@teardown/navigation-metro 2.0.73 → 2.0.75

package/dist/generator/route-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-generator.d.ts","sourceRoot":"","sources":["../../src/generator/route-generator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAiB,KAAK,eAAe,EAAE,KAAK,SAAS,EAAuB,MAAM,yBAAyB,CAAC;AAEnH,MAAM,WAAW,eAAe;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,EAAE,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,CAiCpE;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,eAAe,EAAE,CAwBhF;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAgDrE;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAkC1F;AAED;;GAEG;AACH,wBAAgB,2BAA2B,IAAI,MAAM,CAepD;AA4ED,MAAM,WAAW,cAAc;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAED;;GAEG;AAEH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,cAAc,EAAE,CAqDpH;AA+JD;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CA4EjH"}
+{"version":3,"file":"route-generator.d.ts","sourceRoot":"","sources":["../../src/generator/route-generator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAiB,KAAK,eAAe,EAAE,KAAK,SAAS,EAAuB,MAAM,yBAAyB,CAAC;AAEnH,MAAM,WAAW,eAAe;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,EAAE,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,CAiCpE;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,eAAe,EAAE,CAwBhF;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAgDrE;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAkC1F;AAED;;GAEG;AACH,wBAAgB,2BAA2B,IAAI,MAAM,CAepD;AA4ED,MAAM,WAAW,cAAc;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAED;;GAEG;AAEH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,cAAc,EAAE,CAqDpH;AAgLD;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CA4EjH"}

package/dist/generator/route-generator.js

@@ -292,10 +292,8 @@ function buildNavigatorHierarchy(routes, routesDir, generatedDir) {
             screens: [],
             nestedNavigators: [],
         };
-        // Process children
-        for (const node of nodes) {
-            if (node.isLayout)
-                continue;
+        // Helper to process a single screen node
+        function processScreenNode(node) {
             const importName = pathToImportName(node.relativePath);
             const importPath = getImportPath(routesDir, generatedDir, node.relativePath);
             allImports.push({ name: importName, path: importPath });
@@ -326,6 +324,24 @@ function buildNavigatorHierarchy(routes, routesDir, generatedDir) {
                 });
             }
         }
