@postxl/generators 1.11.3 → 1.11.5

package/dist/backend-import/generators/detect-delta/detect-delta-all-models.generator.js

@@ -13,11 +13,16 @@ function generateDetectDeltaAllModels(context) {
         .add(context.import.detectDelta.types.generic.modelType)
         .addType(context.import.detectDelta.types.generic.errors.type)
         .add(context.import.detectDelta.types.generic.errors.typeGuard)
+        .add(context.import.detectDelta._utils.ensureItemsHaveIds)
         .addImport({
         from: (0, generator_1.toPackageName)('@postxl/utils'),
         items: [(0, generator_1.toFunctionName)('red'), (0, generator_1.toFunctionName)('format'), (0, generator_1.toFunctionName)('pluralize')],
+    })
+        .addImport({
+        from: (0, generator_1.toPackageName)('node:crypto'),
+        items: [(0, generator_1.toFunctionName)('randomUUID')],
     });
-    const { resultAssignments, idMapTypes, idMapInit, keyMapTypes, keyMapInit, deltaTypes } = prepareModelDeltaTypes({
+    const { resultAssignments, idMapTypes, keyMapTypes, deltaTypes, prepareImportMapsAssignments, prepareImportMapsIdMapResult, prepareImportMapsKeyMapResult, } = prepareModelDeltaTypes({
         context,
         imports,
     });
@@ -45,39 +50,25 @@ export type KeyMap = {
   ${keyMapTypes.join('\n')}
 }
 
-function getIdMap(data: DataModel): ${context.import.detectDelta.allModels.idMapType.name} {
-  const result: IdMap = {
-    ${idMapInit.join(',\n')}
-  }
-  return result
-}
-
-function getKeyMap(data: DataModel): KeyMap {
-  const result: KeyMap = {
-    ${keyMapInit.join(',\n')}
-  }
-  return result
-}
-
-function toIdMap<Model extends {id: ID}, ID extends string>(items?: Model[]): Map<ID, Model> {
-  const result = new Map<ID, Model>()
-  if (!items) return result
-  for (const item of items) {
-    result.set(item.id, item)
-  }
-  return result
-}
+/**
+ * Pass 1: Ensure all items have IDs assigned.
+ * For items without an ID, check database by key or generate a new UUID.
+ * This populates idMap and keyMap with items that have proper IDs.
+ */
+async function prepareImportMaps(
+  dataService: ${context.repositories.dataService.name},
+  data: ${decoders.dataModel.decodedType.name},
+): Promise<{ idMap: ${context.import.detectDelta.allModels.idMapType.name}; keyMap: KeyMap }> {
+  ${prepareImportMapsAssignments.join('\n')}
 
-function toKeyMap<Model, Key extends string | number>(items: Model[] | undefined, keyField: keyof Model): Map<Key, Model> {
-  const result = new Map<Key, Model>()
-  if (!items) return result
-  for (const item of items) {
-    const key = item[keyField] as Key
-    if (key !== undefined && key !== null) {
-      result.set(key, item)
-    }
+  return {
+    idMap: {
+      ${prepareImportMapsIdMapResult.join(',\n')}
+    },
+    keyMap: {
+      ${prepareImportMapsKeyMapResult.join(',\n')}
+    },
   }
-  return result
 }
 
 export async function detectDelta(
@@ -85,11 +76,18 @@ export async function detectDelta(
   data: ${decoders.dataModel.decodedType.name},
   throwInCaseOfError = true,
 ): Promise<${allModels.type.name}> {
-  const idMap = getIdMap(data)
-  const keyMap = getKeyMap(data)
+  // Pass 1: Ensure all items have IDs and build lookup maps
+  // This must happen FIRST so that when resolving relation keys,
+  // referenced items already have their IDs assigned.
+  const { idMap, keyMap } = await prepareImportMaps(dataService, data)
+
+  // Pass 2 & 3: Run delta detection (which includes relation key resolution)
+  // The resolveRelationKeys callback in each model's detectDelta will use
+  // idMap and keyMap to resolve relation field keys to proper IDs.
   const result: ${allModels.type.name} = {
     ${resultAssignments.join(',\n')}
   }
+
   const errors = ${allModels.extractErrors.name}(result)
   if (Object.keys(errors).length > 0 && throwInCaseOfError) {
     throw new Error(${allModels.summarizeErrors.name}(errors))
@@ -139,9 +137,11 @@ function prepareModelDeltaTypes({ context, imports }) {
     const deltaTypes = [];
     const resultAssignments = [];
     const idMapTypes = [];
-    const idMapInit = [];
     const keyMapTypes = [];
-    const keyMapInit = [];
+    const prepareImportMapsAssignments = [];
+    const prepareImportMapsIdMapResult = [];
+    const prepareImportMapsKeyMapResult = [];
+    const ensureItemsHaveIdsFn = context.import.detectDelta._utils.ensureItemsHaveIds.name;
     for (const model of context.models.values()) {
         imports
             //
@@ -150,18 +150,45 @@ function prepareModelDeltaTypes({ context, imports }) {
             .add(model.import.delta.errors)
             .add(model.import.delta.detect);
         const keyFieldName = model.keyField.name;
-        deltaTypes.push(`${model.decoder.dataModelEntry}?: ${context.import.detectDelta.types.generic.modelType.name}<
+        const dataEntry = model.decoder.dataModelEntry;
+        deltaTypes.push(`${dataEntry}?: ${context.import.detectDelta.types.generic.modelType.name}<
         ${model.types.name},
         ${model.types.id.name},
         ${model.import.delta.errors.name}
         >[]`);
-        idMapTypes.push(`'${model.decoder.dataModelEntry}': Map<${model.types.id.name}, ${model.types.name}>`);
-        idMapInit.push(`${model.decoder.dataModelEntry}: toIdMap(data.${model.decoder.dataModelEntry})`);
+        idMapTypes.push(`'${dataEntry}': Map<${model.types.id.name}, ${model.types.name}>`);
         // KeyMap uses the keyField for lookups (supports string or number keys)
-        keyMapTypes.push(`'${model.decoder.dataModelEntry}': Map<string | number, ${model.types.name}>`);
-        keyMapInit.push(`${model.decoder.dataModelEntry}: toKeyMap(data.${model.decoder.dataModelEntry}, '${keyFieldName}')`);
-        resultAssignments.push(`${model.decoder.dataModelEntry}: await ${model.import.delta.detect.name}(dataService, data.${model.decoder.dataModelEntry} ?? [], idMap, keyMap)`);
+        keyMapTypes.push(`'${dataEntry}': Map<string | number, ${model.types.name}>`);
+        // Generate the prepareImportMaps call for this model
+        // For models with NoRepository, we can't look up by key from database - just generate new IDs
+        if (model.repository.kind === 'NoRepository') {
+            prepareImportMapsAssignments.push(`const ${dataEntry}Result = await ${ensureItemsHaveIdsFn}({
+    items: data.${dataEntry},
+    keyFieldName: '${keyFieldName}',
+    getByKey: async () => null, // NoRepository - can't look up from database
+    generateId: () => randomUUID() as ${model.types.id.name},
+  })`);
+        }
+        else {
+            prepareImportMapsAssignments.push(`const ${dataEntry}Result = await ${ensureItemsHaveIdsFn}({
+    items: data.${dataEntry},
+    keyFieldName: '${keyFieldName}',
+    getByKey: (key) => dataService.${model.repository.dataServiceVariable}.getByKey(key),
+    generateId: () => randomUUID() as ${model.types.id.name},
+  })`);
+        }
+        prepareImportMapsIdMapResult.push(`${dataEntry}: ${dataEntry}Result.idMap`);
+        prepareImportMapsKeyMapResult.push(`${dataEntry}: ${dataEntry}Result.keyMap`);
+        resultAssignments.push(`${dataEntry}: await ${model.import.delta.detect.name}(dataService, data.${dataEntry} ?? [], idMap, keyMap)`);
     }
-    return { resultAssignments, deltaTypes, idMapTypes, idMapInit, keyMapTypes, keyMapInit };
+    return {
+        resultAssignments,
+        deltaTypes,
+        idMapTypes,
+        keyMapTypes,
+        prepareImportMapsAssignments,
+        prepareImportMapsIdMapResult,
+        prepareImportMapsKeyMapResult,
+    };
 }
 //# sourceMappingURL=detect-delta-all-models.generator.js.map

package/dist/backend-import/generators/detect-delta/detect-delta-all-models.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"detect-delta-all-models.generator.js","sourceRoot":"","sources":["../../../../src/backend-import/generators/detect-delta/detect-delta-all-models.generator.ts"],"names":[],"mappings":";;AAIA,oEA0IC;AA9ID,iDAAkF;AAIlF,SAAgB,4BAA4B,CAAC,OAAsB;IACjE,MAAM,EACJ,QAAQ,EACR,MAAM,EAAE,EAAE,WAAW,EAAE,GACxB,GAAG,OAAO,CAAA;IACX,MAAM,EAAE,SAAS,EAAE,GAAG,WAAW,CAAA;IAEjC,MAAM,OAAO,GAAG,2BAAe;QAC7B,EAAE;SACD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;SACxB,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC;SACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC;SACvC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;SACvD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;SAC7D,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;SAC9D,SAAS,CAAC;QACT,IAAI,EAAE,IAAA,yBAAa,EAAC,eAAe,CAAC;QACpC,KAAK,EAAE,CAAC,IAAA,0BAAc,EAAC,KAAK,CAAC,EAAE,IAAA,0BAAc,EAAC,QAAQ,CAAC,EAAE,IAAA,0BAAc,EAAC,WAAW,CAAC,CAAC;KACtF,CAAC,CAAA;IAEJ,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,sBAAsB,CAAC;QAC/G,OAAO;QACP,OAAO;KACR,CAAC,CAAA;IAEF,OAAO;EACP,OAAO,CAAC,QAAQ,EAAE;;;;;cAKN,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI;IACxD,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;cAMX,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI;IAC7D,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;;IAOrB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;;;sCAGY,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI;;MAEnF,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC;;;;;;;MAOrB,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA2BX,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI;UAC5C,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI;;aAEhC,SAAS,CAAC,IAAI,CAAC,IAAI;;;kBAGd,SAAS,CAAC,IAAI,CAAC,IAAI;MAC/B,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC;;mBAEhB,SAAS,CAAC,aAAa,CAAC,IAAI;;sBAEzB,SAAS,CAAC,eAAe,CAAC,IAAI;;;;;kBAKlC,SAAS,CAAC,aAAa,CAAC,IAAI,WAAW,SAAS,CAAC,IAAI,CAAC,IAAI,qBAAqB,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI;iCAC1G,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI;;sEAEL,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,WAAW,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI;;;;;;;;;;;;kBAYxJ,SAAS,CAAC,eAAe,CAAC,IAAI,2BAA2B,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI;;;;;;;;;;;;;;;;;;;;;CAqBpH,CAAA;AACD,CAAC;AAED,SAAS,sBAAsB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAwD;IACxG,MAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,MAAM,iBAAiB,GAAa,EAAE,CAAA;IACtC,MAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,MAAM,SAAS,GAAa,EAAE,CAAA;IAC9B,MAAM,WAAW,GAAa,EAAE,CAAA;IAChC,MAAM,UAAU,GAAa,EAAE,CAAA;IAE/B,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QAC5C,OAAO;YACL,EAAE;aACD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;aACpB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;aACvB,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;aAC9B,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAEjC,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAA;QAExC,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,MAAM,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI;UACtG,KAAK,CAAC,KAAK,CAAC,IAAI;UAChB,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI;UACnB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI;YAC5B,CAAC,CAAA;QAET,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,cAAc,UAAU,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAA;QAEtG,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,kBAAkB,KAAK,CAAC,OAAO,CAAC,cAAc,GAAG,CAAC,CAAA;QAEhG,wEAAwE;QACxE,WAAW,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,cAAc,2BAA2B,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAA;QAEhG,UAAU,CAAC,IAAI,CACb,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,mBAAmB,KAAK,CAAC,OAAO,CAAC,cAAc,MAAM,YAAY,IAAI,CACrG,CAAA;QAED,iBAAiB,CAAC,IAAI,CACpB,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,WAAW,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,sBAAsB,KAAK,CAAC,OAAO,CAAC,cAAc,wBAAwB,CACnJ,CAAA;IACH,CAAC;IACD,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,CAAA;AAC1F,CAAC"}
+{"version":3,"file":"detect-delta-all-models.generator.js","sourceRoot":"","sources":["../../../../src/backend-import/generators/detect-delta/detect-delta-all-models.generator.ts"],"names":[],"mappings":";;AAIA,oEAgJC;AApJD,iDAAkF;AAIlF,SAAgB,4BAA4B,CAAC,OAAsB;IACjE,MAAM,EACJ,QAAQ,EACR,MAAM,EAAE,EAAE,WAAW,EAAE,GACxB,GAAG,OAAO,CAAA;IACX,MAAM,EAAE,SAAS,EAAE,GAAG,WAAW,CAAA;IAEjC,MAAM,OAAO,GAAG,2BAAe;QAC7B,EAAE;SACD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;SACxB,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC;SACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC;SACvC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;SACvD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;SAC7D,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;SAC9D,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC;SACzD,SAAS,CAAC;QACT,IAAI,EAAE,IAAA,yBAAa,EAAC,eAAe,CAAC;QACpC,KAAK,EAAE,CAAC,IAAA,0BAAc,EAAC,KAAK,CAAC,EAAE,IAAA,0BAAc,EAAC,QAAQ,CAAC,EAAE,IAAA,0BAAc,EAAC,WAAW,CAAC,CAAC;KACtF,CAAC;SACD,SAAS,CAAC;QACT,IAAI,EAAE,IAAA,yBAAa,EAAC,aAAa,CAAC;QAClC,KAAK,EAAE,CAAC,IAAA,0BAAc,EAAC,YAAY,CAAC,CAAC;KACtC,CAAC,CAAA;IAEJ,MAAM,EACJ,iBAAiB,EACjB,UAAU,EACV,WAAW,EACX,UAAU,EACV,4BAA4B,EAC5B,4BAA4B,EAC5B,6BAA6B,GAC9B,GAAG,sBAAsB,CAAC;QACzB,OAAO;QACP,OAAO;KACR,CAAC,CAAA;IAEF,OAAO;EACP,OAAO,CAAC,QAAQ,EAAE;;;;;cAKN,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI;IACxD,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;cAMX,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI;IAC7D,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;;IAOrB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;;;;iBAST,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI;UAC5C,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI;sBACvB,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI;IACrE,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC;;;;QAInC,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC;;;QAGxC,6BAA6B,CAAC,IAAI,CAAC,KAAK,CAAC;;;;;;iBAMhC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI;UAC5C,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI;;aAEhC,SAAS,CAAC,IAAI,CAAC,IAAI;;;;;;;;;kBASd,SAAS,CAAC,IAAI,CAAC,IAAI;MAC/B,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC;;;mBAGhB,SAAS,CAAC,aAAa,CAAC,IAAI;;sBAEzB,SAAS,CAAC,eAAe,CAAC,IAAI;;;;;kBAKlC,SAAS,CAAC,aAAa,CAAC,IAAI,WAAW,SAAS,CAAC,IAAI,CAAC,IAAI,qBAAqB,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI;iCAC1G,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI;;sEAEL,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,WAAW,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI;;;;;;;;;;;;kBAYxJ,SAAS,CAAC,eAAe,CAAC,IAAI,2BAA2B,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI;;;;;;;;;;;;;;;;;;;;;CAqBpH,CAAA;AACD,CAAC;AAED,SAAS,sBAAsB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAwD;IACxG,MAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,MAAM,iBAAiB,GAAa,EAAE,CAAA;IACtC,MAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,MAAM,WAAW,GAAa,EAAE,CAAA;IAChC,MAAM,4BAA4B,GAAa,EAAE,CAAA;IACjD,MAAM,4BAA4B,GAAa,EAAE,CAAA;IACjD,MAAM,6BAA6B,GAAa,EAAE,CAAA;IAElD,MAAM,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAA;IAEtF,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QAC5C,OAAO;YACL,EAAE;aACD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;aACpB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;aACvB,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;aAC9B,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAEjC,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAA;QACxC,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,CAAA;QAE9C,UAAU,CAAC,IAAI,CAAC,GAAG,SAAS,MAAM,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI;UACnF,KAAK,CAAC,KAAK,CAAC,IAAI;UAChB,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI;UACnB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI;YAC5B,CAAC,CAAA;QAET,UAAU,CAAC,IAAI,CAAC,IAAI,SAAS,UAAU,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAA;QAEnF,wEAAwE;QACxE,WAAW,CAAC,IAAI,CAAC,IAAI,SAAS,2BAA2B,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAA;QAE7E,qDAAqD;QACrD,8FAA8F;QAC9F,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YAC7C,4BAA4B,CAAC,IAAI,CAC/B,SAAS,SAAS,kBAAkB,oBAAoB;kBAC9C,SAAS;qBACN,YAAY;;wCAEO,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI;KACtD,CACE,CAAA;QACH,CAAC;aAAM,CAAC;YACN,4BAA4B,CAAC,IAAI,CAC/B,SAAS,SAAS,kBAAkB,oBAAoB;kBAC9C,SAAS;qBACN,YAAY;qCACI,KAAK,CAAC,UAAU,CAAC,mBAAmB;wCACjC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI;KACtD,CACE,CAAA;QACH,CAAC;QAED,4BAA4B,CAAC,IAAI,CAAC,GAAG,SAAS,KAAK,SAAS,cAAc,CAAC,CAAA;QAC3E,6BAA6B,CAAC,IAAI,CAAC,GAAG,SAAS,KAAK,SAAS,eAAe,CAAC,CAAA;QAE7E,iBAAiB,CAAC,IAAI,CACpB,GAAG,SAAS,WAAW,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,sBAAsB,SAAS,wBAAwB,CAC7G,CAAA;IACH,CAAC;IACD,OAAO;QACL,iBAAiB;QACjB,UAAU;QACV,UAAU;QACV,WAAW;QACX,4BAA4B;QAC5B,4BAA4B;QAC5B,6BAA6B;KAC9B,CAAA;AACH,CAAC"}

package/dist/backend-import/generators/detect-delta/detect-delta-functions.generator.js

@@ -82,6 +82,11 @@ export type ${detectDelta._utils.validation.params.name}<Model extends ${dto.gen
  * Detects changes for a model and returns the result as a Delta_Model object.
  * When both id and keyField are provided, id takes precedence for looking up existing records.
  * Falls back to keyField when id is not provided.
+ *
+ * IMPORTANT: For correct delta detection, relation field keys must be resolved to IDs
+ * BEFORE calling this function. Use the resolveRelationKeys callback to do this.
+ * Otherwise, the delta calculation will incorrectly show changes for relation fields
+ * when comparing keys against IDs.
  */
 export async function ${detectDelta._utils.detectModelDelta.name}<Model extends ${dto.genericModel.name}<ID>, ID extends ${dto.idType.name}, ModelErrors, KeyFieldName extends keyof Model>({
   items,
@@ -89,6 +94,7 @@ export async function ${detectDelta._utils.detectModelDelta.name}<Model extends
   getById,
   getByKey,
   getDelta,
+  resolveRelationKeys,
   validate
 }: {
   items?: Model[]
@@ -99,6 +105,12 @@ export async function ${detectDelta._utils.detectModelDelta.name}<Model extends
   /** Function to look up an existing record by its key value (fallback when id is not provided) */
   getByKey: (key: Model[KeyFieldName]) => Promise<Model | null>
   getDelta: (args: { item: Model; existingItem: Model }) => ${delta_Fields.name}<Model, ID>
+  /**
+   * Function to resolve relation field keys to IDs in the item.
+   * This MUST be called before delta calculation to ensure correct comparison.
+   * Returns the resolved item and any errors encountered during resolution.
+   */
+  resolveRelationKeys: (item: Model) => Promise<{ item: Model; errors: ModelErrors[] }>
   validate: ${detectDelta._utils.validation.params.name}<Model, ID, ModelErrors>
 }): Promise<${modelType.name}<Model, ID, ModelErrors>[]> {
   const upsertResult: ${modelType.name}<Model, ID, ModelErrors>[] = []
@@ -108,7 +120,18 @@ export async function ${detectDelta._utils.detectModelDelta.name}<Model extends
   }
 
   for (const item of items) {
-    const deltaResult = await determineDeltaResult({ item, keyFieldName, getById, getByKey, getDelta })
+    // IMPORTANT: Resolve relation field keys to IDs BEFORE delta calculation.
+    // This ensures that when we compare the item against existing records,
+    // relation fields contain actual IDs (not keys), enabling correct delta detection.
+    const { item: resolvedItem, errors: resolutionErrors } = await resolveRelationKeys(item)
+
+    // If key resolution failed, report errors and skip this item
+    if (resolutionErrors.length > 0) {
+      upsertResult.push({ type: 'errors', input: item, errors: resolutionErrors })
+      continue
+    }
+
+    const deltaResult = await determineDeltaResult({ item: resolvedItem, keyFieldName, getById, getByKey, getDelta })
     const errors = deltaResult.type === 'unchanged' ? [] : await validate[deltaResult.type](deltaResult as any)
 
     if (errors.length !== 0) {
@@ -117,7 +140,7 @@ export async function ${detectDelta._utils.detectModelDelta.name}<Model extends
     }
     switch (deltaResult.type) {
       case '${create.discriminant}':
-        upsertResult.push({ type: '${create.discriminant}', input: item, createDto: item })
+        upsertResult.push({ type: '${create.discriminant}', input: item, createDto: resolvedItem })
         break
 
       case '${update.discriminant}':
@@ -281,6 +304,137 @@ export function ${detectDelta._utils.keepErrors.name}<O, I extends O | undefined
   return errors.filter((error) => error !== undefined) as O[]
 }
 
+/**
+ * Checks if the item needs an ID assigned
+ */
+function needsIdAssignment<ID extends ${dto.idType.name}>(id: ID | undefined): boolean {
+  return !id || id === ('' as unknown as ID)
+}
+
+/**
+ * Extracts and validates the key value from an item
+ */
+function getValidKeyValue<Model, KeyFieldName extends keyof Model>(
+  item: Model,
+  keyFieldName: KeyFieldName,
+): string | number | null {
+  const keyValue = item[keyFieldName] as string | number | undefined | null
+
+  if (keyValue === undefined || keyValue === null || keyValue === '') {
+    return null
+  }
+
+  return keyValue
+}
+
+/**
+ * Assigns an ID to an item by either finding existing entity or generating new ID
+ */
+async function assignIdToItem<Model extends ${dto.genericModel.name}<ID>, ID extends ${dto.idType.name}>({
+  item,
+  keyValue,
+  getByKey,
+  generateId,
+}: {
+  item: Model
+  keyValue: string | number | null
+  getByKey: (key: string) => Promise<Model | null>
+  generateId: () => ID
+}): Promise<void> {
+  // If no valid key, generate new ID
+  if (keyValue === null) {
+    item.id = generateId()
+    return
+  }
+
+  // Try to find existing entity by key
+  const existingItem = await getByKey(String(keyValue))
+  item.id = existingItem ? existingItem.id : generateId()
+}
+
+/**
+ * Adds an item to the ID and key lookup maps
+ */
+function addItemToMaps<
+  Model extends ${dto.genericModel.name}<ID>,
+  ID extends ${dto.idType.name},
+  KeyFieldName extends keyof Model,
+>({
+  item,
+  keyFieldName,
+  idMap,
+  keyMap,
+}: {
+  item: Model
+  keyFieldName: KeyFieldName
+  idMap: Map<ID, Model>
+  keyMap: Map<string | number, Model>
+}): void {
+  idMap.set(item.id, item)
+
+  const keyValue = getValidKeyValue(item, keyFieldName)
+  if (keyValue !== null) {
+    keyMap.set(keyValue, item)
+  }
+}
+
+/**
+ * Ensures all items have IDs assigned.
+ * For items without an ID (undefined, null, or empty string):
+ * 1. If keyField value is provided, check database for existing entity with that key -> use its ID
+ * 2. Otherwise, generate a new UUID
+ *
+ * This must be called BEFORE building idMap/keyMap to ensure all items have proper IDs
+ * that can be referenced by other models during relation key resolution.
+ *
+ * @returns Object containing:
+ *   - items: The items with IDs assigned
+ *   - idMap: Map of ID -> item (for items with IDs)
+ *   - keyMap: Map of keyField -> item (for all items with keyField values)
+ */
+export async function ${detectDelta._utils.ensureItemsHaveIds.name}<
+  Model extends ${dto.genericModel.name}<ID>,
+  ID extends ${dto.idType.name},
+  KeyFieldName extends keyof Model,
+>({
+  items,
+  keyFieldName,
+  getByKey,
+  generateId,
+}: {
+  items?: Model[]
+  /** The name of the keyField for this model */
+  keyFieldName: KeyFieldName
+  /** Function to look up an existing entity by keyField value from the database */
+  getByKey: (key: string) => Promise<Model | null>
+  /** Function to generate a new ID (e.g., crypto.randomUUID() with brand) */
+  generateId: () => ID
+}): Promise<{
+  items: Model[]
+  idMap: Map<ID, Model>
+  keyMap: Map<string | number, Model>
+}> {
+  const idMap = new Map<ID, Model>()
+  const keyMap = new Map<string | number, Model>()
+
+  if (!items || items.length === 0) {
+    return { items: [], idMap, keyMap }
+  }
+
+  for (const item of items) {
+    // Assign ID if needed
+    if (needsIdAssignment(item.id)) {
+      const keyValue = getValidKeyValue(item, keyFieldName)
+      await assignIdToItem({ item, keyValue, getByKey, generateId })
+    }
+
+    // Add item to lookup maps
+    addItemToMaps({ item, keyFieldName, idMap, keyMap })
+  }
+
+  return { items, idMap, keyMap }
+}
+
 /**
  * Validates that the model has all required fields.
  */
@@ -308,8 +462,80 @@ export function ${detectDelta._utils.validation.requiredFields.name}<
   }
 }
 
+/**
+ * Resolves a relation field value (which could be an ID or a key) to the actual ID.
+ * This is used before delta calculation to ensure relation fields contain IDs, not keys.
+ *
+ * Resolution order:
+ * 1. Check idMap (if value is already an ID in the current import batch)
+ * 2. Check keyMap (if value is a keyField value from imported data)
+ * 3. Database lookup by ID
+ * 4. Database lookup by keyField
+ *
+ * @returns The resolved ID if found, or an error if the reference is invalid
+ */
+export async function ${detectDelta._utils.resolveRelationKey.name}<
+  ID extends ${dto.idType.name},
+  RelatedModel extends ${dto.genericModel.name}<ID>,
+  FieldName extends string,
+  RelatedModelName extends string,
+  KeyType extends string | number = string | number,
+>({
+  value,
+  fieldName,
+  relatedModel,
+  idMapEntry,
+  keyMapEntry,
+  getById,
+  getByKey,
+}: {
+  /** The value to resolve - could be an ID or a keyField value */
+  value: ID
+  /** The name of the field being resolved (for error reporting) */
+  fieldName: FieldName
+  /** The name of the related model (for error reporting) */
+  relatedModel: RelatedModelName
+  /** Map of IDs to items from the current import batch */
+  idMapEntry: Map<ID, RelatedModel>
+  /** Map of keyField values to items from the current import batch */
+  keyMapEntry: Map<KeyType, RelatedModel>
+  /** Function to look up an item by ID from the database */
+  getById: (id: ID) => Promise<RelatedModel | null>
+  /** Function to look up an item by keyField from the database */
+  getByKey: (key: string) => Promise<RelatedModel | null>
+}): Promise<{ id: ID } | { error: ${errors.invalidReference.type.name}<RelatedModelName, FieldName, ID> }> {
+  // 1. Try idMap (if value is an id from the current import batch)
+  const byId = idMapEntry.get(value)
+  if (byId) {
+    return { id: byId.id }
+  }
+
+  // 2. Try keyMap (if value is a keyField value from imported data)
+  const byKey = keyMapEntry.get(value as unknown as KeyType)
+  if (byKey) {
+    return { id: byKey.id }
+  }
+
+  // 3. Try database lookup by ID
+  const fromDbById = await getById(value)
+  if (fromDbById) {
+    return { id: fromDbById.id }
+  }
+
+  // 4. Try database lookup by keyField
+  const fromDbByKey = await getByKey(String(value))
+  if (fromDbByKey) {
+    return { id: fromDbByKey.id }
+  }
+
+  // Not found - return error
+  return { error: { error: '${errors.invalidReference.discriminant}', relatedModel, fieldName, value } }
+}
+
 /**
  * Validates that the field is a reference to an existing item.
+ * If the value is a key (not an ID), it resolves the key to the actual ID and updates the item.
+ * This allows importing Excel data where relation fields contain human-readable keys instead of UUIDs.
  */
 export async function ${detectDelta._utils.validation.referenceField.name}<
   Model extends ${dto.genericModel.name}<ID>,
@@ -328,16 +554,27 @@ export async function ${detectDelta._utils.validation.referenceField.name}<
   item: Partial<Model>
   fieldName: FieldName
   relatedModel: RelatedModelName
-  getExistingItem: (id: RelatedID) => Promise<RelatedModel | null>
+  /**
+   * Function to get an existing item by ID or key.
+   * Should try ID lookup first, then key lookup.
+   * Returns the item if found, null otherwise.
+   */
+  getExistingItem: (idOrKey: RelatedID) => Promise<RelatedModel | null>
 }): Promise<${errors.invalidReference.type.name}<RelatedModelName, FieldName, Value> | undefined> {
   const value: Value | undefined | null = item[fieldName] as Value | undefined | null
-  if (value === undefined || value === null) {  
+  if (value === undefined || value === null) {
     return undefined
   }
   const existingItem = await getExistingItem(value)
   if (!existingItem) {
     return { error: '${errors.invalidReference.discriminant}', relatedModel, fieldName, value }
   }
+  // If the existing item was found and its ID differs from the provided value,
+  // it means the value was a key (not an ID). Replace the key with the actual ID.
+  // This ensures the item has the correct ID for database operations.
+  if (existingItem.id !== value) {
+    (item as Record<string, unknown>)[fieldName] = existingItem.id
+  }
   return undefined
 }
 

package/dist/backend-import/generators/detect-delta/detect-delta-functions.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"detect-delta-functions.generator.js","sourceRoot":"","sources":["../../../../src/backend-import/generators/detect-delta/detect-delta-functions.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,oEA0YC;AA9YD,6DAA8C;AAI9C,SAAgB,4BAA4B,CAAC,OAAsB;IACjE,MAAM,EACJ,MAAM,EAAE,EAAE,WAAW,EAAE,GACxB,GAAG,OAAO,CAAA;IAEX,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAA;IAC7B,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,CAAA;IACzC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;IAE9E,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe;QACvC,EAAE;SACD,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;SAC1C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;SACzB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;SACnB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;SACnB,OAAO,CAAC,YAAY,CAAC;SACrB,OAAO,CAAC,SAAS,CAAC;SAClB,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC;SACrC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;SAChC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC;SACjC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;SAC9B,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;IAE5C,OAAO,QAAQ,CAAC;;EAEhB,OAAO,CAAC,QAAQ,EAAE;;;;;;eAML,SAAS,CAAC,YAAY;;yFAEoD,MAAM,CAAC,YAAY;;WAEjG,MAAM,CAAC,YAAY;WACnB,YAAY,CAAC,IAAI;;;;yFAI6D,OAAO,CAAC,MAAM,CAAC,YAAY;;cAEtG,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,kBAAkB,GAAG,CAAC,YAAY,CAAC,IAAI;;;;;;;;;;;wBAWtE,WAAW,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,kBAAkB,GAAG,CAAC,YAAY,CAAC,IAAI,oBAAoB,GAAG,CAAC,MAAM,CAAC,IAAI;;;;;;;;;;;;;;;8DAe5E,YAAY,CAAC,IAAI;cACjE,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI;cACzC,SAAS,CAAC,IAAI;wBACJ,SAAS,CAAC,IAAI;;;;;;;;;;;;;;;cAexB,MAAM,CAAC,YAAY;qCACI,MAAM,CAAC,YAAY;;;cAG1C,MAAM,CAAC,YAAY;;mBAEd,MAAM,CAAC,YAAY;;;;;;;cAOxB,OAAO,CAAC,MAAM,CAAC,YAAY;;;;cAI3B,SAAS,CAAC,YAAY;qCACC,SAAS,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;;;oDAuBP,GAAG,CAAC,YAAY,CAAC,IAAI,oBAAoB,GAAG,CAAC,MAAM,CAAC,IAAI;;;;;;;;;;;gFAW5B,YAAY,CAAC,IAAI;;;;;;;;;0BASvE,MAAM,CAAC,YAAY;;wBAErB,SAAS,CAAC,YAAY;;;sBAGxB,MAAM,CAAC,YAAY;;;;;;;;sBAQnB,MAAM,CAAC,YAAY;;;;;;;sBAOnB,MAAM,CAAC,YAAY;;;;;;sBAMnB,MAAM,CAAC,YAAY;;;;;sBAKnB,OAAO,CAAC,MAAM,CAAC,YAAY;;;oBAG7B,SAAS,CAAC,YAAY;;;kBAGxB,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,kBAAkB,GAAG,CAAC,YAAY,CAAC,IAAI,oBAAoB,GAAG,CAAC,MAAM,CAAC,IAAI;;;;;;;;MAQtH,YAAY,CAAC,IAAI;iBACN,YAAY,CAAC,IAAI;;;;;;;;;;;;;kCAaA,GAAG,CAAC,YAAY,CAAC,IAAI,oBAAoB,GAAG,CAAC,MAAM,CAAC,IAAI;;;;;;WAM/E,YAAY,CAAC,IAAI;;;;;;;;;;;;;;kDAcsB,GAAG,CAAC,YAAY,CAAC,IAAI,oBAAoB,GAAG,CAAC,MAAM,CAAC,IAAI;;;;;WAK/F,YAAY,CAAC,IAAI;MACtB,GAAG,CAAC,MAAM,CAAC,IAAI;;;;;;;;;;;;;;;kBAeH,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI;;;;;;;kBAOlC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI;kBACjD,GAAG,CAAC,YAAY,CAAC,IAAI;eACxB,GAAG,CAAC,MAAM,CAAC,IAAI;;;;;;;;MAQxB,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI;kBACjB,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI;;;8BAGjB,MAAM,CAAC,YAAY,CAAC,YAAY;;;;;;;;;;;;;wBAatC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI;kBACvD,GAAG,CAAC,YAAY,CAAC,IAAI;eACxB,GAAG,CAAC,MAAM,CAAC,IAAI;yBACL,GAAG,CAAC,YAAY,CAAC,IAAI;sBACxB,GAAG,CAAC,MAAM,CAAC,IAAI;;;;;;;;;;;;;;cAcvB,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI;;;;;;;uBAOxB,MAAM,CAAC,gBAAgB,CAAC,YAAY;;;;;;;;wBAQnC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI;kBACpD,GAAG,CAAC,YAAY,CAAC,IAAI;eACxB,GAAG,CAAC,MAAM,CAAC,IAAI;;;;;;;;;;;cAWhB,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI;;;;;;;uBAOjB,MAAM,CAAC,SAAS,CAAC,YAAY;;;;;;;;kBAQlC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI;kBACtC,GAAG,CAAC,YAAY,CAAC,IAAI;eACxB,GAAG,CAAC,MAAM,CAAC,IAAI;;;;;;;;MAQxB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI;;;;;;;;uBAQX,MAAM,CAAC,WAAW,CAAC,YAAY;;;;;;;;wBAQ9B,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,IAAI;kBAC3D,GAAG,CAAC,YAAY,CAAC,IAAI;eACxB,GAAG,CAAC,MAAM,CAAC,IAAI;;;yBAGL,GAAG,CAAC,YAAY,CAAC,IAAI;sBACxB,GAAG,CAAC,MAAM,CAAC,IAAI;;;;;;;;;;;;IAYjC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI;;;;;;qBAMpB,MAAM,CAAC,oBAAoB,CAAC,YAAY;EAC3D,CAAA;AACF,CAAC"}
+{"version":3,"file":"detect-delta-functions.generator.js","sourceRoot":"","sources":["../../../../src/backend-import/generators/detect-delta/detect-delta-functions.generator.ts"],"names":[],"mappings":"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"}