@dataverse-kit/export-engine 1.5.0 → 1.6.0

package/dist/index.cjs

@@ -14359,7 +14359,8 @@ function buildGridCommandHandlerBlock(args) {
     itemsExpr,
     selectionExpr,
     exportColumnsLiteral,
-    createColumnsLiteral
+    createColumnsLiteral,
+    addExisting
   } = args;
   const exportCase = exportColumnsLiteral ? `{
         const exportColumns = [${exportColumnsLiteral}];
@@ -14431,6 +14432,36 @@ function buildGridCommandHandlerBlock(args) {
         }
         return;
       }`;
+  const addExistingStateBlock = addExisting ? `
+  const gridAddExistingMutation = useUpdateRecord<Record<string, unknown>>('${addExisting.childEntitySet}');` : "";
+  const addExistingCase = addExisting ? `{
+        const parentId = selectedIds[0];
+        if (!parentId) {
+          console.warn('[grid] Select or open a parent record before adding an existing ${addExisting.childEntityLogical}.');
+          return;
+        }
+        const lookup = (xrm as { Utility?: { lookupObjects?: (opts: unknown) => Promise<Array<{ id: string }>> } } | undefined)?.Utility;
+        if (lookup?.lookupObjects) {
+          const picked = await lookup.lookupObjects({ entityTypes: ['${addExisting.childEntityLogical}'], allowMultiSelect: true });
+          if (!picked || picked.length === 0) return;
+          for (const rec of picked) {
+            const childId = String(rec.id).replace(/[{}]/g, '');
+            await gridAddExistingMutation.mutateAsync({ id: childId, data: { '${addExisting.childField}@odata.bind': '/${addExisting.parentEntitySet}(' + parentId + ')' } as Record<string, unknown> });
+          }
+          await refreshGrid();
+        } else {
+          console.warn('[grid] Add Existing requires Xrm.Utility.lookupObjects; not available in this host.');
+        }
+        return;
+      }` : `{
+        if (xrm?.Navigation?.openForm) {
+          await xrm.Navigation.openForm({ entityName: '${entityName}' });
+          await refreshGrid();
+        } else {
+          console.warn('[grid] Add Existing requires Xrm.Navigation; not available in this host.');
+        }
+        return;
+      }`;
   return `
   const queryClient = useQueryClient();
   const gridUpdateMutation = useUpdateRecord<Record<string, unknown>>('${entitySetName}');
@@ -14454,7 +14485,7 @@ function buildGridCommandHandlerBlock(args) {
     } catch (err) {
       setDeleteError((err as Error)?.message ?? 'Delete failed.');
     }
-  }, [pendingDelete, gridDeleteMutation]);${createStateBlock}
+  }, [pendingDelete, gridDeleteMutation]);${createStateBlock}${addExistingStateBlock}
   const handleGridCommand = React.useCallback(async (actionType: string, overrideRowIndex?: number) => {
     const xrm = (typeof window !== 'undefined' ? (window as unknown as { Xrm?: any }).Xrm : undefined);
     const items = ${itemsExpr} as ReadonlyArray<Record<string, unknown>>;
@@ -14480,15 +14511,7 @@ function buildGridCommandHandlerBlock(args) {
     };
     switch (actionType) {
       case 'new': ${newCase}
-      case 'addExisting': {
-        if (xrm?.Navigation?.openForm) {
-          await xrm.Navigation.openForm({ entityName: '${entityName}' });
-          await refreshGrid();
-        } else {
-          console.warn('[grid] Add Existing requires Xrm.Navigation; not available in this host.');
-        }
-        return;
-      }
+      case 'addExisting': ${addExistingCase}
       case 'edit': {
         if (!requireSel('edit')) return;
         if (selectedIds.length > 1 && xrm?.Navigation?.openBulkEditForm) {
@@ -14538,7 +14561,7 @@ function buildGridCommandHandlerBlock(args) {
       default:
         return;
     }
-  }, [${itemsExpr}, ${selectionExpr}, gridUpdateMutation, refreshGrid]);`;
+  }, [${itemsExpr}, ${selectionExpr}, gridUpdateMutation, refreshGrid${addExisting ? ", gridAddExistingMutation" : ""}]);`;
 }
 function buildRowCommandsLiteral(contextMenuItems) {
   return contextMenuItems.filter((ci) => (ci.actionType ?? "custom") !== "custom").filter((ci) => ci.actionType !== "new").map(
@@ -15001,12 +15024,18 @@ function generateLinkedSubgrid(gridDef, entityName, imports, library = "fluent-v
   const showRefresh = gridDef.toolbar?.showRefresh ?? false;
   const showColumnChooser = gridDef.toolbar?.showColumnChooser ?? false;
   const hasToolbarIcons = showFilters || showViewToggle || showExport || showRefresh || showColumnChooser;
+  const childGridDef = gridDef.nestedGridId ? _currentGridCustomizers.find((g) => g.id === gridDef.nestedGridId) : void 0;
+  const _aeRel = gridDef.nestedRelationship;
+  const addExistingFeasible = Boolean(
+    childGridDef && _includeDataAccessLayer && _aeRel?.relationshipType === "OneToMany" && _aeRel?.parentField && _aeRel?.childField && gridDef.dataSource?.entitySetName && gridDef.dataSource?.fetchXml && childGridDef.dataSource?.entitySetName && childGridDef.dataSource?.entityName && childGridDef.dataSource?.fetchXml
+  );
   const barItems = (gridDef.commandBarItems ?? []).filter(
     (ci) => ci.visibility === "commandBar" || ci.visibility === "both" || !ci.visibility
-  );
+  ).filter((ci) => ci.actionType !== "addExisting" || addExistingFeasible);
   const contextMenuItems = (gridDef.commandBarItems ?? []).filter(
     (ci) => ci.visibility === "contextMenu" || ci.visibility === "both" || !ci.visibility
-  );
+  ).filter((ci) => ci.actionType !== "addExisting" || addExistingFeasible);
+  const enableAddExisting = addExistingFeasible && (barItems.some((ci) => ci.actionType === "addExisting") || contextMenuItems.some((ci) => ci.actionType === "addExisting"));
   const _handlerAvailable = (
     // The dispatcher calls useUpdateRecord/useDeleteRecord/useQueryClient — which only
     // exist (module + provider + dep) when the data-access layer is included. Without it,
@@ -15095,7 +15124,6 @@ function generateLinkedSubgrid(gridDef, entityName, imports, library = "fluent-v
         </div>
       </div>`;
   }
