@takeshape/schema 8.215.4 → 8.217.0

package/es/schemas/project-schema.json

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

package/es/util/api-indexing.js

@@ -12,4 +12,27 @@ export function serviceHasIndexedShapes(schema, serviceId) {
   }
 
   return false;
-}
+}
+
+function getQueryIndexConfigHelper(op) {
+  return ({
+    indexedShapes
+  }, shapeName) => {
+    const indexingConfig = indexedShapes === null || indexedShapes === void 0 ? void 0 : indexedShapes[shapeName];
+
+    if (indexingConfig) {
+      const queryConfig = indexingConfig.queries[op];
+
+      if (queryConfig) {
+        return {
+          shapeName,
+          ...indexingConfig.query,
+          ...queryConfig
+        };
+      }
+    }
+  };
+}
+
+export const getListQueryIndexConfig = getQueryIndexConfigHelper('list');
+export const getGetQueryIndexConfig = getQueryIndexConfigHelper('get');

package/es/validate.js

@@ -307,8 +307,17 @@ function validateQueryConfigs(projectSchema, additionalShapeNames = builtInShape
   return errors;
 }
 
+function hasIdField(selectionSet, idField) {
+  // TODO allow GraphQL parser implementation to be passed in
+  const topLevel = selectionSet.replace(/^\s*{\s*/, '') // remove first {
+  .replace(/\s*}\s*$/, '') // remove last {
+  .replace(/{[^}]*}|:/g, '') // remove nested selections and :
+  .split(/\s+/g);
+  return topLevel.includes(idField);
+}
+
 function validateIndexedShapeConfig(projectSchema, shapeName, config) {
-  var _config$queries;
+  var _config$queries, _config$query;
 
   const errors = [];
   const list = (_config$queries = config.queries) === null || _config$queries === void 0 ? void 0 : _config$queries.list;
@@ -323,6 +332,18 @@ function validateIndexedShapeConfig(projectSchema, shapeName, config) {
     }
   }
 
+  if ((_config$query = config.query) !== null && _config$query !== void 0 && _config$query.selectionSet) {
+    const idField = config.idField ?? 'id';
+
+    if (!hasIdField(config.query.selectionSet, idField)) {
+      errors.push({
+        path: ['indexedShapes', shapeName, 'query', 'selectionSet'],
+        type: 'notFound',
+        message: `selectionSet must contain "${idField}"`
+      });
+    }
+  }
+
   return errors;
 }
 

package/examples/latest/betzino.json

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

package/examples/latest/blog-schema.json

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

package/examples/latest/brewery-schema.json

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

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

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

package/examples/latest/complex-schema.json

@@ -17,7 +17,7 @@
   "apiVersion": "1",
   "queries": {},
   "mutations": {},
-  "schemaVersion": "3.21.0",
+  "schemaVersion": "3.22.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.21.0"
+  "schemaVersion": "3.22.0"
 }

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

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

package/examples/latest/klirr-schema.json

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

package/examples/latest/massive-schema.json

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

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

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

package/examples/latest/one-earth.json

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

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

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

package/examples/latest/post-schema.json

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

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

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

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

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

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

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

package/examples/latest/recursive-schema.json

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

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

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

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

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

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

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

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

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

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

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

package/examples/latest/shape-books.json

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

package/examples/latest/shopify-lookbook.json

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

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

@@ -9,7 +9,7 @@
     "en-us"
   ],
   "apiVersion": "2",
-  "schemaVersion": "3.21.0",
+  "schemaVersion": "3.22.0",
   "queries": {
     "getAsset": {
       "shape": "Asset",
@@ -39001,4 +39001,4 @@
       "authentication": "secret"
     }
   }
-}
+}

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

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

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

@@ -9,7 +9,7 @@
     "en-us"
   ],
   "apiVersion": "2",
-  "schemaVersion": "3.21.0",
+  "schemaVersion": "3.22.0",
   "queries": {
     "getAsset": {
       "shape": "Asset",
@@ -4406,12 +4406,10 @@
     "Stripe_Product": {
       "queries": {
         "list": {
-          "name": "Stripe_listProducts",
-          "objectDepthLimit": 1
+          "name": "Stripe_listProducts"
         },
         "get": {
-          "name": "Stripe_getProduct",
-          "objectDepthLimit": 1
+          "name": "Stripe_getProduct"
         }
       },
       "triggers": [
@@ -4420,7 +4418,10 @@
           "query": "list",
           "interval": 1440
         }
-      ]
+      ],
+      "query": {
+        "maxDepth": 1
+      }
     }
   }
 }

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

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

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

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

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

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

package/package.json

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