@blinkk/root-cms 3.0.1-alpha.1 → 3.0.1-beta.2

package/dist/{chunk-UTSL2E2P.js → chunk-TRM4MQHU.js}

@@ -1,7 +1,7 @@
 import {
   RootCMSClient,
   getCmsPlugin
-} from "./chunk-SNZ4S4IC.js";
+} from "./chunk-F4SODS5S.js";
 
 // core/cron.ts
 import { Timestamp as Timestamp3 } from "firebase-admin/firestore";
@@ -264,6 +264,181 @@ function extractDocRecords(schema, options) {
   return records;
 }
 
+// core/search-query.ts
+var SMART_QUOTES = /[“”„«»]/g;
+function parseQuery(input) {
+  const out = {
+    phrases: [],
+    terms: [],
+    excluded: [],
+    excludedPhrases: []
+  };
+  if (!input) {
+    return out;
+  }
+  const s = input.replace(SMART_QUOTES, '"');
+  let i = 0;
+  while (i < s.length) {
+    while (i < s.length && isSpace(s[i])) {
+      i++;
+    }
+    if (i >= s.length) {
+      break;
+    }
+    let negative = false;
+    if (s[i] === "-" && i + 1 < s.length && !isSpace(s[i + 1])) {
+      negative = true;
+      i++;
+    }
+    if (s[i] === '"') {
+      i++;
+      const start = i;
+      while (i < s.length && s[i] !== '"') {
+        i++;
+      }
+      const phrase = s.slice(start, i).trim();
+      if (i < s.length) {
+        i++;
+      }
+      if (phrase) {
+        if (negative) {
+          out.excludedPhrases.push(phrase);
+        } else {
+          out.phrases.push(phrase);
+        }
+      }
+    } else {
+      const start = i;
+      while (i < s.length && !isSpace(s[i]) && s[i] !== '"') {
+        i++;
+      }
+      const term = s.slice(start, i);
+      if (term && term.replace(/^-+$/, "")) {
+        if (negative) {
+          out.excluded.push(term);
+        } else {
+          out.terms.push(term);
+        }
+      }
+    }
+  }
+  return out;
+}
+function isSpace(ch) {
+  return ch === " " || ch === "	" || ch === "\n" || ch === "\r";
+}
+function tokenize(s) {
+  return s.toLowerCase().split(/[\s\p{P}]+/u).filter(Boolean);
+}
+function containsPhrase(text, phrase) {
+  const phraseTokens = tokenize(phrase);
+  if (phraseTokens.length === 0) {
+    return true;
+  }
+  const textTokens = tokenize(text);
+  if (textTokens.length < phraseTokens.length) {
+    return false;
+  }
+  outer: for (let i = 0; i <= textTokens.length - phraseTokens.length; i++) {
+    for (let j = 0; j < phraseTokens.length; j++) {
+      if (textTokens[i + j] !== phraseTokens[j]) {
+        continue outer;
+      }
+    }
+    return true;
+  }
+  return false;
+}
+function isEmptyQuery(parsed) {
+  return parsed.phrases.length === 0 && parsed.terms.length === 0;
+}
+function executeQuery(index, parsed) {
+  if (isEmptyQuery(parsed)) {
+    return [];
+  }
+  let acc = null;
+  for (const phrase of parsed.phrases) {
+    const candidates = index.search(phrase, {
+      combineWith: "AND",
+      fuzzy: false,
+      prefix: false
+    });
+    const matched = candidates.filter(
+      (r) => containsPhrase(String(r.text || ""), phrase) || containsPhrase(String(r.fieldLabel || ""), phrase)
+    );
+    acc = mergeAnd(acc, matched);
+    if (acc.size === 0) {
+      return [];
+    }
+  }
+  if (parsed.terms.length > 0) {
+    const q = parsed.terms.join(" ");
+    const results = index.search(q, { combineWith: "AND" });
+    acc = mergeAnd(acc, results);
+  }
+  if (!acc || acc.size === 0) {
+    return [];
+  }
+  for (const term of parsed.excluded) {
+    for (const r of index.search(term)) {
+      acc.delete(String(r.id));
+    }
+  }
+  for (const phrase of parsed.excludedPhrases) {
+    const candidates = index.search(phrase, {
+      combineWith: "AND",
+      fuzzy: false,
+      prefix: false
+    });
+    for (const r of candidates) {
+      if (containsPhrase(String(r.text || ""), phrase) || containsPhrase(String(r.fieldLabel || ""), phrase)) {
+        acc.delete(String(r.id));
+      }
+    }
+  }
+  return Array.from(acc.values()).sort((a, b) => b.score - a.score).map((entry) => ({
+    ...entry.record,
+    score: entry.score,
+    terms: Array.from(entry.terms)
+  }));
+}
+function mergeAnd(acc, results) {
+  if (acc === null) {
+    const next2 = /* @__PURE__ */ new Map();
+    for (const r of results) {
+      next2.set(String(r.id), {
+        score: r.score,
+        record: r,
+        terms: new Set(Array.isArray(r.terms) ? r.terms : [])
+      });
+    }
+    return next2;
+  }
+  const byId = /* @__PURE__ */ new Map();
+  for (const r of results) {
+    byId.set(String(r.id), r);
+  }
+  const next = /* @__PURE__ */ new Map();
+  for (const [id, entry] of acc) {
+    const r = byId.get(id);
+    if (!r) {
+      continue;
+    }
+    const terms = new Set(entry.terms);
+    if (Array.isArray(r.terms)) {
+      for (const t of r.terms) {
+        terms.add(t);
+      }
+    }
+    next.set(id, {
+      score: entry.score + r.score,
+      record: entry.record,
+      terms
+    });
+  }
+  return next;
+}
+
 // core/search-index.ts
 var SHARD_MAX_CHARS = 5e5;
 var MAX_INDEX_SIZE_BYTES = 50 * 1024 * 1024;
