@vibeorm/extensions 2.2.1 → 2.2.2

package/dist/index.js

@@ -1,6 +1,6 @@
 // @bun
 // packages/extensions/src/search/index.ts
-import { VibeError as VibeError2, defineExtension, unsupportedCapability } from "@vibeorm/schema";
+import { VibeError as VibeError2, assertIdentifierFits, defineExtension, fitDefaultName, unsupportedCapability } from "@vibeorm/schema";
 
 // packages/extensions/src/shared.ts
 import { VibeError } from "@vibeorm/schema";
@@ -156,9 +156,14 @@ function resolveArtifactNames(params) {
       hint: "only the tsvector engine materializes a generated column \u2014 drop columnName or target tsvector"
     });
   }
+  const remedy = "Shorten it, or set a shorter `name:` on the @@search declaration.";
+  if (decl.columnName !== undefined)
+    assertIdentifierFits({ name: decl.columnName, dialect, what: "@@search columnName", remedy });
+  if (decl.indexName !== undefined)
+    assertIdentifierFits({ name: decl.indexName, dialect, what: "@@search indexName", remedy });
   return {
-    tsvColumn: decl.columnName ?? `${decl.base}_tsv`,
-    indexName: decl.indexName ?? `${decl.base}_idx`
+    tsvColumn: decl.columnName ?? fitDefaultName({ prefix: decl.base, suffix: "_tsv", dialect }),
+    indexName: decl.indexName ?? fitDefaultName({ prefix: decl.base, suffix: "_idx", dialect })
   };
 }
 function resolveRank(params) {
@@ -252,7 +257,7 @@ 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 (${[pkColumn, ...columns].map((column) => quote(column)).join(", ")}) WITH (key_field='${pkColumn}');`
+          `CREATE INDEX IF NOT EXISTS ${quote(bm25Names.indexName)} ON ${quote(table)} USING bm25 (${[pkColumn, ...columns].map((column) => quote(column)).join(", ")}) WITH (key_field=${dialect.quoteStringLiteral({ value: pkColumn })});`
         ],
         drop: [`DROP INDEX IF EXISTS ${quote(bm25Names.indexName)};`]
       });
@@ -282,7 +287,7 @@ function searchArtifacts(ctx) {
           auxiliaryPrefixes: [`${fts}_`]
         },
         create: [
-          `CREATE VIRTUAL TABLE IF NOT EXISTS ${quote(fts)} USING fts5(${columnList}, content='${table}');`
+          `CREATE VIRTUAL TABLE IF NOT EXISTS ${quote(fts)} USING fts5(${columnList}, content=${dialect.quoteStringLiteral({ value: table })});`
         ],
         drop: [`DROP TABLE IF EXISTS ${quote(fts)};`]
       }, {
@@ -628,7 +633,7 @@ function search(options = {}) {
   });
 }
 // packages/extensions/src/vector/index.ts
-import { VibeError as VibeError3, defineExtension as defineExtension2, unsupportedCapability as unsupportedCapability2 } from "@vibeorm/schema";
+import { VibeError as VibeError3, assertIdentifierFits as assertIdentifierFits2, defineExtension as defineExtension2, fitDefaultName as fitDefaultName2, unsupportedCapability as unsupportedCapability2 } from "@vibeorm/schema";
 import { ParamCollector as ParamCollector2, getSqlDialect as getSqlDialect2, renderExpr as renderExpr2 } from "@vibeorm/sql";
 var VERSION2 = "2.0.0-alpha.0";
 var METRIC_OPERATOR = {
@@ -702,6 +707,13 @@ function vectorArtifacts(ctx) {
     const columns = vectorColumnsOf({ declaration });
     const indexFields = declStringArray(declaration, "fields") ?? [];
     const kindRaw = declString(declaration, "index") ?? "hnsw";
+    if (!INDEX_KINDS.includes(kindRaw)) {
+      throw new VibeError3({
+        code: "VIBE_SCHEMA_INVALID",
+        message: `@@vector on "${modelName}" declares index kind "${kindRaw}" \u2014 expected one of ${INDEX_KINDS.join(", ")}`,
+        meta: { model: modelName, index: kindRaw }
+      });
+    }
     const metricRaw = declString(declaration, "metric") ?? "cosine";
     const metric = METRICS.find((candidate) => candidate === metricRaw) ?? "cosine";
     for (const field of indexFields) {
@@ -714,7 +726,9 @@ function vectorArtifacts(ctx) {
       }
       const column = columnNameOf({ model, field });
       const nameOverride = indexFields.length === 1 ? declString(declaration, "indexName") : undefined;
-      const indexName = nameOverride ?? `${table}_${column}_${kindRaw}_idx`;
+      if (nameOverride !== undefined)
+        assertIdentifierFits2({ name: nameOverride, dialect: ctx.dialect, what: "@@vector indexName", remedy: "Shorten it." });
+      const indexName = nameOverride ?? fitDefaultName2({ prefix: `${table}_${column}_${kindRaw}`, suffix: "_idx", dialect: ctx.dialect });
       const withOptions = [];
       const m = declaration["m"];
       const efConstruction = declaration["efConstruction"];
@@ -939,7 +953,7 @@ function vector(options = {}) {
   });
 }
 // packages/extensions/src/trgm/index.ts
-import { VibeError as VibeError4, defineExtension as defineExtension3, unsupportedCapability as unsupportedCapability3 } from "@vibeorm/schema";
+import { VibeError as VibeError4, defineExtension as defineExtension3, fitDefaultName as fitDefaultName3, unsupportedCapability as unsupportedCapability3 } from "@vibeorm/schema";
 import { getSqlDialect as getSqlDialect3 } from "@vibeorm/sql";
 var DEFAULT_THRESHOLD = 0.3;
 var VERSION3 = "2.0.0-alpha.0";
@@ -971,7 +985,7 @@ function trgmArtifacts(ctx) {
     const table = tableNameOf({ model });
     for (const field of declStringArray(declaration, "fields") ?? []) {
       const column = columnNameOf({ model, field });
-      const indexName = `${table}_${column}_trgm_idx`;
+      const indexName = fitDefaultName3({ prefix: `${table}_${column}_trgm`, suffix: "_idx", dialect: ctx.dialect });
       artifacts.push({
         id: `trgm:${modelName}:${field}`,
         owns: { kind: "index", table, name: indexName },
@@ -1126,4 +1140,4 @@ export {
   vector
 };
 
-//# debugId=CB654FBC580AA6A164756E2164756E21
+//# debugId=22E4747EF131DCA564756E2164756E21