@takeshape/schema 9.47.0 → 9.49.0

package/es/schemas/project-schema/v3.4.0.json

@@ -1,10 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://schema.takeshape.io/project-schema/v3.4.0#",
-  "title": "Project Schema",
+  "title": "Project Schema JSON",
   "definitions": {
     "shape": {
-      "title": "Shape",
+      "title": "Shape JSON",
       "description": "A Shape is a schema object for structuring and storing data from one or more sources, including the TakeShape data store and connected services",
       "type": "object",
       "properties": {
@@ -317,7 +317,7 @@
       "additionalProperties": false
     },
     "storedServiceConfig": {
-      "title": "Stored Service Config",
+      "title": "Service Config JSON",
       "type": "object",
       "properties": {
         "id": {
@@ -369,7 +369,7 @@
       ]
     },
     "storedServiceMap": {
-      "title": "Stored Service Map",
+      "title": "Service Map JSON",
       "type": "object",
       "patternProperties": {
         "[0-9A-Za-z_-]+": {

package/es/schemas/project-schema/v3.5.0.json

@@ -1,10 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://schema.takeshape.io/project-schema/v3.5.0#",
-  "title": "Project Schema",
+  "title": "Project Schema JSON",
   "definitions": {
     "shape": {
-      "title": "Shape",
+      "title": "Shape JSON",
       "description": "A Shape is a schema object for structuring and storing data from one or more sources, including the TakeShape data store and connected services",
       "type": "object",
       "properties": {
@@ -317,7 +317,7 @@
       "additionalProperties": false
     },
     "storedServiceConfig": {
-      "title": "Stored Service Config",
+      "title": "Service Config JSON",
       "type": "object",
       "properties": {
         "id": {
@@ -369,7 +369,7 @@
       ]
     },
     "storedServiceMap": {
-      "title": "Stored Service Map",
+      "title": "Service Map JSON",
       "type": "object",
       "patternProperties": {
         "[0-9A-Za-z_-]+": {

package/es/schemas/project-schema/v3.5.1.json

@@ -1,10 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://schema.takeshape.io/project-schema/v3.5.1#",
-  "title": "Project Schema",
+  "title": "Project Schema JSON",
   "definitions": {
     "shape": {
-      "title": "Shape",
+      "title": "Shape JSON",
       "description": "A Shape is a schema object for structuring and storing data from one or more sources, including the TakeShape data store and connected services",
       "type": "object",
       "properties": {
@@ -317,7 +317,7 @@
       "additionalProperties": false
     },
     "storedServiceConfig": {
-      "title": "Stored Service Config",
+      "title": "Service Config JSON",
       "type": "object",
       "properties": {
         "id": {
@@ -369,7 +369,7 @@
       ]
     },
     "storedServiceMap": {
-      "title": "Stored Service Map",
+      "title": "Service Map JSON",
       "type": "object",
       "patternProperties": {
         "[0-9A-Za-z_-]+": {

package/es/schemas/project-schema/v3.6.0.json

@@ -1,10 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://schema.takeshape.io/project-schema/v3.6.0#",
-  "title": "Project Schema",
+  "title": "Project Schema JSON",
   "definitions": {
     "shape": {
-      "title": "Shape",
+      "title": "Shape JSON",
       "description": "A Shape is a schema object for structuring and storing data from one or more sources, including the TakeShape data store and connected services",
       "type": "object",
       "properties": {
@@ -333,7 +333,7 @@
       "additionalProperties": false
     },
     "storedServiceConfig": {
-      "title": "Stored Service Config",
+      "title": "Service Config JSON",
       "type": "object",
       "properties": {
         "id": {
@@ -385,7 +385,7 @@
       ]
     },
     "storedServiceMap": {
-      "title": "Stored Service Map",
+      "title": "Service Map JSON",
       "type": "object",
       "patternProperties": {
         "[0-9A-Za-z_-]+": {

package/es/schemas/project-schema/v3.7.0.json

@@ -1,10 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://schema.takeshape.io/project-schema/v3.7.0#",
-  "title": "Project Schema",
+  "title": "Project Schema JSON",
   "definitions": {
     "shape": {
-      "title": "Shape",
+      "title": "Shape JSON",
       "description": "A Shape is a schema object for structuring and storing data from one or more sources, including the TakeShape data store and connected services",
       "type": "object",
       "properties": {
@@ -333,7 +333,7 @@
       "additionalProperties": false
     },
     "storedServiceConfig": {
-      "title": "Stored Service Config",
+      "title": "Service Config JSON",
       "type": "object",
       "properties": {
         "id": {
@@ -385,7 +385,7 @@
       ]
     },
     "storedServiceMap": {
-      "title": "Stored Service Map",
+      "title": "Service Map JSON",
       "type": "object",
       "patternProperties": {
         "[0-9A-Za-z_-]+": {

package/es/schemas/project-schema/v3.8.0.json

@@ -1,10 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://schema.takeshape.io/project-schema/v3.8.0#",
-  "title": "Project Schema",
+  "title": "Project Schema JSON",
   "definitions": {
     "shape": {
-      "title": "Shape",
+      "title": "Shape JSON",
       "description": "A Shape is a schema object for structuring and storing data from one or more sources, including the TakeShape data store and connected services",
       "type": "object",
       "properties": {
@@ -346,7 +346,7 @@
       "additionalProperties": false
     },
     "storedServiceConfig": {
-      "title": "Stored Service Config",
+      "title": "Service Config JSON",
       "type": "object",
       "properties": {
         "id": {
@@ -398,7 +398,7 @@
       ]
     },
     "storedServiceMap": {
-      "title": "Stored Service Map",
+      "title": "Service Map JSON",
       "type": "object",
       "patternProperties": {
         "[0-9A-Za-z_-]+": {

package/es/schemas/project-schema/v3.9.0.json

@@ -1,10 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://schema.takeshape.io/project-schema/v3.9.0#",
-  "title": "Project Schema",
+  "title": "Project Schema JSON",
   "definitions": {
     "shape": {
-      "title": "Shape",
+      "title": "Shape JSON",
       "description": "A Shape is a schema object for structuring and storing data from one or more sources, including the TakeShape data store and connected services",
       "type": "object",
       "properties": {
@@ -346,7 +346,7 @@
       "additionalProperties": false
     },
     "storedServiceConfig": {
-      "title": "Stored Service Config",
+      "title": "Service Config JSON",
       "type": "object",
       "properties": {
         "id": {
@@ -398,7 +398,7 @@
       ]
     },
     "storedServiceMap": {
-      "title": "Stored Service Map",
+      "title": "Service Map JSON",
       "type": "object",
       "patternProperties": {
         "[0-9A-Za-z_-]+": {

package/es/schemas/project-schema/v4.0.0.json

@@ -1284,7 +1284,7 @@
       "oneOf": [{"$ref": "#/definitions/basicResolver"}, {"$ref": "#/definitions/composeResolver"}]
     },
     "query": {
-      "title": "Query",
+      "title": "Query JSON",
       "type": "object",
       "properties": {
         "args": {
@@ -1457,7 +1457,7 @@
       "additionalProperties": false
     },
     "shape": {
-      "title": "Shape",
+      "title": "Shape JSON",
       "description": "A Shape is a schema object for structuring and storing data from one or more sources, including the TakeShape data store and connected services",
       "type": "object",
       "properties": {
@@ -1800,7 +1800,7 @@
       "additionalProperties": false
     },
     "storedServiceConfig": {
-      "title": "Stored Service Config",
+      "title": "Service Config JSON",
       "type": "object",
       "properties": {
         "title": {
@@ -1848,7 +1848,7 @@
       ]
     },
     "storedServiceMap": {
-      "title": "Stored Service Map",
+      "title": "Service Map JSON",
       "type": "object",
       "patternProperties": {
         "[0-9A-Za-z_-]+": {
@@ -2227,7 +2227,7 @@
       ]
     }
   },
-  "title": "Project Schema",
+  "title": "Project Schema JSON",
   "type": "object",
   "properties": {
     "$schema": {

package/es/schemas/project-schema.json

@@ -132,6 +132,9 @@
     {
       "$ref": "https://schema.takeshape.io/project-schema/v3.34.0#"
     },
+    {
+      "$ref": "https://schema.takeshape.io/project-schema/v3.35.0#"
+    },
     {
       "$ref": "https://schema.takeshape.io/project-schema/v4.0.0#"
     }

package/es/services.js

@@ -34,12 +34,12 @@ export function decryptServiceConfig(decryptFn, storedServiceConfig) {
   };
 }
 /**
- * Given a `StoredServiceMap` returns a usable `ServiceMap` with all the
+ * Given a `ServiceMapJSON` returns a usable `ServiceMap` with all the
  * authentication objects decrypted.
  */
 
-export async function decryptServiceMap(decryptFn, storedServiceMap) {
-  return Object.entries(storedServiceMap).reduce((result, [serviceKey, serviceConfig]) => {
+export async function decryptServiceMap(decryptFn, ServiceMapJSON) {
+  return Object.entries(ServiceMapJSON).reduce((result, [serviceKey, serviceConfig]) => {
     return result.set(serviceKey, decryptServiceConfig(decryptFn, serviceConfig));
   }, new Map());
 }

package/es/types/utils.js

@@ -294,4 +294,7 @@ export function getCachedShapeMap(shapes) {
   }
 
   return results;
+}
+export function isMeshShape(shape) {
+  return Boolean(shape.joins);
 }

package/es/util/get-return-shape.js

@@ -23,6 +23,9 @@ function getReturnShapeHelper(projectSchema, propOrQuery) {
   return shape;
 }
 
+export function getReturnShapeRef(context, propOrQuery) {
+  return isQuery(propOrQuery) ? parseReturnShape(context, propOrQuery.shape).ref : getRef(context, propOrQuery);
+}
 const cache = new WeakMap();
 export function getReturnShape(projectSchema, propOrQuery) {
   let result = cache.get(propOrQuery);

package/es/validate.js

@@ -16,7 +16,7 @@ import { getAllRefs } from './schema-util';
 import { builtInShapes } from './builtin-schema';
 import { isValidTemplate } from './template-shapes';
 import { isBasicResolver, isComposeResolver, isExtendsSchema, isObjectSchema } from './types/utils';
-import { refItemToShapeName, getRefShapeName, parsePropertyRef, propertyRefItemToResolverPath, createGetNamespace, propertyRefItemToPath } from './refs';
+import { refItemToShapeName, getRefShapeName, parsePropertyRef, propertyRefItemToResolverPath, createGetNamespace, propertyRefItemToPath, atRefToRefItem, refItemToShape } from './refs';
 import { scalars } from './scalars';
 import { isUnionSchema } from './unions';
 import { isEnumLikeSchema } from './enum';
@@ -438,6 +438,78 @@ async function validateQueryConfigs(context, projectSchema) {
   return flatten(await Promise.all(promises));
 }
 
+function listShapeJoins(projectSchema) {
+  const joins = [];
+
+  for (const shapeKey of Object.keys(projectSchema.shapes)) {
+    const shape = projectSchema.shapes[shapeKey];
+
+    if ('joins' in shape) {
+      for (const joinRef of Object.keys(shape.joins)) {
+        const join = shape.joins[joinRef];
+        joins.push({
+          ref: joinRef,
+          path: ['shapes', shapeKey, 'joins', joinRef],
+          join
+        });
+      }
+    }
+  }
+
+  return joins;
+}
+
+function validateLocalShapeJoinRef(projectSchema, item) {
+  const refItem = atRefToRefItem(projectSchema, item.ref);
+
+  if (refItem.serviceKey === 'local') {
+    const shape = refItemToShape(projectSchema, refItem);
+
+    if (!shape) {
+      return [{
+        type: 'notFound',
+        path: item.path,
+        message: `Invalid join "${item.ref}" not found`
+      }];
+    }
+  }
+
+  return [];
+}
+
+function validateLocalShapeJoins(projectSchema) {
+  return listShapeJoins(projectSchema).flatMap(item => validateLocalShapeJoinRef(projectSchema, item).concat(validateResolver(projectSchema, item.path.concat('resolver'), item.join.resolver)));
+}
+
+async function validateShapeJoinRef(context, projectSchema, item) {
+  const refItem = atRefToRefItem(projectSchema, item.ref);
+
+  if (refItem) {
+    const layer = await context.resolveLayer(refItem.serviceKey);
+    const valid = isValidRef(context, projectSchema, layer, refItem);
+
+    if (!valid) {
+      return [{
+        type: 'notFound',
+        path: item.path,
+        message: `Invalid join "${item.ref}" not found`
+      }];
+    }
+  }
+
+  return [];
+}
+
+async function validateShapeJoins(context, projectSchema) {
+  const promises = [];
+
+  for (const item of listShapeJoins(projectSchema)) {
+    promises.push(validateShapeJoinRef(context, projectSchema, item), validateResolverReferences(context, projectSchema, item.path, item.join.resolver));
+  }
+
+  return flatten(await Promise.all(promises));
+}
+
 function validateIndexedShapeConfig(projectSchema, shapeName, config) {
   var _config$queries;
 
@@ -633,6 +705,15 @@ function validateLocalRefs(projectSchema) {
   return errors;
 }
 
+function isValidRef(context, projectSchema, layer, item) {
+  const {
+    serviceKey: layerId
+  } = item;
+  const shapeName = refItemToShapeName(item);
+  const localShapeExists = Boolean(projectSchema.shapes[shapeName]) || builtInShapeNames.has(shapeName);
+  return layerId === 'local' ? localShapeExists : localShapeExists || isValidShapeReference(context, layer, shapeName);
+}
+
 async function validateRefs(context, projectSchema) {
   const {
     resolveLayer
@@ -661,9 +742,7 @@ async function validateRefs(context, projectSchema) {
     const {
       serviceKey: layerId
     } = item;
-    const shapeName = refItemToShapeName(item);
-    const localShapeExists = Boolean(projectSchema.shapes[shapeName]) || builtInShapeNames.has(shapeName);
-    const valid = layerId === 'local' ? localShapeExists : localShapeExists || isValidShapeReference(context, layersById[layerId], shapeName);
+    const valid = isValidRef(context, projectSchema, layersById[layerId], item);
 
     if (!valid) {
       errors.push({
@@ -1022,13 +1101,13 @@ const validators = [{
   validateSyntax(schemaVersion, context, obj) {
     const schema = obj;
     let errors = [];
-    errors = errors.concat(checkShapeNames(schema.shapes)).concat(checkShapeIds(schema.shapes)).concat(validateWorkflowsV3(schema)).concat(validateLocalQueryConfigs(schema)).concat(validateLocalRefs(schema)).concat(validateDirectives(schema)).concat(validateLocales(schema)).concat(checkWorkflowStepNames(schema.workflows)).concat(checkWorkflowStepKeys(schema.workflows)).concat(validateOneOfs(schema)).concat(validateIndexedShapes(schema)).concat(validateInterfaces(schema)).concat(validateInterfaceImplementations(schema));
+    errors = errors.concat(checkShapeNames(schema.shapes)).concat(checkShapeIds(schema.shapes)).concat(validateWorkflowsV3(schema)).concat(validateLocalQueryConfigs(schema)).concat(validateLocalRefs(schema)).concat(validateLocalShapeJoins(schema)).concat(validateDirectives(schema)).concat(validateLocales(schema)).concat(checkWorkflowStepNames(schema.workflows)).concat(checkWorkflowStepKeys(schema.workflows)).concat(validateOneOfs(schema)).concat(validateIndexedShapes(schema)).concat(validateInterfaces(schema)).concat(validateInterfaceImplementations(schema));
     return formatValidationResult(context, errors, schema);
   },
 
   async validateReferences(schemaVersion, context, obj) {
     const schema = obj;
-    const errors = flatten(await Promise.all([validateRefs(context, schema), validateQueryConfigs(context, schema)]));
+    const errors = flatten(await Promise.all([validateRefs(context, schema), validateQueryConfigs(context, schema), validateShapeJoins(context, schema)]));
     return formatValidationResult(context, errors, schema);
   }
 

package/examples/latest/betzino.json

@@ -52781,6 +52781,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

package/examples/latest/blog-schema.json

@@ -399,6 +399,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

package/examples/latest/brewery-schema.json

@@ -387,6 +387,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

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

@@ -4350,6 +4350,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

package/examples/latest/complex-schema.json

@@ -15,7 +15,7 @@
   "apiVersion": "1",
   "queries": {},
   "mutations": {},
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "shapes": {
     "DocumentUploadForm": {
       "id": "HJPFlRKkr",

package/examples/latest/fabric-ecommerce.json

@@ -10474,5 +10474,5 @@
       }
     }
   },
-  "schemaVersion": "3.34.0"
+  "schemaVersion": "3.35.0"
 }

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

@@ -23446,6 +23446,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

package/examples/latest/klirr-schema.json

@@ -35163,6 +35163,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

package/examples/latest/massive-schema.json

@@ -8053,6 +8053,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

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

@@ -1884,6 +1884,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

package/examples/latest/one-earth.json

@@ -14766,6 +14766,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

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

@@ -388,6 +388,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

package/examples/latest/post-schema.json

@@ -226,6 +226,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

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

@@ -9756,5 +9756,5 @@
       }
     }
   },
-  "schemaVersion": "3.34.0"
+  "schemaVersion": "3.35.0"
 }

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

@@ -806,6 +806,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

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

@@ -142,6 +142,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

package/examples/latest/recursive-schema.json

@@ -149,6 +149,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

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

@@ -2633,5 +2633,5 @@
       }
     }
   },
-  "schemaVersion": "3.34.0"
+  "schemaVersion": "3.35.0"
 }

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

@@ -2105,5 +2105,5 @@
       }
     }
   },
-  "schemaVersion": "3.34.0"
+  "schemaVersion": "3.35.0"
 }

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

@@ -91,5 +91,5 @@
       }
     }
   },
-  "schemaVersion": "3.34.0"
+  "schemaVersion": "3.35.0"
 }

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

@@ -397,6 +397,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

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

@@ -1129,6 +1129,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

package/examples/latest/shape-books.json

@@ -1129,6 +1129,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "services": {}
 }

package/examples/latest/shape-editor-schema-edited.json

@@ -1004,6 +1004,6 @@
       }
     }
   },
-  "schemaVersion": "3.34.0",
+  "schemaVersion": "3.35.0",
   "apiVersion": "2"
-}
+}