@bitcobblers/wod-wiki-storage 0.44.2160 → 0.45.2166

package/dist/sql/index.d.cts

@@ -1,8 +1,8 @@
 import { S as SqlConnection, D as Database } from '../connection-DxuCLpRc.cjs';
 export { L as LibsqlClient, a as SqlRow, b as SqlStatement, c as SqlValue, l as libsqlDatabase } from '../connection-DxuCLpRc.cjs';
-import { e as StoreDef, R as RangeDTO, K as KeyDTO, f as DomainQueryResult, T as TxOp, I as IStorage, S as StoreName, a as IReadOnlyStore, b as StoreType, c as IReadWriteStore, D as DomainQuery, d as IStorageTransaction } from '../wire-DGYxXt3I.cjs';
-import { b as StoredSyncOp, S as SyncMutation } from '../sync-DG4Z-szj.cjs';
-export { A as ApplySyncBatchOptions, R as RawSyncOp, c as SYNC_OPS_TABLE, d as SYNC_STATE_TABLE, a as SyncEntry, e as SyncTargetKind, f as applySyncBatch, g as fetchSyncOps, i as initSyncTarget, p as probeSyncTarget, r as readLegacyRows, h as readRawSyncOps } from '../sync-DG4Z-szj.cjs';
+import { e as StoreDef, R as RangeDTO, K as KeyDTO, f as DomainQueryResult, T as TxOp, I as IStorage, S as StoreName, a as IReadOnlyStore, b as StoreType, c as IReadWriteStore, D as DomainQuery, d as IStorageTransaction } from '../wire-BO8FM1LJ.cjs';
+import { b as StoredSyncOp, S as SyncMutation } from '../sync-BDu_Q__z.cjs';
+export { A as ApplySyncBatchOptions, R as RawSyncOp, c as SYNC_OPS_TABLE, d as SYNC_STATE_TABLE, a as SyncEntry, e as SyncTargetKind, f as applySyncBatch, g as fetchSyncOps, i as initSyncTarget, p as probeSyncTarget, r as readLegacyRows, h as readRawSyncOps } from '../sync-BDu_Q__z.cjs';
 import '@libsql/client';
 import '@bitcobblers/wod-wiki-core';
 import '@bitcobblers/wod-wiki-lang';

package/dist/sql/index.d.ts

@@ -1,8 +1,8 @@
 import { S as SqlConnection, D as Database } from '../connection-DxuCLpRc.js';
 export { L as LibsqlClient, a as SqlRow, b as SqlStatement, c as SqlValue, l as libsqlDatabase } from '../connection-DxuCLpRc.js';
-import { e as StoreDef, R as RangeDTO, K as KeyDTO, f as DomainQueryResult, T as TxOp, I as IStorage, S as StoreName, a as IReadOnlyStore, b as StoreType, c as IReadWriteStore, D as DomainQuery, d as IStorageTransaction } from '../wire-DGYxXt3I.js';
-import { b as StoredSyncOp, S as SyncMutation } from '../sync-Bjj_c1ea.js';
-export { A as ApplySyncBatchOptions, R as RawSyncOp, c as SYNC_OPS_TABLE, d as SYNC_STATE_TABLE, a as SyncEntry, e as SyncTargetKind, f as applySyncBatch, g as fetchSyncOps, i as initSyncTarget, p as probeSyncTarget, r as readLegacyRows, h as readRawSyncOps } from '../sync-Bjj_c1ea.js';
+import { e as StoreDef, R as RangeDTO, K as KeyDTO, f as DomainQueryResult, T as TxOp, I as IStorage, S as StoreName, a as IReadOnlyStore, b as StoreType, c as IReadWriteStore, D as DomainQuery, d as IStorageTransaction } from '../wire-BO8FM1LJ.js';
+import { b as StoredSyncOp, S as SyncMutation } from '../sync-BQ0g8ctt.js';
+export { A as ApplySyncBatchOptions, R as RawSyncOp, c as SYNC_OPS_TABLE, d as SYNC_STATE_TABLE, a as SyncEntry, e as SyncTargetKind, f as applySyncBatch, g as fetchSyncOps, i as initSyncTarget, p as probeSyncTarget, r as readLegacyRows, h as readRawSyncOps } from '../sync-BQ0g8ctt.js';
 import '@libsql/client';
 import '@bitcobblers/wod-wiki-core';
 import '@bitcobblers/wod-wiki-lang';

