@constructive-io/graphql-codegen 4.8.0 → 4.9.0

package/core/codegen/cli/command-map-generator.js

@@ -48,6 +48,25 @@ function createNamedImportDeclaration(moduleSpecifier, namedImports, typeOnly =
     decl.importKind = typeOnly ? 'type' : 'value';
     return decl;
 }
+/**
+ * Build the command handler function type:
+ * (argv: Partial<Record<string, unknown>>, prompter: Inquirerer, options: CLIOptions) => Promise<void>
+ * This matches the actual exported handler signatures from table/custom command files.
+ */
+function buildCommandHandlerType() {
+    const argvParam = t.identifier('argv');
+    argvParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Partial'), t.tsTypeParameterInstantiation([
+        t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([
+            t.tsStringKeyword(),
+            t.tsUnknownKeyword(),
+        ])),
+    ])));
+    const prompterParam = t.identifier('prompter');
+    prompterParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Inquirerer')));
+    const optionsParam = t.identifier('options');
+    optionsParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CLIOptions')));
+    return t.tsFunctionType(null, [argvParam, prompterParam, optionsParam], t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tsVoidKeyword()]))));
+}
 function generateCommandMap(tables, customOperations, toolName) {
     const statements = [];
     statements.push(createNamedImportDeclaration('inquirerer', [
@@ -74,18 +93,17 @@ function generateCommandMap(tables, customOperations, toolName) {
         statements.push(createImportDeclaration(`./commands/${kebab}`, importName));
     }
     const mapProperties = commandEntries.map((entry) => t.objectProperty(t.stringLiteral(entry.kebab), t.identifier(entry.importName)));
-    const createCommandMapFunc = t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier('createCommandMap'), t.arrowFunctionExpression([], t.objectExpression(mapProperties))),
-    ]);
-    const createCommandMapAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([
-        t.tsStringKeyword(),
-        t.tsFunctionType(null, [], t.tsTypeAnnotation(t.tsAnyKeyword())),
-    ])));
+    // Build command handler type matching actual handler signature:
+    // (argv: Partial<Record<string, unknown>>, prompter: Inquirerer, options: CLIOptions) => Promise<void>
+    const commandHandlerType = buildCommandHandlerType();
     const createCommandMapId = t.identifier('createCommandMap');
     createCommandMapId.typeAnnotation = t.tsTypeAnnotation(t.tsParenthesizedType(t.tsFunctionType(null, [], t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([
         t.tsStringKeyword(),
-        t.tsFunctionType(null, [], t.tsTypeAnnotation(t.tsUnknownKeyword())),
+        commandHandlerType,
     ]))))));
+    const createCommandMapFunc = t.variableDeclaration('const', [
+        t.variableDeclarator(createCommandMapId, t.arrowFunctionExpression([], t.objectExpression(mapProperties))),
+    ]);
     statements.push(createCommandMapFunc);
     const usageLines = [
         '',
@@ -152,7 +170,7 @@ function generateCommandMap(tables, customOperations, toolName) {
                     ]),
                 ]))),
             ]),
-            t.expressionStatement(t.assignmentExpression('=', t.identifier('command'), t.memberExpression(t.identifier('answer'), t.identifier('command')))),
+            t.expressionStatement(t.assignmentExpression('=', t.identifier('command'), t.tsAsExpression(t.memberExpression(t.identifier('answer'), t.identifier('command')), t.tsStringKeyword()))),
         ])),
         t.variableDeclaration('const', [
             t.variableDeclarator(t.identifier('commandFn'), t.memberExpression(t.identifier('commandMap'), t.identifier('command'), true)),
@@ -223,8 +241,15 @@ function generateMultiTargetCommandMap(input) {
         }
     }
     const mapProperties = commandEntries.map((entry) => t.objectProperty(t.stringLiteral(entry.kebab), t.identifier(entry.importName)));
+    // Build command handler type matching actual handler signature
+    const multiTargetCommandHandlerType = buildCommandHandlerType();
+    const multiTargetCreateCommandMapId = t.identifier('createCommandMap');
+    multiTargetCreateCommandMapId.typeAnnotation = t.tsTypeAnnotation(t.tsParenthesizedType(t.tsFunctionType(null, [], t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([
+        t.tsStringKeyword(),
+        multiTargetCommandHandlerType,
+    ]))))));
     const createCommandMapFunc = t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier('createCommandMap'), t.arrowFunctionExpression([], t.objectExpression(mapProperties))),
