@ai-matrx/records-ui 0.101.11 → 0.101.15

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog — @ai-matrx/records-ui
 
+## 0.101.15
+
+Automatic changed-only republish (docs/metadata drift since the last tag — see
+`git diff npm/records-ui/v0.101.14..npm/records-ui/v0.101.15 -- apps/shared/records-ui`).
+No source changes intended and no consumer action required.
+
+## 0.101.14
+
+Automatic changed-only republish (docs/metadata drift since the last tag — see
+`git diff npm/records-ui/v0.101.11..npm/records-ui/v0.101.14 -- apps/shared/records-ui`).
+No source changes intended and no consumer action required.
+
+## 0.101.12
+
+Automatic changed-only republish (docs/metadata drift since the last tag — see
+`git diff npm/records-ui/v0.101.11..npm/records-ui/v0.101.12 -- apps/shared/records-ui`).
+No source changes intended and no consumer action required.
+
 ## 0.101.11
 
 - **The Action Inbox key hints answer to the inbox's width, not the screen's.** In a ~360px window on

package/dist/index.cjs

@@ -7696,6 +7696,7 @@ function containsPattern(text) {
 var BLANK_VALUE = "__empty__";
 var field = (f) => ({ field: f.id });
 var constant = (value) => ({ const: value });
+var withinWindow = (f, window2) => ({ op: "within", args: [field(f), constant(window2)] });
 var op = (name, ...args) => ({ op: name, args });
 function clauseFor(f, value, now = /* @__PURE__ */ new Date()) {
   const name = fieldName(f);
@@ -7725,12 +7726,12 @@ function clauseFor(f, value, now = /* @__PURE__ */ new Date()) {
       const kind = String(editorKindFor(f));
       if (kind === "datetime" || kind === "date") {
         if (words2.length === 0) return { rule: value.negated ? present : not(present) };
-        if (words2.length > 1 || blank || value.negated) {
-          return `${name} is asked one ticked day at a time. Use the date range for more.`;
-        }
-        const day = words2[0];
         const holdsDays = String((f.config ?? {})["kind"] ?? "") === "date";
-        return { flat: { [f.key]: dayWindow(day, holdsDays) } };
+        if (words2.length === 1 && !blank && !value.negated) return { flat: { [f.key]: dayWindow(words2[0], holdsDays) } };
+        const leaves = words2.map((day) => withinWindow(f, dayWindow(day, holdsDays)));
+        const anyDay = leaves.length === 1 ? leaves[0] : op("or", ...leaves);
+        if (!value.negated) return { rule: blank ? op("or", not(present), anyDay) : anyDay };
+        return { rule: blank ? op("and", present, not(anyDay)) : not(anyDay) };
       }
       const asStored = (w) => holdsNumbers(f) || kind === "rating" ? Number.isFinite(Number(w)) ? Number(w) : w : kind === "checkbox" && (w === "true" || w === "false") ? w === "true" : w;
       const stored = words2.map(asStored);
@@ -7813,7 +7814,7 @@ function storeQuestion(fields, base, columnFilters, now = /* @__PURE__ */ new Da
     const value = flat[key];
     if (!f) continue;
     if (value !== null && typeof value === "object") {
-      refused.push(`${fieldName(f)}'s date range cannot be asked together with the other filters yet, so it is left off.`);
+      rules.push(withinWindow(f, value));
       continue;
     }
     rules.push(value === null ? op("not", op("present", field(f))) : op("eq", field(f), constant(value)));
@@ -13732,6 +13733,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
 var import_jsx_runtime48 = require("react/jsx-runtime");
@@ -13840,26 +13879,26 @@ function useMergedGridControls(args) {
   );
   const choiceKeys = (0, import_react77.useMemo)(() => enabled ? fields.filter(isChoiceField).map((f) => f.key) : [], [enabled, fields]);
   const choiceOptions = useChoiceOptions(fields, choiceKeys);
-  const searchTyped = query.search.trim() !== "";
-  const countQuestionKey = JSON.stringify([choiceKeys, query.columnFilters, args.filter ?? null]);
+  const searchWords = (args.search ?? "").trim();
+  const countQuestionKey = JSON.stringify([choiceKeys, query.columnFilters, args.filter ?? null, searchWords]);
   const rowsKey = rows.map((row) => `${row.id}:${row.version ?? ""}`).join(",");
   const fieldsRef = (0, import_react77.useRef)(fields);
   fieldsRef.current = fields;
   const [choiceCounts, setChoiceCounts] = (0, import_react77.useState)({});
   (0, import_react77.useEffect)(() => {
-    if (!enabled || searchTyped || choiceKeys.length === 0) {
+    if (!enabled || choiceKeys.length === 0) {
       setChoiceCounts({});
       return;
     }
     let cancelled = false;
-    const [keys, filters, base] = JSON.parse(countQuestionKey);
+    const [keys, filters, base, searched] = JSON.parse(countQuestionKey);
     for (const key of keys) {
       const { [key]: _own, ...others } = filters;
       const asked3 = storeQuestion(fieldsRef.current, base ?? void 0, others);
       void askOnce(
         client,
-        `value_counts:${tableId}:${key}:${JSON.stringify(asked3.filter ?? null)}`,
-        () => client.recordAggregate({ table_id: tableId, groupBy: [key], measures: [{ op: "count" }], ...asked3.filter ? { filter: asked3.filter } : {}, limit: 500 }),
+        `value_counts:${tableId}:${key}:${searched}:${JSON.stringify(asked3.filter ?? null)}`,
+        () => client.recordAggregate({ table_id: tableId, groupBy: [key], measures: [{ op: "count" }], ...asked3.filter ? { filter: asked3.filter } : {}, ...searched ? { search: searched } : {}, limit: 500 }),
         VALUE_COUNTS_FRESH_MS
       ).then((answer) => {
         if (cancelled || !answer.ok) return;
@@ -13875,7 +13914,7 @@ function useMergedGridControls(args) {
     return () => {
       cancelled = true;
     };
-  }, [enabled, searchTyped, countQuestionKey, client, tableId, rowsKey]);
+  }, [enabled, countQuestionKey, client, tableId, rowsKey]);
   const filterFor = (0, import_react77.useCallback)(
     (key) => {
       if (!enabled) return void 0;
@@ -15503,12 +15542,7 @@ function PastePreview({
           plan.refusals.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)("div", { "data-matrx-paste-refusals": true, className: "flex flex-col gap-1", children: [
             /* @__PURE__ */ (0, import_jsx_runtime51.jsx)("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__ */ (0, import_jsx_runtime51.jsx)("ul", { className: "flex flex-col gap-1", children: plan.refusals.slice(0, 12).map((refusal3, index) => /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)("li", { className: "text-xs text-muted-foreground", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)("span", { className: "font-medium", children: [
-                "Row ",
-                refusal3.fromLine,
-                ", ",
-                refusal3.column
-              ] }),
+              /* @__PURE__ */ (0, import_jsx_runtime51.jsx)("span", { className: "font-medium", children: refusal3.fromLine > 0 ? `Row ${refusal3.fromLine}, ${refusal3.column}` : refusal3.column }),
               " \u2014 ",
               refusal3.why
             ] }, index)) }),
@@ -19192,7 +19226,8 @@ async function askColumnValues(inputs, args) {
   const field2 = inputs.fields.find((f) => f.key === args.columnId);
   const kind = valueListKind(field2);
   if (kind === "none") return noValueList(args.columnId);
-  if (kind === "loaded" || args.search.trim() !== "") return null;
+  if (kind === "loaded") return null;
+  const searched = args.search.trim();
   const { [args.columnId]: _own, ...others } = inputs.columnFilters;
   const asked3 = storeQuestion(inputs.fields, inputs.filter, others);
   const limit = Math.min(Math.max(args.limit, 1), MOST_VALUES);
@@ -19201,6 +19236,7 @@ async function askColumnValues(inputs, args) {
     ...kind === "days" ? { bucket: { key: field2.key, by: "day" } } : { groupBy: [field2.key] },
     measures: [{ op: "count" }],
     ...asked3.filter ? { filter: asked3.filter } : {},
+    ...searched ? { search: searched } : {},
     limit: MOST_VALUES
   });
   if (!answer.ok) throw new Error(refusalSentence(answer.error));
@@ -19212,7 +19248,8 @@ async function askColumnValues(inputs, args) {
     const unique = await inputs.client.recordAggregate({
       table_id: inputs.tableId,
       measures: [{ op: "unique", key: field2.key }],
-      ...asked3.filter ? { filter: asked3.filter } : {}
+      ...asked3.filter ? { filter: asked3.filter } : {},
+      ...searched ? { search: searched } : {}
     });
     if (unique.ok) {
       const n = Number(unique.data?.[0]?.measures?.[`unique_${field2.key}`]);
@@ -21280,19 +21317,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) {
@@ -21393,20 +21420,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 = (0, import_react107.useRef)(applyPasteAsOne);
   pasteAtOnce.current = applyPasteAsOne;
@@ -21481,6 +21509,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) {
@@ -21500,7 +21529,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;
@@ -21509,7 +21538,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 = (0, import_react107.useMemo)(() => ordered.map((field2) => field2.key), [ordered]);
   const lookWrites = (0, import_react107.useRef)(null);
   const writeLook = (0, import_react107.useCallback)(
@@ -21631,6 +21660,7 @@ function GridBody({
     writeLook,
     query,
     ...filter ? { filter } : {},
+    search: searchTerm,
     setQuery,
     duplicate: (row) => void duplicate(row),
     askDelete: setDeleting,
@@ -23132,6 +23162,7 @@ var import_records40 = require("@ai-matrx/records");
 var import_design_system67 = require("@ai-matrx/design-system");
 
 // src/newTableColumns.ts
+var import_templates = require("@ai-matrx/records/templates");
 var NEW_COLUMN_TYPES = [
   { type: "text", words: "Text" },
   { type: "rich_text", words: "Formatted text" },
@@ -23149,7 +23180,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 import_templates.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;
@@ -23160,23 +23264,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"];
@@ -23201,7 +23310,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();
@@ -27032,8 +27143,15 @@ function bodyFieldOf(fields) {
 var BODY_COLUMN_NAME = "Notes";
 var BODY_SAVE_PAUSE_MS = 900;
 function RecordBody({ tableId, recordId, className }) {
+  const host = useRecordsUi();
   const fields = (0, import_react150.useFields)(tableId);
+  const hostRecord = (0, import_react150.useRecord)(recordId, true, { tableId });
+  const hostMay = useRecordRights(recordId);
   const field2 = bodyFieldOf(fields.data ?? []);
+  const hostBody = host.renderRecordBody && hostRecord.data ? host.renderRecordBody({ tableId, recordId, record: hostRecord.data, readOnly: !hostMay.write }) : null;
+  if (hostBody !== null && hostBody !== void 0) {
+    return /* @__PURE__ */ (0, import_jsx_runtime90.jsx)("section", { className: (0, import_design_system80.cn)("flex min-w-0 flex-col gap-1.5", className), "data-record-body": "host", children: hostBody });
+  }
   if (fields.loading && !fields.data) return null;
   return /* @__PURE__ */ (0, import_jsx_runtime90.jsx)("section", { className: (0, import_design_system80.cn)("flex min-w-0 flex-col gap-1.5", className), "data-record-body": field2?.key ?? "", children: field2 ? /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(BodyEditor, { tableId, recordId, field: field2 }, `${recordId}:${field2.key}`) : /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(AddBody, { tableId }) });
 }