@takeshape/schema 9.57.1 → 9.58.2

package/dist/schemas/project-schema.json

@@ -141,6 +141,9 @@
     {
       "$ref": "https://schema.takeshape.io/project-schema/v3.37.0#"
     },
+    {
+      "$ref": "https://schema.takeshape.io/project-schema/v3.38.0#"
+    },
     {
       "$ref": "https://schema.takeshape.io/project-schema/v4.0.0#"
     }

package/dist/util/merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/util/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAY,MAAM,mBAAmB,CAAC;AAazF,wBAAgB,kBAAkB,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,YAAY,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,YAAY,CAgBjG;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,GAAG,YAAY,CAiBjH;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,UAAU,CAezF;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAgBvG;AAED,wBAAgB,gBAAgB,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,CAErE;AAkKD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,iBAAiB,GACtB;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,SAAS,CAAA;CAAC,GAAG;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,iBAAiB,CAAA;CAAC,CAwChG"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/util/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAY,MAAM,mBAAmB,CAAC;AAazF,wBAAgB,kBAAkB,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,YAAY,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,YAAY,CAgBjG;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,GAAG,YAAY,CAiBjH;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,UAAU,CAezF;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAgBvG;AAED,wBAAgB,gBAAgB,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,CAErE;AAmLD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,iBAAiB,GACtB;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,SAAS,CAAA;CAAC,GAAG;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,iBAAiB,CAAA;CAAC,CAwChG"}

package/dist/util/merge.js

@@ -192,6 +192,12 @@ function getChangedShape(schema, change) {
   const shape = findChangedShape(schema, change);
   (0, _tinyInvariant.default)(shape, 'Expected shape not found');
   return shape;
+}
+
+function rebaseShapeProperties(toShape, fromShape, baseShape) {
+  return baseShape ? (0, _util.rebaseObject)((0, _omit.default)(toShape, 'schema'), (0, _omit.default)(baseShape, 'schema'), (0, _omit.default)(fromShape, 'schema')) : { ...toShape,
+    ...fromShape
+  };
 } // eslint-disable-next-line complexity
 
 
