@ai-matrx/records-ui 0.101.11 → 0.101.14

package/dist/index.d.cts

@@ -6699,6 +6699,7 @@ declare const MOST_NEW_COLUMNS = 40;
  * The column NAMES a person typed or pasted, in order, each once. Empty when there are none.
  * A tab means a spreadsheet header row; several lines mean a list; otherwise one line split on
  * commas, semicolons, pipes and a last "and" — after "with" or a colon when it is a sentence.
+ * Only OUTSIDE brackets: "Status (choice: a, b)" is one column.
  */
 declare function columnNamesFrom(text: string): string[];
 /** What a column of this NAME most likely holds. Text when nothing in the name says otherwise. */

package/dist/index.d.ts

@@ -6699,6 +6699,7 @@ declare const MOST_NEW_COLUMNS = 40;
  * The column NAMES a person typed or pasted, in order, each once. Empty when there are none.
  * A tab means a spreadsheet header row; several lines mean a list; otherwise one line split on
  * commas, semicolons, pipes and a last "and" — after "with" or a colon when it is a sentence.
+ * Only OUTSIDE brackets: "Status (choice: a, b)" is one column.
  */
 declare function columnNamesFrom(text: string): string[];
 /** What a column of this NAME most likely holds. Text when nothing in the name says otherwise. */

package/dist/index.js

@@ -13375,6 +13375,44 @@ function replanPastedBlock(plan, args, change = {}) {
     droppedLines: (plan.droppedLines ?? 0) + dropped
   });
 }
+function storedValueAgrees(field2, stored, written, options) {
+  const empty = (v) => v === void 0 || v === null || v === "";
+  if (empty(stored) || empty(written)) return empty(stored) && empty(written);
+  if (field2 !== void 0) {
+    if (isDateField(field2)) {
+      if (hasTimePart(written)) {
+        const a = new Date(stored).getTime();
+        const b = new Date(written).getTime();
+        if (!Number.isNaN(a) && !Number.isNaN(b)) return a === b;
+      } else {
+        const dayOf = (v) => typeof v === "string" && /^\d{4}-\d{2}-\d{2}/.test(v.trim()) ? v.trim().slice(0, 10) : calendarDayOf(v);
+        const a = dayOf(stored);
+        const b = dayOf(written);
+        if (a !== null && b !== null) return a === b;
+      }
+    }
+    const kind = editorKindFor(field2);
+    if (kind === "number" || kind === "currency" || kind === "percent") {
+      const a = typeof stored === "number" ? stored : Number(String(stored).trim());
+      const b = typeof written === "number" ? written : Number(String(written).trim());
+      if (Number.isFinite(a) && Number.isFinite(b)) return a === b;
+    }
+    if (options !== void 0 && typeof stored === "string" && typeof written === "string") {
+      const option = (v) => options.byWord.get(v.trim().toLowerCase()) ?? v.trim().toLowerCase();
+      return option(stored) === option(written);
+    }
+  }
+  return JSON.stringify(stored) === JSON.stringify(written);
+}
+function columnsTheGridTurnedAway(turnedAway, columnKeys, columnName, already) {
+  const said = /* @__PURE__ */ new Map();
+  for (const refused of turnedAway) {
+    if (!columnKeys.includes(refused.columnId)) continue;
+    if (already.some((r) => r.column === columnName(refused.columnId))) continue;
+    said.set(refused.columnId, refused.reason);
+  }
+  return [...said].map(([columnId, why]) => ({ fromLine: 0, column: columnName(columnId), raw: "", why }));
+}
 
 // src/gridControls.tsx
 import { Fragment as Fragment14, jsx as jsx48, jsxs as jsxs44 } from "react/jsx-runtime";
