Merge branch 'master' into master

MIGRATION.md

@@ -110,6 +110,10 @@ The `scope` attribute in `Scopable` is now optional.
 Use `Scoped` instead for non optional scopes.
 The utility function `fromScopable` was renamed to `fromScoped` accordingly.
 
+### Localization of Date Picker in Angular Material
+
+Date Picker in Angular Material will use the global configuration of your Angular Material application.
+
 ## Migrating to JSON Forms 2.5
 
 ### JsonForms Component for Angular

README.md

@@ -9,13 +9,13 @@ Please see the official JSON Forms website, [jsonforms.io](https://jsonforms.io)
 ## Getting started
 
 1. Clone the seed app with `git clone https://github.com/eclipsesource/jsonforms-react-seed.git`
-2. Install dependencies with `npm ci` (or `npm install` when using an older version)
+2. Install dependencies with `npm ci`
 3. Run the app with `npm run start`
 
 For more info about the seed app, please see the corresponding README file of the [seed repo](https://github.com/eclipsesource/jsonforms-react-seed).
 For a more detailed tutorial about the usage of JSON Forms, please see [this tutorial](http://jsonforms.io/docs/tutorial).
 
-## Upgrading to JSON Forms 3.0 Alpha
+## Upgrading to JSON Forms 3.0
 
 With version 3.0 of JSON Forms we removed `json-schema-ref-parser` from the core package.
 This change only affects users of the React variant (Vue and Angular are not affected) and even for React only a few users will need to adjust their code.

lerna.json

@@ -4,7 +4,7 @@
     "packages/vue/*",
     "packages/vue2/*"
   ],
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.4",
   "nohoist": [
     "core-js",
     "vue",

packages/angular-material/README.md

@@ -39,11 +39,58 @@ import { angularMaterialRenderers } from "@jsonforms/angular-material";
 })
 export class AppComponent {
   renderers = angularMaterialRenderers;
+  uischema = {
+    type: "VerticalLayout",
+    elements: [
+      {
+        type: "Control",
+        label: false,
+        scope: "#/properties/done",
+      },
+      {
+        type: "Control",
+        scope: "#/properties/name",
+      },
+      {
+        type: "HorizontalLayout",
+        elements: [
+          {
+            type: "Control",
+            scope: "#/properties/due_date",
+          },
+          {
+            type: "Control",
+            scope: "#/properties/recurrence",
+          },
+        ],
+      },
+    ],
+  };
+  schema = {
+    type: "object",
+    properties: {
+      name: {
+        type: "string",
+        minLength: 1,
+      },
+      done: {
+        type: "boolean",
+      },
+      due_date: {
+        type: "string",
+        format: "date",
+      },
+      recurrence: {
+        type: "string",
+        enum: ["Never", "Daily", "Weekly", "Monthly"],
+      },
+    },
+    required: ["name", "due_date"],
+  };
   data = {};
 }
 ```
-
-Example module file:
+Example module file `app.module.ts`:
 
 ```ts
 import { NgModule } from "@angular/core";
@@ -65,6 +112,7 @@ import { AppComponent } from "./app.component";
   bootstrap: [AppComponent],
 })
 
