@takeshape/schema 9.36.4 → 9.38.0

package/es/schemas/project-schema.json

@@ -114,11 +114,17 @@
     {
       "$ref": "https://schema.takeshape.io/project-schema/v3.28.0#"
     },
+    {
+      "$ref": "https://schema.takeshape.io/project-schema/v3.29.0#"
+    },
     {
       "$ref": "https://schema.takeshape.io/project-schema/v3.30.0#"
     },
+    {
+      "$ref": "https://schema.takeshape.io/project-schema/v3.31.0#"
+    },
     {
       "$ref": "https://schema.takeshape.io/project-schema/v4.0.0#"
     }
   ]
-}
+}

package/es/types/utils.js

@@ -26,6 +26,7 @@ export function isComposeResolver(resolver) {
 const {
   definitions: {
     takeshapeResolver,
+    shapedbResolver,
     utilResolver,
     graphqlResolver,
     restResolver,
@@ -35,6 +36,9 @@ const {
 export function isTakeshapeResolver(resolver) {
   return isBasicResolver(resolver) && takeshapeResolver.properties.name.enum.includes(resolver.name);
 }
+export function isShapedbResolver(resolver) {
+  return isBasicResolver(resolver) && shapedbResolver.properties.name.enum.includes(resolver.name);
+}
 export function isGraphqlResolver(resolver) {
   return isBasicResolver(resolver) && graphqlResolver.properties.name.enum.includes(resolver.name);
 }
@@ -166,7 +170,7 @@ export function isAllOfSchema(propertySchema) {
   return isArray(propertySchema.allOf);
 }
 export function isExtendsSchema(propertySchema) {
-  return isArray(propertySchema.extends);
+  return isRecord(propertySchema) && isArray(propertySchema.extends);
 }
 export function isOneOfSchema(propertySchema) {
   return isArray(propertySchema.oneOf);
@@ -181,7 +185,7 @@ export function isReturnShapeArraySchema(returnShape) {
   return typeof returnShape === 'object' && returnShape.type === 'array';
 }
 export function isObjectSchema(propertySchema) {
-  return propertySchema.type === 'object' && isRecord(propertySchema.properties);
+  return isRecord(propertySchema) && propertySchema.type === 'object' && isRecord(propertySchema.properties);
 }
 /** Service Config Utils **/
 
@@ -274,5 +278,5 @@ export const getRefType = refSchema => {
 export function isPropertySchemaWithRelationship(schema) {
   var _schema$Resolver;
 
-  return ((_schema$Resolver = schema['@resolver']) === null || _schema$Resolver === void 0 ? void 0 : _schema$Resolver.name) === 'takeshape:getRelated';
+  return ((_schema$Resolver = schema['@resolver']) === null || _schema$Resolver === void 0 ? void 0 : _schema$Resolver.name) === 'shapedb:getRelated';
 }

package/es/validate.js

@@ -184,7 +184,8 @@ function enumerateBasicResolvers(resolver, path) {
 
   visit(resolver, path);
   return results;
-}
+} // eslint-disable-next-line complexity
+
 
 function validateResolver(projectSchema, basePath, baseResolver) {
   const errors = [];
@@ -228,13 +229,22 @@ function validateResolver(projectSchema, basePath, baseResolver) {
   };
 
   const isLessThanV3_9_0 = lt(getSemver(projectSchema.schemaVersion), '3.9.0');
+  const isLessThanV3_31_0 = lt(getSemver(projectSchema.schemaVersion), '3.31.0');
   const getNamespace = createGetNamespace(projectSchema);
 
   for (const [resolver, path] of enumerateBasicResolvers(baseResolver, basePath)) {
     if (isBasicResolver(resolver)) {
-      var _projectSchema$servic;
+      var _projectSchema$servic, _projectSchema$servic2;
+
+      if (isLessThanV3_31_0 && 'service' in resolver && resolver.service !== 'takeshape:local' && !((_projectSchema$servic = projectSchema.services) !== null && _projectSchema$servic !== void 0 && _projectSchema$servic[resolver.service])) {
+        errors.push({
+          type: 'notFound',
+          path: path.concat(['service']),
+          message: `Invalid service "${resolver.service}"`
+        });
+      }
 
-      if ('service' in resolver && resolver.service !== 'takeshape:local' && !((_projectSchema$servic = projectSchema.services) !== null && _projectSchema$servic !== void 0 && _projectSchema$servic[resolver.service])) {
+      if (!isLessThanV3_31_0 && 'service' in resolver && resolver.service !== 'shapedb' && resolver.service !== 'takeshape' && !((_projectSchema$servic2 = projectSchema.services) !== null && _projectSchema$servic2 !== void 0 && _projectSchema$servic2[resolver.service])) {
         errors.push({
           type: 'notFound',
           path: path.concat(['service']),