@rs-x/cli 2.0.0-next.21 → 2.0.0-next.22

package/bin/rsx.cjs

@@ -3142,11 +3142,14 @@ function rsxBootstrapFilePath(entryFile) {
 }
 
 function ensureRsxBootstrapFile(bootstrapFile, dryRun) {
-  const content = `import { InjectionContainer } from '@rs-x/core';\nimport { RsXExpressionParserModule } from '@rs-x/expression-parser';\n\n// Generated by rsx init\nexport async function initRsx(): Promise<void> {\n  await InjectionContainer.load(RsXExpressionParserModule);\n}\n`;
+  const content = `import { InjectionContainer } from '@rs-x/core';\nimport { RsXExpressionParserModule } from '@rs-x/expression-parser';\n\n// Generated by rsx init — top-level await ensures DI is ready before any expression module evaluates\nawait InjectionContainer.load(RsXExpressionParserModule);\n`;
 
   if (fs.existsSync(bootstrapFile)) {
     const existing = fs.readFileSync(bootstrapFile, 'utf8');
-    if (existing.includes('export async function initRsx')) {
+    if (
+      existing.includes('await InjectionContainer.load') ||
+      existing.includes('export async function initRsx')
+    ) {
       logInfo(`Bootstrap module already exists: ${bootstrapFile}`);
       return;
     }
@@ -3209,16 +3212,14 @@ function indentBlock(text, spaces) {
 }
 
 function wrapReactEntry(source) {
+  // top-level await in rsx-bootstrap.ts ensures DI is loaded before any
+  // expression module evaluates — no async wrapper needed here
   const reactStartPattern =
     /(ReactDOM\s*\.\s*)?createRoot\([\s\S]*?\)\s*\.\s*render\([\s\S]*?\);/mu;
-  const match = source.match(reactStartPattern);
-  if (!match) {
+  if (!source.match(reactStartPattern)) {
     return null;
   }
-
-  const renderCall = match[0].trim();
-  const replacement = `const __rsxStart = async () => {\n  await initRsx();\n${indentBlock(renderCall, 2)}\n};\n\nvoid __rsxStart();`;
-  return source.replace(reactStartPattern, replacement);
+  return source;
 }
 
 function wrapAngularEntry(source) {
@@ -3243,16 +3244,14 @@ function wrapAngularEntry(source) {
 }
 
 function wrapVueEntry(source) {
+  // top-level await in rsx-bootstrap.ts ensures DI is loaded before any
+  // expression module evaluates — no async wrapper needed here
   const vueStartPattern =
     /createApp\([\s\S]*?\)\s*\.\s*mount\([\s\S]*?\)\s*;/mu;
-  const match = source.match(vueStartPattern);
-  if (!match) {
+  if (!source.match(vueStartPattern)) {
     return null;
   }
-
-  const mountCall = match[0].trim();
-  const replacement = `const __rsxBootstrap = async () => {\n  await initRsx();\n${indentBlock(mountCall, 2)}\n};\n\nvoid __rsxBootstrap();`;
-  return source.replace(vueStartPattern, replacement);
+  return source;
 }
 
 function wrapGenericEntry(source) {
@@ -3448,13 +3447,19 @@ function patchNextEntryFile(entryFile, gateFile, dryRun) {
 
 function patchEntryFileForRsx(entryFile, bootstrapFile, context, dryRun) {
   const original = fs.readFileSync(entryFile, 'utf8');
-  if (original.includes('initRsx') && original.includes('rsx-bootstrap')) {
+  if (original.includes('rsx-bootstrap')) {
     logInfo(`Entry already wired for RS-X bootstrap: ${entryFile}`);
     return true;
   }
 
   const importPath = toModuleImportPath(entryFile, bootstrapFile);
-  const importStatement = `import { initRsx } from '${importPath}';`;
+  // For React/Vue: side-effect import only — top-level await in bootstrap
+  // ensures DI is ready before any expression module evaluates.
+  // For Angular/generic: named import used by the async wrapper.
+  const importStatement =
+    context === 'react' || context === 'vuejs'
+      ? `import '${importPath}';`
+      : `import { initRsx } from '${importPath}';`;
 
   let updated = injectImport(original, importStatement);
 
@@ -3559,8 +3564,7 @@ function runInit(flags) {
 
     if (!patched) {
       logInfo('Manual fallback snippet:');
-      console.log("  import { initRsx } from './rsx-bootstrap';");
-      console.log('  await initRsx(); // before first rsx(...)');
+      console.log("  import './rsx-bootstrap'; // must be the first import in your entry file");
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rs-x/cli",
-  "version": "2.0.0-next.21",
+  "version": "2.0.0-next.22",
   "description": "CLI for installing RS-X compiler tooling and VS Code integration",
   "bin": {
     "rsx": "./bin/rsx.cjs"