graphile-utils 5.0.0-beta.8 → 5.0.0-rc.1

package/README.md

@@ -1,5 +1,3 @@
-# V5: NOT YET FULLY IMPLEMENTED
-
 # graphile-utils
 
 <span class="badge-patreon"><a href="https://patreon.com/benjie" title="Support Graphile development on Patreon"><img src="https://img.shields.io/badge/sponsor-via%20Patreon-orange.svg" alt="Patreon sponsor button" /></a></span>
@@ -21,9 +19,9 @@ PRs to improve documentation are always welcome!
 
 ## Crowd-funded open-source software
 
-To help us develop this software sustainably under the MIT license, we ask all
-individuals and businesses that use it to help support its ongoing maintenance
-and development via sponsorship.
+To help us develop this software sustainably, we ask all individuals and
+businesses that use it to help support its ongoing maintenance and development
+via sponsorship.
 
 ### [Click here to find out more about sponsors and sponsorship.](https://www.graphile.org/sponsor/)
 
@@ -31,112 +29,129 @@ And please give some love to our featured sponsors 🤩:
 
 <table><tr>
 <td align="center"><a href="https://www.the-guild.dev/"><img src="https://graphile.org/images/sponsors/theguild.png" width="90" height="90" alt="The Guild" /><br />The Guild</a> *</td>
-<td align="center"><a href="https://dovetailapp.com/"><img src="https://graphile.org/images/sponsors/dovetail.png" width="90" height="90" alt="Dovetail" /><br />Dovetail</a> *</td>
-<td align="center"><a href="https://qwick.com/"><img src="https://graphile.org/images/sponsors/qwick.png" width="90" height="90" alt="Qwick" /><br />Qwick</a> *</td>
-<td align="center"><a href="https://www.netflix.com/"><img src="https://graphile.org/images/sponsors/Netflix.png" width="90" height="90" alt="Netflix" /><br />Netflix</a> *</td>
-</tr><tr>
-<td align="center"><a href=""><img src="https://graphile.org/images/sponsors/chadf.png" width="90" height="90" alt="Chad Furman" /><br />Chad Furman</a> *</td>
-<td align="center"><a href="https://stellate.co/"><img src="https://graphile.org/images/sponsors/Stellate.png" width="90" height="90" alt="Stellate" /><br />Stellate</a> *</td>
-<td align="center"><a href="https://www.accenture.com/"><img src="https://graphile.org/images/sponsors/accenture.svg" width="90" height="90" alt="Accenture" /><br />Accenture</a> *</td>
+<td align="center"><a href="https://gosteelhead.com/"><img src="https://graphile.org/images/sponsors/steelhead.svg" width="90" height="90" alt="Steelhead" /><br />Steelhead</a> *</td>
 </tr></table>
 
 <em>\* Sponsors the entire Graphile suite</em>
 
 <!-- SPONSORS_END -->
 
-### `gql`
-
-Similar to the default export from `graphql-tag`, this export can be used to
-form tagged template literals that are useful when building schema extensions.
-`gql` in `graphile-utils` differs from `graphql-tag` in a number of ways, most
-notably: it can use interpolation to generate dynamically named fields and
-types, and it can embed raw values using the `embed` helper.
-
-### `embed`
+### `extendSchema`
 
-Used to wrap a value to be included in a `gql` AST, e.g. for use in GraphQL
-directives.
-
-### `makeExtendSchemaPlugin`
-
-Docs: https://postgraphile.org/postgraphile/next/make-extend-schema-plugin
+Docs: https://postgraphile.org/postgraphile/next/extend-schema
 
 Enables you to add additonal types or extend existing types within your Graphile
 Engine GraphQL schema.
 
 ```js
-const {
-  makeExtendSchemaPlugin,
-  gql,
-} = require('graphile-utils');
+import { extendSchema } from 'graphile-utils';
 
 const MySchemaExtensionPlugin =
-  makeExtendSchemaPlugin(
+  extendSchema(
     build => ({
-      typeDefs: gql`...`,
-      resolvers: ...
+      typeDefs: /* GraphQL */ `...`,
+      objects: {...},
+      interfaces: {...},
+      unions: {...},
     })
   );
 
-module.exports = MySchemaExtensionPlugin;
+export default MySchemaExtensionPlugin;
 ```
 
 e.g.:
 
 ```js
-makeExtendSchemaPlugin((build) => ({
-  typeDefs: gql`
-    type Random {
-      float: Float!
-      number(min: Int!, max: Int!): Int!
-    }
-    extend type Query {
-      random: Random
-    }
-  `,
-  resolvers: {
-    Query: {
-      random() {
-        return {};
+export default extendSchema((build) => {
+  const {
+    grafast: { constant },
+  } = build;
+  return {
+    typeDefs: /* GraphQL */ `
+      type Random {
+        float: Float!
+        number(min: Int!, max: Int!): Int!
+      }
+      extend type Query {
+        random: Random
+      }
+    `,
+    objects: {
+      Query: {
+        plans: {
+          random() {
+            return constant({});
+          },
+        },
       },
-    },
-    Random: {
-      float() {
-        return Math.random();
-      },
-      number(_parent, { min, max }) {
-        return min + Math.floor(Math.random() * (max - min + 1));
+      Random: {
+        plans: {
+          float() {
+            return lambda(null, () => Math.random());
+          },
+          number(_parent, { $min, $max }) {
+            return lambda(
+              [$min, $max],
+              ([min, max]) => min + Math.floor(Math.random() * (max - min + 1)),
+            );
+          },
+        },
       },
     },
-  },
-}));
+  };
+});
 ```
 
