graphile-settings 2.6.11 → 2.6.13

package/README.md

@@ -9,7 +9,7 @@
     <img height="20" src="https://github.com/launchql/launchql/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
    <a href="https://github.com/launchql/launchql/blob/main/LICENSE"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"/></a>
-   <a href="https://www.npmjs.com/package/graphile-settings"><img height="20" src="https://img.shields.io/github/package-json/v/launchql/launchql?filename=packages%2Fgraphile-settings%2Fpackage.json"/></a>
+   <a href="https://www.npmjs.com/package/graphile-settings"><img height="20" src="https://img.shields.io/github/package-json/v/launchql/launchql?filename=graphile%2Fgraphile-settings%2Fpackage.json"/></a>
 </p>
 
 **`graphile-settings`** is a batteries-included configuration builder for [PostGraphile](https://www.graphile.org/postgraphile/), purpose-built for the [LaunchQL](https://github.com/launchql/launchql) ecosystem. It centralizes plugin setup, schema wiring, and feature flags into a single, composable interface — enabling consistent, high-performance GraphQL APIs across projects.
@@ -114,9 +114,9 @@ app.listen(settings.port);
 
 ## 🔌 Included Plugins
 
-* `postgraphile-plugin-connection-filter`
-* `@pyramation/postgraphile-plugin-fulltext-filter`
-* `@pyramation/postgis`
+* `graphile-plugin-connection-filter`
+* `graphile-plugin-fulltext-filter`
+* `graphile-postgis`
 * `postgraphile-plugin-connection-filter-postgis`
 * `postgraphile-derived-upload-field`
 * `graphile-simple-inflector`

package/esm/index.js

@@ -1,20 +1,19 @@
 import PgManyToMany from '@graphile-contrib/pg-many-to-many';
 import { getEnvOptions } from '@launchql/env';
-import PgPostgis from '@pyramation/postgis';
-// @ts-ignore
-import FulltextFilterPlugin from '@pyramation/postgraphile-plugin-fulltext-filter';
+import PgPostgis from 'graphile-postgis';
+import FulltextFilterPlugin from 'graphile-plugin-fulltext-filter';
 import { NodePlugin } from 'graphile-build';
 import { additionalGraphQLContextFromRequest as langAdditional, LangPlugin } from 'graphile-i18n';
 import PgMetaschema from 'graphile-meta-schema';
-// @ts-ignore
 import PgSearch from 'graphile-search-plugin';
 import PgSimpleInflector from 'graphile-simple-inflector';
+// import ConnectionFilterPlugin from 'graphile-plugin-connection-filter';
+// @ts-ignore
 import ConnectionFilterPlugin from 'postgraphile-plugin-connection-filter';
 // @ts-ignore
 import PgPostgisFilter from 'postgraphile-plugin-connection-filter-postgis';
 import LqlTypesPlugin from './plugins/types';
-import UploadPostGraphilePlugin from './plugins/upload-postgraphile-plugin';
-import { Uploader } from './resolvers/upload';
+import UploadPostGraphilePlugin, { Uploader } from 'graphile-upload-plugin';
 export const getGraphileSettings = (rawOpts) => {
     const opts = getEnvOptions(rawOpts);
     const { server, graphile, features, cdn } = opts;

package/index.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,26 +39,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGraphileSettings = void 0;
 const pg_many_to_many_1 = __importDefault(require("@graphile-contrib/pg-many-to-many"));
 const env_1 = require("@launchql/env");
-const postgis_1 = __importDefault(require("@pyramation/postgis"));
-// @ts-ignore
-const postgraphile_plugin_fulltext_filter_1 = __importDefault(require("@pyramation/postgraphile-plugin-fulltext-filter"));
+const graphile_postgis_1 = __importDefault(require("graphile-postgis"));
+const graphile_plugin_fulltext_filter_1 = __importDefault(require("graphile-plugin-fulltext-filter"));
 const graphile_build_1 = require("graphile-build");
 const graphile_i18n_1 = require("graphile-i18n");
 const graphile_meta_schema_1 = __importDefault(require("graphile-meta-schema"));
-// @ts-ignore
 const graphile_search_plugin_1 = __importDefault(require("graphile-search-plugin"));
 const graphile_simple_inflector_1 = __importDefault(require("graphile-simple-inflector"));
+// import ConnectionFilterPlugin from 'graphile-plugin-connection-filter';
+// @ts-ignore
 const postgraphile_plugin_connection_filter_1 = __importDefault(require("postgraphile-plugin-connection-filter"));
 // @ts-ignore
 const postgraphile_plugin_connection_filter_postgis_1 = __importDefault(require("postgraphile-plugin-connection-filter-postgis"));
 const types_1 = __importDefault(require("./plugins/types"));
-const upload_postgraphile_plugin_1 = __importDefault(require("./plugins/upload-postgraphile-plugin"));
-const upload_1 = require("./resolvers/upload");
+const graphile_upload_plugin_1 = __importStar(require("graphile-upload-plugin"));
 const getGraphileSettings = (rawOpts) => {
     const opts = (0, env_1.getEnvOptions)(rawOpts);
     const { server, graphile, features, cdn } = opts;
     // Instantiate uploader with merged cdn opts
-    const uploader = new upload_1.Uploader({
+    const uploader = new graphile_upload_plugin_1.Uploader({
         bucketName: cdn.bucketName,
         awsRegion: cdn.awsRegion,
         awsAccessKey: cdn.awsAccessKey,
@@ -35,15 +67,15 @@ const getGraphileSettings = (rawOpts) => {
     const resolveUpload = uploader.resolveUpload.bind(uploader);
     const plugins = [
         postgraphile_plugin_connection_filter_1.default,
-        postgraphile_plugin_fulltext_filter_1.default,
+        graphile_plugin_fulltext_filter_1.default,
         types_1.default,
-        upload_postgraphile_plugin_1.default,
+        graphile_upload_plugin_1.default,
         graphile_meta_schema_1.default,
         pg_many_to_many_1.default,
         graphile_search_plugin_1.default,
     ];
     if (features?.postgis) {
-        plugins.push(postgis_1.default, postgraphile_plugin_connection_filter_postgis_1.default);
+        plugins.push(graphile_postgis_1.default, postgraphile_plugin_connection_filter_postgis_1.default);
     }
     if (features?.simpleInflection) {
         plugins.push(graphile_simple_inflector_1.default);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-settings",
-  "version": "2.6.11",
+  "version": "2.6.13",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "description": "graphile settings",
   "main": "index.js",
@@ -30,20 +30,20 @@
   },
   "dependencies": {
     "@graphile-contrib/pg-many-to-many": "^1.0.2",
-    "@launchql/env": "^2.5.5",
-    "@launchql/s3-streamer": "^2.6.6",
-    "@launchql/types": "^2.8.5",
-    "@launchql/upload-names": "^2.2.9",
-    "@pyramation/postgis": "^0.1.1",
-    "@pyramation/postgraphile-plugin-fulltext-filter": "^2.0.0",
+    "@launchql/env": "^2.5.6",
+    "@launchql/types": "^2.8.6",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "graphile-build": "^4.14.1",
-    "graphile-i18n": "^0.1.3",
-    "graphile-meta-schema": "^0.2.8",
-    "graphile-query": "^2.3.9",
-    "graphile-search-plugin": "^0.1.11",
-    "graphile-simple-inflector": "^0.1.6",
+    "graphile-i18n": "^0.1.5",
+    "graphile-meta-schema": "^0.2.10",
+    "graphile-plugin-connection-filter": "^2.3.1",
+    "graphile-plugin-fulltext-filter": "^2.0.2",
+    "graphile-postgis": "^0.1.1",
+    "graphile-query": "^2.3.11",
+    "graphile-search-plugin": "^0.1.13",
+    "graphile-simple-inflector": "^0.1.8",
+    "graphile-upload-plugin": "^0.2.0",
     "graphql": "15.10.1",
     "graphql-tag": "2.12.6",
     "graphql-upload": "^13.0.0",
@@ -51,7 +51,7 @@
     "pg": "^8.16.0",
     "postgraphile": "^4.14.1",
     "postgraphile-derived-upload-field": "^0.0.6",
-    "postgraphile-plugin-connection-filter": "^2.3.0",
+    "postgraphile-plugin-connection-filter": "^2.0.0",
     "postgraphile-plugin-connection-filter-postgis": "^1.0.0-alpha.6",
     "request-ip": "^3.3.0"
   },
@@ -60,7 +60,7 @@
     "@types/express": "^5.0.1",
     "@types/pg": "^8.15.2",
     "@types/request-ip": "^0.0.41",
-    "makage": "^0.1.6",
+    "makage": "^0.1.8",
     "nodemon": "^3.1.10",
     "ts-node": "^10.9.2"
   },
@@ -71,5 +71,5 @@
     "launchql",
     "graphql"
   ],
-  "gitHead": "e85e82c301d859ff7e2317bf07345156af9ff8d1"
+  "gitHead": "3812f24a480b2035b3413ec7fecfe492f294e590"
 }

package/esm/plugins/upload-postgraphile-plugin.js

@@ -1,158 +0,0 @@
-// PostGraphile plugin
-const UploadPostGraphilePlugin = (builder, opts = {}) => {
-    const { uploadFieldDefinitions = [] } = opts;
-    // Determine whether a table attribute should be treated as an Upload according to configuration
-    const relevantUploadType = (attr) => {
-        const types = uploadFieldDefinitions.filter(({ name, namespaceName, tag }) => (name &&
-            namespaceName &&
-            attr.type?.name === name &&
-            attr.type?.namespaceName === namespaceName) ||
-            (tag && attr.tags?.[tag]));
-        if (types.length === 1) {
-            return types[0];
-        }
-        else if (types.length > 1) {
-            throw new Error('Upload field definitions are ambiguous');
-        }
-        return undefined;
-    };
-    builder.hook('build', (input, build) => {
-        const { addType, graphql: { GraphQLScalarType, GraphQLError }, } = build;
-        const GraphQLUpload = new GraphQLScalarType({
-            name: 'Upload',
-            description: 'The `Upload` scalar type represents a file upload.',
-            parseValue(value) {
-                // The value should be an object with a `.promise` that resolves to the file upload
-                const maybe = value;
-                if (maybe &&
-                    maybe.promise &&
-                    typeof maybe.promise.then === 'function') {
-                    return maybe.promise;
-                }
-                throw new GraphQLError('Upload value invalid.');
-            },
-            parseLiteral(ast) {
-                throw new GraphQLError('Upload literal unsupported.', ast);
-            },
-            serialize() {
-                throw new GraphQLError('Upload serialization unsupported.');
-            },
-        });
-        addType(GraphQLUpload);
-        // Override the internal types for configured upload-backed columns
-        uploadFieldDefinitions.forEach(({ name, namespaceName, type }) => {
-            if (!name || !type || !namespaceName)
-                return; // tag-based or incomplete definitions
-            const theType = build.pgIntrospectionResultsByKind.type.find((typ) => typ.name === name && typ.namespaceName === namespaceName);
-            if (theType) {
-                build.pgRegisterGqlTypeByTypeId(theType.id, () => build.getTypeByName(type));
-            }
-        });
-        return input;
-    });
-    builder.hook('inflection', (inflection, build) => {
-        return build.extend(inflection, {
-            // NO ARROW FUNCTIONS HERE (this)
-            uploadColumn(attr) {
-                return this.column(attr) + 'Upload';
-            },
-        });
-    });
-    // Add Upload input fields alongside matching columns
-    builder.hook('GraphQLInputObjectType:fields', (fields, build, context) => {
-        const { scope: { isPgRowType, pgIntrospection: table }, } = context;
-        if (!isPgRowType || !table || table.kind !== 'class') {
-            return fields;
-        }
-        return build.extend(fields, table.attributes.reduce((memo, attr) => {
-            if (!build.pgColumnFilter(attr, build, context))
-                return memo;
-            const action = context.scope.isPgBaseInput
-                ? 'base'
-                : context.scope.isPgPatch
-                    ? 'update'
-                    : 'create';
-            if (build.pgOmit(attr, action))
-                return memo;
-            if (attr.identity === 'a')
-                return memo;
-            if (!relevantUploadType(attr)) {
-                return memo;
-            }
-            const fieldName = build.inflection.uploadColumn(attr);
-            if (memo[fieldName]) {
-                throw new Error(`Two columns produce the same GraphQL field name '${fieldName}' on class '${table.namespaceName}.${table.name}'; one of them is '${attr.name}'`);
-            }
-            memo = build.extend(memo, {
-                [fieldName]: context.fieldWithHooks(fieldName, {
-                    description: attr.description,
-                    type: build.getTypeByName('Upload'),
-                }, { pgFieldIntrospection: attr, isPgUploadField: true }),
-            }, `Adding field for ${build.describePgEntity(attr)}. You can rename this field with a 'Smart Comment':\n\n  ${build.sqlCommentByAddingTags(attr, {
-                name: 'newNameHere',
-            })}`);
-            return memo;
-        }, {}), `Adding columns to '${build.describePgEntity(table)}'`);
-    });
-    builder.hook('GraphQLObjectType:fields:field', (field, build, context) => {
-        const { pgIntrospectionResultsByKind: introspectionResultsByKind, inflection, } = build;
-        const { scope: { isRootMutation, fieldName, pgFieldIntrospection: table }, } = context;
-        if (!isRootMutation || !table) {
-            return field;
-        }
-        // It's possible that `resolve` isn't specified on a field, so in that case
-        // we fall back to a default resolver.
-        const defaultResolver = (obj) => obj[fieldName];
-        // Extract the old resolver from `field`
-        const { resolve: oldResolve = defaultResolver, ...rest } = field; // GraphQLFieldConfig
-        const tags = {};
-        const types = {};
-        const originals = {};
-        const uploadResolversByFieldName = introspectionResultsByKind.attribute
-            .filter((attr) => attr.classId === table.id)
-            .reduce((memo, attr) => {
-            // first, try to directly match the types here
-            const typeMatched = relevantUploadType(attr);
-            if (typeMatched) {
-                const fieldName = inflection.column(attr);
-                const uploadFieldName = inflection.uploadColumn(attr);
-                memo[uploadFieldName] = typeMatched.resolve;
-                tags[uploadFieldName] = attr.tags;
-                types[uploadFieldName] = attr.type.name;
-                originals[uploadFieldName] = fieldName;
-            }
-            return memo;
-        }, {});
-        return {
-            // Copy over everything except 'resolve'
-            ...rest,
-            // Add our new resolver which wraps the old resolver
-            async resolve(source, args, context, info) {
-                // Recursively check for Upload promises to resolve
-                async function resolvePromises(obj) {
-                    for (const key of Object.keys(obj)) {
-                        if (obj[key] instanceof Promise) {
-                            if (uploadResolversByFieldName[key]) {
-                                const upload = await obj[key];
-                                // eslint-disable-next-line require-atomic-updates
-                                obj[originals[key]] = await uploadResolversByFieldName[key](upload, args, context, {
-                                    ...info,
-                                    uploadPlugin: { tags: tags[key], type: types[key] },
-                                });
-                            }
-                        }
-                        else if (obj[key] !== null && typeof obj[key] === 'object') {
-                            await resolvePromises(obj[key]);
-                        }
-                    }
-                }
-                await resolvePromises(args);
-                // Call the old resolver
-                const oldResolveResult = await oldResolve(source, args, context, info);
-                // Finally return the result.
-                return oldResolveResult;
-            },
-        };
-    });
-};
-export default UploadPostGraphilePlugin;

package/esm/resolvers/upload.js

@@ -1,54 +0,0 @@
-import streamer from '@launchql/s3-streamer';
-import uploadNames from '@launchql/upload-names';
-export class Uploader {
-    opts;
-    streamerInstance;
-    constructor(opts) {
-        this.opts = opts;
-        const { bucketName, awsRegion, awsSecretKey, awsAccessKey, minioEndpoint } = this.opts;
-        this.streamerInstance = new streamer({
-            defaultBucket: bucketName,
-            awsRegion,
-            awsSecretKey,
-            awsAccessKey,
-            minioEndpoint,
-        });
-    }
-    async resolveUpload(upload, _args, _context, info) {
-        const { uploadPlugin: { tags, type } } = info;
-        const readStream = upload.createReadStream();
-        const { filename } = upload;
-        const rand = Math.random().toString(36).substring(2, 7) +
-            Math.random().toString(36).substring(2, 7);
-        const key = `${rand}-${uploadNames(filename)}`;
-        const result = await this.streamerInstance.upload({
-            readStream,
-            filename,
-            key,
-            bucket: this.opts.bucketName
-        });
-        const url = result.upload.Location;
-        const { contentType, magic: { charset } } = result;
-        const typ = type || tags.type;
-        const allowedMimes = tags.mime
-            ? tags.mime.trim().split(',').map((a) => a.trim())
-            : typ === 'image'
-                ? ['image/jpg', 'image/jpeg', 'image/png', 'image/svg+xml']
-                : [];
-        if (allowedMimes.length && !allowedMimes.includes(contentType)) {
-            throw new Error(`UPLOAD_MIMETYPE ${allowedMimes.join(',')}`);
-        }
-        switch (typ) {
-            case 'image':
-            case 'upload':
-                return {
-                    filename,
-                    mime: contentType,
-                    url
-                };
-            case 'attachment':
-            default:
-                return url;
-        }
-    }
-}

package/plugins/upload-postgraphile-plugin.d.ts

@@ -1,31 +0,0 @@
-import type { ReadStream } from 'fs';
-import type { Plugin } from 'graphile-build';
-import type { GraphQLResolveInfo } from 'graphql';
-export interface FileUpload {
-    filename: string;
-    mimetype?: string;
-    encoding?: string;
-    createReadStream: () => ReadStream;
-}
-export interface UploadPluginInfo {
-    tags: Record<string, any>;
-    type?: string;
-}
-export type UploadResolver = (upload: FileUpload, args: any, context: any, info: GraphQLResolveInfo & {
-    uploadPlugin: UploadPluginInfo;
-}) => Promise<any>;
-export type UploadFieldDefinition = {
-    name: string;
-    namespaceName: string;
-    type: string;
-    resolve: UploadResolver;
-    tag?: never;
-} | {
-    tag: string;
-    resolve: UploadResolver;
-    name?: never;
-    namespaceName?: never;
-    type?: string;
-};
-declare const UploadPostGraphilePlugin: Plugin;
-export default UploadPostGraphilePlugin;

package/plugins/upload-postgraphile-plugin.js

@@ -1,160 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// PostGraphile plugin
-const UploadPostGraphilePlugin = (builder, opts = {}) => {
-    const { uploadFieldDefinitions = [] } = opts;
-    // Determine whether a table attribute should be treated as an Upload according to configuration
-    const relevantUploadType = (attr) => {
-        const types = uploadFieldDefinitions.filter(({ name, namespaceName, tag }) => (name &&
-            namespaceName &&
-            attr.type?.name === name &&
-            attr.type?.namespaceName === namespaceName) ||
-            (tag && attr.tags?.[tag]));
-        if (types.length === 1) {
-            return types[0];
-        }
-        else if (types.length > 1) {
-            throw new Error('Upload field definitions are ambiguous');
-        }
-        return undefined;
-    };
-    builder.hook('build', (input, build) => {
-        const { addType, graphql: { GraphQLScalarType, GraphQLError }, } = build;
-        const GraphQLUpload = new GraphQLScalarType({
-            name: 'Upload',
-            description: 'The `Upload` scalar type represents a file upload.',
-            parseValue(value) {
-                // The value should be an object with a `.promise` that resolves to the file upload
-                const maybe = value;
-                if (maybe &&
-                    maybe.promise &&
-                    typeof maybe.promise.then === 'function') {
-                    return maybe.promise;
-                }
-                throw new GraphQLError('Upload value invalid.');
-            },
-            parseLiteral(ast) {
-                throw new GraphQLError('Upload literal unsupported.', ast);
-            },
-            serialize() {
-                throw new GraphQLError('Upload serialization unsupported.');
-            },
-        });
-        addType(GraphQLUpload);
-        // Override the internal types for configured upload-backed columns
-        uploadFieldDefinitions.forEach(({ name, namespaceName, type }) => {
-            if (!name || !type || !namespaceName)
-                return; // tag-based or incomplete definitions
-            const theType = build.pgIntrospectionResultsByKind.type.find((typ) => typ.name === name && typ.namespaceName === namespaceName);
-            if (theType) {
-                build.pgRegisterGqlTypeByTypeId(theType.id, () => build.getTypeByName(type));
-            }
-        });
-        return input;
-    });
-    builder.hook('inflection', (inflection, build) => {
-        return build.extend(inflection, {
-            // NO ARROW FUNCTIONS HERE (this)
-            uploadColumn(attr) {
-                return this.column(attr) + 'Upload';
-            },
-        });
-    });
-    // Add Upload input fields alongside matching columns
-    builder.hook('GraphQLInputObjectType:fields', (fields, build, context) => {
-        const { scope: { isPgRowType, pgIntrospection: table }, } = context;
-        if (!isPgRowType || !table || table.kind !== 'class') {
-            return fields;
-        }
-        return build.extend(fields, table.attributes.reduce((memo, attr) => {
-            if (!build.pgColumnFilter(attr, build, context))
-                return memo;
-            const action = context.scope.isPgBaseInput
-                ? 'base'
-                : context.scope.isPgPatch
-                    ? 'update'
-                    : 'create';
-            if (build.pgOmit(attr, action))
-                return memo;
-            if (attr.identity === 'a')
-                return memo;
-            if (!relevantUploadType(attr)) {
-                return memo;
-            }
-            const fieldName = build.inflection.uploadColumn(attr);
-            if (memo[fieldName]) {
-                throw new Error(`Two columns produce the same GraphQL field name '${fieldName}' on class '${table.namespaceName}.${table.name}'; one of them is '${attr.name}'`);
-            }
-            memo = build.extend(memo, {
-                [fieldName]: context.fieldWithHooks(fieldName, {
-                    description: attr.description,
-                    type: build.getTypeByName('Upload'),
-                }, { pgFieldIntrospection: attr, isPgUploadField: true }),
-            }, `Adding field for ${build.describePgEntity(attr)}. You can rename this field with a 'Smart Comment':\n\n  ${build.sqlCommentByAddingTags(attr, {
-                name: 'newNameHere',
-            })}`);
-            return memo;
-        }, {}), `Adding columns to '${build.describePgEntity(table)}'`);
-    });
-    builder.hook('GraphQLObjectType:fields:field', (field, build, context) => {
-        const { pgIntrospectionResultsByKind: introspectionResultsByKind, inflection, } = build;
-        const { scope: { isRootMutation, fieldName, pgFieldIntrospection: table }, } = context;
-        if (!isRootMutation || !table) {
-            return field;
-        }
-        // It's possible that `resolve` isn't specified on a field, so in that case
-        // we fall back to a default resolver.
-        const defaultResolver = (obj) => obj[fieldName];
-        // Extract the old resolver from `field`
-        const { resolve: oldResolve = defaultResolver, ...rest } = field; // GraphQLFieldConfig
-        const tags = {};
-        const types = {};
-        const originals = {};
-        const uploadResolversByFieldName = introspectionResultsByKind.attribute
-            .filter((attr) => attr.classId === table.id)
-            .reduce((memo, attr) => {
-            // first, try to directly match the types here
-            const typeMatched = relevantUploadType(attr);
-            if (typeMatched) {
-                const fieldName = inflection.column(attr);
-                const uploadFieldName = inflection.uploadColumn(attr);
-                memo[uploadFieldName] = typeMatched.resolve;
-                tags[uploadFieldName] = attr.tags;
-                types[uploadFieldName] = attr.type.name;
-                originals[uploadFieldName] = fieldName;
-            }
-            return memo;
-        }, {});
-        return {
-            // Copy over everything except 'resolve'
-            ...rest,
-            // Add our new resolver which wraps the old resolver
-            async resolve(source, args, context, info) {
-                // Recursively check for Upload promises to resolve
-                async function resolvePromises(obj) {
-                    for (const key of Object.keys(obj)) {
-                        if (obj[key] instanceof Promise) {
-                            if (uploadResolversByFieldName[key]) {
-                                const upload = await obj[key];
-                                // eslint-disable-next-line require-atomic-updates
-                                obj[originals[key]] = await uploadResolversByFieldName[key](upload, args, context, {
-                                    ...info,
-                                    uploadPlugin: { tags: tags[key], type: types[key] },
-                                });
-                            }
-                        }
-                        else if (obj[key] !== null && typeof obj[key] === 'object') {
-                            await resolvePromises(obj[key]);
-                        }
-                    }
-                }
-                await resolvePromises(args);
-                // Call the old resolver
-                const oldResolveResult = await oldResolve(source, args, context, info);
-                // Finally return the result.
-                return oldResolveResult;
-            },
-        };
-    });
-};
-exports.default = UploadPostGraphilePlugin;

package/resolvers/upload.d.ts

@@ -1,14 +0,0 @@
-interface UploaderOptions {
-    bucketName: string;
-    awsRegion: string;
-    awsSecretKey: string;
-    awsAccessKey: string;
-    minioEndpoint?: string;
-}
-export declare class Uploader {
-    private opts;
-    private streamerInstance;
-    constructor(opts: UploaderOptions);
-    resolveUpload(upload: any, _args: any, _context: any, info: any): Promise<any>;
-}
-export {};

package/resolvers/upload.js

@@ -1,61 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Uploader = void 0;
-const s3_streamer_1 = __importDefault(require("@launchql/s3-streamer"));
-const upload_names_1 = __importDefault(require("@launchql/upload-names"));
-class Uploader {
-    opts;
-    streamerInstance;
-    constructor(opts) {
-        this.opts = opts;
-        const { bucketName, awsRegion, awsSecretKey, awsAccessKey, minioEndpoint } = this.opts;
-        this.streamerInstance = new s3_streamer_1.default({
-            defaultBucket: bucketName,
-            awsRegion,
-            awsSecretKey,
-            awsAccessKey,
-            minioEndpoint,
-        });
-    }
-    async resolveUpload(upload, _args, _context, info) {
-        const { uploadPlugin: { tags, type } } = info;
-        const readStream = upload.createReadStream();
-        const { filename } = upload;
-        const rand = Math.random().toString(36).substring(2, 7) +
-            Math.random().toString(36).substring(2, 7);
-        const key = `${rand}-${(0, upload_names_1.default)(filename)}`;
-        const result = await this.streamerInstance.upload({
-            readStream,
-            filename,
-            key,
-            bucket: this.opts.bucketName
-        });
-        const url = result.upload.Location;
-        const { contentType, magic: { charset } } = result;
-        const typ = type || tags.type;
-        const allowedMimes = tags.mime
-            ? tags.mime.trim().split(',').map((a) => a.trim())
-            : typ === 'image'
-                ? ['image/jpg', 'image/jpeg', 'image/png', 'image/svg+xml']
-                : [];
-        if (allowedMimes.length && !allowedMimes.includes(contentType)) {
-            throw new Error(`UPLOAD_MIMETYPE ${allowedMimes.join(',')}`);
-        }
-        switch (typ) {
-            case 'image':
-            case 'upload':
-                return {
-                    filename,
-                    mime: contentType,
-                    url
-                };
-            case 'attachment':
-            default:
-                return url;
-        }
-    }
-}
-exports.Uploader = Uploader;