-  const childGridDef = gridDef.nestedGridId ? _currentGridCustomizers.find((g) => g.id === gridDef.nestedGridId) : void 0;
   const isGridKitNested = !!childGridDef;
   const visibleCols = [...gridDef.columns].filter((c) => c.isVisible).sort((a, b) => a.order - b.order);
   const exportColumnsLiteral = enableExport ? buildExportColumnsLiteral(visibleCols) : "";
@@ -15168,7 +15196,18 @@ ${childEntries.join(",\n")},
         itemsExpr: "keyedItems",
         selectionExpr: "selectedIndices",
         exportColumnsLiteral,
-        createColumnsLiteral
+        createColumnsLiteral,
+        // Associate an existing child to the clicked/active parent (the ONLY call site
+        // that wires it). Shared by the nested AND focused-view emitters below — both
+        // reuse this ngHandlerBlock. Gated on enableAddExisting (feasible AND an
+        // addExisting item present); the && chain narrows the optional entity-set strings
+        // to `string` (enableAddExisting ⟹ addExistingFeasible guarantees they're present).
+        addExisting: enableAddExisting && childEntitySet && childEntityLogical && parentEntitySet && nestedRel?.childField ? {
+          childEntitySet,
+          childEntityLogical,
+          childField: nestedRel.childField,
+          parentEntitySet
+        } : null
       }) : "";
       const ngHasDelete = (gridDef.commandBarItems ?? []).some(
         (ci) => ci.actionType === "delete"
@@ -15399,7 +15438,9 @@ ${childEntries.join(",\n")},
       itemsExpr: "rows",
       selectionExpr: "selectedIndices",
       exportColumnsLiteral,
-      createColumnsLiteral
+      createColumnsLiteral,
+      addExisting: null
+      // flat (no parent relationship) → addExisting filtered out above
     }) : "";
     const cardSelectedIndicesState = cardEmitHandler ? "\n  const [selectedIndices, setSelectedIndices] = React.useState<Set<number>>(new Set());" : "";
     const cardRowCommandsLiteral = cardEmitRowCommands ? buildRowCommandsLiteral(contextMenuItems) : "";
@@ -15493,7 +15534,9 @@ ${childEntries.join(",\n")},
       itemsExpr: "rows",
       selectionExpr: "selectedIndices",
       exportColumnsLiteral,
-      createColumnsLiteral
+      createColumnsLiteral,
+      addExisting: null
+      // flat (no parent relationship) → addExisting filtered out above
     }) : "";
     const roSelectedIndicesState = roEmitHandler ? "\n  const [selectedIndices, setSelectedIndices] = React.useState<Set<number>>(new Set());" : "";
     const roRowCommandsLiteral = roEmitRowCommands ? buildRowCommandsLiteral(contextMenuItems) : "";
