@takeshape/schema 12.2.2 → 12.4.3

package/dist/schema-util.d.ts

@@ -1,6 +1,6 @@
 import { type Maybe } from '@takeshape/util';
 import { type SchemaDefaultsOptions } from './builtin-schema.ts';
-import type { ProjectSchemaJSON, PropertySchema, QueryJSON, ServiceConfig, ShapeJSON, ShapeMap, ShapeSchema } from './project-schema/index.ts';
+import type { FieldMapping, ProjectSchemaJSON, PropertySchema, QueryJSON, ServiceConfig, ShapeJSON, ShapeMap, ShapeSchema } from './project-schema/index.ts';
 import { type RefItem, type RefItemWithPath, type ServicesContext, type ServicesShapesContext } from './refs.ts';
 import { type LatestProjectSchemaWithServices, type LayerSchema, type SchemaPath, type SchemaPropertyName, type SchemaPropertyNode, type SchemaWithArgs, type ServiceMap } from './types/index.ts';
 export declare function isBuiltinShape(ref: string): boolean;
@@ -99,7 +99,7 @@ export declare function shapeToJsonSchema(projectSchema: ProjectSchemaJSON, shap
     '@l10n'?: boolean;
     '@key'?: string;
     '@workflow'?: string;
-    '@mapping'?: import("./project-schema/latest.ts").FieldMapping;
+    '@mapping'?: FieldMapping;
     '@tag'?: string;
     '@tags'?: string[];
     '@deprecationReason'?: string;

package/dist/schema-util.js

@@ -10,7 +10,7 @@ import { AGENTS_SCHEMA_PATH, getAgentMap } from './agents.js';
 import { workflowsEnabled } from "./api-version.js";
 import { allBuiltInShapes, getBuiltInForms, getBuiltInShapes } from "./builtin-schema.js";
 import { SERVICE_OBJECT_PATTERN_NAME } from "./constants.js";
-import { createTemplateShapeName, dereferenceObjectSchema, dereferenceSchema, getRef, getRefOrItemsRef, getRefShapeName, isValidRefItem, parseRef, parseReturnShape, refItemToNamespacedShapeName, refItemToShape, refItemToShapeSchema, refToRefItem, returnShapeToSchema, serializePropertyRef } from "./refs.js";
+import { createTemplateShapeName, dereferenceObjectSchema, dereferenceSchema, getRef, getRefOrItemsRef, getRefShapeName, isValidRefItem, parseName, parseRef, parseReturnShape, refItemToNamespacedShapeName, refItemToShape, refItemToShapeSchema, refToRefItem, returnShapeToSchema, serializePropertyRef } from "./refs.js";
 import { getArgsType, isAllOfSchema, isArraySchema, isCachedShape, isExtendsSchema, isGraphqlResolver, isModelShape, isObjectSchema, isOneOfSchema, isReferenceableShape, isRefSchema } from "./types/index.js";
 import { isUnionSchema } from "./unions.js";
 import { getArgs } from "./util/has-arg.js";
@@ -233,15 +233,25 @@ export function getIdField(obj) {
 /**
  * Get properties necessary for cached / remote data to work with the TSSearchable interface.
  */
-function getCachedBuiltInProperties(shape, properties) {
+function getCachedBuiltInProperties(projectSchema, shape, properties) {
     const idField = getIdField(shape.cache);
+    const idFieldSchema = properties[idField];
+    let idMapping;
+    // Determine _id mapping: prefer existing mapping on idField, fallback to constructing from shape name
+    if (idFieldSchema) {
+        idMapping = idFieldSchema['@mapping'];
+        if (!idMapping) {
+            const { layerId, name } = parseName(projectSchema, shape.name);
+            idMapping = `${layerId}:${name}.${idField}`;
+        }
+    }
     // TODO Implement `searchSummary` and `_shapeId` here, and remove `getRemoteShapeTSSearchableFields`
     return {
         _id: {
             title: 'Id',
             type: 'string',
             ...properties._id,
-            ...(properties[idField]?.['@mapping'] ? { '@mapping': properties[idField]['@mapping'] } : {})
+            ...(idMapping ? { '@mapping': idMapping } : {})
         }
     };
 }
@@ -363,7 +373,9 @@ export function applyBuiltinPropertiesToShape(projectSchema, shape) {
     const { properties } = shapeObjectSchema;
     const commonProperties = getCommonBuiltInProperties(shape);
     const modelProperties = profile === BuiltInPropertiesProfile.Model ? getModelBuiltInProperties(projectSchema, shape) : undefined;
-    const cachedProperties = profile === BuiltInPropertiesProfile.Cached ? getCachedBuiltInProperties(shape, properties) : undefined;
+    const cachedProperties = profile === BuiltInPropertiesProfile.Cached
+        ? getCachedBuiltInProperties(projectSchema, shape, properties)
+        : undefined;
     return {
         ...shape,
         schema: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "12.2.2",
+  "version": "12.4.3",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -57,9 +57,9 @@
     "p-reduce": "3.0.0",
     "semver": "7.7.2",
     "tiny-invariant": "1.3.3",
-    "@takeshape/errors": "12.2.2",
-    "@takeshape/json-schema": "12.2.2",
-    "@takeshape/util": "12.2.2"
+    "@takeshape/errors": "12.4.3",
+    "@takeshape/json-schema": "12.4.3",
+    "@takeshape/util": "12.4.3"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "11.0.0",
@@ -76,8 +76,8 @@
     "glob": "11.0.1",
     "json-schema-to-ts": "3.1.1",
     "shortid": "2.2.16",
-    "@takeshape/logger": "12.2.2",
-    "@takeshape/infra": "12.2.2"
+    "@takeshape/infra": "12.4.3",
+    "@takeshape/logger": "12.4.3"
   },
   "engines": {
     "node": ">=24"