@@ -290,6 +465,46 @@ var MINISEARCH_OPTIONS = {
     fuzzy: 0.2
   }
 };
+function toSetOrNull(values) {
+  if (!values || values.length === 0) {
+    return null;
+  }
+  return new Set(values);
+}
+function resolveSearchIndexFilters(config) {
+  return {
+    includeCollections: toSetOrNull(config?.includeCollections),
+    excludeCollections: toSetOrNull(config?.excludeCollections),
+    includeDocIds: toSetOrNull(config?.includeDocIds),
+    excludeDocIds: toSetOrNull(config?.excludeDocIds)
+  };
+}
+function isCollectionIndexable(filters, collectionId) {
+  if (filters.includeCollections && !filters.includeCollections.has(collectionId)) {
+    return false;
+  }
+  if (filters.excludeCollections?.has(collectionId)) {
+    return false;
+  }
+  return true;
+}
+function isDocIndexable(filters, docId) {
+  const slashIndex = docId.indexOf("/");
+  if (slashIndex < 0) {
+    return false;
+  }
+  const collectionId = docId.slice(0, slashIndex);
+  if (!isCollectionIndexable(filters, collectionId)) {
+    return false;
+  }
+  if (filters.includeDocIds && !filters.includeDocIds.has(docId)) {
+    return false;
+  }
+  if (filters.excludeDocIds?.has(docId)) {
+    return false;
+  }
+  return true;
+}
 function isTitleyDeepKey(deepKey) {
   const last = deepKey.split(".").pop() || "";
   return TITLEY_KEYS.has(last.toLowerCase());
@@ -298,7 +513,7 @@ function withWeight(rec) {
   return { ...rec, weight: isTitleyDeepKey(rec.deepKey) ? 2 : 1 };
 }
 var SearchIndexService = class {
-  constructor(rootConfig, loadSchema) {
+  constructor(rootConfig, loadSchema, filtersOverride) {
     this.cached = null;
     this.rootConfig = rootConfig;
     const cmsPlugin = getCmsPlugin(rootConfig);
@@ -306,6 +521,20 @@ var SearchIndexService = class {
     this.projectId = cmsPluginOptions.id || "default";
     this.db = cmsPlugin.getFirestore();
     this.loadSchema = loadSchema || ((id) => this.loadCollectionSchemaFromDist(id));
+    this.filters = resolveSearchIndexFilters(
+      filtersOverride ?? cmsPluginOptions.searchIndex
+    );
+  }
+  /** Returns true if the given collection passes the include/exclude filter. */
+  isCollectionIndexable(collectionId) {
+    return isCollectionIndexable(this.filters, collectionId);
+  }
+  /**
+   * Returns true if the given doc id passes the include/exclude filter (and
+   * its collection is itself indexable). Doc ids are `<collectionId>/<slug>`.
+   */
+  isDocIndexable(docId) {
+    return isDocIndexable(this.filters, docId);
   }
   /** Returns the MiniSearch options used by both writers and readers. */
   static getMiniSearchOptions() {
@@ -317,14 +546,17 @@ var SearchIndexService = class {
   indexCollectionPath() {
     return `Projects/${this.projectId}/${SEARCH_INDEX_SUBCOLLECTION}`;
   }
-  /** Lists collection ids by globbing `<rootDir>/collections/*.schema.ts`. */
+  /**
+   * Lists collection ids by globbing `<rootDir>/collections/*.schema.ts`,
+   * filtered by the include/exclude config.
+   */
   async listCollectionIds() {
     const collectionsDir = path.join(this.rootConfig.rootDir, "collections");
     if (!fs.existsSync(collectionsDir)) {
       return [];
     }
     const fileNames = await glob("*.schema.ts", { cwd: collectionsDir });
-    return fileNames.map((f) => f.slice(0, -10));
+    return fileNames.map((f) => f.slice(0, -10)).filter((id) => this.isCollectionIndexable(id));
   }
   /**
    * Default schema loader: reads `dist/collections/<id>.schema.json`. These
@@ -438,23 +670,33 @@ var SearchIndexService = class {
     snap.forEach((d) => batch.delete(d.ref));
     await batch.commit();
   }
-  /** Lists the full set of live (collection, slug, doc) tuples for `Drafts`. */
+  /**
+   * Lists the full set of live (collection, slug, doc) tuples for `Drafts`,
+   * filtered by the include/exclude config.
+   */
   async listAllDocs(collectionIds) {
     const all = [];
     for (const collectionId of collectionIds) {
       const path3 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
       const snap = await this.db.collection(path3).get();
       snap.forEach((d) => {
+        const docId = `${collectionId}/${d.id}`;
+        if (!this.isDocIndexable(docId)) {
+          return;
+        }
         const data = d.data() || {};
         if (!data.collection) data.collection = collectionId;
         if (!data.slug) data.slug = d.id;
-        if (!data.id) data.id = `${collectionId}/${d.id}`;
+        if (!data.id) data.id = docId;
         all.push(data);
       });
     }
     return all;
   }
-  /** Lists docs modified since `lastRun` across every collection. */
+  /**
+   * Lists docs modified since `lastRun` across every collection, filtered by
+   * the include/exclude config.
+   */
   async listChangedDocs(collectionIds, lastRun) {
     const all = [];
     for (const collectionId of collectionIds) {
@@ -462,10 +704,14 @@ var SearchIndexService = class {
       const q = this.db.collection(path3).where("sys.modifiedAt", ">=", lastRun);
       const snap = await q.get();
       snap.forEach((d) => {
+        const docId = `${collectionId}/${d.id}`;
+        if (!this.isDocIndexable(docId)) {
+          return;
+        }
         const data = d.data() || {};
         if (!data.collection) data.collection = collectionId;
         if (!data.slug) data.slug = d.id;
-        if (!data.id) data.id = `${collectionId}/${d.id}`;
+        if (!data.id) data.id = docId;
         all.push(data);
       });
     }
@@ -495,7 +741,12 @@ var SearchIndexService = class {
     for (const collectionId of collectionIds) {
       const path3 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
       const snap = await this.db.collection(path3).select().get();
-      snap.forEach((d) => liveIds.add(`${collectionId}/${d.id}`));
+      snap.forEach((d) => {
+        const docId = `${collectionId}/${d.id}`;
+        if (this.isDocIndexable(docId)) {
+          liveIds.add(docId);
+        }
+      });
     }
     for (const id of knownIds) {
       if (!liveIds.has(id)) {
@@ -561,6 +812,9 @@ var SearchIndexService = class {
       snap.forEach((d) => {
         const data = d.data() || {};
         const slug = data.slug || d.id;
+        if (!this.isDocIndexable(`${collectionId}/${slug}`)) {
+          return;
+        }
         const records = extractDocRecords(schema, {
           collection: collectionId,
           slug,
@@ -632,7 +886,12 @@ var SearchIndexService = class {
     for (const collectionId of collectionIds) {
       const path3 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
       const snap = await this.db.collection(path3).select().get();
-      snap.forEach((d) => liveIds.add(`${collectionId}/${d.id}`));
+      snap.forEach((d) => {
+        const docId = `${collectionId}/${d.id}`;
+        if (this.isDocIndexable(docId)) {
+          liveIds.add(docId);
+        }
+      });
     }
     let deletions = 0;
     for (const docId of Object.keys(docMap)) {
@@ -712,7 +971,7 @@ var SearchIndexService = class {
     if (!cached || !q.trim()) {
       return { hits: [], meta: status };
     }
-    const raw = cached.index.search(q.trim());
+    const raw = executeQuery(cached.index, parseQuery(q));
     const hits = raw.slice(0, limit).map((r) => ({
       id: String(r.id || ""),
       docId: String(r.docId || ""),

package/dist/{chunk-KDXHFMIH.js → chunk-XLX37FRL.js}

@@ -222,6 +222,9 @@ function fieldType(field, options) {
   if (field.type === "multiselect") {
     return dom.type.array(dom.type.string);
   }
+  if (field.type === "number") {
+    return dom.type.number;
+  }
   if (field.type === "oneof") {
     const oneOf = dom.create.namedTypeReference("RootCMSOneOf");
     if (field.types && Array.isArray(field.types)) {

package/dist/cli.js

@@ -1,11 +1,12 @@
 import {
   generateTypes
-} from "./chunk-KDXHFMIH.js";
+} from "./chunk-XLX37FRL.js";
 import {
   RootCMSClient,
   getCmsPlugin,
   unmarshalData
-} from "./chunk-SNZ4S4IC.js";
+} from "./chunk-F4SODS5S.js";
+import "./chunk-CRK7N6RR.js";
 import "./chunk-MLKGABMK.js";
 
 // cli/cli.ts