@emeryld/manager 0.4.2 → 0.4.4

package/dist/create-package/index.js

@@ -1,4 +1,4 @@
-import { mkdir, readdir, readFile, stat } from 'node:fs/promises';
+import { mkdir, readdir, readFile, rm, stat } from 'node:fs/promises';
 import { spawn } from 'node:child_process';
 import path from 'node:path';
 import { stdin as input } from 'node:process';
@@ -105,6 +105,10 @@ function parseCreateCliArgs(argv) {
             options.skipBuild = true;
             continue;
         }
+        if (arg === '--reset') {
+            options.reset = true;
+            continue;
+        }
         if (arg === '--help' || arg === '-h') {
             options.help = true;
             continue;
@@ -123,6 +127,7 @@ function printCreateHelp() {
     console.log('  pnpm manager-cli create --describe rrr-server');
     console.log('  pnpm manager-cli create --variant rrr-client --dir packages/rrr-client --name @scope/client');
     console.log('  pnpm manager-cli create --variant rrr-server --contract @scope/contract --skip-install');
+    console.log('  pnpm manager-cli create --variant rrr-server --reset # blow away an existing target before scaffolding');
     console.log('');
     console.log('Flags:');
     console.log('  --list, -l          Show available templates');
@@ -131,16 +136,28 @@ function printCreateHelp() {
     console.log('  --dir, --path, -p   Target directory (skips path prompt)');
     console.log('  --name, -n          Package name (skips name prompt)');
     console.log('  --contract          Contract import to inject (server/client variants)');
+    console.log('  --reset             Remove the target directory if it already exists');
     console.log('  --skip-install      Do not run pnpm install after scaffolding');
     console.log('  --skip-build        Skip build after scaffolding');
     console.log('  --help, -h          Show this help');
 }
-async function ensureTargetDir(targetDir) {
+async function ensureTargetDir(targetDir, options) {
+    const resolvedTarget = path.resolve(targetDir);
+    const shouldReset = options?.reset ?? false;
+    if (shouldReset && resolvedTarget === workspaceRoot) {
+        throw new Error('Refusing to reset the workspace root directory.');
+    }
     try {
         const stats = await stat(targetDir);
         if (!stats.isDirectory()) {
             throw new Error(`Target "${targetDir}" exists and is not a directory.`);
         }
+        if (shouldReset) {
+            logGlobal(`Resetting existing target ${path.relative(workspaceRoot, resolvedTarget) || '.'}…`, colors.yellow);
+            await rm(resolvedTarget, { recursive: true, force: true });
+            await mkdir(resolvedTarget, { recursive: true });
+            return;
+        }
         const entries = await readdir(targetDir);
         if (entries.length > 0) {
             logGlobal(`Target ${path.relative(workspaceRoot, targetDir)} is not empty; existing files will be preserved.`, colors.yellow);
@@ -150,7 +167,7 @@ async function ensureTargetDir(targetDir) {
         if (error &&
             typeof error === 'object' &&
             error.code === 'ENOENT') {
-            await mkdir(targetDir, { recursive: true });
+            await mkdir(resolvedTarget, { recursive: true });
             return;
         }
         throw error;
@@ -289,6 +306,10 @@ async function promptForTargetDir(fallback) {
     const normalized = answer || fallback;
     return path.resolve(workspaceRoot, normalized);
 }
+/**
+ * ✅ Build solution #1: after install, build the workspace graph (or at least deps)
+ * ✅ Keeps a safe fallback to the old "build just the new package" behavior.
+ */
 async function postCreateTasks(targetDir, options) {
     if (options?.skipInstall) {
         logGlobal('Skipping pnpm install (flag).', colors.dim);
@@ -306,6 +327,27 @@ async function postCreateTasks(targetDir, options) {
         logGlobal('Skipping build (flag).', colors.dim);
         return;
     }
+    // Prefer building the dependency graph rooted at the new package (fast),
+    // fall back to building the whole workspace, then fall back to old behavior.
+    try {
+        if (options?.pkgName) {
+            logGlobal(`Building workspace deps for ${options.pkgName}…`, colors.cyan);
+            await runCommand('pnpm', ['-r', '--filter', `${options.pkgName}...`, 'build'], workspaceRoot);
+            return;
+        }
+    }
+    catch (error) {
+        logGlobal(`Filtered workspace build failed; will try full workspace build: ${error instanceof Error ? error.message : String(error)}`, colors.yellow);
+    }
+    try {
+        logGlobal('Building full workspace…', colors.cyan);
+        await runCommand('pnpm', ['-r', 'build'], workspaceRoot);
+        return;
+    }
+    catch (error) {
+        logGlobal(`Full workspace build failed; falling back to building only the new package: ${error instanceof Error ? error.message : String(error)}`, colors.yellow);
+    }
+    // Old behavior fallback: build only the new package if it has a build script
     try {
         const pkgJsonPath = path.join(targetDir, 'package.json');
         const pkgRaw = await readFile(pkgJsonPath, 'utf8');
@@ -329,12 +371,13 @@ async function gatherTarget(initial = {}) {
         ? await askLine(`Package name? (${fallbackName}): `)
         : initial.pkgName;
     const pkgName = (nameAnswer || fallbackName).trim() || fallbackName;
-    await ensureTargetDir(targetDir);
+    await ensureTargetDir(targetDir, { reset: initial.reset });
     return {
         variant,
         targetDir,
         pkgName,
         contractName: initial.contractName,
+        reset: initial.reset,
     };
 }
 export async function createRrrPackage(options = {}) {
@@ -348,6 +391,7 @@ export async function createRrrPackage(options = {}) {
     await postCreateTasks(target.targetDir, {
         skipInstall: options.skipInstall,
         skipBuild: options.skipBuild ?? options.skipInstall,
+        pkgName: target.pkgName,
     });
     logGlobal('Scaffold complete. Install/build steps were attempted; ready to run!', colors.green);
 }
@@ -381,6 +425,7 @@ export async function runCreatePackageCli(argv) {
         targetDir,
         pkgName: parsed.pkgName,
         contractName: parsed.contractName,
+        reset: parsed.reset,
         skipInstall: parsed.skipInstall,
         skipBuild: parsed.skipBuild ?? parsed.skipInstall,
     });

package/dist/create-package/shared.js

@@ -1,6 +1,15 @@
+import { readFileSync } from 'node:fs';
 import { access, mkdir, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 export const workspaceRoot = process.cwd();
+function pathExists(target) {
+    return access(target)
+        .then(() => true)
+        .catch(() => false);
+}
+function toPosixPath(value) {
+    return value.split(path.sep).join('/');
+}
 export async function writeFileIfMissing(baseDir, relative, contents) {
     const fullPath = path.join(baseDir, relative);
     await mkdir(path.dirname(fullPath), { recursive: true });
@@ -23,7 +32,8 @@ export async function writeFileIfMissing(baseDir, relative, contents) {
     return 'created';
 }
 export function baseTsConfig(options) {
-    return `${JSON.stringify({
+    const config = {
+        ...(options?.extends ? { extends: options.extends } : {}),
         compilerOptions: {
             target: 'ES2020',
             module: 'NodeNext',
@@ -41,11 +51,15 @@ export function baseTsConfig(options) {
         },
         include: options?.include ?? ['src/**/*'],
         exclude: options?.exclude ?? ['dist', 'node_modules'],
-    }, null, 2)}\n`;
+    };
+    return `${JSON.stringify(config, null, 2)}\n`;
 }
 export function baseEslintConfig(tsconfigPath = './tsconfig.json') {
     return `import tseslint from 'typescript-eslint'
 import prettierPlugin from 'eslint-plugin-prettier'
+import { fileURLToPath } from 'node:url'
+
+const __dirname = fileURLToPath(new URL('.', import.meta.url))
 
 export default tseslint.config(
   { ignores: ['dist', 'node_modules'] },
@@ -55,7 +69,7 @@ export default tseslint.config(
     languageOptions: {
       parserOptions: {
         project: ${JSON.stringify(tsconfigPath)},
-        tsconfigRootDir: import.meta.dirname,
+        tsconfigRootDir: __dirname,
       },
     },
     plugins: {
@@ -125,6 +139,8 @@ const DEFAULT_GITIGNORE_ENTRIES = [
     '.env',
     'coverage',
     '*.log',
+    '.vscode',
+    '.husky',
 ];
 export function gitignoreFrom(entries = DEFAULT_GITIGNORE_ENTRIES) {
     return entries.join('\n');
@@ -199,6 +215,10 @@ function stripUndefined(obj) {
 }
 export function basePackageJson(options) {
     const applyDefaults = options.useDefaults ?? true;
+    const inheritPackageManager = options.inheritPackageManager ?? true;
+    const packageManager = inheritPackageManager && !options.extraFields?.packageManager
+        ? readRootPackageManager()
+        : undefined;
     const pkg = stripUndefined({
         name: options.name,
         version: options.version ?? '0.1.0',
@@ -221,7 +241,47 @@ export function basePackageJson(options) {
         dependencies: options.dependencies,
         devDependencies: options.devDependencies,
         'lint-staged': LINT_STAGED_CONFIG,
+        packageManager,
         ...options.extraFields,
     });
     return `${JSON.stringify(pkg, null, 2)}\n`;
 }
+function readRootPackageManager() {
+    try {
+        const raw = readFileSync(path.join(workspaceRoot, 'package.json'), 'utf8');
+        const pkg = JSON.parse(raw);
+        return pkg.packageManager;
+    }
+    catch (error) {
+        if (error &&
+            typeof error === 'object' &&
+            error.code !== 'ENOENT') {
+            console.warn(`Could not read root package.json for packageManager: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        return undefined;
+    }
+}
+async function resolveRootTsconfig() {
+    const candidates = ['tsconfig.base.json', 'tsconfig.json'];
+    for (const candidate of candidates) {
+        const fullPath = path.join(workspaceRoot, candidate);
+        if (await pathExists(fullPath)) {
+            return fullPath;
+        }
+    }
+    return undefined;
+}
+export async function packageTsConfig(targetDir, options) {
+    const extendsFromRoot = options?.extendsFromRoot ?? true;
+    let extendsPath;
+    if (extendsFromRoot) {
+        const rootConfig = await resolveRootTsconfig();
+        if (rootConfig) {
+            const relative = path.relative(targetDir, rootConfig);
+            if (relative !== '') {
+                extendsPath = toPosixPath(relative || './tsconfig.json');
+            }
+        }
+    }
+    return baseTsConfig({ ...options, extends: extendsPath });
+}

package/dist/create-package/variants/client.js

@@ -1,4 +1,4 @@
-import { BASE_LINT_DEV_DEPENDENCIES, basePackageFiles, basePackageJson, buildReadme, baseScripts, baseTsConfig, writeFileIfMissing, } from '../shared.js';
+import { BASE_LINT_DEV_DEPENDENCIES, basePackageFiles, basePackageJson, buildReadme, baseScripts, packageTsConfig, writeFileIfMissing, } from '../shared.js';
 const CLIENT_SCRIPTS = [
     'dev',
     'build',
@@ -45,10 +45,14 @@ export function clientPackageJson(name, contractName = CONTRACT_IMPORT_PLACEHOLD
         },
     });
 }
-function clientFiles(pkgName, contractImport) {
+async function clientFiles(pkgName, contractImport, targetDir) {
+    const tsconfig = await packageTsConfig(targetDir, {
+        lib: ['ES2020', 'DOM'],
+        types: ['node'],
+    });
     return {
         'package.json': clientPackageJson(pkgName, contractImport),
-        'tsconfig.json': baseTsConfig({ lib: ['ES2020', 'DOM'], types: ['node'] }),
+        'tsconfig.json': tsconfig,
         ...basePackageFiles(),
         'src/index.ts': clientIndexTs(contractImport),
         'README.md': buildReadme({
@@ -92,7 +96,7 @@ export const clientVariant = {
     ],
     async scaffold(ctx) {
         const contractImport = ctx.contractName ?? CONTRACT_IMPORT_PLACEHOLDER;
-        const files = clientFiles(ctx.pkgName, contractImport);
+        const files = await clientFiles(ctx.pkgName, contractImport, ctx.targetDir);
         for (const [relative, contents] of Object.entries(files)) {
             // eslint-disable-next-line no-await-in-loop
             await writeFileIfMissing(ctx.targetDir, relative, contents);

package/dist/create-package/variants/contract.js

@@ -1,4 +1,4 @@
-import { BASE_LINT_DEV_DEPENDENCIES, basePackageFiles, basePackageJson, buildReadme, baseScripts, baseTsConfig, writeFileIfMissing, } from '../shared.js';
+import { BASE_LINT_DEV_DEPENDENCIES, basePackageFiles, basePackageJson, buildReadme, baseScripts, packageTsConfig, writeFileIfMissing, } from '../shared.js';
 const CONTRACT_SCRIPTS = [
     'dev',
     'build',
@@ -90,7 +90,8 @@ function contractPackageJson(name) {
                 import: './dist/index.js',
             },
         },
-        scripts: baseScripts('tsx watch src/index.ts'),
+        // ✅ Dev now *builds/updates dist + .d.ts continuously*
+        scripts: baseScripts('tsc -p tsconfig.json --watch --preserveWatchOutput'),
         dependencies: {
             '@emeryld/rrroutes-contract': '^2.5.2',
             zod: '^4.2.1',
@@ -100,10 +101,11 @@ function contractPackageJson(name) {
         },
     });
 }
-function contractFiles(pkgName) {
+async function contractFiles(pkgName, targetDir) {
+    const tsconfig = await packageTsConfig(targetDir);
     return {
         'package.json': contractPackageJson(pkgName),
-        'tsconfig.json': baseTsConfig(),
+        'tsconfig.json': tsconfig,
         ...basePackageFiles(),
         'src/index.ts': CONTRACT_TS,
         'README.md': buildReadme({
@@ -141,7 +143,7 @@ export const contractVariant = {
         'Edit src/index.ts to define routes and socket events; exports registry/socket config.',
     ],
     async scaffold(ctx) {
-        const files = contractFiles(ctx.pkgName);
+        const files = await contractFiles(ctx.pkgName, ctx.targetDir);
         for (const [relative, contents] of Object.entries(files)) {
             // eslint-disable-next-line no-await-in-loop
             await writeFileIfMissing(ctx.targetDir, relative, contents);

package/dist/create-package/variants/docker.js

@@ -1,4 +1,4 @@
-import { BASE_LINT_DEV_DEPENDENCIES, basePackageFiles, basePackageJson, buildReadme, baseScripts, baseTsConfig, writeFileIfMissing, } from '../shared.js';
+import { BASE_LINT_DEV_DEPENDENCIES, basePackageFiles, basePackageJson, buildReadme, baseScripts, packageTsConfig, writeFileIfMissing, } from '../shared.js';
 const DOCKER_SCRIPTS = [
     'dev',
     'build',
@@ -41,7 +41,7 @@ function dockerPackageJson(name) {
             '@types/cors': '^2.8.5',
             '@types/express': '^5.0.6',
             '@types/node': '^24.10.2',
-            'docker-cli-js': '^3.0.9',
+            'docker-cli-js': '^2.10.0',
         },
     });
 }
@@ -95,10 +95,11 @@ EXPOSE 3000
 CMD ["node", "dist/index.js"]
 `;
 }
-function dockerFiles(pkgName) {
+async function dockerFiles(pkgName, targetDir) {
+    const tsconfig = await packageTsConfig(targetDir, { types: ['node'] });
     return {
         'package.json': dockerPackageJson(pkgName),
-        'tsconfig.json': baseTsConfig({ types: ['node'] }),
+        'tsconfig.json': tsconfig,
         'src/index.ts': dockerIndexTs(),
         'scripts/docker.ts': dockerCliScript(pkgName),
         '.dockerignore': DOCKER_DOCKERIGNORE,
@@ -190,8 +191,8 @@ async function main() {
 async function safe(run: () => Promise<unknown>) {
   try {
     await run()
-  } catch (error) {
-    console.warn(String(error))
+  } catch (error: unknown) {
+    console.warn(error instanceof Error ? error.message : String(error))
   }
 }
 
@@ -211,8 +212,8 @@ function printHelp() {
   )
 }
 
-main().catch((err) => {
-  console.error(err)
+main().catch((error: unknown) => {
+  console.error(error instanceof Error ? error.message : String(error))
   process.exit(1)
 })
 `;
@@ -234,7 +235,7 @@ export const dockerVariant = {
         'scripts/docker.ts wraps common docker commands with consistent naming.',
     ],
     async scaffold(ctx) {
-        const files = dockerFiles(ctx.pkgName);
+        const files = await dockerFiles(ctx.pkgName, ctx.targetDir);
         for (const [relative, contents] of Object.entries(files)) {
             // eslint-disable-next-line no-await-in-loop
             await writeFileIfMissing(ctx.targetDir, relative, contents);

package/dist/create-package/variants/empty.js

@@ -1,4 +1,4 @@
-import { BASE_LINT_DEV_DEPENDENCIES, basePackageFiles, basePackageJson, buildReadme, baseScripts, baseTsConfig, writeFileIfMissing, } from '../shared.js';
+import { BASE_LINT_DEV_DEPENDENCIES, basePackageFiles, basePackageJson, buildReadme, baseScripts, packageTsConfig, writeFileIfMissing, } from '../shared.js';
 const EMPTY_SCRIPTS = [
     'dev',
     'build',
@@ -19,10 +19,11 @@ function emptyPackageJson(name) {
         },
     });
 }
-function emptyFiles(pkgName) {
+async function emptyFiles(pkgName, targetDir) {
+    const tsconfig = await packageTsConfig(targetDir, { types: ['node'] });
     return {
         'package.json': emptyPackageJson(pkgName),
-        'tsconfig.json': baseTsConfig({ types: ['node'] }),
+        'tsconfig.json': tsconfig,
         ...basePackageFiles(),
         'src/index.ts': "export const hello = 'world'\n",
         'README.md': buildReadme({
@@ -55,7 +56,7 @@ export const emptyVariant = {
     scripts: EMPTY_SCRIPTS,
     notes: ['Start coding in src/index.ts; everything else is wired up.'],
     async scaffold(ctx) {
-        const files = emptyFiles(ctx.pkgName);
+        const files = await emptyFiles(ctx.pkgName, ctx.targetDir);
         for (const [relative, contents] of Object.entries(files)) {
             // eslint-disable-next-line no-await-in-loop
             await writeFileIfMissing(ctx.targetDir, relative, contents);

package/dist/create-package/variants/server.js

@@ -1,4 +1,4 @@
-import { BASE_LINT_DEV_DEPENDENCIES, basePackageFiles, basePackageJson, buildReadme, baseScripts, baseTsConfig, writeFileIfMissing, } from '../shared.js';
+import { BASE_LINT_DEV_DEPENDENCIES, basePackageFiles, basePackageJson, buildReadme, baseScripts, packageTsConfig, writeFileIfMissing, } from '../shared.js';
 const SERVER_SCRIPTS = [
     'dev',
     'build',
@@ -81,10 +81,11 @@ export function serverPackageJson(name, contractName = CONTRACT_IMPORT_PLACEHOLD
         },
     });
 }
-function serverFiles(pkgName, contractImport) {
+async function serverFiles(pkgName, contractImport, targetDir) {
+    const tsconfig = await packageTsConfig(targetDir, { types: ['node'] });
     return {
         'package.json': serverPackageJson(pkgName, contractImport),
-        'tsconfig.json': baseTsConfig({ types: ['node'] }),
+        'tsconfig.json': tsconfig,
         ...basePackageFiles(),
         'src/index.ts': serverIndexTs(contractImport),
         '.env.example': 'PORT=4000\n',
@@ -130,7 +131,7 @@ export const serverVariant = {
     ],
     async scaffold(ctx) {
         const contractImport = ctx.contractName ?? CONTRACT_IMPORT_PLACEHOLDER;
-        const files = serverFiles(ctx.pkgName, contractImport);
+        const files = await serverFiles(ctx.pkgName, contractImport, ctx.targetDir);
         for (const [relative, contents] of Object.entries(files)) {
             // eslint-disable-next-line no-await-in-loop
             await writeFileIfMissing(ctx.targetDir, relative, contents);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emeryld/manager",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Interactive manager for pnpm monorepos (update/test/build/publish).",
   "license": "MIT",
   "type": "module",