+        t.variableDeclarator(multiTargetCreateCommandMapId, t.arrowFunctionExpression([], t.objectExpression(mapProperties))),
     ]);
     statements.push(createCommandMapFunc);
     const usageLines = [
@@ -298,7 +323,7 @@ function generateMultiTargetCommandMap(input) {
                     ]),
                 ]))),
             ]),
-            t.expressionStatement(t.assignmentExpression('=', t.identifier('command'), t.memberExpression(t.identifier('answer'), t.identifier('command')))),
+            t.expressionStatement(t.assignmentExpression('=', t.identifier('command'), t.tsAsExpression(t.memberExpression(t.identifier('answer'), t.identifier('command')), t.tsStringKeyword()))),
         ])),
         t.variableDeclaration('const', [
             t.variableDeclarator(t.identifier('commandFn'), t.memberExpression(t.identifier('commandMap'), t.identifier('command'), true)),

package/core/codegen/cli/custom-command-generator.js

@@ -101,22 +101,33 @@ function buildDefaultSelectString(returnType, isMutation) {
     }
     return '';
 }
-function buildOrmCustomCall(opKind, opName, argsExpr, selectExpr, hasArgs = true) {
+function buildOrmCustomCall(opKind, opName, argsExpr, selectExpr, hasArgs = true, selectTypeName) {
     const callArgs = [];
+    // Helper: wrap { select } and cast to `{ select: XxxSelect }` via `unknown`.
+    // The ORM method's second parameter is `{ select: S } & StrictSelect<S, XxxSelect>`.
+    // We import the concrete Select type (e.g. CheckPasswordPayloadSelect) and cast
+    // `{ select: selectFields } as unknown as { select: XxxSelect }` so TS infers
+    // `S = XxxSelect` and StrictSelect is satisfied.
+    const castSelectWrapper = (sel) => {
+        const selectObj = t.objectExpression([
+            t.objectProperty(t.identifier('select'), sel),
+        ]);
+        if (!selectTypeName)
+            return selectObj;
+        return t.tsAsExpression(t.tsAsExpression(selectObj, t.tsUnknownKeyword()), t.tsTypeLiteral([
+            t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(selectTypeName)))),
+        ]));
+    };
     if (hasArgs) {
-        // Operation has arguments: pass args as first param, select as second
+        // Operation has arguments: pass args as first param, select as second.
         callArgs.push(argsExpr);
         if (selectExpr) {
-            callArgs.push(t.objectExpression([
-                t.objectProperty(t.identifier('select'), selectExpr),
-            ]));
+            callArgs.push(castSelectWrapper(selectExpr));
         }
     }
     else if (selectExpr) {
-        // No arguments: pass { select } as the only param (ORM signature)
-        callArgs.push(t.objectExpression([
-            t.objectProperty(t.identifier('select'), selectExpr),
-        ]));
+        // No arguments: pass { select } as the only param (ORM signature).
+        callArgs.push(castSelectWrapper(selectExpr));
     }
     return t.callExpression(t.memberExpression(t.callExpression(t.memberExpression(t.memberExpression(t.identifier('client'), t.identifier(opKind)), t.identifier(opName)), callArgs), t.identifier('execute')), []);
 }
@@ -152,6 +163,18 @@ function generateCustomCommand(op, options) {
     if (utilsImports.length > 0) {
         statements.push(createImportDeclaration(utilsPath, utilsImports));
     }
+    // Import the Variables type for this operation from the ORM query/mutation module.
+    // Custom operations define their own Variables types (e.g. CheckPasswordVariables)
+    // in the ORM layer. We import and cast CLI answers to this type for proper typing.
+    if (op.args.length > 0) {
+        const variablesTypeName = `${(0, utils_1.ucFirst)(op.name)}Variables`;
+        // Commands are at cli/commands/xxx.ts (no target) or cli/commands/{target}/xxx.ts (with target).
+        // ORM query/mutation is at orm/{opKind}/ — two or three levels up from commands.
+        const ormOpPath = options?.targetName
+            ? `../../../orm/${opKind}`
+            : `../../orm/${opKind}`;
+        statements.push(createImportDeclaration(ormOpPath, [variablesTypeName], true));
+    }
     const questionsArray = op.args.length > 0
         ? (0, arg_mapper_1.buildQuestionsArray)(op.args)
         : t.arrayExpression([]);
@@ -189,10 +212,16 @@ function generateCustomCommand(op, options) {
             ])),
         ]));
     }
