@takeshape/schema 9.46.0 → 9.48.0

package/es/project-schema/index.js

@@ -42,6 +42,8 @@ export * from './v3.30.0';
 export * from './v3.31.0';
 export * from './v3.32.0';
 export * from './v3.33.0';
+export * from './v3.34.0';
+export * from './v3.35.0';
 export * from './v4.0.0';
 
 // Schema type utilities
@@ -63,47 +65,49 @@ function createVersionPredicate(expectedVersion) {
   };
 }
 
-export const isProjectSchemaV1_0_0 = createVersionPredicate('1.0.0');
-export const isProjectSchemaV3_0_0 = createVersionPredicate('3.0.0');
-export const isProjectSchemaV3_1_0 = createVersionPredicate('3.1.0');
-export const isProjectSchemaV3_2_0 = createVersionPredicate('3.2.0');
-export const isProjectSchemaV3_3_0 = createVersionPredicate('3.3.0');
-export const isProjectSchemaV3_4_0 = createVersionPredicate('3.4.0');
-export const isProjectSchemaV3_5_0 = createVersionPredicate('3.5.0');
-export const isProjectSchemaV3_5_1 = createVersionPredicate('3.5.1');
-export const isProjectSchemaV3_6_0 = createVersionPredicate('3.6.0');
-export const isProjectSchemaV3_7_0 = createVersionPredicate('3.7.0');
-export const isProjectSchemaV3_8_0 = createVersionPredicate('3.8.0');
-export const isProjectSchemaV3_9_0 = createVersionPredicate('3.9.0');
-export const isProjectSchemaV3_10_0 = createVersionPredicate('3.10.0');
-export const isProjectSchemaV3_11_0 = createVersionPredicate('3.11.0');
-export const isProjectSchemaV3_12_0 = createVersionPredicate('3.12.0');
-export const isProjectSchemaV3_12_1 = createVersionPredicate('3.12.1');
-export const isProjectSchemaV3_12_2 = createVersionPredicate('3.12.2');
-export const isProjectSchemaV3_12_3 = createVersionPredicate('3.12.3');
-export const isProjectSchemaV3_13_0 = createVersionPredicate('3.13.0');
-export const isProjectSchemaV3_14_0 = createVersionPredicate('3.14.0');
-export const isProjectSchemaV3_15_0 = createVersionPredicate('3.15.0');
-export const isProjectSchemaV3_16_0 = createVersionPredicate('3.16.0');
-export const isProjectSchemaV3_17_0 = createVersionPredicate('3.17.0');
-export const isProjectSchemaV3_17_1 = createVersionPredicate('3.17.1');
-export const isProjectSchemaV3_18_0 = createVersionPredicate('3.18.0');
-export const isProjectSchemaV3_18_1 = createVersionPredicate('3.18.1');
-export const isProjectSchemaV3_18_2 = createVersionPredicate('3.18.2');
-export const isProjectSchemaV3_19_0 = createVersionPredicate('3.19.0');
-export const isProjectSchemaV3_20_0 = createVersionPredicate('3.20.0');
-export const isProjectSchemaV3_21_0 = createVersionPredicate('3.21.0');
-export const isProjectSchemaV3_22_0 = createVersionPredicate('3.22.0');
-export const isProjectSchemaV3_23_0 = createVersionPredicate('3.23.0');
-export const isProjectSchemaV3_24_0 = createVersionPredicate('3.24.0');
-export const isProjectSchemaV3_25_0 = createVersionPredicate('3.25.0');
-export const isProjectSchemaV3_26_0 = createVersionPredicate('3.26.0');
-export const isProjectSchemaV3_27_0 = createVersionPredicate('3.27.0');
-export const isProjectSchemaV3_28_0 = createVersionPredicate('3.28.0');
-export const isProjectSchemaV3_29_0 = createVersionPredicate('3.29.0');
-export const isProjectSchemaV3_30_0 = createVersionPredicate('3.30.0');
-export const isProjectSchemaV3_31_0 = createVersionPredicate('3.31.0');
-export const isProjectSchemaV3_32_0 = createVersionPredicate('3.32.0');
-export const isProjectSchemaV3_33_0 = createVersionPredicate('3.33.0');
-export const isLatestProjectSchema = createVersionPredicate('3.33.0');
-export const isProjectSchemaV4_0_0 = createVersionPredicate('4.0.0');
+export const isProjectSchemaJSONV1_0_0 = createVersionPredicate('1.0.0');
+export const isProjectSchemaJSONV3_0_0 = createVersionPredicate('3.0.0');
+export const isProjectSchemaJSONV3_1_0 = createVersionPredicate('3.1.0');
+export const isProjectSchemaJSONV3_2_0 = createVersionPredicate('3.2.0');
+export const isProjectSchemaJSONV3_3_0 = createVersionPredicate('3.3.0');
+export const isProjectSchemaJSONV3_4_0 = createVersionPredicate('3.4.0');
+export const isProjectSchemaJSONV3_5_0 = createVersionPredicate('3.5.0');
+export const isProjectSchemaJSONV3_5_1 = createVersionPredicate('3.5.1');
+export const isProjectSchemaJSONV3_6_0 = createVersionPredicate('3.6.0');
+export const isProjectSchemaJSONV3_7_0 = createVersionPredicate('3.7.0');
+export const isProjectSchemaJSONV3_8_0 = createVersionPredicate('3.8.0');
+export const isProjectSchemaJSONV3_9_0 = createVersionPredicate('3.9.0');
+export const isProjectSchemaJSONV3_10_0 = createVersionPredicate('3.10.0');
+export const isProjectSchemaJSONV3_11_0 = createVersionPredicate('3.11.0');
+export const isProjectSchemaJSONV3_12_0 = createVersionPredicate('3.12.0');
+export const isProjectSchemaJSONV3_12_1 = createVersionPredicate('3.12.1');
+export const isProjectSchemaJSONV3_12_2 = createVersionPredicate('3.12.2');
+export const isProjectSchemaJSONV3_12_3 = createVersionPredicate('3.12.3');
+export const isProjectSchemaJSONV3_13_0 = createVersionPredicate('3.13.0');
+export const isProjectSchemaJSONV3_14_0 = createVersionPredicate('3.14.0');
+export const isProjectSchemaJSONV3_15_0 = createVersionPredicate('3.15.0');
+export const isProjectSchemaJSONV3_16_0 = createVersionPredicate('3.16.0');
+export const isProjectSchemaJSONV3_17_0 = createVersionPredicate('3.17.0');
+export const isProjectSchemaJSONV3_17_1 = createVersionPredicate('3.17.1');
+export const isProjectSchemaJSONV3_18_0 = createVersionPredicate('3.18.0');
+export const isProjectSchemaJSONV3_18_1 = createVersionPredicate('3.18.1');
+export const isProjectSchemaJSONV3_18_2 = createVersionPredicate('3.18.2');
+export const isProjectSchemaJSONV3_19_0 = createVersionPredicate('3.19.0');
+export const isProjectSchemaJSONV3_20_0 = createVersionPredicate('3.20.0');
+export const isProjectSchemaJSONV3_21_0 = createVersionPredicate('3.21.0');
+export const isProjectSchemaJSONV3_22_0 = createVersionPredicate('3.22.0');
+export const isProjectSchemaJSONV3_23_0 = createVersionPredicate('3.23.0');
+export const isProjectSchemaJSONV3_24_0 = createVersionPredicate('3.24.0');
+export const isProjectSchemaJSONV3_25_0 = createVersionPredicate('3.25.0');
+export const isProjectSchemaJSONV3_26_0 = createVersionPredicate('3.26.0');
+export const isProjectSchemaJSONV3_27_0 = createVersionPredicate('3.27.0');
+export const isProjectSchemaJSONV3_28_0 = createVersionPredicate('3.28.0');
+export const isProjectSchemaJSONV3_29_0 = createVersionPredicate('3.29.0');
+export const isProjectSchemaJSONV3_30_0 = createVersionPredicate('3.30.0');
+export const isProjectSchemaJSONV3_31_0 = createVersionPredicate('3.31.0');
+export const isProjectSchemaJSONV3_32_0 = createVersionPredicate('3.32.0');
+export const isProjectSchemaJSONV3_33_0 = createVersionPredicate('3.33.0');
+export const isProjectSchemaJSONV3_34_0 = createVersionPredicate('3.34.0');
+export const isProjectSchemaJSONV3_35_0 = createVersionPredicate('3.35.0');
+export const isLatestProjectSchemaJSON = createVersionPredicate('3.35.0');
+export const isProjectSchemaJSONV4_0_0 = createVersionPredicate('4.0.0');

