create-openibm 0.1.0 → 0.1.1

package/dist/templates/base.js

@@ -12,10 +12,6 @@ function schemaIbmi(a) {
         `    transport = env("IBMI_TRANSPORT")`,
         `    system    = env("IBMI_SYSTEM")`,
         `}`,
-        ``,
-        `generator client {`,
-        `    output = "./src/generated/ibmi"`,
-        `}`,
     ];
     if (a.features.includes('program')) {
         blocks.push(``, `// RPG/COBOL program — JS name maps to actual IBM i program via @map`, `program SimpleCalc @map("SIMPLECALC") {`, `    library = "MYLIB"`, `    input   PackedDecimal(15, 0) @in`, `    output  PackedDecimal(16, 0) @out`, `}`);
@@ -48,9 +44,6 @@ function gitignore() {
         '.env',
         '*.tsbuildinfo',
         '',
-        '# Generated IBM i client — re-create with: npm run generate',
-        'src/generated/',
-        '',
         '# OS',
         '.DS_Store',
         'Thumbs.db',

package/dist/templates/basic.d.ts

@@ -7,5 +7,11 @@ export declare function clientConfigBlock(a: Answers): string;
  * pulling @openibm/* from the globally linked monorepo packages.
  */
 export declare function linkDevScriptMjs(): string;
+/**
+ * Stub for src/generated/ibmi/index.ts — created by `npm run generate`.
+ * Allows the server to boot without a real IBM i connection.
+ * Replace by running: npm run generate
+ */
+export declare function generatedStub(): string;
 /** Zod-based IBM i data-type validators — shared by basic + express templates */
 export declare function ibmiValidatorsTs(): string;

package/dist/templates/basic.js

@@ -51,6 +51,10 @@ function tsconfig() {
             esModuleInterop: true,
             skipLibCheck: true,
             forceConsistentCasingInFileNames: true,
+            baseUrl: '.',
+            paths: {
+                '.openibm': ['./node_modules/.openibm/index.ts'],
+            },
         },
         include: ['src'],
         exclude: ['node_modules', 'dist'],
@@ -61,7 +65,7 @@ function indexTs(a) {
     const hasProgram = a.features.includes('program');
     const hasTable = a.features.includes('table');
     const imports = [
-        `import { createClient } from './generated/ibmi/index.js';`,
+        `import { createClient } from '.openibm';`,
         ...(a.transport === 'odbc' ? [`import 'odbc';`] : []),
     ];
     const clientConfig = clientConfigBlock(a);
@@ -235,6 +239,45 @@ export function linkDevScriptMjs() {
         ``,
     ].join('\n');
 }
+/**
+ * Stub for src/generated/ibmi/index.ts — created by `npm run generate`.
+ * Allows the server to boot without a real IBM i connection.
+ * Replace by running: npm run generate
+ */
+export function generatedStub() {
+    return [
+        `// AUTO-GENERATED STUB — run \`npm run generate\` to replace with the real IBM i client.`,
+        `/* eslint-disable */`,
+        ``,
+        `export function createClient(_config: any): {`,
+        `    connect(): Promise<void>;`,
+        `    disconnect(): Promise<void>;`,
+        `    isConnected(): boolean;`,
+        `    query: Record<string, any>;`,
+        `    program: Record<string, any>;`,
+        `} {`,
+        `    const warn = () =>`,
+        `        console.warn('\\x1b[33m[openibm]\\x1b[0m Stub client — run \`npm run generate\` to connect to IBM i');`,
+        ``,
+        `    const tableProxy: any = new Proxy({}, {`,
+        `        get: (_t, method) => {`,
+        `            if (method === 'findMany')  return async () => { warn(); return []; };`,
+        `            if (method === 'findFirst') return async () => { warn(); return null; };`,
+        `            return async () => { warn(); return null; };`,
+        `        },`,
+        `    });`,
+        ``,
+        `    return {`,
+        `        connect:     async () => { warn(); },`,
+        `        disconnect:  async () => {},`,
+        `        isConnected: () => false,`,
+        `        query:   new Proxy({}, { get: () => tableProxy }),`,
+        `        program: new Proxy({}, { get: () => async (..._a: any[]) => { warn(); return {}; } }),`,
+        `    };`,
+        `}`,
+        ``,
+    ].join('\n');
+}
 /** Zod-based IBM i data-type validators — shared by basic + express templates */
 export function ibmiValidatorsTs() {
     return [

package/dist/templates/express.js

@@ -2,14 +2,32 @@ import { clientConfigBlock, ibmiValidatorsTs, linkDevScriptMjs } from './basic.j
 export function expressFiles(a) {
     const hasProgram = a.features.includes('program');
     const hasTable = a.features.includes('table');
-    return {
+    const files = {
         'package.json': packageJson(a),
         'tsconfig.json': tsconfig(),
-        'src/index.ts': indexTs(a, hasProgram, hasTable),
+        'nodemon.json': nodemonJson(),
+        'src/index.ts': indexTs(),
+        'src/app.ts': appTs(hasProgram, hasTable),
+        'src/client.ts': clientTs(a),
+        'src/docs.ts': docsTs(a, hasProgram, hasTable),
+        'src/routes/index.ts': routesIndex(hasProgram, hasTable),
+        'src/routes/health.routes.ts': healthRoutes(),
+        'src/controllers/health.controller.ts': healthController(),
         'src/ibmi-validators.ts': ibmiValidatorsTs(),
         'scripts/link-dev.mjs': linkDevScriptMjs(),
+        '.vscode/settings.json': vscodeSettings(),
+        '.vscode/extensions.json': vscodeExtensions(),
         'README.md': readme(a, hasProgram, hasTable),
     };
+    if (hasTable) {
+        files['src/routes/customers.routes.ts'] = customersRoutes();
+        files['src/controllers/customers.controller.ts'] = customersController();
+    }
+    if (hasProgram) {
+        files['src/routes/calculate.routes.ts'] = calculateRoutes();
+        files['src/controllers/calculate.controller.ts'] = calculateController();
+    }
+    return files;
 }
 // ── package.json ──────────────────────────────────────────────────────────────
 function packageJson(a) {
@@ -21,13 +39,14 @@ function packageJson(a) {
         scripts: {
             generate: 'openibm generate',
             build: 'tsc --project tsconfig.json',
-            dev: 'node --env-file=.env --import tsx/esm src/index.ts',
+            dev: 'nodemon',
             start: 'node dist/index.js',
             'link:dev': 'node scripts/link-dev.mjs',
         },
         dependencies: {
             '@openibm/driver': '^0.1.0',
             '@openibm/types': '^0.1.0',
+            '@scalar/express-api-reference': '^0.4.0',
             express: '^4.21.0',
             morgan: '^1.10.0',
             'swagger-ui-express': '^5.0.0',
@@ -41,6 +60,7 @@ function packageJson(a) {
             '@types/morgan': '^1.9.0',
             '@types/swagger-ui-express': '^4.1.0',
             '@types/node': '^22.0.0',
+            nodemon: '^3.1.0',
             tsx: '^4.0.0',
             typescript: '^5.7.0',
         },
@@ -60,14 +80,80 @@ function tsconfig() {
             esModuleInterop: true,
             skipLibCheck: true,
             forceConsistentCasingInFileNames: true,
+            baseUrl: '.',
+            paths: {
+                '.openibm': ['./node_modules/.openibm/index.ts'],
+            },
         },
         include: ['src'],
         exclude: ['node_modules', 'dist'],
     }, null, 4) + '\n';
 }
+// ── nodemon.json ──────────────────────────────────────────────────────────────
+function nodemonJson() {
+    return JSON.stringify({
+        watch: ['src'],
+        ext: 'ts,json',
+        exec: 'node --env-file=.env --import tsx/esm src/index.ts',
+    }, null, 4) + '\n';
+}
 // ── src/index.ts ──────────────────────────────────────────────────────────────
-function indexTs(a, hasProgram, hasTable) {
-    // ── Swagger paths (built conditionally) ──────────────────────────────────
+function indexTs() {
+    return [
+        `import { client } from './client.js';`,
+        `import app from './app.js';`,
+        ``,
+        `const PORT = Number(process.env.PORT ?? 3000);`,
+        ``,
+        `app.listen(PORT, async () => {`,
+        `    await client.connect();`,
+        `    console.log(\`Server:  http://localhost:\${PORT}\`);`,
+        `    console.log(\`Swagger: http://localhost:\${PORT}/api-docs\`);`,
+        `    console.log(\`Scalar:  http://localhost:\${PORT}/scalar\`);`,
+        `});`,
+        ``,
+    ].join('\n');
+}
+// ── src/app.ts ────────────────────────────────────────────────────────────────
+function appTs(hasProgram, hasTable) {
+    return [
+        `import express from 'express';`,
+        `import morgan from 'morgan';`,
+        `import { setupDocs } from './docs.js';`,
+        `import router from './routes/index.js';`,
+        ``,
+        `const app = express();`,
+        ``,
+        `// ── Middleware ────────────────────────────────────────────────────────────────`,
+        ``,
+        `app.use(express.json());`,
+        `app.use(morgan('dev'));`,
+        ``,
+        `// ── API docs ──────────────────────────────────────────────────────────────────`,
+        ``,
+        `setupDocs(app);`,
+        ``,
+        `// ── Routes ───────────────────────────────────────────────────────────────────`,
+        ``,
+        `app.use('/', router);`,
+        ``,
+        `export default app;`,
+        ``,
+    ].join('\n');
+}
+// ── src/client.ts ─────────────────────────────────────────────────────────────
+function clientTs(a) {
+    return [
+        `import { createClient } from '.openibm';`,
+        ``,
+        clientConfigBlock(a),
+        ``,
+        `export { client };`,
+        ``,
+    ].join('\n');
+}
+// ── src/docs.ts ───────────────────────────────────────────────────────────────
+function docsTs(a, hasProgram, hasTable) {
     const swaggerPaths = [
         `        '/health': {`,
         `            get: {`,
@@ -85,73 +171,259 @@ function indexTs(a, hasProgram, hasTable) {
     if (hasProgram) {
         swaggerPaths.push(`        '/calculate': {`, `            post: {`, `                tags: ['Programs'],`, `                summary: 'Call SimpleCalc IBM i program',`, `                requestBody: {`, `                    required: true,`, `                    content: {`, `                        'application/json': {`, `                            schema: {`, `                                type: 'object',`, `                                required: ['input'],`, `                                properties: { input: { type: 'integer', example: 5, description: 'IBM i INTEGER' } },`, `                            },`, `                        },`, `                    },`, `                },`, `                responses: {`, `                    '200': { description: 'Calculation result', content: { 'application/json': { schema: { example: { input: 5, output: 500 } } } } },`, `                    '400': { description: 'Validation error' },`, `                },`, `            },`, `        },`);
     }
-    // ── Routes ───────────────────────────────────────────────────────────────
-    const routes = [
-        `// ── Health ───────────────────────────────────────────────────────────────────`,
+    return [
+        `import type { Express } from 'express';`,
+        `import swaggerUi from 'swagger-ui-express';`,
+        `import { apiReference } from '@scalar/express-api-reference';`,
         ``,
-        `app.get('/health', (_req, res) => {`,
-        `    res.json({ status: 'ok', connected: client.isConnected() });`,
-        `});`,
+        `export const apiSpec = {`,
+        `    openapi: '3.0.0',`,
+        `    info: { title: '${a.projectName}', version: '1.0.0', description: 'IBM i REST API' },`,
+        `    paths: {`,
+        ...swaggerPaths,
+        `    },`,
+        `};`,
+        ``,
+        `export function setupDocs(app: Express): void {`,
+        `    app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(apiSpec as any));`,
+        `    app.use(`,
+        `        '/scalar',`,
+        `        apiReference({ spec: { content: apiSpec } }) as any,`,
+        `    );`,
+        `}`,
+        ``,
+    ].join('\n');
+}
+// ── src/routes/index.ts ───────────────────────────────────────────────────────
+function routesIndex(hasProgram, hasTable) {
+    const imports = [
+        `import { Router } from 'express';`,
+        `import healthRouter from './health.routes.js';`,
     ];
-    if (hasTable) {
-        routes.push(``, `// ── Customers ────────────────────────────────────────────────────────────────`, ``, `app.get('/customers', async (req, res) => {`, `    const state = typeof req.query.state === 'string' ? req.query.state : 'TX';`, `    const rows  = await client.query.Customer.findMany({`, `        where:   { state },`, `        orderBy: { customerId: 'asc' },`, `        take:    20,`, `    });`, `    res.json(rows);`, `});`, ``, `app.get('/customers/:id', async (req, res) => {`, `    const row = await client.query.Customer.findFirst({`, `        where: { customerId: Number(req.params.id) },`, `    });`, `    if (!row) { res.status(404).json({ error: 'Not found' }); return; }`, `    res.json(row);`, `});`);
-    }
-    if (hasProgram) {
-        routes.push(``, `// ── SimpleCalc ───────────────────────────────────────────────────────────────`, ``, `const calculateSchema = z.object({ input: ibmiInt });`, ``, `app.post('/calculate', async (req, res) => {`, `    const parsed = calculateSchema.safeParse(req.body);`, `    if (!parsed.success) {`, `        res.status(400).json({ errors: parsed.error.flatten() });`, `        return;`, `    }`, `    const result = await client.program.SimpleCalc({ input: parsed.data.input });`, `    res.json({ input: parsed.data.input, output: result.output });`, `});`);
-    }
-    const zodImports = hasProgram
-        ? [`import { z } from 'zod';`, `import { ibmiInt } from './ibmi-validators.js';`]
-        : [];
+    if (hasTable)
+        imports.push(`import customersRouter from './customers.routes.js';`);
+    if (hasProgram)
+        imports.push(`import calculateRouter from './calculate.routes.js';`);
+    const mounts = [
+        `router.use('/health', healthRouter);`,
+    ];
+    if (hasTable)
+        mounts.push(`router.use('/customers', customersRouter);`);
+    if (hasProgram)
+        mounts.push(`router.use('/calculate', calculateRouter);`);
     return [
-        `import express from 'express';`,
-        `import morgan from 'morgan';`,
-        `import swaggerUi from 'swagger-ui-express';`,
-        `import { createClient } from './generated/ibmi/index.js';`,
-        ...zodImports,
+        ...imports,
         ``,
-        `const app  = express();`,
-        `const PORT = Number(process.env.PORT ?? 3000);`,
+        `const router = Router();`,
         ``,
-        `// ── Middleware ────────────────────────────────────────────────────────────────`,
+        ...mounts,
         ``,
-        `app.use(express.json());`,
-        `app.use(morgan('dev'));`,
+        `export default router;`,
         ``,
-        `// ── IBM i client ──────────────────────────────────────────────────────────────`,
+    ].join('\n');
+}
+// ── src/routes/health.routes.ts ───────────────────────────────────────────────
+function healthRoutes() {
+    return [
+        `import { Router } from 'express';`,
+        `import { getHealth } from '../controllers/health.controller.js';`,
         ``,
-        clientConfigBlock(a),
+        `const router = Router();`,
         ``,
-        `// ── OpenAPI / Swagger ─────────────────────────────────────────────────────────`,
+        `router.get('/', getHealth);`,
         ``,
-        `const apiSpec = {`,
-        `    openapi: '3.0.0',`,
-        `    info: { title: '${a.projectName}', version: '1.0.0', description: 'IBM i REST API' },`,
-        `    paths: {`,
-        ...swaggerPaths,
-        `    },`,
-        `};`,
+        `export default router;`,
         ``,
-        `app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(apiSpec as any));`,
+    ].join('\n');
+}
+// ── src/controllers/health.controller.ts ─────────────────────────────────────
+function healthController() {
+    return [
+        `import type { Request, Response } from 'express';`,
+        `import { client } from '../client.js';`,
         ``,
-        `// ── Routes ───────────────────────────────────────────────────────────────────`,
+        `export function getHealth(_req: Request, res: Response): void {`,
+        `    res.json({ status: 'ok', connected: client.isConnected() });`,
+        `}`,
+        ``,
+    ].join('\n');
+}
+// ── src/routes/customers.routes.ts ───────────────────────────────────────────
+function customersRoutes() {
+    return [
+        `import { Router } from 'express';`,
+        `import { listCustomers, getCustomer } from '../controllers/customers.controller.js';`,
         ``,
-        ...routes,
+        `const router = Router();`,
         ``,
-        `// ── Start ────────────────────────────────────────────────────────────────────`,
+        `router.get('/',    listCustomers);`,
+        `router.get('/:id', getCustomer);`,
         ``,
-        `app.listen(PORT, async () => {`,
-        `    await client.connect();`,
-        `    console.log(\`Server:  http://localhost:\${PORT}\`);`,
-        `    console.log(\`Swagger: http://localhost:\${PORT}/api-docs\`);`,
-        `});`,
+        `export default router;`,
+        ``,
+    ].join('\n');
+}
+// ── src/controllers/customers.controller.ts ──────────────────────────────────
+function customersController() {
+    return [
+        `import type { Request, Response } from 'express';`,
+        `import { client } from '../client.js';`,
+        ``,
+        `export async function listCustomers(req: Request, res: Response): Promise<void> {`,
+        `    const state = typeof req.query.state === 'string' ? req.query.state : 'TX';`,
+        `    const rows  = await client.query.Customer.findMany({`,
+        `        where:   { state },`,
+        `        orderBy: { customerId: 'asc' },`,
+        `        take:    20,`,
+        `    });`,
+        `    res.json(rows);`,
+        `}`,
+        ``,
+        `export async function getCustomer(req: Request, res: Response): Promise<void> {`,
+        `    const row = await client.query.Customer.findFirst({`,
+        `        where: { customerId: Number(req.params.id) },`,
+        `    });`,
+        `    if (!row) { res.status(404).json({ error: 'Not found' }); return; }`,
+        `    res.json(row);`,
+        `}`,
+        ``,
+    ].join('\n');
+}
+// ── src/routes/calculate.routes.ts ───────────────────────────────────────────
+function calculateRoutes() {
+    return [
+        `import { Router } from 'express';`,
+        `import { calculate } from '../controllers/calculate.controller.js';`,
+        ``,
+        `const router = Router();`,
+        ``,
+        `router.post('/', calculate);`,
+        ``,
+        `export default router;`,
+        ``,
+    ].join('\n');
+}
+// ── src/controllers/calculate.controller.ts ──────────────────────────────────
+function calculateController() {
+    return [
+        `import type { Request, Response } from 'express';`,
+        `import { z } from 'zod';`,
+        `import { ibmiInt } from '../ibmi-validators.js';`,
+        `import { client } from '../client.js';`,
+        ``,
+        `const calculateSchema = z.object({ input: ibmiInt });`,
+        ``,
+        `export async function calculate(req: Request, res: Response): Promise<void> {`,
+        `    const parsed = calculateSchema.safeParse(req.body);`,
+        `    if (!parsed.success) {`,
+        `        res.status(400).json({ errors: parsed.error.flatten() });`,
+        `        return;`,
+        `    }`,
+        `    const result = await client.program.SimpleCalc({ input: parsed.data.input });`,
+        `    res.json({ input: parsed.data.input, output: result.output });`,
+        `}`,
         ``,
     ].join('\n');
 }
+// ── .vscode/settings.json ─────────────────────────────────────────────────────
+function vscodeSettings() {
+    return JSON.stringify({
+        'editor.formatOnSave': true,
+        'editor.defaultFormatter': 'esbenp.prettier-vscode',
+        'editor.codeActionsOnSave': {
+            'source.fixAll.eslint': 'explicit',
+            'source.organizeImports': 'never',
+            'source.removeUnusedImports': 'explicit',
+        },
+        'editor.tabSize': 2,
+        'editor.insertSpaces': true,
+        'editor.rulers': [80, 120],
+        'editor.wordWrap': 'on',
+        'editor.bracketPairColorization.enabled': true,
+        'editor.guides.bracketPairs': true,
+        'editor.inlineSuggest.enabled': true,
+        'js/ts.tsdk': 'node_modules/typescript/lib',
+        'js/ts.enablePromptUseWorkspaceTsdk': true,
+        'js/ts.preferences.importModuleSpecifier': 'non-relative',
+        'js/ts.updateImportsOnFileMove.enabled': 'always',
+        'js/ts.suggest.autoImports': true,
+        'js/ts.preferences.quoteStyle': 'single',
+        'files.autoSave': 'onFocusChange',
+        'files.trimTrailingWhitespace': true,
+        'files.insertFinalNewline': true,
+        'files.eol': '\n',
+        'files.exclude': {
+            '**/.git': true,
+            '**/.DS_Store': true,
+            '**/dist': true,
+            '**/coverage': true,
+        },
+        'search.exclude': {
+            '**/node_modules': true,
+            '**/dist': true,
+            '**/coverage': true,
+            'package-lock.json': true,
+            'pnpm-lock.yaml': true,
+        },
+        'prettier.singleQuote': true,
+        'prettier.trailingComma': 'all',
+        'prettier.tabWidth': 2,
+        'prettier.semi': true,
+        'prettier.arrowParens': 'always',
+        'prettier.endOfLine': 'lf',
+        'git.autofetch': true,
+        'git.confirmSync': false,
+        'git.enableSmartCommit': true,
+        'explorer.confirmDelete': false,
+        'explorer.confirmDragAndDrop': false,
+        'explorer.fileNesting.enabled': true,
+        'explorer.fileNesting.patterns': {
+            '*.ts': '${capture}.js, ${capture}.d.ts, ${capture}.spec.ts, ${capture}.test.ts',
+            'package.json': 'package-lock.json, pnpm-lock.yaml, yarn.lock, .npmrc, .nvmrc, .node-version',
+            'tsconfig.json': 'tsconfig.*.json',
+            '.env': '.env.*',
+            '.gitignore': '.gitattributes',
+            'README.md': 'CHANGELOG.md, LICENSE',
+        },
+        '[typescript]': { 'editor.defaultFormatter': 'esbenp.prettier-vscode' },
+        '[javascript]': { 'editor.defaultFormatter': 'esbenp.prettier-vscode' },
+        '[json]': { 'editor.defaultFormatter': 'esbenp.prettier-vscode' },
+        '[ibmi]': { 'editor.defaultFormatter': 'openibm.vscode' },
+        'rest-client.environmentVariables': {
+            '$shared': { baseUrl: 'http://localhost:3000' },
+            'local': { baseUrl: 'http://localhost:3000' },
+        },
+        'todo-tree.general.tags': ['TODO', 'FIXME', 'NOTE', 'BUG'],
+        'todo-tree.highlights.defaultHighlight': {
+            icon: 'alert', type: 'text', foreground: '#fff', iconColour: '#ffcc00',
+        },
+        'todo-tree.highlights.customHighlight': {
+            'TODO': { icon: 'check', iconColour: '#3498db' },
+            'FIXME': { icon: 'flame', iconColour: '#e74c3c' },
+            'NOTE': { icon: 'note', iconColour: '#2ecc71' },
+            'BUG': { icon: 'bug', iconColour: '#e74c3c' },
+        },
+    }, null, 2) + '\n';
+}
+// ── .vscode/extensions.json ───────────────────────────────────────────────────
+function vscodeExtensions() {
+    return JSON.stringify({
+        recommendations: [
+            'openibm.vscode',
+            'esbenp.prettier-vscode',
+            'dbaeumer.vscode-eslint',
+            'christian-kohler.path-intellisense',
+            'humao.rest-client',
+            'gruntfuggly.todo-tree',
+        ],
+    }, null, 2) + '\n';
+}
 // ── README.md ─────────────────────────────────────────────────────────────────
-function readme(a, hasTable, hasProgram) {
+function readme(a, hasProgram, hasTable) {
     const endpoints = [
         `| \`GET  /health\`        | Connection status |`,
         `| \`GET  /api-docs\`      | Swagger UI |`,
+        `| \`GET  /scalar\`        | Scalar API reference |`,
         ...(hasTable ? [`| \`GET  /customers\`    | Query DB2 table (filtered by state) |`] : []),
         ...(hasTable ? [`| \`GET  /customers/:id\`| Find customer by ID |`] : []),
         ...(hasProgram ? [`| \`POST /calculate\`    | Call IBM i program (\`{ input: number }\`) |`] : []),
@@ -161,6 +433,19 @@ function readme(a, hasTable, hasProgram) {
         ``,
         `IBM i Express application generated by [create-openibm](https://www.npmjs.com/package/create-openibm).`,
         ``,
+        `## Project structure`,
+        ``,
+        `\`\`\``,
+        `src/`,
+        `├── index.ts              # Entry point — listen & connect`,
+        `├── app.ts                # Express setup, middleware, routes`,
+        `├── client.ts             # IBM i client singleton`,
+        `├── docs.ts               # OpenAPI spec + Swagger & Scalar setup`,
+        `├── ibmi-validators.ts    # Zod schemas for IBM i types`,
+        `├── controllers/          # Request handlers`,
+        `└── routes/               # Express routers`,
+        `\`\`\``,
+        ``,
         `## Setup`,
         ``,
         `\`\`\`bash`,
@@ -172,7 +457,7 @@ function readme(a, hasTable, hasProgram) {
         `## Development`,
         ``,
         `\`\`\`bash`,
-        `npm run dev`,
+        `npm run dev   # starts with nodemon — restarts on file save`,
         `\`\`\``,
         ``,
         `## Endpoints`,

package/dist/templates/nestjs.js

@@ -2,19 +2,35 @@ import { linkDevScriptMjs } from './basic.js';
 export function nestjsFiles(a) {
     const hasProgram = a.features.includes('program');
     const hasTable = a.features.includes('table');
-    return {
+    const files = {
         'package.json': packageJson(a),
         'tsconfig.json': tsconfig(),
+        'nodemon.json': nodemonJson(),
         'src/main.ts': mainTs(a),
-        'src/app.module.ts': appModuleTs(),
+        'src/app.module.ts': appModuleTs(hasProgram, hasTable),
+        'src/docs.ts': docsTs(a),
         'src/ibmi/ibmi.module.ts': ibmiModuleTs(),
         'src/ibmi/ibmi.service.ts': ibmiServiceTs(a),
-        'src/ibmi/ibmi.controller.ts': ibmiControllerTs(a, hasProgram, hasTable),
-        'src/ibmi/dto/ibmi-validators.ts': ibmiValidatorsNestTs(),
-        ...(hasProgram ? { 'src/ibmi/dto/calculate.dto.ts': calculateDtoTs() } : {}),
+        'src/health/health.module.ts': healthModuleTs(),
+        'src/health/health.controller.ts': healthControllerTs(),
+        'src/common/ibmi-validators.ts': ibmiValidatorsNestTs(),
         'scripts/link-dev.mjs': linkDevScriptMjs(),
+        '.vscode/settings.json': vscodeSettings(),
+        '.vscode/extensions.json': vscodeExtensions(),
         'README.md': readme(a, hasProgram, hasTable),
     };
+    if (hasTable) {
+        files['src/customers/customers.module.ts'] = customersModuleTs();
+        files['src/customers/customers.controller.ts'] = customersControllerTs();
+        files['src/customers/customers.service.ts'] = customersServiceTs();
+    }
+    if (hasProgram) {
+        files['src/programs/programs.module.ts'] = programsModuleTs();
+        files['src/programs/programs.controller.ts'] = programsControllerTs();
+        files['src/programs/programs.service.ts'] = programsServiceTs();
+        files['src/programs/dto/calculate.dto.ts'] = calculateDtoTs();
+    }
+    return files;
 }
 // ── package.json ──────────────────────────────────────────────────────────────
 function packageJson(a) {
@@ -26,7 +42,7 @@ function packageJson(a) {
         scripts: {
             generate: 'openibm generate',
             build: 'tsc --project tsconfig.json',
-            dev: 'node --env-file=.env --import tsx/esm src/main.ts',
+            dev: 'nodemon',
             start: 'node dist/main.js',
             'link:dev': 'node scripts/link-dev.mjs',
         },
@@ -37,6 +53,7 @@ function packageJson(a) {
             '@nestjs/swagger': '^7.0.0',
             '@openibm/driver': '^0.1.0',
             '@openibm/types': '^0.1.0',
+            '@scalar/express-api-reference': '^0.4.0',
             'class-transformer': '^0.5.0',
             'class-validator': '^0.14.0',
             morgan: '^1.10.0',
@@ -49,6 +66,7 @@ function packageJson(a) {
             '@openibm/client': '^0.1.0',
             '@types/morgan': '^1.9.0',
             '@types/node': '^22.0.0',
+            nodemon: '^3.1.0',
             tsx: '^4.0.0',
             typescript: '^5.7.0',
         },
@@ -70,43 +88,47 @@ function tsconfig() {
             experimentalDecorators: true,
             emitDecoratorMetadata: true,
             forceConsistentCasingInFileNames: true,
+            baseUrl: '.',
+            paths: {
+                '.openibm': ['./node_modules/.openibm/index.ts'],
+            },
         },
         include: ['src'],
         exclude: ['node_modules', 'dist'],
     }, null, 4) + '\n';
 }
+// ── nodemon.json ──────────────────────────────────────────────────────────────
+function nodemonJson() {
+    return JSON.stringify({
+        watch: ['src'],
+        ext: 'ts,json',
+        exec: 'node --env-file=.env --import tsx/esm src/main.ts',
+    }, null, 4) + '\n';
+}
 // ── src/main.ts ───────────────────────────────────────────────────────────────
 function mainTs(a) {
+    void a;
     return [
         `import 'reflect-metadata';`,
         `import { NestFactory } from '@nestjs/core';`,
         `import { ValidationPipe } from '@nestjs/common';`,
-        `import { SwaggerModule, DocumentBuilder } from '@nestjs/swagger';`,
         `import morgan from 'morgan';`,
         `import { AppModule } from './app.module.js';`,
+        `import { setupDocs } from './docs.js';`,
         ``,
         `async function bootstrap(): Promise<void> {`,
         `    const app = await NestFactory.create(AppModule);`,
         ``,
-        `    // ── HTTP request logging ─────────────────────────────────────────────────`,
         `    app.use(morgan('dev'));`,
-        ``,
-        `    // ── Global validation pipe (class-validator + class-transformer) ─────────`,
         `    app.useGlobalPipes(new ValidationPipe({ whitelist: true, transform: true }));`,
         ``,
-        `    // ── Swagger / OpenAPI ────────────────────────────────────────────────────`,
-        `    const config = new DocumentBuilder()`,
-        `        .setTitle('${a.projectName}')`,
-        `        .setDescription('IBM i REST API')`,
-        `        .setVersion('1.0.0')`,
-        `        .build();`,
-        `    const document = SwaggerModule.createDocument(app, config);`,
-        `    SwaggerModule.setup('api-docs', app, document);`,
+        `    setupDocs(app);`,
         ``,
         `    const port = Number(process.env.PORT ?? 3000);`,
         `    await app.listen(port);`,
         `    console.log(\`Application: http://localhost:\${port}\`);`,
         `    console.log(\`Swagger UI:  http://localhost:\${port}/api-docs\`);`,
+        `    console.log(\`Scalar:      http://localhost:\${port}/scalar\`);`,
         `}`,
         ``,
         `bootstrap().catch(console.error);`,
@@ -114,29 +136,67 @@ function mainTs(a) {
     ].join('\n');
 }
 // ── src/app.module.ts ─────────────────────────────────────────────────────────
-function appModuleTs() {
-    return [
+function appModuleTs(hasProgram, hasTable) {
+    const imports = [
         `import { Module } from '@nestjs/common';`,
         `import { IBMiModule } from './ibmi/ibmi.module.js';`,
+        `import { HealthModule } from './health/health.module.js';`,
+    ];
+    const moduleImports = [`IBMiModule`, `HealthModule`];
+    if (hasTable) {
+        imports.push(`import { CustomersModule } from './customers/customers.module.js';`);
+        moduleImports.push(`CustomersModule`);
+    }
+    if (hasProgram) {
+        imports.push(`import { ProgramsModule } from './programs/programs.module.js';`);
+        moduleImports.push(`ProgramsModule`);
+    }
+    return [
+        ...imports,
         ``,
         `@Module({`,
-        `    imports: [IBMiModule],`,
+        `    imports: [${moduleImports.join(', ')}],`,
         `})`,
         `export class AppModule {}`,
         ``,
     ].join('\n');
 }
+// ── src/docs.ts ───────────────────────────────────────────────────────────────
+function docsTs(a) {
+    return [
+        `import type { INestApplication } from '@nestjs/common';`,
+        `import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';`,
+        `import { apiReference } from '@scalar/express-api-reference';`,
+        ``,
+        `export function setupDocs(app: INestApplication): void {`,
+        `    const config = new DocumentBuilder()`,
+        `        .setTitle('${a.projectName}')`,
+        `        .setDescription('IBM i REST API')`,
+        `        .setVersion('1.0.0')`,
+        `        .build();`,
+        ``,
+        `    const document = SwaggerModule.createDocument(app, config);`,
+        ``,
+        `    SwaggerModule.setup('api-docs', app, document);`,
+        ``,
+        `    app.use(`,
+        `        '/scalar',`,
+        `        apiReference({ spec: { content: document } }) as any,`,
+        `    );`,
+        `}`,
+        ``,
+    ].join('\n');
+}
 // ── src/ibmi/ibmi.module.ts ───────────────────────────────────────────────────
 function ibmiModuleTs() {
     return [
-        `import { Module } from '@nestjs/common';`,
+        `import { Global, Module } from '@nestjs/common';`,
         `import { IBMiService } from './ibmi.service.js';`,
-        `import { IBMiController } from './ibmi.controller.js';`,
         ``,
+        `@Global()`,
         `@Module({`,
-        `    providers:   [IBMiService],`,
-        `    controllers: [IBMiController],`,
-        `    exports:     [IBMiService],`,
+        `    providers: [IBMiService],`,
+        `    exports:   [IBMiService],`,
         `})`,
         `export class IBMiModule {}`,
         ``,
@@ -161,7 +221,7 @@ function ibmiServiceTs(a) {
     const extras = [httpOptions, sshOptions, odbcOptions].filter(Boolean).join('\n');
     return [
         `import { Injectable, OnModuleInit, OnModuleDestroy } from '@nestjs/common';`,
-        `import { createClient } from '../generated/ibmi/index.js';`,
+        `import { createClient } from '.openibm';`,
         ``,
         `@Injectable()`,
         `export class IBMiService implements OnModuleInit, OnModuleDestroy {`,
@@ -173,60 +233,195 @@ function ibmiServiceTs(a) {
         ...(extras ? [extras] : []),
         `    });`,
         ``,
-        `    async onModuleInit(): Promise<void> {`,
-        `        await this.client.connect();`,
+        `    async onModuleInit(): Promise<void>  { await this.client.connect(); }`,
+        `    async onModuleDestroy(): Promise<void> { await this.client.disconnect(); }`,
+        `}`,
+        ``,
+    ].join('\n');
+}
+// ── src/health/health.module.ts ───────────────────────────────────────────────
+function healthModuleTs() {
+    return [
+        `import { Module } from '@nestjs/common';`,
+        `import { HealthController } from './health.controller.js';`,
+        ``,
+        `@Module({ controllers: [HealthController] })`,
+        `export class HealthModule {}`,
+        ``,
+    ].join('\n');
+}
+// ── src/health/health.controller.ts ──────────────────────────────────────────
+function healthControllerTs() {
+    return [
+        `import { Controller, Get } from '@nestjs/common';`,
+        `import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';`,
+        `import { IBMiService } from '../ibmi/ibmi.service.js';`,
+        ``,
+        `@ApiTags('Health')`,
+        `@Controller('health')`,
+        `export class HealthController {`,
+        `    constructor(private readonly ibmi: IBMiService) {}`,
+        ``,
+        `    @Get()`,
+        `    @ApiOperation({ summary: 'Connection status' })`,
+        `    @ApiResponse({ status: 200, schema: { example: { status: 'ok', connected: true } } })`,
+        `    check() {`,
+        `        return { status: 'ok', connected: this.ibmi.client.isConnected() };`,
         `    }`,
+        `}`,
         ``,
-        `    async onModuleDestroy(): Promise<void> {`,
-        `        await this.client.disconnect();`,
+    ].join('\n');
+}
+// ── src/customers/customers.module.ts ────────────────────────────────────────
+function customersModuleTs() {
+    return [
+        `import { Module } from '@nestjs/common';`,
+        `import { CustomersController } from './customers.controller.js';`,
+        `import { CustomersService } from './customers.service.js';`,
+        ``,
+        `@Module({`,
+        `    controllers: [CustomersController],`,
+        `    providers:   [CustomersService],`,
+        `})`,
+        `export class CustomersModule {}`,
+        ``,
+    ].join('\n');
+}
+// ── src/customers/customers.service.ts ───────────────────────────────────────
+function customersServiceTs() {
+    return [
+        `import { Injectable } from '@nestjs/common';`,
+        `import { IBMiService } from '../ibmi/ibmi.service.js';`,
+        ``,
+        `@Injectable()`,
+        `export class CustomersService {`,
+        `    constructor(private readonly ibmi: IBMiService) {}`,
+        ``,
+        `    findAll(state: string) {`,
+        `        return this.ibmi.client.query.Customer.findMany({`,
+        `            where:   { state },`,
+        `            orderBy: { customerId: 'asc' },`,
+        `            take:    20,`,
+        `        });`,
+        `    }`,
+        ``,
+        `    findOne(id: number) {`,
+        `        return this.ibmi.client.query.Customer.findFirst({`,
+        `            where: { customerId: id },`,
+        `        });`,
         `    }`,
         `}`,
         ``,
     ].join('\n');
 }
-// ── src/ibmi/ibmi.controller.ts ───────────────────────────────────────────────
-function ibmiControllerTs(a, hasProgram, hasTable) {
-    const nestImports = ['Controller', 'Get', 'Post', 'Param', 'Body'];
-    const swaggerImports = ['ApiOperation', 'ApiResponse', 'ApiTags'];
-    if (hasTable)
-        swaggerImports.push('ApiParam', 'ApiQuery');
-    if (hasProgram)
-        swaggerImports.push('ApiBody');
-    const imports = [
-        `import { ${nestImports.join(', ')} } from '@nestjs/common';`,
-        `import { ${swaggerImports.join(', ')} } from '@nestjs/swagger';`,
-        `import { IBMiService } from './ibmi.service.js';`,
-        ...(hasProgram ? [`import { CalculateDto } from './dto/calculate.dto.js';`] : []),
-    ];
-    const methods = [
-        `    @Get('health')`,
-        `    @ApiOperation({ summary: 'Connection status' })`,
-        `    @ApiResponse({ status: 200, description: 'OK', schema: { example: { status: 'ok', connected: true } } })`,
-        `    health() {`,
-        `        return { status: 'ok', connected: this.ibmi.client.isConnected() };`,
+// ── src/customers/customers.controller.ts ────────────────────────────────────
+function customersControllerTs() {
+    return [
+        `import { Controller, Get, Param, Query, NotFoundException } from '@nestjs/common';`,
+        `import { ApiOperation, ApiParam, ApiQuery, ApiResponse, ApiTags } from '@nestjs/swagger';`,
+        `import { CustomersService } from './customers.service.js';`,
+        ``,
+        `@ApiTags('Customers')`,
+        `@Controller('customers')`,
+        `export class CustomersController {`,
+        `    constructor(private readonly customers: CustomersService) {}`,
+        ``,
+        `    @Get()`,
+        `    @ApiOperation({ summary: 'List customers filtered by state' })`,
+        `    @ApiQuery({ name: 'state', required: false, example: 'TX', description: 'State code — CHAR(2)' })`,
+        `    @ApiResponse({ status: 200, description: 'Array of customer rows' })`,
+        `    findAll(@Query('state') state = 'TX') {`,
+        `        return this.customers.findAll(state);`,
         `    }`,
-    ];
-    if (hasTable) {
-        methods.push(``, `    @Get('customers')`, `    @ApiOperation({ summary: 'List customers filtered by state' })`, `    @ApiQuery({ name: 'state', required: false, example: 'TX', description: 'State code — CHAR(2)' })`, `    @ApiResponse({ status: 200, description: 'Array of customer rows' })`, `    async findCustomers(@Param() params: Record<string, string>) {`, `        const state = params['state'] ?? 'TX';`, `        return this.ibmi.client.query.Customer.findMany({`, `            where:   { state },`, `            orderBy: { customerId: 'asc' },`, `            take:    20,`, `        });`, `    }`, ``, `    @Get('customers/:id')`, `    @ApiOperation({ summary: 'Find customer by ID' })`, `    @ApiParam({ name: 'id', type: Number })`, `    @ApiResponse({ status: 200, description: 'Customer row' })`, `    @ApiResponse({ status: 404, description: 'Not found' })`, `    async findCustomer(@Param('id') id: string) {`, `        return this.ibmi.client.query.Customer.findFirst({`, `            where: { customerId: Number(id) },`, `        });`, `    }`);
-    }
-    if (hasProgram) {
-        methods.push(``, `    @Post('calculate')`, `    @ApiOperation({ summary: 'Call SimpleCalc IBM i program' })`, `    @ApiBody({ type: CalculateDto })`, `    @ApiResponse({ status: 200, description: 'Result', schema: { example: { input: 5, output: 500 } } })`, `    async calculate(@Body() body: CalculateDto) {`, `        const result = await this.ibmi.client.program.SimpleCalc({ input: body.input });`, `        return { input: body.input, output: result.output };`, `    }`);
-    }
-    void a;
+        ``,
+        `    @Get(':id')`,
+        `    @ApiOperation({ summary: 'Find customer by ID' })`,
+        `    @ApiParam({ name: 'id', type: Number })`,
+        `    @ApiResponse({ status: 200, description: 'Customer row' })`,
+        `    @ApiResponse({ status: 404, description: 'Not found' })`,
+        `    async findOne(@Param('id') id: string) {`,
+        `        const row = await this.customers.findOne(Number(id));`,
+        `        if (!row) throw new NotFoundException('Customer not found');`,
+        `        return row;`,
+        `    }`,
+        `}`,
+        ``,
+    ].join('\n');
+}
+// ── src/programs/programs.module.ts ──────────────────────────────────────────
+function programsModuleTs() {
     return [
-        ...imports,
+        `import { Module } from '@nestjs/common';`,
+        `import { ProgramsController } from './programs.controller.js';`,
+        `import { ProgramsService } from './programs.service.js';`,
+        ``,
+        `@Module({`,
+        `    controllers: [ProgramsController],`,
+        `    providers:   [ProgramsService],`,
+        `})`,
+        `export class ProgramsModule {}`,
+        ``,
+    ].join('\n');
+}
+// ── src/programs/programs.service.ts ─────────────────────────────────────────
+function programsServiceTs() {
+    return [
+        `import { Injectable } from '@nestjs/common';`,
+        `import { IBMiService } from '../ibmi/ibmi.service.js';`,
         ``,
-        `@ApiTags('IBM i')`,
-        `@Controller()`,
-        `export class IBMiController {`,
+        `@Injectable()`,
+        `export class ProgramsService {`,
         `    constructor(private readonly ibmi: IBMiService) {}`,
         ``,
-        ...methods,
+        `    calculate(input: number) {`,
+        `        return this.ibmi.client.program.SimpleCalc({ input });`,
+        `    }`,
+        `}`,
+        ``,
+    ].join('\n');
+}
+// ── src/programs/programs.controller.ts ──────────────────────────────────────
+function programsControllerTs() {
+    return [
+        `import { Controller, Post, Body } from '@nestjs/common';`,
+        `import { ApiBody, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';`,
+        `import { ProgramsService } from './programs.service.js';`,
+        `import { CalculateDto } from './dto/calculate.dto.js';`,
+        ``,
+        `@ApiTags('Programs')`,
+        `@Controller('programs')`,
+        `export class ProgramsController {`,
+        `    constructor(private readonly programs: ProgramsService) {}`,
+        ``,
+        `    @Post('calculate')`,
+        `    @ApiOperation({ summary: 'Call SimpleCalc IBM i program' })`,
+        `    @ApiBody({ type: CalculateDto })`,
+        `    @ApiResponse({ status: 200, schema: { example: { input: 5, output: 500 } } })`,
+        `    async calculate(@Body() body: CalculateDto) {`,
+        `        const result = await this.programs.calculate(body.input);`,
+        `        return { input: body.input, output: result.output };`,
+        `    }`,
         `}`,
         ``,
     ].join('\n');
 }
-// ── src/ibmi/dto/ibmi-validators.ts ──────────────────────────────────────────
+// ── src/programs/dto/calculate.dto.ts ─────────────────────────────────────────
+function calculateDtoTs() {
+    return [
+        `import { IsNumber } from 'class-validator';`,
+        `import { ApiProperty } from '@nestjs/swagger';`,
+        `import { IbmiInt } from '../../common/ibmi-validators.js';`,
+        ``,
+        `export class CalculateDto {`,
+        `    @ApiProperty({ example: 5, description: 'Input integer (IBM i INTEGER: -2147483648 to 2147483647)' })`,
+        `    @IsNumber()`,
+        `    @IbmiInt()`,
+        `    input!: number;`,
+        `}`,
+        ``,
+    ].join('\n');
+}
+// ── src/common/ibmi-validators.ts ─────────────────────────────────────────────
 function ibmiValidatorsNestTs() {
     return [
         `/**`,
@@ -234,12 +429,12 @@ function ibmiValidatorsNestTs() {
         ` * Use these in your NestJS DTOs alongside standard class-validator decorators.`,
         ` *`,
         ` * Usage:`,
-        ` *   import { IbmiChar, IbmiPackedDecimal, IbmiInt } from './ibmi-validators.js';`,
+        ` *   import { IbmiChar, IbmiPackedDecimal, IbmiInt } from '../common/ibmi-validators.js';`,
         ` *`,
         ` *   export class MyDto {`,
-        ` *       @IbmiChar(8)   name!: string;`,
+        ` *       @IbmiChar(8)             name!: string;`,
         ` *       @IbmiPackedDecimal(6, 2) balance!: number;`,
-        ` *       @IbmiInt()     id!: number;`,
+        ` *       @IbmiInt()               id!: number;`,
         ` *   }`,
         ` */`,
         `import { registerDecorator, ValidationOptions, ValidationArguments } from 'class-validator';`,
@@ -390,36 +585,147 @@ function ibmiValidatorsNestTs() {
         ``,
     ].join('\n');
 }
-// ── src/ibmi/dto/calculate.dto.ts ─────────────────────────────────────────────
-function calculateDtoTs() {
-    return [
-        `import { IsNumber } from 'class-validator';`,
-        `import { ApiProperty } from '@nestjs/swagger';`,
-        `import { IbmiInt } from './ibmi-validators.js';`,
-        ``,
-        `export class CalculateDto {`,
-        `    @ApiProperty({ example: 5, description: 'Input integer (IBM i INTEGER: -2147483648 to 2147483647)' })`,
-        `    @IsNumber()`,
-        `    @IbmiInt()`,
-        `    input!: number;`,
-        `}`,
-        ``,
-    ].join('\n');
+// ── .vscode/settings.json ─────────────────────────────────────────────────────
+function vscodeSettings() {
+    return JSON.stringify({
+        'editor.formatOnSave': true,
+        'editor.defaultFormatter': 'esbenp.prettier-vscode',
+        'editor.codeActionsOnSave': {
+            'source.fixAll.eslint': 'explicit',
+            'source.organizeImports': 'never',
+            'source.removeUnusedImports': 'explicit',
+        },
+        'editor.tabSize': 2,
+        'editor.insertSpaces': true,
+        'editor.rulers': [80, 120],
+        'editor.wordWrap': 'on',
+        'editor.bracketPairColorization.enabled': true,
+        'editor.guides.bracketPairs': true,
+        'editor.inlineSuggest.enabled': true,
+        'js/ts.tsdk': 'node_modules/typescript/lib',
+        'js/ts.enablePromptUseWorkspaceTsdk': true,
+        'js/ts.preferences.importModuleSpecifier': 'non-relative',
+        'js/ts.updateImportsOnFileMove.enabled': 'always',
+        'js/ts.suggest.autoImports': true,
+        'js/ts.preferences.quoteStyle': 'single',
+        'files.autoSave': 'onFocusChange',
+        'files.trimTrailingWhitespace': true,
+        'files.insertFinalNewline': true,
+        'files.eol': '\n',
+        'files.exclude': {
+            '**/.git': true,
+            '**/.DS_Store': true,
+            '**/dist': true,
+            '**/coverage': true,
+        },
+        'search.exclude': {
+            '**/node_modules': true,
+            '**/dist': true,
+            '**/coverage': true,
+            'package-lock.json': true,
+            'pnpm-lock.yaml': true,
+        },
+        'prettier.singleQuote': true,
+        'prettier.trailingComma': 'all',
+        'prettier.tabWidth': 2,
+        'prettier.semi': true,
+        'prettier.arrowParens': 'always',
+        'prettier.endOfLine': 'lf',
+        'git.autofetch': true,
+        'git.confirmSync': false,
+        'git.enableSmartCommit': true,
+        'explorer.confirmDelete': false,
+        'explorer.confirmDragAndDrop': false,
+        'explorer.fileNesting.enabled': true,
+        'explorer.fileNesting.patterns': {
+            '*.ts': '${capture}.js, ${capture}.d.ts, ${capture}.spec.ts, ${capture}.test.ts',
+            '*.controller.ts': '${capture}.controller.spec.ts',
+            '*.service.ts': '${capture}.service.spec.ts',
+            '*.module.ts': '${capture}.module.spec.ts',
+            'package.json': 'package-lock.json, pnpm-lock.yaml, yarn.lock, .npmrc, .nvmrc, .node-version',
+            'tsconfig.json': 'tsconfig.*.json',
+            '.env': '.env.*',
+            '.gitignore': '.gitattributes',
+            'README.md': 'CHANGELOG.md, LICENSE',
+        },
+        '[typescript]': { 'editor.defaultFormatter': 'esbenp.prettier-vscode' },
+        '[javascript]': { 'editor.defaultFormatter': 'esbenp.prettier-vscode' },
+        '[json]': { 'editor.defaultFormatter': 'esbenp.prettier-vscode' },
+        '[ibmi]': { 'editor.defaultFormatter': 'openibm.vscode' },
+        'rest-client.environmentVariables': {
+            '$shared': { baseUrl: 'http://localhost:3000' },
+            'local': { baseUrl: 'http://localhost:3000' },
+        },
+        'todo-tree.general.tags': ['TODO', 'FIXME', 'NOTE', 'BUG'],
+        'todo-tree.highlights.defaultHighlight': {
+            icon: 'alert', type: 'text', foreground: '#fff', iconColour: '#ffcc00',
+        },
+        'todo-tree.highlights.customHighlight': {
+            'TODO': { icon: 'check', iconColour: '#3498db' },
+            'FIXME': { icon: 'flame', iconColour: '#e74c3c' },
+            'NOTE': { icon: 'note', iconColour: '#2ecc71' },
+            'BUG': { icon: 'bug', iconColour: '#e74c3c' },
+        },
+    }, null, 2) + '\n';
+}
+// ── .vscode/extensions.json ───────────────────────────────────────────────────
+function vscodeExtensions() {
+    return JSON.stringify({
+        recommendations: [
+            'openibm.vscode',
+            'esbenp.prettier-vscode',
+            'dbaeumer.vscode-eslint',
+            'christian-kohler.path-intellisense',
+            'humao.rest-client',
+            'gruntfuggly.todo-tree',
+        ],
+    }, null, 2) + '\n';
 }
 // ── README.md ─────────────────────────────────────────────────────────────────
 function readme(a, hasProgram, hasTable) {
     const endpoints = [
-        `| \`GET  /health\`        | Connection status |`,
-        `| \`GET  /api-docs\`      | Swagger UI |`,
-        ...(hasTable ? [`| \`GET  /customers\`    | Query DB2 table (filtered by state) |`] : []),
-        ...(hasTable ? [`| \`GET  /customers/:id\`| Find customer by ID |`] : []),
-        ...(hasProgram ? [`| \`POST /calculate\`    | Call IBM i program (\`{ input: number }\`) |`] : []),
+        `| \`GET  /health\`             | Connection status |`,
+        `| \`GET  /api-docs\`           | Swagger UI |`,
+        `| \`GET  /scalar\`             | Scalar API reference |`,
+        ...(hasTable ? [`| \`GET  /customers\`         | Query DB2 table (filtered by state) |`] : []),
+        ...(hasTable ? [`| \`GET  /customers/:id\`     | Find customer by ID |`] : []),
+        ...(hasProgram ? [`| \`POST /programs/calculate\`| Call IBM i program (\`{ input: number }\`) |`] : []),
     ];
     return [
         `# ${a.projectName}`,
         ``,
         `IBM i NestJS application generated by [create-openibm](https://www.npmjs.com/package/create-openibm).`,
         ``,
+        `## Project structure`,
+        ``,
+        `\`\`\``,
+        `src/`,
+        `├── main.ts                  # Bootstrap — listen, ValidationPipe, docs`,
+        `├── app.module.ts            # Root module`,
+        `├── docs.ts                  # Swagger + Scalar setup`,
+        `├── ibmi/                    # IBM i client (global module)`,
+        `│   ├── ibmi.module.ts`,
+        `│   └── ibmi.service.ts`,
+        `├── health/`,
+        `│   ├── health.module.ts`,
+        `│   └── health.controller.ts`,
+        ...(hasTable ? [
+            `├── customers/`,
+            `│   ├── customers.module.ts`,
+            `│   ├── customers.controller.ts`,
+            `│   └── customers.service.ts`,
+        ] : []),
+        ...(hasProgram ? [
+            `├── programs/`,
+            `│   ├── programs.module.ts`,
+            `│   ├── programs.controller.ts`,
+            `│   ├── programs.service.ts`,
+            `│   └── dto/calculate.dto.ts`,
+        ] : []),
+        `└── common/`,
+        `    └── ibmi-validators.ts   # class-validator decorators for IBM i types`,
+        `\`\`\``,
+        ``,
         `## Setup`,
         ``,
         `\`\`\`bash`,
@@ -431,15 +737,9 @@ function readme(a, hasProgram, hasTable) {
         `## Development`,
         ``,
         `\`\`\`bash`,
-        `npm run dev`,
+        `npm run dev   # starts with nodemon — restarts on file save`,
         `\`\`\``,
         ``,
-        `## Architecture`,
-        ``,
-        `- **\`IBMiModule\`** — NestJS module that provides and exports \`IBMiService\``,
-        `- **\`IBMiService\`** — wraps the generated client; connects on \`onModuleInit\`, disconnects on \`onModuleDestroy\``,
-        `- **\`IBMiController\`** — exposes HTTP endpoints backed by the IBM i client`,
-        ``,
         `## Endpoints`,
         ``,
         `| Route | Description |`,
@@ -448,10 +748,10 @@ function readme(a, hasProgram, hasTable) {
         ``,
         `## IBM i validators`,
         ``,
-        `\`src/ibmi/dto/ibmi-validators.ts\` provides class-validator decorators for IBM i data types:`,
+        `\`src/common/ibmi-validators.ts\` provides class-validator decorators for IBM i data types:`,
         ``,
         `\`\`\`ts`,
-        `import { IbmiChar, IbmiPackedDecimal, IbmiInt } from './ibmi-validators.js';`,
+        `import { IbmiChar, IbmiPackedDecimal, IbmiInt } from '../common/ibmi-validators.js';`,
         `import { IsString, IsNumber } from 'class-validator';`,
         `import { ApiProperty } from '@nestjs/swagger';`,
         ``,
@@ -461,11 +761,6 @@ function readme(a, hasProgram, hasTable) {
         `    @IbmiChar(8)`,
         `    lastName!: string;`,
         ``,
-        `    @ApiProperty({ example: 0.00, description: 'DECIMAL(6,2)' })`,
-        `    @IsNumber()`,
-        `    @IbmiPackedDecimal(6, 2)`,
-        `    balanceDue!: number;`,
-        ``,
         `    @ApiProperty({ example: 1, description: 'INTEGER' })`,
         `    @IsNumber()`,
         `    @IbmiInt()`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-openibm",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Create a new IBM i application — interactive scaffold with Express, NestJS, or plain Node.js",
   "license": "MIT",
   "homepage": "https://github.com/satyamlohiya/openibm",
@@ -30,16 +30,6 @@
     "LICENSE"
   ],
   "sideEffects": false,
-  "scripts": {
-    "build": "tsc --project tsconfig.json",
-    "dev": "tsc --project tsconfig.json --watch",
-    "typecheck": "tsc --noEmit",
-    "clean": "rm -rf dist",
-    "try": "node scripts/try.mjs",
-    "link": "pnpm run build && pnpm link --global",
-    "unlink": "pnpm unlink --global create-openibm",
-    "prepublishOnly": "npm run build"
-  },
   "dependencies": {
     "@clack/prompts": "^0.9.0"
   },
@@ -52,5 +42,14 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "build": "tsc --project tsconfig.json",
+    "dev": "tsc --project tsconfig.json --watch",
+    "typecheck": "tsc --noEmit",
+    "clean": "rm -rf dist",
+    "try": "node scripts/try.mjs",
+    "link": "pnpm run build && pnpm link --global",
+    "unlink": "pnpm unlink --global create-openibm"
   }
-}
+}