package/dist/sql/index.mjs

@@ -1,23 +1,28 @@
-import { DOMAIN_PROJECTION_VERSION, bufferToOps, bufferedGet, overlayRows, isDirty, bufferSlot } from '../chunk-JFVXIJJI.mjs';
-import { getRows, storeDefinition, deleteRows, clearRows, SCHEMA_TABLE, decodeRowJson, initializeStore, putRow, wipeRows, getRow, listRowsFromIndexMany, listRows, countRows, putRows, deleteIn, batchInsert, SYNC_STATE_TABLE, encodeRowJson } from '../chunk-IFLOX2TK.mjs';
-export { SCHEMA_TABLE, SYNC_OPS_TABLE, SYNC_STATE_TABLE, applySyncBatch, clearRows, countRows, decodeRowJson, deleteRows, encodeRowJson, fetchSyncOps, getRow, getRows, initSyncTarget, initializeStore, listRows, listRowsFromIndexMany, probeSyncTarget, putRow, putRows, readLegacyRows, readRawSyncOps, storeDefinition, wipeRows } from '../chunk-IFLOX2TK.mjs';
-import { rowsEqual, validateStoredPins, DB_VERSION, STORE_DEFS, stampUserOwned, rangeFromIDB, keyFromValue, isRange } from '../chunk-IMNG2HY5.mjs';
+import { DOMAIN_PROJECTION_VERSION, bufferToOps, bufferedGet, overlayRows, isDirty, bufferSlot } from '../chunk-PJ7GRYOZ.mjs';
+import { getRows, storeDefinition, deleteRows, clearRows, SCHEMA_TABLE, decodeRowJson, encodeRowJson, initializeStore, putRow, wipeRows, getRow, listRowsFromIndexMany, listRows, countRows, putRows, deleteIn, batchInsert, SYNC_STATE_TABLE } from '../chunk-UN56ET7P.mjs';
+export { SCHEMA_TABLE, SYNC_OPS_TABLE, SYNC_STATE_TABLE, applySyncBatch, clearRows, countRows, decodeRowJson, deleteRows, encodeRowJson, fetchSyncOps, getRow, getRows, initSyncTarget, initializeStore, listRows, listRowsFromIndexMany, probeSyncTarget, putRow, putRows, readLegacyRows, readRawSyncOps, storeDefinition, wipeRows } from '../chunk-UN56ET7P.mjs';
+import { rowsEqual, validateStoredPins, DB_VERSION, STORE_DEFS, stampUserOwned, rangeFromIDB, keyFromValue, isRange } from '../chunk-J6KVDPTL.mjs';
 import { libsqlDatabase } from '../chunk-6ZTAWTAP.mjs';
 export { libsqlDatabase } from '../chunk-6ZTAWTAP.mjs';
 import { StorageError } from '../chunk-XRQKLSOT.mjs';
 export { StorageError } from '../chunk-XRQKLSOT.mjs';
-import { catalogOfItem, sourceMatches } from '@bitcobblers/wod-wiki-wql';
+import { WQL_SOURCE_VALUES, migrateLegacyRow, hasLegacyIdentity, sourceMatches, sourceShape } from '@bitcobblers/wod-wiki-wql';
 import { createClient } from '@libsql/client/web';
 
 var TABLES = ["domain_note", "query_block"];
 var PROJECTION_GUARD_KEY = "domain_projection";
