@dataverse-kit/export-engine 1.2.0 → 1.4.0

package/dist/index.cjs

@@ -20278,7 +20278,7 @@ function walkForm(form, entities, gridById) {
   for (const section of sections) {
     for (const row of section.rows ?? []) {
       for (const cell of row.cells ?? []) {
-        for (const control of cell.controls ?? []) {
+        for (const control of cellControls(cell)) {
           absorbControl(control, primary, entities, gridById);
         }
       }
@@ -20286,11 +20286,17 @@ function walkForm(form, entities, gridById) {
   }
   const headerCells = form.header?.cells ?? [];
   for (const cell of headerCells) {
-    for (const control of cell.controls ?? []) {
+    for (const control of cellControls(cell)) {
       absorbControl(control, primary, entities, gridById);
     }
   }
 }
+function cellControls(cell) {
+  return [
+    ...cell.control ? [cell.control] : [],
+    ...cell.controls ?? []
+  ];
+}
 function absorbControl(control, primary, entities, gridById) {
   if (control.dataBinding && primary) {
     absorbBinding(control.dataBinding, primary);
@@ -20816,7 +20822,11 @@ function anyFormHasBindings(forms) {
     for (const section of sections) {
       for (const row of section.rows ?? []) {
         for (const cell of row.cells ?? []) {
-          for (const control of cell.controls ?? []) {
+          const controls = [
+            ...cell.control ? [cell.control] : [],
+            ...cell.controls ?? []
+          ];
+          for (const control of controls) {
             if (control.dataBinding) return true;
             if (control.type === "subgrid" && typeof control.properties?.entityName === "string" && control.properties.entityName) {
               return true;
@@ -22541,27 +22551,6 @@ function generatePcfProject(project, options) {
       2
     ) + "\n"
   });
-  const platformLibraries = isV9 ? `    <platform-library name="React" version="18.2.0" />
-    <platform-library name="Fluent" version="9.46.2" />` : `    <platform-library name="React" version="16.14.0" />
-    <platform-library name="Fluent" version="8.29.0" />`;
-  const nsAttr = escapeHtml(ns);
-  const controlNameAttr = escapeHtml(controlName);
-  files.push({
-    path: `${controlName}/ControlManifest.Input.xml`,
-    content: `<?xml version="1.0" encoding="utf-8" ?>
-<manifest>
-  <control namespace="${nsAttr}" constructor="${controlNameAttr}" version="1.0.0" display-name-key="${controlNameAttr}" description-key="${controlNameAttr} PCF Control" control-type="virtual" >
-    <external-service-usage enabled="false">
-    </external-service-usage>
-    <property name="value" display-name-key="Value" description-key="Primary value" of-type="SingleLine.Text" usage="bound" required="false" />
-    <resources>
-      <code path="index.ts" order="1"/>
-${platformLibraries}
-    </resources>
-  </control>
-</manifest>
-`
-  });
   const mainForm = project.forms.find((f) => f.type === "main") ?? project.forms[0];
   const mainComponentName = mainForm ? toFormComponentName(mainForm.name) : "div";
   const pcfIndexContent = isV9 ? `import { IInputs, IOutputs } from './generated/ManifestTypes';
@@ -22569,7 +22558,7 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { initializeIcons } from '@fluentui/react';
 import { FluentProvider, webLightTheme } from '@fluentui/react-components';
-import { ${mainComponentName} } from './components/${mainComponentName}';
+import { ${mainComponentName} } from './src/components/${mainComponentName}';
 
 initializeIcons();
 
@@ -22609,7 +22598,7 @@ export class ${controlName} implements ComponentFramework.ReactControl<IInputs,
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { initializeIcons, ThemeProvider } from '@fluentui/react';
-import { ${mainComponentName} } from './components/${mainComponentName}';
+import { ${mainComponentName} } from './src/components/${mainComponentName}';
 
 initializeIcons();
 
@@ -22662,6 +22651,29 @@ export class ${controlName} implements ComponentFramework.ReactControl<IInputs,
       content: file.content
     });
   }
+  const usesGridKit = formFiles.some((f) => f.path.startsWith("src/lib/grid-kit/"));
+  const platformLibraries = isV9 ? `    <platform-library name="React" version="18.2.0" />
+    <platform-library name="Fluent" version="9.46.2" />` : usesGridKit ? `    <platform-library name="React" version="18.2.0" />
+    <platform-library name="Fluent" version="8.115.6" />` : `    <platform-library name="React" version="16.14.0" />
+    <platform-library name="Fluent" version="8.29.0" />`;
+  const nsAttr = escapeHtml(ns);
+  const controlNameAttr = escapeHtml(controlName);
+  files.push({
+    path: `${controlName}/ControlManifest.Input.xml`,
+    content: `<?xml version="1.0" encoding="utf-8" ?>
+<manifest>
+  <control namespace="${nsAttr}" constructor="${controlNameAttr}" version="1.0.0" display-name-key="${controlNameAttr}" description-key="${controlNameAttr} PCF Control" control-type="virtual" >
+    <external-service-usage enabled="false">
+    </external-service-usage>
+    <property name="value" display-name-key="Value" description-key="Primary value" of-type="SingleLine.Text" usage="bound" required="false" />
+    <resources>
+      <code path="index.ts" order="1"/>
+${platformLibraries}
+    </resources>
+  </control>
+</manifest>
+`
+  });
   if (includeDataAccessLayer) {
     const dalFiles = generateDataAccessLayer(
       project.forms,

package/dist/index.mjs

@@ -20258,7 +20258,7 @@ function walkForm(form, entities, gridById) {
   for (const section of sections) {
     for (const row of section.rows ?? []) {
       for (const cell of row.cells ?? []) {
-        for (const control of cell.controls ?? []) {
+        for (const control of cellControls(cell)) {
           absorbControl(control, primary, entities, gridById);
         }
       }
@@ -20266,11 +20266,17 @@ function walkForm(form, entities, gridById) {
   }
   const headerCells = form.header?.cells ?? [];
   for (const cell of headerCells) {
-    for (const control of cell.controls ?? []) {
+    for (const control of cellControls(cell)) {
       absorbControl(control, primary, entities, gridById);
     }
   }
 }
+function cellControls(cell) {
+  return [
+    ...cell.control ? [cell.control] : [],
+    ...cell.controls ?? []
+  ];
+}
 function absorbControl(control, primary, entities, gridById) {
   if (control.dataBinding && primary) {
     absorbBinding(control.dataBinding, primary);
@@ -20796,7 +20802,11 @@ function anyFormHasBindings(forms) {
     for (const section of sections) {
       for (const row of section.rows ?? []) {
         for (const cell of row.cells ?? []) {
-          for (const control of cell.controls ?? []) {
+          const controls = [
+            ...cell.control ? [cell.control] : [],
+            ...cell.controls ?? []
+          ];
+          for (const control of controls) {
             if (control.dataBinding) return true;
             if (control.type === "subgrid" && typeof control.properties?.entityName === "string" && control.properties.entityName) {
               return true;
@@ -22521,27 +22531,6 @@ function generatePcfProject(project, options) {
       2
     ) + "\n"
   });
-  const platformLibraries = isV9 ? `    <platform-library name="React" version="18.2.0" />
-    <platform-library name="Fluent" version="9.46.2" />` : `    <platform-library name="React" version="16.14.0" />
-    <platform-library name="Fluent" version="8.29.0" />`;
-  const nsAttr = escapeHtml(ns);
-  const controlNameAttr = escapeHtml(controlName);
-  files.push({
-    path: `${controlName}/ControlManifest.Input.xml`,
-    content: `<?xml version="1.0" encoding="utf-8" ?>
-<manifest>
-  <control namespace="${nsAttr}" constructor="${controlNameAttr}" version="1.0.0" display-name-key="${controlNameAttr}" description-key="${controlNameAttr} PCF Control" control-type="virtual" >
-    <external-service-usage enabled="false">
-    </external-service-usage>
-    <property name="value" display-name-key="Value" description-key="Primary value" of-type="SingleLine.Text" usage="bound" required="false" />
-    <resources>
-      <code path="index.ts" order="1"/>
-${platformLibraries}
-    </resources>
-  </control>
-</manifest>
-`
-  });
   const mainForm = project.forms.find((f) => f.type === "main") ?? project.forms[0];
   const mainComponentName = mainForm ? toFormComponentName(mainForm.name) : "div";
   const pcfIndexContent = isV9 ? `import { IInputs, IOutputs } from './generated/ManifestTypes';
@@ -22549,7 +22538,7 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { initializeIcons } from '@fluentui/react';
 import { FluentProvider, webLightTheme } from '@fluentui/react-components';
-import { ${mainComponentName} } from './components/${mainComponentName}';
+import { ${mainComponentName} } from './src/components/${mainComponentName}';
 
 initializeIcons();
 
@@ -22589,7 +22578,7 @@ export class ${controlName} implements ComponentFramework.ReactControl<IInputs,
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { initializeIcons, ThemeProvider } from '@fluentui/react';
-import { ${mainComponentName} } from './components/${mainComponentName}';
+import { ${mainComponentName} } from './src/components/${mainComponentName}';
 
 initializeIcons();
 
@@ -22642,6 +22631,29 @@ export class ${controlName} implements ComponentFramework.ReactControl<IInputs,
       content: file.content
     });
   }
+  const usesGridKit = formFiles.some((f) => f.path.startsWith("src/lib/grid-kit/"));
+  const platformLibraries = isV9 ? `    <platform-library name="React" version="18.2.0" />
+    <platform-library name="Fluent" version="9.46.2" />` : usesGridKit ? `    <platform-library name="React" version="18.2.0" />
+    <platform-library name="Fluent" version="8.115.6" />` : `    <platform-library name="React" version="16.14.0" />
+    <platform-library name="Fluent" version="8.29.0" />`;
+  const nsAttr = escapeHtml(ns);
+  const controlNameAttr = escapeHtml(controlName);
+  files.push({
+    path: `${controlName}/ControlManifest.Input.xml`,
+    content: `<?xml version="1.0" encoding="utf-8" ?>
+<manifest>
+  <control namespace="${nsAttr}" constructor="${controlNameAttr}" version="1.0.0" display-name-key="${controlNameAttr}" description-key="${controlNameAttr} PCF Control" control-type="virtual" >
+    <external-service-usage enabled="false">
+    </external-service-usage>
+    <property name="value" display-name-key="Value" description-key="Primary value" of-type="SingleLine.Text" usage="bound" required="false" />
+    <resources>
+      <code path="index.ts" order="1"/>
+${platformLibraries}
+    </resources>
+  </control>
+</manifest>
+`
+  });
   if (includeDataAccessLayer) {
     const dalFiles = generateDataAccessLayer(
       project.forms,

package/package.json

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