@@ -15605,7 +15648,9 @@ const ${liveWrapperName}: React.FC = () => {
         itemsExpr: "keyedItems",
         selectionExpr: "selectedIndices",
         exportColumnsLiteral,
-        createColumnsLiteral
+        createColumnsLiteral,
+        addExisting: null
+        // flat (no parent relationship) → addExisting filtered out above
       }) : "";
       const edSelectedIndicesState = edEmitHandler ? "\n  const [selectedIndices, setSelectedIndices] = React.useState<Set<number>>(new Set());" : "";
       const edRowCommandsLiteral = edEmitRowCommands ? buildRowCommandsLiteral(contextMenuItems) : "";
@@ -18465,6 +18510,19 @@ ${code}
 };
 `;
 }
+function dedupeImportStatements(content) {
+  const isImportLine = (l) => /^import\b[^\n]*\bfrom\b[^\n]*;[ \t]*$/.test(l) || /^import\s+['"][^'"]+['"];[ \t]*$/.test(l);
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const line of content.split("\n")) {
+    if (isImportLine(line)) {
+      if (seen.has(line)) continue;
+      seen.add(line);
+    }
+    out.push(line);
+  }
+  return out.join("\n");
+}
 function generateFormCode(form, options) {
   _currentGridCustomizers = options?.gridCustomizers ?? [];
   _includeSampleData = options?.includeSampleData ?? false;
@@ -18495,6 +18553,7 @@ function generateFormCode(form, options) {
     default:
       content = generateMainForm(form, hasRules, library);
   }
+  content = dedupeImportStatements(content);
   const files = [
     { path: `src/components/${fileName}`, content }
   ];

package/dist/index.d.cts

@@ -148,7 +148,6 @@ interface GenerateFormCodeOptions {
      */
     componentLibrary?: 'fluent-v8' | 'fluent-v9';
 }
-/** Generate React component source files from a FormDefinition. */
 declare function generateFormCode(form: FormDefinition, options?: GenerateFormCodeOptions): GeneratedFile[];
 /** Options for `generateAllFormCode`. */
 interface GenerateAllFormCodeOptions {

package/dist/index.d.ts

@@ -148,7 +148,6 @@ interface GenerateFormCodeOptions {
      */
     componentLibrary?: 'fluent-v8' | 'fluent-v9';
 }
-/** Generate React component source files from a FormDefinition. */
 declare function generateFormCode(form: FormDefinition, options?: GenerateFormCodeOptions): GeneratedFile[];
 /** Options for `generateAllFormCode`. */
 interface GenerateAllFormCodeOptions {

package/dist/index.mjs

@@ -14339,7 +14339,8 @@ function buildGridCommandHandlerBlock(args) {
     itemsExpr,
     selectionExpr,
     exportColumnsLiteral,
-    createColumnsLiteral
+    createColumnsLiteral,
+    addExisting
   } = args;
   const exportCase = exportColumnsLiteral ? `{
         const exportColumns = [${exportColumnsLiteral}];
@@ -14411,6 +14412,36 @@ function buildGridCommandHandlerBlock(args) {
         }
         return;
       }`;
+  const addExistingStateBlock = addExisting ? `
+  const gridAddExistingMutation = useUpdateRecord<Record<string, unknown>>('${addExisting.childEntitySet}');` : "";
+  const addExistingCase = addExisting ? `{
+        const parentId = selectedIds[0];
+        if (!parentId) {
+          console.warn('[grid] Select or open a parent record before adding an existing ${addExisting.childEntityLogical}.');
+          return;
+        }
+        const lookup = (xrm as { Utility?: { lookupObjects?: (opts: unknown) => Promise<Array<{ id: string }>> } } | undefined)?.Utility;
+        if (lookup?.lookupObjects) {
+          const picked = await lookup.lookupObjects({ entityTypes: ['${addExisting.childEntityLogical}'], allowMultiSelect: true });
+          if (!picked || picked.length === 0) return;
+          for (const rec of picked) {
+            const childId = String(rec.id).replace(/[{}]/g, '');
+            await gridAddExistingMutation.mutateAsync({ id: childId, data: { '${addExisting.childField}@odata.bind': '/${addExisting.parentEntitySet}(' + parentId + ')' } as Record<string, unknown> });
+          }
+          await refreshGrid();
+        } else {
+          console.warn('[grid] Add Existing requires Xrm.Utility.lookupObjects; not available in this host.');
+        }
+        return;
+      }` : `{
+        if (xrm?.Navigation?.openForm) {
+          await xrm.Navigation.openForm({ entityName: '${entityName}' });
+          await refreshGrid();
+        } else {
+          console.warn('[grid] Add Existing requires Xrm.Navigation; not available in this host.');
+        }
+        return;
+      }`;
   return `
   const queryClient = useQueryClient();
   const gridUpdateMutation = useUpdateRecord<Record<string, unknown>>('${entitySetName}');
