@constructive-io/cli 5.11.1 → 6.0.1

package/commands/codegen.d.ts

@@ -1,3 +1,3 @@
-import { CLIOptions, Inquirerer, ParsedArgs } from 'inquirerer';
-declare const _default: (argv: Partial<ParsedArgs>, _prompter: Inquirerer, _options: CLIOptions) => Promise<void>;
+import { CLIOptions, Inquirerer } from 'inquirerer';
+declare const _default: (argv: Partial<Record<string, unknown>>, prompter: Inquirerer, _options: CLIOptions) => Promise<void>;
 export default _default;

package/commands/codegen.js

@@ -1,167 +1,60 @@
 "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;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __importStar(require("node:fs"));
-const path = __importStar(require("node:path"));
-const graphql_server_1 = require("@constructive-io/graphql-server");
 const graphql_codegen_1 = require("@constructive-io/graphql-codegen");
-const graphql_env_1 = require("@constructive-io/graphql-env");
 const usage = `
 Constructive GraphQL Codegen:
 
   cnc codegen [OPTIONS]
 
-Options:
-  --help, -h                 Show this help message
+Source Options (choose one):
   --config <path>            Path to graphql-codegen config file
-  --target <name>            Target name in config file
   --endpoint <url>           GraphQL endpoint URL
-  --auth <token>             Authorization header value (e.g., "Bearer 123")
-  --out <dir>                Output directory (default: codegen)
-  --dry-run                  Preview without writing files
-  -v, --verbose              Verbose output
+  --schemaFile <path>        Path to GraphQL schema file
 
-  --orm                      Generate Prisma-like ORM client instead of React Query hooks
+Database Options:
+  --schemas <list>           Comma-separated PostgreSQL schemas
+  --apiNames <list>          Comma-separated API names
 
-  --database <name>          Database override for DB mode (defaults to PGDATABASE)
-  --schemas <list>           Comma-separated schemas (required for DB mode)
+Generator Options:
+  --reactQuery               Generate React Query hooks (default)
+  --orm                      Generate ORM client
+  --output <dir>             Output directory (default: codegen)
+  --authorization <token>    Authorization header value
+  --dryRun                   Preview without writing files
+  --verbose                  Verbose output
+
+  --help, -h                 Show this help message
 `;
