graphile-search 1.5.2 → 1.5.4

package/adapters/pgvector.js

@@ -9,13 +9,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPgvectorAdapter = createPgvectorAdapter;
 /**
- * pgvector distance operators.
+ * Build a distance expression for the given metric.
+ * Uses explicit SQL template literals for each operator to avoid sql.raw.
  */
-const METRIC_OPERATORS = {
-    COSINE: '<=>',
-    L2: '<->',
-    IP: '<#>',
-};
+function buildDistanceExpr(sql, columnExpr, vectorExpr, metric) {
+    switch (metric) {
+        case 'L2':
+            return sql `(${columnExpr} <-> ${vectorExpr})`;
+        case 'IP':
+            return sql `(${columnExpr} <#> ${vectorExpr})`;
+        case 'COSINE':
+        default:
+            return sql `(${columnExpr} <=> ${vectorExpr})`;
+    }
+}
 function isVectorCodec(codec) {
     return codec?.name === 'vector';
 }
@@ -171,7 +178,6 @@ function createPgvectorAdapter(options = {}) {
             if (!vector || !Array.isArray(vector) || vector.length === 0)
                 return null;
             const resolvedMetric = metric || defaultMetric;
-            const operator = METRIC_OPERATORS[resolvedMetric] || METRIC_OPERATORS.COSINE;
             const vectorString = `[${vector.join(',')}]`;
             const vectorExpr = sql `${sql.value(vectorString)}::vector`;
             // Check if this column has chunks info and chunk querying is requested
@@ -190,14 +196,15 @@ function createPgvectorAdapter(options = {}) {
                 // Alias to avoid ambiguity when the chunks table name might collide
                 const chunksAlias = sql.identifier('__chunks');
                 // Subquery: SELECT MIN(distance) FROM chunks WHERE chunks.parent_fk = parent.pk
+                const chunkDistanceExpr = buildDistanceExpr(sql, sql `${chunksAlias}.${chunkEmbedding}`, vectorExpr, resolvedMetric);
                 const chunkDistanceSubquery = sql `(
-          SELECT MIN(${chunksAlias}.${chunkEmbedding} ${sql.raw(operator)} ${vectorExpr})
+          SELECT MIN(${chunkDistanceExpr})
           FROM ${chunksTableRef} AS ${chunksAlias}
           WHERE ${chunksAlias}.${parentFk} = ${parentId}
         )`;
                 // Also compute direct parent distance if the parent has an embedding
                 const parentColumnExpr = sql `${alias}.${sql.identifier(column.attributeName)}`;
-                const parentDistanceExpr = sql `(${parentColumnExpr} ${sql.raw(operator)} ${vectorExpr})`;
+                const parentDistanceExpr = buildDistanceExpr(sql, parentColumnExpr, vectorExpr, resolvedMetric);
                 // Use LEAST of parent distance and closest chunk distance
                 // COALESCE handles cases where parent or chunks may not have embeddings
                 const combinedDistanceExpr = sql `LEAST(
@@ -215,7 +222,7 @@ function createPgvectorAdapter(options = {}) {
             }
             // Standard (non-chunk) query
             const columnExpr = sql `${alias}.${sql.identifier(column.attributeName)}`;
-            const distanceExpr = sql `(${columnExpr} ${sql.raw(operator)} ${vectorExpr})`;
+            const distanceExpr = buildDistanceExpr(sql, columnExpr, vectorExpr, resolvedMetric);
             let whereClause = null;
             if (distance !== undefined && distance !== null) {
                 whereClause = sql `${distanceExpr} <= ${sql.value(distance)}`;

package/esm/adapters/pgvector.js

@@ -6,13 +6,20 @@
  * Wraps the same SQL logic as graphile-pgvector but as a SearchAdapter.
  */
 /**
- * pgvector distance operators.
+ * Build a distance expression for the given metric.
+ * Uses explicit SQL template literals for each operator to avoid sql.raw.
  */
-const METRIC_OPERATORS = {
-    COSINE: '<=>',
-    L2: '<->',
-    IP: '<#>',
-};
+function buildDistanceExpr(sql, columnExpr, vectorExpr, metric) {
+    switch (metric) {
+        case 'L2':
+            return sql `(${columnExpr} <-> ${vectorExpr})`;
+        case 'IP':
+            return sql `(${columnExpr} <#> ${vectorExpr})`;
+        case 'COSINE':
+        default:
+            return sql `(${columnExpr} <=> ${vectorExpr})`;
+    }
+}
 function isVectorCodec(codec) {
     return codec?.name === 'vector';
 }
@@ -168,7 +175,6 @@ export function createPgvectorAdapter(options = {}) {
             if (!vector || !Array.isArray(vector) || vector.length === 0)
                 return null;
             const resolvedMetric = metric || defaultMetric;
-            const operator = METRIC_OPERATORS[resolvedMetric] || METRIC_OPERATORS.COSINE;
             const vectorString = `[${vector.join(',')}]`;
             const vectorExpr = sql `${sql.value(vectorString)}::vector`;
             // Check if this column has chunks info and chunk querying is requested
@@ -187,14 +193,15 @@ export function createPgvectorAdapter(options = {}) {
                 // Alias to avoid ambiguity when the chunks table name might collide
                 const chunksAlias = sql.identifier('__chunks');
                 // Subquery: SELECT MIN(distance) FROM chunks WHERE chunks.parent_fk = parent.pk
+                const chunkDistanceExpr = buildDistanceExpr(sql, sql `${chunksAlias}.${chunkEmbedding}`, vectorExpr, resolvedMetric);
                 const chunkDistanceSubquery = sql `(
-          SELECT MIN(${chunksAlias}.${chunkEmbedding} ${sql.raw(operator)} ${vectorExpr})
+          SELECT MIN(${chunkDistanceExpr})
           FROM ${chunksTableRef} AS ${chunksAlias}
           WHERE ${chunksAlias}.${parentFk} = ${parentId}
         )`;
                 // Also compute direct parent distance if the parent has an embedding
                 const parentColumnExpr = sql `${alias}.${sql.identifier(column.attributeName)}`;
-                const parentDistanceExpr = sql `(${parentColumnExpr} ${sql.raw(operator)} ${vectorExpr})`;
+                const parentDistanceExpr = buildDistanceExpr(sql, parentColumnExpr, vectorExpr, resolvedMetric);
                 // Use LEAST of parent distance and closest chunk distance
                 // COALESCE handles cases where parent or chunks may not have embeddings
                 const combinedDistanceExpr = sql `LEAST(
@@ -212,7 +219,7 @@ export function createPgvectorAdapter(options = {}) {
             }
             // Standard (non-chunk) query
             const columnExpr = sql `${alias}.${sql.identifier(column.attributeName)}`;
-            const distanceExpr = sql `(${columnExpr} ${sql.raw(operator)} ${vectorExpr})`;
+            const distanceExpr = buildDistanceExpr(sql, columnExpr, vectorExpr, resolvedMetric);
             let whereClause = null;
             if (distance !== undefined && distance !== null) {
                 whereClause = sql `${distanceExpr} <= ${sql.value(distance)}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-search",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "Unified PostGraphile v5 search plugin — abstracts tsvector, BM25, pg_trgm, and pgvector behind a single adapter-based architecture with composite searchScore",
   "author": "Constructive <developers@constructive.io>",
   "homepage": "https://github.com/constructive-io/constructive",
@@ -31,20 +31,20 @@
   "devDependencies": {
     "@types/node": "^22.19.11",
     "@types/pg": "^8.18.0",
-    "graphile-connection-filter": "^1.3.2",
-    "graphile-test": "^4.7.2",
-    "makage": "^0.1.10",
+    "graphile-connection-filter": "^1.3.4",
+    "graphile-test": "^4.7.4",
+    "makage": "^0.3.0",
     "pg": "^8.20.0",
-    "pgsql-test": "^4.7.2"
+    "pgsql-test": "^4.7.4"
   },
   "peerDependencies": {
-    "@dataplan/pg": "1.0.0-rc.8",
-    "graphile-build": "5.0.0-rc.6",
-    "graphile-build-pg": "5.0.0-rc.8",
-    "graphile-config": "1.0.0-rc.6",
+    "@dataplan/pg": "1.0.0",
+    "graphile-build": "5.0.0",
+    "graphile-build-pg": "5.0.0",
+    "graphile-config": "1.0.0",
     "graphql": "16.13.0",
-    "pg-sql2": "5.0.0-rc.5",
-    "postgraphile": "5.0.0-rc.10"
+    "pg-sql2": "5.0.0",
+    "postgraphile": "5.0.0"
   },
   "keywords": [
     "postgraphile",
@@ -62,5 +62,5 @@
     "hybrid-search",
     "searchScore"
   ],
-  "gitHead": "93deca687ce109bf90d2a0a73ea6b05b22724160"
+  "gitHead": "2f6e083d11764a04b2a6bc14df5b2ca2725defc6"
 }