@takeshape/schema 8.47.0 → 8.50.1

package/es/flatten-templates.js

@@ -17,7 +17,7 @@ export function flattenTemplates(projectSchema) {
       const {
         shapeName,
         dependencies
-      } = resolveTemplate(projectSchema, ref.template, refItemToShapeName(ref));
+      } = resolveTemplate(newSchema, ref.template, refItemToShapeName(ref));
       set(newSchema, ref.path, ref.path[ref.path.length - 1] === '@ref' ? `local:${shapeName}` : shapeName);
       Object.assign(newSchema.shapes, dependencies);
     }

package/es/migration/index.js

@@ -1,4 +1,4 @@
-import { isLatestProjectSchema, isProjectSchemaV1, isProjectSchemaV3, isProjectSchemaV3_1, isProjectSchemaV3_2, isProjectSchemaV3_3, isProjectSchemaV3_4, isProjectSchemaV3_5, isProjectSchemaV3_5_1, isProjectSchemaV3_6, isProjectSchemaV3_7, isProjectSchemaV3_8, isProjectSchemaV3_9, isProjectSchemaV3_10, isProjectSchemaV3_11 } from '../types/utils';
+import { isLatestProjectSchema, isProjectSchemaV1, isProjectSchemaV3, isProjectSchemaV3_1, isProjectSchemaV3_2, isProjectSchemaV3_3, isProjectSchemaV3_4, isProjectSchemaV3_5, isProjectSchemaV3_5_1, isProjectSchemaV3_6, isProjectSchemaV3_7, isProjectSchemaV3_8, isProjectSchemaV3_9, isProjectSchemaV3_10, isProjectSchemaV3_11, isProjectSchemaV3_12 } from '../types/utils';
 import migrateToV3 from './to/v3.0.0';
 import migrateToV3_1 from './to/v3.1.0';
 import migrateToV3_2 from './to/v3.2.0';
@@ -13,6 +13,7 @@ import migrateToV3_9_0 from './to/v3.9.0';
 import migrateToV3_10 from './to/v3.10.0';
 import migrateToV3_11_0 from './to/v3.11.0';
 import migrateToV3_12_0 from './to/v3.12.0';
