@constructive-io/graphql-codegen 4.7.3 → 4.8.1

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

@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import { toKebabCase } from 'komoji';
 import { generateCode } from '../babel-ast';
-import { getGeneratedFileHeader } from '../utils';
+import { getGeneratedFileHeader, ucFirst } from '../utils';
 import { buildQuestionsArray } from './arg-mapper';
 function createImportDeclaration(moduleSpecifier, namedImports, typeOnly = false) {
     const specifiers = namedImports.map((name) => t.importSpecifier(t.identifier(name), t.identifier(name)));
@@ -65,22 +65,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')), []);
 }
@@ -116,6 +127,18 @@ export 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 = `${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
         ? buildQuestionsArray(op.args)
         : t.arrayExpression([]);
@@ -153,10 +176,16 @@ export 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 = `${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
@@ -166,14 +195,31 @@ export 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/esm/core/codegen/cli/docs-generator.d.ts

@@ -5,7 +5,7 @@ export type { GeneratedDocFile, McpTool } from '../docs-utils';
 export declare function generateReadme(tables: CleanTable[], customOperations: CleanOperation[], toolName: string): GeneratedDocFile;
 export declare function generateAgentsDocs(tables: CleanTable[], customOperations: CleanOperation[], toolName: string): GeneratedDocFile;
 export declare function getCliMcpTools(tables: CleanTable[], customOperations: CleanOperation[], toolName: string): McpTool[];
-export declare function generateSkills(tables: CleanTable[], customOperations: CleanOperation[], toolName: string): GeneratedDocFile[];
+export declare function generateSkills(tables: CleanTable[], customOperations: CleanOperation[], toolName: string, targetName: string): GeneratedDocFile[];
 export interface MultiTargetDocsInput {
     toolName: string;
     builtinNames: {

package/esm/core/codegen/cli/docs-generator.js

@@ -1,5 +1,5 @@
 import { toKebabCase } from 'komoji';
-import { formatArgType, getEditableFields, getReadmeHeader, getReadmeFooter, gqlTypeToJsonSchemaType, buildSkillFile, } from '../docs-utils';
+import { formatArgType, getEditableFields, getReadmeHeader, getReadmeFooter, gqlTypeToJsonSchemaType, buildSkillFile, buildSkillReference, } from '../docs-utils';
 import { getScalarFields, getTableNames, getPrimaryKeyInfo, } from '../utils';
 export { resolveDocsConfig } from '../docs-utils';
 export function generateReadme(tables, customOperations, toolName) {
@@ -513,12 +513,16 @@ export function getCliMcpTools(tables, customOperations, toolName) {
     }
     return tools;
 }
-export function generateSkills(tables, customOperations, toolName) {
+export function generateSkills(tables, customOperations, toolName, targetName) {
     const files = [];
+    const skillName = `cli-${targetName}`;
+    const referenceNames = [];
+    // Context reference
+    referenceNames.push('context');
     files.push({
-        fileName: 'skills/context.md',
-        content: buildSkillFile({
-            name: `${toolName}-context`,
+        fileName: `${skillName}/references/context.md`,
+        content: buildSkillReference({
+            title: 'Context Management',
             description: `Manage API endpoint contexts for ${toolName}`,
             usage: [
                 `${toolName} context create <name> --endpoint <url>`,
@@ -542,10 +546,12 @@ export function generateSkills(tables, customOperations, toolName) {
             ],
         }),
     });
+    // Auth reference
+    referenceNames.push('auth');
     files.push({
-        fileName: 'skills/auth.md',
-        content: buildSkillFile({
-            name: `${toolName}-auth`,
+        fileName: `${skillName}/references/auth.md`,
+        content: buildSkillReference({
+            title: 'Authentication',
             description: `Manage authentication tokens for ${toolName}`,
             usage: [
                 `${toolName} auth set-token <token>`,
@@ -564,15 +570,17 @@ export function generateSkills(tables, customOperations, toolName) {
             ],
         }),
     });
+    // Table references
     for (const table of tables) {
         const { singularName } = getTableNames(table);
         const kebab = toKebabCase(singularName);
         const pk = getPrimaryKeyInfo(table)[0];
         const editableFields = getEditableFields(table);
+        referenceNames.push(kebab);
         files.push({
-            fileName: `skills/${kebab}.md`,
-            content: buildSkillFile({
-                name: `${toolName}-${kebab}`,
+            fileName: `${skillName}/references/${kebab}.md`,
+            content: buildSkillReference({
+                title: singularName,
                 description: `CRUD operations for ${table.name} records via ${toolName} CLI`,
                 usage: [
                     `${toolName} ${kebab} list`,
@@ -596,29 +604,21 @@ export function generateSkills(tables, customOperations, toolName) {
                         description: `Get a ${singularName} by ${pk.name}`,
                         code: [`${toolName} ${kebab} get --${pk.name} <value>`],
                     },
-                    {
-                        description: `Update a ${singularName}`,
-                        code: [
-                            `${toolName} ${kebab} update --${pk.name} <value> --${editableFields[0]?.name || 'field'} "new-value"`,
-                        ],
-                    },
-                    {
-                        description: `Delete a ${singularName}`,
-                        code: [`${toolName} ${kebab} delete --${pk.name} <value>`],
-                    },
                 ],
             }),
         });
     }
+    // Custom operation references
     for (const op of customOperations) {
         const kebab = toKebabCase(op.name);
         const usage = op.args.length > 0
             ? `${toolName} ${kebab} ${op.args.map((a) => `--${a.name} <value>`).join(' ')}`
             : `${toolName} ${kebab}`;
+        referenceNames.push(kebab);
         files.push({
-            fileName: `skills/${kebab}.md`,
-            content: buildSkillFile({
-                name: `${toolName}-${kebab}`,
+            fileName: `${skillName}/references/${kebab}.md`,
+            content: buildSkillReference({
+                title: op.name,
                 description: op.description || `Execute the ${op.name} ${op.kind}`,
                 usage: [usage],
                 examples: [
@@ -630,6 +630,39 @@ export function generateSkills(tables, customOperations, toolName) {
             }),
         });
     }
+    // Overview SKILL.md
+    const tableKebabs = tables.slice(0, 5).map((t) => toKebabCase(getTableNames(t).singularName));
+    files.push({
+        fileName: `${skillName}/SKILL.md`,
+        content: buildSkillFile({
+            name: skillName,
+            description: `CLI tool (${toolName}) for the ${targetName} API — provides CRUD commands for ${tables.length} tables and ${customOperations.length} custom operations`,
+            usage: [
+                `# Context management`,
+                `${toolName} context create <name> --endpoint <url>`,
+                `${toolName} context use <name>`,
+                '',
+                `# Authentication`,
+                `${toolName} auth set-token <token>`,
+                '',
+                `# CRUD for any table (e.g. ${tableKebabs[0] || 'model'})`,
+                `${toolName} ${tableKebabs[0] || 'model'} list`,
+                `${toolName} ${tableKebabs[0] || 'model'} get --id <value>`,
+                `${toolName} ${tableKebabs[0] || 'model'} create --<field> <value>`,
+            ],
+            examples: [
+                {
+                    description: 'Set up and query',
+                    code: [
+                        `${toolName} context create local --endpoint http://localhost:5000/graphql`,
+                        `${toolName} context use local`,
+                        `${toolName} auth set-token <token>`,
+                        `${toolName} ${tableKebabs[0] || 'model'} list`,
+                    ],
+                },
+            ],
+        }, referenceNames),
+    });
     return files;
 }
 export function generateMultiTargetReadme(input) {
@@ -1256,22 +1289,26 @@ export function getMultiTargetCliMcpTools(input) {
 export function generateMultiTargetSkills(input) {
     const { toolName, builtinNames, targets } = input;
     const files = [];
-    const contextUsage = [
-        `${toolName} ${builtinNames.context} create <name>`,
-        `${toolName} ${builtinNames.context} list`,
-        `${toolName} ${builtinNames.context} use <name>`,
-        `${toolName} ${builtinNames.context} current`,
-        `${toolName} ${builtinNames.context} delete <name>`,
-    ];
+    // Generate one skill per target, plus a shared cli-common skill for context/auth
+    const commonSkillName = 'cli-common';
+    const commonReferenceNames = [];
     const contextCreateFlags = targets
         .map((t) => `--${t.name}-endpoint <url>`)
         .join(' ');
+    // Context reference
+    commonReferenceNames.push('context');
     files.push({
-        fileName: `skills/${builtinNames.context}.md`,
-        content: buildSkillFile({
-            name: `${toolName}-${builtinNames.context}`,
+        fileName: `${commonSkillName}/references/context.md`,
+        content: buildSkillReference({
+            title: 'Context Management',
             description: `Manage API endpoint contexts for ${toolName} (multi-target: ${targets.map((t) => t.name).join(', ')})`,
-            usage: contextUsage,
+            usage: [
+                `${toolName} ${builtinNames.context} create <name>`,
+                `${toolName} ${builtinNames.context} list`,
+                `${toolName} ${builtinNames.context} use <name>`,
+                `${toolName} ${builtinNames.context} current`,
+                `${toolName} ${builtinNames.context} delete <name>`,
+            ],
             examples: [
                 {
                     description: 'Create a context for local development (accept all defaults)',
@@ -1287,20 +1324,15 @@ export function generateMultiTargetSkills(input) {
                         `${toolName} ${builtinNames.context} use production`,
                     ],
                 },
-                {
-                    description: 'List and switch contexts',
-                    code: [
-                        `${toolName} ${builtinNames.context} list`,
-                        `${toolName} ${builtinNames.context} use staging`,
-                    ],
-                },
             ],
         }),
     });
+    // Auth reference
+    commonReferenceNames.push('auth');
     files.push({
-        fileName: `skills/${builtinNames.auth}.md`,
-        content: buildSkillFile({
-            name: `${toolName}-${builtinNames.auth}`,
+        fileName: `${commonSkillName}/references/auth.md`,
+        content: buildSkillReference({
+            title: 'Authentication',
             description: `Manage authentication tokens for ${toolName} (shared across all targets)`,
             usage: [
                 `${toolName} ${builtinNames.auth} set-token <token>`,
@@ -1319,17 +1351,48 @@ export function generateMultiTargetSkills(input) {
             ],
         }),
     });
+    // Common SKILL.md
+    files.push({
+        fileName: `${commonSkillName}/SKILL.md`,
+        content: buildSkillFile({
+            name: commonSkillName,
+            description: `Shared CLI utilities for ${toolName} — context management and authentication across targets: ${targets.map((t) => t.name).join(', ')}`,
+            usage: [
+                `# Context management`,
+                `${toolName} ${builtinNames.context} create <name>`,
+                `${toolName} ${builtinNames.context} use <name>`,
+                '',
+                `# Authentication`,
+                `${toolName} ${builtinNames.auth} set-token <token>`,
+                `${toolName} ${builtinNames.auth} status`,
+            ],
+            examples: [
+                {
+                    description: 'Set up and authenticate',
+                    code: [
+                        `${toolName} ${builtinNames.context} create local`,
+                        `${toolName} ${builtinNames.context} use local`,
+                        `${toolName} ${builtinNames.auth} set-token <token>`,
+                    ],
+                },
+            ],
+        }, commonReferenceNames),
+    });
+    // Generate one skill per target with table/op references
     for (const tgt of targets) {
+        const tgtSkillName = `cli-${tgt.name}`;
+        const tgtReferenceNames = [];
         for (const table of tgt.tables) {
             const { singularName } = getTableNames(table);
             const kebab = toKebabCase(singularName);
             const pk = getPrimaryKeyInfo(table)[0];
             const editableFields = getEditableFields(table);
             const cmd = `${tgt.name}:${kebab}`;
+            tgtReferenceNames.push(kebab);
             files.push({
-                fileName: `skills/${tgt.name}-${kebab}.md`,
-                content: buildSkillFile({
-                    name: `${toolName}-${cmd}`,
+                fileName: `${tgtSkillName}/references/${kebab}.md`,
+                content: buildSkillReference({
+                    title: singularName,
                     description: `CRUD operations for ${table.name} records via ${toolName} CLI (${tgt.name} target)`,
                     usage: [
                         `${toolName} ${cmd} list`,
@@ -1349,10 +1412,6 @@ export function generateMultiTargetSkills(input) {
                                 `${toolName} ${cmd} create ${editableFields.map((f) => `--${f.name} "value"`).join(' ')}`,
                             ],
                         },
-                        {
-                            description: `Get a ${singularName} by ${pk.name}`,
-                            code: [`${toolName} ${cmd} get --${pk.name} <value>`],
-                        },
                     ],
                 }),
             });
@@ -1367,10 +1426,11 @@ export function generateMultiTargetSkills(input) {
             if (tgt.isAuthTarget && op.kind === 'mutation') {
                 usageLines.push(`${baseUsage} --save-token`);
             }
+            tgtReferenceNames.push(kebab);
             files.push({
-                fileName: `skills/${tgt.name}-${kebab}.md`,
-                content: buildSkillFile({
-                    name: `${toolName}-${cmd}`,
+                fileName: `${tgtSkillName}/references/${kebab}.md`,
+                content: buildSkillReference({
+                    title: op.name,
                     description: `${op.description || `Execute the ${op.name} ${op.kind}`} (${tgt.name} target)`,
                     usage: usageLines,
                     examples: [
@@ -1382,6 +1442,29 @@ export function generateMultiTargetSkills(input) {
                 }),
             });
         }
+        // Target SKILL.md
+        const firstKebab = tgt.tables.length > 0
+            ? toKebabCase(getTableNames(tgt.tables[0]).singularName)
+            : 'model';
+        files.push({
+            fileName: `${tgtSkillName}/SKILL.md`,
+            content: buildSkillFile({
+                name: tgtSkillName,
+                description: `CLI commands for the ${tgt.name} API target — ${tgt.tables.length} tables and ${tgt.customOperations.length} custom operations via ${toolName}`,
+                usage: [
+                    `# CRUD for ${tgt.name} tables (e.g. ${firstKebab})`,
+                    `${toolName} ${tgt.name}:${firstKebab} list`,
+                    `${toolName} ${tgt.name}:${firstKebab} get --id <value>`,
+                    `${toolName} ${tgt.name}:${firstKebab} create --<field> <value>`,
+                ],
+                examples: [
+                    {
+                        description: `Query ${tgt.name} records`,
+                        code: [`${toolName} ${tgt.name}:${firstKebab} list`],
+                    },
+                ],
+            }, tgtReferenceNames),
+        });
     }
     return files;
 }

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

@@ -49,9 +49,16 @@ export 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'))])),
@@ -156,9 +163,16 @@ export 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/esm/core/codegen/cli/infra-generator.js

@@ -96,7 +96,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'),
@@ -185,7 +185,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')),
@@ -204,7 +204,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'))),
@@ -341,7 +344,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')), [
@@ -457,7 +460,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')), [
@@ -549,7 +552,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'),
@@ -651,7 +654,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')),
@@ -770,7 +773,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([
@@ -870,7 +873,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'),
@@ -969,7 +972,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 = [
@@ -991,7 +994,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)),
@@ -999,7 +1002,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')),
             ]),
         ])),
@@ -1022,7 +1025,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);
@@ -1098,7 +1101,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'),