@chelone/core 0.6.0 → 0.7.0

package/dist/csv/import-controller.js

@@ -2,174 +2,190 @@ import { createMicroStore } from "../store/micro-store.js";
 import { matchCsvHeaders } from "./match-headers.js";
 import { runCsvImport } from "./run-import.js";
 import { csvSchemaFields, validateCsvRows } from "./validate-rows.js";
-const STEPS = ["upload", "map", "preview", "commit"];
-const asError = (error) => error instanceof Error ? error : new Error(String(error));
+// src/csv/import-controller.ts
+var STEPS = [
+	"upload",
+	"map",
+	"preview",
+	"commit"
+];
+var asError = (error) => error instanceof Error ? error : new Error(String(error));
 function createCsvImportController(options) {
-  const fromSchema = csvSchemaFields(options.schema);
-  const explicitFields = options.fields ?? fromSchema.fields;
-  const requiredFields = options.requiredFields ?? (options.fields ? [] : fromSchema.required);
-  const initialMapping = options.mapping ?? {};
-  const initial = () => ({
-    step: "upload",
-    fileName: null,
-    headers: [],
-    rows: [],
-    parseError: null,
-    fields: explicitFields,
-    requiredFields,
-    mapping: initialMapping,
-    validations: [],
-    progress: { current: 0, total: 0 },
-    status: "idle",
-    report: null,
-    error: null
-  });
-  const store = createMicroStore(initial());
-  const state = () => store.getSnapshot();
-  let mappingSettled = Object.keys(initialMapping).length > 0;
-  let generation = 0;
-  let busy = false;
-  let created = false;
-  let abort;
-  const startImport = () => {
-    const run = ++generation;
-    const controller = new AbortController();
-    abort = controller;
-    const validations = state().validations;
-    const total = validations.filter((v) => v.ok).length;
-    store.setState({
-      status: "running",
-      progress: { current: 0, total },
-      report: null,
-      error: null
-    });
-    void (async () => {
-      let report;
-      try {
-        report = await runCsvImport({
-          dataProvider: options.dataProvider,
-          resource: options.resource,
-          validations,
-          ...options.batchSize !== void 0 && {
-            batchSize: options.batchSize
-          },
-          signal: controller.signal,
-          onProgress: (progress) => {
-            if (run === generation) store.setState({ progress });
-          }
-        });
-      } catch (thrown) {
-        if (run !== generation) return;
-        const error = asError(thrown);
-        store.setState({ status: "failed", error });
-        options.onError?.(error);
-        return;
-      }
-      if (run !== generation) return;
-      if (report.created > 0) created = true;
-      store.setState({ status: "done", report });
-      options.onComplete?.(report);
-    })();
-  };
-  const gate = (step) => {
-    const s = state();
-    switch (step) {
-      case "upload":
-        return s.rows.length > 0 && s.parseError === null;
-      case "map":
-        return s.requiredFields.every((field) => !!s.mapping[field]) && Object.values(s.mapping).some(Boolean);
-      case "preview":
-        return !created && s.validations.some((v) => v.ok);
-      case "commit":
-        return false;
-    }
-  };
-  return {
-    store,
-    loadParsed(parsed, fileName) {
-      if (state().status === "running" || busy) return;
-      const first = parsed.errors[0];
-      const parseError = first ? first.row === void 0 ? first.message : `Row ${first.row}: ${first.message}` : null;
-      const fields = explicitFields.length > 0 ? explicitFields : parsed.headers;
-      mappingSettled = Object.keys(initialMapping).length > 0;
-      created = false;
-      store.setState({
-        ...initial(),
-        fileName: fileName ?? null,
-        headers: parsed.headers,
-        rows: parseError === null ? parsed.rows : [],
-        parseError,
-        fields
-      });
-    },
-    setMapping(field, header) {
-      if (busy) return;
-      mappingSettled = true;
-      store.setState((prev) => ({
-        mapping: { ...prev.mapping, [field]: header }
-      }));
-    },
-    async next() {
-      if (busy) return false;
-      const s = state();
-      if (s.status === "running") return false;
-      const index = STEPS.indexOf(s.step);
-      const target = STEPS[index + 1];
-      if (!target || !gate(s.step)) return false;
-      if (target === "map") {
-        if (!mappingSettled) {
-          mappingSettled = true;
-          const mapping = explicitFields.length > 0 ? matchCsvHeaders(s.fields, s.headers) : Object.fromEntries(s.headers.map((h) => [h, h]));
-          store.setState({ mapping });
-        }
-        store.setState({ step: "map" });
-      } else if (target === "preview") {
-        busy = true;
-        const run = generation;
-        try {
-          const validations = await validateCsvRows(s.rows, {
-            mapping: s.mapping,
-            ...options.schema && { schema: options.schema },
-            ...options.transform && { transform: options.transform }
-          });
-          if (run !== generation) return false;
-          store.setState({ validations, step: "preview" });
-        } finally {
-          if (run === generation) busy = false;
-        }
-      } else {
-        store.setState({ step: "commit" });
-        startImport();
-      }
-      return true;
-    },
-    back() {
-      const s = state();
-      if (s.status === "running" || busy) return;
-      const previous = STEPS[STEPS.indexOf(s.step) - 1];
-      if (!previous) return;
-      store.setState({
-        step: previous,
-        status: "idle",
-        report: null,
-        error: null,
-        progress: { current: 0, total: 0 }
-      });
-    },
-    cancel() {
-      abort?.abort();
-    },
-    reset() {
-      generation += 1;
-      abort?.abort();
-      abort = void 0;
-      busy = false;
-      created = false;
-      mappingSettled = Object.keys(initialMapping).length > 0;
-      store.setState(initial());
-    }
-  };
+	const fromSchema = csvSchemaFields(options.schema);
+	const explicitFields = options.fields ?? fromSchema.fields;
+	const requiredFields = options.requiredFields ?? (options.fields ? [] : fromSchema.required);
+	const initialMapping = options.mapping ?? {};
+	const initial = () => ({
+		step: "upload",
+		fileName: null,
+		headers: [],
+		rows: [],
+		parseError: null,
+		fields: explicitFields,
+		requiredFields,
+		mapping: initialMapping,
+		validations: [],
+		progress: {
+			current: 0,
+			total: 0
+		},
+		status: "idle",
+		report: null,
+		error: null
+	});
+	const store = createMicroStore(initial());
+	const state = () => store.getSnapshot();
+	let mappingSettled = Object.keys(initialMapping).length > 0;
+	let generation = 0;
+	let busy = false;
+	let created = false;
+	let abort;
+	const startImport = () => {
+		const run = ++generation;
+		const controller = new AbortController();
+		abort = controller;
+		const validations = state().validations;
+		const total = validations.filter((v) => v.ok).length;
+		store.setState({
+			status: "running",
+			progress: {
+				current: 0,
+				total
+			},
+			report: null,
+			error: null
+		});
+		(async () => {
+			let report;
+			try {
+				report = await runCsvImport({
+					dataProvider: options.dataProvider,
+					resource: options.resource,
+					validations,
+					...options.batchSize !== void 0 && { batchSize: options.batchSize },
+					signal: controller.signal,
+					onProgress: (progress) => {
+						if (run === generation) store.setState({ progress });
+					}
+				});
+			} catch (thrown) {
+				if (run !== generation) return;
+				const error = asError(thrown);
+				store.setState({
+					status: "failed",
+					error
+				});
+				options.onError?.(error);
+				return;
+			}
+			if (run !== generation) return;
+			if (report.created > 0) created = true;
+			store.setState({
+				status: "done",
+				report
+			});
+			options.onComplete?.(report);
+		})();
+	};
+	const gate = (step) => {
+		const s = state();
+		switch (step) {
+			case "upload": return s.rows.length > 0 && s.parseError === null;
+			case "map": return s.requiredFields.every((field) => !!s.mapping[field]) && Object.values(s.mapping).some(Boolean);
+			case "preview": return !created && s.validations.some((v) => v.ok);
+			case "commit": return false;
+		}
+	};
+	return {
+		store,
+		loadParsed(parsed, fileName) {
+			if (state().status === "running" || busy) return;
+			const first = parsed.errors[0];
+			const parseError = first ? first.row === void 0 ? first.message : `Row ${first.row}: ${first.message}` : null;
+			const fields = explicitFields.length > 0 ? explicitFields : parsed.headers;
+			mappingSettled = Object.keys(initialMapping).length > 0;
+			created = false;
+			store.setState({
+				...initial(),
+				fileName: fileName ?? null,
+				headers: parsed.headers,
+				rows: parseError === null ? parsed.rows : [],
+				parseError,
+				fields
+			});
+		},
+		setMapping(field, header) {
+			if (busy) return;
+			mappingSettled = true;
+			store.setState((prev) => ({ mapping: {
+				...prev.mapping,
+				[field]: header
+			} }));
+		},
+		async next() {
+			if (busy) return false;
+			const s = state();
+			if (s.status === "running") return false;
+			const target = STEPS[STEPS.indexOf(s.step) + 1];
+			if (!target || !gate(s.step)) return false;
+			if (target === "map") {
+				if (!mappingSettled) {
+					mappingSettled = true;
+					const mapping = explicitFields.length > 0 ? matchCsvHeaders(s.fields, s.headers) : Object.fromEntries(s.headers.map((h) => [h, h]));
+					store.setState({ mapping });
+				}
+				store.setState({ step: "map" });
+			} else if (target === "preview") {
+				busy = true;
+				const run = generation;
+				try {
+					const validations = await validateCsvRows(s.rows, {
+						mapping: s.mapping,
+						...options.schema && { schema: options.schema },
+						...options.transform && { transform: options.transform }
+					});
+					if (run !== generation) return false;
+					store.setState({
+						validations,
+						step: "preview"
+					});
+				} finally {
+					if (run === generation) busy = false;
+				}
+			} else {
+				store.setState({ step: "commit" });
+				startImport();
+			}
+			return true;
+		},
+		back() {
+			const s = state();
+			if (s.status === "running" || busy) return;
+			const previous = STEPS[STEPS.indexOf(s.step) - 1];
+			if (!previous) return;
+			store.setState({
+				step: previous,
+				status: "idle",
+				report: null,
+				error: null,
+				progress: {
+					current: 0,
+					total: 0
+				}
+			});
+		},
+		cancel() {
+			abort?.abort();
+		},
+		reset() {
+			generation += 1;
+			abort?.abort();
+			abort = void 0;
+			busy = false;
+			created = false;
+			mappingSettled = Object.keys(initialMapping).length > 0;
+			store.setState(initial());
+		}
+	};
 }
