@takeshape/schema 8.281.0 → 8.282.3

package/es/schemas/project-schema.json

@@ -111,6 +111,9 @@
     {
       "$ref": "https://schema.takeshape.io/project-schema/v3.27.0#"
     },
+    {
+      "$ref": "https://schema.takeshape.io/project-schema/v3.28.0#"
+    },
     {
       "$ref": "https://schema.takeshape.io/project-schema/v4.0.0#"
     }

package/es/util/api-indexing.js

@@ -1,18 +1,41 @@
 import { isServiceResolver } from '../types';
+import { ensureArray } from '@takeshape/util';
+import { getResolverServices } from '../services';
 export function serviceHasIndexedShapes(schema, serviceId) {
   for (const config of Object.values(schema.indexedShapes ?? {})) {
-    var _config$queries$list;
+    const listConfigs = config.queries.list;
 
-    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 (listConfigs) {
+      for (const {
+        name: queryName
+      } of ensureArray(listConfigs)) {
+        const query = queryName && schema.queries[queryName];
 
-    if (query && isServiceResolver(query.resolver) && query.resolver.service === serviceId) {
-      return true;
+        if (query && isServiceResolver(query.resolver) && query.resolver.service === serviceId) {
+          return true;
+        }
+      }
     }
   }
 
   return false;
 }
+export function getIndexedServices(projectSchema, configs) {
+  return ensureArray(configs).reduce((services, queryConfig) => {
+    const queryName = queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.name;
+    const query = queryName && projectSchema.queries[queryName];
+    return query ? [...services, ...getResolverServices(query.resolver)] : services;
+  }, []);
+}
+
+function flattenListQueryConfigs(shapeName, queryConfig, maybeConfigArray) {
+  return maybeConfigArray && ensureArray(maybeConfigArray).flatMap(config => ensureArray(config.args).map(args => ({
+    shapeName,
+    ...queryConfig,
+    ...config,
+    args
+  })));
+}
 
 function getQueryIndexConfigHelper(op) {
   return ({
@@ -21,7 +44,11 @@ function getQueryIndexConfigHelper(op) {
     const indexingConfig = indexedShapes === null || indexedShapes === void 0 ? void 0 : indexedShapes[shapeName];
 
     if (indexingConfig) {
-      const queryConfig = indexingConfig.queries[op];
+      if (op === 'list') {
+        return flattenListQueryConfigs(shapeName, indexingConfig.query, indexingConfig.queries.list);
+      }
+
+      const queryConfig = indexingConfig.queries.get;
 
       if (queryConfig) {
         return {
@@ -34,5 +61,5 @@ function getQueryIndexConfigHelper(op) {
   };
 }
 
-export const getListQueryIndexConfig = getQueryIndexConfigHelper('list');
+export const getListQueryIndexConfigs = getQueryIndexConfigHelper('list');
 export const getGetQueryIndexConfig = getQueryIndexConfigHelper('get');

package/es/util/merge.js

@@ -8,6 +8,7 @@ import last from 'lodash/last';
 import omit from 'lodash/omit';
 import { isExtendsSchema, isObjectSchema } from '../types';
 import invariant from 'tiny-invariant';
+import pickBy from 'lodash/pickBy';
 export function mergeObjectSchemas(...args) {
   return args.filter(isDefined).reduce(mergeSchemaProperties, {
     type: 'object',
@@ -103,7 +104,15 @@ export function mergeFormConfigs(...configs) {
     order: []
   });
 }
-const mergeableSections = ['shapes', 'mutations', 'queries', 'forms', 'services'];
+const mergeableSections = ['shapes', 'mutations', 'queries', 'forms', 'services', 'indexedShapes'];
+
+const isMergeableSection = str => {
+  return mergeableSections.includes(str);
+};
+
+const pickUnmergeable = projectSchema => {
+  return pickBy(projectSchema, (_value, key) => !isMergeableSection(key));
+};
 
 function compareSection(section, original, updated) {
   const changes = [];
@@ -279,6 +288,7 @@ export function mergeProjectSchemas(base, parent, head) {
     applyChange(mergedSchema, parent, head, change);
   }
 
+  Object.assign(mergedSchema, rebaseObject(pickUnmergeable(base), pickUnmergeable(parent), pickUnmergeable(head)));
   return {
     error: undefined,
     mergedSchema

package/es/validate.js

@@ -21,7 +21,7 @@ import { scalars } from './scalars';
 import { isUnionSchema } from './unions';
 import { isEnumLikeSchema } from './enum';
 import metaSchemaV3_9_0 from './schemas/project-schema/meta-schema-v3.9.0.json';
-import { isIntegerLike, isRecord } from '@takeshape/util';
+import { ensureArray, isIntegerLike, isRecord } from '@takeshape/util';
 import forOwn from 'lodash/forOwn';
 import uniqBy from 'lodash/uniqBy';
 import initial from 'lodash/initial';
@@ -353,16 +353,17 @@ function validateIndexedShapeConfig(projectSchema, shapeName, config) {
   var _config$queries, _config$query;
 
   const errors = [];
-  const list = (_config$queries = config.queries) === null || _config$queries === void 0 ? void 0 : _config$queries.list;
 
-  if (list) {
-    if (projectSchema.queries[list.name] === undefined) {
-      errors.push({
-        path: ['indexedShapes', shapeName, 'queries', 'list', 'name'],
-        type: 'notFound',
-        message: `Invalid query "${list.name}"`
-      });
-    }
+  if ((_config$queries = config.queries) !== null && _config$queries !== void 0 && _config$queries.list) {
+    ensureArray(config.queries.list).forEach((list, i) => {
+      if (projectSchema.queries[list.name] === undefined) {
+        errors.push({
+          path: Array.isArray(config.queries.list) ? ['indexedShapes', shapeName, 'queries', 'list', i, 'name'] : ['indexedShapes', shapeName, 'queries', 'list', 'name'],
+          type: 'notFound',
+          message: `Invalid query "${list.name}"`
+        });
+      }
+    });
   }
 
   if ((_config$query = config.query) !== null && _config$query !== void 0 && _config$query.selectionSet) {

package/examples/latest/betzino.json

@@ -52525,6 +52525,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

package/examples/latest/blog-schema.json

@@ -399,6 +399,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

package/examples/latest/brewery-schema.json

@@ -382,6 +382,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

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

@@ -4185,6 +4185,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

package/examples/latest/complex-schema.json

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

package/examples/latest/fabric-ecommerce.json

@@ -10505,5 +10505,5 @@
       }
     }
   },
-  "schemaVersion": "3.27.0"
+  "schemaVersion": "3.28.0"
 }

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

@@ -23251,6 +23251,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

package/examples/latest/klirr-schema.json

@@ -34786,6 +34786,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

package/examples/latest/massive-schema.json

@@ -7837,6 +7837,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

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

@@ -1884,6 +1884,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

package/examples/latest/one-earth.json

@@ -14216,6 +14216,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

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

@@ -388,6 +388,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

package/examples/latest/post-schema.json

@@ -226,6 +226,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

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

@@ -9756,5 +9756,5 @@
       }
     }
   },
-  "schemaVersion": "3.27.0"
+  "schemaVersion": "3.28.0"
 }

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

@@ -1041,6 +1041,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

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

@@ -142,6 +142,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

package/examples/latest/recursive-schema.json

@@ -149,6 +149,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

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

@@ -2820,5 +2820,5 @@
       }
     }
   },
-  "schemaVersion": "3.27.0"
+  "schemaVersion": "3.28.0"
 }

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

@@ -2292,5 +2292,5 @@
       }
     }
   },
