Merge branch 'master' into lk/2371-remove-ajv-from-combinators

Author: lucas-koehler

.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.191.1/containers/javascript-node/.devcontainer/base.Dockerfile
 
-# [Choice] Node.js version: 18
-ARG VARIANT="18"
+# [Choice] Node.js version: 22
+ARG VARIANT="22"
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:1-${VARIANT}
 
 # Install chromium and point the CHROME_BIN environment variable to it

.github/workflows/ci.yaml

@@ -21,12 +21,12 @@ jobs:
           - windows-latest
     name: Run on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
 
       - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
         name: Install pnpm

.github/workflows/publish.yaml

@@ -1,66 +1,66 @@
-name: "Publish"
+name: 'Publish'
 
 on:
   workflow_dispatch:
     inputs:
       next_version:
-        type: "string"
-        description: "version (e.g. 3.4.0-alpha.0)"
+        type: 'string'
+        description: 'version (e.g. 3.4.0-alpha.0)'
         required: true
       skip_publish:
-        type: "boolean"
-        description: "mark in case only the version update shall be executed, skipping the release to npm"
+        type: 'boolean'
+        description: 'mark in case only the version update shall be executed, skipping the release to npm'
         required: true
       skip_push:
-        type: "boolean"
-        description: "mark in case the version update shall not be pushed back to the repository"
+        type: 'boolean'
+        description: 'mark in case the version update shall not be pushed back to the repository'
         required: true
       stable_release:
-        type: "boolean"
-        description: "mark in case this is a full stable release (flag is ignored in case publish is skipped)"
+        type: 'boolean'
+        description: 'mark in case this is a full stable release (flag is ignored in case publish is skipped)'
         required: true
 
 jobs:
   publish:
     permissions:
-      contents: "write"
-      id-token: "write"
-    runs-on: "ubuntu-latest"
+      contents: 'write'
+      id-token: 'write'
+    runs-on: 'ubuntu-latest'
     steps:
-      - uses: "actions/checkout@v4"
+      - uses: 'actions/checkout@v4'
         with:
-          token: "${{ secrets.JSONFORMS_PUBLISH_PAT }}"
+          token: '${{ secrets.JSONFORMS_PUBLISH_PAT }}'
 
-      - name: "Configure Git Credentials"
+      - name: 'Configure Git Credentials'
         run: |
           git config user.name "jsonforms-publish[bot]"
           git config user.email "jsonforms-publish@eclipsesource.com"
 
-      - name: "Setup node"
-        uses: "actions/setup-node@v3"
+      - name: 'Setup node'
+        uses: 'actions/setup-node@v4'
         with:
-          node-version: "18"
-          registry-url: "https://registry.npmjs.org"
+          node-version: '22'
+          registry-url: 'https://registry.npmjs.org'
 
       - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
         name: Install pnpm
         id: pnpm-install
         with:
           run_install: false
 
-      - name: "Install Packages"
-        run: "pnpm i --frozen-lockfile"
+      - name: 'Install Packages'
+        run: 'pnpm i --frozen-lockfile'
 
-      - name: "Build"
-        run: "pnpm run build"
+      - name: 'Build'
+        run: 'pnpm run build'
 
-      - name: "Test"
-        run: "pnpm run test"
+      - name: 'Test'
+        run: 'pnpm run test'
 
-      - name: "Versioning"
-        run: "pnpm exec lerna version ${{ github.event.inputs.next_version }} --no-push --force-publish --yes"
+      - name: 'Versioning'
+        run: 'pnpm exec lerna version ${{ github.event.inputs.next_version }} --no-push --force-publish --yes'
 
-      - name: "Adjust PeerDependencies"
+      - name: 'Adjust PeerDependencies'
         run: |
           cd packages/angular && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}"
           cd ../angular-material && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/angular="${{ github.event.inputs.next_version }}"
@@ -72,20 +72,20 @@ jobs:
           cd ../vue-vanilla && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/vue="${{ github.event.inputs.next_version }}"
           cd ../vue-vuetify && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/vue="${{ github.event.inputs.next_version }}"
 
-      - name: "Tag and Commit"
+      - name: 'Tag and Commit'
         run: |
           git add -A && git commit --amend --no-edit
           git tag v${{ github.event.inputs.next_version }} -f
 
-      - name: "push"
-        if: "github.event.inputs.skip_push == 'false'"
+      - name: 'push'
+        if: github.event.inputs.skip_push == 'false'
         run: |
           git push
           git push origin v${{ github.event.inputs.next_version }}
 
