graphile-connection-filter 1.15.0 → 1.15.2

package/esm/utils.d.ts

@@ -1,37 +1,15 @@
 /**
  * Utility functions for the connection filter plugin.
  */
+export { getQueryBuilder, isComputedScalarAttributeResource } from 'graphile-plugin-utils';
 /**
  * Check if a value is an empty object (no own enumerable keys).
  */
 export declare function isEmpty(o: unknown): boolean;
-/**
- * Check if a pgResource is a computed scalar attribute function.
- * A computed attribute is a function that:
- * - has parameters
- * - returns a scalar (no attributes on codec)
- * - is unique (returns single row)
- * - first parameter's codec has attributes (i.e. takes a table row)
- */
-export declare function isComputedScalarAttributeResource(s: any): boolean;
 /**
  * Get all computed attribute resources for a given source.
  */
 export declare function getComputedAttributeResources(build: any, source: any): any[];
-/**
- * Walks from a PgCondition up to the PgSelectQueryBuilder.
- * Uses the .parent property on PgCondition to traverse up the chain,
- * following Benjie's pattern from postgraphile-plugin-fulltext-filter.
- *
- * This is used by satellite plugins (search, BM25, pgvector) that need
- * to access the query builder from within a filter's apply callback
- * to inject SELECT expressions (for ranking/scoring) and ORDER BY clauses.
- *
- * @param build - The Graphile Build object (needs build.dataplanPg.PgCondition)
- * @param $condition - The PgCondition instance from the filter apply callback
- * @returns The PgSelectQueryBuilder if found, or null
- */
-export declare function getQueryBuilder(build: GraphileBuild.Build, $condition: any): any | null;
 /**
  * Creates an assertion function that validates filter input values.
  *

package/esm/utils.js

@@ -1,36 +1,16 @@
 /**
  * Utility functions for the connection filter plugin.
  */
+import { isComputedScalarAttributeResource } from 'graphile-plugin-utils';
+// Shared helpers now live in graphile-plugin-utils. Re-exported here so the
+// plugin's public API (see index.ts) stays backward compatible.
+export { getQueryBuilder, isComputedScalarAttributeResource } from 'graphile-plugin-utils';
 /**
  * Check if a value is an empty object (no own enumerable keys).
  */
 export function isEmpty(o) {
     return typeof o === 'object' && o !== null && Object.keys(o).length === 0;
 }
-/**
- * Check if a pgResource is a computed scalar attribute function.
- * A computed attribute is a function that:
- * - has parameters
- * - returns a scalar (no attributes on codec)
- * - is unique (returns single row)
- * - first parameter's codec has attributes (i.e. takes a table row)
- */
-export function isComputedScalarAttributeResource(s) {
-    if (!s.parameters || s.parameters.length < 1) {
-        return false;
-    }
-    if (s.codec.attributes) {
-        return false;
-    }
-    if (!s.isUnique) {
-        return false;
-    }
-    const firstParameter = s.parameters[0];
-    if (!firstParameter?.codec.attributes) {
-        return false;
-    }
-    return true;
-}
 /**
  * Get all computed attribute resources for a given source.
  */
@@ -39,42 +19,6 @@ export function getComputedAttributeResources(build, source) {
         s.parameters[0].codec === source.codec);
     return computedAttributeSources;
 }
