@emeryld/manager 0.6.1 → 0.6.3

package/dist/create-package/index.js

@@ -83,20 +83,19 @@ async function promptForClientKind(existing) {
     let selection;
     const scripts = CLIENT_KIND_OPTIONS.map((opt) => ({
         name: opt.label,
-        emoji: '💻',
+        emoji: opt.id == 'vite-react' ? '💻' : opt.id == 'expo-react-native' ? '📱' : '🌐',
         description: opt.summary,
         handler: () => {
             selection = opt.id;
         },
     }));
-    scripts.push({
-        name: `Use default (${defaultKind})`,
-        emoji: '✅',
-        description: 'Keep the prior/default choice',
-        handler: () => {
-            selection = defaultKind;
-        },
-    });
+    // scripts.push({
+    //   name: `Use default (${defaultKind})`,
+    //   emoji: '✅',
+    //   handler: () => {
+    //     selection = defaultKind
+    //   },
+    // })
     await runHelperCli({
         title: 'Select a client template',
         scripts,

package/dist/create-package/shared.js

@@ -2,6 +2,7 @@ import { readFileSync } from 'node:fs';
 import { access, mkdir, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { promptYesNoAll } from '../prompts.js';
+import { ModuleResolutionKind } from 'typescript';
 export const workspaceRoot = process.cwd();
 export function isWorkspaceRoot(dir) {
     return path.resolve(dir) === path.resolve(workspaceRoot);
@@ -347,6 +348,13 @@ export async function packageTsConfig(targetDir, options) {
         esModuleInterop: options?.esModuleInterop ?? true,
         allowSyntheticDefaultImports: options?.esModuleInterop ?? true,
         skipLibCheck: options?.skipLibCheck ?? true,
+        target: options?.target,
+        module: options?.module,
+        moduleResolution: options?.ModuleResolutionKind !== undefined
+            ? ModuleResolutionKind[options.ModuleResolutionKind]
+            : undefined,
+        delcaration: options?.declarationMap,
+        declarationMap: options?.declarationMap,
     });
     const config = stripUndefined({
         extends: extendsPath,

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

@@ -1,3 +1,4 @@
+import { ModuleResolutionKind } from 'typescript';
 import { BASE_LINT_DEV_DEPENDENCIES, basePackageFiles, basePackageJson, baseScripts, buildReadme, isWorkspaceRoot, packageTsConfig, writeFileIfMissing, } from '../../shared.js';
 const EXPO_CLIENT_SCRIPTS = [
     'dev',
@@ -480,6 +481,9 @@ export async function scaffoldExpoReactNativeClient(ctx) {
         include: ['App.tsx', 'src/**/*.ts', 'src/**/*.tsx'],
         jsx: 'react-native',
         types: ['react', 'react-native'],
+        target: 'ES2022',
+        module: 'ESNext',
+        ModuleResolutionKind: ModuleResolutionKind.Bundler,
         rootDir: '.',
     });
     const files = {

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

@@ -1,3 +1,4 @@
+import { ModuleResolutionKind } from 'typescript';
 import { BASE_LINT_DEV_DEPENDENCIES, basePackageFiles, basePackageJson, baseScripts, buildReadme, isWorkspaceRoot, packageTsConfig, writeFileIfMissing, } from '../../shared.js';
 const VITE_CLIENT_SCRIPTS = [
     'dev',
@@ -525,10 +526,15 @@ function indexHtml() {
 export async function scaffoldViteReactClient(ctx) {
     const includePrepare = isWorkspaceRoot(ctx.targetDir);
     const tsconfig = await packageTsConfig(ctx.targetDir, {
-        include: ['src/**/*', 'vite.config.ts'],
+        include: ['src/**/*.ts', 'src/**/*.tsx'],
         lib: ['ES2022', 'DOM'],
         types: ['vite/client'],
         jsx: 'react-jsx',
+        target: 'ES2022',
+        module: 'ESNext',
+        ModuleResolutionKind: ModuleResolutionKind.Bundler,
+        esModuleInterop: true,
+        skipLibCheck: true,
     });
     const files = {
         'package.json': vitePackageJson(ctx.pkgName, ctx.contractName, includePrepare),

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

@@ -1,3 +1,4 @@
+import { ModuleResolutionKind } from 'typescript';
 import { BASE_LINT_DEV_DEPENDENCIES, basePackageFiles, basePackageJson, buildReadme, baseScripts, packageTsConfig, isWorkspaceRoot, writeFileIfMissing, } from '../shared.js';
 const CONTRACT_SCRIPTS = [
     'dev',
@@ -16,19 +17,12 @@ const CONTRACT_SCRIPTS = [
  * in some module shapes (CJS export= or default export). To make scaffolds compile reliably,
  * we import as a namespace and then grab from either `default` or the namespace object.
  */
-export const CONTRACT_TS = `import * as rrroutesContract from '@emeryld/rrroutes-contract'
+export const CONTRACT_TS = `import { defineSocketEvents, finalize, resource } from '@emeryld/rrroutes-contract'
 import { z } from 'zod'
 
-const api = (rrroutesContract as any).default ?? rrroutesContract
-const { defineSocketEvents, finalize, resource } = api as {
-  defineSocketEvents: (...args: any[]) => any
-  finalize: (...args: any[]) => any
-  resource: (...args: any[]) => any
-}
-
 const routes = resource('/api')
   .sub(
-    resource('health')
+    resource('/health')
       .get({
         outputSchema: z.object({
           status: z.literal('ok'),
@@ -121,6 +115,10 @@ async function contractFiles(pkgName, targetDir) {
     const tsconfig = await packageTsConfig(targetDir, {
         include: ['src/**/*.ts', 'src/**/*.tsx'],
         skipLibCheck: true,
+        "target": "ES2022",
+        "module": "ESNext",
+        "declarationMap": true,
+        ModuleResolutionKind: ModuleResolutionKind.Bundler,
     });
     return {
         'package.json': contractPackageJson(pkgName, { includePrepare }),

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

@@ -309,8 +309,8 @@ function rootPnpmWorkspace(patterns) {
 }
 function rootTsconfigBase(baseName, names) {
     const paths = {
-        [names.contract]: [`packages/${baseName}-contract/src`],
-        [`${names.contract}/*`]: [`packages/${baseName}-contract/src/*`],
+        [names.contract]: [`packages/${baseName}-contract/dist`],
+        [`${names.contract}/*`]: [`packages/${baseName}-contract/dist/*`],
         [names.server]: [`packages/${baseName}-server/src`],
         [`${names.server}/*`]: [`packages/${baseName}-server/src/*`],
         [names.client]: [`packages/${baseName}-client/src`],

package/dist/helper-cli.js

@@ -1,11 +1,14 @@
 import { spawn } from 'node:child_process';
+import { existsSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import readline from 'node:readline/promises';
 import { stdin as input, stdout as output } from 'node:process';
 import { fileURLToPath } from 'node:url';
 import path from 'node:path';
 const __filename = fileURLToPath(import.meta.url);
-const rootDir = path.resolve(path.dirname(__filename), '..');
+const managerRoot = path.resolve(path.dirname(__filename), '..');
+// Workspace root is wherever the CLI is executed.
+const rootDir = process.cwd();
 const managerRequire = createRequire(import.meta.url);
 let tsNodeLoaderPath;
 function getTsNodeLoaderPath() {
@@ -237,6 +240,15 @@ function runEntry(entry, forwardedArgs) {
     }
     const scriptPath = entry.absoluteScript;
     const tsConfigPath = path.join(rootDir, 'tsconfig.base.json');
+    const tsConfigFallback = path.join(rootDir, 'tsconfig.json');
+    const bundledTsconfig = path.join(managerRoot, 'tsconfig.base.json');
+    const projectPath = existsSync(tsConfigPath)
+        ? tsConfigPath
+        : existsSync(tsConfigFallback)
+            ? tsConfigFallback
+            : existsSync(bundledTsconfig)
+                ? bundledTsconfig
+                : undefined;
     const extension = path.extname(scriptPath).toLowerCase();
     const isTypeScript = extension === '.js' || extension === '.mts' || extension === '.cts';
     const command = process.execPath;
@@ -253,7 +265,10 @@ function runEntry(entry, forwardedArgs) {
             cwd: rootDir,
             stdio: 'inherit',
             env: isTypeScript
-                ? { ...process.env, TS_NODE_PROJECT: tsConfigPath }
+                ? {
+                    ...process.env,
+                    ...(projectPath ? { TS_NODE_PROJECT: projectPath } : {}),
+                }
                 : process.env,
             shell: process.platform === 'win32' && isTypeScript,
         });

package/dist/utils/run.js

@@ -1,9 +1,9 @@
 // src/utils/run.js
 import { spawn } from 'node:child_process';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-const __filename = fileURLToPath(import.meta.url);
-export const rootDir = path.resolve(path.dirname(__filename), '..', '..');
+// Always execute commands from the workspace where the CLI is invoked.
+// This makes installs from node_modules behave correctly instead of
+// running in the package's own directory.
+export const rootDir = process.cwd();
 export function run(command, args, options = {}) {
     return new Promise((resolve, reject) => {
         const child = spawn(command, args, {

package/package.json

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