@@ -15169,12 +15207,7 @@ function PastePreview({
           plan.refusals.length > 0 ? /* @__PURE__ */ jsxs47("div", { "data-matrx-paste-refusals": true, className: "flex flex-col gap-1", children: [
             /* @__PURE__ */ jsx51("p", { className: "text-xs font-medium", children: plan.refusals.length === 1 ? "One cell will be left alone:" : `${plan.refusals.length} cells will be left alone:` }),
             /* @__PURE__ */ jsx51("ul", { className: "flex flex-col gap-1", children: plan.refusals.slice(0, 12).map((refusal3, index) => /* @__PURE__ */ jsxs47("li", { className: "text-xs text-muted-foreground", children: [
-              /* @__PURE__ */ jsxs47("span", { className: "font-medium", children: [
-                "Row ",
-                refusal3.fromLine,
-                ", ",
-                refusal3.column
-              ] }),
+              /* @__PURE__ */ jsx51("span", { className: "font-medium", children: refusal3.fromLine > 0 ? `Row ${refusal3.fromLine}, ${refusal3.column}` : refusal3.column }),
               " \u2014 ",
               refusal3.why
             ] }, index)) }),
@@ -21006,19 +21039,9 @@ function GridBody({
         pastRightEdge: sheetPlan.pastRightEdge,
         ...headed ? { header: { unmatched: headed.unmatched } } : {}
       });
-      const notWritable = /* @__PURE__ */ new Map();
-      for (const refused of sheetPlan.refusals) {
-        if (built.refusals.some((r) => r.column === columnLabel(fieldList, refused.columnId))) continue;
-        notWritable.set(refused.columnId, refused.reason);
-      }
-      for (const [columnId, why] of notWritable) {
-        built.refusals.push({
-          fromLine: 0,
-          column: columnLabel(fieldList, columnId),
-          raw: "",
-          why
-        });
-      }
+      built.refusals.push(
+        ...columnsTheGridTurnedAway(sheetPlan.refusals, columnKeys, (id) => columnLabel(fieldList, id), built.refusals)
+      );
       if (merged && built.cells > 0 && built.creates === 0 && built.refusals.length === 0 && built.pastRightEdge === 0 && (built.header?.unmatched.length ?? 0) === 0 && built.unmatchedOptions.length === 0) {
         const outcome = await pasteAtOnce.current(built);
         if (outcome.refusals.length > 0 || outcome.missing > 0) {
@@ -21119,20 +21142,21 @@ function GridBody({
       const reread = await client.listByIds({ table_id: tableId, ids: expected.map((e) => e.recordId) });
       let readBack = 0;
       let missing = 0;
+      const fieldOf2 = new Map((fields.data ?? []).map((f) => [f.key, f]));
       const refusals = [];
       if (!reread.ok) refusals.push(`The rows were written and this could not read them back to check: ${refusalSentence(reread.error)}`);
       const seen = new Map((reread.ok ? reread.data : []).map((r) => [r.id, r.document ?? {}]));
       for (const entry of expected) {
         const stored = seen.get(entry.recordId);
         for (const [key, value] of Object.entries(entry.document)) {
-          if (stored !== void 0 && JSON.stringify(stored[key]) === JSON.stringify(value)) readBack += 1;
+          if (stored !== void 0 && storedValueAgrees(fieldOf2.get(key), stored[key], value, choiceOptions.current.get(key))) readBack += 1;
           else missing += 1;
         }
       }
       records.reload();
       return { written: lines, readBack, missing, refusals };
     },
-    [rows, client, tableId, editing, undo, records, versions]
+    [rows, client, tableId, editing, undo, records, versions, fields.data]
   );
   const pasteAtOnce = useRef28(applyPasteAsOne);
   pasteAtOnce.current = applyPasteAsOne;
@@ -21207,6 +21231,7 @@ function GridBody({
     }
     let readBack = 0;
     let missing = 0;
+    const fieldOf2 = new Map((fields.data ?? []).map((f) => [f.key, f]));
     const seen = /* @__PURE__ */ new Map();
     const READ_BACK_PAGE = 500;
     for (let offset = 0; ; offset += READ_BACK_PAGE) {
@@ -21226,7 +21251,7 @@ function GridBody({
     for (const entry of expected) {
       const stored = seen.get(entry.recordId);
       for (const [key, value] of Object.entries(entry.document)) {
-        if (stored !== void 0 && JSON.stringify(stored[key]) === JSON.stringify(value)) {
+        if (stored !== void 0 && storedValueAgrees(fieldOf2.get(key), stored[key], value, choiceOptions.current.get(key))) {
           readBack += 1;
         } else {
           missing += 1;
@@ -21235,7 +21260,7 @@ function GridBody({
     }
     records.reload();
     return { written, readBack, missing, refusals };
-  }, [pastePlan, client, tableId, records, merged, applyPasteAsOne, versions]);
+  }, [pastePlan, client, tableId, records, merged, applyPasteAsOne, versions, fields.data]);
   const columnIds = useMemo35(() => ordered.map((field2) => field2.key), [ordered]);
   const lookWrites = useRef28(null);
   const writeLook = useCallback24(
@@ -22869,6 +22894,7 @@ import { withTablePlacement as withTablePlacement2 } from "@ai-matrx/records";
 import { BasicInput as BasicInput17, Button as Button49, Select as Select10, SelectContent as SelectContent10, SelectItem as SelectItem10, SelectTrigger as SelectTrigger10, SelectValue as SelectValue10, Skeleton as Skeleton6, Textarea as Textarea2, cn as cn39 } from "@ai-matrx/design-system";
 
 // src/newTableColumns.ts
+import { RESOLVABLE_FIELD_TYPE_WORDS } from "@ai-matrx/records/templates";
 var NEW_COLUMN_TYPES = [
   { type: "text", words: "Text" },
   { type: "rich_text", words: "Formatted text" },
@@ -22886,7 +22912,80 @@ var NEW_COLUMN_TYPES = [
 ];
 var MOST_NEW_COLUMNS = 40;
 var BULLET = /^\s*(?:[-*•]|\d+[.)])\s+/;
-function columnNamesFrom(text) {
+var TYPE_WORD_ALIASES = {
+  choice: "select",
+  dropdown: "select",
+  status: "select",
+  list: "select",
+  choices: "multi_select",
+  tags: "multi_select",
+  money: "currency",
+  boolean: "checkbox",
+  bool: "checkbox",
+  "yes/no": "checkbox",
+  "yes / no": "checkbox",
+  link: "url",
+  integer: "number",
+  decimal: "number",
+  float: "number",
+  string: "text",
+  long_text: "rich_text",
+  "formatted text": "rich_text",
+  "date and time": "datetime",
+  "date time": "datetime"
+};
+function typeFromWord(raw) {
+  const word = raw.trim().toLowerCase();
+  if (word === "") return void 0;
+  const type = TYPE_WORD_ALIASES[word] ?? NEW_COLUMN_TYPES.find((t) => t.type === word.replace(/[\s-]+/g, "_"))?.type;
+  if (!type) return void 0;
+  return RESOLVABLE_FIELD_TYPE_WORDS.includes(type === "date" ? "datetime" : type) ? type : void 0;
+}
+function maskBrackets(text) {
+  let depth = 0;
+  let out = "";
+  for (const ch of text) {
+    if (ch === "(" || ch === "[") {
+      depth++;
+      out += depth === 1 ? ch : "\0";
+    } else if ((ch === ")" || ch === "]") && depth > 0) {
+      depth--;
+      out += depth === 0 ? ch : "\0";
+    } else out += depth > 0 ? "\0" : ch;
+  }
+  return out;
+}
+function splitOutsideBrackets(text, sep) {
+  const masked = maskBrackets(text);
+  const parts = [];
+  let from = 0;
+  const re = new RegExp(sep.source, sep.flags.includes("g") ? sep.flags : sep.flags + "g");
+  for (const m of masked.matchAll(re)) {
+    if (m[0] === "") continue;
+    parts.push(text.slice(from, m.index));
+    from = m.index + m[0].length;
+  }
+  parts.push(text.slice(from));
+  return parts;
+}
+function specFromPart(part) {
+  const clean = (t) => t.replace(/^["'\s]+|["'.\s]+$/g, "").replace(/\s+/g, " ");
+  const m = /^(.*?)\s*[(\[]([^()\[\]]*)[)\]]\s*$/.exec(part.trim());
+  if (m) {
+    const inner2 = m[2];
+    const colon = inner2.indexOf(":");
+    const type = typeFromWord(colon >= 0 ? inner2.slice(0, colon) : inner2);
+    const name = clean(m[1]);
+    if (type && name !== "") {
+      const options = colon >= 0 ? [...new Set(inner2.slice(colon + 1).split(/\s*[,;|]\s*/).map(clean).filter((o) => o !== ""))] : void 0;
+      return { label: name, type, ...options && options.length > 0 && (type === "select" || type === "multi_select") ? { options } : {} };
+    }
+  }
+  const withoutPairs = part.replace(/\([^()\[\]]*\)|\[[^()\[\]]*\]/g, "");
+  const label = /[()\[\]]/.test(withoutPairs) ? part.replace(/[()\[\]]/g, " ") : part;
+  return { label: clean(label) };
+}
+function specsFrom(text) {
   const trimmed = text.trim();
   if (trimmed === "") return [];
   let parts;
@@ -22897,23 +22996,28 @@ function columnNamesFrom(text) {
     parts = trimmed.split(/\r?\n/).map((line) => line.replace(BULLET, ""));
   } else {
     let line = trimmed;
-    const colon = line.indexOf(":");
+    const masked = maskBrackets(line);
+    const colon = masked.indexOf(":");
     if (colon >= 0) line = line.slice(colon + 1);
     else {
-      const withAt = line.toLowerCase().lastIndexOf(" with ");
+      const withAt = masked.toLowerCase().lastIndexOf(" with ");
       if (withAt >= 0) line = line.slice(withAt + " with ".length);
     }
-    parts = line.split(/\s*[,;|]\s*|\s+and\s+|\s*&\s*/i);
+    parts = splitOutsideBrackets(line, /\s*[,;|]\s*|\s+and\s+|\s*&\s*/i);
   }
-  const names = parts.map((p) => p.replace(/^["'\s]+|["'.\s]+$/g, "").replace(/\s+/g, " ")).filter((p) => p !== "").map((p) => p === p.toLowerCase() ? p[0].toUpperCase() + p.slice(1) : p);
+  const specs = parts.map(specFromPart).filter((c) => c.label !== "").map((c) => c.label === c.label.toLowerCase() ? { ...c, label: c.label[0].toUpperCase() + c.label.slice(1) } : c);
   const seen = /* @__PURE__ */ new Set();
-  const once = names.filter((n) => {
-    const k = n.toLowerCase();
+  const once = specs.filter((c) => {
+    const k = c.label.toLowerCase();
     if (seen.has(k)) return false;
     seen.add(k);
     return true;
   });
-  return uniqueLabels(once).slice(0, MOST_NEW_COLUMNS);
+  const labels = uniqueLabels(once.map((c) => c.label));
+  return once.map((c, i) => ({ ...c, label: labels[i] })).slice(0, MOST_NEW_COLUMNS);
+}
+function columnNamesFrom(text) {
+  return specsFrom(text).map((c) => c.label);
 }
 var STATUS_CHOICES = ["Not started", "In progress", "Done"];
 var PRIORITY_CHOICES = ["Low", "Medium", "High"];
@@ -22938,7 +23042,9 @@ function columnFromName(label) {
   return { label, type: "text" };
 }
 function columnsFrom(text) {
-  return columnNamesFrom(text).map(columnFromName);
+  return specsFrom(text).map(
+    (c) => c.type ? { label: c.label, type: c.type, ...c.options && c.options.length > 0 ? { options: c.options } : {} } : columnFromName(c.label)
+  );
 }
 function fieldsForNewColumns(columns) {
   const keys = /* @__PURE__ */ new Set();