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

package/dist/tools/entity-service/types.d.ts

@@ -0,0 +1,41 @@
+import type { z } from 'zod';
+import type { SchemaPathElement } from '#src/parser/walk-schema-structure.js';
+import type { EntitySchemaMeta } from '#src/references/definition-ref-registry.js';
+import type { DefinitionEntity, DefinitionEntityType } from '#src/references/types.js';
+/**
+ * Metadata about an entity type's location in the definition schema.
+ */
+export interface EntityTypeMetadata {
+    /** Entity type name (e.g., "model", "model-scalar-field") */
+    name: string;
+    /** The DefinitionEntityType instance */
+    entityType: DefinitionEntityType;
+    /** Entity metadata from schema annotations */
+    entityMeta: EntitySchemaMeta;
+    /** Element schema for the entity array */
+    elementSchema: z.ZodType;
+    /** Path from parent entity (or root) to this entity's array */
+    relativePath: SchemaPathElement[];
+    /** Parent entity type name, if this is a nested entity */
+    parentEntityTypeName?: string;
+}
+/**
+ * Map from entity type name to its metadata.
+ * Built once from the schema and reused for all operations.
+ */
+export type EntityTypeMap = Map<string, EntityTypeMetadata>;
+export interface EntityServiceContext {
+    /**
+     * The serialized definition but with defaults provided.
+     */
+    serializedDefinition: Record<string, unknown>;
+    /**
+     * The entity type map built from the schema.
+     */
+    entityTypeMap: EntityTypeMap;
+    /**
+     * Looks up an entity by its ID.
+     */
+    lookupEntity: (entityId: string) => DefinitionEntity | undefined;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/tools/entity-service/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/tools/entity-service/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AACnF,OAAO,KAAK,EACV,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,6DAA6D;IAC7D,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,UAAU,EAAE,oBAAoB,CAAC;IACjC,8CAA8C;IAC9C,UAAU,EAAE,gBAAgB,CAAC;IAC7B,0CAA0C;IAC1C,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC;IACzB,+DAA+D;IAC/D,YAAY,EAAE,iBAAiB,EAAE,CAAC;IAClC,0DAA0D;IAC1D,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;AAE5D,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9C;;OAEG;IACH,aAAa,EAAE,aAAa,CAAC;IAC7B;;OAEG;IACH,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,gBAAgB,GAAG,SAAS,CAAC;CAClE"}

package/dist/tools/entity-service/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/tools/entity-service/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/tools/entity-service/types.ts"],"names":[],"mappings":""}

package/dist/tools/index.d.ts

@@ -1,2 +1,3 @@
-export * from './model-merger/index.js';
+export * from './entity-service/index.js';
+export * from './merge-schema/index.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/tools/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC"}

package/dist/tools/index.js

@@ -1,2 +1,3 @@
-export * from './model-merger/index.js';
+export * from './entity-service/index.js';
+export * from './merge-schema/index.js';
 //# sourceMappingURL=index.js.map

package/dist/tools/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC"}

package/dist/tools/merge-schema/diff-definition.d.ts

@@ -0,0 +1,74 @@
+import type { z } from 'zod';
+import type { PartialProjectDefinitionInput, ProjectDefinition } from '#src/schema/index.js';
+type PlainObject = Record<string, unknown>;
+/**
+ * A single diff entry representing a changed entity or section.
+ */
+export interface DefinitionDiffEntry {
+    /** Top-level key in the definition (e.g., "models", "settings") */
+    path: string;
+    /**
+     * Human-readable label for this entry.
+     *
+     * Entity arrays: `"Model: User"`, `"App: backend"`
+     * Other fields: `"Settings"`, `"Features"`
+     */
+    label: string;
+    /** Type of change */
+    type: 'added' | 'updated' | 'removed';
+    /** The current serialized value (undefined for additions) */
+    current: unknown;
+    /** The merged serialized value (undefined for removals) */
+    merged: unknown;
+}
+/**
+ * Result of diffing a project definition against a partial merge.
+ */
+export interface DefinitionDiff {
+    /** Whether there are any changes */
+    hasChanges: boolean;
+    /** Individual diff entries grouped by entity/section */
+    entries: DefinitionDiffEntry[];
+}
+export interface DiffSerializedDefinitionsOptions {
+    /**
+     * When provided, only these top-level keys are compared.
+     * When omitted, all keys from both definitions are compared.
+     */
+    scopeToKeys?: Set<string>;
+    /**
+     * When provided, entity array diffs are scoped to only these entity names
+     * per top-level key. When omitted, all entities in both arrays are compared.
+     */
+    entityNamesByKey?: Map<string, Set<string>>;
+}
+/**
+ * Compares two serialized project definitions at the entity level, producing
+ * diff entries for added, updated, and removed entities/fields.
+ *
+ * Both definitions should be in serialized form (with entity names, not IDs).
+ *
+ * @param schema - The project definition Zod schema
+ * @param currentDef - The current serialized definition
+ * @param otherDef - The other serialized definition to compare against
+ * @param options - Optional scoping options
+ * @returns Entity-level diff entries
+ */
+export declare function diffSerializedDefinitions(schema: z.ZodType, currentDef: PlainObject, otherDef: PlainObject, options?: DiffSerializedDefinitionsOptions): DefinitionDiff;
+/**
+ * Computes a structured, entity-grouped diff between the current project definition
+ * and the result of merging a partial definition into it.
+ *
+ * For top-level entity arrays (models, apps, enums, libraries, features), produces
+ * one entry per entity that was added, updated, or removed — detected via schema
+ * entity metadata (`withEnt` annotations) using `collectEntityArrays`. For other
+ * top-level fields (settings, plugins, etc.), produces one entry per changed field.
+ *
+ * @param schema - The project definition Zod schema
+ * @param definition - The current parsed project definition (with IDs)
+ * @param partialDef - A partial serialized definition to merge in
+ * @returns A structured diff with entity-level entries
+ */
+export declare function diffDefinition(schema: z.ZodType, definition: ProjectDefinition, partialDef: PartialProjectDefinitionInput): DefinitionDiff;
+export {};
+//# sourceMappingURL=diff-definition.d.ts.map

package/dist/tools/merge-schema/diff-definition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff-definition.d.ts","sourceRoot":"","sources":["../../../src/tools/merge-schema/diff-definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAM7B,OAAO,KAAK,EACV,6BAA6B,EAC7B,iBAAiB,EAClB,MAAM,sBAAsB,CAAC;AAQ9B,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,mEAAmE;IACnE,IAAI,EAAE,MAAM,CAAC;IACb;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IACd,qBAAqB;IACrB,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;IACtC,6DAA6D;IAC7D,OAAO,EAAE,OAAO,CAAC;IACjB,2DAA2D;IAC3D,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,oCAAoC;IACpC,UAAU,EAAE,OAAO,CAAC;IACpB,wDAAwD;IACxD,OAAO,EAAE,mBAAmB,EAAE,CAAC;CAChC;AAuED,MAAM,WAAW,gCAAgC;IAC/C;;;OAGG;IACH,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAE1B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CAC7C;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,CAAC,CAAC,OAAO,EACjB,UAAU,EAAE,WAAW,EACvB,QAAQ,EAAE,WAAW,EACrB,OAAO,CAAC,EAAE,gCAAgC,GACzC,cAAc,CA2EhB;AAMD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,CAAC,CAAC,OAAO,EACjB,UAAU,EAAE,iBAAiB,EAC7B,UAAU,EAAE,6BAA6B,GACxC,cAAc,CAwChB"}

package/dist/tools/merge-schema/diff-definition.js

@@ -0,0 +1,163 @@
+import { isEqual } from 'es-toolkit';
+import { capitalize } from 'es-toolkit/compat';
+import { serializeSchema } from '#src/references/serialize-schema.js';
+import { getEntityName } from './entity-utils.js';
+import { mergeDefinition } from './merge-definition.js';
+import { collectEntityArrays } from './walk-schema.js';
+// ---------------------------------------------------------------------------
+// Entity array diffing
+// ---------------------------------------------------------------------------
+/**
+ * Diffs an entity array by the `name` field.
+ *
+ * When `scopeToNames` is provided, only those entities are compared — this prevents
+ * showing "removed" entries for entities that the partial doesn't care about.
+ * When omitted, all entities in both arrays are compared.
+ */
+function diffEntityArray(path, entityMeta, currentArray, otherArray, scopeToNames) {
+    const entries = [];
+    const label = capitalize(entityMeta.type.name);
+    const currentByName = new Map(currentArray.map((item) => [getEntityName(entityMeta, item), item]));
+    const otherByName = new Map(otherArray.map((item) => [getEntityName(entityMeta, item), item]));
+    const namesToDiff = scopeToNames ?? new Set([...currentByName.keys(), ...otherByName.keys()]);
+    for (const name of namesToDiff) {
+        const currentItem = currentByName.get(name);
+        const otherItem = otherByName.get(name);
+        if (!currentItem && otherItem) {
+            entries.push({
+                path,
+                label: `${label}: ${name}`,
+                type: 'added',
+                current: undefined,
+                merged: otherItem,
+            });
+        }
+        else if (currentItem && !otherItem) {
+            entries.push({
+                path,
+                label: `${label}: ${name}`,
+                type: 'removed',
+                current: currentItem,
+                merged: undefined,
+            });
+        }
+        else if (currentItem && otherItem && !isEqual(currentItem, otherItem)) {
+            entries.push({
+                path,
+                label: `${label}: ${name}`,
+                type: 'updated',
+                current: currentItem,
+                merged: otherItem,
+            });
+        }
+    }
+    return entries;
+}
+/**
+ * Compares two serialized project definitions at the entity level, producing
+ * diff entries for added, updated, and removed entities/fields.
+ *
+ * Both definitions should be in serialized form (with entity names, not IDs).
+ *
+ * @param schema - The project definition Zod schema
+ * @param currentDef - The current serialized definition
+ * @param otherDef - The other serialized definition to compare against
+ * @param options - Optional scoping options
+ * @returns Entity-level diff entries
+ */
+export function diffSerializedDefinitions(schema, currentDef, otherDef, options) {
+    const entityArrayInfoByKey = new Map(collectEntityArrays(schema)
+        .filter((info) => !info.path.includes('.'))
+        .map((info) => [info.path, info]));
+    const entries = [];
+    const keysToCompare = options?.scopeToKeys ??
+        new Set([...Object.keys(currentDef), ...Object.keys(otherDef)]);
+    for (const key of keysToCompare) {
+        const currentValue = currentDef[key];
+        const otherValue = otherDef[key];
+        if (isEqual(currentValue, otherValue)) {
+            continue;
+        }
+        const entityInfo = entityArrayInfoByKey.get(key);
+        if (entityInfo) {
+            const currentArray = (Array.isArray(currentValue) ? currentValue : []);
+            const otherArray = (Array.isArray(otherValue) ? otherValue : []);
+            const scopeToNames = options?.entityNamesByKey?.get(key);
+            entries.push(...diffEntityArray(key, entityInfo.entityMeta, currentArray, otherArray, scopeToNames));
+        }
+        else {
+            const label = capitalize(key);
+            if (currentValue === undefined) {
+                entries.push({
+                    path: key,
+                    label,
+                    type: 'added',
+                    current: undefined,
+                    merged: otherValue,
+                });
+            }
+            else if (otherValue === undefined) {
+                entries.push({
+                    path: key,
+                    label,
+                    type: 'removed',
+                    current: currentValue,
+                    merged: undefined,
+                });
+            }
+            else {
+                entries.push({
+                    path: key,
+                    label,
+                    type: 'updated',
+                    current: currentValue,
+                    merged: otherValue,
+                });
+            }
+        }
+    }
+    return {
+        hasChanges: entries.length > 0,
+        entries,
+    };
+}
+// ---------------------------------------------------------------------------
+// High-level diff with merge
+// ---------------------------------------------------------------------------
+/**
+ * Computes a structured, entity-grouped diff between the current project definition
+ * and the result of merging a partial definition into it.
+ *
+ * For top-level entity arrays (models, apps, enums, libraries, features), produces
+ * one entry per entity that was added, updated, or removed — detected via schema
+ * entity metadata (`withEnt` annotations) using `collectEntityArrays`. For other
+ * top-level fields (settings, plugins, etc.), produces one entry per changed field.
+ *
+ * @param schema - The project definition Zod schema
+ * @param definition - The current parsed project definition (with IDs)
+ * @param partialDef - A partial serialized definition to merge in
+ * @returns A structured diff with entity-level entries
+ */
+export function diffDefinition(schema, definition, partialDef) {
+    const serializedDef = serializeSchema(schema, definition);
+    const mergedDef = mergeDefinition(schema, definition, partialDef);
+    const partialObj = partialDef;
+    const scopeToKeys = new Set(Object.keys(partialObj));
+    // Build entity name scopes from the partial definition
+    const entityArrayInfoByKey = new Map(collectEntityArrays(schema)
+        .filter((info) => !info.path.includes('.'))
+        .map((info) => [info.path, info]));
+    const entityNamesByKey = new Map();
+    for (const key of scopeToKeys) {
+        const entityInfo = entityArrayInfoByKey.get(key);
+        if (entityInfo) {
+            const partialArray = (Array.isArray(partialObj[key]) ? partialObj[key] : []);
+            entityNamesByKey.set(key, new Set(partialArray.map((item) => getEntityName(entityInfo.entityMeta, item))));
+        }
+    }
+    return diffSerializedDefinitions(schema, serializedDef, mergedDef, {
+        scopeToKeys,
+        entityNamesByKey,
+    });
+}
+//# sourceMappingURL=diff-definition.js.map

package/dist/tools/merge-schema/diff-definition.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff-definition.js","sourceRoot":"","sources":["../../../src/tools/merge-schema/diff-definition.ts"],"names":[],"mappings":"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"}

package/dist/tools/merge-schema/entity-utils.d.ts

@@ -0,0 +1,18 @@
+import type { z } from 'zod';
+import type { EntitySchemaMeta } from '#src/references/definition-ref-registry.js';
+type PlainObject = Record<string, unknown>;
+/**
+ * Returns the first EntitySchemaMeta found on the given schema or any inner
+ * schema reachable through wrappers (optional/nullable/default).
+ */
+export declare function getEntityMeta(schema: z.ZodType): EntitySchemaMeta | undefined;
+/**
+ * Resolves the name of an entity from its serialized (name-based) data using
+ * the entity schema's name resolver.
+ *
+ * Since the data is already serialized, reference IDs are already names —
+ * no cross-entity resolution or toposort is needed.
+ */
+export declare function getEntityName(entityMeta: EntitySchemaMeta, item: PlainObject): string;
+export {};
+//# sourceMappingURL=entity-utils.d.ts.map

package/dist/tools/merge-schema/entity-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity-utils.d.ts","sourceRoot":"","sources":["../../../src/tools/merge-schema/entity-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAKnF,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE3C;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,GAAG,gBAAgB,GAAG,SAAS,CAY7E;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,UAAU,EAAE,gBAAgB,EAC5B,IAAI,EAAE,WAAW,GAChB,MAAM,CAgBR"}

package/dist/tools/merge-schema/entity-utils.js

@@ -0,0 +1,42 @@
+import { getSchemaChildren } from '#src/parser/schema-structure.js';
+import { definitionRefRegistry } from '#src/references/definition-ref-registry.js';
+/**
+ * Returns the first EntitySchemaMeta found on the given schema or any inner
+ * schema reachable through wrappers (optional/nullable/default).
+ */
+export function getEntityMeta(schema) {
+    const meta = definitionRefRegistry
+        .getAll(schema)
+        .find((m) => m.kind === 'entity');
+    if (meta) {
+        return meta;
+    }
+    const children = getSchemaChildren(schema, undefined, []);
+    if (children.kind === 'wrapper') {
+        return getEntityMeta(children.innerSchema);
+    }
+    return undefined;
+}
+/**
+ * Resolves the name of an entity from its serialized (name-based) data using
+ * the entity schema's name resolver.
+ *
+ * Since the data is already serialized, reference IDs are already names —
+ * no cross-entity resolution or toposort is needed.
+ */
+export function getEntityName(entityMeta, item) {
+    if (!entityMeta.getNameResolver) {
+        return item.name;
+    }
+    const resolver = entityMeta.getNameResolver(item);
+    if (typeof resolver === 'string') {
+        return resolver;
+    }
+    // In serialized data, reference IDs are already names — pass them through
+    const resolvedIds = Object.fromEntries(Object.entries(resolver.idsToResolve ?? {}).map(([key, idOrIds]) => [
+        key,
+        idOrIds,
+    ]));
+    return resolver.resolveName(resolvedIds);
+}
+//# sourceMappingURL=entity-utils.js.map

package/dist/tools/merge-schema/entity-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity-utils.js","sourceRoot":"","sources":["../../../src/tools/merge-schema/entity-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAInF;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,MAAiB;IAC7C,MAAM,IAAI,GAAG,qBAAqB;SAC/B,MAAM,CAAC,MAAM,CAAC;SACd,IAAI,CAAC,CAAC,CAAC,EAAyB,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IAC3D,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;IAC1D,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAC3B,UAA4B,EAC5B,IAAiB;IAEjB,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC,IAAc,CAAC;IAC7B,CAAC;IACD,MAAM,QAAQ,GAAG,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,0EAA0E;IAC1E,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CACpC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;QAClE,GAAG;QACH,OAAO;KACR,CAAC,CACH,CAAC;IACF,OAAO,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;AAC3C,CAAC"}

package/dist/tools/merge-schema/index.d.ts

@@ -0,0 +1,10 @@
+export { diffDefinition, diffSerializedDefinitions, } from './diff-definition.js';
+export type { DefinitionDiff, DefinitionDiffEntry, DiffSerializedDefinitionsOptions, } from './diff-definition.js';
+export { getEntityName } from './entity-utils.js';
+export { mergeDataWithSchema } from './merge-data-with-schema.js';
+export { applyMergedDefinition, mergeDefinition, mergeDefinitionContainer, } from './merge-definition.js';
+export { getMergeRule, withByKeyMergeRule, withMergeRule, } from './merge-rule-registry.js';
+export type { MergeRule } from './merge-rule-registry.js';
+export { collectEntityArrays } from './walk-schema.js';
+export type { EntityArrayInfo } from './walk-schema.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/tools/merge-schema/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/merge-schema/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EACV,cAAc,EACd,mBAAmB,EACnB,gCAAgC,GACjC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,aAAa,GACd,MAAM,0BAA0B,CAAC;AAClC,YAAY,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/tools/merge-schema/index.js

@@ -0,0 +1,7 @@
+export { diffDefinition, diffSerializedDefinitions, } from './diff-definition.js';
+export { getEntityName } from './entity-utils.js';
+export { mergeDataWithSchema } from './merge-data-with-schema.js';
+export { applyMergedDefinition, mergeDefinition, mergeDefinitionContainer, } from './merge-definition.js';
+export { getMergeRule, withByKeyMergeRule, withMergeRule, } from './merge-rule-registry.js';
+export { collectEntityArrays } from './walk-schema.js';
+//# sourceMappingURL=index.js.map

package/dist/tools/merge-schema/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/merge-schema/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,aAAa,GACd,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/tools/merge-schema/merge-data-with-schema.d.ts

@@ -0,0 +1,21 @@
+import type { PartialDeep } from 'type-fest';
+import type { z } from 'zod';
+/**
+ * Merges two values according to the given Zod schema and any registered merge rules.
+ *
+ * Default behaviors:
+ * - Leaf scalar → desired replaces current
+ * - Object → merge fields recursively; `undefined` desired fields keep current value (partial patch)
+ * - Array whose element has `withEnt` annotation → merge by entity name (add-only, order-preserving)
+ * - Any other array → full replace with desired
+ * - Wrapper (optional/nullable/default) → descend to inner schema
+ * - Discriminated union → find matching branch by discriminator, merge
+ *
+ * Explicit rules from `withMergeRule` override the defaults:
+ * - `replace` → always return desired value
+ * - `by-key` → merge array by a custom key function (add-only)
+ */
+export declare function mergeDataWithSchema<T extends z.ZodType>(schema: T, current: z.input<T>, desired: PartialDeep<z.input<T>, {
+    recurseIntoArrays: true;
+}>): z.input<T>;
+//# sourceMappingURL=merge-data-with-schema.d.ts.map

package/dist/tools/merge-schema/merge-data-with-schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-data-with-schema.d.ts","sourceRoot":"","sources":["../../../src/tools/merge-schema/merge-data-with-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAc7B;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EACrD,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EACnB,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IAAE,iBAAiB,EAAE,IAAI,CAAA;CAAE,CAAC,GAC5D,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAEZ"}

package/dist/tools/merge-schema/merge-data-with-schema.js

@@ -0,0 +1,168 @@
+import { toMerged } from 'es-toolkit';
+import { getSchemaChildren } from '#src/parser/schema-structure.js';
+import { assignEntityIds } from '../assign-entity-ids.js';
+import { getEntityMeta, getEntityName } from './entity-utils.js';
+import { getMergeRule } from './merge-rule-registry.js';
+/**
+ * Merges two values according to the given Zod schema and any registered merge rules.
+ *
+ * Default behaviors:
+ * - Leaf scalar → desired replaces current
+ * - Object → merge fields recursively; `undefined` desired fields keep current value (partial patch)
+ * - Array whose element has `withEnt` annotation → merge by entity name (add-only, order-preserving)
+ * - Any other array → full replace with desired
+ * - Wrapper (optional/nullable/default) → descend to inner schema
+ * - Discriminated union → find matching branch by discriminator, merge
+ *
+ * Explicit rules from `withMergeRule` override the defaults:
+ * - `replace` → always return desired value
+ * - `by-key` → merge array by a custom key function (add-only)
+ */
+export function mergeDataWithSchema(schema, current, desired) {
+    return mergeDataWithSchemaInternal(schema, current, desired);
+}
+/**
+ * Internal untyped implementation of the schema-driven merge walker.
+ */
+function mergeDataWithSchemaInternal(schema, current, desired) {
+    // If desired is undefined, always keep current (partial patch semantics)
+    if (desired === undefined) {
+        return current;
+    }
+    // Check for explicit merge rule registered via withMergeRule
+    const rule = getMergeRule(schema);
+    if (rule) {
+        switch (rule.kind) {
+            case 'replace': {
+                return desired;
+            }
+            case 'by-key': {
+                return mergeByKey(current, desired, rule.getKey);
+            }
+        }
+    }
+    const children = getSchemaChildren(schema, desired, []);
+    switch (children.kind) {
+        case 'leaf':
+        case 'leaf-union': {
+            return desired;
+        }
+        case 'wrapper': {
+            return mergeDataWithSchemaInternal(children.innerSchema, current, desired);
+        }
+        case 'object': {
+            const currentObj = (current ?? {});
+            const desiredObj = desired;
+            const merged = { ...currentObj };
+            for (const [key, fieldSchema] of children.entries) {
+                const desiredValue = desiredObj[key];
+                if (desiredValue === undefined) {
+                    // Keep current value — partial patch semantics
+                    continue;
+                }
+                merged[key] = mergeDataWithSchemaInternal(fieldSchema, currentObj[key], desiredValue);
+            }
+            return merged;
+        }
+        case 'array': {
+            const { elementSchema } = children;
+            const entityMeta = getEntityMeta(elementSchema);
+            // Auto-detect entity arrays: merge by `name` field
+            if (entityMeta) {
+                return mergeEntityArray(current, desired, elementSchema, entityMeta);
+            }
+            // Default: full replace
+            return desired;
+        }
+        case 'discriminated-union': {
+            if (!children.match) {
+                // No matching branch found for desired — replace
+                return desired;
+            }
+            // If current matches a different branch, replace to avoid leaking stale fields
+            const currentChildren = getSchemaChildren(schema, current, []);
+            if (currentChildren.kind !== 'discriminated-union' ||
+                currentChildren.match !== children.match) {
+                return desired;
+            }
+            return mergeDataWithSchemaInternal(children.match, current, desired);
+        }
+        case 'tuple':
+        case 'record':
+        case 'intersection': {
+            // For these structural types, default to full replace
+            return desired;
+        }
+    }
+}
+/**
+ * Merges an array of entity objects by name (add-only, order-preserving).
+ *
+ * - Current items are kept in their original order
+ * - Matched items (by name) are merged recursively via schema
+ * - Current items not in desired are kept as-is
+ * - New desired items are appended at the end with fresh generated IDs
+ */
+function mergeEntityArray(current, desired, elementSchema, entityMeta) {
+    const currentItems = current ?? [];
+    const desiredByName = new Map(desired.map((item) => [getEntityName(entityMeta, item), item]));
+    const seen = new Set();
+    const result = [];
+    // Walk current items in order — merge matched, keep unmatched
+    for (const currentItem of currentItems) {
+        const name = getEntityName(entityMeta, currentItem);
+        const desiredItem = desiredByName.get(name);
+        if (desiredItem) {
+            result.push(mergeDataWithSchemaInternal(elementSchema, currentItem, desiredItem));
+            seen.add(name);
+        }
+        else {
+            result.push(currentItem);
+        }
+    }
+    // Append new desired items at the end, with fresh IDs
+    for (const desiredItem of desired) {
+        const name = getEntityName(entityMeta, desiredItem);
+        if (!seen.has(name)) {
+            const baseItem = assignEntityIds(elementSchema, desiredItem);
+            result.push(mergeDataWithSchemaInternal(elementSchema, {}, baseItem));
+            seen.add(name);
+        }
+    }
+    return result;
+}
+/**
+ * Merges an array by a custom key function (add-only).
+ *
+ * - Items in `desired` that match a `current` item (by key) are merged with `toMerged`
+ * - Items in `desired` not in `current` are appended
+ * - Items in `current` not in `desired` are kept (add-only semantics)
+ */
+function mergeByKey(current, desired, getKey) {
+    const currentItems = current ?? [];
+    const desiredByKey = new Map(desired.map((item) => [getKey(item), item]));
+    const seen = new Set();
+    const result = [];
+    // Walk current items in order — merge matched, keep unmatched
+    for (const currentItem of currentItems) {
+        const key = getKey(currentItem);
+        const desiredItem = desiredByKey.get(key);
+        if (desiredItem) {
+            result.push(toMerged(currentItem, desiredItem));
+            seen.add(key);
+        }
+        else {
+            result.push(currentItem);
+        }
+    }
+    // Append new desired items (not in current) at the end
+    for (const desiredItem of desired) {
+        const key = getKey(desiredItem);
+        if (!seen.has(key)) {
+            result.push(desiredItem);
+            seen.add(key);
+        }
+    }
+    return result;
+}
+//# sourceMappingURL=merge-data-with-schema.js.map

package/dist/tools/merge-schema/merge-data-with-schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-data-with-schema.js","sourceRoot":"","sources":["../../../src/tools/merge-schema/merge-data-with-schema.ts"],"names":[],"mappings":"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"}