@takeshape/schema 9.104.2 → 9.105.3

package/dist/interfaces.js

@@ -80,7 +80,7 @@ function interfaceToUnion(context, interfaceRef) {
   const shapes = getImplementingShapes(context, interfaceRef);
   return {
     oneOf: shapes.map(shape => ({
-      '@ref': (0, _refs.shapeNameToRef)(context, shape.name)
+      '@ref': (0, _refs.normalizeRefExpression)(context, shape.name)
     }))
   };
 }

package/dist/migration/to/v3.32.0.js

@@ -73,7 +73,7 @@ const migrate = async (_, projectSchema) => {
           title: name,
           schema: {
             extends: [{
-              '@ref': (0, _refs.shapeNameToRef)(projectSchema, name)
+              '@ref': (0, _refs.normalizeRefExpression)(projectSchema, name)
             }]
           }
         };

package/dist/models/project-schema.d.ts

@@ -30,7 +30,7 @@ export declare class ProjectSchema {
     atRefToRefItem(atRef: string, template?: string): RefItem;
     refItemToShape(refItem: RefItem): ShapeModel;
     getRef(refSchema: SchemaWithRef): import("@takeshape/util").Maybe<RefItem>;
-    shapeNameToRef(shapeName: string): string;
-    shapeNameToRefItem(shapeName: string): RefItem;
+    normalizeRefExpression(refExpression: string): string;
+    refExpressionToRefItem(refExpression: string): RefItem;
 }
 //# sourceMappingURL=project-schema.d.ts.map