-export {
-  createCsvImportController
-};
+export { createCsvImportController };

package/dist/csv/match-headers.js

@@ -1,24 +1,31 @@
-const normalise = (name) => name.toLowerCase().replace(/[\s_-]+/g, "");
+// src/csv/match-headers.ts
+var normalise = (name) => name.toLowerCase().replace(/[\s_-]+/g, "");
+/**
+* Pairs each field with the CSV header it most likely names. Pass one takes an
+* equal name, pass two a header that contains the field, pass three a header
+* the field contains. A later match never takes a header an earlier one took.
+*/
 function matchCsvHeaders(fields, headers) {
-  const free = headers.map((header) => ({ header, name: normalise(header) })).filter(({ name }) => name !== "");
-  const result = /* @__PURE__ */ new Map();
-  const pass = (matches) => {
-    for (const field of fields) {
-      if (result.has(field)) continue;
-      const name = normalise(field);
-      if (name === "") continue;
-      const index = free.findIndex((entry) => matches(name, entry.name));
-      const found = free[index];
-      if (!found) continue;
-      result.set(field, found.header);
-      free.splice(index, 1);
-    }
-  };
-  pass((field, header) => field === header);
-  pass((field, header) => header.includes(field));
-  pass((field, header) => field.includes(header));
-  return Object.fromEntries(result);
+	const free = headers.map((header) => ({
+		header,
+		name: normalise(header)
+	})).filter(({ name }) => name !== "");
+	const result = /* @__PURE__ */ new Map();
+	const pass = (matches) => {
+		for (const field of fields) {
+			if (result.has(field)) continue;
+			const name = normalise(field);
+			if (name === "") continue;
+			const index = free.findIndex((entry) => matches(name, entry.name));
+			const found = free[index];
+			if (!found) continue;
+			result.set(field, found.header);
+			free.splice(index, 1);
+		}
+	};
+	pass((field, header) => field === header);
+	pass((field, header) => header.includes(field));
+	pass((field, header) => field.includes(header));
+	return Object.fromEntries(result);
 }