package/es/project-schema/migrate.js

@@ -1,184 +1,192 @@
 // This file is generated by "pnpm json2ts"
 import { migrateTo } from '../migration';
-import { isProjectSchemaV1_0_0, isProjectSchemaV3_0_0, isProjectSchemaV3_1_0, isProjectSchemaV3_2_0, isProjectSchemaV3_3_0, isProjectSchemaV3_4_0, isProjectSchemaV3_5_0, isProjectSchemaV3_5_1, isProjectSchemaV3_6_0, isProjectSchemaV3_7_0, isProjectSchemaV3_8_0, isProjectSchemaV3_9_0, isProjectSchemaV3_10_0, isProjectSchemaV3_11_0, isProjectSchemaV3_12_0, isProjectSchemaV3_12_1, isProjectSchemaV3_12_2, isProjectSchemaV3_12_3, isProjectSchemaV3_13_0, isProjectSchemaV3_14_0, isProjectSchemaV3_15_0, isProjectSchemaV3_16_0, isProjectSchemaV3_17_0, isProjectSchemaV3_17_1, isProjectSchemaV3_18_0, isProjectSchemaV3_18_1, isProjectSchemaV3_18_2, isProjectSchemaV3_19_0, isProjectSchemaV3_20_0, isProjectSchemaV3_21_0, isProjectSchemaV3_22_0, isProjectSchemaV3_23_0, isProjectSchemaV3_24_0, isProjectSchemaV3_25_0, isProjectSchemaV3_26_0, isProjectSchemaV3_27_0, isProjectSchemaV3_28_0, isProjectSchemaV3_29_0, isProjectSchemaV3_30_0, isProjectSchemaV3_31_0, isProjectSchemaV3_32_0, isProjectSchemaV4_0_0, isLatestProjectSchema } 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, isProjectSchemaJSONV4_0_0, isLatestProjectSchemaJSON } from './index'; // eslint-disable-next-line complexity
 
 export async function migrateToLatestProjectSchema(context, projectSchema) {
-  if (isLatestProjectSchema(projectSchema)) {
+  if (isLatestProjectSchemaJSON(projectSchema)) {
     return projectSchema;
   }
 
-  if (isProjectSchemaV1_0_0(projectSchema)) {
+  if (isProjectSchemaJSONV1_0_0(projectSchema)) {
     projectSchema = await migrateTo['v3.0.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_0_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_0_0(projectSchema)) {
     projectSchema = await migrateTo['v3.1.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_1_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_1_0(projectSchema)) {
     projectSchema = await migrateTo['v3.2.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_2_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_2_0(projectSchema)) {
     projectSchema = await migrateTo['v3.3.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_3_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_3_0(projectSchema)) {
     projectSchema = await migrateTo['v3.4.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_4_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_4_0(projectSchema)) {
     projectSchema = await migrateTo['v3.5.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_5_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_5_0(projectSchema)) {
     projectSchema = await migrateTo['v3.5.1'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_5_1(projectSchema)) {
+  if (isProjectSchemaJSONV3_5_1(projectSchema)) {
     projectSchema = await migrateTo['v3.6.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_6_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_6_0(projectSchema)) {
     projectSchema = await migrateTo['v3.7.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_7_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_7_0(projectSchema)) {
     projectSchema = await migrateTo['v3.8.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_8_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_8_0(projectSchema)) {
     projectSchema = await migrateTo['v3.9.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_9_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_9_0(projectSchema)) {
     projectSchema = await migrateTo['v3.10.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_10_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_10_0(projectSchema)) {
     projectSchema = await migrateTo['v3.11.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_11_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_11_0(projectSchema)) {
     projectSchema = await migrateTo['v3.12.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_12_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_12_0(projectSchema)) {
     projectSchema = await migrateTo['v3.12.1'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_12_1(projectSchema)) {
+  if (isProjectSchemaJSONV3_12_1(projectSchema)) {
     projectSchema = await migrateTo['v3.12.2'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_12_2(projectSchema)) {
+  if (isProjectSchemaJSONV3_12_2(projectSchema)) {
     projectSchema = await migrateTo['v3.12.3'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_12_3(projectSchema)) {
+  if (isProjectSchemaJSONV3_12_3(projectSchema)) {
     projectSchema = await migrateTo['v3.13.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_13_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_13_0(projectSchema)) {
     projectSchema = await migrateTo['v3.14.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_14_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_14_0(projectSchema)) {
     projectSchema = await migrateTo['v3.15.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_15_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_15_0(projectSchema)) {
     projectSchema = await migrateTo['v3.16.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_16_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_16_0(projectSchema)) {
     projectSchema = await migrateTo['v3.17.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_17_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_17_0(projectSchema)) {
     projectSchema = await migrateTo['v3.17.1'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_17_1(projectSchema)) {
+  if (isProjectSchemaJSONV3_17_1(projectSchema)) {
     projectSchema = await migrateTo['v3.18.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_18_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_18_0(projectSchema)) {
     projectSchema = await migrateTo['v3.18.1'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_18_1(projectSchema)) {
+  if (isProjectSchemaJSONV3_18_1(projectSchema)) {
     projectSchema = await migrateTo['v3.18.2'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_18_2(projectSchema)) {
+  if (isProjectSchemaJSONV3_18_2(projectSchema)) {
     projectSchema = await migrateTo['v3.19.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_19_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_19_0(projectSchema)) {
     projectSchema = await migrateTo['v3.20.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_20_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_20_0(projectSchema)) {
     projectSchema = await migrateTo['v3.21.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_21_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_21_0(projectSchema)) {
     projectSchema = await migrateTo['v3.22.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_22_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_22_0(projectSchema)) {
     projectSchema = await migrateTo['v3.23.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_23_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_23_0(projectSchema)) {
     projectSchema = await migrateTo['v3.24.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_24_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_24_0(projectSchema)) {
     projectSchema = await migrateTo['v3.25.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_25_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_25_0(projectSchema)) {
     projectSchema = await migrateTo['v3.26.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_26_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_26_0(projectSchema)) {
     projectSchema = await migrateTo['v3.27.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_27_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_27_0(projectSchema)) {
     projectSchema = await migrateTo['v3.28.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_28_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_28_0(projectSchema)) {
     projectSchema = await migrateTo['v3.29.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_29_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_29_0(projectSchema)) {
     projectSchema = await migrateTo['v3.30.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_30_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_30_0(projectSchema)) {
     projectSchema = await migrateTo['v3.31.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_31_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_31_0(projectSchema)) {
     projectSchema = await migrateTo['v3.32.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV3_32_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_32_0(projectSchema)) {
     projectSchema = await migrateTo['v3.33.0'](context, projectSchema);
   }
 
-  if (isProjectSchemaV4_0_0(projectSchema)) {
+  if (isProjectSchemaJSONV3_33_0(projectSchema)) {
+    projectSchema = await migrateTo['v3.34.0'](context, projectSchema);
+  }
+
+  if (isProjectSchemaJSONV3_34_0(projectSchema)) {
+    projectSchema = await migrateTo['v3.35.0'](context, projectSchema);
+  }
+
+  if (isProjectSchemaJSONV4_0_0(projectSchema)) {
     throw new Error('You are using an unreleased schema version. Migration is not possible');
   }
 
   return projectSchema;
 }
 export async function ensureLatest(context, schema) {
-  if (!schema || isLatestProjectSchema(schema)) {
+  if (!schema || isLatestProjectSchemaJSON(schema)) {
     return schema;
   }
 

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

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

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

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

package/es/refs.js

@@ -250,6 +250,9 @@ export function shapeNameToRefItem(context, shapeName, template) {
     isForeign: parsed.serviceId !== 'local'
   };
 }
+export function shapeToRefItem(context, shape) {
+  return shapeNameToRefItem(context, shape.name);
+}
 /**
  * Given a property schema and project schema, finds a `@ref` or `$ref` and
  * returns a `RefItem` suitable for loading a referenced schema...
@@ -553,6 +556,18 @@ export function parsePropertyRef(refStr) {
 export function serializePropertyRef(propertyRef) {
   return `${propertyRef.serviceId}:${propertyRef.shapeName}.${propertyRef.propertyName}`;
 }
+export function propertyRefToShapeRef(propertyRef) {
+  const parsed = parsePropertyRef(propertyRef);
+
+  if (!parsed) {
+    throw new Error(`Invalid property ref "${propertyRef}`);
+  }
+
+  return formatShapeRef(parsed.serviceId, parsed.shapeName);
+}
+export function formatShapeRef(serviceId, shapeName) {
+  return `${serviceId}:${shapeName}`;
+}
 export function applyNamespace(namespace, name) {
   return namespace ? `${namespace}_${name}` : name;
 }

package/es/schema-util.js

@@ -428,6 +428,9 @@ export function applyDefaultsToSchema(projectSchema) {
 export function getShapeById(projectSchema, shapeId) {
   return find(projectSchema.shapes, shape => shape.id === shapeId);
 }
+export function getShapeByRef(projectSchema, shapeRef) {
+  return refItemToShape(projectSchema, atRefToRefItem(projectSchema, shapeRef));
+}
 export function ensureShapeById(projectSchema, shapeId) {
   const shape = getShapeById(projectSchema, shapeId);
 
@@ -1026,47 +1029,47 @@ export const createSchemaPropertyList = curry((context, shapeOrSchema) => {
 function isShape(shapeOrSchema) {
   return 'schema' in shapeOrSchema;
 }
-/**
- * Creates a schema property accessor, allowing you to safely access schema
- * properties.
- */
-
 
-export const createSchemaPropertyAccessor = curry((context, shapeOrSchema) => {
-  const propSchema = isShape(shapeOrSchema) ? shapeOrSchema.schema : shapeOrSchema;
-  const schema = dereferenceSchema(context, propSchema, isShape(shapeOrSchema) ? ['shapes', shapeOrSchema.name] : undefined);
-  const propertyIterator = new Map(isObjectSchema(schema) ? Object.entries(schema.properties) : undefined);
+class SchemaPropertyAccessor {
+  constructor(context, shapeOrSchema) {
+    const propSchema = isShape(shapeOrSchema) ? shapeOrSchema.schema : shapeOrSchema;
+    this.schema = dereferenceSchema(context, propSchema, isShape(shapeOrSchema) ? ['shapes', shapeOrSchema.name] : undefined);
+    this.entries = isObjectSchema(this.schema) ? Object.entries(this.schema.properties) : [];
+    this.properties = new Map(this.entries);
+  }
 
-  const _getValue = propertyName => {
-    return propertyIterator.get(propertyName);
-  };
+  getValue(propertyName) {
+    return this.properties.get(propertyName);
+  }
 
-  const _findValue = predicate => {
-    var _Array$from$find;
+  findValue(predicate) {
+    var _this$entries$find;
 
-    return (_Array$from$find = Array.from(propertyIterator).find(predicate)) === null || _Array$from$find === void 0 ? void 0 : _Array$from$find[1];
-  };
+    return (_this$entries$find = this.entries.find(predicate)) === null || _this$entries$find === void 0 ? void 0 : _this$entries$find[1];
+  }
 
-  const _findName = predicate => {
-    var _Array$from$find2;
+  findName(predicate) {
+    var _this$entries$find2;
 
-    return (_Array$from$find2 = Array.from(propertyIterator).find(predicate)) === null || _Array$from$find2 === void 0 ? void 0 : _Array$from$find2[0];
-  };
+    return (_this$entries$find2 = this.entries.find(predicate)) === null || _this$entries$find2 === void 0 ? void 0 : _this$entries$find2[0];
+  }
 
-  const _getKey = propertyName => {
-    const value = propertyIterator.get(propertyName);
+  getKey(propertyName) {
+    const value = this.properties.get(propertyName);
 
     if (value) {
       return getStorageKey(value);
     }
-  };
+  }
 
-  return {
-    getValue: _getValue,
-    findValue: _findValue,
-    findName: _findName,
-    getKey: _getKey
-  };
+}
+
+/**
+ * Creates a schema property accessor, allowing you to safely access schema
+ * properties.
+ */
+export const createSchemaPropertyAccessor = curry((context, shapeOrSchema) => {
+  return new SchemaPropertyAccessor(context, shapeOrSchema);
 });
 
 function findQueryHelper(slice, shapeName, resolver, type) {

package/es/schemas/index.js

@@ -1,7 +1,7 @@
 // This file is generated by "pnpm json2ts"
-export const CURRENT_SCHEMA_VERSION = '3.33.0';
+export const CURRENT_SCHEMA_VERSION = '3.35.0';
 export { default as anyProjectSchema } from './project-schema.json';
-export { default as latestSchemaJson } from './project-schema/v3.33.0.json';
+export { default as latestSchemaJson } from './project-schema/v3.35.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';
@@ -56,5 +56,7 @@ import projectSchemaV3_30_0 from './project-schema/v3.30.0.json';
 import projectSchemaV3_31_0 from './project-schema/v3.31.0.json';
 import projectSchemaV3_32_0 from './project-schema/v3.32.0.json';
 import projectSchemaV3_33_0 from './project-schema/v3.33.0.json';
+import projectSchemaV3_34_0 from './project-schema/v3.34.0.json';
+import projectSchemaV3_35_0 from './project-schema/v3.35.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, 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, 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.33.0';
+export const CURRENT_SCHEMA_VERSION = '3.35.0';
 export {default as anyProjectSchema} from './project-schema.json';
-export {default as latestSchemaJson} from './project-schema/v3.33.0.json';
+export {default as latestSchemaJson} from './project-schema/v3.35.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';
@@ -56,6 +56,8 @@ import projectSchemaV3_30_0 from './project-schema/v3.30.0.json';
 import projectSchemaV3_31_0 from './project-schema/v3.31.0.json';
 import projectSchemaV3_32_0 from './project-schema/v3.32.0.json';
 import projectSchemaV3_33_0 from './project-schema/v3.33.0.json';
+import projectSchemaV3_34_0 from './project-schema/v3.34.0.json';
+import projectSchemaV3_35_0 from './project-schema/v3.35.0.json';
 import projectSchemaV4_0_0 from './project-schema/v4.0.0.json';
 export const allProjectSchemas = [
   metaSchemaV1_0_0,
@@ -112,5 +114,7 @@ export const allProjectSchemas = [
   projectSchemaV3_31_0,
   projectSchemaV3_32_0,
   projectSchemaV3_33_0,
+  projectSchemaV3_34_0,
+  projectSchemaV3_35_0,
   projectSchemaV4_0_0
 ];

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

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.takeshape.io/project-schema/v3.33.0#",
-  "title": "Project Schema",
+  "$id": "https://schema.takeshape.io/project-schema/v3.35.0#",
+  "title": "Project Schema JSON",
   "definitions": {
     "schemaArray": {
       "title": "Schema Array",
@@ -1766,7 +1766,7 @@
       "additionalProperties": false
     },
     "query": {
-      "title": "Query",
+      "title": "Query JSON",
       "type": "object",
       "properties": {
         "args": {
@@ -2008,7 +2008,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": {
@@ -2067,6 +2067,9 @@
         "loaders": {
           "$ref": "#/definitions/shapeLoaders"
         },
+        "joins": {
+          "$ref": "#/definitions/shapeJoins"
+        },
         "cache": {
           "$ref": "#/definitions/shapeCacheConfig"
         },
@@ -2149,6 +2152,38 @@
         "enabled"
       ]
     },
+    "shapeJoin": {
+      "title": "ShapeJoin",
+      "type": "object",
+      "properties": {
+        "resolver": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/delegateResolver"
+            },
+            {
+              "$ref": "#/definitions/shapedbResolver"
+            }
+          ]
+        },
+        "dependencies": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "resolver"
+      ],
+      "additionalProperties": false
+    },
+    "shapeJoins": {
+      "title": "ShapeJoins",
+      "type": "object",
+      "patternProperties": {
+        "[:0-9A-Za-z_-]+": {
+          "$ref": "#/definitions/shapeJoin"
+        }
+      }
+    },
     "shapeLoaders": {
       "title": "ShapeLoaders",
       "type": "object",
@@ -2826,7 +2861,7 @@
       "additionalProperties": false
     },
     "storedServiceConfig": {
-      "title": "Stored Service Config",
+      "title": "Service Config JSON",
       "type": "object",
       "properties": {
         "id": {
@@ -2894,7 +2929,7 @@
       ]
     },
     "storedServiceMap": {
-      "title": "Stored Service Map",
+      "title": "Service Map JSON",
       "type": "object",
       "patternProperties": {
         "[0-9A-Za-z_-]+": {
@@ -3018,7 +3053,7 @@
     "schemaVersion": {
       "type": "string",
       "enum": [
-        "3.33.0"
+        "3.35.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."
     },
@@ -3085,4 +3120,4 @@
     "mutations",
     "workflows"
   ]
-}
+}

package/es/schemas/project-schema/meta-schema-v3.0.0.json

@@ -348,7 +348,7 @@
       "type": "string"
     },
     "query": {
-      "title": "Query",
+      "title": "Query JSON",
       "type": "object",
       "properties": {
         "args": {

package/es/schemas/project-schema/meta-schema-v3.1.0.json

@@ -348,7 +348,7 @@
       "type": "string"
     },
     "query": {
-      "title": "Query",
+      "title": "Query JSON",
       "type": "object",
       "properties": {
         "args": {