datanotes 1.5.0 → 2.0.1

package/dist/datanotes.cjs

@@ -431,9 +431,9 @@ var require_anchors = __commonJS({
       }
       return true;
     }
-    function anchorNames(root2) {
+    function anchorNames(root) {
       const anchors = /* @__PURE__ */ new Set();
-      visit.visit(root2, {
+      visit.visit(root, {
         Value(_key, node) {
           if (node.anchor)
             anchors.add(node.anchor);
@@ -7233,7 +7233,7 @@ var require_public_api = __commonJS({
       }
       return doc;
     }
-    function parse3(src, reviver, options) {
+    function parse2(src, reviver, options) {
       let _reviver = void 0;
       if (typeof reviver === "function") {
         _reviver = reviver;
@@ -7274,7 +7274,7 @@ var require_public_api = __commonJS({
         return value.toString(options);
       return new Document.Document(value, _replacer, options).toString(options);
     }
-    exports2.parse = parse3;
+    exports2.parse = parse2;
     exports2.parseAllDocuments = parseAllDocuments;
     exports2.parseDocument = parseDocument3;
     exports2.stringify = stringify2;
@@ -7413,9 +7413,6 @@ function dot(a, b) {
 
 // src/core/settings.ts
 var DEFAULT_SETTINGS = {
-  templateProperty: "template",
-  migrationsProperty: "_migrations",
-  journalFolder: "_meta/migrations",
   storeFolder: ".datanotes",
   journalRetentionDays: 90,
   fileLogEnabled: true,
@@ -7428,7 +7425,6 @@ var DEFAULT_SETTINGS = {
   telemetryHeaders: {},
   telemetryProtocol: "http/protobuf",
   autoRecompute: true,
-  viewNotes: true,
   semanticEnabled: false,
   semanticProvider: "ollama",
   semanticBaseUrl: "",
@@ -7440,9 +7436,6 @@ var DEFAULT_SETTINGS = {
   httpServerToken: ""
 };
 var KEYS = [
-  "templateProperty",
-  "migrationsProperty",
-  "journalFolder",
   "storeFolder",
   "journalRetentionDays",
   "fileLogEnabled",
@@ -7455,7 +7448,6 @@ var KEYS = [
   "telemetryHeaders",
   "telemetryProtocol",
   "autoRecompute",
-  "viewNotes",
   "semanticEnabled",
   "semanticProvider",
   "semanticBaseUrl",
@@ -7466,19 +7458,6 @@ var KEYS = [
   "httpServerPort",
   "httpServerToken"
 ];
-var RESERVED_MIGRATIONS_KEYS = /* @__PURE__ */ new Set([
-  "_protected",
-  "_extend",
-  "_inherits",
-  "_table",
-  "_columns"
-]);
-function normalizeMigrationsProperty(out) {
-  const m = out.migrationsProperty;
-  if (m.length === 0 || m === out.templateProperty || RESERVED_MIGRATIONS_KEYS.has(m)) {
-    out.migrationsProperty = DEFAULT_SETTINGS.migrationsProperty;
-  }
-}
 function mergeWithDefaults(loaded) {
   const out = { ...DEFAULT_SETTINGS };
   for (const key of KEYS) {
@@ -7486,18 +7465,6 @@ function mergeWithDefaults(loaded) {
     const raw = loaded[key];
     if (raw === void 0) continue;
     switch (key) {
-      case "templateProperty": {
-        if (typeof raw === "string" && raw.length > 0) {
-          out.templateProperty = raw;
-        }
-        break;
-      }
-      case "migrationsProperty": {
-        if (typeof raw === "string" && raw.length > 0) {
-          out.migrationsProperty = raw;
-        }
-        break;
-      }
       case "telemetryEndpoint": {
         if (typeof raw === "string" && /^https?:\/\/\S+$/.test(raw.trim())) {
           out.telemetryEndpoint = raw.trim().replace(/\/+$/, "");
@@ -7544,12 +7511,6 @@ function mergeWithDefaults(loaded) {
         if (typeof raw === "number" && Number.isInteger(raw) && raw >= 1) out[key] = raw;
         break;
       }
-      case "journalFolder": {
-        if (typeof raw === "string" && raw.trim().replace(/^\/+|\/+$/g, "").length > 0) {
-          out.journalFolder = raw.trim().replace(/^\/+|\/+$/g, "");
-        }
-        break;
-      }
       case "semanticProvider": {
         if (typeof raw === "string" && raw in PROVIDER_PRESETS) out.semanticProvider = raw;
         break;
@@ -7585,8 +7546,7 @@ function mergeWithDefaults(loaded) {
       case "telemetryEnabled":
       case "fileLogEnabled":
       case "semanticEnabled":
-      case "autoRecompute":
-      case "viewNotes": {
+      case "autoRecompute": {
         if (typeof raw === "boolean") {
           out[key] = raw;
         }
@@ -7594,7 +7554,6 @@ function mergeWithDefaults(loaded) {
       }
     }
   }
-  normalizeMigrationsProperty(out);
   return out;
 }
 
@@ -7834,14 +7793,6 @@ function valuesFromFilename(pattern, basename3) {
 
 // src/core/frontmatter.ts
 var import_yaml = __toESM(require_dist(), 1);
-var DEFAULT_MIGRATIONS_KEY = "_migrations";
-var UnsupportedNestedMappingError = class extends Error {
-  constructor(message, keyPath) {
-    super(message);
-    this.keyPath = keyPath;
-    this.name = "UnsupportedNestedMappingError";
-  }
-};
 var FRONTMATTER_BLOCK = /^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n([\s\S]*))?$/;
 function splitFrontmatter(markdown) {
   const m = markdown.match(FRONTMATTER_BLOCK);
@@ -7850,131 +7801,6 @@ function splitFrontmatter(markdown) {
   if (yamlText === void 0) return null;
   return { yamlText, body: m[2] ?? "" };
 }
-function normalizeFlowStyleOpKeys(entry) {
-  const compound = /^(op|from|to|key):(.+)$/;
-  const out = { ...entry };
-  const toDelete = [];
-  for (const k of Object.keys(out)) {
-    const m = k.match(compound);
-    if (m == null) continue;
-    const fieldRaw = m[1];
-    const suffixRaw = m[2];
-    if (fieldRaw === void 0 || suffixRaw === void 0) continue;
-    const field = fieldRaw;
-    const suffix = suffixRaw.trim();
-    if (suffix.length === 0) continue;
-    const raw = out[k];
-    const preferred = raw !== null && raw !== void 0 && raw !== "" ? raw : suffix;
-    const cur = out[field];
-    if (cur !== void 0 && cur !== null && String(cur) !== String(preferred)) {
-      continue;
-    }
-    out[field] = preferred;
-    toDelete.push(k);
-  }
-  for (const k of toDelete) {
-    delete out[k];
-  }
-  return out;
-}
-function migrationEntryMapToObject(map, entryPath, listRoot) {
-  const out = {};
-  for (const pair of map.items) {
-    const kn = pair.key;
-    const k = (0, import_yaml.isScalar)(kn) ? String(kn.value) : String(kn);
-    const v = pair.value;
-    if (v == null) {
-      out[k] = null;
-      continue;
-    }
-    if ((0, import_yaml.isScalar)(v)) {
-      out[k] = v.value;
-      continue;
-    }
-    throw new UnsupportedNestedMappingError(
-      `Invalid value in ${listRoot} entry (path: ${entryPath}.${k})`,
-      `${entryPath}.${k}`
-    );
-  }
-  return normalizeFlowStyleOpKeys(out);
-}
-function parseMigrationsSequence(node, listRoot) {
-  if (node == null) return [];
-  if (!(node instanceof import_yaml.YAMLSeq)) {
-    throw new UnsupportedNestedMappingError(
-      `${listRoot} must be a YAML sequence (path: ${listRoot})`,
-      listRoot
-    );
-  }
-  return node.items.map((item, i) => {
-    const p = `${listRoot}[${i}]`;
-    if (item == null || !(item instanceof import_yaml.YAMLMap)) {
-      throw new Error(`${p}: expected a mapping`);
-    }
-    return migrationEntryMapToObject(item, p, listRoot);
-  });
-}
-function tableEntryMapToObject(map, entryPath) {
-  const out = {};
-  for (const pair of map.items) {
-    const kn = pair.key;
-    const k = (0, import_yaml.isScalar)(kn) ? String(kn.value) : String(kn);
-    const v = pair.value;
-    if (v == null) {
-      out[k] = null;
-    } else if ((0, import_yaml.isScalar)(v)) {
-      out[k] = v.value;
-    } else if (v instanceof import_yaml.YAMLSeq) {
-      out[k] = v.items.map((item, i) => {
-        if (item == null) return null;
-        if ((0, import_yaml.isScalar)(item)) return item.value;
-        throw new UnsupportedNestedMappingError(
-          `Invalid list item in ${entryPath}.${k}[${i}]`,
-          `${entryPath}.${k}[${i}]`
-        );
-      });
-    } else {
-      throw new UnsupportedNestedMappingError(
-        `Invalid value in ${entryPath}.${k}`,
-        `${entryPath}.${k}`
-      );
-    }
-  }
-  return out;
-}
-function parseTableEntriesSequence(node, listRoot) {
-  if (node == null || (0, import_yaml.isScalar)(node) && node.value == null) return [];
-  if (!(node instanceof import_yaml.YAMLSeq)) {
-    throw new UnsupportedNestedMappingError(
-      `${listRoot} must be a YAML sequence (path: ${listRoot})`,
-      listRoot
-    );
-  }
-  return node.items.map((item, i) => {
-    const p = `${listRoot}[${i}]`;
-    if (item == null || !(item instanceof import_yaml.YAMLMap)) {
-      throw new Error(`${p}: expected a mapping`);
-    }
-    return tableEntryMapToObject(item, p);
-  });
-}
-var TABLE_SEQUENCE_KEYS = /* @__PURE__ */ new Set(["_table", "_columns"]);
-function assertPlainValueAtPath(node, keyPath) {
-  if (node == null) return null;
-  if ((0, import_yaml.isScalar)(node)) return node.value;
-  if (node instanceof import_yaml.YAMLMap) {
-    throw new UnsupportedNestedMappingError(
-      `Nested YAML mapping is not supported in v1 (path: ${keyPath})`,
-      keyPath
-    );
-  }
-  if (node instanceof import_yaml.YAMLSeq) {
-    return node.items.map(
-      (item, i) => assertPlainValueAtPath(item, `${keyPath}[${i}]`)
-    );
-  }
-  throw new Error(`Unsupported YAML node at ${keyPath}`);
-}
 function coerceMisparsedYamlWikilinkToString(value) {
   let cur = value;
   const steps = [];
@@ -7990,7 +7816,7 @@ function coerceMisparsedYamlWikilinkToString(value) {
   }
   return `[[${cur}]]`;
 }
-function yamlNodeToPlainForChildNote(node, keyPath) {
+function yamlNodeToPlain(node, keyPath) {
   if (node == null) return null;
   if ((0, import_yaml.isScalar)(node)) return node.value;
   if (node instanceof import_yaml.YAMLMap) {
@@ -7998,55 +7824,34 @@ function yamlNodeToPlainForChildNote(node, keyPath) {
     for (const pair of node.items) {
       const kn = pair.key;
       const k = (0, import_yaml.isScalar)(kn) ? String(kn.value) : String(kn);
-      out[k] = yamlNodeToPlainForChildNote(pair.value, `${keyPath}.${k}`);
+      out[k] = yamlNodeToPlain(pair.value, `${keyPath}.${k}`);
     }
     return out;
   }
   if (node instanceof import_yaml.YAMLSeq) {
     return node.items.map(
-      (item, i) => yamlNodeToPlainForChildNote(item, `${keyPath}[${i}]`)
+      (item, i) => yamlNodeToPlain(item, `${keyPath}[${i}]`)
     );
   }
   throw new Error(`Unsupported YAML node at ${keyPath}`);
 }
-function parseYamlBlockToOrdered(yamlText, migrationsKey = DEFAULT_MIGRATIONS_KEY) {
-  if (yamlText.trim() === "") return [];
-  const doc = (0, import_yaml.parseDocument)(yamlText);
-  if (doc.errors.length > 0) {
-    const first = doc.errors[0];
-    throw new Error(first?.message ?? "YAML parse error");
-  }
-  const root2 = doc.contents;
-  if (root2 == null) return [];
-  if (!(root2 instanceof import_yaml.YAMLMap)) {
-    throw new Error("Frontmatter root must be a YAML mapping (object)");
-  }
-  const entries = [];
-  for (const pair of root2.items) {
-    const kn = pair.key;
-    const key = (0, import_yaml.isScalar)(kn) ? String(kn.value) : String(kn);
-    const value = key === migrationsKey || key === "_inherits" ? parseMigrationsSequence(pair.value, key) : TABLE_SEQUENCE_KEYS.has(key) ? parseTableEntriesSequence(pair.value, key) : assertPlainValueAtPath(pair.value, key);
-    entries.push([key, value]);
-  }
-  return entries;
-}
-function parseYamlBlockToOrderedForChildNote(yamlText, migrationsKey = DEFAULT_MIGRATIONS_KEY, wikilinkStringKeys = /* @__PURE__ */ new Set(["template"])) {
+function parseYamlBlockToOrdered(yamlText, wikilinkStringKeys = /* @__PURE__ */ new Set()) {
   if (yamlText.trim() === "") return [];
   const doc = (0, import_yaml.parseDocument)(yamlText);
   if (doc.errors.length > 0) {
     const first = doc.errors[0];
     throw new Error(first?.message ?? "YAML parse error");
   }
-  const root2 = doc.contents;
-  if (root2 == null) return [];
-  if (!(root2 instanceof import_yaml.YAMLMap)) {
+  const root = doc.contents;
+  if (root == null) return [];
+  if (!(root instanceof import_yaml.YAMLMap)) {
     throw new Error("Frontmatter root must be a YAML mapping (object)");
   }
   const entries = [];
-  for (const pair of root2.items) {
+  for (const pair of root.items) {
     const kn = pair.key;
     const key = (0, import_yaml.isScalar)(kn) ? String(kn.value) : String(kn);
-    let value = key === migrationsKey || key === "_inherits" ? parseMigrationsSequence(pair.value, key) : yamlNodeToPlainForChildNote(pair.value, key);
+    let value = yamlNodeToPlain(pair.value, key);
     if (wikilinkStringKeys.has(key)) {
       value = coerceMisparsedYamlWikilinkToString(value);
     }
@@ -8054,27 +7859,13 @@ function parseYamlBlockToOrderedForChildNote(yamlText, migrationsKey = DEFAULT_M
   }
   return entries;
 }
-function readOrderedFromMarkdownForChildNote(markdown, migrationsKey = DEFAULT_MIGRATIONS_KEY, wikilinkStringKeys = /* @__PURE__ */ new Set(["template"])) {
-  const split2 = splitFrontmatter(markdown);
-  if (!split2) {
-    return { ordered: [], body: markdown };
-  }
-  return {
-    ordered: parseYamlBlockToOrderedForChildNote(
-      split2.yamlText,
-      migrationsKey,
-      wikilinkStringKeys
-    ),
-    body: split2.body
-  };
-}
-function readOrderedFromMarkdown(markdown, migrationsKey = DEFAULT_MIGRATIONS_KEY) {
+function readOrderedFromMarkdown(markdown, wikilinkStringKeys = /* @__PURE__ */ new Set()) {
   const split2 = splitFrontmatter(markdown);
   if (!split2) {
     return { ordered: [], body: markdown };
   }
   return {
-    ordered: parseYamlBlockToOrdered(split2.yamlText, migrationsKey),
+    ordered: parseYamlBlockToOrdered(split2.yamlText, wikilinkStringKeys),
     body: split2.body
   };
 }
@@ -8149,21 +7940,9 @@ function fmReorder(ordered, keysInOrder) {
   }
   return out;
 }
-async function writeFrontmatter(app, file, mutator, migrationsKey = DEFAULT_MIGRATIONS_KEY) {
+async function writeFrontmatter(app, file, mutator, wikilinkStringKeys = /* @__PURE__ */ new Set()) {
   const text2 = await app.vault.read(file);
-  const { ordered: before } = readOrderedFromMarkdown(text2, migrationsKey);
-  const after = mutator(before);
-  await app.fileManager.processFrontMatter(file, (fm) => {
-    applyOrderedFrontmatter(fm, after);
-  });
-}
-async function writeChildFrontmatter(app, file, mutator, migrationsKey = DEFAULT_MIGRATIONS_KEY, wikilinkStringKeys = /* @__PURE__ */ new Set(["template"])) {
-  const text2 = await app.vault.read(file);
-  const { ordered: before } = readOrderedFromMarkdownForChildNote(
-    text2,
-    migrationsKey,
-    wikilinkStringKeys
-  );
+  const { ordered: before } = readOrderedFromMarkdown(text2, wikilinkStringKeys);
   const after = mutator(before);
   await app.fileManager.processFrontMatter(file, (fm) => {
     applyOrderedFrontmatter(fm, after);
@@ -8202,16 +7981,7 @@ var DEFAULT_TODAY = "{today}";
 var DEFAULT_SCHEMA = "public";
 
 // src/core/reserved-keys.ts
-function rowReservedKeys(settings) {
-  return [
-    settings.migrationsProperty,
-    "_protected",
-    "_extend",
-    "_inherits",
-    TABLE_KEY,
-    COLUMNS_KEY
-  ];
-}
+var TABLE_META_KEYS = [TABLE_KEY, COLUMNS_KEY];
 
 // src/core/validate.ts
 var DATE_RE = /^(\d{4})-(\d{2})-(\d{2})$/;
@@ -8344,7 +8114,7 @@ function validateRow(table, row, options, ctx = {}) {
     const known = /* @__PURE__ */ new Set([
       ...table.columns.map((c) => c.name),
       ...table.untypedFields,
-      options.templateProperty,
+      options.tableProperty,
       ...options.extraAllowedKeys ?? []
     ]);
     for (const [k, v] of row) {
@@ -8503,7 +8273,7 @@ var COLUMN_ATTRS = /* @__PURE__ */ new Set([
   "vocabulary",
   "inverse"
 ]);
-var TABLE_ATTRS = /* @__PURE__ */ new Set(["name", "path", "partition", "filename", "archive", "exclude", "description", "aliases"]);
+var TABLE_ATTRS = /* @__PURE__ */ new Set(["name", "partition", "filename", "archive", "exclude", "description", "aliases"]);
 var COLUMN_NAME_RE = /^[A-Za-z][A-Za-z0-9_-]*$/;
 function isScalarType(t) {
   return typeof t === "string" && SCALAR_COLUMN_TYPES.includes(t);
@@ -8747,43 +8517,17 @@ function parseTableOptions(raw) {
   }
   return out;
 }
-function basenameWithoutMd(path6) {
-  const base = path6.split("/").pop() ?? path6;
-  return base.replace(/\.md$/i, "");
-}
-var SCHEMA_BASENAME = "_schema";
 var DEFAULT_DATABASE_FOLDER = "Database";
-function schemaOfTable(schemaPath, databaseFolder = DEFAULT_DATABASE_FOLDER) {
-  const root2 = databaseFolder.replace(/^\/+|\/+$/g, "");
-  if (!schemaPath.startsWith(`${root2}/`)) return DEFAULT_SCHEMA;
-  const rel = schemaPath.slice(root2.length + 1).split("/");
-  return rel.length >= 3 && !rel[0].startsWith("_") ? rel[0] : DEFAULT_SCHEMA;
-}
-function isDatabaseTable(schemaPath, databaseFolder = DEFAULT_DATABASE_FOLDER) {
-  const root2 = databaseFolder.replace(/^\/+|\/+$/g, "");
-  if (!schemaPath.startsWith(`${root2}/`)) return false;
-  const rel = schemaPath.slice(root2.length + 1).split("/");
-  return rel[rel.length - 1] === `${SCHEMA_BASENAME}.md` && (rel.length === 2 || rel.length === 3) && !rel[0].startsWith("_");
-}
-function tableLayout(schemaPath, options, databaseFolder = DEFAULT_DATABASE_FOLDER) {
-  const cut = schemaPath.lastIndexOf("/");
-  const folder = cut < 0 ? "" : schemaPath.slice(0, cut);
-  const inDatabase = isDatabaseTable(schemaPath, databaseFolder);
-  const join = (a, b) => a === "" ? b : `${a}/${b}`;
-  let rowPath;
-  if (options.path) rowPath = options.path;
-  else if (inDatabase) rowPath = options.partition ? join(folder, options.partition) : folder;
-  let archive;
-  if (options.archive) archive = inDatabase && !options.archive.includes("/") ? join(folder, options.archive) : options.archive;
-  else archive = join(folder, inDatabase ? DEFAULT_ARCHIVE_FOLDER : "_archivio");
-  return { folder, inDatabase, ...rowPath !== void 0 ? { rowPath } : {}, archive };
-}
 var DEFAULT_ARCHIVE_FOLDER = "_archive";
-function defaultTableName(schemaPath) {
-  const base = basenameWithoutMd(schemaPath);
-  if (base !== SCHEMA_BASENAME) return base;
-  const parts = schemaPath.split("/");
-  return parts.length >= 2 ? parts[parts.length - 2] : base;
+function catalogLayout(root, ref2, options) {
+  const folder = `${root}/${ref2.catalog}/${ref2.schema}/${ref2.table}`;
+  const archiveName = options.archive && !options.archive.includes("/") ? options.archive : DEFAULT_ARCHIVE_FOLDER;
+  return {
+    folder,
+    inDatabase: true,
+    rowPath: options.partition ? `${folder}/${options.partition}` : folder,
+    archive: options.archive && options.archive.includes("/") ? options.archive : `${folder}/${archiveName}`
+  };
 }
 function checkGeneratedColumns(specs, known) {
   specs.forEach((c, index) => {
@@ -8811,8 +8555,8 @@ function checkGeneratedColumns(specs, known) {
     }
   });
 }
-function tableDefinitionFromOrdered(schemaPath, ordered, settings) {
-  const reserved = /* @__PURE__ */ new Set([...rowReservedKeys(settings), settings.templateProperty]);
+function tableDefinitionFromOrdered(ref2, schemaPath, ordered, settings) {
+  const reserved = new Set(TABLE_META_KEYS);
   const options = parseTableOptions(fmGet(ordered, TABLE_KEY));
   const specs = parseColumns(fmGet(ordered, COLUMNS_KEY), reserved);
   const fieldKeys = ordered.map(([k]) => k).filter((k) => !reserved.has(k));
@@ -8822,9 +8566,10 @@ function tableDefinitionFromOrdered(schemaPath, ordered, settings) {
   checkGeneratedColumns(specs, /* @__PURE__ */ new Set([...columnNames, ...fieldKeys]));
   return {
     schemaPath,
-    name: options.name ?? defaultTableName(schemaPath),
-    schema: schemaOfTable(schemaPath, settings.databaseFolder),
-    layout: tableLayout(schemaPath, options, settings.databaseFolder),
+    name: ref2.table,
+    schema: ref2.schema,
+    catalog: ref2.catalog,
+    layout: catalogLayout(settings.databaseFolder.replace(/^\/+|\/+$/g, ""), ref2, options),
     options,
     columns,
     untypedFields: fieldKeys.filter((k) => !columnNames.has(k))
@@ -9052,16 +8797,6 @@ function rowTableFull(model, value) {
   }
 }
 var TABLE_PROPERTY_KEYS = ["partition", "filename", "archive", "exclude"];
-function catalogLayout(root2, ref2, options) {
-  const folder = `${root2}/${ref2.catalog}/${ref2.schema}/${ref2.table}`;
-  const archiveName = options.archive && !options.archive.includes("/") ? options.archive : "_archive";
-  return {
-    folder,
-    inDatabase: true,
-    rowPath: options.partition ? `${folder}/${options.partition}` : folder,
-    archive: options.archive && options.archive.includes("/") ? options.archive : `${folder}/${archiveName}`
-  };
-}
 function entryToOrdered(ref2, entry, settings, model) {
   const columns = model ? effectiveColumns(model, ref2, entry) : entry.columns.map((c) => withSelf(c, ref2.full));
   const ordered = [[settings.tableProperty, ref2.full]];
@@ -9103,7 +8838,7 @@ function orderedToEntry(ordered, previous, settings, ctx) {
   const options = parseTableOptions(fmGet(ordered, TABLE_KEY));
   const columnsRaw = fmGet(ordered, COLUMNS_KEY) ?? [];
   const columnNames = new Set(columnsRaw.map((c) => String(c.name)));
-  const reserved = /* @__PURE__ */ new Set([settings.tableProperty, TABLE_KEY, COLUMNS_KEY, settings.migrationsProperty, "_protected", "_extend", "_inherits"]);
+  const reserved = /* @__PURE__ */ new Set([settings.tableProperty, ...TABLE_META_KEYS]);
   const dense = /* @__PURE__ */ new Set();
   const defaults = {};
   for (const [k, v] of ordered) {
@@ -9314,11 +9049,11 @@ async function readHashed(app, f) {
   e.hash ??= contentHash(e.content);
   return { content: e.content, hash: e.hash };
 }
-async function readParsed(app, f, key, parse3) {
+async function readParsed(app, f, key, parse2) {
   const e = await entryFor(app, f);
   e.parsed ??= /* @__PURE__ */ new Map();
   let p = e.parsed.get(key);
-  if (!p) e.parsed.set(key, p = parse3(e.content));
+  if (!p) e.parsed.set(key, p = parse2(e.content));
   return { ordered: p.ordered.map(([k, v]) => [k, v]), body: p.body };
 }
 function invalidateFiles(app, paths) {
@@ -9441,24 +9176,9 @@ async function findInStore(app, settings, id) {
   }
   return entry ? { entry: await unpack(app, settings, entry), undone, path: `${path6}#${id}` } : null;
 }
-var JSON_BLOCK = /```json\n([\s\S]*?)\n```/;
-function parseLegacyNote(text2, path6) {
-  const m = text2.match(JSON_BLOCK);
-  if (!m) throw new Error(`Journal ${path6} has no JSON block`);
-  const entry = JSON.parse(m[1]);
-  const { ordered } = readOrderedFromMarkdownForChildNote(text2);
-  const undone = ordered.some(([k, v]) => k === "undone" && v === true);
-  const by = ordered.find(([k]) => k === "undone_by")?.[1];
-  return { entry, undone, ...typeof by === "string" ? { undoneBy: by } : {} };
-}
 async function readJournal(app, settings, migrationId) {
   const hit = await findInStore(app, settings, migrationId);
   if (hit) return hit;
-  const f = app.vault.getAbstractFileByPath(`${settings.journalFolder}/${migrationId}.md`);
-  if (f != null && "extension" in f) {
-    const { entry, undone } = parseLegacyNote(await app.vault.read(f), f.path);
-    return { entry, undone, path: f.path };
-  }
   throw new MigrationNotFoundError(migrationId);
 }
 async function markUndone(app, settings, migrationId, undoneBy, now) {
@@ -9531,41 +9251,6 @@ async function compactJournal(app, settings, now = /* @__PURE__ */ new Date()) {
   }
   return res;
 }
-async function importLegacyJournal(app, settings, opts = {}) {
-  const res = { imported: 0, skipped: 0, removed: 0, errors: [] };
-  const folder = settings.journalFolder.replace(/^\/+|\/+$/g, "");
-  if (!folder) return res;
-  const notes = app.vault.getMarkdownFiles().filter((f) => f.path.startsWith(`${folder}/`) && !f.path.slice(folder.length + 1).includes("/")).sort((a, b) => a.path.localeCompare(b.path));
-  const known = /* @__PURE__ */ new Map();
-  const done = [];
-  for (const f of notes) {
-    try {
-      const { entry, undone, undoneBy } = parseLegacyNote(await app.vault.read(f), f.path);
-      const file = journalFileFor(settings, entry.migration_id);
-      if (!known.has(file)) known.set(file, await idsIn(app, file));
-      if (known.get(file).has(entry.migration_id)) {
-        res.skipped++;
-      } else {
-        await appendEntry(app, settings, entry);
-        if (undone) await markUndone(app, settings, entry.migration_id, undoneBy ?? "", new Date(entry.executed_at));
-        known.get(file).add(entry.migration_id);
-        res.imported++;
-      }
-      done.push(f);
-    } catch (e) {
-      res.errors.push({ path: f.path, error: e instanceof Error ? e.message : String(e) });
-    }
-  }
-  if (opts.remove !== false) {
-    for (const f of done) {
-      await app.vault.delete(f);
-      res.removed++;
-    }
-    const dir = app.vault.getAbstractFileByPath(folder);
-    if (dir && Array.isArray(dir.children) && dir.children.length === 0) await app.vault.delete(dir, true);
-  }
-  return res;
-}
 
 // src/core/changeset.ts
 function bodyChanges(e) {
@@ -9657,22 +9342,8 @@ async function ensureFolder(app, folder) {
   await ensureFolder(app, parentFolder(folder));
   await app.vault.createFolder(folder);
 }
-async function readOrderedFor(app, file, strict, settings) {
-  const text2 = await app.vault.read(file);
-  return strict ? readOrderedFromMarkdown(text2, settings.migrationsProperty).ordered : readOrderedFromMarkdownForChildNote(text2, settings.migrationsProperty, /* @__PURE__ */ new Set([settings.templateProperty])).ordered;
-}
-async function writeOrderedDiff(app, file, strict, settings, mutate) {
-  if (strict) {
-    await writeFrontmatter(app, file, mutate, settings.migrationsProperty);
-  } else {
-    await writeChildFrontmatter(
-      app,
-      file,
-      mutate,
-      settings.migrationsProperty,
-      /* @__PURE__ */ new Set([settings.templateProperty])
-    );
-  }
+async function readOrderedFor(app, file) {
+  return readOrderedFromMarkdown(await app.vault.read(file)).ordered;
 }
 async function moveFile(app, from, to) {
   if (from.startsWith(".")) return storeRename(app, from, to);
@@ -9733,12 +9404,11 @@ async function applyChangeSet(app, settings, cs, now = /* @__PURE__ */ new Date(
         const order = e.after.map(([k]) => k);
         const fmChanged = d.set.length > 0 || d.remove.length > 0 || !same(e.before.map(([k]) => k), order);
         if (fmChanged) {
-          await writeOrderedDiff(app, file, e.strict, settings, (fm) => applyDiff(fm, d.set, d.remove, order));
+          await writeFrontmatter(app, file, (fm) => applyDiff(fm, d.set, d.remove, order));
         }
         if (bodyChanges(e)) await writeBody(app, file, e.bodyBefore, e.bodyAfter);
         rows.push({
           path: e.path,
-          strict: e.strict,
           before: d.beforeValues,
           before_absent: d.beforeAbsent,
           before_order: e.before.map(([k]) => k),
@@ -9830,7 +9500,7 @@ async function undoMigration(app, settings, migrationId, now = /* @__PURE__ */ n
       conflicts.push({ path: r.path, message: "note no longer exists" });
       continue;
     }
-    const cur = new Map(await readOrderedFor(app, f, r.strict, settings));
+    const cur = new Map(await readOrderedFor(app, f));
     for (const [k, v] of Object.entries(r.after)) {
       if (!cur.has(k) || !same(cur.get(k), v)) {
         conflicts.push({ path: r.path, message: `"${k}" changed since the operation` });
@@ -9875,18 +9545,15 @@ async function undoMigration(app, settings, migrationId, now = /* @__PURE__ */ n
     for (const r of entry.rows) {
       const f = fileOrNull(app, currentPath(r.path));
       if (Object.keys(r.after).length > 0 || r.after_absent.length > 0 || Object.keys(r.before).length > 0) {
-        await writeOrderedDiff(
+        await writeFrontmatter(
           app,
           f,
-          r.strict,
-          settings,
           (fm) => applyDiff(fm, Object.entries(r.before), r.before_absent, r.before_order)
         );
       }
       if (r.body_after !== void 0) await writeBody(app, f, r.body_after, r.body_before);
       undoRows.push({
         path: currentPath(r.path),
-        strict: r.strict,
         before: r.after,
         before_absent: r.after_absent,
         before_order: [],
@@ -10104,14 +9771,14 @@ async function readCurrentStates(app, settings, model, touched, only) {
     const fm = app.metadataCache.getFileCache(f)?.frontmatter;
     if (fm && fm[settings.tableProperty] != null) candidates.add(f.path);
   }
-  const key = `member-tolerant|${settings.migrationsProperty}`;
+  const key = "member-tolerant";
   const resolved = /* @__PURE__ */ new Map();
   for (const path6 of [...candidates].sort()) {
     const file = app.vault.getAbstractFileByPath(path6);
     if (file == null || !("extension" in file)) continue;
     let raw;
     try {
-      const { ordered } = await readParsed(app, file, key, (c) => readOrderedFromMarkdownForChildNote(c, settings.migrationsProperty));
+      const { ordered } = await readParsed(app, file, key, (c) => readOrderedFromMarkdown(c));
       raw = fmGet(ordered, settings.tableProperty);
     } catch {
       continue;
@@ -10307,13 +9974,13 @@ function linkTo(app, path6, source) {
   return `[[${clash ? path6.replace(/\.md$/i, "") : base}]]`;
 }
 function rowKey(settings) {
-  return `row|${settings.migrationsProperty}|${settings.templateProperty}|${settings.tableProperty}`;
+  return `row|${settings.tableProperty}`;
 }
 async function readRowFrontmatter(app, settings, path6) {
   const f = app.vault.getAbstractFileByPath(path6);
   if (!f || !("extension" in f)) return null;
-  const keep = /* @__PURE__ */ new Set([settings.templateProperty, settings.tableProperty]);
-  const { ordered } = await readParsed(app, f, rowKey(settings), (t) => readOrderedFromMarkdownForChildNote(t, settings.migrationsProperty, keep));
+  const keep = /* @__PURE__ */ new Set([settings.tableProperty]);
+  const { ordered } = await readParsed(app, f, rowKey(settings), (t) => readOrderedFromMarkdown(t, keep));
   return ordered;
 }
 function inverseTargets(app, specs, ordered, source) {
@@ -10418,8 +10085,8 @@ async function inverseEditsFor(app, settings, rows, finalPath) {
   return planInverse(app, settings, ms.model, changes, { known, finalPath });
 }
 function withFrontmatter(content, ordered, settings) {
-  const keep = /* @__PURE__ */ new Set([settings.templateProperty, settings.tableProperty]);
-  const { body } = readOrderedFromMarkdownForChildNote(content, settings.migrationsProperty, keep);
+  const keep = /* @__PURE__ */ new Set([settings.tableProperty]);
+  const { body } = readOrderedFromMarkdown(content, keep);
   return buildMarkdownWithFrontmatter(ordered, body);
 }
 var InverseWatcher = class {
@@ -10521,14 +10188,6 @@ var TableNotFoundError = class extends Error {
     this.name = "TableNotFoundError";
   }
 };
-var AmbiguousTableError = class extends Error {
-  constructor(ref2, paths) {
-    super(`Table name "${ref2}" matches several tables (${paths.join(", ")}); use schema.table`);
-    this.ref = ref2;
-    this.paths = paths;
-    this.name = "AmbiguousTableError";
-  }
-};
 function frontmatterOf(app, file) {
   const fm = app.metadataCache.getFileCache(file)?.frontmatter;
   return fm && typeof fm === "object" ? fm : void 0;
@@ -10566,8 +10225,8 @@ function vocabularyOf(app, settings, table) {
   }
   const hit = entry.sets.get(table);
   if (hit) return hit;
-  const ms = cachedMetastore(app, { databaseFolder: settings.databaseFolder ?? DEFAULT_DATABASE_FOLDER });
-  if (!ms || !settings.tableProperty) return null;
+  const ms = cachedMetastore(app, { databaseFolder: settings.databaseFolder });
+  if (!ms) return null;
   const names = /* @__PURE__ */ new Set();
   for (const f of app.vault.getMarkdownFiles()) {
     const fm = frontmatterOf(app, f);
@@ -10586,8 +10245,8 @@ function validationContextFor(app, settings, sourcePath) {
     tableOfPath: (path6) => {
       const f = markdownFile(app, path6);
       if (!f) return null;
-      const ms = cachedMetastore(app, { databaseFolder: settings.databaseFolder ?? DEFAULT_DATABASE_FOLDER });
-      const full = ms && settings.tableProperty ? rowTableFull(ms, frontmatterOf(app, f)?.[settings.tableProperty]) : null;
+      const ms = cachedMetastore(app, { databaseFolder: settings.databaseFolder });
+      const full = ms ? rowTableFull(ms, frontmatterOf(app, f)?.[settings.tableProperty]) : null;
       return full ?? null;
     }
   };
@@ -10651,6 +10310,25 @@ function resolveDateTokens(where, tz, now) {
   const walk = (v) => Array.isArray(v) ? v.map(walk) : v && typeof v === "object" ? Object.fromEntries(Object.entries(v).map(([k, x]) => [k, walk(x)])) : resolveDateToken(v, tz, now);
   return walk(where);
 }
+function wallClock(now, tz) {
+  const parts = new Intl.DateTimeFormat("en-CA", {
+    timeZone: tz || "UTC",
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    hourCycle: "h23"
+  }).formatToParts(now);
+  const g = (type) => parts.find((p) => p.type === type)?.value ?? "00";
+  return `${g("year")}-${g("month")}-${g("day")}T${g("hour")}:${g("minute")}:${g("second")}`;
+}
+function resolveDefault(value, now, tz) {
+  if (value === DEFAULT_NOW) return tz === "" ? `${now.toISOString().slice(0, 19)}Z` : normalizeDatetime(wallClock(now, tz), tz);
+  if (value === DEFAULT_TODAY) return wallClock(now, tz).slice(0, 10);
+  return value;
+}
 
 // src/core/database.ts
 var DatabaseConfigError = class extends Error {
@@ -10734,7 +10412,7 @@ async function writeDatabaseConfig(app, settings, cfg) {
   primeMetastore(app, settings, after);
 }
 async function describeDatabase(app, settings) {
-  const root2 = databaseRoot(settings);
+  const root = databaseRoot(settings);
   const config = await readDatabaseConfig(app, settings);
   const ms = await loadMetastore(app, settings);
   const catalogs = [];
@@ -10768,7 +10446,7 @@ async function describeDatabase(app, settings) {
     }
   }
   return {
-    root: root2,
+    root,
     metastore: metastorePath(settings),
     journal: storePath(settings, "journal"),
     config,
@@ -10831,9 +10509,6 @@ async function configureDatabase(app, settings, input, saveSettings) {
         }
       }
       settings.databaseFolder = newRoot;
-      if (settings.journalFolder === oldRoot || settings.journalFolder.startsWith(`${oldRoot}/`)) {
-        settings.journalFolder = newRoot + settings.journalFolder.slice(oldRoot.length);
-      }
       await saveSettings();
     }
   }
@@ -10851,15 +10526,8 @@ var OperationInputError = class extends Error {
 function catalogLoadedTable(settings, ms, ref2) {
   const entry = ms.model.catalogs[ref2.catalog].schemas[ref2.schema].tables[ref2.table];
   const ordered = entryToOrdered(ref2, entry, settings, ms.model);
-  const base = tableDefinitionFromOrdered(catalogTablePath(settings, ref2.full), ordered, settings);
-  const def = {
-    ...base,
-    name: ref2.table,
-    schema: ref2.schema,
-    catalog: ref2.catalog,
-    layout: catalogLayout(settings.databaseFolder.replace(/^\/+|\/+$/g, ""), ref2, base.options)
-  };
-  return { file: ms.file, ordered, def, protectedKeys: /* @__PURE__ */ new Set(), catalog: { ref: ref2, entry, text: ms.text, model: ms.model } };
+  const def = tableDefinitionFromOrdered(ref2, catalogTablePath(settings, ref2.full), ordered, settings);
+  return { file: ms.file, ordered, def, catalog: { ref: ref2, entry, text: ms.text, model: ms.model } };
 }
 var INDEX_RETRY = { attempts: 8, delayMs: 150 };
 async function loadTable(app, settings, ref2) {
@@ -10871,23 +10539,20 @@ async function loadTable(app, settings, ref2) {
     await new Promise((r) => setTimeout(r, INDEX_RETRY.delayMs));
   }
 }
-function memberKey(settings, t) {
-  return settings.tableProperty;
-}
 function memberEntry(settings, t) {
   return [settings.tableProperty, t.catalog.ref.full];
 }
 async function loadRows(app, settings, t) {
   const out = [];
   const files = catalogRowFiles(app, settings, t.catalog.ref.full, t.def);
-  const key = `row|${settings.migrationsProperty}|${settings.templateProperty}|${settings.tableProperty}`;
-  const keep = /* @__PURE__ */ new Set([settings.templateProperty, settings.tableProperty]);
+  const key = `row|${settings.tableProperty}`;
+  const keep = /* @__PURE__ */ new Set([settings.tableProperty]);
   for (const f of files) {
     const { ordered, body } = await readParsed(
       app,
       f,
       key,
-      (text2) => readOrderedFromMarkdownForChildNote(text2, settings.migrationsProperty, keep)
+      (text2) => readOrderedFromMarkdown(text2, keep)
     );
     out.push({ file: f, ordered, body });
   }
@@ -10916,12 +10581,7 @@ function uniqueViolations(columns, rows) {
   }
   return [...byPath.entries()].map(([path6, violations]) => ({ path: path6, violations }));
 }
-function metaKeys(settings) {
-  return new Set(rowReservedKeys(settings));
-}
-function reservedNames(settings) {
-  return /* @__PURE__ */ new Set([...rowReservedKeys(settings), settings.templateProperty]);
-}
+var META_KEYS = new Set(TABLE_META_KEYS);
 function serializeColumn(c) {
   const out = { name: c.name, type: c.type };
   if (c.items !== void 0) out.items = c.items;
@@ -10949,7 +10609,7 @@ function serializeColumn(c) {
 }
 function serializeOptions(o) {
   const entry = {};
-  for (const k of ["name", "description", "path", "partition", "filename", "archive"]) {
+  for (const k of ["name", "description", "partition", "filename", "archive"]) {
     if (o[k] !== void 0) entry[k] = o[k];
   }
   if (o.aliases && o.aliases.length > 0) entry.aliases = [...o.aliases];
@@ -11047,11 +10707,11 @@ async function finish(app, settings, cs, conflicts, violations, opts) {
 var INVERSE_OPS = /* @__PURE__ */ new Set(["insert_row", "update_rows", "merge_rows", "adopt_rows", "move_rows", "recompute"]);
 async function addInverseEdits(app, settings, cs, conflicts) {
   if (cs.skipInverse || !INVERSE_OPS.has(cs.op)) return;
-  const keep = /* @__PURE__ */ new Set([settings.templateProperty, settings.tableProperty]);
+  const keep = /* @__PURE__ */ new Set([settings.tableProperty]);
   const created = new Map(cs.creates.map((c) => [c.path, c]));
   const rows = [
-    ...cs.edits.filter((e) => !e.strict).map((e) => ({ path: e.path, before: e.before, after: e.after })),
-    ...cs.creates.map((c) => ({ path: c.path, before: [], after: readOrderedFromMarkdownForChildNote(c.content, settings.migrationsProperty, keep).ordered }))
+    ...cs.edits.map((e) => ({ path: e.path, before: e.before, after: e.after })),
+    ...cs.creates.map((c) => ({ path: c.path, before: [], after: readOrderedFromMarkdown(c.content, keep).ordered }))
   ];
   const moved = new Map(cs.moves.map((m) => [m.from, m.to]));
   const plan = await inverseEditsFor(app, settings, rows, (p) => moved.get(p) ?? p);
@@ -11062,7 +10722,7 @@ async function addInverseEdits(app, settings, cs, conflicts) {
     const create = created.get(path6);
     if (own) own.after = w.after;
     else if (create) create.content = withFrontmatter(create.content, w.after, settings);
-    else cs.edits.push({ path: path6, strict: false, before: w.before, after: w.after });
+    else cs.edits.push({ path: path6, before: w.before, after: w.after });
   }
 }
 var DELTA_OPERATIONS = {
@@ -11151,7 +10811,7 @@ function addSchemaChange(cs, t, after, settings, target) {
       return !prev || prev.ref !== c.ref || prev.hierarchy !== c.hierarchy || prev.type !== c.type || prev.items !== c.items || prev.vocabulary !== c.vocabulary;
     });
     checkColumnRefs(t.catalog.model, ref2.full, touched, ref2.full);
-    def = tableDefinitionFromOrdered(catalogTablePath(settings, ref2.full), entryToOrdered(ref2, entry, settings, t.catalog.model), settings);
+    def = tableDefinitionFromOrdered(ref2, catalogTablePath(settings, ref2.full), entryToOrdered(ref2, entry, settings, t.catalog.model), settings);
   } catch (e) {
     if (e instanceof MetastoreError) throw new OperationInputError(e.message);
     throw e;
@@ -11247,7 +10907,7 @@ async function createTableImpl(app, settings, input, opts = {}) {
     }
     input = { ...input, columns: [{ ...SYSTEM_ID_SPEC, dense: true }, ...input.columns.filter((c) => c.name !== SYSTEM_ID_COLUMN)] };
   }
-  const reserved = reservedNames(settings);
+  const reserved = META_KEYS;
   const conflicts = [];
   const columns = input.columns.map((raw, i) => {
     const { dense: _dense, ...spec } = raw;
@@ -11273,10 +10933,11 @@ async function createTableImpl(app, settings, input, opts = {}) {
         throw new OperationInputError(`"time_column" must be a date or datetime column of the table`);
       }
       if (cfg.default_partition !== "") extra.partition = `{${tc.name}:${cfg.default_partition}}`;
-      extra.filename = `{${tc.name}:${cfg.filename}}`;
+      const format = tc.type === "date" ? cfg.filename.replace(/\s*(\[[^\]]*\])?\s*[Hh]{1,2}.*$/, "") || "YYYY-MM-DD" : cfg.filename;
+      extra.filename = `{${tc.name}:${format}}`;
     }
     const given = { ...input.options ?? {} };
-    if (given.path !== void 0) throw new OperationInputError(`database tables take "partition", not "path"`);
+    if ("path" in given) throw new OperationInputError(`database tables take "partition", not "path"`);
     const catOptions = parseTableOptions(serializeOptions({ ...extra, ...given, name: ref2.table }));
     if (!catOptions.filename) {
       throw new OperationInputError(`pass "time_column" or options.filename (e.g. "{name}") so rows get file names`);
@@ -11298,7 +10959,7 @@ async function createTableImpl(app, settings, input, opts = {}) {
     });
     cat = fmSet(cat, TABLE_KEY, serializeOptions(catOptions));
     cat = withColumns(cat, columns);
-    tableDefinitionFromOrdered(pseudo, cat, settings);
+    tableDefinitionFromOrdered(ref2, pseudo, cat, settings);
     const entry = orderedToEntry(cat, void 0, settings);
     if (typeof input.body === "string" && input.body.trim() !== "") entry.row_template = input.body;
     checkColumnRefs(model, ref2.full, entry.columns, ref2.full);
@@ -11339,21 +11000,22 @@ function columnExists(t, name) {
 }
 async function addColumnImpl(app, settings, input, opts = {}) {
   const t = await loadTable(app, settings, input.table);
-  const reserved = reservedNames(settings);
+  const reserved = META_KEYS;
   const spec = parseColumn(input.column, t.def.columns.length, reserved);
   if (columnExists(t, spec.name)) {
     throw new OperationInputError(`column "${spec.name}" already exists in table "${t.def.name}"`);
   }
   const dense = input.dense === true;
   let after = withColumns(t.ordered, [...t.def.columns, spec]);
-  if (dense) after = addFieldBeforeMeta(after, spec.name, spec.default ?? null, metaKeys(settings));
+  if (dense) after = addFieldBeforeMeta(after, spec.name, spec.default ?? null, META_KEYS);
   const cs = emptyChangeSet("add_column", `add column ${spec.name} to ${t.def.name}`, t.file.path);
   addSchemaChange(cs, t, after, settings);
   const violations = [];
+  const fill = resolveDefault(spec.default, /* @__PURE__ */ new Date(), (await readDatabaseConfig(app, settings)).timezone);
   for (const r of await loadRows(app, settings, t)) {
     const cur = fmGet(r.ordered, spec.name);
     const has = r.ordered.some(([k]) => k === spec.name);
-    const value = has ? cur : spec.default;
+    const value = has ? cur : fill;
     if (isEmptyValue(value)) {
       if (spec.required) {
         violations.push({
@@ -11367,9 +11029,8 @@ async function addColumnImpl(app, settings, input, opts = {}) {
     if (dense && !has) {
       cs.edits.push({
         path: r.file.path,
-        strict: false,
         before: r.ordered,
-        after: fmAdd(r.ordered, spec.name, spec.default ?? null)
+        after: fmAdd(r.ordered, spec.name, fill ?? null)
       });
     }
   }
@@ -11382,12 +11043,11 @@ async function renameColumnImpl(app, settings, input, opts = {}) {
   const t = await loadTable(app, settings, input.table);
   const from = input.from;
   const to = assertColumnName(input.to, `"to"`);
-  const reserved = reservedNames(settings);
+  const reserved = META_KEYS;
   if (!columnExists(t, from)) throw new OperationInputError(`column "${from}" not found in table "${t.def.name}"`);
   if (reserved.has(to)) throw new OperationInputError(`"${to}" is a reserved key`);
   if (columnExists(t, to)) throw new OperationInputError(`column "${to}" already exists in table "${t.def.name}"`);
   const conflicts = [];
-  if (t.protectedKeys.has(from)) conflicts.push({ path: t.file.path, message: `"${from}" is protected` });
   const columns = t.def.columns.map((c) => c.name === from ? { ...c, name: to } : c);
   let after = t.def.columns.some((c) => c.name === from) ? withColumns(t.ordered, columns) : t.ordered;
   after = fmRename(after, from, to);
@@ -11406,7 +11066,7 @@ async function renameColumnImpl(app, settings, input, opts = {}) {
       }
       next = fmDelete(next, to);
     }
-    cs.edits.push({ path: r.file.path, strict: false, before: r.ordered, after: fmRename(next, from, to) });
+    cs.edits.push({ path: r.file.path, before: r.ordered, after: fmRename(next, from, to) });
   }
   return finish(app, settings, cs, conflicts, [], opts);
 }
@@ -11427,7 +11087,6 @@ async function renameValueImpl(app, settings, input, opts = {}) {
   }
   const conflicts = [];
   if (values.includes(to)) conflicts.push({ path: t.file.path, message: `"${to}" is already a value of ${col.name}` });
-  if (t.protectedKeys.has(col.name)) conflicts.push({ path: t.file.path, message: `"${col.name}" is protected` });
   const spec = {
     ...col,
     values: values.map((v) => v === from ? to : v),
@@ -11444,7 +11103,7 @@ async function renameValueImpl(app, settings, input, opts = {}) {
     if (isEmptyValue(v)) continue;
     const next = swap(v);
     if (JSON.stringify(next) === JSON.stringify(v)) continue;
-    cs.edits.push({ path: r.file.path, strict: false, before: r.ordered, after: fmSet(r.ordered, col.name, next) });
+    cs.edits.push({ path: r.file.path, before: r.ordered, after: fmSet(r.ordered, col.name, next) });
   }
   return finish(app, settings, cs, conflicts, [], opts);
 }
@@ -11453,14 +11112,13 @@ async function dropColumnImpl(app, settings, input, opts = {}) {
   const name = input.name;
   if (!columnExists(t, name)) throw new OperationInputError(`column "${name}" not found in table "${t.def.name}"`);
   const conflicts = [];
-  if (t.protectedKeys.has(name)) conflicts.push({ path: t.file.path, message: `"${name}" is protected` });
   let after = t.def.columns.some((c) => c.name === name) ? withColumns(t.ordered, t.def.columns.filter((c) => c.name !== name)) : t.ordered;
   after = fmDelete(after, name);
   const cs = emptyChangeSet("drop_column", `drop column ${name} from ${t.def.name}`, t.file.path);
   addSchemaChange(cs, t, after, settings);
   for (const r of await loadRows(app, settings, t)) {
     if (!r.ordered.some(([k]) => k === name)) continue;
-    cs.edits.push({ path: r.file.path, strict: false, before: r.ordered, after: fmDelete(r.ordered, name) });
+    cs.edits.push({ path: r.file.path, before: r.ordered, after: fmDelete(r.ordered, name) });
   }
   return finish(app, settings, cs, conflicts, [], opts);
 }
@@ -11478,12 +11136,12 @@ async function alterColumnImpl(app, settings, input, opts = {}) {
     if (v === null) delete merged[k];
     else merged[k] = v;
   }
-  const spec = parseColumn(merged, idx, reservedNames(settings));
+  const spec = parseColumn(merged, idx, META_KEYS);
   const columns = t.def.columns.map((c, i) => i === idx ? spec : c);
-  const reserved = reservedNames(settings);
+  const reserved = META_KEYS;
   let after = withColumns(t.ordered, columns);
   const makeDense = dense === true && !old.dense;
-  if (makeDense) after = addFieldBeforeMeta(after, spec.name, spec.default ?? null, metaKeys(settings));
+  if (makeDense) after = addFieldBeforeMeta(after, spec.name, spec.default ?? null, META_KEYS);
   if (dense === false && old.dense) after = fmDelete(after, spec.name);
   const cs = emptyChangeSet("alter_column", `alter column ${spec.name} in ${t.def.name}`, t.file.path);
   addSchemaChange(cs, t, after, settings);
@@ -11491,12 +11149,13 @@ async function alterColumnImpl(app, settings, input, opts = {}) {
   const widen = old.type === "date" && spec.type === "datetime";
   const tz = widen ? (await readDatabaseConfig(app, settings)).timezone : "";
   const violations = spec.unique ? uniqueViolations([spec], existing.map((r) => ({ path: r.file.path, ordered: r.ordered }))) : [];
+  const fill = makeDense ? resolveDefault(spec.default, /* @__PURE__ */ new Date(), (await readDatabaseConfig(app, settings)).timezone) : void 0;
   for (const r of existing) {
     const has = r.ordered.some(([k]) => k === spec.name);
     let v = fmGet(r.ordered, spec.name);
     if (widen && typeof v === "string" && /^\d{4}-\d{2}-\d{2}$/.test(v)) {
       const cast = normalizeDatetime(`${v}T00:00`, tz);
-      cs.edits.push({ path: r.file.path, strict: false, before: r.ordered, after: fmSet(r.ordered, spec.name, cast) });
+      cs.edits.push({ path: r.file.path, before: r.ordered, after: fmSet(r.ordered, spec.name, cast) });
       v = cast;
     }
     if (isEmptyValue(v)) {
@@ -11507,7 +11166,7 @@ async function alterColumnImpl(app, settings, input, opts = {}) {
       violations.push({ path: r.file.path, violations: validateValue(spec, v, validationContextFor(app, settings, r.file.path)) });
     }
     if (makeDense && !has) {
-      cs.edits.push({ path: r.file.path, strict: false, before: r.ordered, after: fmAdd(r.ordered, spec.name, spec.default ?? null) });
+      cs.edits.push({ path: r.file.path, before: r.ordered, after: fmAdd(r.ordered, spec.name, fill ?? null) });
     }
   }
   return finish(app, settings, cs, [], violations, opts);
@@ -11669,10 +11328,9 @@ async function loadTableAsOf(app, settings, table, asOf2) {
   const file = ms?.file ?? pseudoFile(metastorePath(settings));
   const t = catalogLoadedTable(settings, { file, text: "", model: modelWith(ref2, state, ms?.model.bases ?? {}) }, ref2);
   const rows = [...state.files.entries()].sort(([a], [b]) => a.localeCompare(b)).map(([path6, f]) => {
-    const { ordered, body } = readOrderedFromMarkdownForChildNote(
+    const { ordered, body } = readOrderedFromMarkdown(
       f.content,
-      settings.migrationsProperty,
-      /* @__PURE__ */ new Set([settings.templateProperty, settings.tableProperty])
+      /* @__PURE__ */ new Set([settings.tableProperty])
     );
     return { file: pseudoFile(path6), ordered, body };
   });
@@ -11714,12 +11372,11 @@ var restoreTable = instrumented("restore_table", restoreTableImpl, (i) => ({
   timestamp: i.timestamp
 }));
 function rowValues(content, settings) {
-  const { ordered } = readOrderedFromMarkdownForChildNote(
+  const { ordered } = readOrderedFromMarkdown(
     content,
-    settings.migrationsProperty,
-    /* @__PURE__ */ new Set([settings.templateProperty, settings.tableProperty])
+    /* @__PURE__ */ new Set([settings.tableProperty])
   );
-  return Object.fromEntries(ordered.filter(([k]) => k !== settings.tableProperty && k !== settings.templateProperty));
+  return Object.fromEntries(ordered.filter(([k]) => k !== settings.tableProperty));
 }
 async function tableChanges(app, settings, input) {
   const ref2 = await historyTableName(app, settings, input.table);
@@ -11886,82 +11543,6 @@ function resolveThisTokens(query, host) {
   return walk(query);
 }
 
-// src/core/view-notes.ts
-var VIEW_NOTE_KEY = "view";
-var GENERATED_MARK = "Generated by Datanotes";
-function root(settings) {
-  return settings.databaseFolder.replace(/^\/+|\/+$/g, "");
-}
-function viewNotePath(settings, ref2) {
-  return `${root(settings)}/${ref2.catalog}/${ref2.schema}/${ref2.table}.md`;
-}
-function viewNoteText(ref2, view) {
-  const lines = ["---", `${VIEW_NOTE_KEY}: ${ref2.full}`];
-  if (view.aliases && view.aliases.length > 0) {
-    lines.push("aliases:", ...view.aliases.map((a) => `  - ${JSON.stringify(a)}`));
-  }
-  lines.push("---", "");
-  if (view.comment) lines.push(...view.comment.split("\n").map((l) => `> ${l}`), "");
-  lines.push("```datanotes", `view: ${ref2.full}`, "```", "");
-  lines.push(`%% ${GENERATED_MARK} from the view in database.yaml: change the view (create_view with replace, drop_view), not this note. %%`, "");
-  return lines.join("\n");
-}
-function viewOfNote(text2) {
-  const m = /^---\r?\n([\s\S]*?)\r?\n---/.exec(text2);
-  if (!m) return null;
-  const line = m[1].split(/\r?\n/).find((l) => l.startsWith(`${VIEW_NOTE_KEY}:`));
-  return line ? line.slice(VIEW_NOTE_KEY.length + 1).trim().replace(/^["']|["']$/g, "") || null : null;
-}
-async function viewNoteBlocked(app, settings, ref2) {
-  if (settings.viewNotes === false) return null;
-  const path6 = viewNotePath(settings, ref2);
-  const f = app.vault.getAbstractFileByPath(path6);
-  if (f == null) return null;
-  if (!("extension" in f)) return path6;
-  return viewOfNote(await app.vault.read(f)) === ref2.full ? null : path6;
-}
-async function syncViewNotes(app, settings, model) {
-  const out = { created: [], updated: [], removed: [], skipped: [] };
-  const ms = model ?? (await loadMetastore(app, settings))?.model ?? null;
-  if (!ms) return out;
-  const wanted = /* @__PURE__ */ new Map();
-  if (settings.viewNotes !== false) {
-    for (const { ref: ref2, view } of catalogViews(ms)) wanted.set(viewNotePath(settings, ref2), viewNoteText(ref2, view));
-  }
-  for (const [path6, text2] of wanted) {
-    const f = app.vault.getAbstractFileByPath(path6);
-    if (f == null) {
-      await ensureFolder(app, parentFolder(path6));
-      await app.vault.create(path6, text2);
-      out.created.push(path6);
-      continue;
-    }
-    if (!("extension" in f)) {
-      out.skipped.push(path6);
-      continue;
-    }
-    const current2 = await app.vault.read(f);
-    const expected = viewOfNote(text2);
-    if (viewOfNote(current2) !== expected) {
-      out.skipped.push(path6);
-      continue;
-    }
-    if (current2 !== text2) {
-      await app.vault.process(f, () => text2);
-      out.updated.push(path6);
-    }
-  }
-  const depth = root(settings).split("/").length + 3;
-  for (const f of app.vault.getMarkdownFiles()) {
-    if (wanted.has(f.path) || !f.path.startsWith(`${root(settings)}/`) || f.path.split("/").length !== depth) continue;
-    const text2 = await app.vault.read(f);
-    if (viewOfNote(text2) == null || !text2.includes(GENERATED_MARK)) continue;
-    await trash(app, f);
-    out.removed.push(f.path);
-  }
-  return out;
-}
-
 // src/core/catalog-ops.ts
 var IDENT2 = /^[a-z][a-z0-9_]*$/;
 function ident(kind, value) {
@@ -12063,8 +11644,6 @@ async function createViewImpl(app, settings, input, opts = {}) {
   const conflicts = [];
   if (sch?.tables[ref2.table]) conflicts.push({ path: ref2.full, message: `${ref2.full} is a table` });
   if (sch?.views[ref2.table] && input.replace !== true) conflicts.push({ path: ref2.full, message: `${ref2.full} already exists (pass replace)` });
-  const blocked = await viewNoteBlocked(app, settings, ref2);
-  if (blocked) conflicts.push({ path: blocked, message: `${blocked} exists and is not this view's note: rename it or choose another view name` });
   if (hasThisTokens(input.query)) viewQueryToSelect(input.query);
   else await select(app, settings, { ...viewQueryToSelect(input.query), limit: 1 });
   for (const [k, v] of Object.entries(input.labels ?? {})) {
@@ -12078,11 +11657,7 @@ async function createViewImpl(app, settings, input, opts = {}) {
   };
   const cs = emptyChangeSet("create_view", `create view ${ref2.full}`, `${metastorePath(settings)}#${ref2.full}`);
   cs.texts.push({ path: metastorePath(settings), before: text2, after: setViewEntry(text2, ref2, view) });
-  return withViewNotes(app, settings, await finish(app, settings, cs, conflicts, [], opts));
-}
-async function withViewNotes(app, settings, r) {
-  if (r.ok && !r.dryRun) await syncViewNotes(app, settings);
-  return r;
+  return finish(app, settings, cs, conflicts, [], opts);
 }
 async function dropViewImpl(app, settings, input, opts = {}) {
   const { text: text2, model } = await metastoreOrEmpty(app, settings);
@@ -12090,7 +11665,7 @@ async function dropViewImpl(app, settings, input, opts = {}) {
   if (!ref2) throw new TableNotFoundError(input.view);
   const cs = emptyChangeSet("drop_view", `drop view ${ref2.full}`, `${metastorePath(settings)}#${ref2.full}`);
   cs.texts.push({ path: metastorePath(settings), before: text2, after: setViewEntry(text2, ref2, null) });
-  return withViewNotes(app, settings, await finish(app, settings, cs, [], [], opts));
+  return finish(app, settings, cs, [], [], opts);
 }
 var createView = instrumented("create_view", createViewImpl, (i) => ({ name: i.name, catalog: i.catalog, schema: i.schema }));
 var dropView = instrumented("drop_view", dropViewImpl, (i) => ({ view: i.view }));
@@ -12343,13 +11918,15 @@ async function planInheritedRows(app, settings, model, text2, refs, rewrite, cs)
     checkColumnRefs(model, ref2.full, effectiveColumns(model, ref2, t.catalog.entry).filter((c) => !own.has(String(c.name))), ref2.full);
     const old = await loadTable(app, settings, ref2.full);
     const dense = t.def.columns.filter((c) => c.dense);
+    const now = /* @__PURE__ */ new Date();
+    const tz = (await readDatabaseConfig(app, settings)).timezone;
     for (const r of await loadRows(app, settings, old)) {
       let after = rewrite(r.ordered);
-      for (const c of dense) if (!after.some(([k]) => k === c.name)) after = fmSet(after, c.name, c.default ?? null);
+      for (const c of dense) if (!after.some(([k]) => k === c.name)) after = fmSet(after, c.name, resolveDefault(c.default, now, tz) ?? null);
       after = await fillIdentities(app, settings, t, after, r.file.path);
-      const v = validateRow(t.def, after, { templateProperty: settings.tableProperty }, validationContextFor(app, settings, r.file.path));
+      const v = validateRow(t.def, after, { tableProperty: settings.tableProperty }, validationContextFor(app, settings, r.file.path));
       if (v.length > 0) violations.push({ path: r.file.path, violations: v });
-      if (JSON.stringify(after) !== JSON.stringify(r.ordered)) cs.edits.push({ path: r.file.path, strict: false, before: r.ordered, after });
+      if (JSON.stringify(after) !== JSON.stringify(r.ordered)) cs.edits.push({ path: r.file.path, before: r.ordered, after });
     }
   }
   return violations;
@@ -12604,25 +12181,6 @@ function renderPathTemplate(template, values) {
     return sanitizeFileName(scalarForPath(v));
   });
 }
-function wallClock(now, tz) {
-  const parts = new Intl.DateTimeFormat("en-CA", {
-    timeZone: tz || "UTC",
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-    hour: "2-digit",
-    minute: "2-digit",
-    second: "2-digit",
-    hourCycle: "h23"
-  }).formatToParts(now);
-  const g = (type) => parts.find((p) => p.type === type)?.value ?? "00";
-  return `${g("year")}-${g("month")}-${g("day")}T${g("hour")}:${g("minute")}:${g("second")}`;
-}
-function resolveDefault(value, now, tz) {
-  if (value === DEFAULT_NOW) return tz === "" ? `${now.toISOString().slice(0, 19)}Z` : normalizeDatetime(wallClock(now, tz), tz);
-  if (value === DEFAULT_TODAY) return wallClock(now, tz).slice(0, 10);
-  return value;
-}
 function computedColumnNames(t) {
   return new Set(t.def.columns.filter((c) => c.generated !== void 0 || c.identity !== void 0).map((c) => c.name));
 }
@@ -12801,7 +12359,7 @@ function knownKeys(t, settings) {
   return /* @__PURE__ */ new Set([
     ...t.def.columns.map((c) => c.name),
     ...t.def.untypedFields,
-    memberKey(settings, t),
+    settings.tableProperty,
     "path"
   ]);
 }
@@ -12881,18 +12439,18 @@ async function resolveWithin(app, settings, t, where) {
     const rows = await loadRows(app, settings, target);
     const names = new Set(rows.map((r) => basenameOf(r.file.path)));
     const raw = cond.within;
-    let root2 = linkName(raw) ?? (typeof raw === "string" ? basenameOf(raw.trim()) : null);
-    if (root2 != null && !names.has(root2)) {
+    let root = linkName(raw) ?? (typeof raw === "string" ? basenameOf(raw.trim()) : null);
+    if (root != null && !names.has(root)) {
       const hit = rows.find((r) => r.ordered.some(([k, v]) => (k === "name" || k === "title") && v === raw));
-      root2 = hit ? basenameOf(hit.file.path) : null;
+      root = hit ? basenameOf(hit.file.path) : null;
     }
-    if (root2 == null) throw new OperationInputError(`"within": no row of ${spec.ref} named ${JSON.stringify(raw)}`);
+    if (root == null) throw new OperationInputError(`"within": no row of ${spec.ref} named ${JSON.stringify(raw)}`);
     const children = /* @__PURE__ */ new Map();
     for (const r of rows) {
       const p = linkName(fmGet(r.ordered, h.name));
       if (p) children.set(p, [...children.get(p) ?? [], basenameOf(r.file.path)]);
     }
-    const subtree = /* @__PURE__ */ new Set([root2]);
+    const subtree = /* @__PURE__ */ new Set([root]);
     for (const n of subtree) for (const c of children.get(n) ?? []) subtree.add(c);
     const { within: _w, ...rest } = cond;
     out ??= { ...where };
@@ -13066,7 +12624,7 @@ async function selectOn(app, settings, input, hist) {
   const tz = (await readDatabaseConfig(app, settings)).timezone;
   const now = /* @__PURE__ */ new Date();
   const get = rowGetter(app, t, settings, tz);
-  const hidden2 = /* @__PURE__ */ new Set([settings.templateProperty, settings.tableProperty]);
+  const hidden2 = /* @__PURE__ */ new Set([settings.tableProperty]);
   const specs = new Map(t.def.columns.map((c) => [c.name, c]));
   for (const c of [...input.columns ?? [], ...input.expand ?? []]) {
     if (!known.has(c)) throw new OperationInputError(`unknown column: "${c}"`);
@@ -13209,7 +12767,7 @@ async function checkImpl(app, settings, input) {
   );
   for (const r of rows) {
     const v = [
-      ...validateRow(t.def, r.ordered, { templateProperty: memberKey(settings, t) }, validationContextFor(app, settings, r.file.path)),
+      ...validateRow(t.def, r.ordered, { tableProperty: settings.tableProperty }, validationContextFor(app, settings, r.file.path)),
       ...unique.get(r.file.path) ?? [],
       ...constraintViolations(t, settings, r.file.path, r.ordered),
       ...generatedMismatches(t, settings, r)
@@ -13253,11 +12811,12 @@ function rowTemplate(t, values) {
 function planInsert(app, settings, t, input, env) {
   const known = knownKeys(t, settings);
   known.delete("path");
-  known.delete(memberKey(settings, t));
+  known.delete(settings.tableProperty);
   for (const k of Object.keys(input.values)) {
     if (!known.has(k)) throw new OperationInputError(`unknown column "${k}" for table "${t.def.name}"`);
   }
   const computed = computedColumnNames(t);
+  for (const c of t.def.columns) if (c.identity === "filename") computed.delete(c.name);
   for (const k of Object.keys(input.values)) {
     if (computed.has(k)) throw new OperationInputError(`"${k}" is a generated column: its value is computed`);
   }
@@ -13286,8 +12845,8 @@ function planInsert(app, settings, t, input, env) {
   const values = new Map(ordered);
   let path6 = input.path;
   if (path6 == null) {
-    if (t.def.layout.rowPath === void 0 || !t.def.options.filename) {
-      throw new OperationInputError(`table "${t.def.name}" has no _table path/filename; pass "path"`);
+    if (!t.def.options.filename) {
+      throw new OperationInputError(`table "${t.def.name}" has no filename pattern; pass "path"`);
     }
     const base = `${renderPathTemplate(t.def.layout.rowPath, values)}/${renderPathTemplate(t.def.options.filename, values)}`;
     path6 = `${base}.md`;
@@ -13300,7 +12859,7 @@ function planInsert(app, settings, t, input, env) {
   ordered = withIdentity(t, ordered, path6, false, { now, tz });
   ordered = withGenerated(t, settings, ordered, path6);
   const violations = [
-    ...validateRow(t.def, ordered, { templateProperty: memberKey(settings, t) }, validationContextFor(app, settings, path6)),
+    ...validateRow(t.def, ordered, { tableProperty: settings.tableProperty }, validationContextFor(app, settings, path6)),
     ...constraintViolations(t, settings, path6, ordered)
   ];
   return { path: path6, ordered, conflicts, violations };
@@ -13368,7 +12927,7 @@ async function mergeRowsImpl(app, settings, input, opts = {}) {
       let after = r.ordered;
       for (const [k, v] of normalized) {
         if (input.on.includes(k)) continue;
-        if (!known.has(k) || k === "path" || k === memberKey(settings, t)) throw new OperationInputError(`unknown column "${k}" for table "${t.def.name}"`);
+        if (!known.has(k) || k === "path" || k === settings.tableProperty) throw new OperationInputError(`unknown column "${k}" for table "${t.def.name}"`);
         if (computed.has(k)) throw new OperationInputError(`"${k}" is a generated column: its value is computed`);
         after = fmSet(after, k, v);
       }
@@ -13383,7 +12942,7 @@ async function mergeRowsImpl(app, settings, input, opts = {}) {
         return validateValue(spec, v, ctx);
       });
       violations.push({ path: r.file.path, violations: [...rowViolations, ...constraintViolations(t, settings, r.file.path, after)] });
-      cs.edits.push({ path: r.file.path, strict: false, before: r.ordered, after });
+      cs.edits.push({ path: r.file.path, before: r.ordered, after });
       continue;
     }
     if (input.whenNotMatched === "ignore") continue;
@@ -13395,7 +12954,7 @@ async function mergeRowsImpl(app, settings, input, opts = {}) {
   }
   if (t.def.columns.some((c) => c.unique)) {
     const afterByPath = new Map(cs.edits.map((e) => [e.path, e.after]));
-    const created = cs.creates.map((c) => ({ path: c.path, ordered: readOrderedFromMarkdownForChildNote(c.content, settings.migrationsProperty, /* @__PURE__ */ new Set([settings.templateProperty, settings.tableProperty])).ordered }));
+    const created = cs.creates.map((c) => ({ path: c.path, ordered: readOrderedFromMarkdown(c.content, /* @__PURE__ */ new Set([settings.tableProperty])).ordered }));
     const touched = /* @__PURE__ */ new Set([...afterByPath.keys(), ...created.map((c) => c.path)]);
     violations.push(
       ...uniqueViolations(t.def.columns, [
@@ -13482,7 +13041,7 @@ async function recomputeImpl(app, settings, input, opts = {}) {
           return isEmptyValue(v) ? [] : validateValue(c, v, ctx);
         })
       });
-      cs.edits.push({ path: r.file.path, strict: false, before: r.ordered, after });
+      cs.edits.push({ path: r.file.path, before: r.ordered, after });
     }
   }
   if (cs.edits.length === 0) return { ...emptyResult("recompute", opts.dryRun === true), ok: true };
@@ -13493,19 +13052,17 @@ async function updateRowsImpl(app, settings, input, opts = {}) {
   const t = await loadTable(app, settings, input.table);
   const known = knownKeys(t, settings);
   known.delete("path");
-  known.delete(memberKey(settings, t));
+  known.delete(settings.tableProperty);
   const set = input.set ?? {};
   const unset = input.unset ?? [];
   if (Object.keys(set).length === 0 && unset.length === 0 && input.body === void 0) {
     throw new OperationInputError(`nothing to update: pass "set", "unset" or "body"`);
   }
-  const reservedOnRows = new Set(rowReservedKeys(settings));
   for (const k of Object.keys(set)) {
     if (!known.has(k)) throw new OperationInputError(`unknown column "${k}" for table "${t.def.name}"`);
   }
   for (const k of unset) {
-    if (k === memberKey(settings, t) || k === "path") throw new OperationInputError(`cannot unset "${k}"`);
-    void reservedOnRows;
+    if (k === settings.tableProperty || k === "path") throw new OperationInputError(`cannot unset "${k}"`);
   }
   const computed = computedColumnNames(t);
   for (const k of [...Object.keys(set), ...unset]) {
@@ -13524,7 +13081,7 @@ async function updateRowsImpl(app, settings, input, opts = {}) {
   if (input.body !== void 0 && matched.length !== 1) {
     throw new OperationInputError(`"body" updates exactly one row; "where" matched ${matched.length}`);
   }
-  const nameTemplate = t.def.layout.rowPath !== void 0 && t.def.options.filename ? `${t.def.layout.rowPath}/${t.def.options.filename}` : null;
+  const nameTemplate = t.def.options.filename ? `${t.def.layout.rowPath}/${t.def.options.filename}` : null;
   const nameCols = new Set([...(nameTemplate ?? "").matchAll(/\{([A-Za-z][A-Za-z0-9_-]*)(?::[^}]+)?\}/g)].map((m) => m[1]));
   const renames = [...Object.keys(set), ...unset].some((k) => nameCols.has(k));
   const movedTo = /* @__PURE__ */ new Set();
@@ -13572,7 +13129,6 @@ async function updateRowsImpl(app, settings, input, opts = {}) {
     violations.push({ path: r.file.path, violations: rowViolations });
     cs.edits.push({
       path: r.file.path,
-      strict: false,
       before: r.ordered,
       after,
       ...input.body !== void 0 ? { bodyBefore: r.body, bodyAfter: input.body } : {}
@@ -13673,12 +13229,23 @@ async function deleteRowsImpl(app, settings, input, opts = {}) {
     sources.forEach((s) => referrers.add(s));
   }
   if (policy === "set_null") {
+    const model = cachedMetastore(app, settings);
     for (const src of [...referrers].sort()) {
       const f = app.vault.getAbstractFileByPath(src);
       if (!f || !("extension" in f) || f.extension !== "md") continue;
       const text2 = await app.vault.read(f);
-      const before = readOrderedFromMarkdownForChildNote(text2, settings.migrationsProperty, /* @__PURE__ */ new Set([settings.templateProperty])).ordered;
-      cs.edits.push({ path: src, strict: false, before, after: clearLinksTo(app, src, before, doomed) });
+      const before = readOrderedFromMarkdown(text2).ordered;
+      const after = clearLinksTo(app, src, before, doomed);
+      const owner = model ? rowTableFull(model, fmGet(after, settings.tableProperty)) : null;
+      const ot = owner ? await loadTable(app, settings, owner) : null;
+      if (ot && !src.startsWith(`${archiveFolder(ot.def)}/`)) {
+        for (const c of ot.def.columns) {
+          if (c.required && !isEmptyValue(fmGet(before, c.name)) && isEmptyValue(fmGet(after, c.name))) {
+            conflicts.push({ path: src, message: `"${c.name}" is required and would be left empty: change or delete this row first, or use on_referenced "ignore"` });
+          }
+        }
+      }
+      cs.edits.push({ path: src, before, after });
     }
   }
   const folder = archiveFolder(t.def);
@@ -13697,7 +13264,7 @@ async function deleteRowsImpl(app, settings, input, opts = {}) {
 }
 function checkRetarget(dst, settings, r) {
   const dstKnown = knownKeys(dst, settings);
-  const membership = /* @__PURE__ */ new Set([settings.templateProperty, settings.tableProperty]);
+  const membership = /* @__PURE__ */ new Set([settings.tableProperty]);
   const computed = computedColumnNames(dst);
   for (const [from, to] of Object.entries(r.rename)) {
     if (typeof to !== "string" || !dstKnown.has(to)) {
@@ -13717,7 +13284,7 @@ function checkRetarget(dst, settings, r) {
 }
 async function retargetRows(app, settings, dst, notes, r, cs, opts) {
   const dstKnown = knownKeys(dst, settings);
-  const membership = /* @__PURE__ */ new Set([settings.templateProperty, settings.tableProperty]);
+  const membership = /* @__PURE__ */ new Set([settings.tableProperty]);
   const tz = (await readDatabaseConfig(app, settings)).timezone;
   const violations = [];
   const conflicts = [];
@@ -13749,11 +13316,14 @@ async function retargetRows(app, settings, dst, notes, r, cs, opts) {
     after = withGenerated(dst, settings, after, n.path);
     let to = n.path;
     if (r.relocate) {
-      if (dst.def.layout.rowPath === void 0 || !dst.def.options.filename) {
+      if (!dst.def.options.filename) {
         throw new OperationInputError(`table "${dst.def.name}" has no filename pattern: cannot relocate rows`);
       }
       try {
         const values = new Map(after);
+        for (const c of dst.def.columns) {
+          if (c.identity === "filename" && isEmptyValue(values.get(c.name))) values.set(c.name, basenameOf(n.path));
+        }
         const base = `${renderPathTemplate(dst.def.layout.rowPath, values)}/${renderPathTemplate(dst.def.options.filename, values)}`;
         to = `${base}.md`;
         for (let k = 2; to !== n.path && (taken.has(to) || app.vault.getAbstractFileByPath(to) != null) && k <= MAX_NAME_SUFFIX; k++) {
@@ -13772,11 +13342,11 @@ async function retargetRows(app, settings, dst, notes, r, cs, opts) {
     violations.push({
       path: n.path,
       violations: [
-        ...validateRow(dst.def, after, { templateProperty: memberKey(settings, dst) }, validationContextFor(app, settings, n.path)),
+        ...validateRow(dst.def, after, { tableProperty: settings.tableProperty }, validationContextFor(app, settings, n.path)),
         ...constraintViolations(dst, settings, n.path, after)
       ]
     });
-    cs.edits.push({ path: n.path, strict: false, before: n.ordered, after });
+    cs.edits.push({ path: n.path, before: n.ordered, after });
     if (to !== n.path) cs.moves.push({ from: n.path, to });
   }
   if (dst.def.columns.some((c) => c.unique)) {
@@ -13826,10 +13396,9 @@ async function adoptRowsImpl(app, settings, input, opts = {}) {
   for (const p of paths) {
     const f = app.vault.getAbstractFileByPath(p);
     if (f == null || !("extension" in f)) throw new OperationInputError(`note not found: ${p}`);
-    const { ordered } = readOrderedFromMarkdownForChildNote(
+    const { ordered } = readOrderedFromMarkdown(
       await app.vault.read(f),
-      settings.migrationsProperty,
-      /* @__PURE__ */ new Set([settings.templateProperty, settings.tableProperty])
+      /* @__PURE__ */ new Set([settings.tableProperty])
     );
     const owner = model ? rowTableFull(model, fmGet(ordered, settings.tableProperty)) : null;
     if (owner) conflicts.push({ path: p, message: `already a row of ${owner}: use move_rows` });
@@ -13862,8 +13431,7 @@ async function relocateTable(app, settings, t, dest, changes, opts, properties =
     if (v === null) delete merged[k];
     else merged[k] = v;
   }
-  const tp = settings.templateProperty;
-  const membership = /* @__PURE__ */ new Set([tp, settings.tableProperty]);
+  const membership = /* @__PURE__ */ new Set([settings.tableProperty]);
   let options;
   let layout;
   let member;
@@ -13871,7 +13439,6 @@ async function relocateTable(app, settings, t, dest, changes, opts, properties =
   let cs;
   {
     const ref2 = dest.catalogRef;
-    delete merged.path;
     options = parseTableOptions([{ ...merged, name: ref2.table }]);
     layout = catalogLayout(databaseRoot(settings), ref2, options);
     member = (o) => withRowId([[settings.tableProperty, ref2.full], ...o.filter(([k]) => !membership.has(k))]);
@@ -13933,14 +13500,14 @@ async function relocateTable(app, settings, t, dest, changes, opts, properties =
       if (!list2.includes(oldName)) after = fmSet(after, "aliases", [...list2, oldName]);
     }
     if (JSON.stringify(after) !== JSON.stringify(r.ordered)) {
-      cs.edits.push({ path: r.path, strict: false, before: r.ordered, after });
+      cs.edits.push({ path: r.path, before: r.ordered, after });
     }
     if (to !== r.path) cs.moves.push({ from: r.path, to });
   };
   const excluded = (p) => (options.exclude ?? []).some((dir) => p.startsWith(`${dir.replace(/\/+$/, "")}/`));
   const rows = (await loadRows(app, settings, t)).filter((r) => !excluded(r.file.path));
   const bases = /* @__PURE__ */ new Map();
-  if (layout.rowPath !== void 0 && options.filename) {
+  if (options.filename) {
     for (const r of rows) {
       try {
         const values = new Map(r.ordered);
@@ -13965,14 +13532,14 @@ async function relocateTable(app, settings, t, dest, changes, opts, properties =
   }
   for (const r of rows) {
     const base = bases.get(r.file.path);
-    if (layout.rowPath !== void 0 && options.filename && base === void 0) continue;
+    if (options.filename && base === void 0) continue;
     const to = base === void 0 ? r.file.path : base.startsWith("\0") ? base.slice(1) : claim(base, r.file.path);
     relink({ path: r.file.path, ordered: r.ordered }, to);
   }
   const oldArchive = t.def.layout.archive;
   const newArchive = layout.archive;
   for (const f of archivedRowFiles(app, settings, t)) {
-    const { ordered } = readOrderedFromMarkdownForChildNote(await app.vault.read(f), settings.migrationsProperty, membership);
+    const { ordered } = readOrderedFromMarkdown(await app.vault.read(f), membership);
     const to = newArchive === oldArchive ? f.path : claim(`${newArchive}/${basenameOf(f.path)}`, f.path);
     relink({ path: f.path, ordered }, to);
   }
@@ -13981,25 +13548,15 @@ async function relocateTable(app, settings, t, dest, changes, opts, properties =
 async function alterTableImpl(app, settings, input, opts = {}) {
   const t = await loadTable(app, settings, input.table);
   const cfg = await readDatabaseConfig(app, settings);
-  const schema = assertIdentifier("schema", input.schema ?? (t.def.layout.inDatabase ? t.def.schema : cfg.default_schema));
+  const schema = assertIdentifier("schema", input.schema ?? t.def.schema);
   const name = assertIdentifier("table", input.name ?? t.def.name);
-  const catalog = assertIdentifier("catalog", input.catalog ?? t.def.catalog ?? cfg.default_catalog);
+  const catalog = assertIdentifier("catalog", input.catalog ?? t.def.catalog);
+  const changes = { name: null };
+  if (input.partition !== void 0) changes.partition = input.partition ? input.partition : null;
   const cur = t.def.options;
-  const changes = { path: null, name: null };
-  let partition = input.partition ?? cur.partition;
-  if (input.partition === void 0 && cur.path) {
-    const own = t.def.layout.folder;
-    if (cur.path === own) partition = "";
-    else if (cur.path.startsWith(`${own}/`)) partition = cur.path.slice(own.length + 1);
-    else {
-      const brace = cur.path.indexOf("{");
-      partition = brace < 0 ? "" : cur.path.slice(cur.path.lastIndexOf("/", brace) + 1);
-    }
-  }
-  changes.partition = partition ? partition : null;
   if (!cur.archive || cur.archive.includes("/")) {
     const own = t.def.layout.archive;
-    changes.archive = t.def.layout.inDatabase && own.startsWith(`${t.def.layout.folder}/`) && !own.slice(t.def.layout.folder.length + 1).includes("/") ? own.slice(t.def.layout.folder.length + 1) : cfg.archive_folder;
+    changes.archive = own.startsWith(`${t.def.layout.folder}/`) && !own.slice(t.def.layout.folder.length + 1).includes("/") ? own.slice(t.def.layout.folder.length + 1) : cfg.archive_folder;
   }
   if (input.filename !== void 0) changes.filename = input.filename;
   if (input.description !== void 0) changes.description = input.description;
@@ -14040,7 +13597,7 @@ async function syncRelations(app, settings, changes, opts = {}) {
   if (plan.edits.size === 0) return null;
   const cs = emptyChangeSet("sync_relations", `mirror links of ${changes.map((c) => c.path).join(", ")}`.slice(0, 200));
   cs.skipInverse = true;
-  for (const [path6, w] of plan.edits) cs.edits.push({ path: path6, strict: false, before: w.before, after: w.after });
+  for (const [path6, w] of plan.edits) cs.edits.push({ path: path6, before: w.before, after: w.after });
   return finish(app, settings, cs, plan.conflicts, [], opts);
 }
 async function alignRelationsImpl(app, settings, input, opts = {}) {
@@ -14058,7 +13615,7 @@ async function alignRelationsImpl(app, settings, input, opts = {}) {
   const plan = await planInverse(app, settings, t.catalog.model, changes, { keepSingles: true });
   const cs = emptyChangeSet("align_relations", `align inverse links of ${t.catalog.ref.full}`, t.def.schemaPath);
   cs.skipInverse = true;
-  for (const [path6, w] of plan.edits) cs.edits.push({ path: path6, strict: false, before: w.before, after: w.after });
+  for (const [path6, w] of plan.edits) cs.edits.push({ path: path6, before: w.before, after: w.after });
   return finish(app, settings, cs, plan.conflicts, [], opts);
 }
 function alignRelations(app, settings, input, opts = {}) {
@@ -14094,7 +13651,7 @@ async function adoptCreatedNote(app, settings, file) {
   const target = await adoptTargetFor(app, settings, file.path);
   if (!target) return { adopted: false };
   const text2 = await app.vault.read(file);
-  const { ordered, body } = readOrderedFromMarkdownForChildNote(text2, settings.migrationsProperty, /* @__PURE__ */ new Set([settings.tableProperty]));
+  const { ordered, body } = readOrderedFromMarkdown(text2, /* @__PURE__ */ new Set([settings.tableProperty]));
   const declared = ordered.find(([k]) => k === settings.tableProperty)?.[1];
   if (declared !== void 0) {
     if (declared !== target.table && !target.table.endsWith(`.${String(declared)}`)) return { adopted: false };
@@ -14110,6 +13667,10 @@ async function adoptCreatedNote(app, settings, file) {
   const present = new Set(ordered.map(([k]) => k));
   const values = Object.fromEntries(Object.entries(target.values).filter(([k]) => !present.has(k)));
   for (const c of (await loadTable(app, settings, target.table)).def.columns) {
+    if (c.generated !== void 0 || c.identity !== void 0) {
+      delete values[c.name];
+      continue;
+    }
     if (c.external_default !== void 0 && !present.has(c.name) && values[c.name] === void 0) values[c.name] = c.external_default;
   }
   const r = await adoptRows(app, settings, { table: target.table, paths: [file.path], perRow: { [file.path]: values }, relocate: false });
@@ -14534,7 +14095,7 @@ function frontmatter(app, f) {
 }
 async function inferTable(app, settings, input) {
   const maxEnum = input.maxEnumValues ?? 12;
-  const skip = /* @__PURE__ */ new Set([...rowReservedKeys(settings), settings.tableProperty, settings.templateProperty, settings.migrationsProperty, "id", ...SKIP_KEYS]);
+  const skip = /* @__PURE__ */ new Set([settings.tableProperty, "id", ...SKIP_KEYS]);
   const notes = [];
   if (input.table !== void 0) {
     const t = await loadTable(app, settings, input.table);
@@ -15429,139 +14990,6 @@ var OtlpSink = class {
   }
 };
 
-// src/core/view-block.ts
-var import_yaml3 = __toESM(require_dist(), 1);
-var BLOCK_KEYS = /* @__PURE__ */ new Set(["view", "table", "columns", "where", "order_by", "limit", "join", "group_by", "aggregates", "expand", "labels", "row_link", "chart", "with_table"]);
-function parseChart(raw) {
-  if (raw == null || typeof raw !== "object" || Array.isArray(raw)) throw new OperationInputError(`datanotes block: "chart" must be a mapping (type, x, y)`);
-  const c = raw;
-  for (const k of Object.keys(c)) {
-    if (!["type", "x", "y", "targets", "title"].includes(k)) throw new OperationInputError(`datanotes block: unknown chart key "${k}" (allowed: type, x, y, targets, title)`);
-  }
-  const type = c.type ?? "line";
-  if (type !== "line" && type !== "bar") throw new OperationInputError(`datanotes block: chart type must be line or bar`);
-  if (typeof c.x !== "string" || !c.x.trim()) throw new OperationInputError(`datanotes block: chart needs "x" (the column along the axis)`);
-  const y = typeof c.y === "string" ? [c.y] : Array.isArray(c.y) ? c.y.map(String) : [];
-  if (!y.length) throw new OperationInputError(`datanotes block: chart needs "y" (a column or a list of columns)`);
-  const targets = {};
-  if (c.targets != null) {
-    if (typeof c.targets !== "object" || Array.isArray(c.targets)) throw new OperationInputError(`datanotes block: chart "targets" must be a mapping label \u2192 number`);
-    for (const [k, v] of Object.entries(c.targets)) {
-      const n = Number(v);
-      if (!Number.isFinite(n)) throw new OperationInputError(`datanotes block: chart target "${k}" must be a number`);
-      targets[k] = n;
-    }
-  }
-  return { type, x: c.x.trim(), y, targets, ...typeof c.title === "string" ? { title: c.title } : {} };
-}
-function parseViewBlock(source) {
-  let raw;
-  try {
-    raw = (0, import_yaml3.parse)(source);
-  } catch (e) {
-    throw new OperationInputError(`datanotes block: invalid YAML (${e instanceof Error ? e.message : String(e)})`);
-  }
-  if (raw == null || typeof raw !== "object" || Array.isArray(raw)) {
-    throw new OperationInputError(`datanotes block: write "view: <catalog.schema.view>" or a query ("table: \u2026")`);
-  }
-  const b = raw;
-  for (const k of Object.keys(b)) {
-    if (!BLOCK_KEYS.has(k)) throw new OperationInputError(`datanotes block: unknown key "${k}" (allowed: ${[...BLOCK_KEYS].join(", ")})`);
-  }
-  if (b.view !== void 0 && b.table !== void 0) throw new OperationInputError(`datanotes block: pass "view" or "table", not both`);
-  const target = b.view ?? b.table;
-  if (typeof target !== "string" || target.trim() === "") throw new OperationInputError(`datanotes block needs "view" or "table"`);
-  const { view: _v, labels, row_link, chart, with_table, ...query } = b;
-  const labelMap = {};
-  if (labels != null) {
-    if (typeof labels !== "object" || Array.isArray(labels)) throw new OperationInputError(`datanotes block: "labels" must be a mapping`);
-    for (const [k, v] of Object.entries(labels)) labelMap[k] = String(v);
-  }
-  const select2 = viewQueryToSelect({ ...query, table: target.trim() });
-  return {
-    select: select2,
-    labels: labelMap,
-    rowLink: row_link !== false,
-    ...select2.columns ? { columns: select2.columns } : {},
-    ...chart !== void 0 ? { chart: parseChart(chart) } : {},
-    withTable: with_table === true
-  };
-}
-function chartValue(v) {
-  if (v === null || v === void 0 || v === "") return "null";
-  const n = Number(v);
-  return Number.isFinite(n) ? String(Math.round(n * 100) / 100) : "null";
-}
-function chartLabel(v) {
-  const text2 = cell(v);
-  const d = text2.match(/^(\d{4})-(\d{2})-(\d{2})(?: (\d{2}:\d{2}))?$/);
-  const shown = d ? `${d[3]}/${d[2]}${d[4] ? ` ${d[4]}` : ""}` : text2.replace(/\[\[(?:[^|\]]*\|)?([^\]]*)\]\]/g, "$1");
-  return JSON.stringify(shown);
-}
-function chartMarkdown(result, chart, labels) {
-  if (result.rows.length === 0) return "_No data to chart._";
-  const missing = [chart.x, ...chart.y].filter((c) => !(c in result.rows[0]));
-  if (missing.length) return `> [!warning] datanotes
-> chart: no column ${missing.map((m) => `"${m}"`).join(", ")} in the rows (columns: ${Object.keys(result.rows[0]).filter((k) => k !== "path").join(", ")})`;
-  const lines = ["```chart", `type: ${chart.type}`, `labels: [${result.rows.map((r) => chartLabel(r[chart.x])).join(", ")}]`, "series:"];
-  for (const col of chart.y) {
-    lines.push(`  - title: ${JSON.stringify(labels[col] ?? col)}`, `    data: [${result.rows.map((r) => chartValue(r[col])).join(", ")}]`);
-  }
-  for (const [label, value] of Object.entries(chart.targets)) {
-    lines.push(`  - title: ${JSON.stringify(label)}`, `    data: [${result.rows.map(() => String(value)).join(", ")}]`);
-  }
-  lines.push("tension: 0.3", "width: 100%", "fill: false", "beginAtZero: false", "spanGaps: true", "```");
-  if (chart.title) lines.unshift(`**${chart.title}**`, "");
-  return lines.join("\n");
-}
-function cell(v) {
-  if (v === null || v === void 0) return "";
-  if (Array.isArray(v)) return v.map(cell).filter((x) => x !== "").join(", ");
-  if (typeof v === "boolean") return v ? "\u2713" : "";
-  if (typeof v === "object") return JSON.stringify(v).replace(/\|/g, "\\|");
-  const text2 = String(v);
-  const dt = text2.match(/^(\d{4}-\d{2}-\d{2})T(\d{2}:\d{2}):\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$/);
-  if (dt) return `${dt[1]} ${dt[2]}`;
-  return text2.replace(/\r?\n/g, " ").replace(/\|/g, "\\|");
-}
-function viewMarkdown(result, opts) {
-  if (result.rows.length === 0) return "_No rows._";
-  const grouped = !("path" in result.rows[0]);
-  let columns = opts.columns ?? Object.keys(result.rows[0]).filter((k) => k !== "path");
-  if (grouped) columns = Object.keys(result.rows[0]);
-  const link = !grouped && opts.rowLink && !columns.includes("file_link");
-  const heads = [...link ? [opts.labels.file_link ?? "Note"] : [], ...columns.map((c) => opts.labels[c] ?? c)];
-  const lines = [`| ${heads.map(cell).join(" | ")} |`, `| ${heads.map(() => "---").join(" | ")} |`];
-  for (const r of result.rows) {
-    const path6 = typeof r.path === "string" ? r.path : "";
-    const name = path6.split("/").pop().replace(/\.md$/i, "");
-    const cells = [...link ? [cell(`[[${path6.replace(/\.md$/i, "")}|${name}]]`)] : [], ...columns.map((c) => cell(r[c]))];
-    lines.push(`| ${cells.join(" | ")} |`);
-  }
-  const shown = result.rows.length;
-  lines.push("", `<small>${result.total === shown ? `${shown} ${shown === 1 ? "row" : "rows"}` : `${shown} of ${result.total} rows`}${result.view ? ` \xB7 view ${result.view}` : ""}</small>`);
-  return lines.join("\n");
-}
-async function renderViewBlock(app, settings, source, host) {
-  try {
-    const block = parseViewBlock(source);
-    const result = await select(app, settings, { ...block.select, ...host ? { host } : {} });
-    let labels = block.labels;
-    if (result.view) {
-      const ms = await loadMetastore(app, settings);
-      const ref2 = ms ? resolveCatalogRef(ms.model, result.view, "view") : null;
-      const own = ref2 ? ms.model.catalogs[ref2.catalog].schemas[ref2.schema].views[ref2.table].labels : void 0;
-      labels = { ...own ?? {}, ...block.labels };
-    }
-    const table = () => viewMarkdown(result, { labels, rowLink: block.rowLink, ...block.select.columns ? { columns: block.select.columns } : {} });
-    const markdown = block.chart ? [chartMarkdown(result, block.chart, labels), ...block.withTable ? ["", table()] : []].join("\n") : table();
-    return { markdown, total: result.total, ...result.view ? { view: result.view } : {} };
-  } catch (e) {
-    return { markdown: `> [!warning] datanotes
-> ${(e instanceof Error ? e.message : String(e)).replace(/\n/g, "\n> ")}`, total: 0 };
-  }
-}
-
 // src/server/rest.ts
 var ROUTE_PREFIX = "/datanotes";
 var BadRequest = class extends Error {
@@ -15630,9 +15058,8 @@ function errorResponse(e) {
     return { status: 404, json: { error: message } };
   }
   if (e instanceof Forbidden) return { status: 403, json: { error: message } };
-  if (e instanceof AmbiguousTableError) return { status: 409, json: { error: message, paths: e.paths } };
   if (e instanceof AmbiguousCatalogRefError) return { status: 409, json: { error: message, tables: e.candidates } };
-  if (e instanceof BadRequest || e instanceof OperationInputError || e instanceof MalformedColumnError || e instanceof MalformedTableOptionsError || e instanceof UnsupportedNestedMappingError || e instanceof QueryInputError || e instanceof DatabaseConfigError || e instanceof EmbeddingError || e instanceof MetastoreError) {
+  if (e instanceof BadRequest || e instanceof OperationInputError || e instanceof MalformedColumnError || e instanceof MalformedTableOptionsError || e instanceof QueryInputError || e instanceof DatabaseConfigError || e instanceof EmbeddingError || e instanceof MetastoreError) {
     return { status: 400, json: { error: message } };
   }
   return { status: 500, json: { error: message } };
@@ -15816,16 +15243,6 @@ function createHandlers(app, getSettings, saveSettings = async () => {
     },
     "/tables/describe/": async (body) => ({ status: 200, json: await describeTable(app, s(), str(body, "table")) }),
     "/ddl/": ddl,
-    // The engine's API itself, method by method (camelCase inputs as in public-api.ts), for the
-    // owner: `remote-api.ts` is its client.
-    "/api/": async (body) => {
-      const method = str(body, "method");
-      const args = list(body, "args") ?? [];
-      const fn = pub[method];
-      if (typeof fn !== "function" || API_EXCLUDED.has(method)) throw new BadRequest(`"method" must be a method of the engine API`);
-      const result = await fn.apply(pub, args);
-      return { status: 200, json: { result: result === void 0 ? null : result } };
-    },
     "/batch/": async (body) => {
       const ops = list(body, "operations");
       if (!ops || ops.length === 0) throw new BadRequest(`"operations" must be a non-empty list`);
@@ -15907,22 +15324,6 @@ function createHandlers(app, getSettings, saveSettings = async () => {
         throw new BadRequest(e instanceof Error ? e.message : String(e));
       }
     },
-    "/views/render/": async (body) => {
-      const blockText = str(body, "block", false);
-      const view = str(body, "view", false);
-      if (!blockText && !view) throw new BadRequest(`pass "view" (a view name) or "block" (the text of an datanotes block)`);
-      const where = obj(body, "where", false);
-      const source = blockText ?? `view: ${view}${where ? `
-where: ${JSON.stringify(where)}` : ""}`;
-      const notePath = str(body, "note", false);
-      let host;
-      if (notePath) {
-        const f = app.vault.getAbstractFileByPath(notePath);
-        if (!f || !("extension" in f)) throw new BadRequest(`note not found: ${notePath}`);
-        host = { path: notePath, frontmatter: app.metadataCache.getFileCache(f)?.frontmatter ?? {} };
-      }
-      return { status: 200, json: await renderViewBlock(app, s(), source, host) };
-    },
     "/webhooks/": async () => {
       try {
         return { status: 200, json: { webhooks: pub.listWebhooks() } };
@@ -16233,7 +15634,6 @@ where: ${JSON.stringify(where)}` : ""}`;
   };
   return handlers;
 }
-var API_EXCLUDED = /* @__PURE__ */ new Set(["withActor"]);
 function batchArgs(op, args) {
   const out = { ...args };
   const move = (from, to) => {
@@ -16597,7 +15997,7 @@ var OPERATIONS = [
               },
               "path": {
                 "type": "string",
-                "description": "database.yaml#catalog.schema.table (or a legacy schema note)."
+                "description": "database.yaml#catalog.schema.table."
               },
               "description": {
                 "type": "string",
@@ -16612,6 +16012,7 @@ var OPERATIONS = [
             },
             "required": [
               "name",
+              "catalog",
               "schema",
               "qualified",
               "path"
@@ -16709,7 +16110,8 @@ var OPERATIONS = [
               "description": "Folder of the table's rows."
             },
             "inDatabase": {
-              "type": "boolean"
+              "type": "boolean",
+              "description": "Always true."
             },
             "rowPath": {
               "type": "string",
@@ -16723,6 +16125,7 @@ var OPERATIONS = [
           "required": [
             "folder",
             "inDatabase",
+            "rowPath",
             "archive"
           ],
           "additionalProperties": true
@@ -16809,7 +16212,7 @@ var OPERATIONS = [
               },
               "dense": {
                 "type": "boolean",
-                "description": "Also a top-level schema field."
+                "description": "Written on every row (with its default)."
               }
             },
             "required": [
@@ -16828,7 +16231,7 @@ var OPERATIONS = [
           "items": {
             "type": "string"
           },
-          "description": "Top-level schema fields without a column entry."
+          "description": "Table defaults without a column (written on every new row), and the table property."
         },
         "qualified": {
           "type": "string",
@@ -23969,7 +23372,7 @@ var OPERATIONS = [
   },
   {
     "name": "infer_table",
-    "description": "Read-only schema inference from notes' frontmatter.\n- `folder` (recursive; \"\" = whole vault) and/or `paths`: notes not yet in a table. Returns\n  `columns` (type, enum `values`, link `ref` to the table most targets belong to, `required`,\n  `unique`, `dense`, `from` when the property name is not a valid column name, `stats`),\n  `proposal` ready for create_table (`name`, `options.filename` or `timeColumn`, `columns`) and\n  `adopt` ready for adopt_rows (`paths`, `rename`, `relocate: false`), plus `notes` to read.\n  Review the proposal (names, enums, required) before creating; ask the user when unsure.\n- `table`: keys the table's rows use but the table does not declare (candidates for add_column,\n  or keys to drop from rows).\nA string column becomes an enum with at most `max_enum_values` distinct values (default 12).",
+    "description": "Read-only schema inference from notes' frontmatter.\n- `folder` (recursive; \"\" = whole vault) and/or `paths`: notes not yet in a table. Returns\n  `columns` (type, enum `values`, link `ref` to the table most targets belong to, `required`,\n  `unique`, `dense`, `from` when the property name is not a valid column name, `stats`),\n  `proposal` ready for create_table (`name`, `options.filename` or `timeColumn`, `columns`) and\n  `adopt` ready for adopt_rows (`paths`, `rename`, `relocate: false`), plus `notes` to read.\n  Review the proposal (names, enums, required) before creating; ask the user when unsure.\n- `table`: keys the table's rows use but the table does not declare (candidates for add_column,\n  or keys to drop from rows).\nA string column becomes an enum when its values repeat: at least 3 notes, at most `max_enum_values`\ndistinct values (default 12), each used twice on average, short texts.",
     "inputSchema": {
       "additionalProperties": false,
       "properties": {
@@ -26768,7 +26171,7 @@ var OPERATIONS = [
   },
   {
     "name": "create_view",
-    "description": "Create (or `replace`) a view: a named select stored in database.yaml. Name it with the prefix\n`vw_` (e.g. `vw_open_tasks`): views share names and folders with tables. `query` takes the\nselect_rows parameters (table, columns, where, order_by, limit, join, group_by, aggregates, expand;\nrelative dates keep it current) and must run now. `comment` and `aliases` let agents find it;\n`labels` are column headings. Read it with select_rows(table=<view>). A note shows it with a\n```datanotes block containing `view: <name>` (drawn live by the client; nothing is written into\nthe note). Filters may read the note that shows the view: `{this.date}`, `{this.date+1d}` (a\nfrontmatter value, date arithmetic), `{this.link}` (a link to that note), `{this.name}`. The view\nalso gets a note in its schema folder.",
+    "description": "Create (or `replace`) a view: a named select stored in database.yaml. Name it with the prefix\n`vw_` (e.g. `vw_open_tasks`): views share names and folders with tables. `query` takes the\nselect_rows parameters (table, columns, where, order_by, limit, join, group_by, aggregates, expand;\nrelative dates keep it current) and must run now. `comment` and `aliases` let agents find it;\n`labels` are column headings. Views are selected with select_rows(table=<view>), which may narrow them further\n(where, columns, order_by, limit). A view writes no note: it lives only in database.yaml.",
     "inputSchema": {
       "additionalProperties": false,
       "properties": {
@@ -28623,7 +28026,6 @@ var READ_ROUTES = /* @__PURE__ */ new Set([
   "/tables/infer/",
   "/select/",
   "/check/",
-  "/views/render/",
   "/changes/",
   "/search/semantic/",
   "/search/semantic/status/",
@@ -28902,22 +28304,6 @@ function openApiDocument(version) {
       body: { type: "object", properties: { rebuild: { type: "boolean", default: false } } },
       result: resultOf("semantic_index") ?? { type: "object" }
     },
-    {
-      route: "/views/render/",
-      operationId: "render_view",
-      summary: "Render a view, or the text of a ```datanotes block, as Markdown (what a note shows).",
-      body: {
-        type: "object",
-        properties: {
-          view: { type: "string", description: "A view's name." },
-          block: { type: "string", description: "The text of a ```datanotes block (instead of `view`)." },
-          where: { type: "object", description: "Extra filter (with `view`)." },
-          note: { type: "string", description: "The note the block is in: its frontmatter fills `{this.*}`." }
-        }
-      },
-      result: { type: "object", additionalProperties: true },
-      namesTable: true
-    },
     {
       route: "/sessions/identify/",
       operationId: "identify_session",
@@ -28939,17 +28325,6 @@ function openApiDocument(version) {
       result: ok,
       writes: true
     },
-    {
-      route: "/api/",
-      operationId: "engine_api",
-      summary: "Call the engine's API method by method (owner only): what the remote engine client uses.",
-      description: "`method` is a method of the engine's public API (camelCase, as in `src/core/public-api.ts`), `args` its positional arguments. Answers `{result}`.",
-      body: { type: "object", required: ["method"], properties: { method: { type: "string" }, args: { type: "array", items: {} } } },
-      bodyRequired: true,
-      result: { type: "object", properties: { result: {} } },
-      namesTable: true,
-      writes: true
-    },
     {
       route: "/openapi/",
       operationId: "openapi_post",
@@ -30360,7 +29735,7 @@ var AppRegistry = class {
       return null;
     }
     const keys = ROW_ROUTES[route];
-    if (!keys) return a.maintain && !OWNER_ADMIN_ROUTES.has(route) && route !== "/api/" ? null : `app ${a.name} may not call ${route} (reserved to the owner)`;
+    if (!keys) return a.maintain && !OWNER_ADMIN_ROUTES.has(route) ? null : `app ${a.name} may not call ${route} (reserved to the owner)`;
     const model = (await loadMetastore(this.deps.app, this.deps.getSettings()).catch(() => null))?.model ?? null;
     for (const k of keys) {
       const ref2 = b[k];
@@ -30692,22 +30067,13 @@ var EngineRuntime = class {
     return this.httpServer !== null;
   }
   /**
-   * Housekeeping of the hidden store: journal notes of the old format are imported (and removed
-   * from the vault), journal entries and log files past their retention are dropped.
+   * Housekeeping of the hidden store: journal entries and log files past their retention are
+   * dropped.
    */
   async maintainStore() {
     const app = this.o.app;
     const s = this.o.getSettings();
     try {
-      const imported = await importLegacyJournal(app, s);
-      if (imported.imported > 0 || imported.errors.length > 0) {
-        telemetry().log(imported.errors.length > 0 ? "WARN" : "INFO", "datanotes imported journal notes into the store", {
-          imported: imported.imported,
-          skipped: imported.skipped,
-          removed: imported.removed,
-          errors: imported.errors.length
-        });
-      }
       const compacted = await compactJournal(app, s);
       const logs = await pruneLogs(app, s);
       if (compacted.dropped > 0 || compacted.blobsRemoved > 0 || logs.length > 0) {
@@ -30726,7 +30092,7 @@ var EngineRuntime = class {
     const refreshMetastore = () => loadMetastore(app, s()).then((ms) => {
       this.inverse.init();
       return ms;
-    }).then((ms) => syncViewNotes(app, s(), ms?.model ?? null)).catch((e) => telemetry().log("WARN", "datanotes could not read database.yaml", { error: errorText(e) }));
+    }).catch((e) => telemetry().log("WARN", "datanotes could not read database.yaml", { error: errorText(e) }));
     const logSoon = () => {
       if (this.logTimer) clearTimeout(this.logTimer);
       this.logTimer = setTimeout(() => {
@@ -30734,7 +30100,7 @@ var EngineRuntime = class {
         void logExternalEdits(app, s());
       }, EXTERNAL_EDIT_DELAY_MS);
     };
-    const watched = (path6) => path6 === metastorePath(s()) || path6.endsWith(".md") && !path6.startsWith(`${s().journalFolder}/`);
+    const watched = (path6) => path6 === metastorePath(s()) || path6.endsWith(".md");
     const v = app.vault;
     const mc = app.metadataCache;
     this.listen(v, "modify", (f) => {
@@ -31211,8 +30577,8 @@ var DEFAULT_VAULT_CONFIG = {
   trashOption: "system",
   userIgnoreFilters: []
 };
-function readVaultConfig(root2) {
-  const file = import_node_path2.default.join(root2, ".obsidian", "app.json");
+function readVaultConfig(root) {
+  const file = import_node_path2.default.join(root, ".obsidian", "app.json");
   let raw = {};
   try {
     raw = JSON.parse(import_node_fs2.default.readFileSync(file, "utf8"));
@@ -31230,7 +30596,6 @@ function readVaultConfig(root2) {
 }
 
 // src/node/node-app.ts
-var KEEP_ALL = "\0";
 var NodeFile = class {
   constructor(path6, stat) {
     this.path = path6;
@@ -31283,19 +30648,19 @@ async function atomicWrite(abs, data) {
     }
   }
 }
-function resolveInVault(root2, rel) {
+function resolveInVault(root, rel) {
   const parts = String(rel).split("/").filter((s) => s !== "" && s !== ".");
   for (const s of parts) {
     if (s === ".." || s.includes("\\") || s.includes("\0") || /^[A-Za-z]:/.test(s)) throw new Error(`path outside the vault refused: ${rel}`);
   }
-  const base = import_node_path3.default.resolve(root2);
+  const base = import_node_path3.default.resolve(root);
   const abs = import_node_path3.default.resolve(base, ...parts);
   if (abs !== base && !abs.startsWith(base + import_node_path3.default.sep)) throw new Error(`path outside the vault refused: ${rel}`);
   return abs;
 }
 var NodeAdapter = class {
-  constructor(root2) {
-    this.root = root2;
+  constructor(root) {
+    this.root = root;
   }
   abs(p) {
     return resolveInVault(this.root, p);
@@ -31341,6 +30706,16 @@ var NodeVault = class {
     this.files = /* @__PURE__ */ new Map();
     this.folders = /* @__PURE__ */ new Map();
     this.root = new NodeFolder("");
+    /**
+     * Bring one path of the index in line with the disk (for the watcher). Emits create / modify /
+     * delete when something changed; returns what happened.
+     */
+    /**
+     * Paths the vault is writing right now (and the folders above them). Between the change on disk
+     * and the index update there is an `await`: a rescan landing there must not take the vault's own
+     * write for a change made outside (a moved file would be dropped as deleted and added again).
+     */
+    this.busy = /* @__PURE__ */ new Map();
     this.adapter = new NodeAdapter(basePath);
     this.events.setMaxListeners(0);
     this.folders.set("", this.root);
@@ -31426,12 +30801,25 @@ var NodeVault = class {
   async refreshStat(f) {
     f.stat = statsOf(await import_promises.default.stat(this.abs(f.path)));
   }
-  /**
-   * Bring one path of the index in line with the disk (for the watcher). Emits create / modify /
-   * delete when something changed; returns what happened.
-   */
+  async guarded(paths, fn) {
+    for (const p of paths) this.busy.set(p, (this.busy.get(p) ?? 0) + 1);
+    try {
+      return await fn();
+    } finally {
+      for (const p of paths) {
+        const n = (this.busy.get(p) ?? 1) - 1;
+        if (n <= 0) this.busy.delete(p);
+        else this.busy.set(p, n);
+      }
+    }
+  }
+  isBusy(rel) {
+    for (const p of this.busy.keys()) if (rel === p || rel.startsWith(`${p}/`) || p.startsWith(`${rel}/`)) return true;
+    return false;
+  }
   syncPath(rel) {
     if (rel === "" || hidden(rel)) return null;
+    if (this.isBusy(rel)) return null;
     let st = null;
     try {
       st = import_node_fs3.default.statSync(this.abs(rel));
@@ -31523,8 +30911,10 @@ var NodeVault = class {
   }
   /** Write a file's text (internal: also used by the file manager). */
   async writeText(file, data) {
-    await atomicWrite(this.abs(file.path), data);
-    await this.refreshStat(file);
+    await this.guarded([file.path], async () => {
+      await atomicWrite(this.abs(file.path), data);
+      await this.refreshStat(file);
+    });
     this.emit("modify", file);
   }
   async process(file, fn) {
@@ -31537,9 +30927,11 @@ var NodeVault = class {
   async create(p, data) {
     const rel = p.replace(/^\/+/, "");
     if (import_node_fs3.default.existsSync(this.abs(rel))) throw new Error(`File already exists: ${rel}`);
-    await this.ensureFolder(dirname(rel));
-    await atomicWrite(this.abs(rel), data);
-    const f = this.addFile(rel, statsOf(await import_promises.default.stat(this.abs(rel))));
+    const f = await this.guarded([rel], async () => {
+      await this.ensureFolder(dirname(rel));
+      await atomicWrite(this.abs(rel), data);
+      return this.addFile(rel, statsOf(await import_promises.default.stat(this.abs(rel))));
+    });
     this.emit("create", f);
     return f;
   }
@@ -31556,6 +30948,9 @@ var NodeVault = class {
     return this.folders.get(rel);
   }
   async delete(file, force) {
+    return this.guarded([file.path], () => this.deleteNow(file, force));
+  }
+  async deleteNow(file, force) {
     const rel = file.path;
     if (this.folders.has(rel)) {
       const gone = [...this.files.values()].filter((f2) => f2.path.startsWith(`${rel}/`));
@@ -31570,8 +30965,11 @@ var NodeVault = class {
     if (f) this.emit("delete", f);
   }
   /** Move to `.trash/` (Obsidian's local trash; also for "system", which Node cannot reach) or delete. */
-  async trash(file, _system) {
+  async trash(file, system) {
     if (this.config.trashOption === "none") return this.delete(file, true);
+    return this.guarded([file.path], () => this.trashNow(file, system));
+  }
+  async trashNow(file, _system) {
     const target = await this.freeName(`.trash/${basename2(file.path)}`);
     const isFolder = this.folders.has(file.path);
     const gone = isFolder ? [...this.files.values()].filter((f) => f.path.startsWith(`${file.path}/`)) : [];
@@ -31603,6 +31001,9 @@ var NodeVault = class {
     const from = item.path;
     const to = newPath.replace(/^\/+|\/+$/g, "");
     if (from === to) return /* @__PURE__ */ new Map();
+    return this.guarded([from, to], () => this.moveNow(item, from, to));
+  }
+  async moveNow(item, from, to) {
     if (import_node_fs3.default.existsSync(this.abs(to)) && from.toLowerCase() !== to.toLowerCase()) throw new Error(`Destination exists: ${to}`);
     await this.ensureFolder(dirname(to));
     await import_promises.default.rename(this.abs(from), this.abs(to));
@@ -31686,7 +31087,7 @@ var NodeMetadataCache = class {
     let frontmatter2;
     let body = text2;
     try {
-      const r = readOrderedFromMarkdownForChildNote(text2, KEEP_ALL, /* @__PURE__ */ new Set());
+      const r = readOrderedFromMarkdown(text2);
       body = r.body;
       if (r.ordered.length > 0) frontmatter2 = Object.fromEntries(r.ordered);
     } catch {
@@ -31835,7 +31236,7 @@ var NodeFileManager = class {
     const f = this.vault.getAbstractFileByPath(file.path);
     if (!f) throw new Error(`file not found: ${file.path}`);
     const text2 = await this.vault.read(f);
-    const { ordered, body } = readOrderedFromMarkdownForChildNote(text2, KEEP_ALL, /* @__PURE__ */ new Set());
+    const { ordered, body } = readOrderedFromMarkdown(text2);
     const fm = Object.fromEntries(ordered);
     const before = JSON.stringify(fm);
     fn(fm);
@@ -31847,8 +31248,8 @@ var NodeFileManager = class {
     return this.vault.trash(file, true);
   }
 };
-function openNodeVault(root2, config) {
-  const vault = new NodeVault(import_node_path3.default.resolve(root2), { ...readVaultConfig(root2), ...config ?? {} });
+function openNodeVault(root, config) {
+  const vault = new NodeVault(import_node_path3.default.resolve(root), { ...readVaultConfig(root), ...config ?? {} });
   vault.scanSync();
   const metadataCache = new NodeMetadataCache(vault);
   metadataCache.indexAll();
@@ -31923,7 +31324,7 @@ var NodeWatcher = class {
 };
 
 // src/node/service.ts
-var VERSION = true ? "1.5.0" : "dev";
+var VERSION = true ? "2.0.1" : "dev";
 function parseArgs(argv, env = process.env) {
   const get = (name) => {
     const i = argv.indexOf(`--${name}`);
@@ -32098,7 +31499,7 @@ Docs: https://datanotes.dev`;
 }
 
 // src/node/cli.ts
-var VERSION2 = true ? "1.5.0" : "dev";
+var VERSION2 = true ? "2.0.1" : "dev";
 async function main2(argv = process.argv.slice(2)) {
   const [command, ...rest] = argv;
   if (command === "--version" || command === "-v" || command === "version") return void process.stdout.write(`${VERSION2}