@constructive-io/graphql-server 2.19.1 → 2.19.3

package/middleware/gql.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildListApis = exports.buildApiByDatabaseIdAndName = exports.buildDomainLookup = void 0;
-const query_builder_1 = require("../codegen/orm/query-builder");
-const apiSelect = {
+exports.normalizeApiRecord = exports.createGraphileOrm = exports.apiListSelect = exports.domainSelect = exports.apiSelect = exports.connectionFirst = void 0;
+const client_1 = require("../codegen/orm/client");
+const models_1 = require("../codegen/orm/models");
+const query_1 = require("../codegen/orm/query");
+exports.connectionFirst = 1000;
+exports.apiSelect = {
     databaseId: true,
     dbname: true,
     roleName: true,
@@ -13,15 +16,15 @@ const apiSelect = {
             subdomain: true,
             domain: true,
         },
-        connection: true,
+        first: exports.connectionFirst,
     },
     apiExtensions: {
         select: { schemaName: true },
-        connection: true,
+        first: exports.connectionFirst,
     },
     schemasByApiSchemaApiIdAndSchemaId: {
         select: { schemaName: true },
-        connection: true,
+        first: exports.connectionFirst,
     },
     rlsModule: {
         select: {
@@ -32,30 +35,17 @@ const apiSelect = {
             currentRoleId: true,
         },
     },
-    database: {
-        select: {
-            sites: {
-                select: {
-                    domains: {
-                        select: { subdomain: true, domain: true },
-                        connection: true,
-                    },
-                },
-                connection: true,
-            },
-        },
-    },
     apiModules: {
         select: { name: true, data: true },
-        connection: true,
+        first: exports.connectionFirst,
     },
 };
-const domainSelect = {
+exports.domainSelect = {
     domain: true,
     subdomain: true,
-    api: { select: apiSelect },
+    api: { select: exports.apiSelect },
 };
-const apisSelect = {
+exports.apiListSelect = {
     id: true,
     databaseId: true,
     name: true,
@@ -65,62 +55,72 @@ const apisSelect = {
     isPublic: true,
     domains: {
         select: { domain: true, subdomain: true },
-        connection: true,
-    },
-    database: {
-        select: {
-            sites: {
-                select: {
-                    domains: {
-                        select: { domain: true, subdomain: true },
-                        connection: true,
-                    },
-                },
-                connection: true,
-            },
-        },
+        first: exports.connectionFirst,
     },
 };
-/**
- * Build query for domain lookup with optional subdomain
- * This uses domains connection instead of domainBySubdomainAndDomain
- * because we need to handle null subdomain with condition filter
- */
-const buildDomainLookup = (vars) => {
-    const where = {
-        domain: { equalTo: vars.domain },
-    };
-    if (vars.subdomain === null || vars.subdomain === undefined) {
-        where.subdomain = { isNull: true };
+class GraphileOrmClient extends client_1.OrmClient {
+    graphile;
+    constructor(graphile) {
+        super({ endpoint: 'http://localhost/graphql' });
+        this.graphile = graphile;
     }
-    else {
-        where.subdomain = { equalTo: vars.subdomain };
+    async execute(document, variables) {
+        const result = await this.graphile.query({
+            role: 'administrator',
+            query: document,
+            variables,
+        });
+        if (result.errors?.length) {
+            return {
+                ok: false,
+                data: null,
+                errors: result.errors,
+            };
+        }
+        return {
+            ok: true,
+            data: result.data,
+            errors: undefined,
+        };
     }
-    return (0, query_builder_1.buildFindFirstDocument)('DomainLookup', 'domains', domainSelect, { where }, 'DomainFilter');
-};
-exports.buildDomainLookup = buildDomainLookup;
-/**
- * Build query for API lookup by database ID and name
- * Uses the generated apiByDatabaseIdAndName custom query
- */
-const buildApiByDatabaseIdAndName = (vars) => {
-    // Import buildCustomDocument locally to avoid circular dependency
-    const { buildCustomDocument } = require('../codegen/orm/query-builder');
-    return buildCustomDocument('query', 'ApiByDatabaseIdAndName', 'apiByDatabaseIdAndName', apiSelect, vars, [
-        { name: 'databaseId', type: 'UUID!' },
-        { name: 'name', type: 'String!' },
-    ]);
+}
+const createGraphileOrm = (graphile) => {
+    const client = new GraphileOrmClient(graphile);
+    return {
+        api: new models_1.ApiModel(client),
+        domain: new models_1.DomainModel(client),
+        query: (0, query_1.createQueryOperations)(client),
+    };
 };
-exports.buildApiByDatabaseIdAndName = buildApiByDatabaseIdAndName;
-/**
- * Build query to list all APIs
- */
-const buildListApis = () => {
-    // Import buildCustomDocument locally to avoid circular dependency
-    const { buildCustomDocument } = require('../codegen/orm/query-builder');
-    return buildCustomDocument('query', 'ListApisByDatabaseId', 'apis', {
-        select: apisSelect,
-        connection: true,
-    }, undefined, []);
+exports.createGraphileOrm = createGraphileOrm;
+const normalizeApiRecord = (api) => {
+    const schemaNames = (api.apiExtensions?.nodes ?? []).flatMap((node) => node.schemaName ? [node.schemaName] : []);
+    const additionalSchemas = (api.schemasByApiSchemaApiIdAndSchemaId?.nodes ?? []).flatMap((node) => (node.schemaName ? [node.schemaName] : []));
+    let domains = [];
+    if (api.domains?.nodes?.length) {
+        domains = api.domains.nodes.reduce((acc, domain) => {
+            if (!domain.domain)
+                return acc;
+            const hostname = domain.subdomain
+                ? `${domain.subdomain}.${domain.domain}`
+                : domain.domain;
+            const protocol = domain.domain === 'localhost' ? 'http://' : 'https://';
+            return [...acc, protocol + hostname];
+        }, []);
+    }
+    return {
+        dbname: api.dbname,
+        anonRole: api.anonRole,
+        roleName: api.roleName,
+        schema: [...schemaNames, ...additionalSchemas],
+        apiModules: api.apiModules?.nodes?.map((node) => ({
+            name: node.name,
+            data: node.data,
+        })) || [],
+        rlsModule: api.rlsModule,
+        domains,
+        databaseId: api.databaseId,
+        isPublic: api.isPublic,
+    };
 };
-exports.buildListApis = buildListApis;
+exports.normalizeApiRecord = normalizeApiRecord;

package/middleware/types.d.ts

@@ -1,29 +1,13 @@
-import { ApiModule } from "../types";
+import type { ApiStructure } from '../types';
 export type ConstructiveAPIToken = {
     id: string;
     user_id: string;
-    [key: string]: any;
+    [key: string]: unknown;
 };
 declare global {
     namespace Express {
         interface Request {
-            api?: {
-                dbname: string;
-                anonRole: string;
-                roleName: string;
-                schema: string[];
-                apiModules: ApiModule[];
-                rlsModule?: {
-                    authenticate?: string;
-                    authenticateStrict?: string;
-                    privateSchema: {
-                        schemaName: string;
-                    };
-                };
-                domains?: string[];
-                databaseId?: string;
-                isPublic?: boolean;
-            };
+            api?: ApiStructure;
             svc_key?: string;
             clientIp?: string;
             databaseId?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-server",
-  "version": "2.19.1",
+  "version": "2.19.3",
   "author": "Constructive <developers@constructive.io>",
   "description": "Constructive GraphQL Server",
   "main": "index.js",
@@ -31,7 +31,8 @@
     "test:watch": "jest --watch",
     "bucket:create": "ts-node src/scripts/create-bucket.ts",
     "codegen:schema": "ts-node src/scripts/codegen-schema.ts",
-    "codegen": "npm run codegen:schema && graphql-codegen generate-orm --schema codegen/schema.graphql --output src/codegen/orm"
+    "codegen:clean": "rimraf src/codegen/orm codegen/schema.graphql",
+    "codegen": "npm run codegen:clean && npm run codegen:schema && graphql-codegen generate-orm --schema codegen/schema.graphql --output src/codegen/orm"
   },
   "keywords": [
     "server",
@@ -52,6 +53,7 @@
     "@pgpmjs/types": "^2.15.0",
     "cors": "^2.8.5",
     "express": "^5.2.1",
+    "gql-ast": "^2.6.0",
     "graphile-build": "^4.14.1",
     "graphile-cache": "^1.8.0",
     "graphile-i18n": "^0.6.0",
@@ -76,7 +78,7 @@
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.971.0",
-    "@constructive-io/graphql-codegen": "2.28.1",
+    "@constructive-io/graphql-codegen": "2.28.3",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.6",
     "@types/graphql-upload": "^8.0.12",
@@ -85,7 +87,8 @@
     "graphile-test": "2.15.0",
     "makage": "^0.1.10",
     "nodemon": "^3.1.10",
+    "rimraf": "^6.1.2",
     "ts-node": "^10.9.2"
   },
-  "gitHead": "b10f4573bc0daa50502a1a5ea8ba610e00c3996b"
+  "gitHead": "06cc06455356911bf9a24245849138892267b87d"
 }

package/types.d.ts

@@ -1,3 +1,4 @@
+import type { PgpmOptions } from '@pgpmjs/types';
 export interface CorsModuleData {
     urls: string[];
 }
@@ -10,7 +11,7 @@ export interface PublicKeyChallengeData {
     sign_in_with_challenge: string;
 }
 export interface GenericModuleData {
-    [key: string]: any;
+    [key: string]: unknown;
 }
 export type ApiModule = {
     name: 'cors';
@@ -29,49 +30,6 @@ export interface RlsModule {
         schemaName: string;
     };
 }
-export interface SchemaNode {
-    schemaName: string;
-}
-export interface SchemaNodes {
-    nodes: SchemaNode[];
-}
-export interface Domain {
-    subdomain?: string;
-    domain: string;
-}
-export interface DomainNodes {
-    nodes: Domain[];
-}
-export interface Site {
-    domains: DomainNodes;
-}
-export interface SiteNodes {
-    nodes: Site[];
-}
-export interface ApiModuleNodes {
-    nodes: ApiModule[];
-}
-export interface Database {
-    sites: SiteNodes;
-}
-export interface OldApiStructure {
-    dbname: string;
-    anonRole: string;
-    roleName: string;
-    schemasByApiSchemaApiIdAndSchemaId: SchemaNodes;
-    apiExtensions: SchemaNodes;
-    apiModules: ApiModuleNodes;
-    rlsModule?: RlsModule;
-    database?: Database;
-    databaseId?: string;
-    isPublic?: boolean;
-}
-export interface ServiceData {
-    api: OldApiStructure;
-}
-export interface Service {
-    data: ServiceData;
-}
 export interface ApiStructure {
     dbname: string;
     anonRole: string;
@@ -83,3 +41,18 @@ export interface ApiStructure {
     databaseId?: string;
     isPublic?: boolean;
 }
+export type ApiError = {
+    errorHtml: string;
+};
+export type ApiConfigResult = ApiStructure | ApiError | null;
+export type ApiOptions = PgpmOptions & {
+    api?: {
+        enableServicesApi?: boolean;
+        exposedSchemas?: string[];
+        anonRole?: string;
+        roleName?: string;
+        defaultDatabaseId?: string;
+        metaSchemas?: string[];
+        isPublic?: boolean;
+    };
+};

package/codegen/orm/models/apiExtension.d.ts

@@ -1,42 +0,0 @@
-/**
- * ApiExtension model for ORM client
- * @generated by @constructive-io/graphql-codegen
- * DO NOT EDIT - changes will be overwritten
- */
-import { OrmClient } from '../client';
-import { QueryBuilder } from '../query-builder';
-import { type ConnectionResult, type FindManyArgs, type FindFirstArgs, type CreateArgs, type UpdateArgs, type DeleteArgs, type InferSelectResult } from '../select-types';
-import { type ApiExtensionWithRelations, type ApiExtensionSelect, type ApiExtensionFilter, type ApiExtensionsOrderBy, type CreateApiExtensionInput, type ApiExtensionPatch } from '../input-types';
-export declare class ApiExtensionModel {
-    private client;
-    constructor(client: OrmClient);
-    findMany<const S extends ApiExtensionSelect>(args?: FindManyArgs<S, ApiExtensionFilter, ApiExtensionsOrderBy>): QueryBuilder<{
-        apiExtensions: ConnectionResult<InferSelectResult<ApiExtensionWithRelations, S>>;
-    }>;
-    findFirst<const S extends ApiExtensionSelect>(args?: FindFirstArgs<S, ApiExtensionFilter>): QueryBuilder<{
-        apiExtensions: {
-            nodes: InferSelectResult<ApiExtensionWithRelations, S>[];
-        };
-    }>;
-    create<const S extends ApiExtensionSelect>(args: CreateArgs<S, CreateApiExtensionInput['apiExtension']>): QueryBuilder<{
-        createApiExtension: {
-            apiExtension: InferSelectResult<ApiExtensionWithRelations, S>;
-        };
-    }>;
-    update<const S extends ApiExtensionSelect>(args: UpdateArgs<S, {
-        id: string;
-    }, ApiExtensionPatch>): QueryBuilder<{
-        updateApiExtension: {
-            apiExtension: InferSelectResult<ApiExtensionWithRelations, S>;
-        };
-    }>;
-    delete(args: DeleteArgs<{
-        id: string;
-    }>): QueryBuilder<{
-        deleteApiExtension: {
-            apiExtension: {
-                id: string;
-            };
-        };
-    }>;
-}

package/codegen/orm/models/apiExtension.js

@@ -1,77 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApiExtensionModel = void 0;
-const query_builder_1 = require("../query-builder");
-// ============================================================================
-// Model Class
-// ============================================================================
-class ApiExtensionModel {
-    client;
-    constructor(client) {
-        this.client = client;
-    }
-    findMany(args) {
-        const { document, variables } = (0, query_builder_1.buildFindManyDocument)('ApiExtension', 'apiExtensions', args?.select, {
-            where: args?.where,
-            orderBy: args?.orderBy,
-            first: args?.first,
-            last: args?.last,
-            after: args?.after,
-            before: args?.before,
-            offset: args?.offset,
-        }, 'ApiExtensionFilter', 'ApiExtensionsOrderBy');
-        return new query_builder_1.QueryBuilder({
-            client: this.client,
-            operation: 'query',
-            operationName: 'ApiExtension',
-            fieldName: 'apiExtensions',
-            document,
-            variables,
-        });
-    }
-    findFirst(args) {
-        const { document, variables } = (0, query_builder_1.buildFindFirstDocument)('ApiExtension', 'apiExtensions', args?.select, { where: args?.where }, 'ApiExtensionFilter');
-        return new query_builder_1.QueryBuilder({
-            client: this.client,
-            operation: 'query',
-            operationName: 'ApiExtension',
-            fieldName: 'apiExtensions',
-            document,
-            variables,
-        });
-    }
-    create(args) {
-        const { document, variables } = (0, query_builder_1.buildCreateDocument)('ApiExtension', 'createApiExtension', 'apiExtension', args.select, args.data, 'CreateApiExtensionInput');
-        return new query_builder_1.QueryBuilder({
-            client: this.client,
-            operation: 'mutation',
-            operationName: 'ApiExtension',
-            fieldName: 'createApiExtension',
-            document,
-            variables,
-        });
-    }
-    update(args) {
-        const { document, variables } = (0, query_builder_1.buildUpdateDocument)('ApiExtension', 'updateApiExtension', 'apiExtension', args.select, args.where, args.data, 'UpdateApiExtensionInput');
-        return new query_builder_1.QueryBuilder({
-            client: this.client,
-            operation: 'mutation',
-            operationName: 'ApiExtension',
-            fieldName: 'updateApiExtension',
-            document,
-            variables,
-        });
-    }
-    delete(args) {
-        const { document, variables } = (0, query_builder_1.buildDeleteDocument)('ApiExtension', 'deleteApiExtension', 'apiExtension', args.where, 'DeleteApiExtensionInput');
-        return new query_builder_1.QueryBuilder({
-            client: this.client,
-            operation: 'mutation',
-            operationName: 'ApiExtension',
-            fieldName: 'deleteApiExtension',
-            document,
-            variables,
-        });
-    }
-}
-exports.ApiExtensionModel = ApiExtensionModel;

package/codegen/orm/models/apiModule.d.ts

@@ -1,42 +0,0 @@
-/**
- * ApiModule model for ORM client
- * @generated by @constructive-io/graphql-codegen
- * DO NOT EDIT - changes will be overwritten
- */
-import { OrmClient } from '../client';
-import { QueryBuilder } from '../query-builder';
-import { type ConnectionResult, type FindManyArgs, type FindFirstArgs, type CreateArgs, type UpdateArgs, type DeleteArgs, type InferSelectResult } from '../select-types';
-import { type ApiModuleWithRelations, type ApiModuleSelect, type ApiModuleFilter, type ApiModulesOrderBy, type CreateApiModuleInput, type ApiModulePatch } from '../input-types';
-export declare class ApiModuleModel {
-    private client;
-    constructor(client: OrmClient);
-    findMany<const S extends ApiModuleSelect>(args?: FindManyArgs<S, ApiModuleFilter, ApiModulesOrderBy>): QueryBuilder<{
-        apiModules: ConnectionResult<InferSelectResult<ApiModuleWithRelations, S>>;
-    }>;
-    findFirst<const S extends ApiModuleSelect>(args?: FindFirstArgs<S, ApiModuleFilter>): QueryBuilder<{
-        apiModules: {
-            nodes: InferSelectResult<ApiModuleWithRelations, S>[];
-        };
-    }>;
-    create<const S extends ApiModuleSelect>(args: CreateArgs<S, CreateApiModuleInput['apiModule']>): QueryBuilder<{
-        createApiModule: {
-            apiModule: InferSelectResult<ApiModuleWithRelations, S>;
-        };
-    }>;
-    update<const S extends ApiModuleSelect>(args: UpdateArgs<S, {
-        id: string;
-    }, ApiModulePatch>): QueryBuilder<{
-        updateApiModule: {
-            apiModule: InferSelectResult<ApiModuleWithRelations, S>;
-        };
-    }>;
-    delete(args: DeleteArgs<{
-        id: string;
-    }>): QueryBuilder<{
-        deleteApiModule: {
-            apiModule: {
-                id: string;
-            };
-        };
-    }>;
-}

package/codegen/orm/models/apiModule.js

@@ -1,77 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApiModuleModel = void 0;
-const query_builder_1 = require("../query-builder");
-// ============================================================================
-// Model Class
-// ============================================================================
-class ApiModuleModel {
-    client;
-    constructor(client) {
-        this.client = client;
-    }
-    findMany(args) {
-        const { document, variables } = (0, query_builder_1.buildFindManyDocument)('ApiModule', 'apiModules', args?.select, {
-            where: args?.where,
-            orderBy: args?.orderBy,
-            first: args?.first,
-            last: args?.last,
-            after: args?.after,
-            before: args?.before,
-            offset: args?.offset,
-        }, 'ApiModuleFilter', 'ApiModulesOrderBy');
-        return new query_builder_1.QueryBuilder({
-            client: this.client,
-            operation: 'query',
-            operationName: 'ApiModule',
-            fieldName: 'apiModules',
-            document,
-            variables,
-        });
-    }
-    findFirst(args) {
-        const { document, variables } = (0, query_builder_1.buildFindFirstDocument)('ApiModule', 'apiModules', args?.select, { where: args?.where }, 'ApiModuleFilter');
-        return new query_builder_1.QueryBuilder({
-            client: this.client,
-            operation: 'query',
-            operationName: 'ApiModule',
-            fieldName: 'apiModules',
-            document,
-            variables,
-        });
-    }
-    create(args) {
-        const { document, variables } = (0, query_builder_1.buildCreateDocument)('ApiModule', 'createApiModule', 'apiModule', args.select, args.data, 'CreateApiModuleInput');
-        return new query_builder_1.QueryBuilder({
-            client: this.client,
-            operation: 'mutation',
-            operationName: 'ApiModule',
-            fieldName: 'createApiModule',
-            document,
-            variables,
-        });
-    }
-    update(args) {
-        const { document, variables } = (0, query_builder_1.buildUpdateDocument)('ApiModule', 'updateApiModule', 'apiModule', args.select, args.where, args.data, 'UpdateApiModuleInput');
-        return new query_builder_1.QueryBuilder({
-            client: this.client,
-            operation: 'mutation',
-            operationName: 'ApiModule',
-            fieldName: 'updateApiModule',
-            document,
-            variables,
-        });
-    }
-    delete(args) {
-        const { document, variables } = (0, query_builder_1.buildDeleteDocument)('ApiModule', 'deleteApiModule', 'apiModule', args.where, 'DeleteApiModuleInput');
-        return new query_builder_1.QueryBuilder({
-            client: this.client,
-            operation: 'mutation',
-            operationName: 'ApiModule',
-            fieldName: 'deleteApiModule',
-            document,
-            variables,
-        });
-    }
-}
-exports.ApiModuleModel = ApiModuleModel;

package/codegen/orm/models/apiSchema.d.ts

@@ -1,42 +0,0 @@
-/**
- * ApiSchema model for ORM client
- * @generated by @constructive-io/graphql-codegen
- * DO NOT EDIT - changes will be overwritten
- */
-import { OrmClient } from '../client';
-import { QueryBuilder } from '../query-builder';
-import { type ConnectionResult, type FindManyArgs, type FindFirstArgs, type CreateArgs, type UpdateArgs, type DeleteArgs, type InferSelectResult } from '../select-types';
-import { type ApiSchemaWithRelations, type ApiSchemaSelect, type ApiSchemaFilter, type ApiSchemasOrderBy, type CreateApiSchemaInput, type ApiSchemaPatch } from '../input-types';
-export declare class ApiSchemaModel {
-    private client;
-    constructor(client: OrmClient);
-    findMany<const S extends ApiSchemaSelect>(args?: FindManyArgs<S, ApiSchemaFilter, ApiSchemasOrderBy>): QueryBuilder<{
-        apiSchemas: ConnectionResult<InferSelectResult<ApiSchemaWithRelations, S>>;
-    }>;
-    findFirst<const S extends ApiSchemaSelect>(args?: FindFirstArgs<S, ApiSchemaFilter>): QueryBuilder<{
-        apiSchemas: {
-            nodes: InferSelectResult<ApiSchemaWithRelations, S>[];
-        };
-    }>;
-    create<const S extends ApiSchemaSelect>(args: CreateArgs<S, CreateApiSchemaInput['apiSchema']>): QueryBuilder<{
-        createApiSchema: {
-            apiSchema: InferSelectResult<ApiSchemaWithRelations, S>;
-        };
-    }>;
-    update<const S extends ApiSchemaSelect>(args: UpdateArgs<S, {
-        id: string;
-    }, ApiSchemaPatch>): QueryBuilder<{
-        updateApiSchema: {
-            apiSchema: InferSelectResult<ApiSchemaWithRelations, S>;
-        };
-    }>;
-    delete(args: DeleteArgs<{
-        id: string;
-    }>): QueryBuilder<{
-        deleteApiSchema: {
-            apiSchema: {
-                id: string;
-            };
-        };
-    }>;
-}