-### `makeAddInflectorsPlugin`
+#### `gql`
 
-Docs: https://postgraphile.org/postgraphile/next/make-add-inflectors-plugin
+Similar to the default export from `graphql-tag`, this export can be used to
+form tagged template literals that are useful when building schema extensions.
+`gql` in `graphile-utils` differs from `graphql-tag` in a number of ways, most
+notably: it can use interpolation to generate dynamically named fields and
+types, and it can embed raw values using the `embed` helper.
+
+```ts
+extendSchema({ typeDefs: gql`...` });
+```
 
-If you don't like the default naming conventions that come with a Graphile
-Engine GraphQL schema then it's easy for you to override them using the
-inflector.
+#### `embed`
 
-### `makeChangeNullabilityPlugin`
+Used to wrap a value to be included in a `gql` AST, e.g. for use in GraphQL
+directives.
 
-Docs: https://postgraphile.org/postgraphile/next/make-change-nullability-plugin
+```ts
+extendSchema({ typeDefs: gql`...${embed(...)}...` });
+```
+
+### `changeNullability`
+
+Docs: https://postgraphile.org/postgraphile/next/change-nullability
 
 Use this plugin to override the nullability of fields in your GraphQL schema.
 
-### `makeProcessSchemaPlugin`
+### `processSchema`
 
-Docs: https://postgraphile.org/postgraphile/next/make-process-schema-plugin
+Docs: https://postgraphile.org/postgraphile/next/process-schema
 
 Enables you to process the schema after it's built, e.g. print it to a file,
 augment it with a third party library (e.g. graphql-shield), etc.
 
-### `makeWrapResolversPlugin`
+### `wrapPlans`
+
+Docs: https://postgraphile.org/postgraphile/next/wrap-plans
+
+Enables you to wrap the field plan resolvers in the generated Grafast schema,
+allowing you to augment the way in which existing fields operate.
 
-Docs: https://www.graphile.org/postgraphile/make-wrap-resolvers-plugin/
+## Developing
 
-Enables you to wrap the field resolvers in the generated GraphQL API, allowing
-you to take an action before or after the resolver, or even modify the resolver
-result.
+### Testing
+
+Make sure you first follow the instructions in the
+[CONTRIBUTING.md file at the root of the repository](../../CONTRIBUTING.md),
+then run the test with the following commands:
+
+```bash
+yarn prepack
+yarn test
+```

package/dist/exportable.d.ts

@@ -1,2 +1,5 @@
-export declare function EXPORTABLE<T, TScope extends any[]>(factory: (...args: TScope) => T, args: [...TScope]): T;
+export declare function EXPORTABLE<T, TScope extends any[]>(factory: (...args: TScope) => T, args: [...TScope], nameHint?: string): T;
+export declare function isForbidden(thing: unknown): thing is {
+    $$export: false;
+};
 //# sourceMappingURL=exportable.d.ts.map

