@svadmin/core 0.32.0 → 0.32.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svadmin/core",
-  "version": "0.32.0",
+  "version": "0.32.2",
   "author": "zuohuadong",
   "repository": {
     "type": "git",
@@ -9,14 +9,14 @@
   },
   "main": "src/index.ts",
   "devDependencies": {
-    "@happy-dom/global-registrator": "^20.10.0",
+    "@happy-dom/global-registrator": "^20.11.0",
     "@sveltejs/vite-plugin-svelte": "^7.2.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/svelte": "^5.4.2",
     "@testing-library/user-event": "^14.6.1",
     "@types/bun": "^1.3.14",
     "@types/jsdom": "^28.0.3",
-    "happy-dom": "^20.10.0",
+    "happy-dom": "^20.11.0",
     "jsdom": "^29.1.1",
     "vitest": "^4.1.8"
   },

package/src/data-transfer.svelte.ts

@@ -3,6 +3,7 @@ import { useParsed } from './useParsed.svelte';
 import type { Sort, Filter, BaseRecord } from './types';
 import { downloadData } from './export-format';
 import type { ExportFormat } from './export-format';
+import { parseCSV } from './helpers-pure';
 export { downloadData, toCsv, toJson, toXlsx, escapeCsvField } from './export-format';
 export type { ExportFormat } from './export-format';
 
@@ -69,7 +70,9 @@ export function useExport<TData extends BaseRecord = BaseRecord>(options: UseExp
 
       return allRecords;
     } catch (error) {
-      options.onError?.(error as Error);
+      const exportError = error instanceof Error ? error : new Error(String(error));
+      if (!options.onError) throw exportError;
+      options.onError(exportError);
       return [];
     } finally {
       isLoading = false;
@@ -211,61 +214,3 @@ export function useImport<TData = Record<string, unknown>>(options: UseImportOpt
     get mutationResult() { return mutationResult; },
   };
 }
-
-
-// ─── 解析工具 ────────────────────────────────────────────────────
-
-/** Parse full CSV text respecting quoted multi-line fields */
-function parseCSV(text: string): string[][] {
-  const rows: string[][] = [];
-  let currentRow: string[] = [];
-  let currentVal = '';
-  let inQuotes = false;
-  let wasQuoted = false;
-
-  for (let i = 0; i < text.length; i++) {
-    const ch = text[i];
-    if (inQuotes) {
-      if (ch === '"') {
-        if (i + 1 < text.length && text[i + 1] === '"') {
-          currentVal += '"';
-          i++;
-        } else {
-          inQuotes = false;
-        }
-      } else {
-        currentVal += ch;
-      }
-    } else {
-      if (ch === '"') {
-        inQuotes = true;
-        wasQuoted = true;
-      } else if (ch === ',') {
-        currentRow.push(wasQuoted ? currentVal : currentVal.trim());
-        currentVal = '';
-        wasQuoted = false;
-      } else if (ch === '\n' || ch === '\r') {
-        currentRow.push(wasQuoted ? currentVal : currentVal.trim());
-        if (currentRow.some(v => v !== '')) {
-          rows.push(currentRow);
-        }
-        currentRow = [];
-        currentVal = '';
-        wasQuoted = false;
-        if (ch === '\r' && i + 1 < text.length && text[i + 1] === '\n') {
-          i++;
-        }
-      } else {
-        currentVal += ch;
-      }
-    }
-  }
-  
-  if (currentVal || currentRow.length > 0) {
-    currentRow.push(wasQuoted ? currentVal : currentVal.trim());
-    if (currentRow.some(v => v !== '')) {
-      rows.push(currentRow);
-    }
-  }
-  return rows;
-}

package/src/export-format.ts

@@ -5,24 +5,28 @@
 export type ExportFormat = 'csv' | 'json' | 'xlsx';
 
 /** CSV 转义，含公式注入防护 */