@@ -14434,7 +14465,7 @@ function buildGridCommandHandlerBlock(args) {
     } catch (err) {
       setDeleteError((err as Error)?.message ?? 'Delete failed.');
     }
-  }, [pendingDelete, gridDeleteMutation]);${createStateBlock}
+  }, [pendingDelete, gridDeleteMutation]);${createStateBlock}${addExistingStateBlock}
   const handleGridCommand = React.useCallback(async (actionType: string, overrideRowIndex?: number) => {
     const xrm = (typeof window !== 'undefined' ? (window as unknown as { Xrm?: any }).Xrm : undefined);
     const items = ${itemsExpr} as ReadonlyArray<Record<string, unknown>>;
@@ -14460,15 +14491,7 @@ function buildGridCommandHandlerBlock(args) {
     };
     switch (actionType) {
       case 'new': ${newCase}
-      case 'addExisting': {
-        if (xrm?.Navigation?.openForm) {
-          await xrm.Navigation.openForm({ entityName: '${entityName}' });
-          await refreshGrid();
-        } else {
-          console.warn('[grid] Add Existing requires Xrm.Navigation; not available in this host.');
-        }
-        return;
-      }
+      case 'addExisting': ${addExistingCase}
       case 'edit': {
         if (!requireSel('edit')) return;
         if (selectedIds.length > 1 && xrm?.Navigation?.openBulkEditForm) {
@@ -14518,7 +14541,7 @@ function buildGridCommandHandlerBlock(args) {
       default:
         return;
     }
-  }, [${itemsExpr}, ${selectionExpr}, gridUpdateMutation, refreshGrid]);`;
+  }, [${itemsExpr}, ${selectionExpr}, gridUpdateMutation, refreshGrid${addExisting ? ", gridAddExistingMutation" : ""}]);`;
 }
 function buildRowCommandsLiteral(contextMenuItems) {
   return contextMenuItems.filter((ci) => (ci.actionType ?? "custom") !== "custom").filter((ci) => ci.actionType !== "new").map(
@@ -14981,12 +15004,18 @@ function generateLinkedSubgrid(gridDef, entityName, imports, library = "fluent-v
   const showRefresh = gridDef.toolbar?.showRefresh ?? false;
   const showColumnChooser = gridDef.toolbar?.showColumnChooser ?? false;
   const hasToolbarIcons = showFilters || showViewToggle || showExport || showRefresh || showColumnChooser;
+  const childGridDef = gridDef.nestedGridId ? _currentGridCustomizers.find((g) => g.id === gridDef.nestedGridId) : void 0;
+  const _aeRel = gridDef.nestedRelationship;
+  const addExistingFeasible = Boolean(
+    childGridDef && _includeDataAccessLayer && _aeRel?.relationshipType === "OneToMany" && _aeRel?.parentField && _aeRel?.childField && gridDef.dataSource?.entitySetName && gridDef.dataSource?.fetchXml && childGridDef.dataSource?.entitySetName && childGridDef.dataSource?.entityName && childGridDef.dataSource?.fetchXml
+  );
   const barItems = (gridDef.commandBarItems ?? []).filter(
     (ci) => ci.visibility === "commandBar" || ci.visibility === "both" || !ci.visibility
-  );
+  ).filter((ci) => ci.actionType !== "addExisting" || addExistingFeasible);
   const contextMenuItems = (gridDef.commandBarItems ?? []).filter(
     (ci) => ci.visibility === "contextMenu" || ci.visibility === "both" || !ci.visibility
-  );
+  ).filter((ci) => ci.actionType !== "addExisting" || addExistingFeasible);
+  const enableAddExisting = addExistingFeasible && (barItems.some((ci) => ci.actionType === "addExisting") || contextMenuItems.some((ci) => ci.actionType === "addExisting"));
   const _handlerAvailable = (
     // The dispatcher calls useUpdateRecord/useDeleteRecord/useQueryClient — which only
     // exist (module + provider + dep) when the data-access layer is included. Without it,
@@ -15075,7 +15104,6 @@ function generateLinkedSubgrid(gridDef, entityName, imports, library = "fluent-v
         </div>
       </div>`;
   }
-  const childGridDef = gridDef.nestedGridId ? _currentGridCustomizers.find((g) => g.id === gridDef.nestedGridId) : void 0;
   const isGridKitNested = !!childGridDef;
   const visibleCols = [...gridDef.columns].filter((c) => c.isVisible).sort((a, b) => a.order - b.order);
   const exportColumnsLiteral = enableExport ? buildExportColumnsLiteral(visibleCols) : "";
@@ -15148,7 +15176,18 @@ ${childEntries.join(",\n")},
         itemsExpr: "keyedItems",
         selectionExpr: "selectedIndices",
         exportColumnsLiteral,
-        createColumnsLiteral
+        createColumnsLiteral,
+        // Associate an existing child to the clicked/active parent (the ONLY call site
+        // that wires it). Shared by the nested AND focused-view emitters below — both
+        // reuse this ngHandlerBlock. Gated on enableAddExisting (feasible AND an
+        // addExisting item present); the && chain narrows the optional entity-set strings
+        // to `string` (enableAddExisting ⟹ addExistingFeasible guarantees they're present).
+        addExisting: enableAddExisting && childEntitySet && childEntityLogical && parentEntitySet && nestedRel?.childField ? {
+          childEntitySet,
+          childEntityLogical,
+          childField: nestedRel.childField,
+          parentEntitySet
+        } : null
       }) : "";
       const ngHasDelete = (gridDef.commandBarItems ?? []).some(
         (ci) => ci.actionType === "delete"
@@ -15379,7 +15418,9 @@ ${childEntries.join(",\n")},
       itemsExpr: "rows",
       selectionExpr: "selectedIndices",
       exportColumnsLiteral,
-      createColumnsLiteral
+      createColumnsLiteral,
+      addExisting: null
+      // flat (no parent relationship) → addExisting filtered out above
     }) : "";
     const cardSelectedIndicesState = cardEmitHandler ? "\n  const [selectedIndices, setSelectedIndices] = React.useState<Set<number>>(new Set());" : "";
     const cardRowCommandsLiteral = cardEmitRowCommands ? buildRowCommandsLiteral(contextMenuItems) : "";
@@ -15473,7 +15514,9 @@ ${childEntries.join(",\n")},
       itemsExpr: "rows",
       selectionExpr: "selectedIndices",
       exportColumnsLiteral,
-      createColumnsLiteral
+      createColumnsLiteral,
+      addExisting: null
+      // flat (no parent relationship) → addExisting filtered out above
     }) : "";
     const roSelectedIndicesState = roEmitHandler ? "\n  const [selectedIndices, setSelectedIndices] = React.useState<Set<number>>(new Set());" : "";
     const roRowCommandsLiteral = roEmitRowCommands ? buildRowCommandsLiteral(contextMenuItems) : "";
@@ -15585,7 +15628,9 @@ const ${liveWrapperName}: React.FC = () => {
         itemsExpr: "keyedItems",
         selectionExpr: "selectedIndices",
         exportColumnsLiteral,
-        createColumnsLiteral
+        createColumnsLiteral,
+        addExisting: null
+        // flat (no parent relationship) → addExisting filtered out above
       }) : "";
       const edSelectedIndicesState = edEmitHandler ? "\n  const [selectedIndices, setSelectedIndices] = React.useState<Set<number>>(new Set());" : "";
       const edRowCommandsLiteral = edEmitRowCommands ? buildRowCommandsLiteral(contextMenuItems) : "";
@@ -18445,6 +18490,19 @@ ${code}
 };
 `;
 }
+function dedupeImportStatements(content) {
+  const isImportLine = (l) => /^import\b[^\n]*\bfrom\b[^\n]*;[ \t]*$/.test(l) || /^import\s+['"][^'"]+['"];[ \t]*$/.test(l);
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const line of content.split("\n")) {
+    if (isImportLine(line)) {
+      if (seen.has(line)) continue;
+      seen.add(line);
+    }
+    out.push(line);
+  }
+  return out.join("\n");
+}
 function generateFormCode(form, options) {
   _currentGridCustomizers = options?.gridCustomizers ?? [];
   _includeSampleData = options?.includeSampleData ?? false;
@@ -18475,6 +18533,7 @@ function generateFormCode(form, options) {
     default:
       content = generateMainForm(form, hasRules, library);
   }
+  content = dedupeImportStatements(content);
   const files = [
     { path: `src/components/${fileName}`, content }
   ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataverse-kit/export-engine",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",