Merge branch 'master' into preserve-edit-data

Author: kchobantonov

.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: 22
-ARG VARIANT="22"
+# [Choice] Node.js version: 24
+ARG VARIANT="24"
 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,14 +21,14 @@ jobs:
           - windows-latest
     name: Run on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 24
 
-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
         name: Install pnpm
         id: pnpm-install
         with:

.github/workflows/publish.yaml

@@ -27,7 +27,7 @@ jobs:
       id-token: 'write' # Required for npm OIDC
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v4'
+      - uses: 'actions/checkout@v6'
         with:
           token: '${{ secrets.JSONFORMS_PUBLISH_PAT }}'
 
@@ -36,22 +36,18 @@ jobs:
           git config user.name "jsonforms-publish[bot]"
           git config user.email "jsonforms-publish@eclipsesource.com"
 
-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
         name: Install pnpm
         id: pnpm-install
         with:
           run_install: false
 
       - name: 'Setup node'
-        uses: 'actions/setup-node@v4'
+        uses: 'actions/setup-node@v6'
         with:
-          node-version: '22'
+          node-version: '24'
           registry-url: 'https://registry.npmjs.org'
 
-      # Ensure npm 11.5.1 or later for trusted publishing
-      - name: Update npm
-        run: npm install -g npm@latest
-
       - name: 'Install Packages'
         run: 'pnpm i --frozen-lockfile'
 

.nvmrc

@@ -1 +1 @@
-22
+24

README.md

@@ -43,8 +43,8 @@ Independently of the assigned milestone, contributions are always accepted and a
 
 ### First time setup
 
