graphile-pg-aggregates 1.9.1 → 1.9.3

package/FilterRelationalAggregatesPlugin.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PgAggregatesFilterRelationalAggregatesPlugin = exports.Plugin = void 0;
+const graphile_plugin_utils_1 = require("graphile-plugin-utils");
 const EXPORTABLE_1 = require("./EXPORTABLE");
 const version = '1.0.0';
 const pgAggregateApplyAttributeOrder = (0, EXPORTABLE_1.EXPORTABLE)(() => (PgCondition, sql, spec, attributeName, attrCodec, rawAttrCodec, $parent, input) => {
@@ -373,7 +374,7 @@ group by ())`;
                             }, `Add aggregate '${attributeName}' filter for source '${table.name}' for spec '${spec.id}'`);
                         }, Object.create(null))
                     }, `Adding per-attribute '${spec.id}' aggregate filters for '${pgTypeResource.name}'`);
-                    const computedAttributeResources = Object.values(build.input.pgRegistry.pgResources).filter((s) => isComputedScalarAttributeResource(s) &&
+                    const computedAttributeResources = Object.values(build.input.pgRegistry.pgResources).filter((s) => (0, graphile_plugin_utils_1.isComputedScalarAttributeResource)(s) &&
                         s.parameters[0].codec === table.codec &&
                         s.parameters.slice(1).every((p) => p.optional));
                     fields = extend(fields, {
@@ -425,19 +426,3 @@ group by ())`;
     }
 };
 exports.PgAggregatesFilterRelationalAggregatesPlugin = exports.Plugin;
-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;
-}

package/esm/FilterRelationalAggregatesPlugin.js

