english-lang 0.2.5 → 0.2.6

package/README.md

@@ -91,31 +91,38 @@ export function HomeScreen({ navigation }: any) {
 ## Project structure
 
 ```
-my-app/
-  ├── package.json          ← devDependency: english-lang
-  ├── screens/              ← write your .eng files here
-  │   ├── HomeScreen.eng
-  │   └── ProductScreen.eng
-  └── rn/                   ← react native project (npx react-native init rn)
-      ├── src/              ← engc compiles .tsx here automatically
-      │   ├── HomeScreen.tsx
-      │   └── ProductScreen.tsx
-      ├── ios/
-      ├── android/
-      └── package.json
+MyApp/                         ← project root (.eng world)
+├── package.json               ← compile / watch scripts only
+├── screens/                   ← write your .eng files here
+│   ├── HomeScreen.eng
+│   └── DetailScreen.eng
+└── rn/                        ← entire React Native project
+    ├── App.tsx                ← auto-generated by engc (navigation wiring)
+    ├── src/                   ← auto-generated .tsx (engc output)
+    │   ├── HomeScreen.tsx
+    │   └── DetailScreen.tsx
+    ├── ios/
+    ├── android/
+    ├── node_modules/
+    ├── index.js
+    └── package.json
 ```
 
+**Rules:**
+- You only ever edit files in `screens/` — never touch `rn/src/` or `rn/App.tsx`
+- `rn/App.tsx` is regenerated automatically whenever you add, rename, or remove a `.eng` file
+- `rn/src/*.tsx` are regenerated automatically on every save
+
 **Quick start:**
 
 ```bash
-# One command sets everything up
-engc init my-app
-cd my-app
+# One command sets everything up: scaffolds RN, installs deps, starts Metro
+engc init MyApp
 
-# Watch .eng files and compile to rn/src/ on every save
-npm run watch
+# From inside MyApp/ — Metro + eng watcher in one command
+npm run dev
 
-# In a separate terminal, run the app
+# In a separate terminal — run on device / simulator
 cd rn && npx react-native run-ios
 ```
 

package/dist/cli/engc.js

@@ -50,32 +50,69 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const childProcess = __importStar(require("child_process"));
 const index_1 = require("../index");
-// ── Starter App.tsx ───────────────────────────────────────────
-const STARTER_APP_TSX = `\
-// App.tsx — wired up by engc init
-// All screens are generated from .eng source files in screens/
-
-import React from 'react';
-import { NavigationContainer } from '@react-navigation/native';
-import { createNativeStackNavigator } from '@react-navigation/native-stack';
-import { SafeAreaProvider } from 'react-native-safe-area-context';
-
-import { HomeScreen } from './src/HomeScreen';
-
-const Stack = createNativeStackNavigator();
-
-export default function App() {
-  return (
-    <SafeAreaProvider>
-      <NavigationContainer>
-        <Stack.Navigator initialRouteName="Home">
-          <Stack.Screen name="Home" component={HomeScreen} />
-        </Stack.Navigator>
-      </NavigationContainer>
-    </SafeAreaProvider>
-  );
+// ── App.tsx generator ────────────────────────────────────────
+//
+// Reads every .eng file in screens/, extracts the screen name from
+// the first `screen Foo:` declaration, then writes rn/App.tsx with
+// all screens wired into the navigator automatically.
+// Called on init and after every file change during `engc dev`.
+function screenNamesFromDir(screensDir) {
+    if (!fs.existsSync(screensDir))
+        return [];
+    const names = [];
+    for (const file of fs.readdirSync(screensDir)) {
+        if (!file.endsWith('.eng'))
+            continue;
+        try {
+            const src = fs.readFileSync(path.join(screensDir, file), 'utf8');
+            const m = src.match(/^\s*screen\s+(\w+)/m);
+            if (m)
+                names.push(m[1]);
+        }
+        catch { /* skip unreadable files */ }
+    }
+    return names;
+}
+function generateAppTsx(screensDir, rnDir) {
+    const names = screenNamesFromDir(screensDir);
+    if (names.length === 0)
+        return;
+    const initial = names.includes('HomeScreen') ? 'HomeScreen' : names[0];
+    const imports = names
+        .map(n => `import { ${n} } from './src/${n}';`)
+        .join('\n');
+    const stackScreens = names
+        .map(n => `          <Stack.Screen name="${n}" component={${n}} />`)
+        .join('\n');
+    const content = [
+        `// App.tsx — auto-generated by engc`,
+        `// Do not edit — add new screens by creating .eng files in screens/`,
+        ``,
+        `import React from 'react';`,
+        `import { NavigationContainer } from '@react-navigation/native';`,
+        `import { createNativeStackNavigator } from '@react-navigation/native-stack';`,
+        `import { SafeAreaProvider } from 'react-native-safe-area-context';`,
+        ``,
+        imports,
+        ``,
+        `const Stack = createNativeStackNavigator();`,
+        ``,
+        `export default function App() {`,
+        `  return (`,
+        `    <SafeAreaProvider>`,
+        `      <NavigationContainer>`,
+        `        <Stack.Navigator initialRouteName="${initial}">`,
+        stackScreens,
+        `        </Stack.Navigator>`,
+        `      </NavigationContainer>`,
+        `    </SafeAreaProvider>`,
+        `  );`,
+        `}`,
+        ``,
+    ].join('\n');
+    fs.writeFileSync(path.join(rnDir, 'App.tsx'), content, 'utf8');
+    console.log(`[engc] rn/App.tsx  →  ${names.length} screen${names.length === 1 ? '' : 's'} registered`);
 }
