create-qpq-app 0.1.5 → 0.1.7

package/lib/commonjs/steps/008_transpileToJavaScript.js

@@ -8,17 +8,120 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transpileToJavaScript = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const files_1 = require("../lib/files");
 const types_1 = require("../types");
-// Placeholder for the JavaScript flavour — a later pass will transpile the
-// scaffolded TypeScript sources here. For now it's an honest no-op so the
-// language answer already threads through the pipeline.
+// Convert the scaffolded TypeScript app to JavaScript: per-file type
+// stripping (JSX preserved, comments kept), then remove the TypeScript
+// build plumbing the app no longer needs.
+//
+// The qpq toolchain runs the result as-is: the CLI's ts-node require hook
+// compiles the app's ESM-syntax .js at load time (allowJs, added below), and
+// rspack bundles .js/.jsx natively.
 exports.transpileToJavaScript = {
     name: 'Converting to JavaScript',
     shouldRun: (answers) => answers.language === types_1.AppLanguage.javascript,
-    run: () => __awaiter(void 0, void 0, void 0, function* () {
-        console.log('  JavaScript output is not available yet — generating TypeScript for now.');
+    run: (_a) => __awaiter(void 0, [_a], void 0, function* ({ targetDirectory }) {
+        var _b, _c, _d;
+        // Lazy so TypeScript scaffolds never load the compiler.
+        /* eslint-disable @typescript-eslint/no-require-imports */
+        const ts = require('typescript');
+        const prettier = require('prettier');
+        /* eslint-enable @typescript-eslint/no-require-imports */
+        // The transpiler re-prints files in its own style; format the output with
+        // the app's own prettier settings so generated code matches the repo.
+        const prettierRcPath = path_1.default.join(targetDirectory, '.prettierrc');
+        const prettierOptions = fs_1.default.existsSync(prettierRcPath) ? (0, files_1.readJsonFile)(prettierRcPath) : {};
+        const compilerOptions = {
+            target: ts.ScriptTarget.ESNext,
+            module: ts.ModuleKind.ESNext, // keep import/export statements as written
+            jsx: ts.JsxEmit.Preserve,
+            removeComments: false,
+        };
+        let converted = 0;
+        for (const filePath of (0, files_1.listFilesRecursive)(targetDirectory)) {
+            if (filePath.endsWith('.d.ts')) {
+                fs_1.default.rmSync(filePath);
+                continue;
+            }
+            const isTsx = filePath.endsWith('.tsx');
+            if (!isTsx && !filePath.endsWith('.ts')) {
+                continue;
+            }
+            const source = fs_1.default.readFileSync(filePath, 'utf8');
+            const { outputText } = ts.transpileModule(source, { compilerOptions, fileName: filePath });
+            // Type-only statements leave blank gaps behind — collapse runs of them.
+            const collapsed = outputText.replace(/\n{3,}/g, '\n\n');
+            const outputPath = filePath.replace(/\.tsx?$/, isTsx ? '.jsx' : '.js');
+            const output = yield prettier.format(collapsed, Object.assign(Object.assign({}, prettierOptions), { filepath: outputPath }));
+            fs_1.default.writeFileSync(outputPath, output);
+            fs_1.default.rmSync(filePath);
+            converted += 1;
+        }
+        // TypeScript build plumbing: tsconfigs, the ambient types/ dir, and the
+        // per-package tsc scripts all go. Lib packages no longer build — their
+        // package.json main points straight at src.
+        let libsRepointed = 0;
+        for (const filePath of (0, files_1.listFilesRecursive)(targetDirectory)) {
+            const baseName = path_1.default.basename(filePath);
+            if (baseName.startsWith('tsconfig') && baseName.endsWith('.json') && filePath !== path_1.default.join(targetDirectory, 'tsconfig.json')) {
+                fs_1.default.rmSync(filePath);
+                continue;
+            }
+            if (baseName === 'package.json' && filePath !== path_1.default.join(targetDirectory, 'package.json')) {
+                const packageJson = (0, files_1.readJsonFile)(filePath);
+                let changed = false;
+                if ((_b = packageJson.scripts) === null || _b === void 0 ? void 0 : _b['validate-ts']) {
+                    delete packageJson.scripts['validate-ts'];
+                    changed = true;
+                }
+                // Lib packages (identified by their tsc build) get served from
+                // source. A tsc build with an unexpected main means the template's
+                // conventions moved — fail loudly rather than scaffold a broken app.
+                if (((_c = packageJson.scripts) === null || _c === void 0 ? void 0 : _c.build) === 'tsc -b') {
+                    if (packageJson.main !== './dist/src/index.js') {
+                        throw new Error(`${filePath} has a tsc build but main is "${packageJson.main}" (expected "./dist/src/index.js") — update transpileToJavaScript for the new template convention.`);
+                    }
+                    packageJson.main = './src/index.js';
+                    delete packageJson.typings;
+                    delete packageJson.scripts.build;
+                    packageJson.exports = { '.': { default: './src/index.js' } };
+                    packageJson.files = ['src'];
+                    changed = true;
+                    libsRepointed += 1;
+                }
+                if (changed) {
+                    (0, files_1.writeJsonFile)(filePath, packageJson);
+                }
+            }
+        }
+        if (converted === 0 || libsRepointed === 0) {
+            throw new Error(`JavaScript conversion looks wrong: ${converted} files transpiled, ${libsRepointed} lib packages repointed — has the template changed shape?`);
+        }
+        // The ROOT tsconfig.json stays — the qpq CLI's ts-node require hook reads
+        // its ts-node block, and allowJs makes that hook compile the app's
+        // ESM-syntax .js files (imports, __dirname) at load time.
+        fs_1.default.rmSync(path_1.default.join(targetDirectory, 'types'), { recursive: true, force: true });
+        fs_1.default.rmSync(path_1.default.join(targetDirectory, 'tsconfig.base.json'), { force: true });
+        const rootTsconfigPath = path_1.default.join(targetDirectory, 'tsconfig.json');
+        const rootTsconfig = (0, files_1.readJsonFile)(rootTsconfigPath);
+        rootTsconfig['ts-node'].compilerOptions.allowJs = true;
+        // Scope the hook to this repo — allowJs must never recompile quidproquo
+        // libs living outside node_modules (file:-linked dev setups).
+        rootTsconfig['ts-node'].scope = true;
+        rootTsconfig['ts-node'].scopeDir = '.';
+        (0, files_1.writeJsonFile)(rootTsconfigPath, rootTsconfig);
+        const rootPackageJsonPath = path_1.default.join(targetDirectory, 'package.json');
+        const rootPackageJson = (0, files_1.readJsonFile)(rootPackageJsonPath);
+        (_d = rootPackageJson.scripts) === null || _d === void 0 ? true : delete _d['validate-ts'];
+        (0, files_1.writeJsonFile)(rootPackageJsonPath, rootPackageJson);
+        console.log(`  Converted ${converted} files to JavaScript.`);
     }),
 };
 //# sourceMappingURL=008_transpileToJavaScript.js.map

package/lib/commonjs/steps/008_transpileToJavaScript.js.map

@@ -1 +1 @@
-{"version":3,"file":"008_transpileToJavaScript.js","sourceRoot":"","sources":["../../../src/steps/008_transpileToJavaScript.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAyD;AAEzD,2EAA2E;AAC3E,0EAA0E;AAC1E,wDAAwD;AAC3C,QAAA,qBAAqB,GAAqB;IACrD,IAAI,EAAE,0BAA0B;IAEhC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,mBAAW,CAAC,UAAU;IAEnE,GAAG,EAAE,GAAS,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,2EAA2E,CAAC,CAAC;IAC3F,CAAC,CAAA;CACF,CAAC","sourcesContent":["import { AppLanguage, CreateQpqAppStep } from '../types';\n\n// Placeholder for the JavaScript flavour — a later pass will transpile the\n// scaffolded TypeScript sources here. For now it's an honest no-op so the\n// language answer already threads through the pipeline.\nexport const transpileToJavaScript: CreateQpqAppStep = {\n  name: 'Converting to JavaScript',\n\n  shouldRun: (answers) => answers.language === AppLanguage.javascript,\n\n  run: async () => {\n    console.log('  JavaScript output is not available yet — generating TypeScript for now.');\n  },\n};\n"]}
+{"version":3,"file":"008_transpileToJavaScript.js","sourceRoot":"","sources":["../../../src/steps/008_transpileToJavaScript.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nimport { listFilesRecursive, readJsonFile, writeJsonFile } from '../lib/files';\nimport { AppLanguage, CreateQpqAppStep } from '../types';\n\n// Convert the scaffolded TypeScript app to JavaScript: per-file type\n// stripping (JSX preserved, comments kept), then remove the TypeScript\n// build plumbing the app no longer needs.\n//\n// The qpq toolchain runs the result as-is: the CLI's ts-node require hook\n// compiles the app's ESM-syntax .js at load time (allowJs, added below), and\n// rspack bundles .js/.jsx natively.\nexport const transpileToJavaScript: CreateQpqAppStep = {\n  name: 'Converting to JavaScript',\n\n  shouldRun: (answers) => answers.language === AppLanguage.javascript,\n\n  run: async ({ targetDirectory }) => {\n    // Lazy so TypeScript scaffolds never load the compiler.\n    /* eslint-disable @typescript-eslint/no-require-imports */\n    const ts = require('typescript') as typeof import('typescript');\n    const prettier = require('prettier') as typeof import('prettier');\n    /* eslint-enable @typescript-eslint/no-require-imports */\n\n    // The transpiler re-prints files in its own style; format the output with\n    // the app's own prettier settings so generated code matches the repo.\n    const prettierRcPath = path.join(targetDirectory, '.prettierrc');\n    const prettierOptions = fs.existsSync(prettierRcPath) ? readJsonFile(prettierRcPath) : {};\n\n    const compilerOptions: import('typescript').CompilerOptions = {\n      target: ts.ScriptTarget.ESNext,\n      module: ts.ModuleKind.ESNext, // keep import/export statements as written\n      jsx: ts.JsxEmit.Preserve,\n      removeComments: false,\n    };\n\n    let converted = 0;\n    for (const filePath of listFilesRecursive(targetDirectory)) {\n      if (filePath.endsWith('.d.ts')) {\n        fs.rmSync(filePath);\n        continue;\n      }\n\n      const isTsx = filePath.endsWith('.tsx');\n      if (!isTsx && !filePath.endsWith('.ts')) {\n        continue;\n      }\n\n      const source = fs.readFileSync(filePath, 'utf8');\n      const { outputText } = ts.transpileModule(source, { compilerOptions, fileName: filePath });\n\n      // Type-only statements leave blank gaps behind — collapse runs of them.\n      const collapsed = outputText.replace(/\\n{3,}/g, '\\n\\n');\n\n      const outputPath = filePath.replace(/\\.tsx?$/, isTsx ? '.jsx' : '.js');\n      const output = await prettier.format(collapsed, { ...prettierOptions, filepath: outputPath });\n\n      fs.writeFileSync(outputPath, output);\n      fs.rmSync(filePath);\n      converted += 1;\n    }\n\n    // TypeScript build plumbing: tsconfigs, the ambient types/ dir, and the\n    // per-package tsc scripts all go. Lib packages no longer build — their\n    // package.json main points straight at src.\n    let libsRepointed = 0;\n    for (const filePath of listFilesRecursive(targetDirectory)) {\n      const baseName = path.basename(filePath);\n\n      if (baseName.startsWith('tsconfig') && baseName.endsWith('.json') && filePath !== path.join(targetDirectory, 'tsconfig.json')) {\n        fs.rmSync(filePath);\n        continue;\n      }\n\n      if (baseName === 'package.json' && filePath !== path.join(targetDirectory, 'package.json')) {\n        const packageJson = readJsonFile(filePath);\n        let changed = false;\n\n        if (packageJson.scripts?.['validate-ts']) {\n          delete packageJson.scripts['validate-ts'];\n          changed = true;\n        }\n\n        // Lib packages (identified by their tsc build) get served from\n        // source. A tsc build with an unexpected main means the template's\n        // conventions moved — fail loudly rather than scaffold a broken app.\n        if (packageJson.scripts?.build === 'tsc -b') {\n          if (packageJson.main !== './dist/src/index.js') {\n            throw new Error(\n              `${filePath} has a tsc build but main is \"${packageJson.main}\" (expected \"./dist/src/index.js\") — update transpileToJavaScript for the new template convention.`,\n            );\n          }\n\n          packageJson.main = './src/index.js';\n          delete packageJson.typings;\n          delete packageJson.scripts.build;\n          packageJson.exports = { '.': { default: './src/index.js' } };\n          packageJson.files = ['src'];\n          changed = true;\n          libsRepointed += 1;\n        }\n\n        if (changed) {\n          writeJsonFile(filePath, packageJson);\n        }\n      }\n    }\n\n    if (converted === 0 || libsRepointed === 0) {\n      throw new Error(\n        `JavaScript conversion looks wrong: ${converted} files transpiled, ${libsRepointed} lib packages repointed — has the template changed shape?`,\n      );\n    }\n\n    // The ROOT tsconfig.json stays — the qpq CLI's ts-node require hook reads\n    // its ts-node block, and allowJs makes that hook compile the app's\n    // ESM-syntax .js files (imports, __dirname) at load time.\n    fs.rmSync(path.join(targetDirectory, 'types'), { recursive: true, force: true });\n    fs.rmSync(path.join(targetDirectory, 'tsconfig.base.json'), { force: true });\n\n    const rootTsconfigPath = path.join(targetDirectory, 'tsconfig.json');\n    const rootTsconfig = readJsonFile(rootTsconfigPath);\n    rootTsconfig['ts-node'].compilerOptions.allowJs = true;\n    // Scope the hook to this repo — allowJs must never recompile quidproquo\n    // libs living outside node_modules (file:-linked dev setups).\n    rootTsconfig['ts-node'].scope = true;\n    rootTsconfig['ts-node'].scopeDir = '.';\n    writeJsonFile(rootTsconfigPath, rootTsconfig);\n\n    const rootPackageJsonPath = path.join(targetDirectory, 'package.json');\n    const rootPackageJson = readJsonFile(rootPackageJsonPath);\n    delete rootPackageJson.scripts?.['validate-ts'];\n    writeJsonFile(rootPackageJsonPath, rootPackageJson);\n\n    console.log(`  Converted ${converted} files to JavaScript.`);\n  },\n};\n"]}

package/lib/commonjs/steps/013_printNextSteps.js

@@ -23,7 +23,7 @@ deploys as a single docker image.
 Next steps:
 
   cd ${answers.appName}
-${install}  npm run go:dev     # local dev server on http://localhost:8080
+${install}  npm run go:dev     # api on http://localhost:8080, web on http://localhost:3080
   npm run go         # build the docker image (then run the printed docker command)
 
 Deploy config lives in apps/${answers.appName}/deploy.config.json (domain: ${answers.domain}).

package/lib/commonjs/steps/013_printNextSteps.js.map

@@ -1 +1 @@
-{"version":3,"file":"013_printNextSteps.js","sourceRoot":"","sources":["../../../src/steps/013_printNextSteps.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEa,QAAA,cAAc,GAAqB;IAC9C,IAAI,EAAE,MAAM;IAEZ,GAAG,EAAE,KAAoB,EAAE,4CAAf,EAAE,OAAO,EAAE;QACrB,MAAM,OAAO,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kCAAkC,CAAC;QAEtF,OAAO,CAAC,GAAG,CAAC;UACN,OAAO,CAAC,OAAO;;;;;;;OAOlB,OAAO,CAAC,OAAO;EACpB,OAAO;;;8BAGqB,OAAO,CAAC,OAAO,gCAAgC,OAAO,CAAC,MAAM;CAC1F,CAAC,CAAC;IACD,CAAC,CAAA;CACF,CAAC","sourcesContent":["import { CreateQpqAppStep } from '../types';\n\nexport const printNextSteps: CreateQpqAppStep = {\n  name: 'Done',\n\n  run: async ({ answers }) => {\n    const install = answers.installDependencies ? '' : '  npm install\\n  npm run build\\n';\n\n    console.log(`\nCreated ${answers.appName}!\n\nYour app has five services — admin, auth, design, shell and todo — and\ndeploys as a single docker image.\n\nNext steps:\n\n  cd ${answers.appName}\n${install}  npm run go:dev     # local dev server on http://localhost:8080\n  npm run go         # build the docker image (then run the printed docker command)\n\nDeploy config lives in apps/${answers.appName}/deploy.config.json (domain: ${answers.domain}).\n`);\n  },\n};\n"]}
+{"version":3,"file":"013_printNextSteps.js","sourceRoot":"","sources":["../../../src/steps/013_printNextSteps.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEa,QAAA,cAAc,GAAqB;IAC9C,IAAI,EAAE,MAAM;IAEZ,GAAG,EAAE,KAAoB,EAAE,4CAAf,EAAE,OAAO,EAAE;QACrB,MAAM,OAAO,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kCAAkC,CAAC;QAEtF,OAAO,CAAC,GAAG,CAAC;UACN,OAAO,CAAC,OAAO;;;;;;;OAOlB,OAAO,CAAC,OAAO;EACpB,OAAO;;;8BAGqB,OAAO,CAAC,OAAO,gCAAgC,OAAO,CAAC,MAAM;CAC1F,CAAC,CAAC;IACD,CAAC,CAAA;CACF,CAAC","sourcesContent":["import { CreateQpqAppStep } from '../types';\n\nexport const printNextSteps: CreateQpqAppStep = {\n  name: 'Done',\n\n  run: async ({ answers }) => {\n    const install = answers.installDependencies ? '' : '  npm install\\n  npm run build\\n';\n\n    console.log(`\nCreated ${answers.appName}!\n\nYour app has five services — admin, auth, design, shell and todo — and\ndeploys as a single docker image.\n\nNext steps:\n\n  cd ${answers.appName}\n${install}  npm run go:dev     # api on http://localhost:8080, web on http://localhost:3080\n  npm run go         # build the docker image (then run the printed docker command)\n\nDeploy config lives in apps/${answers.appName}/deploy.config.json (domain: ${answers.domain}).\n`);\n  },\n};\n"]}

package/lib/esm/steps/008_transpileToJavaScript.js

@@ -1,12 +1,111 @@
+import fs from 'fs';
+import path from 'path';
+import { listFilesRecursive, readJsonFile, writeJsonFile } from '../lib/files';
 import { AppLanguage } from '../types';
-// Placeholder for the JavaScript flavour — a later pass will transpile the
-// scaffolded TypeScript sources here. For now it's an honest no-op so the
-// language answer already threads through the pipeline.
+// Convert the scaffolded TypeScript app to JavaScript: per-file type
+// stripping (JSX preserved, comments kept), then remove the TypeScript
+// build plumbing the app no longer needs.
+//
+// The qpq toolchain runs the result as-is: the CLI's ts-node require hook
+// compiles the app's ESM-syntax .js at load time (allowJs, added below), and
+// rspack bundles .js/.jsx natively.
 export const transpileToJavaScript = {
     name: 'Converting to JavaScript',
     shouldRun: (answers) => answers.language === AppLanguage.javascript,
-    run: async () => {
-        console.log('  JavaScript output is not available yet — generating TypeScript for now.');
+    run: async ({ targetDirectory }) => {
+        // Lazy so TypeScript scaffolds never load the compiler.
+        /* eslint-disable @typescript-eslint/no-require-imports */
+        const ts = require('typescript');
+        const prettier = require('prettier');
+        /* eslint-enable @typescript-eslint/no-require-imports */
+        // The transpiler re-prints files in its own style; format the output with
+        // the app's own prettier settings so generated code matches the repo.
+        const prettierRcPath = path.join(targetDirectory, '.prettierrc');
+        const prettierOptions = fs.existsSync(prettierRcPath) ? readJsonFile(prettierRcPath) : {};
+        const compilerOptions = {
+            target: ts.ScriptTarget.ESNext,
+            module: ts.ModuleKind.ESNext, // keep import/export statements as written
+            jsx: ts.JsxEmit.Preserve,
+            removeComments: false,
+        };
+        let converted = 0;
+        for (const filePath of listFilesRecursive(targetDirectory)) {
+            if (filePath.endsWith('.d.ts')) {
+                fs.rmSync(filePath);
+                continue;
+            }
+            const isTsx = filePath.endsWith('.tsx');
+            if (!isTsx && !filePath.endsWith('.ts')) {
+                continue;
+            }
+            const source = fs.readFileSync(filePath, 'utf8');
+            const { outputText } = ts.transpileModule(source, { compilerOptions, fileName: filePath });
+            // Type-only statements leave blank gaps behind — collapse runs of them.
+            const collapsed = outputText.replace(/\n{3,}/g, '\n\n');
+            const outputPath = filePath.replace(/\.tsx?$/, isTsx ? '.jsx' : '.js');
+            const output = await prettier.format(collapsed, { ...prettierOptions, filepath: outputPath });
+            fs.writeFileSync(outputPath, output);
+            fs.rmSync(filePath);
+            converted += 1;
+        }
+        // TypeScript build plumbing: tsconfigs, the ambient types/ dir, and the
+        // per-package tsc scripts all go. Lib packages no longer build — their
+        // package.json main points straight at src.
+        let libsRepointed = 0;
+        for (const filePath of listFilesRecursive(targetDirectory)) {
+            const baseName = path.basename(filePath);
+            if (baseName.startsWith('tsconfig') && baseName.endsWith('.json') && filePath !== path.join(targetDirectory, 'tsconfig.json')) {
+                fs.rmSync(filePath);
+                continue;
+            }
+            if (baseName === 'package.json' && filePath !== path.join(targetDirectory, 'package.json')) {
+                const packageJson = readJsonFile(filePath);
+                let changed = false;
+                if (packageJson.scripts?.['validate-ts']) {
+                    delete packageJson.scripts['validate-ts'];
+                    changed = true;
+                }
+                // Lib packages (identified by their tsc build) get served from
+                // source. A tsc build with an unexpected main means the template's
+                // conventions moved — fail loudly rather than scaffold a broken app.
+                if (packageJson.scripts?.build === 'tsc -b') {
+                    if (packageJson.main !== './dist/src/index.js') {
+                        throw new Error(`${filePath} has a tsc build but main is "${packageJson.main}" (expected "./dist/src/index.js") — update transpileToJavaScript for the new template convention.`);
+                    }
+                    packageJson.main = './src/index.js';
+                    delete packageJson.typings;
+                    delete packageJson.scripts.build;
+                    packageJson.exports = { '.': { default: './src/index.js' } };
+                    packageJson.files = ['src'];
+                    changed = true;
+                    libsRepointed += 1;
+                }
+                if (changed) {
+                    writeJsonFile(filePath, packageJson);
+                }
+            }
+        }
+        if (converted === 0 || libsRepointed === 0) {
+            throw new Error(`JavaScript conversion looks wrong: ${converted} files transpiled, ${libsRepointed} lib packages repointed — has the template changed shape?`);
+        }
+        // The ROOT tsconfig.json stays — the qpq CLI's ts-node require hook reads
+        // its ts-node block, and allowJs makes that hook compile the app's
+        // ESM-syntax .js files (imports, __dirname) at load time.
+        fs.rmSync(path.join(targetDirectory, 'types'), { recursive: true, force: true });
+        fs.rmSync(path.join(targetDirectory, 'tsconfig.base.json'), { force: true });
+        const rootTsconfigPath = path.join(targetDirectory, 'tsconfig.json');
+        const rootTsconfig = readJsonFile(rootTsconfigPath);
+        rootTsconfig['ts-node'].compilerOptions.allowJs = true;
+        // Scope the hook to this repo — allowJs must never recompile quidproquo
+        // libs living outside node_modules (file:-linked dev setups).
+        rootTsconfig['ts-node'].scope = true;
+        rootTsconfig['ts-node'].scopeDir = '.';
+        writeJsonFile(rootTsconfigPath, rootTsconfig);
+        const rootPackageJsonPath = path.join(targetDirectory, 'package.json');
+        const rootPackageJson = readJsonFile(rootPackageJsonPath);
+        delete rootPackageJson.scripts?.['validate-ts'];
+        writeJsonFile(rootPackageJsonPath, rootPackageJson);
+        console.log(`  Converted ${converted} files to JavaScript.`);
     },
 };
 //# sourceMappingURL=008_transpileToJavaScript.js.map

package/lib/esm/steps/008_transpileToJavaScript.js.map

@@ -1 +1 @@
-{"version":3,"file":"008_transpileToJavaScript.js","sourceRoot":"","sources":["../../../src/steps/008_transpileToJavaScript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAoB,MAAM,UAAU,CAAC;AAEzD,2EAA2E;AAC3E,0EAA0E;AAC1E,wDAAwD;AACxD,MAAM,CAAC,MAAM,qBAAqB,GAAqB;IACrD,IAAI,EAAE,0BAA0B;IAEhC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,WAAW,CAAC,UAAU;IAEnE,GAAG,EAAE,KAAK,IAAI,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,2EAA2E,CAAC,CAAC;IAC3F,CAAC;CACF,CAAC","sourcesContent":["import { AppLanguage, CreateQpqAppStep } from '../types';\n\n// Placeholder for the JavaScript flavour — a later pass will transpile the\n// scaffolded TypeScript sources here. For now it's an honest no-op so the\n// language answer already threads through the pipeline.\nexport const transpileToJavaScript: CreateQpqAppStep = {\n  name: 'Converting to JavaScript',\n\n  shouldRun: (answers) => answers.language === AppLanguage.javascript,\n\n  run: async () => {\n    console.log('  JavaScript output is not available yet — generating TypeScript for now.');\n  },\n};\n"]}
+{"version":3,"file":"008_transpileToJavaScript.js","sourceRoot":"","sources":["../../../src/steps/008_transpileToJavaScript.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nimport { listFilesRecursive, readJsonFile, writeJsonFile } from '../lib/files';\nimport { AppLanguage, CreateQpqAppStep } from '../types';\n\n// Convert the scaffolded TypeScript app to JavaScript: per-file type\n// stripping (JSX preserved, comments kept), then remove the TypeScript\n// build plumbing the app no longer needs.\n//\n// The qpq toolchain runs the result as-is: the CLI's ts-node require hook\n// compiles the app's ESM-syntax .js at load time (allowJs, added below), and\n// rspack bundles .js/.jsx natively.\nexport const transpileToJavaScript: CreateQpqAppStep = {\n  name: 'Converting to JavaScript',\n\n  shouldRun: (answers) => answers.language === AppLanguage.javascript,\n\n  run: async ({ targetDirectory }) => {\n    // Lazy so TypeScript scaffolds never load the compiler.\n    /* eslint-disable @typescript-eslint/no-require-imports */\n    const ts = require('typescript') as typeof import('typescript');\n    const prettier = require('prettier') as typeof import('prettier');\n    /* eslint-enable @typescript-eslint/no-require-imports */\n\n    // The transpiler re-prints files in its own style; format the output with\n    // the app's own prettier settings so generated code matches the repo.\n    const prettierRcPath = path.join(targetDirectory, '.prettierrc');\n    const prettierOptions = fs.existsSync(prettierRcPath) ? readJsonFile(prettierRcPath) : {};\n\n    const compilerOptions: import('typescript').CompilerOptions = {\n      target: ts.ScriptTarget.ESNext,\n      module: ts.ModuleKind.ESNext, // keep import/export statements as written\n      jsx: ts.JsxEmit.Preserve,\n      removeComments: false,\n    };\n\n    let converted = 0;\n    for (const filePath of listFilesRecursive(targetDirectory)) {\n      if (filePath.endsWith('.d.ts')) {\n        fs.rmSync(filePath);\n        continue;\n      }\n\n      const isTsx = filePath.endsWith('.tsx');\n      if (!isTsx && !filePath.endsWith('.ts')) {\n        continue;\n      }\n\n      const source = fs.readFileSync(filePath, 'utf8');\n      const { outputText } = ts.transpileModule(source, { compilerOptions, fileName: filePath });\n\n      // Type-only statements leave blank gaps behind — collapse runs of them.\n      const collapsed = outputText.replace(/\\n{3,}/g, '\\n\\n');\n\n      const outputPath = filePath.replace(/\\.tsx?$/, isTsx ? '.jsx' : '.js');\n      const output = await prettier.format(collapsed, { ...prettierOptions, filepath: outputPath });\n\n      fs.writeFileSync(outputPath, output);\n      fs.rmSync(filePath);\n      converted += 1;\n    }\n\n    // TypeScript build plumbing: tsconfigs, the ambient types/ dir, and the\n    // per-package tsc scripts all go. Lib packages no longer build — their\n    // package.json main points straight at src.\n    let libsRepointed = 0;\n    for (const filePath of listFilesRecursive(targetDirectory)) {\n      const baseName = path.basename(filePath);\n\n      if (baseName.startsWith('tsconfig') && baseName.endsWith('.json') && filePath !== path.join(targetDirectory, 'tsconfig.json')) {\n        fs.rmSync(filePath);\n        continue;\n      }\n\n      if (baseName === 'package.json' && filePath !== path.join(targetDirectory, 'package.json')) {\n        const packageJson = readJsonFile(filePath);\n        let changed = false;\n\n        if (packageJson.scripts?.['validate-ts']) {\n          delete packageJson.scripts['validate-ts'];\n          changed = true;\n        }\n\n        // Lib packages (identified by their tsc build) get served from\n        // source. A tsc build with an unexpected main means the template's\n        // conventions moved — fail loudly rather than scaffold a broken app.\n        if (packageJson.scripts?.build === 'tsc -b') {\n          if (packageJson.main !== './dist/src/index.js') {\n            throw new Error(\n              `${filePath} has a tsc build but main is \"${packageJson.main}\" (expected \"./dist/src/index.js\") — update transpileToJavaScript for the new template convention.`,\n            );\n          }\n\n          packageJson.main = './src/index.js';\n          delete packageJson.typings;\n          delete packageJson.scripts.build;\n          packageJson.exports = { '.': { default: './src/index.js' } };\n          packageJson.files = ['src'];\n          changed = true;\n          libsRepointed += 1;\n        }\n\n        if (changed) {\n          writeJsonFile(filePath, packageJson);\n        }\n      }\n    }\n\n    if (converted === 0 || libsRepointed === 0) {\n      throw new Error(\n        `JavaScript conversion looks wrong: ${converted} files transpiled, ${libsRepointed} lib packages repointed — has the template changed shape?`,\n      );\n    }\n\n    // The ROOT tsconfig.json stays — the qpq CLI's ts-node require hook reads\n    // its ts-node block, and allowJs makes that hook compile the app's\n    // ESM-syntax .js files (imports, __dirname) at load time.\n    fs.rmSync(path.join(targetDirectory, 'types'), { recursive: true, force: true });\n    fs.rmSync(path.join(targetDirectory, 'tsconfig.base.json'), { force: true });\n\n    const rootTsconfigPath = path.join(targetDirectory, 'tsconfig.json');\n    const rootTsconfig = readJsonFile(rootTsconfigPath);\n    rootTsconfig['ts-node'].compilerOptions.allowJs = true;\n    // Scope the hook to this repo — allowJs must never recompile quidproquo\n    // libs living outside node_modules (file:-linked dev setups).\n    rootTsconfig['ts-node'].scope = true;\n    rootTsconfig['ts-node'].scopeDir = '.';\n    writeJsonFile(rootTsconfigPath, rootTsconfig);\n\n    const rootPackageJsonPath = path.join(targetDirectory, 'package.json');\n    const rootPackageJson = readJsonFile(rootPackageJsonPath);\n    delete rootPackageJson.scripts?.['validate-ts'];\n    writeJsonFile(rootPackageJsonPath, rootPackageJson);\n\n    console.log(`  Converted ${converted} files to JavaScript.`);\n  },\n};\n"]}

package/lib/esm/steps/013_printNextSteps.js

@@ -11,7 +11,7 @@ deploys as a single docker image.
 Next steps:
 
   cd ${answers.appName}
-${install}  npm run go:dev     # local dev server on http://localhost:8080
+${install}  npm run go:dev     # api on http://localhost:8080, web on http://localhost:3080
   npm run go         # build the docker image (then run the printed docker command)
 
 Deploy config lives in apps/${answers.appName}/deploy.config.json (domain: ${answers.domain}).

package/lib/esm/steps/013_printNextSteps.js.map

@@ -1 +1 @@
-{"version":3,"file":"013_printNextSteps.js","sourceRoot":"","sources":["../../../src/steps/013_printNextSteps.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,cAAc,GAAqB;IAC9C,IAAI,EAAE,MAAM;IAEZ,GAAG,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACzB,MAAM,OAAO,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kCAAkC,CAAC;QAEtF,OAAO,CAAC,GAAG,CAAC;UACN,OAAO,CAAC,OAAO;;;;;;;OAOlB,OAAO,CAAC,OAAO;EACpB,OAAO;;;8BAGqB,OAAO,CAAC,OAAO,gCAAgC,OAAO,CAAC,MAAM;CAC1F,CAAC,CAAC;IACD,CAAC;CACF,CAAC","sourcesContent":["import { CreateQpqAppStep } from '../types';\n\nexport const printNextSteps: CreateQpqAppStep = {\n  name: 'Done',\n\n  run: async ({ answers }) => {\n    const install = answers.installDependencies ? '' : '  npm install\\n  npm run build\\n';\n\n    console.log(`\nCreated ${answers.appName}!\n\nYour app has five services — admin, auth, design, shell and todo — and\ndeploys as a single docker image.\n\nNext steps:\n\n  cd ${answers.appName}\n${install}  npm run go:dev     # local dev server on http://localhost:8080\n  npm run go         # build the docker image (then run the printed docker command)\n\nDeploy config lives in apps/${answers.appName}/deploy.config.json (domain: ${answers.domain}).\n`);\n  },\n};\n"]}
+{"version":3,"file":"013_printNextSteps.js","sourceRoot":"","sources":["../../../src/steps/013_printNextSteps.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,cAAc,GAAqB;IAC9C,IAAI,EAAE,MAAM;IAEZ,GAAG,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACzB,MAAM,OAAO,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kCAAkC,CAAC;QAEtF,OAAO,CAAC,GAAG,CAAC;UACN,OAAO,CAAC,OAAO;;;;;;;OAOlB,OAAO,CAAC,OAAO;EACpB,OAAO;;;8BAGqB,OAAO,CAAC,OAAO,gCAAgC,OAAO,CAAC,MAAM;CAC1F,CAAC,CAAC;IACD,CAAC;CACF,CAAC","sourcesContent":["import { CreateQpqAppStep } from '../types';\n\nexport const printNextSteps: CreateQpqAppStep = {\n  name: 'Done',\n\n  run: async ({ answers }) => {\n    const install = answers.installDependencies ? '' : '  npm install\\n  npm run build\\n';\n\n    console.log(`\nCreated ${answers.appName}!\n\nYour app has five services — admin, auth, design, shell and todo — and\ndeploys as a single docker image.\n\nNext steps:\n\n  cd ${answers.appName}\n${install}  npm run go:dev     # api on http://localhost:8080, web on http://localhost:3080\n  npm run go         # build the docker image (then run the printed docker command)\n\nDeploy config lives in apps/${answers.appName}/deploy.config.json (domain: ${answers.domain}).\n`);\n  },\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-qpq-app",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Scaffold a new quidproquo app — npx create-qpq-app my-app",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",
@@ -22,6 +22,7 @@
     "build:esm": "tsc -p tsconfig.esm.json",
     "build:bin-perms": "node -e \"require('fs').chmodSync('lib/commonjs/bin/createQpqApp.js', 0o755)\"",
     "snapshot-template": "node ./scripts/snapshotTemplate.mjs",
+    "smoke-test": "node ./scripts/smokeTest.mjs",
     "prepack": "npm run snapshot-template",
     "lint": "npx eslint .",
     "lint:fix": "npx eslint . --fix",
@@ -44,12 +45,13 @@
   },
   "homepage": "https://github.com/joe-coady/quidproquo#readme",
   "dependencies": {
-    "@inquirer/prompts": "^8.5.2"
+    "@inquirer/prompts": "^8.5.2",
+    "prettier": "^3.2.5",
+    "typescript": "^5.8.2"
   },
   "devDependencies": {
     "@types/node": "^22.13.13",
-    "quidproquo-tsconfig": "0.1.5",
-    "typescript": "^5.8.2"
+    "quidproquo-tsconfig": "0.1.7"
   },
   "bin": {
     "create-qpq-app": "./lib/commonjs/bin/createQpqApp.js"

package/template/README.md

@@ -21,8 +21,7 @@ always runs against the in-repo HEAD. Build the framework first
 nvm use              # ALWAYS FIRST — switches to the Node version in .nvmrc
 npm install          # installs deps + symlinks the sibling quidproquo-* packages (file: refs)
 npm run build        # build every workspace (libs -> tsc -b to dist; services -> type-check)
-npm run go:dev       # backend dev server on :8080 (all services of the selected app)
-npm run go:dev:web   # views dev servers (host + one Rspack server per remote)
+npm run go:dev       # full local dev stack: api dev server (:8080) + all views dev servers
 ```
 
 Smoke test once `go:dev` is up:
@@ -74,7 +73,7 @@ generic CDK app in `quidproquo-deploy-awscdk`.
   `defineDevServerOptions({ port })` in its `infrastructure.ts`). The
   only generated artifact is `apps/<app>/tsconfig.federated.json` — regenerate
   with `npm run prep` after adding or removing a marker.
-- **The dev server** (`qpq go:dev`, powered by `quidproquo-dev-server`) loads each service's
+- **The dev server** (`qpq go:dev:api`, powered by `quidproquo-dev-server`) loads each service's
   `infrastructure.ts` directly — no synth needed, just built libs. Its bundle
   externalizes `node_modules` (an externals function in its rspack config) so native modules like
   `sqlite3` load at runtime from their install location.
@@ -90,7 +89,8 @@ generic CDK app in `quidproquo-deploy-awscdk`.
 npm run build        # build only the libs (services/views are bundled, not built); scope with --workspace=@qpqjs/constants
 npm run validate-ts  # TS check: build libs, then tsc-typecheck every service + views
 npm run prep         # regenerate tsconfig.federated.json from // federated.export markers
-npm run go:dev       # backend dev server on :8080, every service at /api/<svc>
+npm run go:dev       # api + web dev servers in one process (one ctrl+c stops the lot)
+npm run go:dev:api   # backend dev server only, on :8080, every service at /api/<svc>
 npm run go:dev:web   # boot ALL views Rspack dev servers (host shell :3080 + remotes on their
                      # ports); remotes resolve dynamically at runtime via mf-manifest.json.
                      # Subset: npm run go:dev:web -- --only host,shell,design
@@ -99,7 +99,7 @@ npm run go:dev:web   # boot ALL views Rspack dev servers (host shell :3080 + rem
 ### App selection (multi-app)
 
 Every app-facing script (`prep`, `synth`, `go`, `go:docker`, `go:dev`,
-`go:dev:web`) resolves its target app the same way:
+`go:dev:api`, `go:dev:web`) resolves its target app the same way:
 
 1. `--app <name>` — **must come after `--`**: `npm run go:dev -- --app qpqjs`
    (this npm silently swallows flags before `--`)

package/template/apps/qpqjs/services/design/views/src/components/LandingPage/components/Footer.tsx

@@ -18,8 +18,9 @@ export function Footer() {
             <span className="hero__title-glow">your first story?</span>
           </h2>
           <p className="footer__cta-sub">
-            Install the core, yield an action, and let the runtime handle the
-            rest.
+            One command scaffolds a full app — five services, a local dev
+            server, a one-image docker deploy. Yield an action; the runtime
+            handles the rest.
           </p>
           <div className="footer__cta-actions">
             <InstallChip />

package/template/apps/qpqjs/services/design/views/src/components/LandingPage/components/InstallChip.tsx

@@ -1,6 +1,6 @@
 import { useState } from 'react';
 
-const INSTALL_COMMAND = 'npm install quidproquo-core';
+const INSTALL_COMMAND = 'npx create-qpq-app myapp';
 
 export function InstallChip() {
   const [copied, setCopied] = useState(false);

package/template/apps/todo/packages/service-utils/src/defineTodoService.ts

@@ -30,6 +30,20 @@ import {
 
 const modulePrefix = 'todo';
 
+// The deployed version tag — git sha when available, so a fresh checkout
+// (or a scaffold that skipped git init) still loads.
+const getVersionTag = (): string => {
+  try {
+    return execSync('git rev-parse --short HEAD', {
+      stdio: ['ignore', 'pipe', 'ignore'],
+    })
+      .toString()
+      .trim();
+  } catch {
+    return 'no-git';
+  }
+};
+
 // The shared config every todo service starts from — app identity, dns,
 // auth, admin, api and caching. Each service's infrastructure.ts layers its
 // own resources on top of this.
@@ -50,11 +64,7 @@ export const defineTodoService = (
     process.env.ACTOR_NAME
   ),
 
-  defineApplicationVersion(
-    `${execSync('git rev-parse --short HEAD')
-      .toString()
-      .trim()}-${new Date().toISOString()}`
-  ),
+  defineApplicationVersion(`${getVersionTag()}-${new Date().toISOString()}`),
 
   defineDns(domainName),
 

package/template/docusaurus/docs/actions/core/ai/ask-ai-prompt-stream.md

@@ -42,7 +42,7 @@ The parameters are identical to [askAiPrompt](./ask-ai-prompt.md) — see there
 | --- | --- | --- |
 | `model` | `AiModel` | Which model to prompt. |
 | `prompt` | `string` | The user prompt. Ignored when `options.messages` is set. |
-| `options` | `AskAiPromptStreamOptions` | `{ system?, aiName?, messages?, reasoning? }` — same shape and meaning as [`AskAiPromptOptions`](./ask-ai-prompt.md#askaipromptoptions). |
+| `options` | `AskAiPromptStreamOptions` | `{ system?, aiName?, messages?, reasoning?, caching? }` — same shape and meaning as [`AskAiPromptOptions`](./ask-ai-prompt.md#askaipromptoptions). |
 
 ## Returns
 

package/template/docusaurus/docs/actions/core/ai/ask-ai-prompt.md

@@ -49,6 +49,7 @@ function* askAiPrompt(
 | `aiName` | `string` | – | Name of a [defineAi](../../../config/core/ai.md) config to bind. This is what wires up tool definitions (and their executors) for the model to call. Omit for a plain, tool-less prompt. |
 | `messages` | [`AiMessage[]`](#aimessage) | – | A full conversation history. When present, this is sent instead of `prompt`, letting you carry a multi-turn dialogue (including prior assistant turns and tool results). |
 | `reasoning` | [`AiReasoningConfig`](#aireasoningconfig) | – | Enables extended thinking. Its presence turns reasoning on; `budgetTokens` caps how many tokens the model may spend thinking before it answers (defaults to `4096` on AWS). |
+| `caching` | `boolean` | – | Marks the system prompt and the last message (or the last `messages` entry) with a Bedrock cache point, so a following call in the same conversation can read everything up to there from cache instead of reprocessing it. |
 
 ### `AiModel`