@smartnet360/svelte-components 0.0.127 → 0.0.129

package/dist/map-v3/features/cells/custom/logic/csv-parser.d.ts

@@ -2,7 +2,7 @@
  * Custom Cells - CSV Parser
  *
  * Parses CSV files for custom cell sets.
- * Required column: txId
+ * Required column: cellName (or txId for backwards compatibility)
  * Optional columns: customGroup, sizeFactor, + any extras for tooltips
  */
 import type { CustomCellImportResult } from '../types';
@@ -10,11 +10,12 @@ import type { Cell } from '../../../../../shared/demo';
 /**
  * Parse a CSV string into custom cells
  * @param csvContent Raw CSV content
- * @param cellLookup Map of txId -> Cell for resolving cell data
+ * @param cellLookup Map of cellName -> Cell for resolving cell data
  * @returns Import result with cells, unmatched IDs, groups, and extra columns
  */
 export declare function parseCustomCellsCsv(csvContent: string, cellLookup: Map<string, Cell>): CustomCellImportResult;
 /**
  * Build a cell lookup map from an array of cells
+ * Creates lookups for both cellName and txId for flexible matching
  */
 export declare function buildCellLookup(cells: Cell[]): Map<string, Cell>;

package/dist/map-v3/features/cells/custom/logic/csv-parser.js

@@ -2,13 +2,13 @@
  * Custom Cells - CSV Parser
  *
  * Parses CSV files for custom cell sets.
- * Required column: txId
+ * Required column: cellName (or txId for backwards compatibility)
  * Optional columns: customGroup, sizeFactor, + any extras for tooltips
  */
 /**
  * Known/reserved column names
  */
-const RESERVED_COLUMNS = ['txId', 'txid', 'customGroup', 'customgroup', 'sizeFactor', 'sizefactor'];
+const RESERVED_COLUMNS = ['cellname', 'txid', 'customgroup', 'sizefactor'];
 /**
  * Normalize column name for matching
  */