+export class AppModule { }
 ```
 
 ## License
@@ -83,3 +131,7 @@ If you encounter any problems feel free to [open an issue](https://github.com/ec
 For questions and discussions please use the [JSON Forms board](https://jsonforms.discourse.group).
 You can also reach us via [email](mailto:jsonforms@eclipsesource.com?subject=JSON%20Forms).
 In addition, EclipseSource also offers [professional support](https://jsonforms.io/support) for JSON Forms.
+
+## Migration
+
+See our [migration guide](https://github.com/eclipsesource/jsonforms/blob/master/MIGRATION.md) when updating JSON Forms.

packages/angular-material/example/app/app.component.ts

@@ -26,6 +26,8 @@ import { Component } from '@angular/core';
 import { ExampleDescription, getExamples } from '@jsonforms/examples';
 import { UISchemaElement, UISchemaTester } from '@jsonforms/core';
 import { angularMaterialRenderers } from '../../src/index';
+import { DateAdapter } from '@angular/material/core';
+
 const uiSchema = {
   type: 'HorizontalLayout',
   elements: [
@@ -89,14 +91,17 @@ export class AppComponent {
   i18n = {
     locale: 'en-US'
   }
+  private dateAdapter;
   private readonly = false;
   data: any;
   uischemas: { tester: UISchemaTester; uischema: UISchemaElement; }[] = [
     { tester: itemTester, uischema: uiSchema }
   ];
 
-  constructor() {
+  constructor(dateAdapter: DateAdapter<Date>) {
     this.selectedExample = this.examples[19];
+    this.dateAdapter = dateAdapter;
+    dateAdapter.setLocale(this.i18n.locale);
   }
 
   onChange(ev: any) {
@@ -105,6 +110,7 @@ export class AppComponent {
 
   changeLocale(locale: string) {
     this.i18n.locale = locale;
+    this.dateAdapter.setLocale(locale);
   }
 
   toggleReadonly() {

packages/angular-material/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular-material",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.4",
   "description": "Material Renderer Set for Angular module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -63,8 +63,8 @@
     "@angular/material": "^12.0.0 || ^13.0.0",
     "@angular/platform-browser": "^12.0.0 || ^13.0.0",
     "@angular/router": "^12.0.0 || ^13.0.0",
-    "@jsonforms/angular": "3.0.0-beta.2",
-    "@jsonforms/core": "3.0.0-beta.2",
+    "@jsonforms/angular": "3.0.0-beta.4",
+    "@jsonforms/core": "3.0.0-beta.4",
     "core-js": "^2.5.3",
     "rxjs": "^6.4.0"
   },
@@ -84,10 +84,10 @@
     "@angular/platform-browser": "^12.0.0",
     "@angular/platform-browser-dynamic": "^12.0.0",
     "@angular/router": "^12.0.0",
-    "@jsonforms/angular": "^3.0.0-beta.2",
-    "@jsonforms/angular-test": "^3.0.0-beta.2",
-    "@jsonforms/core": "^3.0.0-beta.2",
-    "@jsonforms/examples": "^3.0.0-beta.2",
+    "@jsonforms/angular": "^3.0.0-beta.4",
+    "@jsonforms/angular-test": "^3.0.0-beta.4",
+    "@jsonforms/core": "^3.0.0-beta.4",
+    "@jsonforms/examples": "^3.0.0-beta.4",
     "@types/node": "^10.10.0",
     "angular2-template-loader": "^0.6.2",
     "copy-webpack-plugin": "^5.0.5",

packages/angular-material/src/controls/date.renderer.ts

@@ -24,13 +24,11 @@
 */
 import { Component, ChangeDetectionStrategy } from '@angular/core';
 import {
-  getLocale,
   isDateControl,
   RankedTester,
   rankWith
 } from '@jsonforms/core';
 import { JsonFormsAngularService, JsonFormsControl } from '@jsonforms/angular';
-import { DateAdapter, NativeDateAdapter } from '@angular/material/core';
 
 @Component({
   selector: 'DateControlRenderer',
@@ -58,16 +56,10 @@ import { DateAdapter, NativeDateAdapter } from '@angular/material/core';
 export class DateControlRenderer extends JsonFormsControl {
   constructor(
     jsonformsService: JsonFormsAngularService,
-    private dateAdapter: DateAdapter<NativeDateAdapter>
   ) {
     super(jsonformsService);
   }
 
-  mapAdditionalProps() {
-    const locale = getLocale(this.jsonFormsService.getState());
-    this.dateAdapter.setLocale(locale);
-  }
-
   getEventValue = (event: any) => event.value.toISOString().substr(0, 10);
 }
 

packages/angular-test/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@jsonforms/angular-test",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.4",
   "private": true,
   "main": "./lib/index.js",
   "dependencies": {
-    "@jsonforms/angular": "^3.0.0-beta.2",
-    "@jsonforms/core": "^3.0.0-beta.2"
+    "@jsonforms/angular": "^3.0.0-beta.4",
+    "@jsonforms/core": "^3.0.0-beta.4"
   },
   "devDependencies": {
     "jasmine": "^3.2.0",

packages/angular/README.md

@@ -127,6 +127,7 @@ import { AppComponent } from "./app.component";
   bootstrap: [AppComponent],
 })
 
+export class AppModule { }
 ```
 
 ## License
