@takeshape/schema 8.168.0 → 8.173.0

package/dist/util/find-shape-at-path.d.ts

@@ -6,7 +6,17 @@ import { ProjectSchema, PropertySchema, Shape } from '../project-schema';
  * @param queryPath
  *
  * @example
- * findShapeAtPath(projectSchema, projectSchema.shapes.Shopify_ProductConnection, ['edges', 'node']) // finds Shopify_Product
+ * findShapeAtPath(projectSchema, projectSchema.shapes.Shopify_ProductConnection.shape, ['edges', 'node']) // finds {'@ref': Shopify_Product}
  */
-export declare function findShapeAtPath(projectSchema: ProjectSchema, schema: PropertySchema, queryPath: string[]): Shape | undefined;
+export declare function findSchemaAtPath(projectSchema: ProjectSchema, schema: PropertySchema, queryPath: string[]): PropertySchema | undefined;
+/**
+ *
+ * @param projectSchema
+ * @param propSchema
+ * @param queryPath
+ *
+ * @example
+ * findShapeAtPath(projectSchema, projectSchema.shapes.Shopify_ProductConnection.shape, ['edges', 'node']) // finds Shopify_Product
+ */
+export declare function findShapeAtPath(projectSchema: ProjectSchema, propSchema: PropertySchema, queryPath: string[]): Shape | undefined;
 //# sourceMappingURL=find-shape-at-path.d.ts.map

