@takeshape/schema 8.87.2 → 8.89.2

package/es/schemas/project-schema.json

@@ -69,6 +69,9 @@
     {
       "$ref": "https://schema.takeshape.io/project-schema/v3.16.0#"
     },
+    {
+      "$ref": "https://schema.takeshape.io/project-schema/v3.17.0#"
+    },
     {
       "$ref": "https://schema.takeshape.io/project-schema/v4.0.0#"
     }

package/es/template-shapes/where.js

@@ -281,7 +281,7 @@ function getTypeName(name, prop, shapeName, context) {
 }
 
 function skipField(name, prop, projectSchema, exceededRelationshipDepth) {
-  return Boolean(prop['@user'] || prop['@sensitive'] || prop['@resolver'] || prop['@relationship'] && exceededRelationshipDepth || (name === '_enabled' || name === '_enabledAt') && workflowsEnabled(projectSchema.apiVersion));
+  return Boolean(prop['@sensitive'] || prop['@resolver'] || prop['@relationship'] && exceededRelationshipDepth || (name === '_enabled' || name === '_enabledAt') && workflowsEnabled(projectSchema.apiVersion));
 }
 
 export function getFields(typeName, shapes, context) {

package/es/validate.js

@@ -193,7 +193,7 @@ function validateResolver(projectSchema, basePath, resolver) {
       }
 
       if (resolver.name.startsWith('takeshape')) {
-        var _options, _indexedShapes;
+        var _options;
 
         let shapeName;
 
@@ -205,14 +205,18 @@ function validateResolver(projectSchema, basePath, resolver) {
           shapeName = resolver.shapeName;
         }
 
-        const modelShape = shapeName ? projectSchema.shapes[shapeName] : undefined;
+        if (shapeName) {
+          var _indexedShapes;
 
-        if (!(modelShape !== null && modelShape !== void 0 && modelShape.model) && !(shapeName && (_indexedShapes = projectSchema.indexedShapes) !== null && _indexedShapes !== void 0 && _indexedShapes[shapeName])) {
-          errors.push({
-            type: 'notFound',
-            path: basePath.concat(['options', 'model']),
-            message: `Invalid Model Shape "${shapeName ?? ''}"`
-          });
+          const modelShape = projectSchema.shapes[shapeName];
+
+          if (!(modelShape !== null && modelShape !== void 0 && modelShape.model) && !(shapeName && (_indexedShapes = projectSchema.indexedShapes) !== null && _indexedShapes !== void 0 && _indexedShapes[shapeName])) {
+            errors.push({
+              type: 'notFound',
+              path: basePath.concat(['options', 'model']),
+              message: `Invalid Model Shape "${shapeName ?? ''}"`
+            });
+          }
         }
       }
     } else {