@@ -145,3 +146,7 @@ If you encounter any problems feel free to [open an issue](https://github.com/ec
 For questions and discussions please use the [JSON Forms board](https://jsonforms.discourse.group).
 You can also reach us via [email](mailto:jsonforms@eclipsesource.com?subject=JSON%20Forms).
 In addition, EclipseSource also offers [professional support](https://jsonforms.io/support) for JSON Forms.
+
+## Migration
+
+See our [migration guide](https://github.com/eclipsesource/jsonforms/blob/master/MIGRATION.md) when updating JSON Forms.

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.4",
   "description": "Angular module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -63,15 +63,15 @@
   "peerDependencies": {
     "@angular/core": "^12.0.0 || ^13.0.0",
     "@angular/forms": "^12.0.0 || ^13.0.0",
-    "@jsonforms/core": "3.0.0-beta.2",
+    "@jsonforms/core": "3.0.0-beta.4",
     "rxjs": "^6.4.0"
   },
   "devDependencies": {
     "@angular/compiler": "^12.0.0",
     "@angular/compiler-cli": "^12.0.0",
     "@angular/core": "^12.0.0",
     "@angular/forms": "^12.0.0",
-    "@jsonforms/core": "^3.0.0-beta.2",
+    "@jsonforms/core": "^3.0.0-beta.4",
     "ava": "~2.4.0",
     "copy-webpack-plugin": "^5.0.5",
     "cross-env": "^7.0.2",

packages/core/README.md

@@ -21,6 +21,12 @@ See the official [documentation](https://jsonforms.io/) and the [Example Package
 
 Check <https://www.npmjs.com/search?q=%40jsonforms> for all published JSON Forms packages.
 
+## Upgrading to JSON Forms 3.0
+
+With version 3.0 of JSON Forms we removed `json-schema-ref-parser` from the core package.
+This change only affects users of the React variant (Vue and Angular are not affected) and even for React only a few users will need to adjust their code.
+To avoid issues and for more information, please have a look at our [migration guide](https://github.com/eclipsesource/jsonforms/blob/master/MIGRATION.md).
+
 ## License
 
 The JSON Forms project is licensed under the MIT License. See the [LICENSE file](https://github.com/eclipsesource/jsonforms/blob/master/LICENSE) for more information.
@@ -37,3 +43,8 @@ If you encounter any problems feel free to [open an issue](https://github.com/ec
 For questions and discussions please use the [JSON Forms board](https://jsonforms.discourse.group).
 You can also reach us via [email](mailto:jsonforms@eclipsesource.com?subject=JSON%20Forms).
 In addition, EclipseSource also offers [professional support](https://jsonforms.io/support) for JSON Forms.
+
+
+## Migration
+
+See our [migration guide](https://github.com/eclipsesource/jsonforms/blob/master/MIGRATION.md) when updating JSON Forms.

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/core",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.4",
   "description": "Core module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",

packages/core/src/testers/testers.ts

@@ -144,7 +144,7 @@ export const formatIs = (expectedFormat: string): Tester =>
     schema =>
       !isEmpty(schema) &&
       schema.format === expectedFormat &&
-      schema.type === 'string'
+      hasType(schema, 'string')
   );
 
 /**
@@ -445,10 +445,7 @@ export const isObjectArrayWithNesting = (
   }
   const schemaPath = (uischema as ControlElement).scope;
   const resolvedSchema = resolveSchema(schema, schemaPath, rootSchema ?? schema);
-  const wantedNestingByType: { [key: string]: number } = {
-    object: 2,
-    array: 1
-  };
+  let objectDepth = 0;
   if (resolvedSchema !== undefined && resolvedSchema.items !== undefined) {
     // check if nested arrays
     if (
@@ -459,16 +456,16 @@ export const isObjectArrayWithNesting = (
         if (val.$ref !== undefined) {
           return false;
         }
-        // we don't support multiple types
-        if (typeof val.type !== 'string') {
-          return true;
+        if (hasType(val, 'object')) {
+          objectDepth++;
+          if (objectDepth === 2) {
+            return true;
+          }
         }
-        const typeCount = wantedNestingByType[val.type];
-        if (typeCount === undefined) {
-          return false;
+        if (hasType(val, 'array')) {
+          return true;
         }
-        wantedNestingByType[val.type] = typeCount - 1;
-        return wantedNestingByType[val.type] === 0;
+        return false;
       }, rootSchema)
     ) {
       return true;

packages/example/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@jsonforms/examples-react",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.4",
   "private": true,
   "dependencies": {
-    "@jsonforms/core": "^3.0.0-beta.2",
-    "@jsonforms/examples": "^3.0.0-beta.2",
-    "@jsonforms/react": "^3.0.0-beta.2",
+    "@jsonforms/core": "^3.0.0-beta.4",
+    "@jsonforms/examples": "^3.0.0-beta.4",
+    "@jsonforms/react": "^3.0.0-beta.4",
     "@mui/material": "^5.2.2",
     "@types/react-highlight": "^0.12.5",
     "@types/react-tabs": "^2.3.3",

packages/examples/README.md

@@ -8,7 +8,7 @@ JSON Forms eliminates the tedious task of writing fully-featured forms by hand b
 
 This is the examples package which demonstrates how to integrate JSON Forms with your application.
 
-You can use the examples with any renderer set you want, for example the [Material Renderers](https://github.com/eclipsesource/jsonforms/blob/master/packages/material-renderers) or the [Angular Renderers](https://github.com/eclipsesource/jsonforms/blob/master/packages/vanilla-renderers).
+You can use the examples with any renderer set you want, for example the [Material Renderers](https://github.com/eclipsesource/jsonforms/tree/master/packages/material) or the [Angular Renderers](https://github.com/eclipsesource/jsonforms/tree/master/packages/angular-material).
 
 Check <https://www.npmjs.com/search?q=%40jsonforms> for all published JSON Forms packages.
 
@@ -28,3 +28,7 @@ If you encounter any problems feel free to [open an issue](https://github.com/ec
 For questions and discussions please use the [JSON Forms board](https://jsonforms.discourse.group).
 You can also reach us via [email](mailto:jsonforms@eclipsesource.com?subject=JSON%20Forms).
 In addition, EclipseSource also offers [professional support](https://jsonforms.io/support) for JSON Forms.
+
+## Migration
+
+See our [migration guide](https://github.com/eclipsesource/jsonforms/blob/master/MIGRATION.md) when updating JSON Forms.