+    // Cast args to the specific Variables type for this operation.
+    // The ORM expects typed variables (e.g. CheckPasswordVariables), and CLI
+    // prompt answers are Record<string, unknown>. We cast through `unknown`
+    // first because Record<string, unknown> doesn't directly overlap with
+    // Variables types that have specific property types (like `input: SomeInput`).
+    const variablesTypeName = `${(0, utils_1.ucFirst)(op.name)}Variables`;
     const argsExpr = op.args.length > 0
-        ? (hasInputObjectArg
+        ? t.tsAsExpression(t.tsAsExpression(hasInputObjectArg
             ? t.identifier('parsedAnswers')
-            : t.identifier('answers'))
+            : t.identifier('answers'), t.tsUnknownKeyword()), t.tsTypeReference(t.identifier(variablesTypeName)))
         : t.objectExpression([]);
     // For OBJECT return types, generate runtime select from --select flag
     // For scalar return types, no select is needed
@@ -202,14 +231,31 @@ function generateCustomCommand(op, options) {
         // Generate: const selectFields = buildSelectFromPaths(argv.select ?? 'defaultFields')
         bodyStatements.push(t.variableDeclaration('const', [
             t.variableDeclarator(t.identifier('selectFields'), t.callExpression(t.identifier('buildSelectFromPaths'), [
-                t.logicalExpression('??', t.memberExpression(t.identifier('argv'), t.identifier('select')), t.stringLiteral(defaultSelect)),
+                t.logicalExpression('??', t.tsAsExpression(t.memberExpression(t.identifier('argv'), t.identifier('select')), t.tsStringKeyword()), t.stringLiteral(defaultSelect)),
             ])),
         ]));
         selectExpr = t.identifier('selectFields');
     }
+    // Derive the Select type name from the operation's return type.
+    // e.g. CheckPasswordPayload → CheckPasswordPayloadSelect
+    // This is used to cast { select } to the proper type for StrictSelect.
+    let selectTypeName;
+    if (isObjectReturn) {
+        const baseReturnType = unwrapType(op.returnType);
+        if (baseReturnType.name) {
+            selectTypeName = `${baseReturnType.name}Select`;
+        }
+    }
+    // Import the Select type from orm/input-types if we have one
+    if (selectTypeName) {
+        const inputTypesPath = options?.targetName
+            ? `../../../orm/input-types`
+            : `../../orm/input-types`;
+        statements.push(createImportDeclaration(inputTypesPath, [selectTypeName], true));
+    }
     const hasArgs = op.args.length > 0;
     bodyStatements.push(t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier('result'), t.awaitExpression(buildOrmCustomCall(opKind, op.name, argsExpr, selectExpr, hasArgs))),
+        t.variableDeclarator(t.identifier('result'), t.awaitExpression(buildOrmCustomCall(opKind, op.name, argsExpr, selectExpr, hasArgs, selectTypeName))),
     ]));
     if (options?.saveToken) {
         bodyStatements.push(t.ifStatement(t.logicalExpression('&&', t.memberExpression(t.identifier('argv'), t.identifier('saveToken')), t.identifier('result')), t.blockStatement([

package/core/codegen/cli/executor-generator.js

@@ -86,9 +86,16 @@ function generateExecutorFile(toolName, options) {
                 ])),
             ])),
         ])),
-        t.variableDeclaration('const', [
-            t.variableDeclarator(t.identifier('headers'), t.objectExpression([])),
-        ]),
+        (() => {
+            const headersId = t.identifier('headers');
+            headersId.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([
+                t.tsStringKeyword(),
+                t.tsStringKeyword(),
+            ])));
+            return t.variableDeclaration('const', [
+                t.variableDeclarator(headersId, t.objectExpression([])),
+            ]);
+        })(),
         t.ifStatement(t.callExpression(t.memberExpression(t.identifier('store'), t.identifier('hasValidCredentials')), [t.memberExpression(t.identifier('ctx'), t.identifier('name'))]), t.blockStatement([
             t.variableDeclaration('const', [
                 t.variableDeclarator(t.identifier('creds'), t.callExpression(t.memberExpression(t.identifier('store'), t.identifier('getCredentials')), [t.memberExpression(t.identifier('ctx'), t.identifier('name'))])),
@@ -193,9 +200,16 @@ function generateMultiTargetExecutorFile(toolName, targets, options) {
                 ], [t.identifier('targetName')]),
             ])),
         ])),