package/dist/models/project-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-schema.d.ts","sourceRoot":"","sources":["../../../src/models/project-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EACL,OAAO,EACP,eAAe,EAMhB,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACnC,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACnC,OAAO,EAAC,aAAa,EAAC,MAAM,WAAW,CAAC;AASxC;;;;GAIG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;IACvD,OAAO,CAAC,MAAM,CAA0B;gBAE5B,uBAAuB,EAAE,iBAAiB;IAMtD,IAAI,IAAI,sBAEP;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,OAAO,uBAEV;IAED,IAAI,MAAM,uBAET;IAED,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,YAAY,CAAC,OAAO,EAAE,MAAM;IAU5B,aAAa,CAAC,QAAQ,EAAE,MAAM;IAI9B,IAAI,MAAM,gBAKT;IAED,IAAI,IAAI,sBAGP;IAED,cAAc,CAAC,SAAS,EAAE,MAAM;IAIhC,IAAI,OAAO,iBAIV;IAED,iBAAiB,CAAC,YAAY,EAAE,MAAM;IAItC,IAAI,SAAS,iBAGZ;IAED,cAAc,CAAC,SAAS,EAAE,MAAM;IAIhC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IAI/C,cAAc,CAAC,OAAO,EAAE,OAAO;IAI/B,MAAM,CAAC,SAAS,EAAE,aAAa;IAI/B,cAAc,CAAC,SAAS,EAAE,MAAM;IAIhC,kBAAkB,CAAC,SAAS,EAAE,MAAM;CAGrC"}
+{"version":3,"file":"project-schema.d.ts","sourceRoot":"","sources":["../../../src/models/project-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EACL,OAAO,EACP,eAAe,EAMhB,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACnC,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACnC,OAAO,EAAC,aAAa,EAAC,MAAM,WAAW,CAAC;AASxC;;;;GAIG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;IACvD,OAAO,CAAC,MAAM,CAA0B;gBAE5B,uBAAuB,EAAE,iBAAiB;IAMtD,IAAI,IAAI,sBAEP;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,OAAO,uBAEV;IAED,IAAI,MAAM,uBAET;IAED,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,YAAY,CAAC,OAAO,EAAE,MAAM;IAU5B,aAAa,CAAC,QAAQ,EAAE,MAAM;IAI9B,IAAI,MAAM,gBAKT;IAED,IAAI,IAAI,sBAGP;IAED,cAAc,CAAC,SAAS,EAAE,MAAM;IAIhC,IAAI,OAAO,iBAIV;IAED,iBAAiB,CAAC,YAAY,EAAE,MAAM;IAItC,IAAI,SAAS,iBAGZ;IAED,cAAc,CAAC,SAAS,EAAE,MAAM;IAIhC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IAI/C,cAAc,CAAC,OAAO,EAAE,OAAO;IAI/B,MAAM,CAAC,SAAS,EAAE,aAAa;IAI/B,sBAAsB,CAAC,aAAa,EAAE,MAAM;IAI5C,sBAAsB,CAAC,aAAa,EAAE,MAAM;CAG7C"}

package/dist/models/project-schema.js

@@ -55,7 +55,7 @@ class ProjectSchema {
     return new _shape.ShapeModel(this, shapeRef);
   }
   get shapes() {
-    this._cache.shapes = this._cache.shapes ?? Object.keys(this.json.shapes).map(name => new _shape.ShapeModel(this, (0, _refs.shapeNameToRef)(this.json, name)));
+    this._cache.shapes = this._cache.shapes ?? Object.keys(this.json.shapes).map(name => new _shape.ShapeModel(this, (0, _refs.normalizeRefExpression)(this.json, name)));
     return this._cache.shapes;
   }
   get refs() {
@@ -88,11 +88,11 @@ class ProjectSchema {
   getRef(refSchema) {
     return (0, _refs.getRef)(this.json, refSchema);
   }
-  shapeNameToRef(shapeName) {
-    return (0, _refs.shapeNameToRef)(this.json, shapeName);
+  normalizeRefExpression(refExpression) {
+    return (0, _refs.normalizeRefExpression)(this.json, refExpression);
   }
-  shapeNameToRefItem(shapeName) {
-    return (0, _refs.shapeNameToRefItem)(this.json, shapeName);
+  refExpressionToRefItem(refExpression) {
+    return (0, _refs.refExpressionToRefItem)(this.json, refExpression);
   }
 }
 exports.ProjectSchema = ProjectSchema;

package/dist/refs.d.ts

@@ -102,7 +102,6 @@ export interface ParsedName {
  * Parse a name (query, shape, etc) that might have a namespace and find the corresponding service layer id
  */
 export declare function parseName(context: ServicesContext, name: string): ParsedName;
-export declare function shapeNameToRefItem(context: ServicesContext, shapeName: string, template?: string): RefItem;
 export declare function shapeToRefItem(context: ServicesContext, shape: ShapeJSON): RefItem;
 /**
  * Given a property schema and project schema, finds a `@ref` or `$ref` and
@@ -207,7 +206,7 @@ export declare function propertyRefToArgs(projectSchema: ProjectSchemaJSON, ref:
 /**
  * Get a ref to the given shape.
  */
-export declare function shapeNameToRef(context: ServicesContext, shapeName: string): string;
+export declare function normalizeRefExpression(context: ServicesContext, refExpression: string): string;
 export declare function normalizeLocalRefString(ref: string): string;
 export declare function getAllPropertyRefs(projectSchema: ProjectSchemaJSON): PropertyRefItem[];
 export interface QueryEntry {

package/dist/refs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refs.d.ts","sourceRoot":"","sources":["../../src/refs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"refs.d.ts","sourceRoot":"","sources":["../../src/refs.ts"],"names":[],"mappings":"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"}

package/dist/refs.js

@@ -26,6 +26,7 @@ exports.hasRefProperty = hasRefProperty;
 exports.hasResolvableRef = hasResolvableRef;
 exports.isRefItemWithPath = isRefItemWithPath;
 exports.normalizeLocalRefString = normalizeLocalRefString;
+exports.normalizeRefExpression = normalizeRefExpression;
 exports.omitRefAndExtend = void 0;
 exports.parseName = parseName;
 exports.parsePropertyRef = parsePropertyRef;
@@ -51,8 +52,6 @@ exports.refSchemaToPath = refSchemaToPath;
 exports.refToRefItem = refToRefItem;
 exports.returnShapeToSchema = returnShapeToSchema;
 exports.serializePropertyRef = serializePropertyRef;
-exports.shapeNameToRef = shapeNameToRef;
-exports.shapeNameToRefItem = shapeNameToRefItem;
 exports.shapeToRefItem = shapeToRefItem;
 exports.splitAtRef = splitAtRef;
 exports.untemplate = void 0;
@@ -204,7 +203,7 @@ function refExpressionToRefItem(context, refExpression) {
   if (shapeName.includes(':')) {
     return atRefToRefItem(context, shapeName, template);
   }
-  return refToRefItem(context, `#/shapes/${shapeName}/schema`, template);
+  return shapeNameToRefItem(context, shapeName, template);
 }
 
 /**
@@ -356,7 +355,8 @@ function getRefOrItemsRef(context, refSchema, schemaPath = []) {
  * Turns a `RefItem` into an `@ref`.
  */
 function refItemToAtRef(refItem) {
-  return `${refItem.serviceKey}:${refItem.typeName}`;
+  const shapeRef = `${refItem.serviceKey}:${refItem.typeName}`;
+  return refItem.template ? createTemplateShapeName(refItem.template, shapeRef) : shapeRef;
 }
 
 /**
@@ -628,8 +628,8 @@ function propertyRefToArgs(projectSchema, ref) {
 /**
  * Get a ref to the given shape.
  */
-function shapeNameToRef(context, shapeName) {
-  return refItemToAtRef(shapeNameToRefItem(context, shapeName));
+function normalizeRefExpression(context, refExpression) {
+  return refItemToAtRef(refExpressionToRefItem(context, refExpression));
 }
 function normalizeLocalRefString(ref) {
   return ref.startsWith('local:') ? ref.substring(6) : ref;

package/es/interfaces.js

@@ -1,4 +1,4 @@
-import { getRef, refItemToShape, refItemToNamespacedShapeName, shapeNameToRef, shapeToRefItem, refExpressionToRefItem } from './refs';
+import { getRef, refItemToShape, refItemToNamespacedShapeName, normalizeRefExpression, shapeToRefItem, refExpressionToRefItem } from './refs';
 import mapValues from 'lodash/mapValues';
 import { isUnionSchema } from './unions';
 import { isDefined } from '@takeshape/util';
@@ -66,7 +66,7 @@ export function interfaceToUnion(context, interfaceRef) {
   const shapes = getImplementingShapes(context, interfaceRef);
   return {
     oneOf: shapes.map(shape => ({
-      '@ref': shapeNameToRef(context, shape.name)
+      '@ref': normalizeRefExpression(context, shape.name)
     }))
   };
 }

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

@@ -1,4 +1,4 @@
-import { shapeNameToRef } from '../../refs';
+import { normalizeRefExpression } from '../../refs';
 function migrateListQuery(listConfig) {
   const {
     pagination,
@@ -67,7 +67,7 @@ const migrate = async (_, projectSchema) => {
           title: name,
           schema: {
             extends: [{
-              '@ref': shapeNameToRef(projectSchema, name)
+              '@ref': normalizeRefExpression(projectSchema, name)
             }]
           }
         };

package/es/models/project-schema.js

@@ -1,4 +1,4 @@
-import { atRefToRefItem, getRef, shapeNameToRef, shapeNameToRefItem, shapeToRefItem } from '../refs';
+import { atRefToRefItem, getRef, normalizeRefExpression, refExpressionToRefItem, shapeToRefItem } from '../refs';
 import { getAllRefs, getShape, getShapeById } from '../schema-util';
 import omit from 'lodash/omit';
 import { ShapeModel } from './shape';
@@ -48,7 +48,7 @@ export class ProjectSchema {
     return new ShapeModel(this, shapeRef);
   }
   get shapes() {
-    this._cache.shapes = this._cache.shapes ?? Object.keys(this.json.shapes).map(name => new ShapeModel(this, shapeNameToRef(this.json, name)));
+    this._cache.shapes = this._cache.shapes ?? Object.keys(this.json.shapes).map(name => new ShapeModel(this, normalizeRefExpression(this.json, name)));
     return this._cache.shapes;
   }
   get refs() {
@@ -81,10 +81,10 @@ export class ProjectSchema {
   getRef(refSchema) {
     return getRef(this.json, refSchema);
   }
-  shapeNameToRef(shapeName) {
-    return shapeNameToRef(this.json, shapeName);
+  normalizeRefExpression(refExpression) {
+    return normalizeRefExpression(this.json, refExpression);
   }
-  shapeNameToRefItem(shapeName) {
-    return shapeNameToRefItem(this.json, shapeName);
+  refExpressionToRefItem(refExpression) {
+    return refExpressionToRefItem(this.json, refExpression);
   }
 }

package/es/refs.js

@@ -145,7 +145,7 @@ export function refExpressionToRefItem(context, refExpression) {
   if (shapeName.includes(':')) {
     return atRefToRefItem(context, shapeName, template);
   }
-  return refToRefItem(context, `#/shapes/${shapeName}/schema`, template);
+  return shapeNameToRefItem(context, shapeName, template);
 }
 
 /**
@@ -226,7 +226,7 @@ export function parseName(context, name) {
     namespace
   };
 }
-export function shapeNameToRefItem(context, shapeName, template) {
+function shapeNameToRefItem(context, shapeName, template) {
   const parsed = parseName(context, shapeName);
   return {
     typeName: parsed.name,
@@ -297,7 +297,8 @@ export function getRefOrItemsRef(context, refSchema, schemaPath = []) {
  * Turns a `RefItem` into an `@ref`.
  */
 export function refItemToAtRef(refItem) {
-  return `${refItem.serviceKey}:${refItem.typeName}`;
+  const shapeRef = `${refItem.serviceKey}:${refItem.typeName}`;
+  return refItem.template ? createTemplateShapeName(refItem.template, shapeRef) : shapeRef;
 }
 
 /**
@@ -568,8 +569,8 @@ export function propertyRefToArgs(projectSchema, ref) {
 /**
  * Get a ref to the given shape.
  */
-export function shapeNameToRef(context, shapeName) {
-  return refItemToAtRef(shapeNameToRefItem(context, shapeName));
+export function normalizeRefExpression(context, refExpression) {
+  return refItemToAtRef(refExpressionToRefItem(context, refExpression));
 }
 export function normalizeLocalRefString(ref) {
   return ref.startsWith('local:') ? ref.substring(6) : ref;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "9.104.2",
+  "version": "9.105.3",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -28,9 +28,9 @@
     "p-reduce": "^2.1.0",
     "semver": "^7.3.2",
     "tiny-invariant": "^1.2.0",
-    "@takeshape/errors": "9.104.2",
-    "@takeshape/json-schema": "9.104.2",
-    "@takeshape/util": "9.104.2"
+    "@takeshape/errors": "9.105.3",
+    "@takeshape/json-schema": "9.105.3",
+    "@takeshape/util": "9.105.3"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "^11.0.0",
@@ -46,7 +46,7 @@
     "meow": "^9.0.0",
     "p-map": "^5.0.0",
     "shortid": "^2.2.15",
-    "@takeshape/typescript-jest-junit-reporter": "9.104.2"
+    "@takeshape/typescript-jest-junit-reporter": "9.105.3"
   },
   "engines": {
     "node": ">=16"