@@ -18,7 +18,7 @@ function normalizeColumnName(name) {
 /**
  * Parse a CSV string into custom cells
  * @param csvContent Raw CSV content
- * @param cellLookup Map of txId -> Cell for resolving cell data
+ * @param cellLookup Map of cellName -> Cell for resolving cell data
  * @returns Import result with cells, unmatched IDs, groups, and extra columns
  */
 export function parseCustomCellsCsv(csvContent, cellLookup) {
@@ -36,10 +36,15 @@ export function parseCustomCellsCsv(csvContent, cellLookup) {
     const headerLine = lines[0];
     const headers = parseCSVLine(headerLine);
     const normalizedHeaders = headers.map(normalizeColumnName);
-    // Find required txId column
-    const txIdIndex = normalizedHeaders.findIndex(h => h === 'txid');
-    if (txIdIndex === -1) {
-        throw new Error('CSV must contain a "txId" column');
+    // Find cell identifier column - prefer cellName, fallback to txId
+    let idIndex = normalizedHeaders.findIndex(h => h === 'cellname');
+    let usesCellName = true;
+    if (idIndex === -1) {
+        idIndex = normalizedHeaders.findIndex(h => h === 'txid');
+        usesCellName = false;
+    }
+    if (idIndex === -1) {
+        throw new Error('CSV must contain a "cellName" or "txId" column');
     }
     // Find optional columns
     const groupIndex = normalizedHeaders.findIndex(h => h === 'customgroup');
@@ -63,8 +68,8 @@ export function parseCustomCellsCsv(csvContent, cellLookup) {
         if (!line)
             continue;
         const values = parseCSVLine(line);
-        const txId = values[txIdIndex]?.trim();
-        if (!txId)
+        const cellIdentifier = values[idIndex]?.trim();
+        if (!cellIdentifier)
             continue;
         // Get custom group (default to 'default')
         const customGroup = groupIndex !== -1
@@ -88,10 +93,10 @@ export function parseCustomCellsCsv(csvContent, cellLookup) {
             extraFields[extraColumns[i]] = isNaN(numValue) ? value : numValue;
         });
         // Resolve cell from lookup
-        const resolvedCell = cellLookup.get(txId);
+        const resolvedCell = cellLookup.get(cellIdentifier);
         if (resolvedCell) {
             cells.push({
-                txId,
+                txId: resolvedCell.txId, // Always store the txId from resolved cell
                 customGroup,
                 sizeFactor,
                 extraFields,
@@ -99,7 +104,7 @@ export function parseCustomCellsCsv(csvContent, cellLookup) {
             });
         }
         else {
-            unmatchedTxIds.push(txId);
+            unmatchedTxIds.push(cellIdentifier);
         }
     }
     return {
@@ -152,10 +157,16 @@ function parseCSVLine(line) {
 }
 /**
  * Build a cell lookup map from an array of cells
+ * Creates lookups for both cellName and txId for flexible matching
  */
 export function buildCellLookup(cells) {
     const lookup = new Map();
     for (const cell of cells) {
+        // Primary: lookup by cellName
+        if (cell.cellName) {
+            lookup.set(cell.cellName, cell);
+        }
+        // Fallback: also allow lookup by txId for backwards compatibility
         if (cell.txId) {
             lookup.set(cell.txId, cell);
         }

package/dist/map-v3/features/cells/custom/stores/custom-cell-sets.svelte.d.ts

@@ -2,10 +2,13 @@
  * Custom Cell Sets Store
  *
  * Manages multiple custom cell sets, each loaded from a CSV file.
- * Resolves cell data from the parent CellDataStore.
+ * Resolves cell data from a provided cell array.
  */
+import type { Cell } from '../../types';
 import type { CellDataStore } from '../../stores/cell.data.svelte';
 import type { CustomCellSet, CustomCellImportResult } from '../types';
+/** Function that returns the current cells array */
+type CellsGetter = () => Cell[];
 /**
  * Store for managing custom cell sets
  */
@@ -14,11 +17,16 @@ export declare class CustomCellSetsStore {
     sets: CustomCellSet[];
     /** Version counter for reactivity */
     version: number;
-    /** Reference to parent cell data store */
-    private cellDataStore;
+    /** Function to get current cells */
+    private getCells;
     /** Storage key for persistence */
     private storageKey;
-    constructor(cellDataStore: CellDataStore, namespace?: string);
+    /**
+     * Create a new CustomCellSetsStore
+     * @param cells - Either a Cell array or a getter function that returns cells
+     * @param namespace - Storage namespace for persistence
+     */
+    constructor(cells: Cell[] | CellsGetter, namespace?: string);
     /**
      * Import a CSV file and create a new custom cell set
      */
@@ -74,5 +82,8 @@ export declare class CustomCellSetsStore {
 }
 /**
  * Factory function to create a custom cell sets store
+ * @param cells - Cell array, getter function, or CellDataStore
+ * @param namespace - Storage namespace for persistence
  */
-export declare function createCustomCellSetsStore(cellDataStore: CellDataStore, namespace?: string): CustomCellSetsStore;
+export declare function createCustomCellSetsStore(cells: Cell[] | CellsGetter | CellDataStore, namespace?: string): CustomCellSetsStore;
+export {};

package/dist/map-v3/features/cells/custom/stores/custom-cell-sets.svelte.js

@@ -2,7 +2,7 @@
  * Custom Cell Sets Store
  *
  * Manages multiple custom cell sets, each loaded from a CSV file.
- * Resolves cell data from the parent CellDataStore.
+ * Resolves cell data from a provided cell array.
  */
 import { browser } from '$app/environment';
 import { CUSTOM_CELL_PALETTE } from '../types';
@@ -21,12 +21,18 @@ export class CustomCellSetsStore {
     sets = $state([]);
     /** Version counter for reactivity */
     version = $state(0);
-    /** Reference to parent cell data store */
-    cellDataStore;
+    /** Function to get current cells */
+    getCells;
     /** Storage key for persistence */
     storageKey;
-    constructor(cellDataStore, namespace = 'default') {
-        this.cellDataStore = cellDataStore;
+    /**
+     * Create a new CustomCellSetsStore
+     * @param cells - Either a Cell array or a getter function that returns cells
+     * @param namespace - Storage namespace for persistence
+     */
+    constructor(cells, namespace = 'default') {
+        // Normalize to a getter function
+        this.getCells = typeof cells === 'function' ? cells : () => cells;
         this.storageKey = `${namespace}:custom-cell-sets`;
         if (browser) {
             this.load();
@@ -36,14 +42,15 @@ export class CustomCellSetsStore {
                 const _v = this.version;
                 this.save();
             });
-            // Re-resolve cells when main cell data changes
+            // Re-resolve cells when cell data changes (only works if getter is reactive)
             $effect(() => {
-                const cellCount = this.cellDataStore.rawCells.length;
+                const currentCells = this.getCells();
+                const cellCount = currentCells.length;
                 if (cellCount > 0 && this.sets.length > 0) {
                     // Check if any cells need resolution
                     const needsResolution = this.sets.some(set => set.cells.some(c => !c.resolvedCell));
                     if (needsResolution) {
-                        console.log('[CustomCellSetsStore] Re-resolving cells after main data loaded');
+                        console.log('[CustomCellSetsStore] Re-resolving cells after data loaded');
                         this.refreshResolutions();
                     }
                 }
@@ -54,8 +61,8 @@ export class CustomCellSetsStore {
      * Import a CSV file and create a new custom cell set
      */
     importFromCsv(csvContent, fileName) {
-        // Build lookup from all cells (unfiltered)
-        const cellLookup = buildCellLookup(this.cellDataStore.rawCells);
+        // Build lookup from all cells
+        const cellLookup = buildCellLookup(this.getCells());
         // Parse CSV
         const result = parseCustomCellsCsv(csvContent, cellLookup);
         return result;
@@ -180,7 +187,7 @@ export class CustomCellSetsStore {
      * Re-resolve cells after main cell data changes
      */
     refreshResolutions() {
-        const cellLookup = buildCellLookup(this.cellDataStore.rawCells);
+        const cellLookup = buildCellLookup(this.getCells());
         for (const set of this.sets) {
             for (const cell of set.cells) {
                 cell.resolvedCell = cellLookup.get(cell.txId);
@@ -236,7 +243,13 @@ export class CustomCellSetsStore {
 }
 /**
  * Factory function to create a custom cell sets store
+ * @param cells - Cell array, getter function, or CellDataStore
+ * @param namespace - Storage namespace for persistence
  */
-export function createCustomCellSetsStore(cellDataStore, namespace = 'default') {
-    return new CustomCellSetsStore(cellDataStore, namespace);
+export function createCustomCellSetsStore(cells, namespace = 'default') {
+    // Handle CellDataStore by extracting a getter
+    if (cells && typeof cells === 'object' && 'rawCells' in cells) {
+        return new CustomCellSetsStore(() => cells.rawCells, namespace);
+    }
+    return new CustomCellSetsStore(cells, namespace);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@smartnet360/svelte-components",
-	"version": "0.0.127",
+	"version": "0.0.129",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build && npm run prepack",