@dynamic-entity/server 2.2.0 → 2.3.1

package/index.d.mts

@@ -1,6 +1,6 @@
-import { I as ImportLimits } from './write-template-C2dCEp48.mjs';
-export { B as BatchInfo, a as ByteSource, D as DEFAULT_LIMITS, b as ImportRunResult, O as OnBatch, P as PreviewSheetOptions, R as ReadSheetOptions, c as RunImportOptions, S as SheetFormat, d as SheetPreview, e as SheetSource, f as TEMPLATE_EXTENSION, g as TEMPLATE_MEDIA_TYPE, T as TemplateFormat, W as WriteTemplateOptions, h as destroySource, i as detectFormat, j as guardRows, l as limitBytes, p as peek, k as previewSheet, r as readSheet, m as resolveLimits, n as runImport, t as toByteStream, w as writeTemplate } from './write-template-C2dCEp48.mjs';
-import '@dynamic-entity/core';
+import { I as ImportLimits } from './write-template-CzKVVjgT.mjs';
+export { B as BatchInfo, a as ByteSource, D as DEFAULT_LIMITS, b as ImportRunResult, O as OnBatch, P as PreviewSheetOptions, R as ReadSheetOptions, c as RunImportOptions, S as SheetFormat, d as SheetPreview, e as SheetSource, f as TEMPLATE_EXTENSION, g as TEMPLATE_MEDIA_TYPE, T as TemplateFormat, W as WriteTemplateOptions, h as destroySource, i as detectFormat, j as guardRows, l as limitBytes, p as peek, k as previewSheet, r as readSheet, m as resolveLimits, n as runImport, t as toByteStream, w as writeTemplate } from './write-template-CzKVVjgT.mjs';
+export { cellText as sampleText } from '@dynamic-entity/core';
 import 'node:stream';
 
 /**
@@ -79,24 +79,6 @@ declare function toErrorBody(error: unknown): {
     body: ImportErrorBody;
 };
 
-/**
- * cell-text.ts — how a typed cell is rendered when text is what has to cross the wire.
- *
- * Its own module because both the reader and the preview need it, and a second copy would be
- * a second place for the date rule to be wrong.
- */
-/**
- * Render a cell as the text a mapping screen shows.
- *
- * It mirrors `coerceTypedCell`'s date rule on purpose. A preview sample crosses the wire as
- * text and the browser then runs `coerceCell` over that text, so if this rendered a `Date`
- * with `String()` the preview would show — and the browser would coerce — a different day
- * from the one the import will store. That is a preview lying about the only thing it exists
- * to show, and it would be wrong by exactly one day, silently, only for users at a negative
- * UTC offset. `run-import.spec.ts` asserts the two agree rather than trusting this comment.
- */
-declare function sampleText(raw: unknown): string;
-
 /**
  * guard-zip.ts — open the archive ourselves, and hand the parser only what it should see.
  *
@@ -177,4 +159,4 @@ declare function cellValue(raw: unknown): unknown;
  */
 declare function xlsxRows(source: AsyncIterable<Uint8Array>, limits: ImportLimits): AsyncGenerator<unknown[]>;
 
-export { ImportError, type ImportErrorBody, type ImportErrorCode, ImportLimits, cellValue, guardZip, sampleText, toErrorBody, xlsxRows };
+export { ImportError, type ImportErrorBody, type ImportErrorCode, ImportLimits, cellValue, guardZip, toErrorBody, xlsxRows };

package/index.d.ts