-        t.variableDeclaration('const', [
-            t.variableDeclarator(t.identifier('headers'), t.objectExpression([])),
-        ]),
+        (() => {
+            const headersId = t.identifier('headers');
+            headersId.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([
+                t.tsStringKeyword(),
+                t.tsStringKeyword(),
+            ])));
+            return t.variableDeclaration('const', [
+                t.variableDeclarator(headersId, t.objectExpression([])),
+            ]);
+        })(),
         t.variableDeclaration('let', [
             t.variableDeclarator(t.identifier('endpoint'), t.stringLiteral('')),
         ]),

package/core/codegen/cli/infra-generator.js

@@ -135,7 +135,7 @@ Create Options:
                 ]))),
             ]),
             t.returnStatement(t.callExpression(t.identifier('handleSubcommand'), [
-                t.memberExpression(t.identifier('answer'), t.identifier('subcommand')),
+                t.tsAsExpression(t.memberExpression(t.identifier('answer'), t.identifier('subcommand')), t.tsStringKeyword()),
                 t.identifier('newArgv'),
                 t.identifier('prompter'),
                 t.identifier('store'),
@@ -224,7 +224,7 @@ function buildCreateHandler() {
             ])),
         ]),
         t.variableDeclaration('const', [
-            t.variableDeclarator(t.identifier('answers'), t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('prompter'), t.identifier('prompt')), [
+            t.variableDeclarator(t.identifier('answers'), t.tsAsExpression(t.tsAsExpression(t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('prompter'), t.identifier('prompt')), [
                 t.objectExpression([
                     t.objectProperty(t.identifier('name'), t.identifier('name'), false, true),
                     t.spreadElement(t.identifier('restArgv')),
@@ -243,7 +243,10 @@ function buildCreateHandler() {
                         t.objectProperty(t.identifier('required'), t.booleanLiteral(true)),
                     ]),
                 ]),
-            ]))),
+            ])), t.tsUnknownKeyword()), t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([
+                t.tsStringKeyword(),
+                t.tsStringKeyword(),
+            ])))),
         ]),
         t.variableDeclaration('const', [
             t.variableDeclarator(t.identifier('contextName'), t.memberExpression(t.identifier('answers'), t.identifier('name'))),
@@ -380,7 +383,7 @@ function buildUseHandler() {
                     ]),
                 ]))),
             ]),
-            t.expressionStatement(t.assignmentExpression('=', t.identifier('contextName'), t.memberExpression(t.identifier('answer'), t.identifier('name')))),
+            t.expressionStatement(t.assignmentExpression('=', t.identifier('contextName'), t.tsAsExpression(t.memberExpression(t.identifier('answer'), t.identifier('name')), t.tsStringKeyword()))),
         ])),
         t.ifStatement(t.callExpression(t.memberExpression(t.identifier('store'), t.identifier('setCurrentContext')), [t.identifier('contextName')]), t.blockStatement([
             t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('console'), t.identifier('log')), [
@@ -496,7 +499,7 @@ function buildDeleteHandler() {
                     ]),
                 ]))),
             ]),
-            t.expressionStatement(t.assignmentExpression('=', t.identifier('contextName'), t.memberExpression(t.identifier('answer'), t.identifier('name')))),
+            t.expressionStatement(t.assignmentExpression('=', t.identifier('contextName'), t.tsAsExpression(t.memberExpression(t.identifier('answer'), t.identifier('name')), t.tsStringKeyword()))),
         ])),
         t.ifStatement(t.callExpression(t.memberExpression(t.identifier('store'), t.identifier('deleteContext')), [t.identifier('contextName')]), t.blockStatement([
             t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('console'), t.identifier('log')), [
@@ -588,7 +591,7 @@ Options:
                 ]))),
             ]),
             t.returnStatement(t.callExpression(t.identifier('handleAuthSubcommand'), [
-                t.memberExpression(t.identifier('answer'), t.identifier('subcommand')),
+                t.tsAsExpression(t.memberExpression(t.identifier('answer'), t.identifier('subcommand')), t.tsStringKeyword()),
                 t.identifier('newArgv'),
                 t.identifier('prompter'),
                 t.identifier('store'),
@@ -690,7 +693,7 @@ function buildSetTokenHandler() {
                     ]),
                 ]))),
             ]),
-            t.expressionStatement(t.assignmentExpression('=', t.identifier('tokenValue'), t.memberExpression(t.identifier('answer'), t.identifier('token')))),
+            t.expressionStatement(t.assignmentExpression('=', t.identifier('tokenValue'), t.tsAsExpression(t.memberExpression(t.identifier('answer'), t.identifier('token')), t.tsStringKeyword()))),
         ])),
         t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('store'), t.identifier('setCredentials')), [
             t.memberExpression(t.identifier('current'), t.identifier('name')),
@@ -809,7 +812,7 @@ function buildLogoutHandler() {
                 ]),
             ]))),
         ]),
