@jsonforms/core 3.2.0-alpha.1 → 3.2.0-alpha.3

package/lib/util/renderer.d.ts

@@ -27,11 +27,17 @@ export declare const computeLabel: (label: string | undefined, required: boolean
  */
 export declare const showAsRequired: (required: boolean, hideRequiredAsterisk: boolean) => boolean;
 /**
- * Create a default value based on the given scheam.
+ * Create a default value based on the given schema.
  * @param schema the schema for which to create a default value.
  * @returns {any}
  */
-export declare const createDefaultValue: (schema: JsonSchema) => {};
+export declare const createDefaultValue: (schema: JsonSchema, rootSchema: JsonSchema) => any;
+/**
+ * Returns the default value defined in the given schema.
+ * @param schema the schema for which to create a default value.
+ * @returns {any}
+ */
+export declare const extractDefaults: (schema: JsonSchema, rootSchema: JsonSchema) => any;
 /**
  * Whether an element's description should be hidden.
  *

package/lib/util/util.d.ts

@@ -1,5 +1,31 @@
 import type { JsonSchema, Scoped, UISchemaElement } from '..';
 import type Ajv from 'ajv';
+/**
+ * Returns the string representation of the given date. The format of the output string can be specified:
+ * - 'date' for a date-only string (YYYY-MM-DD),
+ * - 'time' for a time-only string (HH:mm:ss), or
+ * - 'date-time' for a full date-time string in ISO format (YYYY-MM-DDTHH:mm:ss.sssZ).
+ * If no format is specified, the full date-time ISO string is returned by default.
+ *
+ * @returns {string} A string representation of the date in the specified format.
+ *
+ * @example
+ * // returns '2023-11-09'
+ * convertDateToString(new Date('2023-11-09T14:22:54.131Z'), 'date');
+ *
+ * @example
+ * // returns '14:22:54'
+ * convertDateToString(new Date('2023-11-09T14:22:54.131Z'), 'time');
+ *
+ * @example
+ * // returns '2023-11-09T14:22:54.131Z'
+ * convertDateToString(new Date('2023-11-09T14:22:54.131Z'), 'date-time');
+ *
+ * @example
+ * // returns '2023-11-09T14:22:54.131Z'
+ * convertDateToString(new Date('2023-11-09T14:22:54.131Z'));
+ */
+export declare const convertDateToString: (date: Date, format?: 'date' | 'time' | 'date-time') => string;
 /**
  * Escape the given string such that it can be used as a class name,
  * i.e. hashes and slashes will be replaced.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/core",
-  "version": "3.2.0-alpha.1",
+  "version": "3.2.0-alpha.3",
   "description": "Core module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -99,5 +99,5 @@
     "typedoc": "~0.21.9",
     "typescript": "4.2.3"
   },
-  "gitHead": "deb2c7cd71f6065cca7777420b1018f17e73052a"
+  "gitHead": "77624c6ab6c0f3db98abe3175547bbd51f7510bb"
 }

package/src/reducers/core.ts

@@ -90,16 +90,6 @@ const initState: JsonFormsCore = {
   additionalErrors: [],
 };
 
-const reuseAjvForSchema = (ajv: Ajv, schema: JsonSchema): Ajv => {
-  if (
-    Object.prototype.hasOwnProperty.call(schema, 'id') ||
-    Object.prototype.hasOwnProperty.call(schema, '$id')
-  ) {
-    ajv.removeSchema(schema);
-  }
-  return ajv;
-};
-
 const getOrCreateAjv = (
   state: JsonFormsCore,
   action?: InitAction | UpdateCoreAction
@@ -115,12 +105,7 @@ const getOrCreateAjv = (
       }
     }
   }
-  if (state.ajv) {
-    return action?.schema
-      ? reuseAjvForSchema(state.ajv, action.schema)
-      : state.ajv;
-  }
-  return createAjv();
+  return state.ajv ? state.ajv : createAjv();
 };
 
 const hasAjvOption = (option: any): option is InitActionOptions => {
@@ -255,7 +240,7 @@ export const coreReducer: Reducer<JsonFormsCore, CoreActions> = (
       const needsNewValidator =
         action.schema && state.ajv && state.validationMode !== 'NoValidation';
       const v = needsNewValidator
-        ? reuseAjvForSchema(state.ajv, action.schema).compile(action.schema)
+        ? state.ajv.compile(action.schema)
         : state.validator;
       const errors = validate(v, state.data);
       return {
@@ -326,9 +311,7 @@ export const coreReducer: Reducer<JsonFormsCore, CoreActions> = (
         };
       }
       if (state.validationMode === 'NoValidation') {
-        const validator = reuseAjvForSchema(state.ajv, state.schema).compile(
-          state.schema
-        );
+        const validator = state.ajv.compile(state.schema);
         const errors = validate(validator, state.data);
         return {
           ...state,

package/src/reducers/reducers.ts

@@ -77,7 +77,7 @@ export const findUISchema = (
           return fallback();
         }
         // force generation of uischema
-        return Generate.uiSchema(schema, fallback);
+        return Generate.uiSchema(schema, fallback, undefined, rootSchema);
       }
     } else if (typeof control.options.detail === 'object') {
       // check if detail is a valid uischema

package/src/util/renderer.ts

@@ -57,7 +57,7 @@ import { createLabelDescriptionFrom } from './label';
 import type { CombinatorKeyword } from './combinators';
 import { moveDown, moveUp } from './array';
 import type { AnyAction, Dispatch } from './type';
-import { Resolve } from './util';
+import { Resolve, convertDateToString, hasType } from './util';
 import { composePaths, composeWithUi } from './path';
 import { CoreActions, update } from '../actions';
 import type { ErrorObject } from 'ajv';
@@ -78,6 +78,8 @@ import {
   arrayDefaultTranslations,
   ArrayTranslations,
 } from '../i18n/arrayTranslations';
+import { resolveSchema } from './resolvers';
+import cloneDeep from 'lodash/cloneDeep';
 
 const isRequired = (
   schema: JsonSchema,
@@ -137,33 +139,65 @@ export const showAsRequired = (
 };
 
 /**
- * Create a default value based on the given scheam.
+ * Create a default value based on the given schema.
  * @param schema the schema for which to create a default value.
  * @returns {any}
  */
-export const createDefaultValue = (schema: JsonSchema) => {
-  switch (schema.type) {
-    case 'string':
-      if (
-        schema.format === 'date-time' ||
-        schema.format === 'date' ||
-        schema.format === 'time'
-      ) {
-        return new Date();
+export const createDefaultValue = (
+  schema: JsonSchema,
+  rootSchema: JsonSchema
+) => {
+  const resolvedSchema = Resolve.schema(schema, schema.$ref, rootSchema);
+  if (resolvedSchema.default !== undefined) {
+    return extractDefaults(resolvedSchema, rootSchema);
+  }
+  if (hasType(resolvedSchema, 'string')) {
+    if (
+      resolvedSchema.format === 'date-time' ||
+      resolvedSchema.format === 'date' ||
+      resolvedSchema.format === 'time'
+    ) {
+      return convertDateToString(new Date(), resolvedSchema.format);
+    }
+    return '';
+  } else if (
+    hasType(resolvedSchema, 'integer') ||
+    hasType(resolvedSchema, 'number')
+  ) {
+    return 0;
+  } else if (hasType(resolvedSchema, 'boolean')) {
+    return false;
+  } else if (hasType(resolvedSchema, 'array')) {
+    return [];
+  } else if (hasType(resolvedSchema, 'object')) {
+    return extractDefaults(resolvedSchema, rootSchema);
+  } else if (hasType(resolvedSchema, 'null')) {
+    return null;
+  } else {
+    return {};
+  }
+};
+
+/**
+ * Returns the default value defined in the given schema.
+ * @param schema the schema for which to create a default value.
+ * @returns {any}
+ */
+export const extractDefaults = (schema: JsonSchema, rootSchema: JsonSchema) => {
+  if (hasType(schema, 'object') && schema.default === undefined) {
+    const result: { [key: string]: any } = {};
+    for (const key in schema.properties) {
+      const property = schema.properties[key];
+      const resolvedProperty = property.$ref
+        ? Resolve.schema(rootSchema, property.$ref, rootSchema)
+        : property;
+      if (resolvedProperty.default !== undefined) {
+        result[key] = cloneDeep(resolvedProperty.default);
       }
-      return '';
-    case 'integer':
-    case 'number':
-      return 0;
-    case 'boolean':
-      return false;
-    case 'array':
-      return [];
-    case 'null':
-      return null;
-    default:
-      return {};
+    }
+    return result;
   }
+  return cloneDeep(schema.default);
 };
 
 /**
@@ -617,7 +651,11 @@ export const mapStateToMultiEnumControlProps = (
   ownProps: OwnPropsOfControl & OwnPropsOfEnum
 ): StatePropsOfControl & OwnPropsOfEnum => {
   const props: StatePropsOfControl = mapStateToControlProps(state, ownProps);
-  const items = props.schema.items as JsonSchema;
+  let items = props.schema.items as JsonSchema;
+  items =
+    items && items.$ref
+      ? resolveSchema(props.rootSchema, items.$ref, props.rootSchema)
+      : items;
   const options: EnumOption[] =
     ownProps.options ||
     (items?.oneOf &&

package/src/util/util.ts

@@ -33,6 +33,49 @@ import { composePaths, toDataPathSegments } from './path';
 import { isEnabled, isVisible } from './runtime';
 import type Ajv from 'ajv';
 
+/**
+ * Returns the string representation of the given date. The format of the output string can be specified:
+ * - 'date' for a date-only string (YYYY-MM-DD),
+ * - 'time' for a time-only string (HH:mm:ss), or
+ * - 'date-time' for a full date-time string in ISO format (YYYY-MM-DDTHH:mm:ss.sssZ).
+ * If no format is specified, the full date-time ISO string is returned by default.
+ *
+ * @returns {string} A string representation of the date in the specified format.
+ *
+ * @example
+ * // returns '2023-11-09'
+ * convertDateToString(new Date('2023-11-09T14:22:54.131Z'), 'date');
+ *
+ * @example
+ * // returns '14:22:54'
+ * convertDateToString(new Date('2023-11-09T14:22:54.131Z'), 'time');
+ *
+ * @example
+ * // returns '2023-11-09T14:22:54.131Z'
+ * convertDateToString(new Date('2023-11-09T14:22:54.131Z'), 'date-time');
+ *
+ * @example
+ * // returns '2023-11-09T14:22:54.131Z'
+ * convertDateToString(new Date('2023-11-09T14:22:54.131Z'));
+ */
+export const convertDateToString = (
+  date: Date,
+  format?: 'date' | 'time' | 'date-time'
+): string => {
+  //e.g. '2023-11-09T14:22:54.131Z'
+  const dateString = date.toISOString();
+  if (format === 'date-time') {
+    return dateString;
+  } else if (format === 'date') {
+    // e.g. '2023-11-09'
+    return dateString.split('T')[0];
+  } else if (format === 'time') {
+    //e.g. '14:22:54'
+    return dateString.split('T')[1].split('.')[0];
+  }
+  return dateString;
+};
+
 /**
  * Escape the given string such that it can be used as a class name,
  * i.e. hashes and slashes will be replaced.
@@ -77,7 +120,17 @@ export const deriveTypes = (jsonSchema: JsonSchema): string[] => {
   if (!isEmpty(jsonSchema.items)) {
     return ['array'];
   }
-
+  if (!isEmpty(jsonSchema.enum)) {
+    const types: Set<string> = new Set();
+    jsonSchema.enum.forEach((enumElement) => {
+      if (typeof enumElement === 'string') {
+        types.add('string');
+      } else {
+        deriveTypes(enumElement).forEach((type) => types.add(type));
+      }
+    });
+    return Array.from(types);
+  }
   if (!isEmpty(jsonSchema.allOf)) {
     const allOfType = find(
       jsonSchema.allOf,

package/src/util/validator.ts

@@ -31,6 +31,7 @@ export const createAjv = (options?: Options) => {
     allErrors: true,
     verbose: true,
     strict: false,
+    addUsedSchema: false,
     ...options,
   });
   addFormats(ajv);