@@ -1,6 +1,6 @@
-import { I as ImportLimits } from './write-template-C2dCEp48.js';
-export { B as BatchInfo, a as ByteSource, D as DEFAULT_LIMITS, b as ImportRunResult, O as OnBatch, P as PreviewSheetOptions, R as ReadSheetOptions, c as RunImportOptions, S as SheetFormat, d as SheetPreview, e as SheetSource, f as TEMPLATE_EXTENSION, g as TEMPLATE_MEDIA_TYPE, T as TemplateFormat, W as WriteTemplateOptions, h as destroySource, i as detectFormat, j as guardRows, l as limitBytes, p as peek, k as previewSheet, r as readSheet, m as resolveLimits, n as runImport, t as toByteStream, w as writeTemplate } from './write-template-C2dCEp48.js';
-import '@dynamic-entity/core';
+import { I as ImportLimits } from './write-template-CzKVVjgT.js';
+export { B as BatchInfo, a as ByteSource, D as DEFAULT_LIMITS, b as ImportRunResult, O as OnBatch, P as PreviewSheetOptions, R as ReadSheetOptions, c as RunImportOptions, S as SheetFormat, d as SheetPreview, e as SheetSource, f as TEMPLATE_EXTENSION, g as TEMPLATE_MEDIA_TYPE, T as TemplateFormat, W as WriteTemplateOptions, h as destroySource, i as detectFormat, j as guardRows, l as limitBytes, p as peek, k as previewSheet, r as readSheet, m as resolveLimits, n as runImport, t as toByteStream, w as writeTemplate } from './write-template-CzKVVjgT.js';
+export { cellText as sampleText } from '@dynamic-entity/core';
 import 'node:stream';
 
 /**
@@ -79,24 +79,6 @@ declare function toErrorBody(error: unknown): {
     body: ImportErrorBody;
 };
 
-/**
- * cell-text.ts — how a typed cell is rendered when text is what has to cross the wire.
- *
- * Its own module because both the reader and the preview need it, and a second copy would be
- * a second place for the date rule to be wrong.
- */
-/**
- * Render a cell as the text a mapping screen shows.
- *
- * It mirrors `coerceTypedCell`'s date rule on purpose. A preview sample crosses the wire as
- * text and the browser then runs `coerceCell` over that text, so if this rendered a `Date`
- * with `String()` the preview would show — and the browser would coerce — a different day
- * from the one the import will store. That is a preview lying about the only thing it exists
- * to show, and it would be wrong by exactly one day, silently, only for users at a negative
- * UTC offset. `run-import.spec.ts` asserts the two agree rather than trusting this comment.
- */
-declare function sampleText(raw: unknown): string;
-
 /**
  * guard-zip.ts — open the archive ourselves, and hand the parser only what it should see.
  *
@@ -177,4 +159,4 @@ declare function cellValue(raw: unknown): unknown;
  */
 declare function xlsxRows(source: AsyncIterable<Uint8Array>, limits: ImportLimits): AsyncGenerator<unknown[]>;
 
-export { ImportError, type ImportErrorBody, type ImportErrorCode, ImportLimits, cellValue, guardZip, sampleText, toErrorBody, xlsxRows };
+export { ImportError, type ImportErrorBody, type ImportErrorCode, ImportLimits, cellValue, guardZip, toErrorBody, xlsxRows };

package/index.js

@@ -1,9 +1,9 @@
 'use strict';
 
+var core = require('@dynamic-entity/core');
 var zlib = require('zlib');
 var ExcelJS = require('exceljs');
 var stream = require('stream');
-var core = require('@dynamic-entity/core');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -140,17 +140,6 @@ function destroySource(source) {
   } catch {
   }
 }
-
-// src/cell-text.ts
-function sampleText(raw) {
-  if (raw === null || raw === void 0) return "";
-  if (raw instanceof Date) {
-    if (Number.isNaN(raw.getTime())) return "";
-    const iso = raw.toISOString();
-    return raw.getTime() % 864e5 === 0 ? iso.slice(0, 10) : iso;
-  }
-  return typeof raw === "string" ? raw : String(raw);
-}
 var LOCAL_HEADER = 67324752;
 var CENTRAL_HEADER = 33639248;
 var END_OF_CENTRAL = 101010256;
@@ -467,6 +456,12 @@ async function guardZip(source, limits) {
     }
   }
   if (!sheet) {
+    if (!kept.has("xl/workbook.xml")) {
+      throw new ImportError(
+        "UNSUPPORTED_FORMAT",
+        "This is a zip archive that is not an Excel workbook. Upload an .xlsx or .csv file."
+      );
+    }
     throw new ImportError("MALFORMED_FILE", "This workbook has no worksheet.");
   }
   const ordered = [...WANTED, sheet.name].map((wanted) => kept.get(wanted)).filter((entry) => entry !== void 0);
@@ -557,13 +552,36 @@ function detectFormat(head) {
   }
   return "csv";
 }
