@takeshape/schema 8.130.2 → 8.132.0

package/dist/template-shapes/where.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"where.d.ts","sourceRoot":"","sources":["../../../src/template-shapes/where.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAY,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAC,cAAc,EAAE,aAAa,EAAE,KAAK,EAAC,MAAM,mBAAmB,CAAC;AAI5E,OAAO,EAAC,YAAY,EAAE,QAAQ,EAAC,MAAM,mBAAmB,CAAC;AAczD,OAAO,EAAC,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAKzC,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,yBAAyB,sBAAgB,OAA0C,CAAC;AAEjG,aAAK,qBAAqB,GAAG,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE5F,aAAK,UAAU,GAAG,KAAK,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;AAExC,cAAM,UAAU;IACd,MAAM,0BAAiC;IACvC,UAAU,cAAqB;IAE/B,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI/B,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAO/C,UAAU,IAAI,QAAQ;CAiBvB;AAED,eAAO,MAAM,mBAAmB,EAAE,MAAM,CACtC,MAAM,EACN;IAAC,WAAW,EAAE,qBAAqB,EAAE,CAAC;IAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAA;CAAC,CAW1F,CAAC;AACF,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CASzD,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAuB,CAAC;AACrD,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAIvD,CAAC;AAqBF,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAc/F;AAsGD,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,qBAAqB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACpC,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAgBD,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAkBrH;AAYD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,eAAe,GACvB,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAkFvC;AAkED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,gBAAgB,CA4BrG;AAED,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,KAAK,EAAE,GACtB;IAAC,MAAM,EAAE,YAAY,CAAC;IAAC,YAAY,EAAE,QAAQ,CAAA;CAAC,CAchD"}
+{"version":3,"file":"where.d.ts","sourceRoot":"","sources":["../../../src/template-shapes/where.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAY,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAC,cAAc,EAAE,aAAa,EAAE,KAAK,EAAC,MAAM,mBAAmB,CAAC;AAU5E,OAAO,EAAC,YAAY,EAAE,QAAQ,EAAC,MAAM,mBAAmB,CAAC;AAczD,OAAO,EAAC,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAKzC,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,yBAAyB,sBAAgB,OAA0C,CAAC;AAEjG,aAAK,qBAAqB,GAAG,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE5F,aAAK,UAAU,GAAG,KAAK,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;AAExC,cAAM,UAAU;IACd,MAAM,0BAAiC;IACvC,UAAU,cAAqB;IAE/B,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI/B,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAO/C,UAAU,IAAI,QAAQ;CAiBvB;AAED,eAAO,MAAM,mBAAmB,EAAE,MAAM,CACtC,MAAM,EACN;IAAC,WAAW,EAAE,qBAAqB,EAAE,CAAC;IAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAA;CAAC,CAW1F,CAAC;AACF,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CASzD,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAuB,CAAC;AACrD,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAIvD,CAAC;AAqBF,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAc/F;AAsGD,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,qBAAqB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACpC,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAwBD,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA2BrH;AAYD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,eAAe,GACvB,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAyFvC;AAkED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,gBAAgB,CA4BrG;AAED,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,KAAK,EAAE,GACtB;IAAC,MAAM,EAAE,YAAY,CAAC;IAAC,YAAY,EAAE,QAAQ,CAAA;CAAC,CAchD"}

package/dist/template-shapes/where.js

@@ -291,8 +291,14 @@ function getTypeName(name, prop, shapeName, context) {
   return `TSWhere${(0, _util.pascalCase)(type)}`;
 }
 
-function skipField(name, prop, projectSchema, exceededRelationshipDepth) {
-  return Boolean(prop['@sensitive'] || prop['@resolver'] || prop['@relationship'] && exceededRelationshipDepth || (name === '_enabled' || name === '_enabledAt') && (0, _apiVersion.workflowsEnabled)(projectSchema.apiVersion));
+function skipField({
+  name,
+  prop,
+  workflowsEnabled,
+  exceededRelationshipDepth,
+  isIndexedShape
+}) {
+  return Boolean(prop['@sensitive'] || !isIndexedShape && prop['@resolver'] || prop['@relationship'] && exceededRelationshipDepth || (name === '_enabled' || name === '_enabledAt') && workflowsEnabled);
 }
 
 function getFields(typeName, shapes, context) {
@@ -309,7 +315,13 @@ function getFields(typeName, shapes, context) {
   };
 
   for (const shape of shapes) {
-    const nodes = (0, _schemaUtil.createSchemaPropertyList)(projectSchema, shape).filterBy(([name, property]) => !skipField(name, property, projectSchema, tooDeep)).getNodes();
+    const nodes = (0, _schemaUtil.createSchemaPropertyList)(projectSchema, shape).filterBy(([name, prop]) => !skipField({
+      name,
+      prop,
+      workflowsEnabled: (0, _apiVersion.workflowsEnabled)(projectSchema.apiVersion),
+      isIndexedShape: (0, _schemaUtil.isIndexedRemoteShape)(projectSchema, shape),
+      exceededRelationshipDepth: exceededRelationshipDepth(relationshipDepth)
+    })).getNodes();
 
     for (const [name, property] of nodes) {
       Object.assign(result, getPropertyComparisonType(name, property, shape.name, fieldContext));
@@ -343,7 +355,13 @@ function getPropertyComparisonType(name, prop, shapeName, context) {
     conflictingProperties
   } = context;
 
-  if (skipField(name, prop, projectSchema, exceededRelationshipDepth(relationshipDepth))) {
+  if (skipField({
+    name,
+    prop,
+    workflowsEnabled: (0, _apiVersion.workflowsEnabled)(projectSchema.apiVersion),
+    isIndexedShape: (0, _schemaUtil.isIndexedRemoteShape)(projectSchema, projectSchema.shapes[shapeName]),
+    exceededRelationshipDepth: exceededRelationshipDepth(relationshipDepth)
+  })) {
     return undefined;
   }
 
@@ -381,7 +399,6 @@ function getPropertyComparisonType(name, prop, shapeName, context) {
       } else if ((0, _unions.isUnionSchema)(propOrItems)) {
         const shapes = (0, _unions.enumerateOneOfKeys)(projectSchema, propOrItems.oneOf).map(option => projectSchema.shapes[option.shapeName]);
         props = getFields(typeName, shapes, { ...context,
-          relationshipDepth,
           booleanOperators: false
         });
       } else if (fieldType === 'object' || fieldType === 'array' && ((_prop$items = prop.items) === null || _prop$items === void 0 ? void 0 : _prop$items.type) === 'object') {

package/es/template-shapes/where.js

@@ -1,7 +1,7 @@
 import { pascalCase, isDefined } from '@takeshape/util';
 import unset from 'lodash/unset';
 import isFunction from 'lodash/isFunction';
-import { createSchemaPropertyList, createShape, getAllRefsInShapes, getShapeById } from '../schema-util';
+import { createSchemaPropertyList, createShape, getAllRefsInShapes, getShapeById, isIndexedRemoteShape } from '../schema-util';
 import { workflowsEnabled } from '../api-version';
 import { followRef, getRef, getRefOrItemsRef, hasRefProperty, hasResolvableRef, refItemToShape, refItemToShapeName } from '../refs';
 import { enumerateOneOfKeys, isUnionSchema } from '../unions';
@@ -258,8 +258,14 @@ function getTypeName(name, prop, shapeName, context) {
   return `TSWhere${pascalCase(type)}`;
 }
 
-function skipField(name, prop, projectSchema, exceededRelationshipDepth) {
-  return Boolean(prop['@sensitive'] || prop['@resolver'] || prop['@relationship'] && exceededRelationshipDepth || (name === '_enabled' || name === '_enabledAt') && workflowsEnabled(projectSchema.apiVersion));
+function skipField({
+  name,
+  prop,
+  workflowsEnabled,
+  exceededRelationshipDepth,
+  isIndexedShape
+}) {
+  return Boolean(prop['@sensitive'] || !isIndexedShape && prop['@resolver'] || prop['@relationship'] && exceededRelationshipDepth || (name === '_enabled' || name === '_enabledAt') && workflowsEnabled);
 }
 
 export function getFields(typeName, shapes, context) {
@@ -276,7 +282,13 @@ export function getFields(typeName, shapes, context) {
   };
 
   for (const shape of shapes) {
-    const nodes = createSchemaPropertyList(projectSchema, shape).filterBy(([name, property]) => !skipField(name, property, projectSchema, tooDeep)).getNodes();
+    const nodes = createSchemaPropertyList(projectSchema, shape).filterBy(([name, prop]) => !skipField({
+      name,
+      prop,
+      workflowsEnabled: workflowsEnabled(projectSchema.apiVersion),
+      isIndexedShape: isIndexedRemoteShape(projectSchema, shape),
+      exceededRelationshipDepth: exceededRelationshipDepth(relationshipDepth)
+    })).getNodes();
 
     for (const [name, property] of nodes) {
       Object.assign(result, getPropertyComparisonType(name, property, shape.name, fieldContext));
@@ -310,7 +322,13 @@ export function getPropertyComparisonType(name, prop, shapeName, context) {
     conflictingProperties
   } = context;
 
-  if (skipField(name, prop, projectSchema, exceededRelationshipDepth(relationshipDepth))) {
+  if (skipField({
+    name,
+    prop,
+    workflowsEnabled: workflowsEnabled(projectSchema.apiVersion),
+    isIndexedShape: isIndexedRemoteShape(projectSchema, projectSchema.shapes[shapeName]),
+    exceededRelationshipDepth: exceededRelationshipDepth(relationshipDepth)
+  })) {
     return undefined;
   }
 
@@ -348,7 +366,6 @@ export function getPropertyComparisonType(name, prop, shapeName, context) {
       } else if (isUnionSchema(propOrItems)) {
         const shapes = enumerateOneOfKeys(projectSchema, propOrItems.oneOf).map(option => projectSchema.shapes[option.shapeName]);
         props = getFields(typeName, shapes, { ...context,
-          relationshipDepth,
           booleanOperators: false
         });
       } else if (fieldType === 'object' || fieldType === 'array' && ((_prop$items = prop.items) === null || _prop$items === void 0 ? void 0 : _prop$items.type) === 'object') {

package/package.json

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