@takeshape/schema 8.218.3 → 8.219.0

package/es/schemas/project-schema.json

@@ -96,6 +96,9 @@
     {
       "$ref": "https://schema.takeshape.io/project-schema/v3.22.0#"
     },
+    {
+      "$ref": "https://schema.takeshape.io/project-schema/v3.23.0#"
+    },
     {
       "$ref": "https://schema.takeshape.io/project-schema/v4.0.0#"
     }

package/es/services.js

@@ -1,4 +1,4 @@
-import { mergeWithArrayMerge } from '@takeshape/util';
+import { isDefined, mergeWithArrayMerge } from '@takeshape/util';
 import { createAjv } from '@takeshape/json-schema';
 import { SchemaValidationError } from '@takeshape/errors';
 import isNull from 'lodash/isNull';
@@ -170,7 +170,7 @@ export function getServiceObjectFields(projectSchema, shape, provider) {
 }
 export function getResolverServices(resolver) {
   const resolverArray = 'compose' in resolver ? resolver.compose : [resolver];
-  return uniq(resolverArray.map(resolver => resolver.service));
+  return uniq(resolverArray.map(resolver => 'service' in resolver ? resolver.service : undefined).filter(isDefined));
 }
 export function isMissingAuth(service) {
   return service.authenticationType !== 'none' && isEmpty(service.authentication);

package/es/types/utils.js

@@ -14,7 +14,10 @@ import satisfies from 'semver/functions/satisfies';
  */
 
 export function isBasicResolver(resolver) {
-  return isString(resolver === null || resolver === void 0 ? void 0 : resolver.name) && isString(resolver.service);
+  return isRecord(resolver) && isString(resolver.name);
+}
+export function isServiceResolver(resolver) {
+  return isRecord(resolver) && isString(resolver.name) && isString(resolver.service);
 }
 export function isComposeResolver(resolver) {
   return Boolean(isArray(resolver === null || resolver === void 0 ? void 0 : resolver.compose) && resolver.compose.length && resolver.compose.every(isBasicResolver));

package/es/util/api-indexing.js

@@ -1,4 +1,4 @@
-import { isBasicResolver } from '../types';
+import { isServiceResolver } from '../types';
 export function serviceHasIndexedShapes(schema, serviceId) {
   for (const config of Object.values(schema.indexedShapes ?? {})) {
     var _config$queries$list;
@@ -6,7 +6,7 @@ export function serviceHasIndexedShapes(schema, serviceId) {
     const queryName = (_config$queries$list = config.queries.list) === null || _config$queries$list === void 0 ? void 0 : _config$queries$list.name;
     const query = queryName && schema.queries[queryName];
 
-    if (query && isBasicResolver(query.resolver) && query.resolver.service === serviceId) {
+    if (query && isServiceResolver(query.resolver) && query.resolver.service === serviceId) {
       return true;
     }
   }

package/es/validate.js

@@ -16,7 +16,7 @@ import { getAllNamespaceShapes, getAllRefsInShapes } from './schema-util';
 import { builtInShapes } from './builtin-schema';
 import { isValidTemplate } from './template-shapes';
 import { isBasicResolver, isComposeResolver, isExtendsSchema, isObjectSchema } from './types/utils';
-import { refItemToAtRef, refItemToShapeName, parseReturnShape, getRefShapeName } from './refs';
+import { refItemToAtRef, refItemToShapeName, parseReturnShape, getRefShapeName, parsePropertyRef, propertyRefItemToPath, createGetNamespace } from './refs';
 import { scalars } from './scalars';
 import { isUnionSchema } from './unions';
 import { isEnumLikeSchema } from './enum';
@@ -194,12 +194,13 @@ function validateResolver(projectSchema, basePath, resolver) {
   };
 
   const isLessThanV3_9_0 = lt(getSemver(projectSchema.schemaVersion), '3.9.0');
+  const getNamespace = createGetNamespace(projectSchema);
 
   const validateBasicResolver = resolver => {
     if (isBasicResolver(resolver)) {
       var _projectSchema$servic;
 
-      if (resolver.service !== 'takeshape:local' && !((_projectSchema$servic = projectSchema.services) !== null && _projectSchema$servic !== void 0 && _projectSchema$servic[resolver.service])) {
+      if ('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: basePath.concat(['service']),
@@ -246,6 +247,28 @@ function validateResolver(projectSchema, basePath, resolver) {
           });
         }
       }
+
+      if (resolver.name === 'delegate') {
+        const parsed = parsePropertyRef(resolver.to);
+
+        if (parsed) {
+          const targetResolver = get(projectSchema, propertyRefItemToPath(getNamespace, parsed));
+
+          if (!isBasicResolver(targetResolver) && !isComposeResolver(targetResolver)) {
+            errors.push({
+              type: 'notFound',
+              path: basePath.concat('to'),
+              message: `Missing resolver config at property ref "${resolver.to}"`
+            });
+          }
+        } else {
+          errors.push({
+            type: 'conflict',
+            path: basePath.concat('to'),
+            message: `Unable to parse property ref "${resolver.to}"`
+          });
+        }
+      }
     } else {
       errors.push({
         type: 'notFound',

package/examples/latest/betzino.json

@@ -52529,6 +52529,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/blog-schema.json

@@ -403,6 +403,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/brewery-schema.json

@@ -386,6 +386,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/complex-project-schema.json

@@ -4189,6 +4189,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/complex-schema.json

@@ -17,7 +17,7 @@
   "apiVersion": "1",
   "queries": {},
   "mutations": {},
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "created": "2019-06-20T12:58:43.119Z",
   "updated": "2020-04-29T10:10:28.182Z",
   "shapes": {

package/examples/latest/fabric-ecommerce.json

@@ -10509,5 +10509,5 @@
       }
     }
   },
-  "schemaVersion": "3.22.0"
+  "schemaVersion": "3.23.0"
 }

package/examples/latest/frank-and-fred-schema.json

@@ -23255,6 +23255,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/klirr-schema.json

@@ -34790,6 +34790,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/massive-schema.json

@@ -7841,6 +7841,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/mill-components-schema.json

@@ -1888,6 +1888,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/one-earth.json

@@ -14220,6 +14220,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/pet-oneof-array.json

@@ -392,6 +392,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/post-schema.json

@@ -230,6 +230,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/pruned-shopify-product-schema.json

@@ -9760,5 +9760,5 @@
       }
     }
   },
-  "schemaVersion": "3.22.0"
+  "schemaVersion": "3.23.0"
 }

package/examples/latest/real-world-schema.json

@@ -1045,6 +1045,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/recursive-repeater-schema.json

@@ -146,6 +146,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/recursive-schema.json

@@ -153,6 +153,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/rick-and-morty-ast.json

@@ -2824,5 +2824,5 @@
       }
     }
   },