@@ -201,12 +207,17 @@ function attemptToMerge(base, parent, head, change) {
   const toSchema = toShape.schema;
   const fromSchema = fromShape.schema;
 
+  if ((0, _isEqual.default)(toSchema, fromSchema)) {
+    const baseShape = findChangedShape(parent, change);
+    return { ...rebaseShapeProperties(toShape, fromShape, baseShape),
+      schema: toSchema
+    };
+  }
+
   if ((0, _types.isObjectSchema)(toSchema) && (0, _types.isObjectSchema)(fromSchema)) {
     const baseShape = findChangedShape(parent, change);
     const baseSchema = baseShape === null || baseShape === void 0 ? void 0 : baseShape.schema;
-    return { ...(baseShape ? (0, _util.rebaseObject)((0, _omit.default)(toShape, 'schema'), (0, _omit.default)(baseShape, 'schema'), (0, _omit.default)(fromShape, 'schema')) : { ...toShape,
-        ...fromShape
-      }),
+    return { ...rebaseShapeProperties(toShape, fromShape, baseShape),
       schema: change.op === 'update' && baseSchema && (0, _types.isObjectSchema)(baseSchema) ? rebaseSchemaProperties(toSchema, baseSchema, fromSchema) : mergeSchemaProperties(toSchema, fromSchema)
     };
   }
@@ -217,10 +228,9 @@ function attemptToMerge(base, parent, head, change) {
     const fromObj = (0, _last.default)(fromSchema.extends);
 
     if (toObj && (0, _types.isObjectSchema)(toObj) && fromObj && (0, _types.isObjectSchema)(fromObj) && toSchema.extends.slice(0, toSchema.extends.length - 1).every((item, i) => (0, _isEqual.default)(item, fromExtends[i]))) {
-      var _findChangedShape;
-
       let mergedObjSchema;
-      const baseSchema = (_findChangedShape = findChangedShape(parent, change)) === null || _findChangedShape === void 0 ? void 0 : _findChangedShape.schema;
+      const baseShape = findChangedShape(parent, change);
+      const baseSchema = baseShape === null || baseShape === void 0 ? void 0 : baseShape.schema;
 
       if (change.op === 'update' && baseSchema && (0, _types.isExtendsSchema)(baseSchema)) {
         const baseObj = (0, _last.default)(baseSchema.extends);
@@ -234,7 +244,7 @@ function attemptToMerge(base, parent, head, change) {
         mergedObjSchema = mergeSchemaProperties(toObj, fromObj);
       }
 
-      return { ...fromShape,
+      return { ...rebaseShapeProperties(toShape, fromShape, baseShape),
         schema: {
           extends: [...toSchema.extends.slice(0, toSchema.extends.length - 1), mergedObjSchema]
         }

package/es/migration/index.js

@@ -43,6 +43,7 @@ import migrateToV3_34_0 from './to/v3.34.0';
 import migrateToV3_35_0 from './to/v3.35.0';
 import migrateToV3_36_0 from './to/v3.36.0';
 import migrateToV3_37_0 from './to/v3.37.0';
+import migrateToV3_38_0 from './to/v3.38.0';
 export const migrateTo = {
   'v3.0.0': migrateToV3_0_0,
   'v3.1.0': migrateToV3_1_0,
@@ -88,7 +89,8 @@ export const migrateTo = {
   'v3.34.0': migrateToV3_34_0,
   'v3.35.0': migrateToV3_35_0,
   'v3.36.0': migrateToV3_36_0,
-  'v3.37.0': migrateToV3_37_0
+  'v3.37.0': migrateToV3_37_0,
+  'v3.38.0': migrateToV3_38_0
 };
 export * from './utils';
 export const listTypePrefix = 'PaginatedList';

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

@@ -0,0 +1,10 @@
+const migrate = async (_, projectSchema) => {
+  /**
+   * No migration needed all changes are backwards compatible.
+   */
+  return { ...projectSchema,
+    schemaVersion: '3.38.0'
+  };
+};
+
+export default migrate;

package/es/project-schema/index.js

@@ -46,6 +46,7 @@ export * from './v3.34.0';
 export * from './v3.35.0';
 export * from './v3.36.0';
 export * from './v3.37.0';
+export * from './v3.38.0';
 export * from './v4.0.0';
 
 // Schema type utilities
@@ -113,5 +114,6 @@ export const isProjectSchemaJSONV3_34_0 = createVersionPredicate('3.34.0');
 export const isProjectSchemaJSONV3_35_0 = createVersionPredicate('3.35.0');
 export const isProjectSchemaJSONV3_36_0 = createVersionPredicate('3.36.0');
 export const isProjectSchemaJSONV3_37_0 = createVersionPredicate('3.37.0');
-export const isLatestProjectSchemaJSON = createVersionPredicate('3.37.0');
+export const isProjectSchemaJSONV3_38_0 = createVersionPredicate('3.38.0');
+export const isLatestProjectSchemaJSON = createVersionPredicate('3.38.0');
 export const isProjectSchemaJSONV4_0_0 = createVersionPredicate('4.0.0');

package/es/project-schema/migrate.js

@@ -1,6 +1,6 @@
 // This file is generated by "pnpm json2ts"
 import { migrateTo } from '../migration';
-import { isProjectSchemaJSONV1_0_0, isProjectSchemaJSONV3_0_0, isProjectSchemaJSONV3_1_0, isProjectSchemaJSONV3_2_0, isProjectSchemaJSONV3_3_0, isProjectSchemaJSONV3_4_0, isProjectSchemaJSONV3_5_0, isProjectSchemaJSONV3_5_1, isProjectSchemaJSONV3_6_0, isProjectSchemaJSONV3_7_0, isProjectSchemaJSONV3_8_0, isProjectSchemaJSONV3_9_0, isProjectSchemaJSONV3_10_0, isProjectSchemaJSONV3_11_0, isProjectSchemaJSONV3_12_0, isProjectSchemaJSONV3_12_1, isProjectSchemaJSONV3_12_2, isProjectSchemaJSONV3_12_3, isProjectSchemaJSONV3_13_0, isProjectSchemaJSONV3_14_0, isProjectSchemaJSONV3_15_0, isProjectSchemaJSONV3_16_0, isProjectSchemaJSONV3_17_0, isProjectSchemaJSONV3_17_1, isProjectSchemaJSONV3_18_0, isProjectSchemaJSONV3_18_1, isProjectSchemaJSONV3_18_2, isProjectSchemaJSONV3_19_0, isProjectSchemaJSONV3_20_0, isProjectSchemaJSONV3_21_0, isProjectSchemaJSONV3_22_0, isProjectSchemaJSONV3_23_0, isProjectSchemaJSONV3_24_0, isProjectSchemaJSONV3_25_0, isProjectSchemaJSONV3_26_0, isProjectSchemaJSONV3_27_0, isProjectSchemaJSONV3_28_0, isProjectSchemaJSONV3_29_0, isProjectSchemaJSONV3_30_0, isProjectSchemaJSONV3_31_0, isProjectSchemaJSONV3_32_0, isProjectSchemaJSONV3_33_0, isProjectSchemaJSONV3_34_0, isProjectSchemaJSONV3_35_0, isProjectSchemaJSONV3_36_0, isProjectSchemaJSONV4_0_0, isLatestProjectSchemaJSON } from './index'; // eslint-disable-next-line complexity
+import { isProjectSchemaJSONV1_0_0, isProjectSchemaJSONV3_0_0, isProjectSchemaJSONV3_1_0, isProjectSchemaJSONV3_2_0, isProjectSchemaJSONV3_3_0, isProjectSchemaJSONV3_4_0, isProjectSchemaJSONV3_5_0, isProjectSchemaJSONV3_5_1, isProjectSchemaJSONV3_6_0, isProjectSchemaJSONV3_7_0, isProjectSchemaJSONV3_8_0, isProjectSchemaJSONV3_9_0, isProjectSchemaJSONV3_10_0, isProjectSchemaJSONV3_11_0, isProjectSchemaJSONV3_12_0, isProjectSchemaJSONV3_12_1, isProjectSchemaJSONV3_12_2, isProjectSchemaJSONV3_12_3, isProjectSchemaJSONV3_13_0, isProjectSchemaJSONV3_14_0, isProjectSchemaJSONV3_15_0, isProjectSchemaJSONV3_16_0, isProjectSchemaJSONV3_17_0, isProjectSchemaJSONV3_17_1, isProjectSchemaJSONV3_18_0, isProjectSchemaJSONV3_18_1, isProjectSchemaJSONV3_18_2, isProjectSchemaJSONV3_19_0, isProjectSchemaJSONV3_20_0, isProjectSchemaJSONV3_21_0, isProjectSchemaJSONV3_22_0, isProjectSchemaJSONV3_23_0, isProjectSchemaJSONV3_24_0, isProjectSchemaJSONV3_25_0, isProjectSchemaJSONV3_26_0, isProjectSchemaJSONV3_27_0, isProjectSchemaJSONV3_28_0, isProjectSchemaJSONV3_29_0, isProjectSchemaJSONV3_30_0, isProjectSchemaJSONV3_31_0, isProjectSchemaJSONV3_32_0, isProjectSchemaJSONV3_33_0, isProjectSchemaJSONV3_34_0, isProjectSchemaJSONV3_35_0, isProjectSchemaJSONV3_36_0, isProjectSchemaJSONV3_37_0, isProjectSchemaJSONV4_0_0, isLatestProjectSchemaJSON } from './index'; // eslint-disable-next-line complexity
 
 export async function migrateToLatestProjectSchema(context, projectSchema) {
   if (isLatestProjectSchemaJSON(projectSchema)) {
@@ -187,6 +187,10 @@ export async function migrateToLatestProjectSchema(context, projectSchema) {
     projectSchema = await migrateTo['v3.37.0'](context, projectSchema);
   }
 
+  if (isProjectSchemaJSONV3_37_0(projectSchema)) {
+    projectSchema = await migrateTo['v3.38.0'](context, projectSchema);
+  }
+
   if (isProjectSchemaJSONV4_0_0(projectSchema)) {
     throw new Error('You are using an unreleased schema version. Migration is not possible');
   }

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

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

package/es/schemas/index.js

@@ -1,7 +1,7 @@
 // This file is generated by "pnpm json2ts"
-export const CURRENT_SCHEMA_VERSION = '3.37.0';
+export const CURRENT_SCHEMA_VERSION = '3.38.0';
 export { default as anyProjectSchema } from './project-schema.json';
-export { default as latestSchemaJson } from './project-schema/v3.37.0.json';
+export { default as latestSchemaJson } from './project-schema/v3.38.0.json';
 import metaSchemaV1_0_0 from './project-schema/meta-schema-v1.0.0.json';
 import projectSchemaV1_0_0 from './project-schema/v1.0.0.json';
 import metaSchemaV3_0_0 from './project-schema/meta-schema-v3.0.0.json';
@@ -60,5 +60,6 @@ import projectSchemaV3_34_0 from './project-schema/v3.34.0.json';
 import projectSchemaV3_35_0 from './project-schema/v3.35.0.json';
 import projectSchemaV3_36_0 from './project-schema/v3.36.0.json';
 import projectSchemaV3_37_0 from './project-schema/v3.37.0.json';
+import projectSchemaV3_38_0 from './project-schema/v3.38.0.json';
 import projectSchemaV4_0_0 from './project-schema/v4.0.0.json';
-export const allProjectSchemas = [metaSchemaV1_0_0, projectSchemaV1_0_0, metaSchemaV3_0_0, projectSchemaV3_0_0, metaSchemaV3_1_0, projectSchemaV3_1_0, metaSchemaV3_2_0, projectSchemaV3_2_0, metaSchemaV3_3_0, projectSchemaV3_3_0, metaSchemaV3_4_0, projectSchemaV3_4_0, metaSchemaV3_5_0, projectSchemaV3_5_0, metaSchemaV3_5_1, projectSchemaV3_5_1, metaSchemaV3_6_0, projectSchemaV3_6_0, metaSchemaV3_7_0, projectSchemaV3_7_0, metaSchemaV3_8_0, projectSchemaV3_8_0, metaSchemaV3_9_0, projectSchemaV3_9_0, projectSchemaV3_10_0, projectSchemaV3_11_0, projectSchemaV3_12_0, projectSchemaV3_12_1, projectSchemaV3_12_2, projectSchemaV3_12_3, projectSchemaV3_13_0, projectSchemaV3_14_0, projectSchemaV3_15_0, projectSchemaV3_16_0, projectSchemaV3_17_0, projectSchemaV3_17_1, projectSchemaV3_18_0, projectSchemaV3_18_1, projectSchemaV3_18_2, projectSchemaV3_19_0, projectSchemaV3_20_0, projectSchemaV3_21_0, projectSchemaV3_22_0, projectSchemaV3_23_0, projectSchemaV3_24_0, projectSchemaV3_25_0, projectSchemaV3_26_0, projectSchemaV3_27_0, projectSchemaV3_28_0, projectSchemaV3_29_0, projectSchemaV3_30_0, projectSchemaV3_31_0, projectSchemaV3_32_0, projectSchemaV3_33_0, projectSchemaV3_34_0, projectSchemaV3_35_0, projectSchemaV3_36_0, projectSchemaV3_37_0, projectSchemaV4_0_0];
+export const allProjectSchemas = [metaSchemaV1_0_0, projectSchemaV1_0_0, metaSchemaV3_0_0, projectSchemaV3_0_0, metaSchemaV3_1_0, projectSchemaV3_1_0, metaSchemaV3_2_0, projectSchemaV3_2_0, metaSchemaV3_3_0, projectSchemaV3_3_0, metaSchemaV3_4_0, projectSchemaV3_4_0, metaSchemaV3_5_0, projectSchemaV3_5_0, metaSchemaV3_5_1, projectSchemaV3_5_1, metaSchemaV3_6_0, projectSchemaV3_6_0, metaSchemaV3_7_0, projectSchemaV3_7_0, metaSchemaV3_8_0, projectSchemaV3_8_0, metaSchemaV3_9_0, projectSchemaV3_9_0, projectSchemaV3_10_0, projectSchemaV3_11_0, projectSchemaV3_12_0, projectSchemaV3_12_1, projectSchemaV3_12_2, projectSchemaV3_12_3, projectSchemaV3_13_0, projectSchemaV3_14_0, projectSchemaV3_15_0, projectSchemaV3_16_0, projectSchemaV3_17_0, projectSchemaV3_17_1, projectSchemaV3_18_0, projectSchemaV3_18_1, projectSchemaV3_18_2, projectSchemaV3_19_0, projectSchemaV3_20_0, projectSchemaV3_21_0, projectSchemaV3_22_0, projectSchemaV3_23_0, projectSchemaV3_24_0, projectSchemaV3_25_0, projectSchemaV3_26_0, projectSchemaV3_27_0, projectSchemaV3_28_0, projectSchemaV3_29_0, projectSchemaV3_30_0, projectSchemaV3_31_0, projectSchemaV3_32_0, projectSchemaV3_33_0, projectSchemaV3_34_0, projectSchemaV3_35_0, projectSchemaV3_36_0, projectSchemaV3_37_0, projectSchemaV3_38_0, projectSchemaV4_0_0];

package/es/schemas/index.ts

@@ -1,7 +1,7 @@
 // This file is generated by "pnpm json2ts"
-export const CURRENT_SCHEMA_VERSION = '3.37.0';
+export const CURRENT_SCHEMA_VERSION = '3.38.0';
 export {default as anyProjectSchema} from './project-schema.json';
-export {default as latestSchemaJson} from './project-schema/v3.37.0.json';
+export {default as latestSchemaJson} from './project-schema/v3.38.0.json';
 import metaSchemaV1_0_0 from './project-schema/meta-schema-v1.0.0.json';
 import projectSchemaV1_0_0 from './project-schema/v1.0.0.json';
 import metaSchemaV3_0_0 from './project-schema/meta-schema-v3.0.0.json';
@@ -60,6 +60,7 @@ import projectSchemaV3_34_0 from './project-schema/v3.34.0.json';
 import projectSchemaV3_35_0 from './project-schema/v3.35.0.json';
 import projectSchemaV3_36_0 from './project-schema/v3.36.0.json';
 import projectSchemaV3_37_0 from './project-schema/v3.37.0.json';
+import projectSchemaV3_38_0 from './project-schema/v3.38.0.json';
 import projectSchemaV4_0_0 from './project-schema/v4.0.0.json';
 export const allProjectSchemas = [
   metaSchemaV1_0_0,
@@ -120,5 +121,6 @@ export const allProjectSchemas = [
   projectSchemaV3_35_0,
   projectSchemaV3_36_0,
   projectSchemaV3_37_0,
+  projectSchemaV3_38_0,
   projectSchemaV4_0_0
 ];

package/es/schemas/project-schema/latest.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.takeshape.io/project-schema/v3.37.0#",
+  "$id": "https://schema.takeshape.io/project-schema/v3.38.0#",
   "title": "Project Schema JSON",
   "definitions": {
     "schemaArray": {
@@ -115,10 +115,8 @@
       "properties": {
         "enum": {
           "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "minItems": 1
+          "minItems": 1,
+          "uniqueItems": true
         }
       },
       "additionalProperties": false,
@@ -3141,7 +3139,7 @@
     "schemaVersion": {
       "type": "string",
       "enum": [
-        "3.37.0"
+        "3.38.0"
       ],
       "description": "The version of the schema format your project is using. We increase the version as we make breaking changes to the schema format."
     },