package/dist/exportable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exportable.d.ts","sourceRoot":"","sources":["../src/exportable.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,SAAS,GAAG,EAAE,EAChD,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,KAAK,CAAC,EAC/B,IAAI,EAAE,CAAC,GAAG,MAAM,CAAC,GAChB,CAAC,CAYH"}
+{"version":3,"file":"exportable.d.ts","sourceRoot":"","sources":["../src/exportable.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,SAAS,GAAG,EAAE,EAChD,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,KAAK,CAAC,EAC/B,IAAI,EAAE,CAAC,GAAG,MAAM,CAAC,EACjB,QAAQ,CAAC,EAAE,MAAM,GAChB,CAAC,CAmBH;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI;IAAE,QAAQ,EAAE,KAAK,CAAA;CAAE,CAOxE"}

package/dist/exportable.js

@@ -1,16 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EXPORTABLE = void 0;
-function EXPORTABLE(factory, args) {
+exports.EXPORTABLE = EXPORTABLE;
+exports.isForbidden = isForbidden;
+function EXPORTABLE(factory, args, nameHint) {
+    const forbiddenIndex = args.findIndex(isForbidden);
+    if (forbiddenIndex >= 0) {
+        throw new Error(`${nameHint ?? "Anonymous"} EXPORTABLE call's args[${forbiddenIndex}] is not allowed to be exported.`);
+    }
     const fn = factory(...args);
-    if ((typeof fn === "function" || (typeof fn === "object" && fn !== null)) &&
+    if (((typeof fn === "object" && fn !== null) || typeof fn === "function") &&
         !("$exporter$factory" in fn)) {
         Object.defineProperties(fn, {
             $exporter$args: { value: args },
             $exporter$factory: { value: factory },
+            $exporter$name: { writable: true, value: nameHint },
         });
     }
     return fn;
 }
-exports.EXPORTABLE = EXPORTABLE;
+function isForbidden(thing) {
+    return ((typeof thing === "object" || typeof thing === "function") &&
+        thing !== null &&
+        "$$export" in thing &&
+        thing.$$export === false);
+}
 //# sourceMappingURL=exportable.js.map

package/dist/exportable.js.map

@@ -1 +1 @@
-{"version":3,"file":"exportable.js","sourceRoot":"","sources":["../src/exportable.ts"],"names":[],"mappings":";;;AAAA,SAAgB,UAAU,CACxB,OAA+B,EAC/B,IAAiB;IAEjB,MAAM,EAAE,GAAM,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;IAC/B,IACE,CAAC,OAAO,EAAE,KAAK,UAAU,IAAI,CAAC,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,IAAI,CAAC,CAAC;QACrE,CAAC,CAAC,mBAAmB,IAAI,EAAE,CAAC,EAC5B;QACA,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE;YAC1B,cAAc,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;YAC/B,iBAAiB,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE;SACtC,CAAC,CAAC;KACJ;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAfD,gCAeC"}
+{"version":3,"file":"exportable.js","sourceRoot":"","sources":["../src/exportable.ts"],"names":[],"mappings":";;AAAA,gCAuBC;AAED,kCAOC;AAhCD,SAAgB,UAAU,CACxB,OAA+B,EAC/B,IAAiB,EACjB,QAAiB;IAEjB,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACnD,IAAI,cAAc,IAAI,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CACb,GAAG,QAAQ,IAAI,WAAW,2BAA2B,cAAc,kCAAkC,CACtG,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,GAAM,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;IAC/B,IACE,CAAC,CAAC,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,IAAI,CAAC,IAAI,OAAO,EAAE,KAAK,UAAU,CAAC;QACrE,CAAC,CAAC,mBAAmB,IAAI,EAAE,CAAC,EAC5B,CAAC;QACD,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE;YAC1B,cAAc,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;YAC/B,iBAAiB,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE;YACrC,cAAc,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE;SACpD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,WAAW,CAAC,KAAc;IACxC,OAAO,CACL,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,UAAU,CAAC;QAC1D,KAAK,KAAK,IAAI;QACd,UAAU,IAAI,KAAK;QACnB,KAAK,CAAC,QAAQ,KAAK,KAAK,CACzB,CAAC;AACJ,CAAC"}

package/dist/gql.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gql = void 0;
+exports.gql = gql;
 // eslint-disable-next-line no-restricted-syntax
 const graphql_1 = require("grafast/graphql");
 function isGraphQLDocument(input) {
@@ -56,5 +56,4 @@ function gql(strings, ...interpolatedValues) {
     const astWithPlaceholdersReplaced = (0, graphql_1.visit)(ast, visitor);
     return astWithPlaceholdersReplaced;
 }
-exports.gql = gql;
 //# sourceMappingURL=gql.js.map

package/dist/gql.js.map

@@ -1 +1 @@
-{"version":3,"file":"gql.js","sourceRoot":"","sources":["../src/gql.ts"],"names":[],"mappings":";;;AACA,gDAAgD;AAChD,6CAA+C;AAE/C,SAAS,iBAAiB,CAAC,KAAU;IACnC,OAAO,CACL,KAAK;QACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,CAAC,IAAI,KAAK,UAAU;QACzB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CACjC,CAAC;AACJ,CAAC;AAED,SAAgB,GAAG,CACjB,OAA6B,EAC7B,GAAG,kBAAgD;IAEnD,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,qBAAqB,GAA0B,EAAE,CAAC;IACxD,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,EAAE,GAAG,EAAE,EAAE;QAC9D,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9B,IAAI,GAAG,KAAK,MAAM,GAAG,CAAC,EAAE;YACtB,uDAAuD;SACxD;aAAM;YACL,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;YAClD,IAAI,OAAO,iBAAiB,KAAK,QAAQ,EAAE;gBACzC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC;aAC5C;iBAAM,IAAI,iBAAiB,CAAC,iBAAiB,CAAC,EAAE;gBAC/C,qBAAqB,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;aAC9D;iBAAM;gBACL,MAAM,IAAI,KAAK,CACb,eACE,GAAG,GAAG,CACR,+DAA+D,OAAO,iBAAiB,sBAAsB,UAAU,CAAC,IAAI,CAC1H,EAAE,CACH,GAAG,CACL,CAAC;aACH;SACF;KACF;IACD,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG;QACd,KAAK,EAAE,CAAC,IAAa,EAAE,EAAE;YACvB,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE;gBAC5B,OAAO;oBACL,GAAG,IAAI;oBACP,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,GAAG,qBAAqB,CAAC;iBAC7D,CAAC;aACH;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE;gBACnC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE;oBACrC,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;wBAClC,OAAO;4BACL,GAAG,IAAI;4BACP,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;yBACtC,CAAC;qBACH;iBACF;aACF;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;KACF,CAAC;IACF,MAAM,2BAA2B,GAAG,IAAA,eAAK,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACxD,OAAO,2BAA2B,CAAC;AACrC,CAAC;AAnDD,kBAmDC"}
+{"version":3,"file":"gql.js","sourceRoot":"","sources":["../src/gql.ts"],"names":[],"mappings":";;AAaA,kBAmDC;AA/DD,gDAAgD;AAChD,6CAA+C;AAE/C,SAAS,iBAAiB,CAAC,KAAU;IACnC,OAAO,CACL,KAAK;QACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,CAAC,IAAI,KAAK,UAAU;QACzB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CACjC,CAAC;AACJ,CAAC;AAED,SAAgB,GAAG,CACjB,OAA6B,EAC7B,GAAG,kBAAgD;IAEnD,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,qBAAqB,GAA0B,EAAE,CAAC;IACxD,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC;QAC/D,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9B,IAAI,GAAG,KAAK,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,uDAAuD;QACzD,CAAC;aAAM,CAAC;YACN,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;YAClD,IAAI,OAAO,iBAAiB,KAAK,QAAQ,EAAE,CAAC;gBAC1C,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC;YAC7C,CAAC;iBAAM,IAAI,iBAAiB,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAChD,qBAAqB,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CACb,eACE,GAAG,GAAG,CACR,+DAA+D,OAAO,iBAAiB,sBAAsB,UAAU,CAAC,IAAI,CAC1H,EAAE,CACH,GAAG,CACL,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG;QACd,KAAK,EAAE,CAAC,IAAa,EAAE,EAAE;YACvB,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC7B,OAAO;oBACL,GAAG,IAAI;oBACP,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,GAAG,qBAAqB,CAAC;iBAC7D,CAAC;YACJ,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBACpC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;oBACtC,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;wBACnC,OAAO;4BACL,GAAG,IAAI;4BACP,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;yBACtC,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;KACF,CAAC;IACF,MAAM,2BAA2B,GAAG,IAAA,eAAK,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACxD,OAAO,2BAA2B,CAAC;AACrC,CAAC"}

package/dist/index.d.ts

@@ -1,11 +1,46 @@
+import type { BaseGraphQLArguments, Step } from "grafast";
 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";
-export { makeProcessSchemaPlugin } from "./makeProcessSchemaPlugin.js";
-export { makeWrapPlansPlugin, PlanWrapperFilter, PlanWrapperFilterRule, PlanWrapperFn, PlanWrapperRule, PlanWrapperRules, PlanWrapperRulesGenerator, } from "./makeWrapPlansPlugin.js";
+export { addPgTableCondition, makeAddPgTableConditionPlugin, } from "./makeAddPgTableConditionPlugin.js";
+export { addPgTableOrderBy, makeAddPgTableOrderByPlugin, MakeAddPgTableOrderByPluginOrders, NullsSortMethod, orderByAscDesc, OrderByAscDescOptions, } from "./makeAddPgTableOrderByPlugin.js";
+export { changeNullability, ChangeNullabilityRules, ChangeNullabilityTypeRules, makeChangeNullabilityPlugin, NullabilitySpec, NullabilitySpecString, } from "./makeChangeNullabilityPlugin.js";
+export { EnumResolver, extendSchema, ExtensionDefinition, makeExtendSchemaPlugin, ObjectPlan, ObjectResolver, Plans, Resolvers, } from "./makeExtendSchemaPlugin.js";
+export { jsonPgSmartTags, makeJSONPgSmartTagsPlugin, makePgSmartTagsFromFilePlugin, makePgSmartTagsPlugin, pgSmartTags, pgSmartTagsFromFile, TagsFilePlugin, } from "./makePgSmartTagsPlugin.js";
+export { makeProcessSchemaPlugin, processSchema, } from "./makeProcessSchemaPlugin.js";
+export { makeWrapPlansPlugin, PlanWrapperFilter, PlanWrapperFilterRule, PlanWrapperFn, PlanWrapperRule, PlanWrapperRules, PlanWrapperRulesGenerator, wrapPlans, } from "./makeWrapPlansPlugin.js";
+declare module "grafast" {
+    interface ScalarPlan<TInternal = any, TExternal = any> {
+        scope?: GraphileBuild.ScopeScalar;
+    }
+    interface EnumPlan {
+        scope?: GraphileBuild.ScopeEnum;
+    }
+    interface EnumValueConfig {
+        scope?: Omit<GraphileBuild.ScopeEnumValuesValue, "valueName">;
+    }
+    interface ObjectPlan<TSource extends Step = Step> {
+        scope?: GraphileBuild.ScopeObject;
+    }
+    interface ObjectFieldConfig<TSource extends Step = Step, TArgs extends BaseGraphQLArguments = any, TResultStep extends Step = Step> {
+        scope?: Omit<GraphileBuild.ScopeObjectFieldsField, "fieldName">;
+    }
+    interface UnionPlan<TSpecifier = any, TSource extends Step = Step> {
+        scope?: GraphileBuild.ScopeUnion;
+    }
+    interface InterfacePlan<TSpecifier = any, TSource extends Step = Step> {
+        scope?: GraphileBuild.ScopeInterface;
+        fields?: {
+            [fieldName: string]: {
+                scope?: GraphileBuild.ScopeInterfaceFieldsField;
+            };
+        };
+    }
+    interface InputObjectPlan {
+        scope?: GraphileBuild.ScopeInputObject;
+    }
+    interface InputObjectFieldConfig<TParent = any, TData = any> {
+        scope?: Omit<GraphileBuild.ScopeInputObjectFieldsField, "fieldName">;
+    }
+}
 //# sourceMappingURL=index.d.ts.map

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,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE1D,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,mBAAmB,EACnB,6BAA6B,GAC9B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,iBAAiB,EACjB,2BAA2B,EAC3B,iCAAiC,EACjC,eAAe,EACf,cAAc,EACd,qBAAqB,GACtB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,iBAAiB,EACjB,sBAAsB,EACtB,0BAA0B,EAC1B,2BAA2B,EAC3B,eAAe,EACf,qBAAqB,GACtB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,mBAAmB,EACnB,sBAAsB,EACtB,UAAU,EACV,cAAc,EACd,KAAK,EACL,SAAS,GACV,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,eAAe,EACf,yBAAyB,EACzB,6BAA6B,EAC7B,qBAAqB,EACrB,WAAW,EACX,mBAAmB,EACnB,cAAc,GACf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,uBAAuB,EACvB,aAAa,GACd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,yBAAyB,EACzB,SAAS,GACV,MAAM,0BAA0B,CAAC;AAGlC,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,UAAU,CAAC,SAAS,GAAG,GAAG,EAAE,SAAS,GAAG,GAAG;QACnD,KAAK,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC;KACnC;IACD,UAAU,QAAQ;QAChB,KAAK,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC;KACjC;IACD,UAAU,eAAe;QACvB,KAAK,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;KAC/D;IACD,UAAU,UAAU,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI;QAC9C,KAAK,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC;KACnC;IACD,UAAU,iBAAiB,CACzB,OAAO,SAAS,IAAI,GAAG,IAAI,EAC3B,KAAK,SAAS,oBAAoB,GAAG,GAAG,EACxC,WAAW,SAAS,IAAI,GAAG,IAAI;QAE/B,KAAK,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;KACjE;IACD,UAAU,SAAS,CAAC,UAAU,GAAG,GAAG,EAAE,OAAO,SAAS,IAAI,GAAG,IAAI;QAC/D,KAAK,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC;KAClC;IACD,UAAU,aAAa,CAAC,UAAU,GAAG,GAAG,EAAE,OAAO,SAAS,IAAI,GAAG,IAAI;QACnE,KAAK,CAAC,EAAE,aAAa,CAAC,cAAc,CAAC;QACrC,MAAM,CAAC,EAAE;YACP,CAAC,SAAS,EAAE,MAAM,GAAG;gBACnB,KAAK,CAAC,EAAE,aAAa,CAAC,yBAAyB,CAAC;aACjD,CAAC;SACH,CAAC;KACH;IACD,UAAU,eAAe;QACvB,KAAK,CAAC,EAAE,aAAa,CAAC,gBAAgB,CAAC;KACxC;IACD,UAAU,sBAAsB,CAAC,OAAO,GAAG,GAAG,EAAE,KAAK,GAAG,GAAG;QACzD,KAAK,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,2BAA2B,EAAE,WAAW,CAAC,CAAC;KACtE;CACF"}

package/dist/index.js

@@ -1,6 +1,6 @@
 "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.orderByAscDesc = exports.makeAddPgTableOrderByPlugin = exports.makeAddPgTableConditionPlugin = exports.makeAddInflectorsPlugin = exports.gql = exports.EXPORTABLE = void 0;
+exports.wrapPlans = exports.makeWrapPlansPlugin = exports.processSchema = exports.makeProcessSchemaPlugin = exports.TagsFilePlugin = exports.pgSmartTagsFromFile = exports.pgSmartTags = exports.makePgSmartTagsPlugin = exports.makePgSmartTagsFromFilePlugin = exports.makeJSONPgSmartTagsPlugin = exports.jsonPgSmartTags = exports.makeExtendSchemaPlugin = exports.extendSchema = exports.makeChangeNullabilityPlugin = exports.changeNullability = exports.orderByAscDesc = exports.makeAddPgTableOrderByPlugin = exports.addPgTableOrderBy = exports.makeAddPgTableConditionPlugin = exports.addPgTableCondition = 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");
@@ -8,21 +8,31 @@ Object.defineProperty(exports, "gql", { enumerable: true, get: function () { ret
 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, "addPgTableCondition", { enumerable: true, get: function () { return makeAddPgTableConditionPlugin_js_1.addPgTableCondition; } });
 Object.defineProperty(exports, "makeAddPgTableConditionPlugin", { enumerable: true, get: function () { return makeAddPgTableConditionPlugin_js_1.makeAddPgTableConditionPlugin; } });
 var makeAddPgTableOrderByPlugin_js_1 = require("./makeAddPgTableOrderByPlugin.js");
+Object.defineProperty(exports, "addPgTableOrderBy", { enumerable: true, get: function () { return makeAddPgTableOrderByPlugin_js_1.addPgTableOrderBy; } });
 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, "changeNullability", { enumerable: true, get: function () { return makeChangeNullabilityPlugin_js_1.changeNullability; } });
 Object.defineProperty(exports, "makeChangeNullabilityPlugin", { enumerable: true, get: function () { return makeChangeNullabilityPlugin_js_1.makeChangeNullabilityPlugin; } });
 var makeExtendSchemaPlugin_js_1 = require("./makeExtendSchemaPlugin.js");
+Object.defineProperty(exports, "extendSchema", { enumerable: true, get: function () { return makeExtendSchemaPlugin_js_1.extendSchema; } });
 Object.defineProperty(exports, "makeExtendSchemaPlugin", { enumerable: true, get: function () { return makeExtendSchemaPlugin_js_1.makeExtendSchemaPlugin; } });
 var makePgSmartTagsPlugin_js_1 = require("./makePgSmartTagsPlugin.js");
+Object.defineProperty(exports, "jsonPgSmartTags", { enumerable: true, get: function () { return makePgSmartTagsPlugin_js_1.jsonPgSmartTags; } });
 Object.defineProperty(exports, "makeJSONPgSmartTagsPlugin", { enumerable: true, get: function () { return makePgSmartTagsPlugin_js_1.makeJSONPgSmartTagsPlugin; } });
 Object.defineProperty(exports, "makePgSmartTagsFromFilePlugin", { enumerable: true, get: function () { return makePgSmartTagsPlugin_js_1.makePgSmartTagsFromFilePlugin; } });
 Object.defineProperty(exports, "makePgSmartTagsPlugin", { enumerable: true, get: function () { return makePgSmartTagsPlugin_js_1.makePgSmartTagsPlugin; } });
+Object.defineProperty(exports, "pgSmartTags", { enumerable: true, get: function () { return makePgSmartTagsPlugin_js_1.pgSmartTags; } });
+Object.defineProperty(exports, "pgSmartTagsFromFile", { enumerable: true, get: function () { return makePgSmartTagsPlugin_js_1.pgSmartTagsFromFile; } });
 Object.defineProperty(exports, "TagsFilePlugin", { enumerable: true, get: function () { return makePgSmartTagsPlugin_js_1.TagsFilePlugin; } });
 var makeProcessSchemaPlugin_js_1 = require("./makeProcessSchemaPlugin.js");
 Object.defineProperty(exports, "makeProcessSchemaPlugin", { enumerable: true, get: function () { return makeProcessSchemaPlugin_js_1.makeProcessSchemaPlugin; } });
+Object.defineProperty(exports, "processSchema", { enumerable: true, get: function () { return makeProcessSchemaPlugin_js_1.processSchema; } });
 var makeWrapPlansPlugin_js_1 = require("./makeWrapPlansPlugin.js");
 Object.defineProperty(exports, "makeWrapPlansPlugin", { enumerable: true, get: function () { return makeWrapPlansPlugin_js_1.makeWrapPlansPlugin; } });
+Object.defineProperty(exports, "wrapPlans", { enumerable: true, get: function () { return makeWrapPlansPlugin_js_1.wrapPlans; } });
+/* eslint-enable @typescript-eslint/no-unused-vars */
 //# sourceMappingURL=index.js.map

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,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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAEA,iDAA6C;AAApC,2GAAA,UAAU,OAAA;AACnB,mCAA+B;AAAtB,6FAAA,GAAG,OAAA;AACZ,2EAAuE;AAA9D,qIAAA,uBAAuB,OAAA;AAChC,uFAG4C;AAF1C,uIAAA,mBAAmB,OAAA;AACnB,iJAAA,6BAA6B,OAAA;AAE/B,mFAO0C;AANxC,mIAAA,iBAAiB,OAAA;AACjB,6IAAA,2BAA2B,OAAA;AAG3B,gIAAA,cAAc,OAAA;AAGhB,mFAO0C;AANxC,mIAAA,iBAAiB,OAAA;AAGjB,6IAAA,2BAA2B,OAAA;AAI7B,yEASqC;AAPnC,yHAAA,YAAY,OAAA;AAEZ,mIAAA,sBAAsB,OAAA;AAMxB,uEAQoC;AAPlC,2HAAA,eAAe,OAAA;AACf,qIAAA,yBAAyB,OAAA;AACzB,yIAAA,6BAA6B,OAAA;AAC7B,iIAAA,qBAAqB,OAAA;AACrB,uHAAA,WAAW,OAAA;AACX,+HAAA,mBAAmB,OAAA;AACnB,0HAAA,cAAc,OAAA;AAEhB,2EAGsC;AAFpC,qIAAA,uBAAuB,OAAA;AACvB,2HAAA,aAAa,OAAA;AAEf,mEASkC;AARhC,6HAAA,mBAAmB,OAAA;AAOnB,mHAAA,SAAS,OAAA;AA0CX,qDAAqD"}

package/dist/makeAddInflectorsPlugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeAddInflectorsPlugin = void 0;
+exports.makeAddInflectorsPlugin = makeAddInflectorsPlugin;
 /** @deprecated Build a plugin directly */
 function makeAddInflectorsPlugin() {
     throw new Error(`makeAddInflectorsPlugin is no longer supported; the new plugin system makes it a little easier to write it yourself:
@@ -29,7 +29,7 @@ export const MyInflectorPlugin: GraphileConfig.Plugin = {
         ...args
       ) {
         if (name === "Query") return "RootQuery";
-        return previous.call(this, ...args);
+        return previous(...args);
       }
     }
   }
@@ -38,5 +38,4 @@ export const MyInflectorPlugin: GraphileConfig.Plugin = {
 
 `);
 }
-exports.makeAddInflectorsPlugin = makeAddInflectorsPlugin;
 //# sourceMappingURL=makeAddInflectorsPlugin.js.map

package/dist/makeAddInflectorsPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"makeAddInflectorsPlugin.js","sourceRoot":"","sources":["../src/makeAddInflectorsPlugin.ts"],"names":[],"mappings":";;;AAAA,0CAA0C;AAC1C,SAAgB,uBAAuB;IACrC,MAAM,IAAI,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiCjB,CAAC,CAAC;AACH,CAAC;AAnCD,0DAmCC"}
+{"version":3,"file":"makeAddInflectorsPlugin.js","sourceRoot":"","sources":["../src/makeAddInflectorsPlugin.ts"],"names":[],"mappings":";;AACA,0DAmCC;AApCD,0CAA0C;AAC1C,SAAgB,uBAAuB;IACrC,MAAM,IAAI,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiCjB,CAAC,CAAC;AACH,CAAC"}

package/dist/makeAddPgTableConditionPlugin.d.ts

@@ -1,14 +1,40 @@
-import type { PgConditionStep, PgSelectStep } from "@dataplan/pg";
-import type { FieldArgs, GrafastInputFieldConfig } from "grafast";
+import { sqlValueWithCodec } from "@dataplan/pg";
+import type { GrafastInputFieldConfig } from "grafast";
 import type { SQL, sql } from "pg-sql2";
-export declare function makeAddPgTableConditionPlugin(match: {
+export declare function addPgTableCondition(match: {
     serviceName?: string;
     schemaName: string;
     tableName: string;
-}, conditionFieldName: string, conditionFieldSpecGenerator: (build: GraphileBuild.Build) => GrafastInputFieldConfig<any, any, any, any, any>, conditionGenerator?: (value: FieldArgs, helpers: {
-    $condition: PgConditionStep<PgSelectStep>;
+}, conditionFieldName: string, conditionFieldSpecGenerator: (build: GraphileBuild.Build) => GrafastInputFieldConfig, conditionGenerator?: (value: unknown, helpers: {
     sql: typeof sql;
     sqlTableAlias: SQL;
-    build: GraphileBuild.Build;
+    sqlValueWithCodec: typeof sqlValueWithCodec;
+    build: ReturnType<typeof pruneBuild>;
 }) => SQL | null | undefined): GraphileConfig.Plugin;
+/** @deprecated renamed to addPgTableCondition */
+export declare const makeAddPgTableConditionPlugin: typeof addPgTableCondition;
+declare function pruneBuild(build: GraphileBuild.Build): {
+    sql: import("pg-sql2").PgSQL<never>;
+    grafast: typeof import("grafast");
+    graphql: typeof import("graphql");
+    dataplanPg: typeof import("@dataplan/pg");
+    input: {
+        pgRegistry: import("@dataplan/pg").PgRegistry<Record<string, import("@dataplan/pg").PgCodec<string, {
+            [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any | undefined, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined> | undefined>, boolean>;
+        } | undefined, any, any, any, any, any>>, Record<string, import("@dataplan/pg").PgResourceOptions<string, import("@dataplan/pg").PgCodecWithAttributes<{
+            [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any | undefined, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined> | undefined>, boolean>;
+        }>, readonly import("@dataplan/pg").PgResourceUnique<{
+            [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any | undefined, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined> | undefined>, boolean>;
+        }>[], readonly import("@dataplan/pg").PgResourceParameter<string | null, import("@dataplan/pg").PgCodec<string, {
+            [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any | undefined, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined> | undefined>, boolean>;
+        } | undefined, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined> | undefined>>[] | 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 | undefined, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined> | undefined>, boolean>;
+        }, any, any, undefined, any, undefined>, import("@dataplan/pg").PgResourceOptions<any, import("@dataplan/pg").PgCodecWithAttributes<{
+            [x: string]: import("@dataplan/pg").PgCodecAttribute<import("@dataplan/pg").PgCodec<string, /*elided*/ any | undefined, any, any, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, any, any, any, any, any, any> | undefined, import("@dataplan/pg").PgCodec<string, undefined, any, any, undefined, any, undefined> | undefined>, boolean>;
+        }>, any, any>>>>, {
+            [executorName: string]: import("@dataplan/pg").PgExecutor<any, any>;
+        }>;
+    };
+};
+export {};
 //# sourceMappingURL=makeAddPgTableConditionPlugin.d.ts.map

package/dist/makeAddPgTableConditionPlugin.d.ts.map

@@ -1 +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,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAIxC,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EACtE,kBAAkB,EAAE,MAAM,EAC1B,2BAA2B,EAAE,CAC3B,KAAK,EAAE,aAAa,CAAC,KAAK,KACvB,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EACrD,kBAAkB,CAAC,EAAE,CACnB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE;IACP,UAAU,EAAE,eAAe,CAAC,YAAY,CAAC,CAAC;IAC1C,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"}
+{"version":3,"file":"makeAddPgTableConditionPlugin.d.ts","sourceRoot":"","sources":["../src/makeAddPgTableConditionPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAIxC,wBAAgB,mBAAmB,CACjC,KAAK,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EACtE,kBAAkB,EAAE,MAAM,EAC1B,2BAA2B,EAAE,CAC3B,KAAK,EAAE,aAAa,CAAC,KAAK,KACvB,uBAAuB,EAE5B,kBAAkB,CAAC,EAAE,CACnB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE;IACP,GAAG,EAAE,OAAO,GAAG,CAAC;IAChB,aAAa,EAAE,GAAG,CAAC;IACnB,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAG5C,KAAK,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;CAGtC,KACE,GAAG,GAAG,IAAI,GAAG,SAAS,GAC1B,cAAc,CAAC,MAAM,CAqGvB;AAED,iDAAiD;AACjD,eAAO,MAAM,6BAA6B,4BAAsB,CAAC;AAEjE,iBAAS,UAAU,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK;;;;;;;;;;;;;;;;;;;;;;EAkB7C"}

package/dist/makeAddPgTableConditionPlugin.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeAddPgTableConditionPlugin = void 0;
+exports.addPgTableCondition = addPgTableCondition;
+const pg_1 = require("@dataplan/pg");
 const exportable_js_1 = require("./exportable.js");
-function makeAddPgTableConditionPlugin(match, conditionFieldName, conditionFieldSpecGenerator, conditionGenerator) {
+function addPgTableCondition(match, conditionFieldName, conditionFieldSpecGenerator, 
+// DEPRECATED! Use `apply` instead.
+conditionGenerator) {
     const { serviceName = "main", schemaName, tableName } = match;
     const displayName = `makeAddPgTableConditionPlugin__${schemaName}__${tableName}__${conditionFieldName}`;
     const plugin = {
@@ -39,10 +43,10 @@ function makeAddPgTableConditionPlugin(match, conditionFieldName, conditionField
                         return fields;
                     }
                     const conditionFieldSpec = conditionFieldSpecGenerator(build);
-                    if (conditionFieldSpec.applyPlan ||
-                        conditionFieldSpec.extensions?.grafast?.applyPlan) {
+                    if (conditionFieldSpec.apply ||
+                        conditionFieldSpec.extensions?.grafast?.apply) {
                         if (conditionGenerator) {
-                            throw new Error(`${displayName}: You supplied 'applyPlan' for your field spec, so you cannot also supply a 'conditionGenerator'`);
+                            throw new Error(`${displayName}: You supplied 'apply' for your field spec, so you cannot also supply a 'conditionGenerator'`);
                         }
                         // Done.
                     }
@@ -51,17 +55,19 @@ function makeAddPgTableConditionPlugin(match, conditionFieldName, conditionField
                             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 _build = pruneBuild(build);
+                        conditionFieldSpec.apply = (0, exportable_js_1.EXPORTABLE)((_build, conditionGenerator, sql, sqlValueWithCodec) => function apply(condition, val) {
                             const expression = conditionGenerator(val, {
-                                $condition,
                                 sql,
-                                sqlTableAlias: $condition.alias,
-                                build,
+                                sqlTableAlias: condition.alias,
+                                sqlValueWithCodec,
+                                build: _build,
+                                condition,
                             });
                             if (expression) {
-                                $condition.where(expression);
+                                condition.where(expression);
                             }
-                        }, [build, conditionGenerator, sql]);
+                        }, [_build, conditionGenerator, sql, pg_1.sqlValueWithCodec], "addPgTableCondition_generator");
                     }
                     const meta = build._pluginMeta[displayName];
                     meta.seen = true;
@@ -76,5 +82,16 @@ function makeAddPgTableConditionPlugin(match, conditionFieldName, conditionField
     };
     return plugin;
 }
-exports.makeAddPgTableConditionPlugin = makeAddPgTableConditionPlugin;
+/** @deprecated renamed to addPgTableCondition */
+exports.makeAddPgTableConditionPlugin = addPgTableCondition;
+function pruneBuild(build) {
+    const { sql, grafast, graphql, dataplanPg, input: { pgRegistry }, } = build;
+    return (0, exportable_js_1.EXPORTABLE)((dataplanPg, grafast, graphql, pgRegistry, sql) => ({
+        sql,
+        grafast,
+        graphql,
+        dataplanPg,
+        input: { pgRegistry },
+    }), [dataplanPg, grafast, graphql, pgRegistry, sql]);
+}
 //# sourceMappingURL=makeAddPgTableConditionPlugin.js.map

package/dist/makeAddPgTableConditionPlugin.js.map

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