-- 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
+- Install [node.js](https://nodejs.org/) (only Node v24+ < 25 is currently supported)
+- Install pnpm: <https://pnpm.io/installation> (use pnpm 10.33.0+) 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.8.0-alpha.0",
+  "version": "3.8.0-alpha.1",
   "npmClient": "pnpm",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

package.json

@@ -1,10 +1,10 @@
 {
   "name": "jsonforms-monorepo",
   "engines": {
-    "node": "^22",
-    "pnpm": "^10.4.1"
+    "node": "^24",
+    "pnpm": "^10.33.0"
   },
-  "packageManager": "pnpm@10.22.0+sha512.bf049efe995b28f527fd2b41ae0474ce29186f7edcb3bf545087bd61fbbebb2bf75362d1307fda09c2d288e1e499787ac12d4fcb617a974718a6051f2eee741c",
+  "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319",
   "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.8.0-alpha.0",
+  "version": "3.8.0-alpha.1",
   "description": "Material Renderer Set for Angular module of JSON Forms",
   "repository": {
     "type": "git",
@@ -72,8 +72,8 @@
     "@angular/material": "^19.0.0 || ^20.0.0 || ^21.0.0",
     "@angular/platform-browser": "^19.0.0 || ^20.0.0 || ^21.0.0",
     "@angular/router": "^19.0.0 || ^20.0.0 || ^21.0.0",
-    "@jsonforms/angular": "3.8.0-alpha.0",
-    "@jsonforms/core": "3.8.0-alpha.0",
+    "@jsonforms/angular": "3.8.0-alpha.1",
+    "@jsonforms/core": "3.8.0-alpha.1",
     "dayjs": "^1.11.10",
     "rxjs": "^6.6.0 || ^7.4.0"
   },
@@ -107,7 +107,7 @@
     "@ngtools/webpack": "^19.0.0",
     "@types/jasmine": "~3.8.0",
     "@types/lodash": "4.14.149",
-    "@types/node": "^22.13.8",
+    "@types/node": "^24.12.2",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
     "babel-loader": "^8.0.6",

…ibrary/controls/autocomplete.renderer.ts …al/src/library/controls/enum.renderer.tspackages/angular-material/src/library/controls/autocomplete.renderer.ts renamed to packages/angular-material/src/library/controls/enum.renderer.ts packages/angular-material/src/library/controls/autocomplete.renderer.ts renamed to packages/angular-material/src/library/controls/enum.renderer.ts

@@ -36,8 +36,10 @@ import {
   ControlElement,
   EnumOption,
   isEnumControl,
+  isOneOfEnumControl,
   JsonFormsState,
   mapStateToEnumControlProps,
+  mapStateToOneOfEnumControlProps,
   OwnPropsOfControl,
   OwnPropsOfEnum,
   RankedTester,
@@ -52,51 +54,53 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 
-@Component({
-  selector: 'AutocompleteControlRenderer',
-  template: `
-    <mat-form-field [ngStyle]="{ display: hidden ? 'none' : '' }">
-      <mat-label>{{ label }}</mat-label>
-      <input
-        matInput
-        type="text"
-        (change)="onChange($event)"
-        [id]="id"
-        [formControl]="form"
-        [matAutocomplete]="auto"
-        (keydown)="updateFilter($event)"
-        (focus)="focused = true"
-        (focusout)="focused = false"
-      />
-      <mat-autocomplete
-        autoActiveFirstOption
-        #auto="matAutocomplete"
-        (optionSelected)="onSelect($event)"
-        [displayWith]="displayFn"
-      >
-        @for (option of filteredOptions | async; track option.value) {
-        <mat-option [value]="option">
-          {{ option.label }}
-        </mat-option>
-        }
-      </mat-autocomplete>
-      <mat-hint *ngIf="shouldShowUnfocusedDescription() || focused">{{
-        description
-      }}</mat-hint>
-      <mat-error>{{ error }}</mat-error>
-    </mat-form-field>
-  `,
-  styles: [
-    `
-      :host {
-        display: flex;
-        flex-direction: row;
-      }
-      mat-form-field {
-        flex: 1 1 auto;
+const template = `
+  <mat-form-field [ngStyle]="{ display: hidden ? 'none' : '' }">
+    <mat-label>{{ label }}</mat-label>
+    <input
+      matInput
+      type="text"
+      (change)="onChange($event)"
+      [id]="id"
+      [formControl]="form"
+      [matAutocomplete]="auto"
+      (keydown)="updateFilter($event)"
+      (focus)="focused = true"
+      (focusout)="focused = false"
+    />
+    <mat-autocomplete
+      autoActiveFirstOption
+      #auto="matAutocomplete"
+      (optionSelected)="onSelect($event)"
+      [displayWith]="displayFn"
+    >
+      @for (option of filteredOptions | async; track option.value) {
+      <mat-option [value]="option">
+        {{ option.label }}
+      </mat-option>
       }
-    `,
-  ],
+    </mat-autocomplete>
+    <mat-hint *ngIf="shouldShowUnfocusedDescription() || focused">{{
+      description
+    }}</mat-hint>
+    <mat-error>{{ error }}</mat-error>
+  </mat-form-field>
+`;
+
+const style = `
+  :host {
+    display: flex;
+    flex-direction: row;
+  }
+  mat-form-field {
+    flex: 1 1 auto;
+  }
+`;
+
+@Component({
+  selector: 'OneOfEnumControlRenderer',
+  template,
+  styles: [style],
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     CommonModule,
@@ -106,11 +110,11 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete';
     MatAutocompleteModule,
   ],
 })
-export class AutocompleteControlRenderer
+export class OneOfEnumControlRenderer
   extends JsonFormsControl
   implements OnInit
 {
-  @Input() options?: EnumOption[] | string[];
+  @Input() options?: EnumOption[];
   valuesToTranslatedOptions?: Map<string, EnumOption>;
   filteredOptions: Observable<EnumOption[]>;
   shouldFilter: boolean;
@@ -123,7 +127,7 @@ export class AutocompleteControlRenderer
   protected override mapToProps(
     state: JsonFormsState
   ): StatePropsOfControl & OwnPropsOfEnum {
-    return mapStateToEnumControlProps(state, this.getOwnProps());
+    return mapStateToOneOfEnumControlProps(state, this.getOwnProps());
   }
 
   getEventValue = (event: any) => event.target.value;
@@ -209,29 +213,51 @@ export class AutocompleteControlRenderer
   protected getOwnProps(): OwnPropsOfControl & OwnPropsOfEnum {
     return {
       ...super.getOwnProps(),
-      options: this.stringOptionsToEnumOptions(this.options),
+      options: this.options,
     };
   }
+}
 
-  /**
-   * For {@link options} input backwards compatibility
-   */
-  protected stringOptionsToEnumOptions(
-    options: typeof this.options
-  ): EnumOption[] | undefined {
-    if (!options) {
-      return undefined;
-    }
+export const oneOfEnumControlTester: RankedTester = rankWith(
+  5,
+  isOneOfEnumControl
+);
+
+@Component({
+  selector: 'EnumControlRenderer, AutocompleteControlRenderer',
+  template,
+  styles: [style],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [
+    CommonModule,
+    ReactiveFormsModule,
+    MatFormFieldModule,
+    MatInputModule,
+    MatAutocompleteModule,
+  ],
+})
+export class EnumControlRenderer extends OneOfEnumControlRenderer {
+  // eslint-disable-next-line @angular-eslint/no-input-rename
+  @Input('options')
+  set stringOptions(strOptions: string[]) {
+    this.options = strOptions.map((str) => {
+      return {
+        label: str,
+        value: str,
+      };
+    });
+  }
 
-    return options.every((item) => typeof item === 'string')
-      ? options.map((str) => {
-          return {
-            label: str,
-            value: str,
-          } satisfies EnumOption;
-        })
-      : options;
+  protected override mapToProps(
+    state: JsonFormsState
+  ): StatePropsOfControl & OwnPropsOfEnum {
+    return mapStateToEnumControlProps(state, this.getOwnProps());
   }
 }
 
+/**
+ * For {@link AutocompleteControlRenderer} class name backwards compatibility
+ */
+export { EnumControlRenderer as AutocompleteControlRenderer };
+
 export const enumControlTester: RankedTester = rankWith(2, isEnumControl);

packages/angular-material/src/library/controls/index.ts

@@ -29,4 +29,4 @@ export * from './number.renderer';
 export * from './range.renderer';
 export * from './date.renderer';
 export * from './toggle.renderer';
-export * from './autocomplete.renderer';
+export * from './enum.renderer';