+import migrateToV3_12_1 from './to/v3.12.1';
 export * from './utils';
 export const listTypePrefix = 'PaginatedList';
 export async function migrateToLatestProjectSchema(context, projectSchema) {
@@ -76,6 +77,10 @@ export async function migrateToLatestProjectSchema(context, projectSchema) {
     projectSchema = migrateToV3_12_0(projectSchema);
   }
 
+  if (isProjectSchemaV3_12(projectSchema)) {
+    projectSchema = migrateToV3_12_1(projectSchema);
+  }
+
   return projectSchema;
 }
 export async function ensureLatest(context, schema) {

package/es/migration/to/v3.10.0.js

@@ -1,22 +1,60 @@
 import mapValues from 'lodash/mapValues';
+import set from 'lodash/fp/set';
 
-function migrateQueryToV3_10(query, queryName) {
-  const {
-    args,
-    shape
-  } = query;
+function $refToPath(ref) {
+  return ref.substr(2).split('/');
+}
 
-  if (typeof args === 'object' && ('oneOf' in args || 'allOf' in args || '$ref' in args || '@ref' in args)) {
-    // As of 11/15/2021 no production schemas contained queries with these args
-    throw new Error(`Query "${queryName}" contains an unsupported arg schema ${JSON.stringify(args)}. Please contact support`);
-  }
+function $refToShapeName(ref) {
+  return $refToPath(ref)[1];
+}
 
-  if (typeof shape === 'object' && !shape.items['@ref']) {
-    // As of 11/15/2021 no production schemas contained queries with array return shapes that are not @refs
-    throw new Error(`Query "${queryName}" contains an unsupported shape schema ${JSON.stringify(shape)}. Please contact support`);
+function findServiceIdForNamespace(projectSchema, namespace) {
+  if (projectSchema.services) {
+    for (const [serviceId, service] of Object.entries(projectSchema.services)) {
+      if (service.namespace === namespace) {
+        return serviceId;
+      }
+    }
   }
 
-  return query;
+  return 'local';
+}
+
+function updateRefSyntax(projectSchema, $ref) {
+  const shapeName = $refToShapeName($ref);
+  const parts = shapeName.split('_');
+  const serviceId = parts.length === 1 ? 'local' : findServiceIdForNamespace(projectSchema, parts[0]);
+  return `${serviceId}:${parts[parts.length - 1]}`;
+}
+
+function migrateQueryToV3_10(projectSchema) {
+  return (query, queryName) => {
+    const {
+      args,
+      shape
+    } = query;
+
+    if (typeof args === 'object' && ('oneOf' in args || 'allOf' in args || '$ref' in args || '@ref' in args)) {
+      // As of 11/15/2021 no production schemas contained queries with these args
+      throw new Error(`Query "${queryName}" contains an unsupported arg schema ${JSON.stringify(args)}. Please contact support`);
+    }
+
+    if (typeof shape === 'object') {
+      if (shape.items.$ref) {
+        return set('shape.items', {
+          '@ref': updateRefSyntax(projectSchema, shape.items.$ref)
+        }, query);
+      }
+
+      if (!shape.items['@ref']) {
+        // As of 11/15/2021 no production schemas contained queries with array return shapes that are not @refs
+        throw new Error(`Query "${queryName}" contains an unsupported shape schema ${JSON.stringify(shape)}. Please contact support`);
+      }
+    }
+
+    return query;
+  };
 }
 
 function migrateShapeToV3_10(shape) {
@@ -45,9 +83,10 @@ function migrateToV3_10(projectSchema) {
     schemaVersion,
     ...rest
   } = projectSchema;
+  const migrate = migrateQueryToV3_10(projectSchema);
   return { ...rest,
-    queries: mapValues(queries, migrateQueryToV3_10),
-    mutations: mapValues(mutations, migrateQueryToV3_10),
+    queries: mapValues(queries, migrate),
+    mutations: mapValues(mutations, migrate),
     shapes: mapValues(shapes, migrateShapeToV3_10),
     schemaVersion: '3.10.0'
   };

package/es/migration/to/v3.12.1.js

@@ -0,0 +1,10 @@
+function migrateToV3_12_1(projectSchema) {
+  /**
+   * No migration needed all changes are backwards compatible.
+   */
+  return { ...projectSchema,
+    schemaVersion: '3.12.1'
+  };
+}
+
+export default migrateToV3_12_1;

package/es/project-schema/index.js

@@ -1,6 +1,7 @@
 // This file is generated by "pnpm json2ts"
 export * from './latest';
 export * from './v4.0.0';
+export * from './v3.12.1';
 export * from './v3.12.0';
 export * from './v3.11.0';
 export * from './v3.10.0';

package/es/project-schema/v3.12.1.js

@@ -0,0 +1 @@
+export {};

package/es/schemas/index.js

@@ -1,8 +1,9 @@
 // This file is generated by "pnpm json2ts"
-export const CURRENT_SCHEMA_VERSION = '3.12.0';
+export const CURRENT_SCHEMA_VERSION = '3.12.1';
 export { default as anyProjectSchema } from './project-schema.json';
-export { default as latestSchemaJson } from './project-schema/v3.12.0.json';
+export { default as latestSchemaJson } from './project-schema/v3.12.1.json';
 import projectSchemaV4_0_0 from './project-schema/v4.0.0.json';
+import projectSchemaV3_12_1 from './project-schema/v3.12.1.json';
 import projectSchemaV3_12_0 from './project-schema/v3.12.0.json';
 import projectSchemaV3_11_0 from './project-schema/v3.11.0.json';
 import projectSchemaV3_10_0 from './project-schema/v3.10.0.json';
@@ -30,4 +31,4 @@ import projectSchemaV3_0_0 from './project-schema/v3.0.0.json';
 import metaSchemaV3_0_0 from './project-schema/meta-schema-v3.0.0.json';
 import projectSchemaV1_0_0 from './project-schema/v1.0.0.json';
 import metaSchemaV1_0_0 from './project-schema/meta-schema-v1.0.0.json';
-export const allProjectSchemas = [projectSchemaV4_0_0, projectSchemaV3_12_0, projectSchemaV3_11_0, projectSchemaV3_10_0, projectSchemaV3_9_0, metaSchemaV3_9_0, projectSchemaV3_8_0, metaSchemaV3_8_0, projectSchemaV3_7_0, metaSchemaV3_7_0, projectSchemaV3_6_0, metaSchemaV3_6_0, projectSchemaV3_5_1, metaSchemaV3_5_1, projectSchemaV3_5_0, metaSchemaV3_5_0, projectSchemaV3_4_0, metaSchemaV3_4_0, projectSchemaV3_3_0, metaSchemaV3_3_0, projectSchemaV3_2_0, metaSchemaV3_2_0, projectSchemaV3_1_0, metaSchemaV3_1_0, projectSchemaV3_0_0, metaSchemaV3_0_0, projectSchemaV1_0_0, metaSchemaV1_0_0];
+export const allProjectSchemas = [projectSchemaV4_0_0, projectSchemaV3_12_1, projectSchemaV3_12_0, projectSchemaV3_11_0, projectSchemaV3_10_0, projectSchemaV3_9_0, metaSchemaV3_9_0, projectSchemaV3_8_0, metaSchemaV3_8_0, projectSchemaV3_7_0, metaSchemaV3_7_0, projectSchemaV3_6_0, metaSchemaV3_6_0, projectSchemaV3_5_1, metaSchemaV3_5_1, projectSchemaV3_5_0, metaSchemaV3_5_0, projectSchemaV3_4_0, metaSchemaV3_4_0, projectSchemaV3_3_0, metaSchemaV3_3_0, projectSchemaV3_2_0, metaSchemaV3_2_0, projectSchemaV3_1_0, metaSchemaV3_1_0, projectSchemaV3_0_0, metaSchemaV3_0_0, projectSchemaV1_0_0, metaSchemaV1_0_0];

package/es/schemas/index.ts

@@ -1,8 +1,9 @@
 // This file is generated by "pnpm json2ts"
-export const CURRENT_SCHEMA_VERSION = '3.12.0';
+export const CURRENT_SCHEMA_VERSION = '3.12.1';
 export {default as anyProjectSchema} from './project-schema.json';
-export {default as latestSchemaJson} from './project-schema/v3.12.0.json';
+export {default as latestSchemaJson} from './project-schema/v3.12.1.json';
 import projectSchemaV4_0_0 from './project-schema/v4.0.0.json';
+import projectSchemaV3_12_1 from './project-schema/v3.12.1.json';
 import projectSchemaV3_12_0 from './project-schema/v3.12.0.json';
 import projectSchemaV3_11_0 from './project-schema/v3.11.0.json';
 import projectSchemaV3_10_0 from './project-schema/v3.10.0.json';
@@ -32,6 +33,7 @@ import projectSchemaV1_0_0 from './project-schema/v1.0.0.json';
 import metaSchemaV1_0_0 from './project-schema/meta-schema-v1.0.0.json';
 export const allProjectSchemas = [
   projectSchemaV4_0_0,
+  projectSchemaV3_12_1,
   projectSchemaV3_12_0,
   projectSchemaV3_11_0,
   projectSchemaV3_10_0,