-function sourceItem(row) {
+function sourceNote(row) {
   const item = {};
-  for (const key of ["id", "noteId", "sourceId", "type", "seedOrigin", "seedChunkId", "sourcePath", "catalog", "notebookId"]) {
+  for (const key of ["id", "noteId", "sourceId", "type", "seedOrigin", "seedChunkId", "feedOrigin", "feedSourceId", "sourcePath", "notebookId"]) {
     const value = row[key];
     if (typeof value === "string") item[key] = value;
     else if (value != null) throw new StorageError(400, `${key} must be a string`);
   }
+  const tags = row["tags"];
+  if (tags !== void 0 && tags !== null) {
+    if (!Array.isArray(tags) || !tags.every((t) => typeof t === "string")) throw new StorageError(400, "tags must be a string array");
+    item.tags = tags;
+  }
   return item;
 }
 var num = (v) => typeof v === "number" && Number.isFinite(v) ? v : null;
@@ -28,11 +33,11 @@ function ensureDdl(db) {
   const n = db.dialect === "postgres" ? " DOUBLE PRECISION" : "";
   const t = db.dialect === "postgres" ? ' TEXT COLLATE "C"' : " TEXT";
   const ddl = [
-    `CREATE TABLE IF NOT EXISTS "domain_note" ("note_id"${t} PRIMARY KEY NOT NULL, "note_type"${t}, "catalog"${t}, "source_id"${t}, "source_path"${t}, "title"${t} NOT NULL, "title_search"${t} NOT NULL, "created_at"${n} NOT NULL, "date"${n}, "text_search"${t} NOT NULL, "journal"${n} NOT NULL, "payload"${t} NOT NULL)`,
+    `CREATE TABLE IF NOT EXISTS "domain_note" ("note_id"${t} PRIMARY KEY NOT NULL, "note_type"${t}, "source_id"${t}, "source_path"${t}, "title"${t} NOT NULL, "title_search"${t} NOT NULL, "created_at"${n} NOT NULL, "date"${n}, "text_search"${t} NOT NULL, "journal"${n} NOT NULL, "payload"${t} NOT NULL)`,
     `CREATE INDEX IF NOT EXISTS "idx_domain_note_date" ON "domain_note" ("date", "note_id")`,
     `CREATE INDEX IF NOT EXISTS "idx_domain_note_created" ON "domain_note" ("created_at", "note_id")`,
     `CREATE INDEX IF NOT EXISTS "idx_domain_note_source_path" ON "domain_note" ("source_path")`,
-    `CREATE TABLE IF NOT EXISTS "query_block" ("occurrence_id"${t} PRIMARY KEY NOT NULL, "source_note_id"${t}, "parent_note_id"${t}, "content_id"${t}, "section_key"${t}, "ordinal"${n}, "data_type"${t}, "source_id"${t}, "source_path"${t}, "catalog"${t}, "effective_date"${n} NOT NULL, "created_at"${n} NOT NULL, "note_title"${t}, "normalized_text"${t} NOT NULL, "journal"${n} NOT NULL, "payload"${t} NOT NULL)`,
+    `CREATE TABLE IF NOT EXISTS "query_block" ("occurrence_id"${t} PRIMARY KEY NOT NULL, "source_note_id"${t}, "parent_note_id"${t}, "content_id"${t}, "section_key"${t}, "ordinal"${n} NOT NULL, "data_type"${t}, "source_id"${t}, "source_path"${t}, "effective_date"${n} NOT NULL, "created_at"${n} NOT NULL, "note_title"${t}, "normalized_text"${t} NOT NULL, "journal"${n} NOT NULL, "payload"${t} NOT NULL)`,
     `CREATE INDEX IF NOT EXISTS "idx_query_block_type" ON "query_block" ("data_type", "effective_date", "occurrence_id")`,
     `CREATE INDEX IF NOT EXISTS "idx_query_block_parent" ON "query_block" ("parent_note_id", "ordinal")`,
     `CREATE INDEX IF NOT EXISTS "idx_query_block_content" ON "query_block" ("content_id")`,
@@ -43,17 +48,16 @@ function ensureDdl(db) {
     for (const sql of ddl) await tx.exec(sql);
   });
 }
-var DOMAIN_NOTE_COLS = ["note_id", "note_type", "catalog", "source_id", "source_path", "title", "title_search", "created_at", "date", "text_search", "journal", "payload"];
-var QUERY_BLOCK_COLS = ["occurrence_id", "source_note_id", "parent_note_id", "content_id", "section_key", "ordinal", "data_type", "source_id", "source_path", "catalog", "effective_date", "created_at", "note_title", "normalized_text", "journal", "payload"];
+var DOMAIN_NOTE_COLS = ["note_id", "note_type", "source_id", "source_path", "title", "title_search", "created_at", "date", "text_search", "journal", "payload"];
+var QUERY_BLOCK_COLS = ["occurrence_id", "source_note_id", "parent_note_id", "content_id", "section_key", "ordinal", "data_type", "source_id", "source_path", "effective_date", "created_at", "note_title", "normalized_text", "journal", "payload"];
 var conflictUpdate = (table, cols, keys) => `ON CONFLICT (${keys.map((k) => `"${k}"`).join(", ")}) DO UPDATE SET ` + cols.filter((c) => !keys.includes(c)).map((c) => `"${c}" = excluded."${c}"`).join(",") + ` WHERE ` + cols.filter((col) => !keys.includes(col)).map((col) => `"${table}"."${col}" IS DISTINCT FROM excluded."${col}"`).join(" OR ");
 function domainNoteRow(note) {
   const id = text(note.id);
   if (!id) return void 0;
-  const source = sourceItem(note);
+  const source = sourceNote(note);
   return [
     id,
     T(note.type),
-    T(catalogOfItem(source)),
     T(note.sourceId),
     T(note.sourcePath),
     T(note.title) ?? "",
@@ -72,7 +76,7 @@ async function upsertDomainNotes(conn, notes) {
 function queryBlockRow(block, parent) {
   const id = text(block.id);
   if (!id) return void 0;
-  const source = sourceItem(block);
+  const source = sourceNote(block);
   const createdAt = N(block.createdAt);
   const effective = parent ? parent.date ?? parent.created_at : createdAt;
   return [
@@ -85,7 +89,6 @@ function queryBlockRow(block, parent) {
     T(block.dataType),
     T(block.sourceId),
     T(block.sourcePath),
-    T(catalogOfItem(source)),
     effective,
     createdAt,
     parent?.note.title ?? T(block.noteTitle),
@@ -265,11 +268,21 @@ async function rebuildProjections(conn) {
     `CREATE TABLE IF NOT EXISTS "${SCHEMA_TABLE}" ("key" TEXT PRIMARY KEY, "value" TEXT NOT NULL)`
   );
   for (const t of TABLES) await conn.exec(`DELETE FROM "${t}"`);
-  const notes = await conn.query(`SELECT "data" FROM "notes"`);
-  const noteObjs = notes.map((row) => decodeRowJson(String(row.data)));
+  const notes = await conn.query(`SELECT "k0", "data" FROM "notes"`);
+  const noteObjs = notes.map((row) => migrateLegacyRow(decodeRowJson(String(row.data))));
+  for (let i = 0; i < notes.length; i++) {
+    if (hasLegacyIdentity(decodeRowJson(String(notes[i].data)))) {
+      await conn.exec(`UPDATE "notes" SET "data" = ? WHERE "k0" = ?`, [encodeRowJson(noteObjs[i]), String(notes[i].k0)]);
+    }
+  }
   await upsertDomainNotes(conn, noteObjs);
-  const blocks = await conn.query(`SELECT "data" FROM "block_index"`);
-  const blockObjs = blocks.map((row) => decodeRowJson(String(row.data)));
+  const blocks = await conn.query(`SELECT "k0", "data" FROM "block_index"`);
+  const blockObjs = blocks.map((row) => migrateLegacyRow(decodeRowJson(String(row.data))));
+  for (let i = 0; i < blocks.length; i++) {
+    if (hasLegacyIdentity(decodeRowJson(String(blocks[i].data)))) {
+      await conn.exec(`UPDATE "block_index" SET "data" = ? WHERE "k0" = ?`, [encodeRowJson(blockObjs[i]), String(blocks[i].k0)]);
+    }
+  }
   const index = indexNoteIdentities(noteObjs);
   await upsertQueryBlocks(conn, blockObjs.map((b) => [b, resolveParentFrom(index, b)]));
   await conn.exec(
@@ -371,7 +384,7 @@ var MAX_CLAUSES = 32;
 var MAX_VALUES = 64;
 var MAX_VALUE_LEN = 256;
 var MAX_ORDER = 4;
-var listFields = ["id", "noteId", "type", "catalog", "source", "tags", "effort"];
+var listFields = ["id", "noteId", "type", "source", "tags", "effort"];
 var onlyKeys = (obj, allowed) => Object.keys(obj).every((k) => allowed.includes(k));
 function bad(msg) {
   return new StorageError(400, msg);
@@ -403,6 +416,15 @@ function parsePredicate(v, plan) {
     }
     return { field, values: strArray(obj.values, `predicate ${field}.values`), ...negate ? { negate } : {} };
   }
+  if (field === "typedTag") {
+    if (!onlyKeys(obj, ["field", "tagType", "values", "negate"])) {
+      throw bad("predicate typedTag accepts only field/tagType/values/negate");
+    }
+    if (typeof obj.tagType !== "string" || obj.tagType.length < 1 || obj.tagType.length > MAX_VALUE_LEN) {
+      throw bad(`predicate typedTag.tagType must be 1..=${MAX_VALUE_LEN} chars`);
+    }
+    return { field: "typedTag", tagType: obj.tagType, values: strArray(obj.values, "predicate typedTag.values"), ...negate ? { negate } : {} };
+  }
   if (field === "text") {
     if (!onlyKeys(obj, ["field", "value"]) || negate) throw bad("predicate text accepts only {field, value}");
     if (typeof obj.value !== "string" || obj.value.length < 1 || obj.value.length > MAX_VALUE_LEN) {
@@ -435,9 +457,9 @@ function parsePredicate(v, plan) {
   }
   if (field === "defaultNotes") {
     if (plan === "blocks") throw bad("predicate defaultNotes does not apply to the blocks plan");
-    if (!onlyKeys(obj, ["field", "feeds"])) throw bad("predicate defaultNotes accepts only {field, feeds}");
-    if (typeof obj.feeds !== "boolean") throw bad("predicate defaultNotes.feeds must be boolean");
-    return { field: "defaultNotes", feeds: obj.feeds };
+    if (!onlyKeys(obj, ["field", "nonPages"])) throw bad("predicate defaultNotes accepts only {field, nonPages}");
+    if (typeof obj.nonPages !== "boolean") throw bad("predicate defaultNotes.nonPages must be boolean");
+    return { field: "defaultNotes", nonPages: obj.nonPages };
   }
   throw bad(`unknown predicate field: ${field}`);
 }
@@ -462,8 +484,8 @@ function parseQuery(body) {
   if (body === null || typeof body !== "object" || Array.isArray(body)) throw bad("body must be a DomainQuery object");
   const obj = body;
   const plan = obj.plan;
-  if (plan !== "notes" && plan !== "blocks" && plan !== "entries") {
-    throw bad("body.plan must be notes | blocks | entries");
+  if (plan !== "notes" && plan !== "blocks" && plan !== "detail") {
+    throw bad("body.plan must be notes | blocks | detail");
   }
   for (const k of Object.keys(obj)) {
     if (!["plan", "selection", "filters", "order", "offset", "limit"].includes(k)) {
@@ -520,25 +542,17 @@ var Sql = class {
     return `${col} IN (${values.map((v) => this.bind(v)).join(", ")})`;
   }
 };
-var SOURCE_ALL_KINDS = ["journal", "feeds", "guides", "playground", "dashboards", "efforts"];
+var SOURCE_ALL_KINDS = ["journal", ...WQL_SOURCE_VALUES.filter((k) => k !== "journal")];
 function sourceKindSql(ctx, kind, sid, typeExpr, journalCol) {
-  switch (kind) {
-    case "journal":
-      return `(${journalCol} = 1)`;
-    case "feed":
-    case "feeds":
-      return `(substr(${sid}, 1, 11) = 'collection:' OR substr(${sid}, 1, 16) = 'page:collection:')`;
-    case "page":
-    case "pages":
-      return `(${sid} = 'page' OR substr(${sid}, 1, 5) = 'page:' OR substr(${sid}, 1, 7) = 'guides:')`;
-    case "guide":
-    case "guides":
-      return `(substr(${sid}, 1, 7) = 'guides:')`;
-    case "playground":
-      return typeExpr ? `(${sid} = 'playground' OR (${typeExpr} IS NOT NULL AND ${typeExpr} = 'playground'))` : `(${sid} = 'playground')`;
-    default:
-      return `(${sid} = ${ctx.bind(kind)})`;
-  }
+  if (kind === "journal") return `(${journalCol} = 1)`;
+  const shape = sourceShape(kind) ?? { exact: [kind] };
+  const parts = [];
+  for (const v of shape.exact ?? []) parts.push(`${sid} = ${ctx.bind(v)}`);
+  for (const p of shape.prefixes ?? []) parts.push(`substr(${sid}, 1, ${p.length}) = ${ctx.bind(p)}`);
+  if (shape.legacyType) {
+    parts.push(typeExpr ? `${typeExpr} = ${ctx.bind(shape.legacyType)}` : "FALSE");
+  }
+  return `(${parts.join(" OR ")})`;
 }
 function sourcePredicateSql(ctx, values, negate, sid, typeExpr, journalCol) {
   const matched = values.map((v) => sourceKindSql(ctx, v, sid, typeExpr, journalCol)).join(" OR ");
@@ -551,7 +565,6 @@ function predicateSql(ctx, p, plan) {
   const sid = blocks ? 'q."source_id"' : 'n."source_id"';
   const typeExpr = blocks ? null : 'n."note_type"';
   const typeCol = blocks ? 'q."data_type"' : 'n."note_type"';
-  const catalogCol = blocks ? 'q."catalog"' : 'n."catalog"';
   const journalCol = blocks ? 'q."journal"' : 'n."journal"';
   const noteId = blocks ? 'q."source_note_id"' : 'n."note_id"';
   switch (p.field) {
@@ -561,8 +574,6 @@ function predicateSql(ctx, p, plan) {
       return wrap(p.negate === true, ctx.inList(noteId, p.values));
     case "type":
       return wrap(p.negate === true, ctx.inList(typeCol, p.values));
-    case "catalog":
-      return wrap(p.negate === true, ctx.inList(catalogCol, p.values));
     case "source":
       return sourcePredicateSql(ctx, p.values, p.negate === true, sid, typeExpr, journalCol);
     case "tags":
@@ -570,6 +581,11 @@ function predicateSql(ctx, p, plan) {
         p.negate === true,
         `EXISTS (SELECT 1 FROM "note_tags" nt JOIN "tags" t ON t."k0" = nt."i_by_tag_0" WHERE nt."i_by_note_0" = ${noteId} AND t."i_by_label_0" IN (${p.values.map((v) => ctx.bind(v)).join(", ")}))`
       );
+    case "typedTag":
+      return wrap(
+        p.negate === true,
+        `EXISTS (SELECT 1 FROM "note_tags" nt JOIN "tags" t ON t."k0" = nt."i_by_tag_0" WHERE nt."i_by_note_0" = ${noteId} AND t."i_by_type_0" = ${ctx.bind(p.tagType)} AND t."i_by_label_0" IN (${p.values.map((v) => ctx.bind(v)).join(", ")}))`
+      );
     case "effort":
       return wrap(
         p.negate === true,
@@ -591,7 +607,7 @@ function predicateSql(ctx, p, plan) {
       return `(${sid} IS NULL OR ${sid} = '' OR ${all})`;
     }
     case "defaultNotes":
-      return p.feeds ? `(n."note_type" IS NULL OR n."note_type" <> 'page')` : `(n."note_type" = 'note' OR (substr(COALESCE(n."source_id", ''), 1, 5) <> 'page:' AND substr(COALESCE(n."source_id", ''), 1, 7) <> 'guides:' AND COALESCE(n."note_type", '') NOT IN ('feed','syntax','behavior','analytics','dashboard','home','page')))`;
+      return p.nonPages ? `(n."note_type" IS NULL OR n."note_type" <> 'page')` : `(n."note_type" = 'note' OR (substr(COALESCE(n."source_id", ''), 1, 5) <> 'page:' AND substr(COALESCE(n."source_id", ''), 1, 7) <> 'guides:' AND COALESCE(n."note_type", '') NOT IN ('feed','syntax','behavior','analytics','dashboard','home','page')))`;
   }
 }
 function clausesSql(ctx, clauses, plan) {
@@ -642,7 +658,7 @@ async function execute(conn, q, pg) {
   const matchedCount = q.filters.length === 0 ? selectedCount : await count(fullWhere, allParams);
   const ordering = orderSql(q.order, plan);
   const paging = pagingSql(q, pg);
-  if (plan !== "entries") {
+  if (plan !== "detail") {
     const pageSql2 = `SELECT "payload" FROM ${table}${fullWhere} ORDER BY ${ordering}${paging}`;
     const rows2 = (await conn.query(pageSql2, allParams)).map((r) => decodeRowJson(String(r.payload)));
     const result = { projectionVersion: DOMAIN_PROJECTION_VERSION, selectedCount, matchedCount, plan, rows: rows2 };