-export {
-  matchCsvHeaders
-};
+export { matchCsvHeaders };

package/dist/csv/parse-with.js

@@ -1,58 +1,64 @@
-const OPTIONS = { header: false, skipEmptyLines: "greedy" };
-const IGNORED_CODES = /* @__PURE__ */ new Set(["UndetectableDelimiter"]);
+// src/csv/parse-with.ts
+var OPTIONS = {
+	header: false,
+	skipEmptyLines: "greedy"
+};
+var IGNORED_CODES = /* @__PURE__ */ new Set(["UndetectableDelimiter"]);
 function parseCsvWith(parser, text) {
-  const result = parser.parse(text, OPTIONS);
-  const body = text.replace(/^/, "");
-  const [headerRow = [], ...records] = result.data;
-  const headers = nameHeaders(headerRow);
-  const rowOf = (error) => {
-    if (error.row === void 0) return void 0;
-    if (error.index === void 0) return error.row;
-    const rows2 = parser.parse(body.slice(0, error.index), OPTIONS).data.length;
-    return Math.max(rows2 - 1, 0);
-  };
-  const errors = [];
-  for (const error of result.errors) {
-    if (IGNORED_CODES.has(error.code)) continue;
-    const { code, message } = error;
-    const row = rowOf(error);
-    errors.push(row === void 0 ? { code, message } : { code, row, message });
-  }
-  records.forEach((record, index) => {
-    if (record.length === headers.length) return;
-    const few = record.length < headers.length;
-    errors.push({
-      code: few ? "TooFewFields" : "TooManyFields",
-      row: index + 1,
-      message: `Too ${few ? "few" : "many"} fields: expected ${headers.length} fields but parsed ${record.length}`
-    });
-  });
-  const rows = records.map(
-    (record) => Object.fromEntries(
-      headers.map((header, index) => [header, record[index] ?? ""])
-    )
-  );
-  return { headers, rows, errors };
+	const result = parser.parse(text, OPTIONS);
+	const body = text.replace(/^/, "");
+	const [headerRow = [], ...records] = result.data;
+	const headers = nameHeaders(headerRow);
+	const rowOf = (error) => {
+		if (error.row === void 0) return void 0;
+		if (error.index === void 0) return error.row;
+		const rows = parser.parse(body.slice(0, error.index), OPTIONS).data.length;
+		return Math.max(rows - 1, 0);
+	};
+	const errors = [];
+	for (const error of result.errors) {
+		if (IGNORED_CODES.has(error.code)) continue;
+		const { code, message } = error;
+		const row = rowOf(error);
+		errors.push(row === void 0 ? {
+			code,
+			message
+		} : {
+			code,
+			row,
+			message
+		});
+	}
+	records.forEach((record, index) => {
+		if (record.length === headers.length) return;
+		const few = record.length < headers.length;
+		errors.push({
+			code: few ? "TooFewFields" : "TooManyFields",
+			row: index + 1,
+			message: `Too ${few ? "few" : "many"} fields: expected ${headers.length} fields but parsed ${record.length}`
+		});
+	});
+	return {
+		headers,
+		rows: records.map((record) => Object.fromEntries(headers.map((header, index) => [header, record[index] ?? ""]))),
+		errors
+	};
 }
 function nameHeaders(cells) {
-  const trimmed = cells.map(
-    (cell, index) => cell.trim() || `column_${index + 1}`
-  );
-  const taken = new Set(trimmed);
-  const seen = /* @__PURE__ */ new Set();
-  return trimmed.map((header) => {
-    if (!seen.has(header)) {
-      seen.add(header);
-      return header;
-    }
-    let n = 1;
-    while (taken.has(`${header}_${n}`)) n += 1;
-    const renamed = `${header}_${n}`;
-    taken.add(renamed);
-    seen.add(renamed);
-    return renamed;
-  });
+	const trimmed = cells.map((cell, index) => cell.trim() || `column_${index + 1}`);
+	const taken = new Set(trimmed);
+	const seen = /* @__PURE__ */ new Set();
+	return trimmed.map((header) => {
+		if (!seen.has(header)) {
+			seen.add(header);
+			return header;
+		}
+		let n = 1;
+		while (taken.has(`${header}_${n}`)) n += 1;
+		const renamed = `${header}_${n}`;
+		taken.add(renamed);
+		seen.add(renamed);
+		return renamed;
+	});
 }
-export {
-  parseCsvWith
-};
+export { parseCsvWith };