+        // Process children
+        for (const node of nodes) {
+            if (node.isLayout) {
+                // Process layout's children as screens in this navigator
+                for (const child of node.children) {
+                    if (child.isLayout) {
+                        // Nested layout - recurse
+                        const nestedNav = processNode([child], child.name);
+                        navigatorInfo.nestedNavigators.push(nestedNav);
+                    }
+                    else {
+                        processScreenNode(child);
+                    }
+                }
+                continue;
+            }
+            processScreenNode(node);
+        }
         return navigatorInfo;
     }
     function collectScreens(nodes, rDir, gDir, imports) {

package/dist/index.d.ts

@@ -8,7 +8,8 @@
 export interface TeardownNavigationOptions {
     /**
      * Path to routes directory relative to project root
-     * @default './src/routes'
+     * If not provided, reads from teardown.config.ts navigation.routesDir
+     * @default './src/_routes'
      */
     routesDir?: string;
     /**
@@ -63,13 +64,17 @@ export interface MetroConfig {
  * @example
  * ```js
  * // metro.config.js
- * const { getDefaultConfig } = require('expo/metro-config');
+ * const { getDefaultConfig } = require('@react-native/metro-config');
  * const { withTeardownNavigation } = require('@teardown/navigation-metro');
  *
  * const config = getDefaultConfig(__dirname);
  *
+ * // Options are read from teardown.config.ts navigation section by default
+ * module.exports = withTeardownNavigation(config);
+ *
+ * // Or override with explicit options:
  * module.exports = withTeardownNavigation(config, {
- *   routesDir: './src/routes',
+ *   routesDir: './src/_routes',
  *   generatedDir: './.teardown',
  *   prefixes: ['myapp://', 'https://myapp.com'],
  *   verbose: true,

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAmCH;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACzC;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE;QACV,cAAc,CAAC,EAAE,CAChB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,KACnB;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,GAAG,IAAI,CAAC;QAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACvB,CAAC;IACF,WAAW,CAAC,EAAE;QACb,4BAA4B,CAAC,EAAE,OAAO,CAAC;QACvC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACvB,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,GAAE,yBAA8B,GAAG,WAAW,CAsEhH;AAED,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEpF,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAChG,OAAO,EACN,YAAY,EACZ,aAAa,EACb,oBAAoB,EACpB,aAAa,EACb,mBAAmB,GACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACN,qBAAqB,EACrB,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,EACtB,eAAe,EACf,WAAW,EACX,iBAAiB,GACjB,MAAM,6BAA6B,CAAC;AACrC,YAAY,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,YAAY,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA0EH;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACzC;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE;QACV,cAAc,CAAC,EAAE,CAChB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,KACnB;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,GAAG,IAAI,CAAC;QAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACvB,CAAC;IACF,WAAW,CAAC,EAAE;QACb,4BAA4B,CAAC,EAAE,OAAO,CAAC;QACvC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACvB,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,GAAE,yBAA8B,GAAG,WAAW,CA8EhH;AAED,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEpF,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAChG,OAAO,EACN,YAAY,EACZ,aAAa,EACb,oBAAoB,EACpB,aAAa,EACb,mBAAmB,GACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACN,qBAAqB,EACrB,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,EACtB,eAAe,EACf,WAAW,EACX,iBAAiB,GACjB,MAAM,6BAA6B,CAAC;AACrC,YAAY,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,YAAY,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC"}

package/dist/index.js

@@ -15,20 +15,35 @@ const file_watcher_1 = require("./watcher/file-watcher");
  */
 const CONFIG_FILE_NAMES = ["teardown.config.ts", "teardown.config.js", "teardown.config.mjs", "launchpad.config.ts"];
 /**
- * Read the slug from the Teardown config file
- * This is a simple synchronous parser that extracts the slug value
+ * Read the navigation config from the Teardown config file
+ * This is a simple synchronous parser that extracts values using regex
  */
-function readSlugFromConfig(projectRoot) {
+function readTeardownConfig(projectRoot) {
     for (const fileName of CONFIG_FILE_NAMES) {
         const configPath = (0, node_path_1.resolve)(projectRoot, fileName);
         if ((0, node_fs_1.existsSync)(configPath)) {
             try {
                 const content = (0, node_fs_1.readFileSync)(configPath, "utf-8");
+                const config = {};
                 // Extract slug using regex - handles both single and double quotes
                 const slugMatch = content.match(/slug:\s*['"]([^'"]+)['"]/);
                 if (slugMatch) {
-                    return slugMatch[1];
+                    config.slug = slugMatch[1];
+                }
+                // Extract navigation config values
+                const routesDirMatch = content.match(/routesDir:\s*['"]([^'"]+)['"]/);
+                if (routesDirMatch) {
+                    config.routesDir = routesDirMatch[1];
+                }
+                const generatedDirMatch = content.match(/generatedDir:\s*['"]([^'"]+)['"]/);
+                if (generatedDirMatch) {
+                    config.generatedDir = generatedDirMatch[1];
                 }
+                const autoTemplateMatch = content.match(/autoTemplate:\s*(true|false)/);
+                if (autoTemplateMatch) {
+                    config.autoTemplate = autoTemplateMatch[1] === "true";
+                }
+                return config;
             }
             catch {
                 // Ignore read errors and try next config file
@@ -37,6 +52,13 @@ function readSlugFromConfig(projectRoot) {
     }
     return null;
 }
+/**
+ * Read the slug from the Teardown config file (legacy helper)
+ */
+function readSlugFromConfig(projectRoot) {
+    const config = readTeardownConfig(projectRoot);
+    return config?.slug ?? null;
+}
 /**
  * Wraps a Metro configuration with Teardown Navigation support
  *
@@ -48,13 +70,17 @@ function readSlugFromConfig(projectRoot) {
  * @example
  * ```js
  * // metro.config.js
- * const { getDefaultConfig } = require('expo/metro-config');
+ * const { getDefaultConfig } = require('@react-native/metro-config');
  * const { withTeardownNavigation } = require('@teardown/navigation-metro');
  *
  * const config = getDefaultConfig(__dirname);
  *
+ * // Options are read from teardown.config.ts navigation section by default
+ * module.exports = withTeardownNavigation(config);
+ *
+ * // Or override with explicit options:
  * module.exports = withTeardownNavigation(config, {
- *   routesDir: './src/routes',
+ *   routesDir: './src/_routes',
  *   generatedDir: './.teardown',
  *   prefixes: ['myapp://', 'https://myapp.com'],
  *   verbose: true,
@@ -62,8 +88,14 @@ function readSlugFromConfig(projectRoot) {
  * ```
  */
 function withTeardownNavigation(config, options = {}) {
-    const { routesDir = "./src/routes", generatedDir = "./.teardown", verbose = false, autoTemplate = true } = options;
     const projectRoot = config.projectRoot ?? process.cwd();
+    // Read from teardown.config.ts if options not provided
+    const teardownConfig = readTeardownConfig(projectRoot);
+    // Use options if provided, fallback to teardown.config.ts, then defaults
+    const routesDir = options.routesDir ?? teardownConfig?.routesDir ?? "./src/_routes";
+    const generatedDir = options.generatedDir ?? teardownConfig?.generatedDir ?? "./.teardown";
+    const autoTemplate = options.autoTemplate ?? teardownConfig?.autoTemplate ?? true;
+    const verbose = options.verbose ?? false;
     const absoluteRoutesDir = (0, node_path_1.resolve)(projectRoot, routesDir);
     const absoluteGeneratedDir = (0, node_path_1.resolve)(projectRoot, generatedDir);
     // If no prefixes provided, try to read slug from teardown config

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@teardown/navigation-metro",
-	"version": "2.0.73",
+	"version": "2.0.75",
 	"description": "Metro plugin for @teardown/navigation type generation",
 	"private": false,
 	"publishConfig": {
@@ -42,7 +42,7 @@
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.3.11",
-		"@teardown/tsconfig": "2.0.73",
+		"@teardown/tsconfig": "2.0.75",
 		"@types/node": "24.10.1",
 		"typescript": "5.9.3"
 	}