graphile-utils 5.0.0-0.28 → 5.0.0-0.29

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # graphile-utils
 
+## 5.0.0-0.29
+
+### Patch Changes
+
+- [#223](https://github.com/benjie/postgraphile-private/pull/223)
+  [`df8c06657`](https://github.com/benjie/postgraphile-private/commit/df8c06657e6f5a7d1444d86dc32fd750d1433223)
+  Thanks [@benjie](https://github.com/benjie)! - `graphile-utils` now includes
+  the `makeAddPgTableConditionPlugin` and `makeAddPgTableOrderByPlugin`
+  generators, freshly ported from V4. The signatures of these functions has
+  changed slightly, but the functionality is broadly the same.
+- Updated dependencies
+  [[`4c2b7d1ca`](https://github.com/benjie/postgraphile-private/commit/4c2b7d1ca1afbda1e47da22c346cc3b03d01b7f0),
+  [`2abc58cf6`](https://github.com/benjie/postgraphile-private/commit/2abc58cf61e78e77b2ba44a875f0ef5b3f98b245),
+  [`c8a56cdc8`](https://github.com/benjie/postgraphile-private/commit/c8a56cdc83390e5735beb9b90f004e7975cab28c),
+  [`df8c06657`](https://github.com/benjie/postgraphile-private/commit/df8c06657e6f5a7d1444d86dc32fd750d1433223)]:
+  - grafast@0.0.1-0.18
+  - graphile-build@5.0.0-0.24
+  - graphile-build-pg@5.0.0-0.29
+
 ## 5.0.0-0.28
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,6 +1,8 @@
 export { EXPORTABLE } from "./exportable.js";
 export { gql } from "./gql.js";
 export { makeAddInflectorsPlugin } from "./makeAddInflectorsPlugin.js";
+export { makeAddPgTableConditionPlugin } from "./makeAddPgTableConditionPlugin.js";
+export { makeAddPgTableOrderByPlugin, MakeAddPgTableOrderByPluginOrders, NullsSortMethod, orderByAscDesc, OrderByAscDescOptions, } from "./makeAddPgTableOrderByPlugin.js";
 export { ChangeNullabilityRules, ChangeNullabilityTypeRules, makeChangeNullabilityPlugin, NullabilitySpec, NullabilitySpecString, } from "./makeChangeNullabilityPlugin.js";
 export { EnumResolver, ExtensionDefinition, makeExtendSchemaPlugin, ObjectFieldConfig, ObjectPlan, ObjectResolver, Plans, Resolvers, } from "./makeExtendSchemaPlugin.js";
 export { makeJSONPgSmartTagsPlugin, makePgSmartTagsFromFilePlugin, makePgSmartTagsPlugin, TagsFilePlugin, } from "./makePgSmartTagsPlugin.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EACL,sBAAsB,EACtB,0BAA0B,EAC1B,2BAA2B,EAC3B,eAAe,EACf,qBAAqB,GACtB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,KAAK,EACL,SAAS,GACV,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,yBAAyB,EACzB,6BAA6B,EAC7B,qBAAqB,EACrB,cAAc,GACf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACnF,OAAO,EACL,2BAA2B,EAC3B,iCAAiC,EACjC,eAAe,EACf,cAAc,EACd,qBAAqB,GACtB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,sBAAsB,EACtB,0BAA0B,EAC1B,2BAA2B,EAC3B,eAAe,EACf,qBAAqB,GACtB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,KAAK,EACL,SAAS,GACV,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,yBAAyB,EACzB,6BAA6B,EAC7B,qBAAqB,EACrB,cAAc,GACf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC"}

package/dist/index.js

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeWrapPlansPlugin = exports.makeProcessSchemaPlugin = exports.TagsFilePlugin = exports.makePgSmartTagsPlugin = exports.makePgSmartTagsFromFilePlugin = exports.makeJSONPgSmartTagsPlugin = exports.makeExtendSchemaPlugin = exports.makeChangeNullabilityPlugin = exports.makeAddInflectorsPlugin = exports.gql = exports.EXPORTABLE = void 0;
+exports.makeWrapPlansPlugin = exports.makeProcessSchemaPlugin = exports.TagsFilePlugin = exports.makePgSmartTagsPlugin = exports.makePgSmartTagsFromFilePlugin = exports.makeJSONPgSmartTagsPlugin = exports.makeExtendSchemaPlugin = exports.makeChangeNullabilityPlugin = exports.orderByAscDesc = exports.makeAddPgTableOrderByPlugin = exports.makeAddPgTableConditionPlugin = exports.makeAddInflectorsPlugin = exports.gql = exports.EXPORTABLE = void 0;
 var exportable_js_1 = require("./exportable.js");
 Object.defineProperty(exports, "EXPORTABLE", { enumerable: true, get: function () { return exportable_js_1.EXPORTABLE; } });
 var gql_js_1 = require("./gql.js");
 Object.defineProperty(exports, "gql", { enumerable: true, get: function () { return gql_js_1.gql; } });
 var makeAddInflectorsPlugin_js_1 = require("./makeAddInflectorsPlugin.js");
 Object.defineProperty(exports, "makeAddInflectorsPlugin", { enumerable: true, get: function () { return makeAddInflectorsPlugin_js_1.makeAddInflectorsPlugin; } });
+var makeAddPgTableConditionPlugin_js_1 = require("./makeAddPgTableConditionPlugin.js");
+Object.defineProperty(exports, "makeAddPgTableConditionPlugin", { enumerable: true, get: function () { return makeAddPgTableConditionPlugin_js_1.makeAddPgTableConditionPlugin; } });
+var makeAddPgTableOrderByPlugin_js_1 = require("./makeAddPgTableOrderByPlugin.js");
+Object.defineProperty(exports, "makeAddPgTableOrderByPlugin", { enumerable: true, get: function () { return makeAddPgTableOrderByPlugin_js_1.makeAddPgTableOrderByPlugin; } });
+Object.defineProperty(exports, "orderByAscDesc", { enumerable: true, get: function () { return makeAddPgTableOrderByPlugin_js_1.orderByAscDesc; } });
 var makeChangeNullabilityPlugin_js_1 = require("./makeChangeNullabilityPlugin.js");
 Object.defineProperty(exports, "makeChangeNullabilityPlugin", { enumerable: true, get: function () { return makeChangeNullabilityPlugin_js_1.makeChangeNullabilityPlugin; } });
 var makeExtendSchemaPlugin_js_1 = require("./makeExtendSchemaPlugin.js");

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAApC,2GAAA,UAAU,OAAA;AACnB,mCAA+B;AAAtB,6FAAA,GAAG,OAAA;AACZ,2EAAuE;AAA9D,qIAAA,uBAAuB,OAAA;AAChC,mFAM0C;AAHxC,6IAAA,2BAA2B,OAAA;AAI7B,yEASqC;AANnC,mIAAA,sBAAsB,OAAA;AAOxB,uEAKoC;AAJlC,qIAAA,yBAAyB,OAAA;AACzB,yIAAA,6BAA6B,OAAA;AAC7B,iIAAA,qBAAqB,OAAA;AACrB,0HAAA,cAAc,OAAA;AAEhB,2EAAuE;AAA9D,qIAAA,uBAAuB,OAAA;AAChC,mEAQkC;AAPhC,6HAAA,mBAAmB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAApC,2GAAA,UAAU,OAAA;AACnB,mCAA+B;AAAtB,6FAAA,GAAG,OAAA;AACZ,2EAAuE;AAA9D,qIAAA,uBAAuB,OAAA;AAChC,uFAAmF;AAA1E,iJAAA,6BAA6B,OAAA;AACtC,mFAM0C;AALxC,6IAAA,2BAA2B,OAAA;AAG3B,gIAAA,cAAc,OAAA;AAGhB,mFAM0C;AAHxC,6IAAA,2BAA2B,OAAA;AAI7B,yEASqC;AANnC,mIAAA,sBAAsB,OAAA;AAOxB,uEAKoC;AAJlC,qIAAA,yBAAyB,OAAA;AACzB,yIAAA,6BAA6B,OAAA;AAC7B,iIAAA,qBAAqB,OAAA;AACrB,0HAAA,cAAc,OAAA;AAEhB,2EAAuE;AAA9D,qIAAA,uBAAuB,OAAA;AAChC,mEAQkC;AAPhC,6HAAA,mBAAmB,OAAA"}

package/dist/makeAddPgTableConditionPlugin.d.ts

@@ -0,0 +1,14 @@
+import type { PgConditionStep, PgSelectStep } from "@dataplan/pg";
+import type { FieldArgs, GraphileInputFieldConfig } from "grafast";
+import type { SQL, sql } from "pg-sql2";
+export declare function makeAddPgTableConditionPlugin(match: {
+    databaseName?: string;
+    schemaName: string;
+    tableName: string;
+}, conditionFieldName: string, conditionFieldSpecGenerator: (build: GraphileBuild.Build) => GraphileInputFieldConfig<any, any, any, any, any>, conditionGenerator?: (value: FieldArgs, helpers: {
+    $condition: PgConditionStep<PgSelectStep<any, any, any, any>>;
+    sql: typeof sql;
+    sqlTableAlias: SQL;
+    build: GraphileBuild.Build;
+}) => SQL | null | undefined): GraphileConfig.Plugin;
+//# sourceMappingURL=makeAddPgTableConditionPlugin.d.ts.map

package/dist/makeAddPgTableConditionPlugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"makeAddPgTableConditionPlugin.d.ts","sourceRoot":"","sources":["../src/makeAddPgTableConditionPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAIxC,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EACvE,kBAAkB,EAAE,MAAM,EAC1B,2BAA2B,EAAE,CAC3B,KAAK,EAAE,aAAa,CAAC,KAAK,KACvB,wBAAwB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EACtD,kBAAkB,CAAC,EAAE,CACnB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE;IACP,UAAU,EAAE,eAAe,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9D,GAAG,EAAE,OAAO,GAAG,CAAC;IAChB,aAAa,EAAE,GAAG,CAAC;IACnB,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC;CAC5B,KACE,GAAG,GAAG,IAAI,GAAG,SAAS,GAC1B,cAAc,CAAC,MAAM,CAqGvB"}

package/dist/makeAddPgTableConditionPlugin.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeAddPgTableConditionPlugin = void 0;
+const exportable_js_1 = require("./exportable.js");
+function makeAddPgTableConditionPlugin(match, conditionFieldName, conditionFieldSpecGenerator, conditionGenerator) {
+    const { databaseName = "main", schemaName, tableName } = match;
+    const displayName = `makeAddPgTableConditionPlugin__${schemaName}__${tableName}__${conditionFieldName}`;
+    const plugin = {
+        name: displayName,
+        version: "0.0.0",
+        // Make sure we're loaded before PgConnectionArgOrderBy, otherwise
+        // ordering added by conditions will be overridden by the default
+        // ordering.
+        before: ["PgConnectionArgOrderByPlugin"],
+        schema: {
+            hooks: {
+                build(build) {
+                    const meta = (build._pluginMeta[displayName] = Object.create(null));
+                    meta.seen = false;
+                    return build;
+                },
+                finalize(schema, build) {
+                    const meta = build._pluginMeta[displayName];
+                    if (!meta.seen) {
+                        // eslint-disable-next-line no-console
+                        console.error(`WARNING: failed to add condition '${conditionFieldName}' to table "${schemaName}"."${tableName}"; did you get the schema/table name right?`);
+                    }
+                    return schema;
+                },
+                GraphQLInputObjectType_fields(fields, build, context) {
+                    const { sql } = build;
+                    const { scope: { isPgCondition, pgCodec: table }, fieldWithHooks, } = context;
+                    if (!isPgCondition ||
+                        !table ||
+                        !table.columns ||
+                        table.extensions?.pg?.databaseName !== databaseName ||
+                        table.extensions?.pg?.schemaName !== schemaName ||
+                        table.extensions?.pg?.name !== tableName) {
+                        return fields;
+                    }
+                    const conditionFieldSpec = conditionFieldSpecGenerator(build);
+                    if (conditionFieldSpec.applyPlan ||
+                        conditionFieldSpec.extensions?.graphile?.applyPlan) {
+                        if (conditionGenerator) {
+                            throw new Error(`${displayName}: You supplied 'applyPlan' for your field spec, so you cannot also supply a 'conditionGenerator'`);
+                        }
+                        // Done.
+                    }
+                    else {
+                        if (!conditionGenerator) {
+                            throw new Error(`${displayName}: You have not supplied 'applyPlan' for your field spec, nor a 'conditionGenerator', so we don't know what to do with this condition`);
+                        }
+                        // build applyPlan
+                        conditionFieldSpec.applyPlan = (0, exportable_js_1.EXPORTABLE)((build, conditionGenerator, sql) => function applyPlan($condition, val) {
+                            const expression = conditionGenerator(val, {
+                                $condition,
+                                sql,
+                                sqlTableAlias: $condition.alias,
+                                build,
+                            });
+                            if (expression) {
+                                $condition.where(expression);
+                            }
+                        }, [build, conditionGenerator, sql]);
+                    }
+                    const meta = build._pluginMeta[displayName];
+                    meta.seen = true;
+                    return build.extend(fields, {
+                        [conditionFieldName]: fieldWithHooks({
+                            fieldName: conditionFieldName,
+                        }, conditionFieldSpec),
+                    }, `Adding condition from ${displayName}`);
+                },
+            },
+        },
+    };
+    return plugin;
+}
+exports.makeAddPgTableConditionPlugin = makeAddPgTableConditionPlugin;
+//# sourceMappingURL=makeAddPgTableConditionPlugin.js.map

package/dist/makeAddPgTableConditionPlugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"makeAddPgTableConditionPlugin.js","sourceRoot":"","sources":["../src/makeAddPgTableConditionPlugin.ts"],"names":[],"mappings":"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"}

package/dist/makeAddPgTableOrderByPlugin.d.ts

@@ -0,0 +1,24 @@
+import type { PgOrderSpec, PgSelectStep } from "@dataplan/pg";
+type OrderBySpecIdentity = string | Omit<PgOrderSpec, "direction"> | (($select: PgSelectStep<any, any, any, any>) => Omit<PgOrderSpec, "direction">);
+export interface MakeAddPgTableOrderByPluginOrders {
+    [orderByEnumValue: string]: {
+        extensions: {
+            graphile: {
+                applyPlan($select: PgSelectStep<any, any, any, any>): void;
+            };
+        };
+    };
+}
+export declare function makeAddPgTableOrderByPlugin(match: {
+    databaseName?: string;
+    schemaName: string;
+    tableName: string;
+}, ordersGenerator: (build: GraphileBuild.Build) => MakeAddPgTableOrderByPluginOrders, hint?: string): GraphileConfig.Plugin;
+export type NullsSortMethod = "first" | "last" | "first-iff-ascending" | "last-iff-ascending" | undefined;
+export interface OrderByAscDescOptions {
+    unique?: boolean;
+    nulls?: NullsSortMethod;
+}
+export declare function orderByAscDesc(baseName: string, columnOrSqlFragment: OrderBySpecIdentity, uniqueOrOptions?: boolean | OrderByAscDescOptions): MakeAddPgTableOrderByPluginOrders;
+export {};
+//# sourceMappingURL=makeAddPgTableOrderByPlugin.d.ts.map

package/dist/makeAddPgTableOrderByPlugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"makeAddPgTableOrderByPlugin.d.ts","sourceRoot":"","sources":["../src/makeAddPgTableOrderByPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI9D,KAAK,mBAAmB,GACpB,MAAM,GACN,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,GAC9B,CAAC,CACC,OAAO,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,KACtC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;AAEzC,MAAM,WAAW,iCAAiC;IAChD,CAAC,gBAAgB,EAAE,MAAM,GAAG;QAC1B,UAAU,EAAE;YACV,QAAQ,EAAE;gBACR,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;aAC5D,CAAC;SACH,CAAC;KACH,CAAC;CACH;AAID,wBAAgB,2BAA2B,CACzC,KAAK,EAAE;IACL,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,EACD,eAAe,EAAE,CACf,KAAK,EAAE,aAAa,CAAC,KAAK,KACvB,iCAAiC,EACtC,IAAI,SAAiG,GACpG,cAAc,CAAC,MAAM,CAyCvB;AAED,MAAM,MAAM,eAAe,GACvB,OAAO,GACP,MAAM,GACN,qBAAqB,GACrB,oBAAoB,GACpB,SAAS,CAAC;AAEd,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,GAAE,OAAO,GAAG,qBAA6B,GACvD,iCAAiC,CAyJnC"}

package/dist/makeAddPgTableOrderByPlugin.js

@@ -0,0 +1,155 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.orderByAscDesc = exports.makeAddPgTableOrderByPlugin = void 0;
+const exportable_js_1 = require("./exportable.js");
+const counterByName = new Map();
+function makeAddPgTableOrderByPlugin(match, ordersGenerator, hint = `Adding orders with makeAddPgTableOrderByPlugin to "${match.schemaName}"."${match.tableName}"`) {
+    const { databaseName = "main", schemaName, tableName } = match;
+    const baseDisplayName = `makeAddPgTableOrderByPlugin_${schemaName}_${tableName}`;
+    let counter = counterByName.get(baseDisplayName);
+    if (!counter) {
+        counter = 0;
+    }
+    counter++;
+    counterByName.set(baseDisplayName, counter);
+    const displayName = counter === 1 ? baseDisplayName : `${baseDisplayName}_${counter}`;
+    const plugin = {
+        name: displayName,
+        version: "0.0.0",
+        schema: {
+            hooks: {
+                GraphQLEnumType_values(values, build, context) {
+                    const { extend } = build;
+                    const { scope: { isPgRowSortEnum, pgCodec: table }, } = context;
+                    if (!isPgRowSortEnum ||
+                        !table ||
+                        !table.columns ||
+                        table.extensions?.pg?.databaseName !== databaseName ||
+                        table.extensions?.pg?.schemaName !== schemaName ||
+                        table.extensions?.pg?.name !== tableName) {
+                        return values;
+                    }
+                    const newValues = ordersGenerator(build);
+                    return extend(values, newValues, hint);
+                },
+            },
+        },
+    };
+    return plugin;
+}
+exports.makeAddPgTableOrderByPlugin = makeAddPgTableOrderByPlugin;
+function orderByAscDesc(baseName, columnOrSqlFragment, uniqueOrOptions = false) {
+    const options = typeof uniqueOrOptions === "boolean"
+        ? { unique: uniqueOrOptions }
+        : uniqueOrOptions ?? {};
+    const { unique = false, nulls } = options;
+    if (typeof unique !== "boolean") {
+        throw new Error(`Invalid value for "unique" passed to orderByAscDesc for ${baseName}. Unique must be a boolean.`);
+    }
+    const isValidNullsOption = [
+        "first",
+        "last",
+        "first-iff-ascending",
+        "last-iff-ascending",
+        undefined,
+    ].includes(nulls);
+    if (!isValidNullsOption) {
+        throw new Error(`Invalid value for "nulls" passed to orderByAscDesc for ${baseName}. Nulls must be sorted by one of: undefined | "first" | "last" | "first-iff-ascending" | "last-iff-ascending".`);
+    }
+    const ascendingNulls = typeof nulls === "undefined"
+        ? undefined
+        : ["first", "first-iff-ascending"].includes(nulls)
+            ? "FIRST"
+            : "LAST";
+    const descendingNulls = typeof nulls === "undefined"
+        ? undefined
+        : ["first", "last-iff-ascending"].includes(nulls)
+            ? "FIRST"
+            : "LAST";
+    let spec;
+    const ascendingPlan = typeof columnOrSqlFragment === "string"
+        ? (0, exportable_js_1.EXPORTABLE)((ascendingNulls, columnOrSqlFragment, unique) => function applyPlan($select) {
+            $select.orderBy({
+                nulls: ascendingNulls,
+                attribute: columnOrSqlFragment,
+                direction: "ASC",
+            });
+            if (unique) {
+                $select.setOrderIsUnique();
+            }
+        }, [ascendingNulls, columnOrSqlFragment, unique])
+        : typeof columnOrSqlFragment === "function"
+            ? (0, exportable_js_1.EXPORTABLE)((ascendingNulls, columnOrSqlFragment, unique) => function applyPlan($select) {
+                $select.orderBy({
+                    nulls: ascendingNulls,
+                    ...columnOrSqlFragment($select),
+                    direction: "ASC",
+                });
+                if (unique) {
+                    $select.setOrderIsUnique();
+                }
+            }, [ascendingNulls, columnOrSqlFragment, unique])
+            : ((spec = {
+                nulls: ascendingNulls,
+                ...columnOrSqlFragment,
+                direction: "ASC",
+            }),
+                (0, exportable_js_1.EXPORTABLE)((spec, unique) => function applyPlan($select) {
+                    $select.orderBy(spec);
+                    if (unique) {
+                        $select.setOrderIsUnique();
+                    }
+                }, [spec, unique]));
+    const descendingPlan = typeof columnOrSqlFragment === "string"
+        ? (0, exportable_js_1.EXPORTABLE)((columnOrSqlFragment, descendingNulls, unique) => function applyPlan($select) {
+            $select.orderBy({
+                nulls: descendingNulls,
+                attribute: columnOrSqlFragment,
+                direction: "DESC",
+            });
+            if (unique) {
+                $select.setOrderIsUnique();
+            }
+        }, [columnOrSqlFragment, descendingNulls, unique])
+        : typeof columnOrSqlFragment === "function"
+            ? (0, exportable_js_1.EXPORTABLE)((columnOrSqlFragment, descendingNulls, unique) => function applyPlan($select) {
+                $select.orderBy({
+                    nulls: descendingNulls,
+                    ...columnOrSqlFragment($select),
+                    direction: "DESC",
+                });
+                if (unique) {
+                    $select.setOrderIsUnique();
+                }
+            }, [columnOrSqlFragment, descendingNulls, unique])
+            : ((spec = {
+                nulls: descendingNulls,
+                ...columnOrSqlFragment,
+                direction: "DESC",
+            }),
+                (0, exportable_js_1.EXPORTABLE)((spec, unique) => function applyPlan($select) {
+                    $select.orderBy(spec);
+                    if (unique) {
+                        $select.setOrderIsUnique();
+                    }
+                }, [spec, unique]));
+    const orders = {
+        [`${baseName}_ASC`]: {
+            extensions: {
+                graphile: {
+                    applyPlan: ascendingPlan,
+                },
+            },
+        },
+        [`${baseName}_DESC`]: {
+            extensions: {
+                graphile: {
+                    applyPlan: descendingPlan,
+                },
+            },
+        },
+    };
+    return orders;
+}
+exports.orderByAscDesc = orderByAscDesc;
+//# sourceMappingURL=makeAddPgTableOrderByPlugin.js.map

package/dist/makeAddPgTableOrderByPlugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"makeAddPgTableOrderByPlugin.js","sourceRoot":"","sources":["../src/makeAddPgTableOrderByPlugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-utils",
-  "version": "5.0.0-0.28",
+  "version": "5.0.0-0.29",
   "description": "Utilities to help with building graphile-build plugins",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -47,18 +47,19 @@
     "node": ">=14.17"
   },
   "peerDependencies": {
-    "grafast": "^0.0.1-0.17",
-    "graphile-build": "^5.0.0-0.23",
-    "graphile-build-pg": "^5.0.0-0.28",
+    "grafast": "^0.0.1-0.18",
+    "graphile-build": "^5.0.0-0.24",
+    "graphile-build-pg": "^5.0.0-0.29",
     "graphql": "^16.1.0-experimental-stream-defer.6",
     "pg-introspection": "^0.0.1-0.3"
   },
   "devDependencies": {
-    "graphile-build": "^5.0.0-0.23",
-    "graphile-build-pg": "^5.0.0-0.28",
+    "graphile-build": "^5.0.0-0.24",
+    "graphile-build-pg": "^5.0.0-0.29",
     "jest": "^28.1.0",
     "jest-serializer-graphql-schema": "^5.0.0-0.3",
     "nodemon": "^2.0.15",
+    "postgraphile": "^5.0.0-0.32",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.0-beta"
   },