-exports.default = async (argv, _prompter, _options) => {
+exports.default = async (argv, prompter, _options) => {
     if (argv.help || argv.h) {
         console.log(usage);
         process.exit(0);
     }
-    const opts = parseArgs(argv);
-    const mode = determineMode(opts);
-    if (mode.type === 'none') {
-        console.error('Error: No source specified. Use --endpoint, --config, or --schemas for database mode.');
-        process.exit(1);
-    }
-    // Build schema from database if needed
-    const outDir = opts.output || 'codegen';
-    const schemaPath = mode.type === 'database'
-        ? await buildSchemaFromDatabase(mode.database, mode.schemas, outDir)
-        : undefined;
-    const commandOptions = {
-        config: opts.config,
-        target: opts.target,
-        endpoint: mode.type === 'endpoint' ? mode.endpoint : undefined,
-        schema: schemaPath,
-        output: opts.config ? opts.output : outDir,
-        authorization: opts.auth,
-        verbose: opts.verbose,
-        dryRun: opts.dryRun,
-    };
-    const result = opts.orm
-        ? await (0, graphql_codegen_1.generateOrm)(commandOptions)
-        : await (0, graphql_codegen_1.generateReactQuery)(commandOptions);
-    printResult(result);
-    if (!result.success) {
-        process.exit(1);
-    }
-};
-function parseArgs(argv) {
-    const schemasArg = argv.schemas || '';
-    return {
-        endpoint: argv.endpoint || undefined,
-        config: argv.config || (0, graphql_codegen_1.findConfigFile)() || undefined,
-        target: argv.target || undefined,
-        output: argv.out || undefined,
-        auth: argv.auth || undefined,
-        database: argv.database || undefined,
-        schemas: schemasArg
-            ? schemasArg.split(',').map((s) => s.trim()).filter(Boolean)
-            : undefined,
-        dryRun: !!(argv['dry-run'] || argv.dryRun),
-        verbose: !!(argv.verbose || argv.v),
-        orm: !!argv.orm,
-    };
-}
-function determineMode(opts) {
-    if (opts.endpoint) {
-        return { type: 'endpoint', endpoint: opts.endpoint };
-    }
-    if (opts.schemas?.length) {
-        const database = opts.database || (0, graphql_env_1.getEnvOptions)().pg.database;
-        return { type: 'database', database, schemas: opts.schemas };
-    }
-    if (opts.config) {
-        return { type: 'config', configPath: opts.config };
-    }
-    return { type: 'none' };
-}
-function printTargetResult(target) {
-    const status = target.success ? '[ok]' : 'x';
-    console.log(`\n${status} ${target.message}`);
-    if (target.tables?.length) {
-        console.log('  Tables:');
-        target.tables.forEach((t) => console.log(`    - ${t}`));
-    }
-    if (target.filesWritten?.length) {
-        console.log('  Files written:');
-        target.filesWritten.forEach((f) => console.log(`    - ${f}`));
-    }
-    if (!target.success && target.errors?.length) {
-        target.errors.forEach((e) => console.error(`  - ${e}`));
-    }
-}
-function printResult(result) {
-    const targets = result.targets ?? [];
-    const isMultiTarget = targets.length > 1 || (targets.length === 1 && targets[0]?.name !== 'default');
-    if (isMultiTarget) {
-        console.log(result.message);
-        targets.forEach(printTargetResult);
+    // Auto-detect config file if not provided
+    const config = argv.config || (0, graphql_codegen_1.findConfigFile)();
+    if (config) {
+        // If config file exists, just run generate with it (config file handles everything)
+        const result = await (0, graphql_codegen_1.generate)({});
+        (0, graphql_codegen_1.printResult)(result);
         return;
     }
-    if (!result.success) {
-        console.error(result.message);
-        result.errors?.forEach((e) => console.error('  -', e));
-    }
-    else {
-        console.log(result.message);
-        result.filesWritten?.forEach((f) => console.log(f));
-    }
-}
-async function buildSchemaFromDatabase(database, schemas, outDir) {
-    await fs.promises.mkdir(outDir, { recursive: true });
-    const sdl = await (0, graphql_server_1.buildSchemaSDL)({
-        database,
-        schemas,
-        graphile: { pgSettings: async () => ({ role: 'administrator' }) },
+    // No config file - prompt for options using shared questions
+    const answers = await prompter.prompt(argv, graphql_codegen_1.codegenQuestions);
+    // Build db config if schemas or apiNames provided
+    const db = (answers.schemas || answers.apiNames) ? {
+        schemas: answers.schemas,
+        apiNames: answers.apiNames,
+    } : undefined;
+    const result = await (0, graphql_codegen_1.generate)({
+        endpoint: answers.endpoint,
+        schemaFile: answers.schemaFile,
+        db,
+        output: answers.output,
+        authorization: answers.authorization,
+        reactQuery: answers.reactQuery,
+        orm: answers.orm,
+        dryRun: answers.dryRun,
+        verbose: answers.verbose,
     });
-    const schemaPath = path.join(outDir, 'schema.graphql');
-    await fs.promises.writeFile(schemaPath, sdl, 'utf-8');
-    return schemaPath;
-}
+    (0, graphql_codegen_1.printResult)(result);
+};

package/commands/get-graphql-schema.d.ts

@@ -1,3 +1,3 @@
-import { CLIOptions, Inquirerer, ParsedArgs } from 'inquirerer';
-declare const _default: (argv: Partial<ParsedArgs>, prompter: Inquirerer, _options: CLIOptions) => Promise<void>;
+import { CLIOptions, Inquirerer } from 'inquirerer';
+declare const _default: (argv: Partial<Record<string, unknown>>, prompter: Inquirerer, _options: CLIOptions) => Promise<void>;
 export default _default;

package/commands/get-graphql-schema.js

@@ -7,32 +7,52 @@ Constructive Get GraphQL Schema:
 
   cnc get-graphql-schema [OPTIONS]
 
-Options:
-  --help, -h              Show this help message
+Source Options (choose one):
+  --endpoint <url>        GraphQL endpoint to fetch schema via introspection
   --database <name>       Database name (default: constructive)
+
+Options:
   --schemas <list>        Comma-separated schemas to include
-  --endpoint <url>        GraphQL endpoint to fetch schema via introspection
-  --headerHost <host>     Optional Host header to send with endpoint requests
-  --auth <token>          Optional Authorization header value (e.g., "Bearer 123")
-  --header "Name: Value"  Optional HTTP header; repeat to add multiple headers
+  --headerHost <host>     Host header to send with endpoint requests
+  --auth <token>          Authorization header value
   --out <path>            Output file path (default: print to stdout)
+
+  --help, -h              Show this help message
 `;
-const defaultSchemas = [
-    'metaschema_public',
-    'metaschema_modules_public',
-    'services_public'
+const questions = [
+    {
+        name: 'endpoint',
+        message: 'GraphQL endpoint URL',
+        type: 'text',
+        required: false,
+    },
+    {
+        name: 'database',
+        message: 'Database name',
+        type: 'text',
+        required: false,
+    },
+    {
+        name: 'schemas',
+        message: 'Comma-separated schemas',
+        type: 'text',
+        required: false,
+    },
+    {
+        name: 'out',
+        message: 'Output file path',
+        type: 'text',
+        required: false,
+    },
 ];
 exports.default = async (argv, prompter, _options) => {
     if (argv.help || argv.h) {
         console.log(usage);
         process.exit(0);
     }
-    const endpoint = argv.endpoint ?? '';
-    const headerHost = argv.headerHost ?? '';
-    const auth = argv.auth ?? '';
-    const database = argv.database ?? 'constructive';
-    const schemasArg = argv.schemas ?? defaultSchemas.join(',');
-    const out = argv.out ?? '';
+    const { endpoint, database, schemas: schemasArg, out, } = await prompter.prompt(argv, questions);
+    const schemas = String(schemasArg).split(',').map((s) => s.trim()).filter(Boolean);
+    // Parse repeated --header values into headers object
     const headerArg = argv.header;
     const headerList = Array.isArray(headerArg) ? headerArg : headerArg ? [headerArg] : [];
     const headers = {};
@@ -46,23 +66,19 @@ exports.default = async (argv, prompter, _options) => {
             continue;
         headers[name] = value;
     }
-    const schemas = schemasArg.split(',').map(s => s.trim()).filter(Boolean);
     let sdl;
     if (endpoint) {
         const opts = {};
-        if (headerHost)
-            opts.headerHost = headerHost;
-        if (auth)
-            opts.auth = auth;
+        if (argv.headerHost)
+            opts.headerHost = argv.headerHost;
+        if (argv.auth)
+            opts.auth = argv.auth;
         if (Object.keys(headers).length)
             opts.headers = headers;
         sdl = await graphql_server_1.fetchEndpointSchemaSDL(endpoint, opts);
     }
     else {
-        // The server package already depends on postgraphile and graphql,
-        // and exporting a reusable programmatic builder from there
-        // avoids adding new dependencies to cli and prevents duplication.
-        sdl = await (0, graphql_server_1.buildSchemaSDL)({ database, schemas });
+        sdl = await (0, graphql_server_1.buildSchemaSDL)({ database: database, schemas });
     }
     if (out) {
         await fs_1.promises.writeFile(out, sdl, 'utf8');

package/esm/commands/codegen.js

@@ -1,132 +1,58 @@
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { buildSchemaSDL } from '@constructive-io/graphql-server';
-import { generateReactQuery, generateOrm, findConfigFile, } from '@constructive-io/graphql-codegen';
-import { getEnvOptions } from '@constructive-io/graphql-env';
+import { generate, findConfigFile, codegenQuestions, printResult, } from '@constructive-io/graphql-codegen';
 const usage = `
 Constructive GraphQL Codegen:
 
   cnc codegen [OPTIONS]
 
-Options:
-  --help, -h                 Show this help message
+Source Options (choose one):
   --config <path>            Path to graphql-codegen config file
-  --target <name>            Target name in config file
   --endpoint <url>           GraphQL endpoint URL
-  --auth <token>             Authorization header value (e.g., "Bearer 123")
-  --out <dir>                Output directory (default: codegen)
-  --dry-run                  Preview without writing files
-  -v, --verbose              Verbose output
+  --schemaFile <path>        Path to GraphQL schema file
+
+Database Options:
+  --schemas <list>           Comma-separated PostgreSQL schemas
+  --apiNames <list>          Comma-separated API names
 
-  --orm                      Generate Prisma-like ORM client instead of React Query hooks
+Generator Options:
+  --reactQuery               Generate React Query hooks (default)
+  --orm                      Generate ORM client
+  --output <dir>             Output directory (default: codegen)
+  --authorization <token>    Authorization header value
+  --dryRun                   Preview without writing files
+  --verbose                  Verbose output
 
-  --database <name>          Database override for DB mode (defaults to PGDATABASE)
-  --schemas <list>           Comma-separated schemas (required for DB mode)
+  --help, -h                 Show this help message
 `;
-export default async (argv, _prompter, _options) => {
+export default async (argv, prompter, _options) => {
     if (argv.help || argv.h) {
         console.log(usage);
         process.exit(0);
     }
-    const opts = parseArgs(argv);
-    const mode = determineMode(opts);
-    if (mode.type === 'none') {
-        console.error('Error: No source specified. Use --endpoint, --config, or --schemas for database mode.');
-        process.exit(1);
-    }
-    // Build schema from database if needed
-    const outDir = opts.output || 'codegen';
-    const schemaPath = mode.type === 'database'
-        ? await buildSchemaFromDatabase(mode.database, mode.schemas, outDir)
-        : undefined;
-    const commandOptions = {
-        config: opts.config,
-        target: opts.target,
-        endpoint: mode.type === 'endpoint' ? mode.endpoint : undefined,
-        schema: schemaPath,
-        output: opts.config ? opts.output : outDir,
-        authorization: opts.auth,
-        verbose: opts.verbose,
-        dryRun: opts.dryRun,
-    };
-    const result = opts.orm
-        ? await generateOrm(commandOptions)
-        : await generateReactQuery(commandOptions);
-    printResult(result);
-    if (!result.success) {
-        process.exit(1);
-    }
-};
-function parseArgs(argv) {
-    const schemasArg = argv.schemas || '';
-    return {
-        endpoint: argv.endpoint || undefined,
-        config: argv.config || findConfigFile() || undefined,
-        target: argv.target || undefined,
-        output: argv.out || undefined,
-        auth: argv.auth || undefined,
-        database: argv.database || undefined,
-        schemas: schemasArg
-            ? schemasArg.split(',').map((s) => s.trim()).filter(Boolean)
-            : undefined,
-        dryRun: !!(argv['dry-run'] || argv.dryRun),
-        verbose: !!(argv.verbose || argv.v),
-        orm: !!argv.orm,
-    };
-}
-function determineMode(opts) {
-    if (opts.endpoint) {
-        return { type: 'endpoint', endpoint: opts.endpoint };
-    }
-    if (opts.schemas?.length) {
-        const database = opts.database || getEnvOptions().pg.database;
-        return { type: 'database', database, schemas: opts.schemas };
-    }
-    if (opts.config) {
-        return { type: 'config', configPath: opts.config };
-    }
-    return { type: 'none' };
-}
-function printTargetResult(target) {
-    const status = target.success ? '[ok]' : 'x';
-    console.log(`\n${status} ${target.message}`);
-    if (target.tables?.length) {
-        console.log('  Tables:');
-        target.tables.forEach((t) => console.log(`    - ${t}`));
-    }
-    if (target.filesWritten?.length) {
-        console.log('  Files written:');
-        target.filesWritten.forEach((f) => console.log(`    - ${f}`));
-    }
-    if (!target.success && target.errors?.length) {
-        target.errors.forEach((e) => console.error(`  - ${e}`));
-    }
-}
-function printResult(result) {
-    const targets = result.targets ?? [];
-    const isMultiTarget = targets.length > 1 || (targets.length === 1 && targets[0]?.name !== 'default');
-    if (isMultiTarget) {
-        console.log(result.message);
-        targets.forEach(printTargetResult);
+    // Auto-detect config file if not provided
+    const config = argv.config || findConfigFile();
+    if (config) {
+        // If config file exists, just run generate with it (config file handles everything)
+        const result = await generate({});
+        printResult(result);
         return;
     }
-    if (!result.success) {
-        console.error(result.message);
-        result.errors?.forEach((e) => console.error('  -', e));
-    }
-    else {
-        console.log(result.message);
-        result.filesWritten?.forEach((f) => console.log(f));
-    }
-}
-async function buildSchemaFromDatabase(database, schemas, outDir) {
-    await fs.promises.mkdir(outDir, { recursive: true });
-    const sdl = await buildSchemaSDL({
-        database,
-        schemas,
-        graphile: { pgSettings: async () => ({ role: 'administrator' }) },
+    // No config file - prompt for options using shared questions
+    const answers = await prompter.prompt(argv, codegenQuestions);
+    // Build db config if schemas or apiNames provided
+    const db = (answers.schemas || answers.apiNames) ? {
+        schemas: answers.schemas,
+        apiNames: answers.apiNames,
+    } : undefined;
+    const result = await generate({
+        endpoint: answers.endpoint,
+        schemaFile: answers.schemaFile,
+        db,
+        output: answers.output,
+        authorization: answers.authorization,
+        reactQuery: answers.reactQuery,
+        orm: answers.orm,
+        dryRun: answers.dryRun,
+        verbose: answers.verbose,
     });
-    const schemaPath = path.join(outDir, 'schema.graphql');
-    await fs.promises.writeFile(schemaPath, sdl, 'utf-8');
-    return schemaPath;
-}
+    printResult(result);
+};

package/esm/commands/get-graphql-schema.js

@@ -5,32 +5,52 @@ Constructive Get GraphQL Schema:
 
   cnc get-graphql-schema [OPTIONS]
 
-Options:
-  --help, -h              Show this help message
+Source Options (choose one):
+  --endpoint <url>        GraphQL endpoint to fetch schema via introspection
   --database <name>       Database name (default: constructive)
+
+Options:
   --schemas <list>        Comma-separated schemas to include
-  --endpoint <url>        GraphQL endpoint to fetch schema via introspection
-  --headerHost <host>     Optional Host header to send with endpoint requests
-  --auth <token>          Optional Authorization header value (e.g., "Bearer 123")
-  --header "Name: Value"  Optional HTTP header; repeat to add multiple headers
+  --headerHost <host>     Host header to send with endpoint requests
+  --auth <token>          Authorization header value
   --out <path>            Output file path (default: print to stdout)
+
+  --help, -h              Show this help message
 `;
-const defaultSchemas = [
-    'metaschema_public',
-    'metaschema_modules_public',
-    'services_public'
+const questions = [
+    {
+        name: 'endpoint',
+        message: 'GraphQL endpoint URL',
+        type: 'text',
+        required: false,
+    },
+    {
+        name: 'database',
+        message: 'Database name',
+        type: 'text',
+        required: false,
+    },
+    {
+        name: 'schemas',
+        message: 'Comma-separated schemas',
+        type: 'text',
+        required: false,
+    },
+    {
+        name: 'out',
+        message: 'Output file path',
+        type: 'text',
+        required: false,
+    },
 ];
 export default async (argv, prompter, _options) => {
     if (argv.help || argv.h) {
         console.log(usage);
         process.exit(0);
     }
-    const endpoint = argv.endpoint ?? '';
-    const headerHost = argv.headerHost ?? '';
-    const auth = argv.auth ?? '';
-    const database = argv.database ?? 'constructive';
-    const schemasArg = argv.schemas ?? defaultSchemas.join(',');
-    const out = argv.out ?? '';
+    const { endpoint, database, schemas: schemasArg, out, } = await prompter.prompt(argv, questions);
+    const schemas = String(schemasArg).split(',').map((s) => s.trim()).filter(Boolean);
+    // Parse repeated --header values into headers object
     const headerArg = argv.header;
     const headerList = Array.isArray(headerArg) ? headerArg : headerArg ? [headerArg] : [];
     const headers = {};
@@ -44,23 +64,19 @@ export default async (argv, prompter, _options) => {
             continue;
         headers[name] = value;
     }
-    const schemas = schemasArg.split(',').map(s => s.trim()).filter(Boolean);
     let sdl;
     if (endpoint) {
         const opts = {};
-        if (headerHost)
-            opts.headerHost = headerHost;
-        if (auth)
-            opts.auth = auth;
+        if (argv.headerHost)
+            opts.headerHost = argv.headerHost;
+        if (argv.auth)
+            opts.auth = argv.auth;
         if (Object.keys(headers).length)
             opts.headers = headers;
         sdl = await fetchEndpointSchemaSDL(endpoint, opts);
     }
     else {
-        // The server package already depends on postgraphile and graphql,
-        // and exporting a reusable programmatic builder from there
-        // avoids adding new dependencies to cli and prevents duplication.
-        sdl = await buildSchemaSDL({ database, schemas });
+        sdl = await buildSchemaSDL({ database: database, schemas });
     }
     if (out) {
         await fs.writeFile(out, sdl, 'utf8');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/cli",
-  "version": "5.11.1",
+  "version": "6.0.1",
   "author": "Constructive <developers@constructive.io>",
   "description": "Constructive CLI",
   "main": "index.js",
@@ -45,22 +45,22 @@
     "ts-node": "^10.9.2"
   },
   "dependencies": {
-    "@constructive-io/graphql-codegen": "^2.32.0",
+    "@constructive-io/graphql-codegen": "^3.0.1",
     "@constructive-io/graphql-env": "^2.9.4",
-    "@constructive-io/graphql-explorer": "^2.15.4",
-    "@constructive-io/graphql-server": "^2.19.11",
-    "@constructive-io/knative-job-service": "^0.9.11",
+    "@constructive-io/graphql-explorer": "^3.0.1",
+    "@constructive-io/graphql-server": "^3.0.1",
+    "@constructive-io/knative-job-service": "^1.0.1",
     "@inquirerer/utils": "^3.2.0",
-    "@pgpmjs/core": "^4.17.1",
-    "@pgpmjs/logger": "^1.5.0",
-    "@pgpmjs/server-utils": "^2.10.0",
+    "@pgpmjs/core": "^5.0.0",
+    "@pgpmjs/logger": "^2.0.0",
+    "@pgpmjs/server-utils": "^3.0.0",
     "@pgpmjs/types": "^2.15.0",
     "find-and-require-package-json": "^0.9.0",
     "inquirerer": "^4.4.0",
     "js-yaml": "^4.1.0",
-    "pg-cache": "^1.8.0",
+    "pg-cache": "^2.0.0",
     "pg-env": "^1.3.0",
-    "pgpm": "^2.12.1",
+    "pgpm": "^3.0.0",
     "shelljs": "^0.10.0",
     "yanse": "^0.2.0"
   },
@@ -75,5 +75,5 @@
     "postgres",
     "graphile"
   ],
-  "gitHead": "39b5c59b01b8ce391dc14daf5a9430ca0ff67574"
+  "gitHead": "f6b4b738f0d069833af001a80b97d86fea6499ae"
 }