@vibeorm/extensions 3.0.0 → 4.1.0

package/dist/search/index.js

@@ -1,9 +1,14 @@
 // @bun
 // packages/extensions/src/search/index.ts
-import { VibeError as VibeError2, assertIdentifierFits, defineExtension, fitDefaultName, unsupportedCapability } from "@vibeorm/schema";
+import { VibeError as VibeError2, assertExtensionModelPlacement as assertExtensionModelPlacement2, assertIdentifierFits, defineExtension, fitDefaultName, unsupportedCapability } from "@vibeorm/schema";
 
 // packages/extensions/src/shared.ts
-import { VibeError } from "@vibeorm/schema";
+import { VibeError, assertExtensionModelPlacement, qualifiedSqlName } from "@vibeorm/schema";
+function extensionSqlName(params) {
+  const { dialect, name } = params;
+  const physical = qualifiedSqlName({ name });
+  return dialect.name === "postgres" ? `${dialect.quoteIdent({ name: physical.namespace })}.${dialect.quoteIdent({ name: physical.name })}` : dialect.quoteIdent({ name });
+}
 function finiteNumber(params) {
   const { value, name, integer, min } = params;
   if (typeof value !== "number" || !Number.isFinite(value) || integer === true && !Number.isSafeInteger(value) || min !== undefined && value < min) {
@@ -16,6 +21,7 @@ function finiteNumber(params) {
   return value;
 }
 function tableNameOf(params) {
+  assertExtensionModelPlacement({ namespace: params.model.namespace });
   return params.model.dbName ?? params.model.name;
 }
 function columnNameOf(params) {
@@ -461,16 +467,16 @@ function searchArtifacts(ctx) {
         id: `search:${modelName}:column`,
         owns: { kind: "column", table, column: tsvColumn },
         create: [
-          `ALTER TABLE ${quote(table)} ADD COLUMN IF NOT EXISTS ${quote(tsvColumn)} tsvector GENERATED ALWAYS AS (${expression}) STORED;`
+          `ALTER TABLE ${extensionSqlName({ dialect, name: table })} ADD COLUMN IF NOT EXISTS ${quote(tsvColumn)} tsvector GENERATED ALWAYS AS (${expression}) STORED;`
         ],
-        drop: [`ALTER TABLE ${quote(table)} DROP COLUMN IF EXISTS ${quote(tsvColumn)};`]
+        drop: [`ALTER TABLE ${extensionSqlName({ dialect, name: table })} DROP COLUMN IF EXISTS ${quote(tsvColumn)};`]
       }, {
         id: `search:${modelName}:index`,
         owns: { kind: "index", table, name: indexName },
         create: [
-          `CREATE INDEX IF NOT EXISTS ${quote(indexName)} ON ${quote(table)} USING gin (${quote(tsvColumn)});`
+          `CREATE INDEX IF NOT EXISTS ${quote(indexName)} ON ${extensionSqlName({ dialect, name: table })} USING gin (${quote(tsvColumn)});`
         ],
-        drop: [`DROP INDEX IF EXISTS ${quote(indexName)};`]
+        drop: [`DROP INDEX IF EXISTS ${extensionSqlName({ dialect, name: indexName })};`]
       });
       continue;
     }
@@ -490,9 +496,9 @@ function searchArtifacts(ctx) {
         id: `search:${modelName}:index`,
         owns: { kind: "index", table, name: bm25Names.indexName },
         create: [
-          `CREATE INDEX IF NOT EXISTS ${quote(bm25Names.indexName)} ON ${quote(table)} USING bm25 (${indexed.join(", ")}) WITH (${withOptions.join(", ")});`
+          `CREATE INDEX IF NOT EXISTS ${quote(bm25Names.indexName)} ON ${extensionSqlName({ dialect, name: table })} USING bm25 (${indexed.join(", ")}) WITH (${withOptions.join(", ")});`
         ],
-        drop: [`DROP INDEX IF EXISTS ${quote(bm25Names.indexName)};`]
+        drop: [`DROP INDEX IF EXISTS ${extensionSqlName({ dialect, name: bm25Names.indexName })};`]
       });
       continue;
     }