-async function* csvRows(stream) {
+async function* csvRows(stream, limits, found, forced) {
   const decoder = new TextDecoder("utf-8");
-  const reader = core.createCsvReader();
+  const maxHeader = limits.maxCellLength * limits.maxColumns + limits.maxColumns;
+  let held = "";
+  let reader = null;
+  const open = (headerLine) => {
+    found.delimiter = forced ?? core.detectDelimiter(headerLine);
+    return core.createCsvReader({ delimiter: found.delimiter });
+  };
   for await (const chunk of stream) {
-    for (const row of reader.push(decoder.decode(chunk, { stream: true }))) yield row;
+    const text = decoder.decode(chunk, { stream: true });
+    if (!reader) {
+      held += text;
+      const line = core.completeFirstLine(held);
+      if (line === null) {
+        if (held.length > maxHeader) {
+          throw new ImportError("SHEET_TOO_LARGE", "The header row is longer than any row may be.");
+        }
+        continue;
+      }
+      reader = open(line);
+      for (const row of reader.push(held)) yield row;
+      held = "";
+      continue;
+    }
+    for (const row of reader.push(text)) yield row;
   }
-  for (const row of reader.push(decoder.decode())) yield row;
+  const rest = held + decoder.decode();
+  reader ??= open(core.completeFirstLine(rest) ?? rest);
+  for (const row of reader.push(rest)) yield row;
   for (const row of reader.end()) yield row;
 }
 async function* guardRows(rows, width, limits) {
@@ -598,10 +616,12 @@ async function readSheet(options) {
     const counted = limitBytes(toByteStream(options.stream), limits.maxBytes);
     const { head, stream } = await peek(counted, MAGIC_BYTES);
     const format = detectFormat(head);
-    const rows = format === "xlsx" ? xlsxRows(stream, limits) : csvRows(stream);
+    const found = {};
+    const forced = /\.tsv$/i.test(options.filename ?? "") ? "	" : void 0;
+    const rows = format === "xlsx" ? xlsxRows(stream, limits) : csvRows(stream, limits, found, forced);
     const iterator = rows[Symbol.asyncIterator]();
     const first = await iterator.next();
-    const headers = first.done ? [] : first.value.map(sampleText);
+    const headers = first.done ? [] : first.value.map(core.cellText);
     if (headers.length > limits.maxColumns) {
       throw new ImportError(
         "SHEET_TOO_LARGE",
@@ -612,7 +632,8 @@ async function readSheet(options) {
     return {
       format,
       headers,
-      rows: closing(guardRows(remaining, headers.length, limits), options.stream)
+      rows: closing(guardRows(remaining, headers.length, limits), options.stream),
+      ...found.delimiter ? { delimiter: found.delimiter } : {}
     };
   } catch (error) {
     destroySource(options.stream);
@@ -664,6 +685,7 @@ async function runImport(options) {
     filename: options.filename,
     limits
   });
+  const decimal = options.decimal ?? core.decimalMarkFor(sheet.delimiter);
   const errors = [];
   let errorCount = 0;
   let imported = 0;
@@ -679,6 +701,7 @@ async function runImport(options) {
     batch = [];
     const result = core.applyMapping(rows, plan, config, {
       lang: options.lang,
+      decimal,
       rules: options.rules,
       lookups: options.lookups,
       firstRowNumber: firstRow
@@ -741,19 +764,22 @@ async function previewSheet(options) {
   try {
     for await (const row of sheet.rows) {
       rowCount++;
-      if (sample.length < limits.sampleRows) sample.push(row.map(sampleText));
+      if (sample.length < limits.sampleRows) sample.push(row.map(core.cellText));
     }
   } catch (error) {
     destroySource(options.stream);
     throw error;
   }
-  const { columns } = core.deriveImportColumns(options.config, { lang: options.lang });
+  const arrayBound = core.arrayBoundFor(sheet.headers, options.config, null, options.lang);
+  const { columns } = core.deriveImportColumns(options.config, { lang: options.lang, maxArrayRows: arrayBound });
   return {
     headers: sheet.headers,
     sample,
     rowCount,
     suggestion: core.suggestMapping(sheet.headers, columns, options.config?.entity ?? ""),
-    format: sheet.format
+    format: sheet.format,
+    ...sheet.delimiter ? { delimiter: sheet.delimiter } : {},
+    arrayBound
   };
 }
 var TEMPLATE_EXTENSION = { csv: "csv", xlsx: "xlsx" };
@@ -802,6 +828,10 @@ function sheetName(name) {
   return (cleaned || "Import").slice(0, 31);
 }
 
+Object.defineProperty(exports, "sampleText", {
+  enumerable: true,
+  get: function () { return core.cellText; }
+});
 exports.DEFAULT_LIMITS = DEFAULT_LIMITS;
 exports.ImportError = ImportError;
 exports.TEMPLATE_EXTENSION = TEMPLATE_EXTENSION;
@@ -817,7 +847,6 @@ exports.previewSheet = previewSheet;
 exports.readSheet = readSheet;
 exports.resolveLimits = resolveLimits;
 exports.runImport = runImport;
-exports.sampleText = sampleText;
 exports.toByteStream = toByteStream;
 exports.toErrorBody = toErrorBody;
 exports.writeTemplate = writeTemplate;