-      - name: "Publish to npm"
-        if: "github.event.inputs.skip_publish == 'false'"
+      - name: 'Publish to npm'
+        if: github.event.inputs.skip_publish == 'false'
         run: "pnpm publish --recursive ${{  github.event.inputs.stable_release == 'true' && ' ' || '--tag next' }}"
         env:
-          NODE_AUTH_TOKEN: "${{ secrets.NPM_TOKEN }}"
-          NPM_CONFIG_PROVENANCE: "true"
+          NODE_AUTH_TOKEN: '${{ secrets.NPM_TOKEN }}'
+          NPM_CONFIG_PROVENANCE: 'true'

.nvmrc

@@ -1 +1 @@
-v18.19.0
+22

LICENSE

@@ -1,7 +1,6 @@
 The MIT License
 
-Copyright (c) 2019 EclipseSource Munich
-https://github.com/eclipsesource/jsonforms
+Copyright (c) 2019 EclipseSource GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MIGRATION.md

@@ -112,6 +112,14 @@ const dataWithUser = {
 };
 ```
 
+### UI schema type changes
+
+The `UISchemaElement` type was renamed to `BaseUISchemaElement` and a new `UISchemaElement` type was introduced, which is a union of all available UI schema types.
+
+The `Condition` type was renamed to `BaseCondition` and a new `Condition` type was introduced, which is a union of all available condition types.
+
+Both unions include their respective base type for backwards compatibility, but if you run into errors, replace `UISchemaElement` with `BaseUISchemaElement`/`Condition` with `BaseCondition` in your code to restore the old behaviour.
+
 ## Migrating to JSON Forms 3.5
 
 ### Angular support now targets Angular 18 and Angular 19

README.md

@@ -43,7 +43,7 @@ Independently of the assigned milestone, contributions are always accepted and a
 
 ### First time setup
 
-- Install [node.js](https://nodejs.org/) (only Node v18.19+ < 19 is currently supported)
+- Install [node.js](https://nodejs.org/) (only Node v22+ < 23 is currently supported)
 - Install pnpm: <https://pnpm.io/installation> (use pnpm 10.4.1+) or use [corepack](https://nodejs.org/docs/latest-v18.x/api/corepack.html) to enable the recommended version
 - Clone this repository
 - Install dependencies: `pnpm i --frozen-lockfile`

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.1",
+  "version": "3.6.0-alpha.0",
   "npmClient": "pnpm",
   "useWorkspaces": true
 }

package.json

@@ -1,10 +1,10 @@
 {
   "name": "jsonforms-monorepo",
   "engines": {
-    "node": "^18.19.0",
+    "node": "^22",
     "pnpm": "^10.4.1"
   },
-  "packageManager": "pnpm@10.4.1+sha256.4b702887986995933d4300836b04d6d02a43bc72b52e4f7e93a4ca608b959197",
+  "packageManager": "pnpm@10.5.2+sha512.da9dc28cd3ff40d0592188235ab25d3202add8a207afbedc682220e4a0029ffbff4562102b9e6e46b4e3f9e8bd53e6d05de48544b0c57d4b0179e22c76d1199b",
   "scripts": {
     "lerna": "lerna",
     "preparePublish": "git clean -dfx && pnpm i --frozen-lockfile && pnpm run clean && pnpm run build && pnpm run doc && pnpm run test",

packages/angular-material/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular-material",
-  "version": "3.5.1",
+  "version": "3.6.0-alpha.0",
   "description": "Material Renderer Set for Angular module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -68,8 +68,8 @@
     "@angular/material": "^18.0.0 || ^19.0.0",
     "@angular/platform-browser": "^18.0.0 || ^19.0.0",
     "@angular/router": "^18.0.0 || ^19.0.0",
-    "@jsonforms/angular": "3.5.1",
-    "@jsonforms/core": "3.5.1",
+    "@jsonforms/angular": "3.6.0-alpha.0",
+    "@jsonforms/core": "3.6.0-alpha.0",
     "dayjs": "^1.11.10",
     "rxjs": "^6.6.0 || ^7.4.0"
   },
@@ -103,7 +103,7 @@
     "@ngtools/webpack": "^18.0.0",
     "@types/jasmine": "~3.8.0",
     "@types/lodash": "4.14.149",
-    "@types/node": "^18.19.4",
+    "@types/node": "^22.13.8",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
     "babel-loader": "^8.0.6",

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular",
-  "version": "3.5.1",
+  "version": "3.6.0-alpha.0",
   "description": "Angular module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -69,7 +69,7 @@
   "peerDependencies": {
     "@angular/core": "^18.0.0 || ^19.0.0",
     "@angular/forms": "^18.0.0 || ^19.0.0",
-    "@jsonforms/core": "3.5.1",
+    "@jsonforms/core": "3.6.0-alpha.0",
     "rxjs": "^6.6.0 || ^7.4.0"
   },
   "devDependencies": {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/core",
-  "version": "3.5.1",
+  "version": "3.6.0-alpha.0",
   "description": "Core module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",

packages/core/src/models/uischema.ts

@@ -1,19 +1,19 @@
 /*
   The MIT License
-  
+
   Copyright (c) 2017-2019 EclipseSource Munich
   https://github.com/eclipsesource/jsonforms
-  
+
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
   in the Software without restriction, including without limitation the rights
   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
   copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
-  
+
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
-  
+
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -114,7 +114,7 @@ export enum RuleEffect {
 /**
  * Represents a condition to be evaluated.
  */
-export interface Condition {
+export interface BaseCondition {
   /**
    * The type of condition.
    */
@@ -124,7 +124,7 @@ export interface Condition {
 /**
  * A leaf condition.
  */
-export interface LeafCondition extends Condition, Scoped {
+export interface LeafCondition extends BaseCondition, Scoped {
   type: 'LEAF';
 
   /**
@@ -133,7 +133,7 @@ export interface LeafCondition extends Condition, Scoped {
   expectedValue: any;
 }
 
-export interface SchemaBasedCondition extends Condition, Scoped {
+export interface SchemaBasedCondition extends BaseCondition, Scoped {
   schema: JsonSchema;
 
   /**
@@ -153,7 +153,7 @@ export interface SchemaBasedCondition extends Condition, Scoped {
 /**
  * A composable condition.
  */
-export interface ComposableCondition extends Condition {
+export interface ComposableCondition extends BaseCondition {
   conditions: Condition[];
 }
 
@@ -171,10 +171,20 @@ export interface AndCondition extends ComposableCondition {
   type: 'AND';
 }
 
+/**
+ * A union of all available conditions.
+ */
+export type Condition =
+  | BaseCondition
+  | LeafCondition
+  | OrCondition
+  | AndCondition
+  | SchemaBasedCondition;
+
 /**
  * Common base interface for any UI schema element.
  */
-export interface UISchemaElement {
+export interface BaseUISchemaElement {
   /**
    * The type of this UI schema element.
    */
@@ -195,7 +205,7 @@ export interface UISchemaElement {
  * Represents a layout element which can order its children
  * in a specific way.
  */
-export interface Layout extends UISchemaElement {
+export interface Layout extends BaseUISchemaElement {
   /**
    * The child elements of this layout.
    */
@@ -241,7 +251,7 @@ export interface LabelDescription {
 /**
  * A label element.
  */
-export interface LabelElement extends UISchemaElement, Internationalizable {
+export interface LabelElement extends BaseUISchemaElement, Internationalizable {
   type: 'Label';
   /**
    * The text of label.
@@ -254,7 +264,7 @@ export interface LabelElement extends UISchemaElement, Internationalizable {
  * to which part of the schema the control should be bound.
  */
 export interface ControlElement
-  extends UISchemaElement,
+  extends BaseUISchemaElement,
     Scoped,
     Labelable<string | boolean | LabelDescription>,
     Internationalizable {
@@ -274,7 +284,7 @@ export interface Category extends Layout, Labeled, Internationalizable {
  * the categorization element can be used to represent recursive structures like trees.
  */
 export interface Categorization
-  extends UISchemaElement,
+  extends BaseUISchemaElement,
     Labeled,
     Internationalizable {
   type: 'Categorization';
@@ -284,3 +294,19 @@ export interface Categorization
    */
   elements: (Category | Categorization)[];
 }
+
+/**
+ * A union of all available UI schema elements.
+ * This includes all layout elements, control elements, label elements,
+ * group elements, category elements and categorization elements.
+ */
+export type UISchemaElement =
+  | BaseUISchemaElement
+  | ControlElement
+  | Layout
+  | LabelElement
+  | GroupLayout
+  | Category
+  | Categorization
+  | VerticalLayout
+  | HorizontalLayout;