-  "schemaVersion": "3.22.0"
+  "schemaVersion": "3.23.0"
 }

package/examples/latest/rick-and-morty-graphql.json

@@ -2296,5 +2296,5 @@
       }
     }
   },
-  "schemaVersion": "3.22.0"
+  "schemaVersion": "3.23.0"
 }

package/examples/latest/rick-and-morty-rest.json

@@ -95,5 +95,5 @@
       }
     }
   },
-  "schemaVersion": "3.22.0"
+  "schemaVersion": "3.23.0"
 }

package/examples/latest/schema-with-repeater-draftjs.json

@@ -401,6 +401,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/shape-books-v3_2_0.json

@@ -1128,6 +1128,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/shape-books.json

@@ -1128,6 +1128,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/shopify-lookbook.json

@@ -1181,5 +1181,5 @@
       }
     }
   },
-  "schemaVersion": "3.22.0"
+  "schemaVersion": "3.23.0"
 }

package/examples/latest/shopify-product-2022-07.json

@@ -9,7 +9,7 @@
     "en-us"
   ],
   "apiVersion": "2",
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "queries": {
     "getAsset": {
       "shape": "Asset",

package/examples/latest/shopify-store-with-widget.json

@@ -12564,5 +12564,5 @@
       }
     }
   },
-  "schemaVersion": "3.22.0"
+  "schemaVersion": "3.23.0"
 }

package/examples/latest/stripe-product-runtime-schema.json

@@ -9,7 +9,7 @@
     "en-us"
   ],
   "apiVersion": "2",
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "queries": {
     "getAsset": {
       "shape": "Asset",

package/examples/latest/stripe-starter-resolved.json

@@ -29320,5 +29320,5 @@
       }
     }
   },
-  "schemaVersion": "3.22.0"
+  "schemaVersion": "3.23.0"
 }

package/examples/latest/user-schema-no-required.json

@@ -169,6 +169,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/examples/latest/user-schema-with-defaults.json

@@ -194,6 +194,6 @@
       }
     }
   },
-  "schemaVersion": "3.22.0",
+  "schemaVersion": "3.23.0",
   "services": {}
 }

package/package.json

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