@jsonforms/core 3.6.0-beta.0 → 3.7.0-alpha.0

package/lib/util/resolvers.d.ts

@@ -20,6 +20,6 @@ export declare const findAllRefs: (schema: JsonSchema, result?: ReferenceSchemaM
  * @param {JsonSchema} schema the root schema from which to start
  * @param {string} schemaPath the schema path to be resolved
  * @param {JsonSchema} rootSchema the actual root schema
- * @returns {JsonSchema} the resolved sub-schema
+ * @returns {JsonSchema} the resolved sub-schema or undefined
  */
-export declare const resolveSchema: (schema: JsonSchema, schemaPath: string, rootSchema: JsonSchema) => JsonSchema;
+export declare const resolveSchema: (schema: JsonSchema, schemaPath: string, rootSchema: JsonSchema) => JsonSchema | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/core",
-  "version": "3.6.0-beta.0",
+  "version": "3.7.0-alpha.0",
   "description": "Core module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -44,8 +44,7 @@
       "ts"
     ],
     "require": [
-      "./test-config/ts-node.config.js",
-      "source-map-support/register.js"
+      "./test-config/ts-node.config.js"
     ]
   },
   "nyc": {

package/src/util/resolvers.ts

@@ -102,32 +102,89 @@ export const findAllRefs = (
 const invalidSegment = (pathSegment: string) =>
   pathSegment === '#' || pathSegment === undefined || pathSegment === '';
 
+/**
+ * Map for tracking schema resolution to prevent infinite recursion.
+ * Key: schema object reference, Value: Set of paths being resolved from that schema
+ */
+type ResolutionTrackingMap = Map<JsonSchema, Set<string>>;
+interface ResolveContext {
+  rootSchema: JsonSchema;
+  resolutionMap: ResolutionTrackingMap;
+}
+
 /**
  * Resolve the given schema path in order to obtain a subschema.
  * @param {JsonSchema} schema the root schema from which to start
  * @param {string} schemaPath the schema path to be resolved
  * @param {JsonSchema} rootSchema the actual root schema
- * @returns {JsonSchema} the resolved sub-schema
+ * @returns {JsonSchema} the resolved sub-schema or undefined
  */
 export const resolveSchema = (
   schema: JsonSchema,
   schemaPath: string,
   rootSchema: JsonSchema
-): JsonSchema => {
-  const segments = schemaPath?.split('/').map(decode);
-  return resolveSchemaWithSegments(schema, segments, rootSchema);
+): JsonSchema | undefined => {
+  const result = doResolveSchema(schema, schemaPath, {
+    rootSchema,
+    resolutionMap: new Map(),
+  });
+  return result;
 };
 
-const resolveSchemaWithSegments = (
+const doResolveSchema = (
   schema: JsonSchema,
-  pathSegments: string[],
-  rootSchema: JsonSchema
+  schemaPath: string,
+  ctx: ResolveContext
+): JsonSchema | undefined => {
+  let resolvedSchema: JsonSchema | undefined = undefined;
+  // If the schema has a $ref, we resolve it first before continuing.
+  if (schema && typeof schema.$ref === 'string') {
+    const baseSchema = resolvePath(ctx.rootSchema, schema.$ref, ctx);
+    if (baseSchema !== undefined) {
+      resolvedSchema = resolvePath(baseSchema, schemaPath, ctx);
+    }
+  }
+  // With later versions of JSON Schema, the $ref can also be used next to other properties,
+  // therefore we also try to resolve the path from the schema itself, even if it has a $ref.
+  if (resolvedSchema === undefined) {
+    resolvedSchema = resolvePath(schema, schemaPath, ctx);
+  }
+  return resolvedSchema;
+};
+
+const resolvePath = (
+  schema: JsonSchema,
+  schemaPath: string | undefined,
+  ctx: ResolveContext
 ): JsonSchema => {
-  // use typeof because schema can by of any type - check singleSegmentResolveSchema below
-  if (typeof schema?.$ref === 'string') {
-    schema = resolveSchema(rootSchema, schema.$ref, rootSchema);
+  let visitedPaths: Set<string> | undefined = ctx.resolutionMap.get(schema);
+  if (!visitedPaths) {
+    visitedPaths = new Set();
+    ctx.resolutionMap.set(schema, visitedPaths);
+  }
+  if (visitedPaths.has(schemaPath)) {
+    // We were already asked to resolve this path from this schema, we must be stuck in a circular reference.
+    return undefined;
   }
 
+  visitedPaths.add(schemaPath);
+
+  const resolvedSchema = resolvePathSegmentsWithCombinatorFallback(
+    schema,
+    schemaPath?.split('/').map(decode),
+    ctx
+  );
+
+  visitedPaths.delete(schemaPath);
+
+  return resolvedSchema;
+};
+
+const resolvePathSegmentsWithCombinatorFallback = (
+  schema: JsonSchema,
+  pathSegments: string[],
+  ctx: ResolveContext
+): JsonSchema | undefined => {
   if (!pathSegments || pathSegments.length === 0) {
     return schema;
   }
@@ -136,49 +193,109 @@ const resolveSchemaWithSegments = (
     return undefined;
   }
 
-  const [segment, ...remainingSegments] = pathSegments;
+  const resolvedSchema = resolvePathSegments(schema, pathSegments, ctx);
+  if (resolvedSchema !== undefined) {
+    return resolvedSchema;
+  }
 
-  if (invalidSegment(segment)) {
-    return resolveSchemaWithSegments(schema, remainingSegments, rootSchema);
+  // If the schema is not found, try combinators
+  const subSchemas = [].concat(
+    schema.oneOf ?? [],
+    schema.allOf ?? [],
+    schema.anyOf ?? [],
+    (schema as JsonSchema7).then ?? [],
+    (schema as JsonSchema7).else ?? []
+  );
+
+  for (const subSchema of subSchemas) {
+    let resolvedSubSchema = subSchema;
+    // check whether the subSchema is a $ref. If it is, resolve it first.
+    if (subSchema && typeof subSchema.$ref === 'string') {
+      resolvedSubSchema = doResolveSchema(ctx.rootSchema, subSchema.$ref, ctx);
+    }
+    const alternativeResolveResult = resolvePathSegmentsWithCombinatorFallback(
+      resolvedSubSchema,
+      pathSegments,
+      ctx
+    );
+    if (alternativeResolveResult) {
+      return alternativeResolveResult;
+    }
   }
 
-  const singleSegmentResolveSchema = get(schema, segment);
+  return undefined;
+};
 
-  const resolvedSchema = resolveSchemaWithSegments(
-    singleSegmentResolveSchema,
-    remainingSegments,
-    rootSchema
-  );
-  if (resolvedSchema) {
-    return resolvedSchema;
+const resolvePathSegments = (
+  schema: JsonSchema,
+  pathSegments: string[],
+  ctx: ResolveContext
+): JsonSchema | undefined => {
+  if (!pathSegments || pathSegments.length === 0) {
+    return schema;
   }
 
-  if (segment === 'properties' || segment === 'items') {
-    // Let's try to resolve the path, assuming oneOf/allOf/anyOf/then/else was omitted.
-    // We only do this when traversing an object or array as we want to avoid
-    // following a property which is named oneOf, allOf, anyOf, then or else.
-    let alternativeResolveResult = undefined;
+  if (isEmpty(schema)) {
+    return undefined;
+  }
+
+  // perform a single step
+  const singleStepResult = resolveSingleStep(schema, pathSegments);
 
-    const subSchemas = [].concat(
-      schema.oneOf ?? [],
-      schema.allOf ?? [],
-      schema.anyOf ?? [],
-      (schema as JsonSchema7).then ?? [],
-      (schema as JsonSchema7).else ?? []
+  // Check whether resolving the next step was successful and returned a schema which has a $ref itself.
+  // In this case, we need to resolve the $ref first before continuing.
+  if (
+    singleStepResult.schema &&
+    typeof singleStepResult.schema.$ref === 'string'
+  ) {
+    singleStepResult.schema = doResolveSchema(
+      ctx.rootSchema,
+      singleStepResult.schema.$ref,
+      ctx
     );
+  }
 
-    for (const subSchema of subSchemas) {
-      alternativeResolveResult = resolveSchemaWithSegments(
-        subSchema,
-        [segment, ...remainingSegments],
-        rootSchema
-      );
-      if (alternativeResolveResult) {
-        break;
-      }
-    }
-    return alternativeResolveResult;
+  return resolvePathSegmentsWithCombinatorFallback(
+    singleStepResult.schema,
+    singleStepResult.remainingPathSegments,
+    ctx
+  );
+};
+
+interface ResolveSingleStepResult {
+  schema: JsonSchema | undefined;
+  remainingPathSegments: string[];
+  resolvedSegment?: string;
+}
+/**
+ * Tries to resolve the next "step" of the pathSegments.
+ * Often this will be a single segment, but it might be multiples ones in case there are invalid segments.
+ */
+const resolveSingleStep = (
+  schema: JsonSchema,
+  pathSegments: string[]
+): ResolveSingleStepResult => {
+  if (!pathSegments || pathSegments.length === 0) {
+    return { schema, remainingPathSegments: [] };
   }
 
-  return undefined;
+  if (isEmpty(schema)) {
+    return {
+      schema: undefined,
+      remainingPathSegments: pathSegments,
+    };
+  }
+
+  const [segment, ...remainingPathSegments] = pathSegments;
+
+  if (invalidSegment(segment)) {
+    return resolveSingleStep(schema, remainingPathSegments);
+  }
+
+  const singleSegmentResolveSchema = get(schema, segment);
+  return {
+    schema: singleSegmentResolveSchema,
+    remainingPathSegments,
+    resolvedSegment: segment,
+  };
 };