package/dist/util/find-shape-at-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-shape-at-path.d.ts","sourceRoot":"","sources":["../../../src/util/find-shape-at-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,cAAc,EAAE,KAAK,EAAC,MAAM,mBAAmB,CAAC;AAIvE;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,MAAM,EAAE,GAClB,KAAK,GAAG,SAAS,CAuBnB"}
+{"version":3,"file":"find-shape-at-path.d.ts","sourceRoot":"","sources":["../../../src/util/find-shape-at-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,cAAc,EAAE,KAAK,EAAC,MAAM,mBAAmB,CAAC;AAIvE;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,MAAM,EAAE,GAClB,cAAc,GAAG,SAAS,CA8B5B;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,MAAM,EAAE,GAClB,KAAK,GAAG,SAAS,CAMnB"}

package/dist/util/find-shape-at-path.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.findSchemaAtPath = findSchemaAtPath;
 exports.findShapeAtPath = findShapeAtPath;
 
 var _types = require("../types");
@@ -16,31 +17,59 @@ var _refs = require("../refs");
  * @param queryPath
  *
  * @example
- * findShapeAtPath(projectSchema, projectSchema.shapes.Shopify_ProductConnection, ['edges', 'node']) // finds Shopify_Product
+ * findShapeAtPath(projectSchema, projectSchema.shapes.Shopify_ProductConnection.shape, ['edges', 'node']) // finds {'@ref': Shopify_Product}
  */
-function findShapeAtPath(projectSchema, schema, queryPath) {
+function findSchemaAtPath(projectSchema, schema, queryPath) {
+  if (queryPath.length === 0) {
+    return schema;
+  }
+
   const [prop, ...rest] = queryPath;
 
   if ((0, _types.isRefSchema)(schema)) {
-    if (queryPath.length === 0) {
-      const refItem = (0, _refs.getRef)(projectSchema, schema);
-      return refItem && (0, _refs.refItemToShape)(projectSchema, refItem);
+    const ref = (0, _refs.getRef)(projectSchema, schema);
+
+    if (ref) {
+      const shapeSchema = (0, _refs.refItemToShapeSchema)(projectSchema, ref);
+
+      if (shapeSchema) {
+        return findSchemaAtPath(projectSchema, shapeSchema, queryPath);
+      }
     }
 
-    return findShapeAtPath(projectSchema, (0, _refs.followRef)(projectSchema, schema), queryPath);
+    return undefined;
   }
 
   if ((0, _types.isArraySchema)(schema)) {
-    return findShapeAtPath(projectSchema, schema.items, queryPath);
+    return findSchemaAtPath(projectSchema, schema.items, queryPath);
   }
 
   if ((0, _types.isObjectSchema)(schema)) {
     const propSchema = schema.properties[prop];
 
     if (propSchema) {
-      return findShapeAtPath(projectSchema, propSchema, rest);
+      return findSchemaAtPath(projectSchema, propSchema, rest);
     }
   }
 
   return undefined;
+}
+/**
+ *
+ * @param projectSchema
+ * @param propSchema
+ * @param queryPath
+ *
+ * @example
+ * findShapeAtPath(projectSchema, projectSchema.shapes.Shopify_ProductConnection.shape, ['edges', 'node']) // finds Shopify_Product
+ */
+
+
+function findShapeAtPath(projectSchema, propSchema, queryPath) {
+  const result = findSchemaAtPath(projectSchema, propSchema, queryPath);
+
+  if (result) {
+    const refItem = (0, _refs.getRef)(projectSchema, result.items ?? result);
+    return refItem && (0, _refs.refItemToShape)(projectSchema, refItem);
+  }
 }

package/dist/util/form-config.d.ts

@@ -1,6 +1,10 @@
 import type { FormConfig, FormMap } from '../project-schema';
 import { Maybe } from '@takeshape/util';
 import { ProjectSchema } from '../project-schema';
+/**
+ * If there any non-normal (nested) forms in the schema, create forms for referenced shapes.
+ * The original forms are left intact.
+ */
 export declare function normalizeForms(projectSchema: ProjectSchema): FormMap;
 /**
  * Find the form config for a given shape name and the form key.

package/dist/util/form-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-config.d.ts","sourceRoot":"","sources":["../../../src/util/form-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAE,OAAO,EAAC,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAY,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAIhD,wBAAgB,cAAc,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAmDpE;AAID;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,KAAK,CAAC,UAAU,CAAC,CAYnB"}
+{"version":3,"file":"form-config.d.ts","sourceRoot":"","sources":["../../../src/util/form-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAE,OAAO,EAAC,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAY,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAIhD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAmDpE;AAID;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,KAAK,CAAC,UAAU,CAAC,CAYnB"}

package/dist/util/form-config.js

@@ -12,6 +12,10 @@ var _refs = require("../refs");
 
 var _schemaUtil = require("../schema-util");
 
+/**
+ * If there any non-normal (nested) forms in the schema, create forms for referenced shapes.
+ * The original forms are left intact.
+ */
 function normalizeForms(projectSchema) {
   const normalizedForms = {};
   const {

package/dist/util/has-arg.d.ts

@@ -1,3 +1,3 @@
 import { ProjectSchema, PropertySchema, Query } from '../project-schema';
-export declare function hasArg(projectSchema: ProjectSchema, prop: PropertySchema | Query, argName: string): boolean;
+export declare function hasArg(projectSchema: ProjectSchema, prop: PropertySchema | Query, argPath: string | string[]): boolean;
 //# sourceMappingURL=has-arg.d.ts.map

package/dist/util/has-arg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"has-arg.d.ts","sourceRoot":"","sources":["../../../src/util/has-arg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,cAAc,EAAE,KAAK,EAAC,MAAM,mBAAmB,CAAC;AAGvE,wBAAgB,MAAM,CAAC,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,GAAG,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAU3G"}
+{"version":3,"file":"has-arg.d.ts","sourceRoot":"","sources":["../../../src/util/has-arg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,cAAc,EAAE,KAAK,EAAC,MAAM,mBAAmB,CAAC;AAGvE,wBAAgB,MAAM,CACpB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,cAAc,GAAG,KAAK,EAC5B,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GACzB,OAAO,CAWT"}

package/dist/util/has-arg.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.hasArg = hasArg;
 
-var _schemaUtil = require("../schema-util");
+var _findShapeAtPath = require("./find-shape-at-path");
 
-function hasArg(projectSchema, prop, argName) {
+function hasArg(projectSchema, prop, argPath) {
   var _projectSchema$shapes;
 
   const args = 'args' in prop ? prop.args : prop['@args'];
@@ -17,6 +17,6 @@ function hasArg(projectSchema, prop, argName) {
   }
 
   const schema = typeof args === 'string' ? (_projectSchema$shapes = projectSchema.shapes[args]) === null || _projectSchema$shapes === void 0 ? void 0 : _projectSchema$shapes.schema : args;
-  const schemaPropertyAccessor = (0, _schemaUtil.createSchemaPropertyAccessor)(projectSchema, schema);
-  return Boolean(schemaPropertyAccessor.getValue(argName));
+  const pathArray = Array.isArray(argPath) ? argPath : argPath.split('.');
+  return Boolean((0, _findShapeAtPath.findSchemaAtPath)(projectSchema, schema, pathArray));
 }

package/es/util/find-shape-at-path.js

@@ -1,5 +1,5 @@
 import { isArraySchema, isObjectSchema, isRefSchema } from '../types';
-import { followRef, getRef, refItemToShape } from '../refs';
+import { getRef, refItemToShape, refItemToShapeSchema } from '../refs';
 /**
  *
  * @param projectSchema
@@ -7,32 +7,59 @@ import { followRef, getRef, refItemToShape } from '../refs';
  * @param queryPath
  *
  * @example
- * findShapeAtPath(projectSchema, projectSchema.shapes.Shopify_ProductConnection, ['edges', 'node']) // finds Shopify_Product
+ * findShapeAtPath(projectSchema, projectSchema.shapes.Shopify_ProductConnection.shape, ['edges', 'node']) // finds {'@ref': Shopify_Product}
  */
 
-export function findShapeAtPath(projectSchema, schema, queryPath) {
+export function findSchemaAtPath(projectSchema, schema, queryPath) {
+  if (queryPath.length === 0) {
+    return schema;
+  }
+
   const [prop, ...rest] = queryPath;
 
   if (isRefSchema(schema)) {
-    if (queryPath.length === 0) {
-      const refItem = getRef(projectSchema, schema);
-      return refItem && refItemToShape(projectSchema, refItem);
+    const ref = getRef(projectSchema, schema);
+
+    if (ref) {
+      const shapeSchema = refItemToShapeSchema(projectSchema, ref);
+
+      if (shapeSchema) {
+        return findSchemaAtPath(projectSchema, shapeSchema, queryPath);
+      }
     }
 
-    return findShapeAtPath(projectSchema, followRef(projectSchema, schema), queryPath);
+    return undefined;
   }
 
   if (isArraySchema(schema)) {
-    return findShapeAtPath(projectSchema, schema.items, queryPath);
+    return findSchemaAtPath(projectSchema, schema.items, queryPath);
   }
 
   if (isObjectSchema(schema)) {
     const propSchema = schema.properties[prop];
 
     if (propSchema) {
-      return findShapeAtPath(projectSchema, propSchema, rest);
+      return findSchemaAtPath(projectSchema, propSchema, rest);
     }
   }
 
   return undefined;
+}
+/**
+ *
+ * @param projectSchema
+ * @param propSchema
+ * @param queryPath
+ *
+ * @example
+ * findShapeAtPath(projectSchema, projectSchema.shapes.Shopify_ProductConnection.shape, ['edges', 'node']) // finds Shopify_Product
+ */
+
+export function findShapeAtPath(projectSchema, propSchema, queryPath) {
+  const result = findSchemaAtPath(projectSchema, propSchema, queryPath);
+
+  if (result) {
+    const refItem = getRef(projectSchema, result.items ?? result);
+    return refItem && refItemToShape(projectSchema, refItem);
+  }
 }

package/es/util/form-config.js

@@ -1,6 +1,11 @@
 import { deepClone } from '@takeshape/util';
 import { getRefOrItemsRef, refItemToShapeName } from '../refs';
 import { createSchemaPropertyAccessor } from '../schema-util';
+/**
+ * If there any non-normal (nested) forms in the schema, create forms for referenced shapes.
+ * The original forms are left intact.
+ */
+
 export function normalizeForms(projectSchema) {
   const normalizedForms = {};
   const {

package/es/util/has-arg.js

@@ -1,5 +1,5 @@
-import { createSchemaPropertyAccessor } from '../schema-util';
-export function hasArg(projectSchema, prop, argName) {
+import { findSchemaAtPath } from './find-shape-at-path';
+export function hasArg(projectSchema, prop, argPath) {
   var _projectSchema$shapes;
 
   const args = 'args' in prop ? prop.args : prop['@args'];
@@ -9,6 +9,6 @@ export function hasArg(projectSchema, prop, argName) {
   }
 
   const schema = typeof args === 'string' ? (_projectSchema$shapes = projectSchema.shapes[args]) === null || _projectSchema$shapes === void 0 ? void 0 : _projectSchema$shapes.schema : args;
-  const schemaPropertyAccessor = createSchemaPropertyAccessor(projectSchema, schema);
-  return Boolean(schemaPropertyAccessor.getValue(argName));
+  const pathArray = Array.isArray(argPath) ? argPath : argPath.split('.');
+  return Boolean(findSchemaAtPath(projectSchema, schema, pathArray));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "8.168.0",
+  "version": "8.173.0",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -21,9 +21,9 @@
     "examples"
   ],
   "dependencies": {
-    "@takeshape/errors": "8.168.0",
-    "@takeshape/json-schema": "8.168.0",
-    "@takeshape/util": "8.168.0",
+    "@takeshape/errors": "8.173.0",
+    "@takeshape/json-schema": "8.173.0",
+    "@takeshape/util": "8.173.0",
     "ajv": "^8.10.0",
     "ajv-formats": "^2.1.1",
     "blueimp-md5": "^2.10.0",