-export function escapeCsvField(s: string): string {
-  let val = s;
-  if (/^[=+@\t\r]/.test(val)) val = "'" + val;
-  return val.includes(',') || val.includes('"') || val.includes('\n') || val.includes('\r')
-    ? `"${val.replace(/"/g, '""')}"`
-    : val;
+export function escapeCsvField(fieldValue: string): string {
+  let escapedValue = fieldValue;
+  if (/^[=+@\t\r]/.test(escapedValue)) escapedValue = "'" + escapedValue;
+  return escapedValue.includes(',') || escapedValue.includes('"') || escapedValue.includes('\n') || escapedValue.includes('\r')
+    ? `"${escapedValue.replace(/"/g, '""')}"`
+    : escapedValue;
 }
 
 /** 将记录数组转为 CSV 字符串 */
 export function toCsv(records: Record<string, unknown>[]): string {
   if (records.length === 0) return '';
-  const fields = Object.keys(records[0]);
-  const header = fields.map(escapeCsvField).join(',');
+  const fieldNames = Object.keys(records[0]);
+  const header = fieldNames.map(escapeCsvField).join(',');
   const rows = records.map(record =>
-    fields.map(f => {
-      const val = record[f];
-      const str = val === null || val === undefined ? '' : typeof val === 'object' ? JSON.stringify(val) : String(val);
-      return escapeCsvField(str);
+    fieldNames.map(fieldName => {
+      const rawFieldValue = record[fieldName];
+      const serializedFieldValue = rawFieldValue === null || rawFieldValue === undefined
+        ? ''
+        : typeof rawFieldValue === 'object'
+          ? JSON.stringify(rawFieldValue)
+          : String(rawFieldValue);
+      return escapeCsvField(serializedFieldValue);
     }).join(',')
   );
   return [header, ...rows].join('\n');
@@ -34,8 +38,8 @@ export function toJson(records: Record<string, unknown>[]): string {
 }
 
 /** 转义 XML 特殊字符 */
-export function escapeXml(s: string): string {
-  return s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+export function escapeXml(xmlValue: string): string {
+  return xmlValue.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 }
 
 /**
@@ -43,17 +47,17 @@ export function escapeXml(s: string): string {
  */
 export function toXlsx(records: Record<string, unknown>[]): string {
   if (records.length === 0) return '';
-  const fields = Object.keys(records[0]);
+  const fieldNames = Object.keys(records[0]);
 
-  const headerCells = fields.map(f => `<Cell><Data ss:Type="String">${escapeXml(f)}</Data></Cell>`).join('');
+  const headerCells = fieldNames.map(fieldName => `<Cell><Data ss:Type="String">${escapeXml(fieldName)}</Data></Cell>`).join('');
   const dataRows = records.map(record =>
-    `<Row>${fields.map(f => {
-      const val = record[f];
-      if (val === null || val === undefined) return '<Cell><Data ss:Type="String"></Data></Cell>';
-      if (typeof val === 'number') return `<Cell><Data ss:Type="Number">${val}</Data></Cell>`;
-      if (typeof val === 'boolean') return `<Cell><Data ss:Type="Boolean">${val ? 1 : 0}</Data></Cell>`;
-      const str = typeof val === 'object' ? JSON.stringify(val) : String(val);
-      return `<Cell><Data ss:Type="String">${escapeXml(str)}</Data></Cell>`;
+    `<Row>${fieldNames.map(fieldName => {
+      const fieldValue = record[fieldName];
+      if (fieldValue === null || fieldValue === undefined) return '<Cell><Data ss:Type="String"></Data></Cell>';
+      if (typeof fieldValue === 'number') return `<Cell><Data ss:Type="Number">${fieldValue}</Data></Cell>`;
+      if (typeof fieldValue === 'boolean') return `<Cell><Data ss:Type="Boolean">${fieldValue ? 1 : 0}</Data></Cell>`;
+      const serializedValue = typeof fieldValue === 'object' ? JSON.stringify(fieldValue) : String(fieldValue);
+      return `<Cell><Data ss:Type="String">${escapeXml(serializedValue)}</Data></Cell>`;
     }).join('')}</Row>`
   ).join('\n');
 
@@ -84,32 +88,32 @@ export function downloadData(
 
   let content: string;
   let mimeType: string;
-  let ext: string;
+  let extension: string;
 
   switch (format) {
     case 'json':
       content = toJson(records);
       mimeType = 'application/json;charset=utf-8;';
-      ext = 'json';
+      extension = 'json';
       break;
     case 'xlsx':
       content = toXlsx(records);
       mimeType = 'application/vnd.ms-excel;charset=utf-8;';
-      ext = 'xls';
+      extension = 'xls';
       break;
     case 'csv':
     default:
       content = toCsv(records);
       mimeType = 'text/csv;charset=utf-8;';
-      ext = 'csv';
+      extension = 'csv';
       break;
   }
 
   const blob = new Blob(['\uFEFF' + content], { type: mimeType });
   const url = URL.createObjectURL(blob);
-  const a = document.createElement('a');
-  a.href = url;
-  a.download = `${resource}_export.${ext}`;
-  a.click();
+  const downloadAnchor = document.createElement('a');
+  downloadAnchor.href = url;
+  downloadAnchor.download = `${resource}_export.${extension}`;
+  downloadAnchor.click();
   setTimeout(() => URL.revokeObjectURL(url), 10000);
 }