@svgrid/enterprise 1.1.0 → 1.2.0

package/package.json

@@ -1,72 +1,84 @@
-{
-  "name": "@svgrid/enterprise",
-  "version": "1.1.0",
-  "description": "Pro feature pack for sv-grid: data export (Excel, PDF, CSV, TSV, HTML), import (xlsx, CSV, TSV, JSON), pivot table + designer, AI assistant (BYO model), and printing. Requires a paid license key.",
-  "license": "SEE LICENSE IN LICENSE",
-  "author": "jQWidgets <sales@jqwidgets.com>",
-  "homepage": "https://svgrid.com/pricing",
-  "type": "module",
-  "exports": {
-    ".": {
-      "types": "./src/index.ts",
-      "svelte": "./src/index.ts",
-      "import": "./src/index.ts"
-    },
-    "./export": {
-      "types": "./src/export.ts",
-      "svelte": "./src/export.ts",
-      "import": "./src/export.ts"
-    },
-    "./print": {
-      "types": "./src/print.ts",
-      "svelte": "./src/print.ts",
-      "import": "./src/print.ts"
-    },
-    "./ai": {
-      "types": "./src/ai.ts",
-      "svelte": "./src/ai.ts",
-      "import": "./src/ai.ts"
-    },
-    "./import": {
-      "types": "./src/import.ts",
-      "svelte": "./src/import.ts",
-      "import": "./src/import.ts"
-    },
-    "./pivot": {
-      "types": "./src/pivot.ts",
-      "svelte": "./src/pivot.ts",
-      "import": "./src/pivot.ts"
-    },
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "src",
-    "README.md",
-    "LICENSE"
-  ],
-  "scripts": {
-    "test": "vitest run",
-    "test:types": "tsc -p tsconfig.json --noEmit"
-  },
-  "peerDependencies": {
-    "svelte": "^5.0.0",
-    "@svgrid/grid": "workspace:*",
-    "jszip": "^3.10.0",
-    "pdfmake": "^0.2.0"
-  },
-  "peerDependenciesMeta": {
-    "jszip": {
-      "optional": true
-    },
-    "pdfmake": {
-      "optional": true
-    }
-  },
-  "devDependencies": {
-    "jszip": "^3.10.1",
-    "pdfmake": "^0.2.10",
-    "svelte": "^5.55.5",
-    "@svgrid/grid": "workspace:*",
-    "typescript": "6.0.3"
-  }
+{
+  "name": "@svgrid/enterprise",
+  "version": "1.2.0",
+  "description": "Pro feature pack for sv-grid: data export (Excel, PDF, CSV, TSV, HTML), import (xlsx, CSV, TSV, JSON), pivot table + designer, AI assistant (BYO model), and printing. Requires a paid license key.",
+  "license": "SEE LICENSE IN LICENSE",
+  "author": "jQWidgets <sales@jqwidgets.com>",
+  "homepage": "https://svgrid.com/pricing",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./src/index.ts",
+      "svelte": "./src/index.ts",
+      "import": "./src/index.ts"
+    },
+    "./export": {
+      "types": "./src/export.ts",
+      "svelte": "./src/export.ts",
+      "import": "./src/export.ts"
+    },
+    "./print": {
+      "types": "./src/print.ts",
+      "svelte": "./src/print.ts",
+      "import": "./src/print.ts"
+    },
+    "./ai": {
+      "types": "./src/ai.ts",
+      "svelte": "./src/ai.ts",
+      "import": "./src/ai.ts"
+    },
+    "./import": {
+      "types": "./src/import.ts",
+      "svelte": "./src/import.ts",
+      "import": "./src/import.ts"
+    },
+    "./pivot": {
+      "types": "./src/pivot.ts",
+      "svelte": "./src/pivot.ts",
+      "import": "./src/pivot.ts"
+    },
+    "./cdn/svelte-external": {
+      "import": "./dist/cdn/svgrid-enterprise.svelte-external.js",
+      "default": "./dist/cdn/svgrid-enterprise.svelte-external.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "unpkg": "./dist/cdn/svgrid-enterprise.svelte-external.js",
+  "jsdelivr": "./dist/cdn/svgrid-enterprise.svelte-external.js",
+  "files": [
+    "src",
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "test": "vitest run",
+    "test:types": "tsc -p tsconfig.json --noEmit",
+    "build": "node ./scripts/build-cdn.mjs",
+    "build:cdn": "node ./scripts/build-cdn.mjs",
+    "prepublishOnly": "node ./scripts/build-cdn.mjs"
+  },
+  "peerDependencies": {
+    "svelte": "^5.0.0",
+    "@svgrid/grid": "workspace:*",
+    "jszip": "^3.10.0",
+    "pdfmake": "^0.2.0"
+  },
+  "peerDependenciesMeta": {
+    "jszip": {
+      "optional": true
+    },
+    "pdfmake": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "@sveltejs/vite-plugin-svelte": "^7.0.0",
+    "jszip": "^3.10.1",
+    "pdfmake": "^0.2.10",
+    "svelte": "^5.55.5",
+    "@svgrid/grid": "workspace:*",
+    "typescript": "6.0.3",
+    "vite": "^8.0.10"
+  }
 }

package/src/export.ts

@@ -126,6 +126,30 @@ export type ExportOptions<TData> = {
    * Mutually exclusive with `groupBy`. xlsx only.
    */
   hierarchical?: boolean
+  /**
+   * Merged cells to write into the sheet (xlsx / pdf). Each entry spans
+   * `colSpan` columns and `rowSpan` rows starting at the given zero-based
+   * **body** row / column index (the header row is not counted). Mirrors the
+   * grid's own `MergeSpec` shape closely, so grid merges map straight through -
+   * convert a `MergeSpec` (`{ rowIndex, columnId, rowspan, colspan }`) by
+   * resolving `columnId` to its column index. Mutually exclusive with
+   * `groupBy` / `hierarchical`.
+   */
+  merges?: ReadonlyArray<ExportMerge>
+}
+
+/**
+ * A merged cell region for {@link ExportOptions.merges}. `row` / `col` are
+ * zero-based indices into the exported body (header excluded). A cell that
+ * spans two columns to the right is `{ row, col, colSpan: 2 }`.
+ */
+export type ExportMerge = {
+  row: number
+  col: number
+  /** Columns to span (default 1). */
+  colSpan?: number
+  /** Rows to span (default 1). */
+  rowSpan?: number
 }
 
 let exporterCtorPromise: Promise<
@@ -398,6 +422,19 @@ function buildExporterOptions<TData>(
   // hierarchical through here and groupBy through the constructor call
   // site in exportGrid.
   if (opts.hierarchical) out.hierarchical = true
+  // Merged cells: translate the friendly {row, col, rowSpan, colSpan} shape to
+  // Smart's native {cell: [row, col], rowspan, colspan}. Skip 1x1 "merges"
+  // (nothing to span). Ignored when grouping/hierarchy owns the row layout.
+  if (opts.merges?.length && !opts.groupBy?.length && !opts.hierarchical) {
+    const mergedCells = opts.merges
+      .map((m) => ({
+        cell: [m.row, m.col],
+        rowspan: Math.max(1, Math.floor(m.rowSpan ?? 1)),
+        colspan: Math.max(1, Math.floor(m.colSpan ?? 1)),
+      }))
+      .filter((m) => m.rowspan > 1 || m.colspan > 1)
+    if (mergedCells.length) out.mergedCells = mergedCells
+  }
   return out
 }
 

package/src/pivot.ts

@@ -238,7 +238,7 @@ function buildColumnTree<TFeatures extends TableFeatures>(
   const headerCol: ColumnDef<TFeatures, PivotRow> = {
     id: '__pivotRowHeader',
     header: rowHeaderLabel,
-    accessorFn: (row) => row.__pivotLabel,
+    fieldFn: (row) => row.__pivotLabel,
     width: 240,
   }
 
@@ -252,7 +252,7 @@ function buildColumnTree<TFeatures extends TableFeatures>(
         return {
           id,
           header: label,
-          accessorFn: (row) => row[id],
+          fieldFn: (row) => row[id],
           format: value.format,
           width: 130,
         } as ColumnDef<TFeatures, PivotRow>
@@ -283,7 +283,7 @@ function buildColumnTree<TFeatures extends TableFeatures>(
     return {
       id,
       header: label,
-      accessorFn: (row) => row[id],
+      fieldFn: (row) => row[id],
       format: value.format,
       width: 140,
     } as ColumnDef<TFeatures, PivotRow>