-        t.ifStatement(t.unaryExpression('!', t.memberExpression(t.identifier('confirm'), t.identifier('confirm'))), t.blockStatement([t.returnStatement()])),
+        t.ifStatement(t.unaryExpression('!', t.tsAsExpression(t.memberExpression(t.identifier('confirm'), t.identifier('confirm')), t.tsBooleanKeyword())), t.blockStatement([t.returnStatement()])),
         t.ifStatement(t.callExpression(t.memberExpression(t.identifier('store'), t.identifier('removeCredentials')), [
             t.memberExpression(t.identifier('current'), t.identifier('name')),
         ]), t.blockStatement([
@@ -909,7 +912,7 @@ ${targets.map((tgt) => `  --${tgt.name}-endpoint <url>  ${tgt.name} endpoint (de
                 ]))),
             ]),
             t.returnStatement(t.callExpression(t.identifier('handleSubcommand'), [
-                t.memberExpression(t.identifier('answer'), t.identifier('subcommand')),
+                t.tsAsExpression(t.memberExpression(t.identifier('answer'), t.identifier('subcommand')), t.tsStringKeyword()),
                 t.identifier('newArgv'),
                 t.identifier('prompter'),
                 t.identifier('store'),
@@ -1008,7 +1011,7 @@ function buildMultiTargetCreateHandler(targets) {
     const targetsObjProps = targets.map((target) => {
         const fieldName = `${target.name}Endpoint`;
         return t.objectProperty(t.stringLiteral(target.name), t.objectExpression([
-            t.objectProperty(t.identifier('endpoint'), t.memberExpression(t.identifier('answers'), t.identifier(fieldName))),
+            t.objectProperty(t.identifier('endpoint'), t.tsAsExpression(t.memberExpression(t.identifier('answers'), t.identifier(fieldName)), t.tsStringKeyword())),
         ]));
     });
     const body = [
@@ -1030,7 +1033,7 @@ function buildMultiTargetCreateHandler(targets) {
             ]))),
         ]),
         t.variableDeclaration('const', [
-            t.variableDeclarator(t.identifier('contextName'), t.memberExpression(t.identifier('answers'), t.identifier('name'))),
+            t.variableDeclarator(t.identifier('contextName'), t.tsAsExpression(t.memberExpression(t.identifier('answers'), t.identifier('name')), t.tsStringKeyword())),
         ]),
         t.variableDeclaration('const', [
             t.variableDeclarator(t.identifier('targets'), t.objectExpression(targetsObjProps)),
@@ -1038,7 +1041,7 @@ function buildMultiTargetCreateHandler(targets) {
         t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('store'), t.identifier('createContext')), [
             t.identifier('contextName'),
             t.objectExpression([
-                t.objectProperty(t.identifier('endpoint'), t.memberExpression(t.identifier('answers'), t.identifier(`${targets[0].name}Endpoint`))),
+                t.objectProperty(t.identifier('endpoint'), t.tsAsExpression(t.memberExpression(t.identifier('answers'), t.identifier(`${targets[0].name}Endpoint`)), t.tsStringKeyword())),
                 t.objectProperty(t.identifier('targets'), t.identifier('targets')),
             ]),
         ])),
@@ -1061,7 +1064,7 @@ function buildMultiTargetCreateHandler(targets) {
             t.templateLiteral([
                 t.templateElement({ raw: `  ${target.name}: `, cooked: `  ${target.name}: ` }),
                 t.templateElement({ raw: '', cooked: '' }, true),
-            ], [t.memberExpression(t.identifier('answers'), t.identifier(fieldName))]),
+            ], [t.tsAsExpression(t.memberExpression(t.identifier('answers'), t.identifier(fieldName)), t.tsStringKeyword())]),
         ])));
     }
     const func = t.functionDeclaration(t.identifier('handleCreate'), [argvParam, prompterParam, storeParam], t.blockStatement(body), false, true);
@@ -1137,7 +1140,7 @@ Options:
                 ]))),
             ]),
             t.returnStatement(t.callExpression(t.identifier('handleAuthSubcommand'), [
-                t.memberExpression(t.identifier('answer'), t.identifier('subcommand')),
+                t.tsAsExpression(t.memberExpression(t.identifier('answer'), t.identifier('subcommand')), t.tsStringKeyword()),
                 t.identifier('newArgv'),
                 t.identifier('prompter'),
                 t.identifier('store'),