@@ -1,3 +1,4 @@
+import { isComputedScalarAttributeResource } from 'graphile-plugin-utils';
 import { EXPORTABLE } from './EXPORTABLE';
 const version = '1.0.0';
 const pgAggregateApplyAttributeOrder = EXPORTABLE(() => (PgCondition, sql, spec, attributeName, attrCodec, rawAttrCodec, $parent, input) => {
@@ -422,19 +423,3 @@ group by ())`;
     }
 };
 export { Plugin as PgAggregatesFilterRelationalAggregatesPlugin };
-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;
-}

package/esm/utils.d.ts

@@ -1,10 +1,10 @@
-import type { PgResource, PgResourceParameter } from '@dataplan/pg';
+import type { PgResource } from '@dataplan/pg';
 import type { GraphileBuild } from 'graphile-build';
 export declare function getComputedAttributeResources(build: GraphileBuild.Build, resource: PgResource<any, any, any, any>): PgResource<string, import("@dataplan/pg").PgCodecWithAttributes<{
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
 }>, readonly import("@dataplan/pg").PgResourceUnique<{
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
-}>[], readonly PgResourceParameter<string, import("@dataplan/pg").PgCodec<string, {
+}>[], readonly import("@dataplan/pg").PgResourceParameter<string, import("@dataplan/pg").PgCodec<string, {
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
 }, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>>[], import("@dataplan/pg").PgRegistry<Record<string, import("@dataplan/pg").PgCodec<string, {
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
@@ -12,7 +12,7 @@ export declare function getComputedAttributeResources(build: GraphileBuild.Build
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
 }>, readonly import("@dataplan/pg").PgResourceUnique<{
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
-}>[], readonly PgResourceParameter<string, import("@dataplan/pg").PgCodec<string, {
+}>[], readonly import("@dataplan/pg").PgResourceParameter<string, import("@dataplan/pg").PgCodec<string, {
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
 }, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>>[]>>, Record<string, Record<string, import("@dataplan/pg").PgCodecRelationConfig<import("@dataplan/pg").PgCodec<string, {
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;

package/esm/utils.js

@@ -1,22 +1,7 @@
+import { isComputedScalarAttributeResource } from 'graphile-plugin-utils';
 export function getComputedAttributeResources(build, resource) {
-    const computedAttributeResources = Object.values(build.input.pgRegistry.pgResources).filter((s) => {
-        if (!s.parameters || s.parameters.length < 1) {
-            return false;
-        }
-        if (s.codec.attributes) {
-            return false;
-        }
-        if (!s.isUnique) {
-            return false;
-        }
-        if (s.codec.arrayOfCodec) {
-            return false;
-        }
-        const firstParameter = s.parameters[0];
-        if (firstParameter.codec !== resource.codec) {
-            return false;
-        }
-        return true;
-    });
+    const computedAttributeResources = Object.values(build.input.pgRegistry.pgResources).filter((s) => isComputedScalarAttributeResource(s) &&
+        !s.codec.arrayOfCodec &&
+        s.parameters[0].codec === resource.codec);
     return computedAttributeResources;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-pg-aggregates",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "description": "PostGraphile v5 aggregate plugin — sum, avg, min, max, stddev, variance, distinctCount, groupedAggregates with groupBy + having, orderBy relational aggregates",
   "author": "Constructive <developers@constructive.io>",
   "homepage": "https://github.com/constructive-io/constructive",
@@ -40,11 +40,14 @@
   "bugs": {
     "url": "https://github.com/constructive-io/constructive/issues"
   },
+  "dependencies": {
+    "graphile-plugin-utils": "^1.0.2"
+  },
   "devDependencies": {
     "@types/node": "^22.19.11",
-    "graphile-test": "^4.20.1",
+    "graphile-test": "^4.20.2",
     "makage": "^0.3.0",
-    "pgsql-test": "^4.19.1"
+    "pgsql-test": "^4.19.2"
   },
   "peerDependencies": {
     "@dataplan/pg": "1.0.3",
@@ -57,5 +60,5 @@
     "pg-sql2": "5.0.1",
     "postgraphile": "5.0.3"
   },
-  "gitHead": "6235bf0645f56d423fa464404ec1e3283c49e532"
+  "gitHead": "fe49621d08cbf93d3b75ee7bb9b0849580980369"
 }

package/utils.d.ts

@@ -1,10 +1,10 @@
-import type { PgResource, PgResourceParameter } from '@dataplan/pg';
+import type { PgResource } from '@dataplan/pg';
 import type { GraphileBuild } from 'graphile-build';
 export declare function getComputedAttributeResources(build: GraphileBuild.Build, resource: PgResource<any, any, any, any>): PgResource<string, import("@dataplan/pg").PgCodecWithAttributes<{
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
 }>, readonly import("@dataplan/pg").PgResourceUnique<{
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
-}>[], readonly PgResourceParameter<string, import("@dataplan/pg").PgCodec<string, {
+}>[], readonly import("@dataplan/pg").PgResourceParameter<string, import("@dataplan/pg").PgCodec<string, {
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
 }, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>>[], import("@dataplan/pg").PgRegistry<Record<string, import("@dataplan/pg").PgCodec<string, {
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
@@ -12,7 +12,7 @@ export declare function getComputedAttributeResources(build: GraphileBuild.Build
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
 }>, readonly import("@dataplan/pg").PgResourceUnique<{
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
-}>[], readonly PgResourceParameter<string, import("@dataplan/pg").PgCodec<string, {
+}>[], readonly import("@dataplan/pg").PgResourceParameter<string, import("@dataplan/pg").PgCodec<string, {
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;
 }, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>>[]>>, Record<string, Record<string, import("@dataplan/pg").PgCodecRelationConfig<import("@dataplan/pg").PgCodec<string, {
     [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any>, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined>>, boolean>;

package/utils.js

@@ -1,25 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getComputedAttributeResources = getComputedAttributeResources;
+const graphile_plugin_utils_1 = require("graphile-plugin-utils");
 function getComputedAttributeResources(build, resource) {
-    const computedAttributeResources = Object.values(build.input.pgRegistry.pgResources).filter((s) => {
-        if (!s.parameters || s.parameters.length < 1) {
-            return false;
-        }
-        if (s.codec.attributes) {
-            return false;
-        }
-        if (!s.isUnique) {
-            return false;
-        }
-        if (s.codec.arrayOfCodec) {
-            return false;
-        }
-        const firstParameter = s.parameters[0];
-        if (firstParameter.codec !== resource.codec) {
-            return false;
-        }
-        return true;
-    });
+    const computedAttributeResources = Object.values(build.input.pgRegistry.pgResources).filter((s) => (0, graphile_plugin_utils_1.isComputedScalarAttributeResource)(s) &&
+        !s.codec.arrayOfCodec &&
+        s.parameters[0].codec === resource.codec);
     return computedAttributeResources;
 }