@@ -528,10 +534,10 @@ function searchArtifacts(ctx) {
         id: `search:${modelName}:fts5-triggers`,
         owns: { kind: "trigger", table, name: `${fts}_ai` },
         create: [
-          `CREATE TRIGGER IF NOT EXISTS ${quote(`${fts}_ai`)} AFTER INSERT ON ${quote(table)} BEGIN
+          `CREATE TRIGGER IF NOT EXISTS ${quote(`${fts}_ai`)} AFTER INSERT ON ${extensionSqlName({ dialect, name: table })} BEGIN
   INSERT INTO ${quote(fts)}(rowid, ${columnList}) VALUES (new.rowid, ${newList});
 END;`,
-          `CREATE TRIGGER IF NOT EXISTS ${quote(`${fts}_ad`)} AFTER DELETE ON ${quote(table)} BEGIN
+          `CREATE TRIGGER IF NOT EXISTS ${quote(`${fts}_ad`)} AFTER DELETE ON ${extensionSqlName({ dialect, name: table })} BEGIN
   INSERT INTO ${quote(fts)}(${quote(fts)}, rowid, ${columnList}) VALUES ('delete', old.rowid, ${oldList});
 END;`,
           updateTrigger.create,
@@ -561,9 +567,9 @@ END;`,
       id: `search:${modelName}:index`,
       owns: { kind: "index", table, name: fulltextNames.indexName },
       create: [
-        `CREATE FULLTEXT INDEX ${quote(fulltextNames.indexName)} ON ${quote(table)} (${columns.map((column) => quote(column)).join(", ")});`
+        `CREATE FULLTEXT INDEX ${quote(fulltextNames.indexName)} ON ${extensionSqlName({ dialect, name: table })} (${columns.map((column) => quote(column)).join(", ")});`
       ],
-      drop: [`DROP INDEX ${quote(fulltextNames.indexName)} ON ${quote(table)};`]
+      drop: [`DROP INDEX ${quote(fulltextNames.indexName)} ON ${extensionSqlName({ dialect, name: table })};`]
     });
   }
   return artifacts;
@@ -596,9 +602,12 @@ function shapeHits(params) {
 }
 function createSearchDelegate(config) {
   return (ctx) => {
+    if (ctx.model !== null)
+      assertExtensionModelPlacement2({ namespace: ctx.model.namespace, dialect: ctx.dialect.name });
     const dialect = ctx.dialect;
     const quote = (name) => dialect.quoteIdent({ name });
     const t = quote("t");
+    const pkColumns = ctx.model === null ? config.pkColumn === undefined || config.pkColumn === "" ? [] : [config.pkColumn] : ctx.model.primaryKey.map((field) => field.columnName);
     return async (args) => {
       if (typeof args.query !== "string" || args.query.trim().length === 0) {
         throw new VibeError2({
@@ -650,6 +659,13 @@ function createSearchDelegate(config) {
           meta: { table: config.table }
         });
       }
+      if (pkColumns.length === 0) {
+        throw new VibeError2({
+          code: "VIBE_CONFIG",
+          message: `search needs primary-key metadata for deterministic ordering: ${config.table} has no model key, or the legacy mount has no explicit pkColumn`,
+          meta: { table: config.table }
+        });
+      }
       const projection = idOnly ? `${t}.${quote(config.pkColumn ?? "")}` : ctx.projection({ qualify: "t" });
       const collector = new ParamCollector(dialect);
       const userWhere = (qualify) => {
@@ -670,14 +686,13 @@ function createSearchDelegate(config) {
         if (hlColumn !== null) {
           text += `, ts_headline('${language}', ${t}.${quote(hlColumn)}, ${tsquery()}) AS ${quote(HIGHLIGHT_ALIAS)}`;
         }
-        text += ` FROM ${quote(config.table)} AS ${t} WHERE ${tsv} @@ ${tsquery()}`;
+        text += ` FROM ${extensionSqlName({ dialect, name: config.table })} AS ${t} WHERE ${tsv} @@ ${tsquery()}`;
         const where = userWhere("t");
         if (where !== null)
           text += ` AND (${where})`;
         if (args.minScore !== undefined) {
           text += ` AND ${ranker}(${tsv}, ${tsquery()}) >= ${collector.add(args.minScore)}`;
         }
-        text += ` ORDER BY ${quote(SCORE_ALIAS)} DESC`;
       } else if (config.engine === "fts5") {
         const fts = quote(config.ftsTable ?? "");
         text = `SELECT ${projection}, -bm25(${fts}) AS ${quote(SCORE_ALIAS)}`;
@@ -685,7 +700,7 @@ function createSearchDelegate(config) {
           const index = config.fields.findIndex((field) => field.column === hlColumn);
           text += `, snippet(${fts}, ${index}, '<b>', '</b>', '\u2026', 16) AS ${quote(HIGHLIGHT_ALIAS)}`;
         }
-        text += ` FROM ${fts} JOIN ${quote(config.table)} AS ${t} ON ${t}.rowid = ${fts}.rowid`;
+        text += ` FROM ${fts} JOIN ${extensionSqlName({ dialect, name: config.table })} AS ${t} ON ${t}.rowid = ${fts}.rowid`;
         text += ` WHERE ${fts} MATCH ${collector.add(matchText)}`;
         const where = userWhere("t");
         if (where !== null)
@@ -693,12 +708,11 @@ function createSearchDelegate(config) {
         if (args.minScore !== undefined) {
           text += ` AND -bm25(${fts}) >= ${collector.add(args.minScore)}`;
         }
-        text += ` ORDER BY ${quote(SCORE_ALIAS)} DESC`;
       } else if (config.engine === "fulltext") {
         engineHasHighlights = false;
         const mode = prefix ? "IN BOOLEAN MODE" : "IN NATURAL LANGUAGE MODE";
         const match = () => `MATCH (${config.fields.map((field) => `${t}.${quote(field.column)}`).join(", ")}) AGAINST (${collector.add(matchText)} ${mode})`;
-        text = `SELECT ${projection}, ${match()} AS ${quote(SCORE_ALIAS)} FROM ${quote(config.table)} AS ${t}`;
+        text = `SELECT ${projection}, ${match()} AS ${quote(SCORE_ALIAS)} FROM ${extensionSqlName({ dialect, name: config.table })} AS ${t}`;
         text += ` WHERE ${match()}`;
         const where = userWhere("t");
         if (where !== null)
@@ -706,7 +720,6 @@ function createSearchDelegate(config) {
         if (args.minScore !== undefined) {
           text += ` AND ${match()} >= ${collector.add(args.minScore)}`;
         }
-        text += ` ORDER BY ${quote(SCORE_ALIAS)} DESC`;
       } else {
         const pk = `${t}.${quote(config.pkColumn ?? "")}`;
         const operator = prefix || fuzzy !== undefined ? "&&&" : "@@@";
@@ -715,7 +728,7 @@ function createSearchDelegate(config) {
         if (hlColumn !== null) {
           text += `, paradedb.snippet(${t}.${quote(hlColumn)}) AS ${quote(HIGHLIGHT_ALIAS)}`;
         }
-        text += ` FROM ${quote(config.table)} AS ${t} WHERE (${config.fields.map((field, index) => {
+        text += ` FROM ${extensionSqlName({ dialect, name: config.table })} AS ${t} WHERE (${config.fields.map((field, index) => {
           const boost = config.boosts?.[index];
           const boostCast = boost === undefined || boost === 1 ? "" : `::pdb.boost(${boost})`;
           return `${t}.${quote(field.column)} ${operator} ${collector.add(matchText)}${fuzzyCast}${boostCast}`;
@@ -726,8 +739,8 @@ function createSearchDelegate(config) {
         if (args.minScore !== undefined) {
           text += ` AND paradedb.score(${pk}) >= ${collector.add(args.minScore)}`;
         }
-        text += ` ORDER BY ${quote(SCORE_ALIAS)} DESC`;
       }
+      text += ` ORDER BY ${quote(SCORE_ALIAS)} DESC, ${pkColumns.map((column) => `${t}.${quote(column)} ASC`).join(", ")}`;
       text += ` LIMIT ${take}`;
       if (skip !== null)
         text += ` OFFSET ${skip}`;
@@ -907,4 +920,4 @@ export {
   search
 };
 
-//# debugId=5A96240B33D83FB764756E2164756E21
+//# debugId=231E8A4C6A813A6064756E2164756E21