@baseplate-dev/project-builder-lib 0.5.3 → 0.6.0

package/dist/references/extend-parser-context-with-refs.js

@@ -1,171 +1,131 @@
-import { get } from 'es-toolkit/compat';
 import { z } from 'zod';
-import { DefinitionExpressionMarker, DefinitionReferenceMarker, REF_ANNOTATIONS_MARKER_SYMBOL, } from './markers.js';
+import { definitionRefRegistry } from './definition-ref-registry.js';
 import { createRefContextSlotMap } from './ref-context-slot.js';
-import { stripRefMarkers } from './strip-ref-markers.js';
-export function extendParserContextWithRefs({ transformReferences, }) {
-    function modifyAnnotations(value, ctx, modifier) {
-        if (value === null || value === undefined)
-            return value;
-        if (typeof value !== 'object') {
-            ctx.addIssue({
-                code: 'invalid_type',
-                expected: 'object',
-                message: `Entity must be an object`,
-                input: value,
-            });
-            return value;
-        }
-        if (transformReferences) {
-            const existingAnnotations = REF_ANNOTATIONS_MARKER_SYMBOL in value
-                ? value[REF_ANNOTATIONS_MARKER_SYMBOL]
-                : { entities: [], references: [], slots: [] };
-            return {
-                ...value,
-                [REF_ANNOTATIONS_MARKER_SYMBOL]: modifier(existingAnnotations),
-            };
-        }
-        return value;
-    }
-    function withRef(reference) {
-        return z.string().transform((value) => {
-            if (transformReferences && value) {
-                return new DefinitionReferenceMarker(value, {
-                    path: [],
-                    type: reference.type,
-                    onDelete: reference.onDelete,
-                    parentSlot: reference.parentSlot,
-                    provides: reference.provides,
-                });
-            }
-            return value;
-        });
-    }
-    function withEnt(schema, entity) {
-        return schema.transform((value, ctx) => {
-            if (value === null || value === undefined)
-                return value;
-            if (transformReferences) {
-                if (typeof value !== 'object') {
-                    ctx.addIssue({
-                        code: 'invalid_type',
-                        expected: 'object',
-                        message: `Entity must be an object`,
-                        input: value,
-                    });
-                    return value;
-                }
-                // Check if the id is valid
-                const idPath = entity.idPath ?? ['id'];
-                const id = get(value, idPath);
-                if (typeof id !== 'string' || !id || !entity.type.isId(id)) {
-                    ctx.addIssue({
-                        code: 'custom',
-                        message: `Unable to find string id field '${entity.idPath?.join('.') ?? 'id'}' in entity ${entity.type.name}`,
-                        input: value,
-                    });
-                    return value;
-                }
-                const nameResolver = (() => {
-                    if (entity.getNameResolver) {
-                        return entity.getNameResolver(stripRefMarkers(value));
-                    }
-                    if (!('name' in value) || typeof value.name !== 'string') {
-                        ctx.addIssue({
-                            code: 'custom',
-                            message: `Unable to find string name field in entity ${entity.type.name}`,
-                            input: value,
-                        });
-                        return 'invalid';
-                    }
-                    return value.name;
-                })();
-                const newEntity = {
-                    id,
-                    idPath,
-                    path: [],
-                    type: entity.type,
-                    nameResolver,
-                    parentSlot: entity.parentSlot,
-                    provides: entity.provides,
-                };
-                return modifyAnnotations(value, ctx, (annotations) => ({
-                    ...annotations,
-                    entities: [...annotations.entities, newEntity],
-                }));
-            }
-            return value;
-        });
-    }
-    /**
-     * Creates ref context slots for use within a schema definition.
-     * Slots provide type-safe context for parent-child entity relationships.
-     *
-     * @example
-     * ```typescript
-     * ctx.refContext(
-     *   { modelSlot: modelEntityType },
-     *   ({ modelSlot }) =>
-     *     ctx.withEnt(schema, {
-     *       type: modelEntityType,
-     *       provides: modelSlot,
-     *     }),
-     * );
-     * ```
-     */
-    function refContext(slotDefinition, schemaBuilder) {
-        const slots = createRefContextSlotMap(slotDefinition);
-        return schemaBuilder(slots).transform((value, ctx) => modifyAnnotations(value, ctx, (annotations) => ({
-            ...annotations,
-            slots: [
-                ...annotations.slots,
-                ...Object.values(slots).map((slot) => ({
-                    path: [],
-                    slot,
-                })),
-            ],
-        })));
-    }
-    /**
-     * Wraps a value with a ref expression parser for deferred validation.
-     * The parser handles all parsing, validation, and rename handling.
-     *
-     * If the parser declares required slots (via TRequiredSlots), they must be
-     * provided as the second argument. TypeScript enforces this at compile time.
-     *
-     * The parser's `schema` property is used for input validation.
-     *
-     * @example
-     * ```typescript
-     * // Parser without required slots
-     * const expressionSchema = ctx.withExpression(simpleParser);
-     *
-     * // Parser with required slots (TypeScript enforces the second argument)
-     * ctx.refContext(
-     *   { modelSlot: modelEntityType },
-     *   ({ modelSlot }) =>
-     *     z.object({
-     *       condition: ctx.withExpression(authorizerParser, { model: modelSlot }),
-     *     })
-     * );
-     * ```
-     */
-    function withExpression(parser, slots) {
-        return parser.schema.transform((value) => {
-            if (transformReferences && value !== undefined) {
-                return new DefinitionExpressionMarker(value, {
-                    path: [],
-                    value,
-                    parser,
-                    slots,
-                });
-            }
-            return value;
+/**
+ * Creates a string schema annotated as a reference to another entity.
+ *
+ * Can be used standalone:
+ * ```typescript
+ * withRef({ type: modelEnumEntityType, onDelete: 'RESTRICT' })
+ * ```
+ *
+ * Or on the parser context:
+ * ```typescript
+ * ctx.withRef({ type: modelEnumEntityType, onDelete: 'RESTRICT' })
+ * ```
+ */
+export function withRef(reference) {
+    const schema = z.string().min(1);
+    definitionRefRegistry.add(schema, {
+        kind: 'reference',
+        type: reference.type,
+        onDelete: reference.onDelete,
+        parentSlot: reference.parentSlot,
+        provides: reference.provides,
+    });
+    return schema;
+}
+/**
+ * Creates a schema decorator that marks a schema as defining an entity.
+ *
+ * Can be used with `.apply()`:
+ * ```typescript
+ * schema.apply(withEnt({ type: modelEntityType, provides: modelSlot }))
+ * ```
+ *
+ * Or via the parser context (2-arg legacy form):
+ * ```typescript
+ * ctx.withEnt(schema, { type: modelEntityType, provides: modelSlot })
+ * ```
+ *
+ * @param entity - The entity definition input
+ * @returns A function that decorates a schema with entity metadata
+ */
+export function withEnt(entity) {
+    return (schema) => {
+        const idPath = entity.idPath ?? ['id'];
+        definitionRefRegistry.add(schema, {
+            kind: 'entity',
+            type: entity.type,
+            idPath,
+            getNameResolver: entity.getNameResolver,
+            parentSlot: entity.parentSlot,
+            provides: entity.provides,
         });
-    }
+        return schema;
+    };
+}
+/**
+ * Creates ref context slots for use within a schema definition.
+ * Slots provide type-safe context for parent-child entity relationships.
+ *
+ * @example
+ * ```typescript
+ * ctx.refContext(
+ *   { modelSlot: modelEntityType },
+ *   ({ modelSlot }) =>
+ *     ctx.withEnt(schema, {
+ *       type: modelEntityType,
+ *       provides: modelSlot,
+ *     }),
+ * );
+ * ```
+ */
+function refContext(slotDefinition, schemaBuilder) {
+    const slots = createRefContextSlotMap(slotDefinition);
+    const schema = schemaBuilder(slots);
+    definitionRefRegistry.add(schema, {
+        kind: 'ref-context',
+        slots: Object.values(slots),
+    });
+    return schema;
+}
+/**
+ * Wraps a value with a ref expression parser for deferred validation.
+ * The parser handles all parsing, validation, and rename handling.
+ *
+ * If the parser declares required slots (via TRequiredSlots), they must be
+ * provided as the second argument. TypeScript enforces this at compile time.
+ *
+ * The parser's `createSchema()` method is called to get a fresh schema
+ * instance per call site, allowing per-call metadata to be registered
+ * independently in the Baseplate registry.
+ *
+ * @example
+ * ```typescript
+ * // Parser without required slots
+ * const expressionSchema = ctx.withExpression(simpleParser);
+ *
+ * // Parser with required slots (TypeScript enforces the second argument)
+ * ctx.refContext(
+ *   { modelSlot: modelEntityType },
+ *   ({ modelSlot }) =>
+ *     z.object({
+ *       condition: ctx.withExpression(authorizerParser, { model: modelSlot }),
+ *     })
+ * );
+ * ```
+ */
+function withExpression(parser, slots) {
+    // createSchema() returns a fresh instance per call, allowing per-call
+    // metadata to be registered without conflicting across call sites.
+    const schema = parser.createSchema();
+    definitionRefRegistry.add(schema, {
+        kind: 'expression',
+        parser,
+        slots,
+    });
+    return schema;
+}
+export function extendParserContextWithRefs() {
     return {
         withRef,
-        withEnt,
+        // Legacy 2-arg API that delegates to the standalone withEnt decorator.
+        // Uses a cast because the standalone accepts DefinitionEntityInput<unknown, ...>
+        // while this 2-arg form infers the full z.output<TType> for type-safe idPath.
+        withEnt(schema, entity) {
+            return schema.apply(withEnt(entity));
+        },
         refContext,
         withExpression,
     };

package/dist/references/extend-parser-context-with-refs.js.map

@@ -1 +1 @@
-{"version":3,"file":"extend-parser-context-with-refs.js","sourceRoot":"","sources":["../../src/references/extend-parser-context-with-refs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extend-parser-context-with-refs.js","sourceRoot":"","sources":["../../src/references/extend-parser-context-with-refs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAkBxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AA2DhE;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,OAAO,CACrB,SAAgD;IAEhD,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACjC,qBAAqB,CAAC,GAAG,CAAC,MAAM,EAAE;QAChC,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,SAAS,CAAC,IAAI;QACpB,QAAQ,EAAE,SAAS,CAAC,QAAQ;QAC5B,UAAU,EAAE,SAAS,CAAC,UAAU;QAChC,QAAQ,EAAE,SAAS,CAAC,QAAQ;KAC7B,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,OAAO,CACrB,MAAmD;IAEnD,OAAO,CACL,MAAa,EACe,EAAE;QAC9B,MAAM,MAAM,GAAI,MAAM,CAAC,MAA0C,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5E,qBAAqB,CAAC,GAAG,CAAC,MAAM,EAAE;YAChC,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,MAAM;YACN,eAAe,EAAE,MAAM,CAAC,eAGJ;YACpB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;SAC1B,CAAC,CAAC;QACH,OAAO,MAA+C,CAAC;IACzD,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,SAAS,UAAU,CAIjB,cAAwB,EACxB,aAA8D;IAE9D,MAAM,KAAK,GAAG,uBAAuB,CAAC,cAAc,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACpC,qBAAqB,CAAC,GAAG,CAAC,MAAM,EAAE;QAChC,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAqB;KAChD,CAAC,CAAC;IACH,OAAO,MAAiD,CAAC;AAC3D,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,SAAS,cAAc,CAKrB,MAAiE,EACjE,KAAyC;IAEzC,sEAAsE;IACtE,mEAAmE;IACnE,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,EAA+B,CAAC;IAElE,qBAAqB,CAAC,GAAG,CAAC,MAAM,EAAE;QAChC,IAAI,EAAE,YAAY;QAElB,MAAM;QACN,KAAK;KACN,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,2BAA2B;IAMzC,OAAO;QACL,OAAO;QACP,uEAAuE;QACvE,iFAAiF;QACjF,8EAA8E;QAC9E,OAAO,CAKL,MAAa,EACb,MAAoE;YAEpE,OAAO,MAAM,CAAC,KAAK,CACjB,OAAO,CAAC,MAAqD,CAAC,CAC/D,CAAC;QACJ,CAAC;QACD,UAAU;QACV,cAAc;KACf,CAAC;AACJ,CAAC"}

package/dist/references/extract-definition-refs.d.ts

@@ -1,3 +1,4 @@
+import type { z } from 'zod';
 import type { DefinitionEntityWithNameResolver } from './definition-ref-builder.js';
 import type { DefinitionExpression } from './expression-types.js';
 import type { DefinitionReference } from './types.js';
@@ -13,17 +14,17 @@ export interface ExtractDefinitionRefsPayload<TData> {
     expressions: DefinitionExpression[];
 }
 /**
- * Extracts definition refs from a parsed value using functional approach.
+ * Extracts definition refs by walking the schema structure alongside the parsed data.
  *
  * Flow:
- * 1. Collect all refs (entities, references, slots, expressions) recursively
+ * 1. Walk schema+data in parallel using registered collectors
  * 2. Resolve all slot references to actual paths
- * 3. Strip ref markers from the data
- * 4. Resolve entity, reference, and expression parent/slot paths
- * 5. Validate no duplicate IDs
+ * 3. Resolve entity, reference, and expression parent/slot paths
+ * 4. Validate no duplicate IDs
  *
- * @param value - The parsed value from Zod schema
- * @returns The extracted refs with clean data
+ * @param schema - The Zod schema used to validate the data
+ * @param value - The parsed value (output of schema.parse())
+ * @returns The extracted refs with the original data unchanged
  */
-export declare function extractDefinitionRefs<T>(value: T): ExtractDefinitionRefsPayload<T>;
+export declare function extractDefinitionRefs<T>(schema: z.ZodType, value: T): ExtractDefinitionRefsPayload<T>;
 //# sourceMappingURL=extract-definition-refs.d.ts.map

package/dist/references/extract-definition-refs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract-definition-refs.d.ts","sourceRoot":"","sources":["../../src/references/extract-definition-refs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,6BAA6B,CAAC;AACpF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAE,mBAAmB,EAAiB,MAAM,YAAY,CAAC;AAMrE;;;;GAIG;AACH,MAAM,WAAW,4BAA4B,CAAC,KAAK;IACjD,IAAI,EAAE,KAAK,CAAC;IACZ,UAAU,EAAE,mBAAmB,EAAE,CAAC;IAClC,wBAAwB,EAAE,gCAAgC,EAAE,CAAC;IAC7D,WAAW,EAAE,oBAAoB,EAAE,CAAC;CACrC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EACrC,KAAK,EAAE,CAAC,GACP,4BAA4B,CAAC,CAAC,CAAC,CAgGjC"}
+{"version":3,"file":"extract-definition-refs.d.ts","sourceRoot":"","sources":["../../src/references/extract-definition-refs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAM7B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,6BAA6B,CAAC;AAOpF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAiB,MAAM,YAAY,CAAC;AAQrE;;;;GAIG;AACH,MAAM,WAAW,4BAA4B,CAAC,KAAK;IACjD,IAAI,EAAE,KAAK,CAAC;IACZ,UAAU,EAAE,mBAAmB,EAAE,CAAC;IAClC,wBAAwB,EAAE,gCAAgC,EAAE,CAAC;IAC7D,WAAW,EAAE,oBAAoB,EAAE,CAAC;CACrC;AAID;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EACrC,MAAM,EAAE,CAAC,CAAC,OAAO,EACjB,KAAK,EAAE,CAAC,GACP,4BAA4B,CAAC,CAAC,CAAC,CA6LjC"}

package/dist/references/extract-definition-refs.js

@@ -1,35 +1,119 @@
-import { collectRefs } from './collect-refs.js';
+import { get } from 'es-toolkit/compat';
+import { walkDataWithSchema } from '#src/parser/walk-data-with-schema.js';
+import { createRefSchemaCollector, createRefSchemaVisitor, } from './ref-schema-visitor.js';
 import { findNearestAncestorSlot, resolveSlots } from './resolve-slots.js';
-import { stripRefMarkers } from './strip-ref-markers.js';
 /**
- * Extracts definition refs from a parsed value using functional approach.
+ * Extracts definition refs by walking the schema structure alongside the parsed data.
  *
  * Flow:
- * 1. Collect all refs (entities, references, slots, expressions) recursively
+ * 1. Walk schema+data in parallel using registered collectors
  * 2. Resolve all slot references to actual paths
- * 3. Strip ref markers from the data
- * 4. Resolve entity, reference, and expression parent/slot paths
- * 5. Validate no duplicate IDs
+ * 3. Resolve entity, reference, and expression parent/slot paths
+ * 4. Validate no duplicate IDs
  *
- * @param value - The parsed value from Zod schema
- * @returns The extracted refs with clean data
+ * @param schema - The Zod schema used to validate the data
+ * @param value - The parsed value (output of schema.parse())
+ * @returns The extracted refs with the original data unchanged
  */
-export function extractDefinitionRefs(value) {
-    // Step 1: Collect all refs without resolving slots
-    const collected = collectRefs(value);
-    // Step 2: Resolve all slots to paths
-    const resolvedSlots = resolveSlots(collected);
-    // Step 3: Strip markers from data
-    const cleanData = stripRefMarkers(value);
-    // Step 4: Resolve entity, reference, and expression parent/slot paths
+export function extractDefinitionRefs(schema, value) {
+    const entities = [];
+    const references = [];
+    const slots = [];
+    const expressionAnnotations = [];
+    // Entity collector: validates ID and captures name resolver
+    const entityCollector = createRefSchemaCollector({
+        kind: 'entity',
+        visit(meta, data, context) {
+            if (data === null || data === undefined || typeof data !== 'object')
+                return;
+            const id = get(data, meta.idPath);
+            if (typeof id !== 'string' || !id || !meta.type.isId(id)) {
+                throw new Error(`Unable to find valid id field '${meta.idPath.join('.')}' in entity ${meta.type.name} at path ${context.path.join('.')}`);
+            }
+            const nameResolver = (() => {
+                if (meta.getNameResolver) {
+                    return meta.getNameResolver(data);
+                }
+                if (!('name' in data) ||
+                    typeof data.name !== 'string') {
+                    throw new Error(`Unable to find string name field in entity ${meta.type.name} at path ${context.path.join('.')}`);
+                }
+                return data.name;
+            })();
+            entities.push({
+                id,
+                idPath: meta.idPath,
+                path: context.path,
+                type: meta.type,
+                nameResolver,
+                parentSlot: meta.parentSlot,
+                provides: meta.provides,
+            });
+        },
+    });
+    // Reference collector: records non-empty string references
+    const referenceCollector = createRefSchemaCollector({
+        kind: 'reference',
+        visit(meta, data, context) {
+            // Skip empty/undefined references
+            if (typeof data !== 'string' || !data)
+                return;
+            references.push({
+                path: context.path,
+                type: meta.type,
+                onDelete: meta.onDelete,
+                parentSlot: meta.parentSlot,
+                provides: meta.provides,
+            });
+        },
+    });
+    // Slot collector: records which ref-context scopes exist and where
+    const slotCollector = createRefSchemaCollector({
+        kind: 'ref-context',
+        visit(meta, _data, context) {
+            for (const slot of meta.slots) {
+                slots.push({ path: context.path, slot });
+            }
+        },
+    });
+    // Expression collector: records expression annotations
+    const expressionCollector = createRefSchemaCollector({
+        kind: 'expression',
+        visit(meta, data, context) {
+            if (data === undefined || data === null)
+                return;
+            expressionAnnotations.push({
+                path: context.path,
+                value: data,
+                parser: meta.parser,
+                slots: meta.slots,
+            });
+        },
+    });
+    // Walk schema+data in parallel to collect all metadata
+    const refVisitor = createRefSchemaVisitor([
+        entityCollector,
+        referenceCollector,
+        slotCollector,
+        expressionCollector,
+    ]);
+    walkDataWithSchema(schema, value, [refVisitor]);
+    // Resolve all slots to paths (reuses existing slot resolution logic)
+    const resolvedSlots = resolveSlots({
+        entities,
+        references,
+        slots,
+        expressions: expressionAnnotations,
+    });
+    // Helper to resolve a parentSlot to a path
     function resolveParentPath(parentSlot, path) {
         const resolvedSlot = findNearestAncestorSlot(resolvedSlots.get(parentSlot.id), path);
         if (!resolvedSlot) {
-            throw new Error(`Could not resolve parent path from ${path.join('.')} for slot ${parentSlot.id.description}`);
+            throw new Error(`Could not resolve parent path from ${path.join('.')} for slot ${String(parentSlot.id.description)}`);
         }
         return resolvedSlot.resolvedPath;
     }
-    const entitiesWithNameResolver = collected.entities.map((entity) => ({
+    const entitiesWithNameResolver = entities.map((entity) => ({
         id: entity.id,
         idPath: entity.idPath,
         nameResolver: entity.nameResolver,
@@ -39,7 +123,7 @@ export function extractDefinitionRefs(value) {
             ? resolveParentPath(entity.parentSlot, entity.path)
             : undefined,
     }));
-    const references = collected.references.map((reference) => ({
+    const resolvedReferences = references.map((reference) => ({
         type: reference.type,
         path: reference.path,
         onDelete: reference.onDelete,
@@ -48,13 +132,13 @@ export function extractDefinitionRefs(value) {
             : undefined,
     }));
     // Resolve expression slots
-    const expressions = collected.expressions.map((expression) => {
+    const expressions = expressionAnnotations.map((expression) => {
         const resolvedSlotPaths = {};
         if (expression.slots) {
             for (const [key, slot] of Object.entries(expression.slots)) {
                 const resolvedSlot = findNearestAncestorSlot(resolvedSlots.get(slot.id), expression.path);
                 if (!resolvedSlot) {
-                    throw new Error(`Could not resolve expression slot "${key}" at path ${expression.path.join('.')} for slot ${slot.id.description}`);
+                    throw new Error(`Could not resolve expression slot "${key}" at path ${expression.path.join('.')}`);
                 }
                 resolvedSlotPaths[key] = resolvedSlot.resolvedPath;
             }
@@ -66,17 +150,17 @@ export function extractDefinitionRefs(value) {
             resolvedSlots: resolvedSlotPaths,
         };
     });
-    // Step 5: Validate no duplicate IDs
+    // Validate no duplicate entity IDs
     const idSet = new Set();
-    for (const entity of collected.entities) {
+    for (const entity of entities) {
         if (idSet.has(entity.id)) {
             throw new Error(`Duplicate ID found: ${entity.id}`);
         }
         idSet.add(entity.id);
     }
     return {
-        data: cleanData,
-        references,
+        data: value,
+        references: resolvedReferences,
         entitiesWithNameResolver,
         expressions,
     };

package/dist/references/extract-definition-refs.js.map

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

package/dist/references/fix-ref-deletions.d.ts

@@ -1,9 +1,9 @@
-import type { def, DefinitionSchemaCreator, DefinitionSchemaCreatorOptions } from '#src/schema/index.js';
+import type { z } from 'zod';
 import type { DefinitionReference, ResolvedZodRefPayload } from './types.js';
-interface FixRefDeletionSuccessResult<T extends DefinitionSchemaCreator> {
+interface FixRefDeletionSuccessResult<T> {
     type: 'success';
-    value: def.InferOutput<T>;
-    refPayload: ResolvedZodRefPayload<def.InferOutput<T>>;
+    value: T;
+    refPayload: ResolvedZodRefPayload<T>;
 }
 export interface FixRefDeletionError {
     ref: DefinitionReference;
@@ -13,10 +13,10 @@ interface FixRefDeletionFailureResult {
     type: 'failure';
     issues: FixRefDeletionError[];
 }
-export type FixRefDeletionResult<T extends DefinitionSchemaCreator> = FixRefDeletionSuccessResult<T> | FixRefDeletionFailureResult;
+export type FixRefDeletionResult<T> = FixRefDeletionSuccessResult<T> | FixRefDeletionFailureResult;
 /**
  * Fixes any reference deletions by performing the appropriate action for the reference
  */
-export declare function fixRefDeletions<T extends DefinitionSchemaCreator>(schemaCreator: T, value: unknown, schemaCreatorOptions: Omit<DefinitionSchemaCreatorOptions, 'transformReferences'>): FixRefDeletionResult<T>;
+export declare function fixRefDeletions<T extends z.ZodType>(schema: T, value: unknown): FixRefDeletionResult<z.output<T>>;
 export {};
 //# sourceMappingURL=fix-ref-deletions.d.ts.map

package/dist/references/fix-ref-deletions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fix-ref-deletions.d.ts","sourceRoot":"","sources":["../../src/references/fix-ref-deletions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,GAAG,EACH,uBAAuB,EACvB,8BAA8B,EAC/B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EACV,mBAAmB,EAEnB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AAIpB,UAAU,2BAA2B,CAAC,CAAC,SAAS,uBAAuB;IACrE,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC1B,UAAU,EAAE,qBAAqB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;CACvD;AAED,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,mBAAmB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,2BAA2B;IACnC,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,mBAAmB,EAAE,CAAC;CAC/B;AAED,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,uBAAuB,IAC9D,2BAA2B,CAAC,CAAC,CAAC,GAC9B,2BAA2B,CAAC;AAKhC;;GAEG;AACH,wBAAgB,eAAe,CAAC,CAAC,SAAS,uBAAuB,EAC/D,aAAa,EAAE,CAAC,EAChB,KAAK,EAAE,OAAO,EACd,oBAAoB,EAAE,IAAI,CACxB,8BAA8B,EAC9B,qBAAqB,CACtB,GACA,oBAAoB,CAAC,CAAC,CAAC,CAsHzB"}
+{"version":3,"file":"fix-ref-deletions.d.ts","sourceRoot":"","sources":["../../src/references/fix-ref-deletions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAK7B,OAAO,KAAK,EACV,mBAAmB,EAEnB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AAIpB,UAAU,2BAA2B,CAAC,CAAC;IACrC,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,CAAC,CAAC;IACT,UAAU,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,mBAAmB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,2BAA2B;IACnC,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,mBAAmB,EAAE,CAAC;CAC/B;AAED,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAC9B,2BAA2B,CAAC,CAAC,CAAC,GAC9B,2BAA2B,CAAC;AAKhC;;GAEG;AACH,wBAAgB,eAAe,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EACjD,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,OAAO,GACb,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAqHnC"}

package/dist/references/fix-ref-deletions.js

@@ -6,13 +6,13 @@ const DELETED_SENTINEL_ID = 'deleted-sentinel-id';
 /**
  * Fixes any reference deletions by performing the appropriate action for the reference
  */
-export function fixRefDeletions(schemaCreator, value, schemaCreatorOptions) {
+export function fixRefDeletions(schema, value) {
     const issues = [];
     // find all references that do not have a corresponding entity
     let iterations;
     let valueToEdit = value;
     for (iterations = 0; iterations < 100; iterations++) {
-        const parseResult = parseSchemaWithTransformedReferences(schemaCreator, valueToEdit, schemaCreatorOptions, {
+        const parseResult = parseSchemaWithTransformedReferences(schema, valueToEdit, {
             allowInvalidReferences: true,
         });
         const { references, entities } = parseResult;

package/dist/references/fix-ref-deletions.js.map

@@ -1 +1 @@
-{"version":3,"file":"fix-ref-deletions.js","sourceRoot":"","sources":["../../src/references/fix-ref-deletions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fix-ref-deletions.js","sourceRoot":"","sources":["../../src/references/fix-ref-deletions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAQtD,OAAO,EAAE,oCAAoC,EAAE,MAAM,mCAAmC,CAAC;AAsBzF,qEAAqE;AACrE,MAAM,mBAAmB,GAAG,qBAAqB,CAAC;AAElD;;GAEG;AACH,MAAM,UAAU,eAAe,CAC7B,MAAS,EACT,KAAc;IAEd,MAAM,MAAM,GAA0B,EAAE,CAAC;IAEzC,8DAA8D;IAC9D,IAAI,UAAU,CAAC;IACf,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,KAAK,UAAU,GAAG,CAAC,EAAE,UAAU,GAAG,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC;QACpD,MAAM,WAAW,GAAG,oCAAoC,CACtD,MAAM,EACN,WAAW,EACX;YACE,sBAAsB,EAAE,IAAI;SAC7B,CACF,CAAC;QACF,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;QAC7C,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC;QAC/B,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,uBAAuB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACtD,MAAM,EAAE,GAAG,GAAG,CAAC,WAAqB,EAAE,CAAC,CAAC,IAAI,CAAW,CAAC;YACxD,OAAO,EAAE,KAAK,mBAAmB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,IAAI,uBAAuB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,MAAM;iBACP,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,WAA0B;gBACjC,UAAU,EAAE,WAAW;aACxB,CAAC;QACJ,CAAC;QAED,MAAM,sBAAsB,GAGtB,EAAE,CAAC;QAET,SAAS,eAAe,CAAC,IAAmB;YAC1C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtB,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACrC,MAAM,MAAM,GAAG,GAAG,CAAC,WAAqB,EAAE,UAAU,CAAY,CAAC;YACjE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3B,OAAO,KAAK,CAAC;YACf,CAAC;YACD,sBAAsB,CAAC,IAAI,CAAC;gBAC1B,IAAI,EAAE,UAAU;gBAChB,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAW;aAC3B,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,2BAA2B;QAC3B,KAAK,MAAM,GAAG,IAAI,uBAAuB,EAAE,CAAC;YAC1C,MAAM,EAAE,GAAG,GAAG,CAAC,WAAqB,EAAE,GAAG,CAAC,IAAI,CAAW,CAAC;YAE1D,QAAQ,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACrB,KAAK,eAAe,CAAC,CAAC,CAAC;oBACrB,wCAAwC;oBACxC,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACxB,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;wBACzC,MAAM,MAAM,GAAG,GAAG,CAAC,WAAqB,EAAE,UAAU,CAAY,CAAC;wBACjE,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;4BAC1B,MAAM,IAAI,SAAS,CACjB,qEAAqE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,mDAAmD,CAC3I,CAAC;wBACJ,CAAC;oBACH,CAAC;oBACD,GAAG,CAAC,WAAqB,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;oBAChD,MAAM;gBACR,CAAC;gBACD,KAAK,UAAU,CAAC,CAAC,CAAC;oBAChB,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;oBACnC,GAAG,CAAC,WAAqB,EAAE,GAAG,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;oBAC1D,MAAM;gBACR,CAAC;gBACD,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACd,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC/B,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;oBAC7D,CAAC;oBACD,MAAM;gBACR,CAAC;gBACD,KAAK,eAAe,CAAC,CAAC,CAAC;oBACrB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC5C,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;oBAC7D,CAAC;oBACD,MAAM;gBACR,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;oBACR,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,CAAC,QAAkB,EAAE,CAAC,CAAC;gBACvE,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAAC,EAAE,EAAE,CAClE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CACjB,CAAC;QAEF,0DAA0D;QAC1D,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC;YAChE,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACvD,KAAK,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC;gBAC9B,MAAM,MAAM,GAAG,GAAG,CAAC,WAAqB,EAAE,CAAC,CAAC,IAAI,CAAY,CAAC;gBAC7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC3B,MAAM,IAAI,SAAS,CACjB,0CAA0C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAC7D,CAAC;gBACJ,CAAC;gBACD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;AAC9D,CAAC"}