-/**
- * Walks from a PgCondition up to the PgSelectQueryBuilder.
- * Uses the .parent property on PgCondition to traverse up the chain,
- * following Benjie's pattern from postgraphile-plugin-fulltext-filter.
- *
- * This is used by satellite plugins (search, BM25, pgvector) that need
- * to access the query builder from within a filter's apply callback
- * to inject SELECT expressions (for ranking/scoring) and ORDER BY clauses.
- *
- * @param build - The Graphile Build object (needs build.dataplanPg.PgCondition)
- * @param $condition - The PgCondition instance from the filter apply callback
- * @returns The PgSelectQueryBuilder if found, or null
- */
-export function getQueryBuilder(build, $condition) {
-    const PgCondition = build.dataplanPg?.PgCondition;
-    if (!PgCondition)
-        return null;
-    let current = $condition;
-    const { alias } = current;
-    // Walk up through nested PgConditions (e.g. and/or/not)
-    // Note: PgCondition.parent is protected, so we use bracket notation
-    // to access it from outside the class hierarchy.
-    while (current &&
-        current instanceof PgCondition &&
-        current.alias === alias) {
-        current = current['parent'];
-    }
-    // Verify we found a query builder with matching alias
-    // Using duck-typing per Benjie's pattern
-    if (current &&
-        typeof current.selectAndReturnIndex === 'function' &&
-        current.alias === alias) {
-        return current;
-    }
-    return null;
-}
 /**
  * Creates an assertion function that validates filter input values.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-connection-filter",
-  "version": "1.15.0",
+  "version": "1.15.2",
   "description": "PostGraphile v5 native connection filter plugin - adds advanced filtering to connections",
   "author": "Constructive <developers@constructive.io>",
   "homepage": "https://github.com/constructive-io/constructive",
@@ -39,11 +39,14 @@
   "bugs": {
     "url": "https://github.com/constructive-io/constructive/issues"
   },
+  "dependencies": {
+    "graphile-plugin-utils": "^1.0.1"
+  },
   "devDependencies": {
     "@types/node": "^22.19.11",
-    "graphile-test": "^4.20.0",
+    "graphile-test": "^4.20.2",
     "makage": "^0.3.0",
-    "pgsql-test": "^4.19.0"
+    "pgsql-test": "^4.19.2"
   },
   "peerDependencies": {
     "@dataplan/pg": "1.0.3",
@@ -54,5 +57,5 @@
     "pg-sql2": "5.0.1",
     "postgraphile": "5.0.3"
   },
-  "gitHead": "7eb34a3baa10ba3476575967b87ff51b606e042a"
+  "gitHead": "cd21f62bb64bdc7f4f40f6cef6af73f8f1c8f8dc"
 }

package/utils.d.ts

@@ -1,37 +1,15 @@
 /**
  * Utility functions for the connection filter plugin.
  */
+export { getQueryBuilder, isComputedScalarAttributeResource } from 'graphile-plugin-utils';
 /**
  * Check if a value is an empty object (no own enumerable keys).
  */
 export declare function isEmpty(o: unknown): boolean;
-/**
- * Check if a pgResource is a computed scalar attribute function.
- * A computed attribute is a function that:
- * - has parameters
- * - returns a scalar (no attributes on codec)
- * - is unique (returns single row)
- * - first parameter's codec has attributes (i.e. takes a table row)
- */
-export declare function isComputedScalarAttributeResource(s: any): boolean;
 /**
  * Get all computed attribute resources for a given source.
  */
 export declare function getComputedAttributeResources(build: any, source: any): any[];