-`;
 // ── Starter .eng file ─────────────────────────────────────────
 const STARTER_ENG = `\
 screen HomeScreen:
@@ -122,8 +159,9 @@ function devProject(projectDir = process.cwd()) {
     metro.on('error', (err) => {
         console.error('[engc] Metro error:', err.message);
     });
-    // Watch .eng files
+    // Initial compile + App.tsx generation
     compileDir(screensDir, rnSrcDir);
+    generateAppTsx(screensDir, rnDir);
     console.log(`[engc] Watching screens/ ...\n`);
     fs.watch(screensDir, { recursive: false }, (event, filename) => {
         if (!filename || !filename.endsWith('.eng'))
@@ -132,6 +170,7 @@ function devProject(projectDir = process.cwd()) {
         if (!fs.existsSync(filePath))
             return;
         compileFile(filePath, rnSrcDir);
+        generateAppTsx(screensDir, rnDir); // re-register screens on every change
     });
     // Keep alive — exit both on Ctrl+C
     process.on('SIGINT', () => {
@@ -183,9 +222,8 @@ function initProject(name) {
     const rnDir = path.join(projectDir, 'rn');
     console.log('\n[engc] Installing React Navigation ...');
     childProcess.execSync('npm install @react-navigation/native @react-navigation/native-stack react-native-screens react-native-safe-area-context', { cwd: rnDir, stdio: 'inherit' });
-    // Patch App.tsx to import the compiled HomeScreen
-    fs.writeFileSync(path.join(rnDir, 'App.tsx'), STARTER_APP_TSX, 'utf8');
-    console.log('[engc] Patched rn/App.tsx');
+    // Compile starter screens, then generate App.tsx from them
+    fs.mkdirSync(rnSrcDir, { recursive: true });
     // Pod install for iOS
     const iosDir = path.join(rnDir, 'ios');
     if (fs.existsSync(iosDir)) {
@@ -200,10 +238,9 @@ function initProject(name) {
             console.warn('[engc] Pod install failed — run it manually: cd rn/ios && pod install');
         }
     }
-    // Compile starter screens into rn/src/
-    fs.mkdirSync(rnSrcDir, { recursive: true });
     console.log('\n[engc] Compiling starter screens ...');
     compileDir(screensDir, rnSrcDir);
+    generateAppTsx(screensDir, rnDir);
     console.log('\n[engc] All done! Starting Metro + eng watcher ...\n');
     // Auto-start dev mode immediately
     devProject(projectDir);
@@ -239,8 +276,10 @@ function compileDir(srcDir, outDir) {
         compileFile(path.join(srcDir, file), outDir);
     }
 }
-function watchDir(srcDir, outDir) {
+function watchDir(srcDir, outDir, rnDir = null) {
     compileDir(srcDir, outDir);
+    if (rnDir)
+        generateAppTsx(srcDir, rnDir);
     console.log(`[engc] Watching ${srcDir} ...`);
     fs.watch(srcDir, { recursive: false }, (event, filename) => {
         if (!filename || !filename.endsWith('.eng'))
@@ -249,6 +288,8 @@ function watchDir(srcDir, outDir) {
         if (!fs.existsSync(filePath))
             return;
         compileFile(filePath, outDir);
+        if (rnDir)
+            generateAppTsx(srcDir, rnDir);
     });
 }
 // ── CLI entry point ───────────────────────────────────────────
@@ -304,11 +345,17 @@ Examples:
             console.error(`[engc] Directory not found: ${srcDir}`);
             process.exit(1);
         }
+        // If outDir is rn/src/, its parent (rn/) is the RN project — regenerate App.tsx
+        const maybeRnDir = outDir ? path.dirname(outDir) : null;
+        const shouldGenApp = maybeRnDir != null
+            && fs.existsSync(path.join(maybeRnDir, 'package.json'));
         if (cmd === 'compile') {
             compileDir(srcDir, outDir);
+            if (shouldGenApp)
+                generateAppTsx(srcDir, maybeRnDir);
         }
         else {
-            watchDir(srcDir, outDir);
+            watchDir(srcDir, outDir, shouldGenApp ? maybeRnDir : null);
         }
         return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "english-lang",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "The English (.eng) programming language compiler",
   "main": "./dist/index.js",
   "bin": {