-  "schemaVersion": "3.27.0"
+  "schemaVersion": "3.28.0"
 }

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

@@ -91,5 +91,5 @@
       }
     }
   },
-  "schemaVersion": "3.27.0"
+  "schemaVersion": "3.28.0"
 }

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

@@ -397,6 +397,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

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

@@ -1124,6 +1124,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

package/examples/latest/shape-books.json

@@ -1124,6 +1124,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

package/examples/latest/shopify-lookbook.json

@@ -1177,5 +1177,5 @@
       }
     }
   },
-  "schemaVersion": "3.27.0"
+  "schemaVersion": "3.28.0"
 }

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

@@ -5,7 +5,7 @@
     "en-us"
   ],
   "apiVersion": "2",
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "queries": {
     "getAsset": {
       "shape": "Asset",

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

@@ -12560,5 +12560,5 @@
       }
     }
   },
-  "schemaVersion": "3.27.0"
+  "schemaVersion": "3.28.0"
 }

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

@@ -5,7 +5,7 @@
     "en-us"
   ],
   "apiVersion": "2",
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "queries": {
     "getAsset": {
       "shape": "Asset",

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

@@ -29316,5 +29316,5 @@
       }
     }
   },
-  "schemaVersion": "3.27.0"
+  "schemaVersion": "3.28.0"
 }

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

@@ -165,6 +165,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

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

@@ -190,6 +190,6 @@
       }
     }
   },
-  "schemaVersion": "3.27.0",
+  "schemaVersion": "3.28.0",
   "services": {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "8.281.0",
+  "version": "8.282.3",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -30,9 +30,9 @@
     "p-reduce": "^2.1.0",
     "semver": "^7.3.2",
     "tiny-invariant": "^1.2.0",
-    "@takeshape/errors": "8.281.0",
-    "@takeshape/util": "8.281.0",
-    "@takeshape/json-schema": "8.281.0"
+    "@takeshape/errors": "8.282.3",
+    "@takeshape/json-schema": "8.282.3",
+    "@takeshape/util": "8.282.3"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "^11.0.0",