-/**
- * Walks from a PgCondition up to the PgSelectQueryBuilder.
- * Uses the .parent property on PgCondition to traverse up the chain,
- * following Benjie's pattern from postgraphile-plugin-fulltext-filter.
- *
- * This is used by satellite plugins (search, BM25, pgvector) that need
- * to access the query builder from within a filter's apply callback
- * to inject SELECT expressions (for ranking/scoring) and ORDER BY clauses.
- *
- * @param build - The Graphile Build object (needs build.dataplanPg.PgCondition)
- * @param $condition - The PgCondition instance from the filter apply callback
- * @returns The PgSelectQueryBuilder if found, or null
- */
-export declare function getQueryBuilder(build: GraphileBuild.Build, $condition: any): any | null;
 /**
  * Creates an assertion function that validates filter input values.
  *

package/utils.js

@@ -3,85 +3,30 @@
  * Utility functions for the connection filter plugin.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isComputedScalarAttributeResource = exports.getQueryBuilder = void 0;
 exports.isEmpty = isEmpty;
-exports.isComputedScalarAttributeResource = isComputedScalarAttributeResource;
 exports.getComputedAttributeResources = getComputedAttributeResources;
-exports.getQueryBuilder = getQueryBuilder;
 exports.makeAssertAllowed = makeAssertAllowed;
+const graphile_plugin_utils_1 = require("graphile-plugin-utils");
+// Shared helpers now live in graphile-plugin-utils. Re-exported here so the
+// plugin's public API (see index.ts) stays backward compatible.
+var graphile_plugin_utils_2 = require("graphile-plugin-utils");
+Object.defineProperty(exports, "getQueryBuilder", { enumerable: true, get: function () { return graphile_plugin_utils_2.getQueryBuilder; } });
+Object.defineProperty(exports, "isComputedScalarAttributeResource", { enumerable: true, get: function () { return graphile_plugin_utils_2.isComputedScalarAttributeResource; } });
 /**
  * Check if a value is an empty object (no own enumerable keys).
  */
 function isEmpty(o) {
     return typeof o === 'object' && o !== null && Object.keys(o).length === 0;
 }
-/**
- * Check if a pgResource is a computed scalar attribute function.
- * A computed attribute is a function that:
- * - has parameters
- * - returns a scalar (no attributes on codec)
- * - is unique (returns single row)
- * - first parameter's codec has attributes (i.e. takes a table row)
- */
-function isComputedScalarAttributeResource(s) {
-    if (!s.parameters || s.parameters.length < 1) {
-        return false;
-    }
-    if (s.codec.attributes) {
-        return false;
-    }
-    if (!s.isUnique) {
-        return false;
-    }
-    const firstParameter = s.parameters[0];
-    if (!firstParameter?.codec.attributes) {
-        return false;
-    }
-    return true;
-}
 /**
  * Get all computed attribute resources for a given source.
  */
 function getComputedAttributeResources(build, source) {
-    const computedAttributeSources = Object.values(build.input.pgRegistry.pgResources).filter((s) => isComputedScalarAttributeResource(s) &&
+    const computedAttributeSources = Object.values(build.input.pgRegistry.pgResources).filter((s) => (0, graphile_plugin_utils_1.isComputedScalarAttributeResource)(s) &&
         s.parameters[0].codec === source.codec);
     return computedAttributeSources;
 }
-/**
- * Walks from a PgCondition up to the PgSelectQueryBuilder.
- * Uses the .parent property on PgCondition to traverse up the chain,
- * following Benjie's pattern from postgraphile-plugin-fulltext-filter.
- *
- * This is used by satellite plugins (search, BM25, pgvector) that need
- * to access the query builder from within a filter's apply callback
- * to inject SELECT expressions (for ranking/scoring) and ORDER BY clauses.
- *
- * @param build - The Graphile Build object (needs build.dataplanPg.PgCondition)
- * @param $condition - The PgCondition instance from the filter apply callback
- * @returns The PgSelectQueryBuilder if found, or null
- */
-function getQueryBuilder(build, $condition) {
-    const PgCondition = build.dataplanPg?.PgCondition;
-    if (!PgCondition)
-        return null;
-    let current = $condition;
-    const { alias } = current;
-    // Walk up through nested PgConditions (e.g. and/or/not)
-    // Note: PgCondition.parent is protected, so we use bracket notation
-    // to access it from outside the class hierarchy.
-    while (current &&
-        current instanceof PgCondition &&
-        current.alias === alias) {
-        current = current['parent'];
-    }
-    // Verify we found a query builder with matching alias
-    // Using duck-typing per Benjie's pattern
-    if (current &&
-        typeof current.selectAndReturnIndex === 'function' &&
-        current.alias === alias) {
-        return current;
-    }
-    return null;
-}
 /**
  * Creates an assertion function that validates filter input values.
  *