mapples 0.2.0-beta.1 → 0.2.0-beta.4

package/dist/merge/toEdits.js.map

@@ -1 +1 @@
-{"version":3,"file":"toEdits.js","sourceRoot":"","sources":["../../src/merge/toEdits.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"toEdits.js","sourceRoot":"","sources":["../../src/merge/toEdits.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,yBAAyB;AACzB,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/nav/navigatorTree.d.ts

@@ -0,0 +1,78 @@
+import type { NavigationDocument, PageEntity } from '../api/objects.js';
+import type { PagesMap } from '../project/pagesMap.js';
+import type { JpatchOp } from '../types.js';
+import type { SyncReport } from '../ui/report.js';
+import { type RoutePlan } from './placement.js';
+export interface NavRouteNode {
+    id: string;
+    name: string;
+    target: {
+        kind: 'page';
+        pageUuid: string;
+    } | {
+        kind: 'navigator';
+        navigatorId: string;
+    };
+    options?: Record<string, unknown>;
+    presentation?: string;
+    path?: string;
+    [k: string]: unknown;
+}
+export interface NavigatorNode {
+    id: string;
+    type: 'stack' | 'tabs' | 'drawer';
+    name: string;
+    initialRouteId?: string;
+    routes: NavRouteNode[];
+    options?: Record<string, unknown>;
+    [k: string]: unknown;
+}
+export interface NavigatorDoc {
+    version: number;
+    rootNavigatorId: string;
+    navigators: Record<string, NavigatorNode>;
+}
+/** Accepts the canonical doc, or the backend's {id: 'nav_default', data: doc} wrapper. */
+export declare function extractNavigatorDoc(raw: unknown): NavigatorDoc | null;
+export declare function slugSegment(name: string): string;
+export declare function humanizeSegment(segment: string): string;
+interface PlannedLayout {
+    file: string;
+    content: string;
+}
+export interface NavPlan extends RoutePlan {
+    layouts: PlannedLayout[];
+    /** Navigator id by directory (relative to routesDir, '' = root) — adoption places files by it. */
+    navigatorByDir: Map<string, string>;
+    /** Navigators no route reaches from the root, by the `(group)` dir they were generated into. */
+    detachedByDir: Map<string, string>;
+}
+/**
+ * Plan the route tree for `doc`: every page route's file, every layout, and
+ * which navigator owns which directory. `segmentOverrides` (routeId -> file
+ * segment) lets the layout pass after local renames honour the files as the
+ * user left them.
+ */
+export declare function buildNavPlan(doc: NavigatorDoc, pages: Map<string, PageEntity>, notes: string[], segmentOverrides?: Map<string, string>): NavPlan;
+/** Every layout the CLI writes opens with this; it is how a CLI-owned file is told from a user's. */
+export declare const GENERATED_LAYOUT_HEADER: RegExp;
+/**
+ * Write a CLI-owned layout. A file already there that the CLI did not
+ * generate is the user's: it is deprecated (`_depr_<ts>_…`), never
+ * overwritten (P0); one the CLI generated is simply replaced.
+ */
+export declare function writeOwnedLayout(root: string, routesDir: string, file: string, content: string, report: SyncReport): void;
+export interface NavigatorSyncResult {
+    pushOps: JpatchOp[];
+    mergedNavigation: NavigationDocument | null;
+}
+/**
+ * Place every page file for the navigation document (routed pages under
+ * routesDir, the rest under pagesDir), regenerate the CLI-owned layouts, and
+ * push local file renames back as route renames. Runs BEFORE the page merge
+ * so the merge reads and writes each page at its final location.
+ */
+export declare function syncNavigatorTree(root: string, routesDir: string, pagesDir: string, pages: Map<string, PageEntity>, pagesMap: PagesMap, baseRaw: NavigationDocument | null, remoteRaw: NavigationDocument | null, report: SyncReport): NavigatorSyncResult;
+/** Put the merged doc back into whatever wrapper shape the server used. */
+export declare function rewrapDoc(raw: NavigationDocument | null, doc: NavigatorDoc): NavigationDocument;
+export {};

package/dist/nav/navigatorTree.js

@@ -0,0 +1,410 @@
+// Creator NavigationDocument (navigators) <-> expo-router route tree.
+//
+// Schema: @mapples/types navigation.ts — {version, rootNavigatorId, navigators:
+// {id -> {type: stack|tabs|drawer, name, initialRouteId?, routes: [{id, name,
+// target: page|navigator, options?, presentation?, path?}], options?}}}.
+// The dev backend wraps it as {id: 'nav_default', data: <doc>, routes: []}.
+//
+// Codegen contract:
+//   _layout.tsx files are CLI-OWNED — regenerated every sync. A layout the
+//   user wrote at a position the CLI owns is deprecated (`_depr_<ts>_…`),
+//   never overwritten; a generated layout nothing plans any more is removed.
+//   Page files ARE the route files (`<segment>.tsx`, RFC-0002 §5): their
+//   content is merged by the page pipeline; their LOCATION follows the
+//   navigation document (nav/placement.ts). Renaming a page file locally
+//   renames the route in Creator (pushed as a NavigationDocument merge patch
+//   replacing that navigator's routes array — arrays replace wholesale,
+//   RFC 7386), and a Creator rename moves the file, content preserved.
+//   Option names are translated (nav/screenOptions.ts): the document carries
+//   Creator names (`tabLabel`, `header.visible`), the layouts need
+//   react-navigation ones (`tabBarLabel`, `headerShown`).
+//
+// Placement rule: the ROOT navigator materializes at routesDir itself —
+// `app/_layout.tsx` for apps born from `mapples create` (routesDir "app"),
+// `app/(mapples)/_layout.tsx` for linked existing apps (routesDir
+// "app/(mapples)"). Initial routes become `index.tsx` (pages) or a `(group)`
+// directory (nested navigators) so they answer at the parent's own path.
+// A navigator no route reaches from the root (Creator: "Not connected") is
+// still generated — as a hidden `(<slug>)` route group under routesDir, kept
+// out of the tab bar / drawer — so its pages stay reachable by path (a segue
+// may target them). Its pages never use `index`: each answers at its own
+// slug, so pages.json records a real path for them.
+import { existsSync, mkdirSync, readFileSync, readdirSync, unlinkSync, writeFileSync, } from 'node:fs';
+import { dirname, join, relative } from 'node:path';
+import { printValue } from '@mapples/sid-ast';
+import { withRouteMarker } from '../codegen/emit.js';
+import { deprecateFile } from '../merge/deprecate.js';
+import { deepEqual } from '../merge/mergePatch.js';
+import { makePlan, placePages, pruneEmptyDirs, publicPath, } from './placement.js';
+import { hiddenScreenOptions, mapNavigatorOptions, mapScreenOptions } from './screenOptions.js';
+/** Accepts the canonical doc, or the backend's {id: 'nav_default', data: doc} wrapper. */
+export function extractNavigatorDoc(raw) {
+    if (typeof raw !== 'object' || raw === null)
+        return null;
+    const outer = raw;
+    const candidate = (typeof outer.data === 'object' && outer.data !== null ? outer.data : raw);
+    if (typeof candidate.rootNavigatorId !== 'string' || typeof candidate.navigators !== 'object') {
+        return null;
+    }
+    return candidate;
+}
+// ---- planning ----
+export function slugSegment(name) {
+    const slug = name
+        .trim()
+        .replace(/([a-z0-9])([A-Z])/g, '$1-$2')
+        .replace(/[^A-Za-z0-9]+/g, '-')
+        .replace(/^-+|-+$/g, '')
+        .toLowerCase();
+    return slug || 'route';
+}
+export function humanizeSegment(segment) {
+    const bare = segment.replace(/^\(|\)$/g, '');
+    return bare
+        .split('-')
+        .map((part, i) => (i === 0 ? part.charAt(0).toUpperCase() + part.slice(1) : part))
+        .join(' ');
+}
+/** Route targets name pages by Creator uuid; pages without one are matched by tree id. */
+function pageKeyIndex(pages) {
+    const index = new Map();
+    for (const [pageId, page] of pages) {
+        index.set(page.uuid ?? pageId, pageId);
+        index.set(pageId, pageId);
+    }
+    return index;
+}
+function uniqueSegment(segment, used) {
+    let unique = segment;
+    let n = 2;
+    while (used.has(unique))
+        unique = `${segment}-${n++}`;
+    used.add(unique);
+    return unique;
+}
+/**
+ * Plan the route tree for `doc`: every page route's file, every layout, and
+ * which navigator owns which directory. `segmentOverrides` (routeId -> file
+ * segment) lets the layout pass after local renames honour the files as the
+ * user left them.
+ */
+export function buildNavPlan(doc, pages, notes, segmentOverrides = new Map()) {
+    const pageByKey = pageKeyIndex(pages);
+    const routes = [];
+    const layouts = [];
+    const navigatorByDir = new Map();
+    const detachedByDir = new Map();
+    const seen = new Set();
+    const segmentFor = (route, isInitial) => {
+        const override = segmentOverrides.get(route.id);
+        if (override)
+            return override;
+        if (route.path)
+            return route.path.replace(/^\/+/, '').replace(/\/+$/, '') || 'index';
+        if (route.target.kind === 'page')
+            return isInitial ? 'index' : slugSegment(route.name);
+        return isInitial ? `(${slugSegment(route.name)})` : slugSegment(route.name);
+    };
+    /**
+     * Plan one navigator at `dir`; child navigators emit their own layouts, the
+     * caller emits this one (the root's screen list grows with detached groups
+     * first). `detached` subtrees never use `index`/`(group)` positions.
+     */
+    const walk = (navigatorId, dir, detached, used) => {
+        if (seen.has(navigatorId)) {
+            notes.push(`navigation: navigator ${navigatorId} is referenced twice — second reference skipped`);
+            return null;
+        }
+        seen.add(navigatorId);
+        const nav = doc.navigators[navigatorId];
+        if (!nav) {
+            notes.push(`navigation: navigator ${navigatorId} is referenced but not defined — skipped`);
+            return null;
+        }
+        navigatorByDir.set(dir, navigatorId);
+        const initialId = nav.initialRouteId ?? nav.routes[0]?.id;
+        const screens = [];
+        for (const route of nav.routes) {
+            const isInitial = !detached && route.id === initialId;
+            const segment = uniqueSegment(segmentFor(route, isInitial), used);
+            const where = `route “${route.name}” of navigator “${nav.name}”`;
+            const options = mapScreenOptions(route, nav.type, where, notes);
+            if (route.target.kind === 'page') {
+                const pageId = pageByKey.get(route.target.pageUuid);
+                if (!pageId) {
+                    notes.push(`navigation: route “${route.name}” targets page ${route.target.pageUuid} which has no synced page — screen skipped`);
+                    continue;
+                }
+                routes.push({
+                    routeId: route.id,
+                    pageId,
+                    navigatorId: nav.id,
+                    dir,
+                    segment,
+                    file: dir ? join(dir, `${segment}.tsx`) : `${segment}.tsx`,
+                    routeName: route.name,
+                    routePath: publicPath(dir, segment),
+                });
+                screens.push({ segment, options });
+            }
+            else {
+                screens.push({ segment, options });
+                const childDir = dir ? join(dir, segment) : segment;
+                const child = walk(route.target.navigatorId, childDir, detached, new Set());
+                if (child)
+                    layouts.push(layoutFor(child.nav, childDir, child.screens, notes));
+            }
+        }
+        return { nav, screens };
+    };
+    const rootUsed = new Set();
+    const root = walk(doc.rootNavigatorId, '', false, rootUsed);
+    if (!root)
+        return { ...makePlan(routes), layouts, navigatorByDir, detachedByDir };
+    // ---- detached navigators: hidden (group)s under the root directory ----
+    const referenced = new Set([doc.rootNavigatorId]);
+    for (const nav of Object.values(doc.navigators)) {
+        for (const route of nav.routes) {
+            if (route.target.kind === 'navigator')
+                referenced.add(route.target.navigatorId);
+        }
+    }
+    const attach = (navigatorId) => {
+        const nav = doc.navigators[navigatorId];
+        const segment = uniqueSegment(`(${slugSegment(nav.name)})`, rootUsed);
+        const group = walk(navigatorId, segment, true, new Set());
+        if (!group)
+            return;
+        detachedByDir.set(segment, navigatorId);
+        layouts.push(layoutFor(group.nav, segment, group.screens, notes));
+        root.screens.push({ segment, options: hiddenScreenOptions(root.nav.type) });
+    };
+    // Unreferenced navigators first (deterministic: document order), then whatever
+    // only a cycle among detached navigators reaches.
+    for (const id of Object.keys(doc.navigators)) {
+        if (!seen.has(id) && !referenced.has(id))
+            attach(id);
+    }
+    for (const id of Object.keys(doc.navigators)) {
+        if (!seen.has(id))
+            attach(id);
+    }
+    layouts.push(layoutFor(root.nav, '', root.screens, notes));
+    return { ...makePlan(routes), layouts, navigatorByDir, detachedByDir };
+}
+function layoutFor(nav, dir, screens, notes) {
+    return {
+        file: dir ? join(dir, '_layout.tsx') : '_layout.tsx',
+        content: layoutContent(nav, screens, notes),
+    };
+}
+// ---- emission ----
+const NAVIGATOR_IMPORT = {
+    stack: { name: 'Stack', module: 'expo-router' },
+    tabs: { name: 'Tabs', module: 'expo-router' },
+    drawer: { name: 'Drawer', module: 'expo-router/drawer' },
+};
+/** Every layout the CLI writes opens with this; it is how a CLI-owned file is told from a user's. */
+export const GENERATED_LAYOUT_HEADER = /^\/\/\s*GENERATED by Mapples/;
+/** Options literal; a string `tabBarIcon`/`drawerIcon` becomes an Icon renderer. */
+function optionsLiteral(options, usesIcon) {
+    const iconKeys = ['tabBarIcon', 'drawerIcon'];
+    const plain = {};
+    const iconParts = [];
+    for (const [key, value] of Object.entries(options)) {
+        if (iconKeys.includes(key) && typeof value === 'string') {
+            usesIcon.value = true;
+            iconParts.push(`${key}: ({ color }) => <Icon iconName=${JSON.stringify(value)} color={color} />`);
+        }
+        else {
+            plain[key] = value;
+        }
+    }
+    const base = printValue(plain);
+    if (iconParts.length === 0)
+        return base;
+    const inner = base === '{}' ? '' : base.slice(1, -1).trim().replace(/,\s*$/, '') + ', ';
+    return `{ ${inner}${iconParts.join(', ')} }`;
+}
+function layoutContent(nav, screens, notes) {
+    const kind = NAVIGATOR_IMPORT[nav.type] ?? NAVIGATOR_IMPORT.stack;
+    const usesIcon = { value: false };
+    const screenLines = screens.map(({ segment, options }) => {
+        if (Object.keys(options).length === 0) {
+            return `      <${kind.name}.Screen name=${JSON.stringify(segment)} />`;
+        }
+        return `      <${kind.name}.Screen name=${JSON.stringify(segment)} options={${optionsLiteral(options, usesIcon)}} />`;
+    });
+    const navOptions = mapNavigatorOptions(nav.options, nav.type, `navigator “${nav.name}”`, notes);
+    const screenOptions = Object.keys(navOptions).length > 0
+        ? ` screenOptions={${optionsLiteral(navOptions, usesIcon)}}`
+        : '';
+    const componentName = `${nav.name.replace(/[^A-Za-z0-9]/g, '') || 'Mapples'}Layout`;
+    return [
+        '// GENERATED by Mapples — DO NOT EDIT. This layout is owned by the CLI and',
+        `// regenerated from the navigation document (navigator “${nav.name}”, ${nav.type})`,
+        '// on every `mapples sync`. Edit navigation in Creator instead.',
+        `import { ${kind.name} } from '${kind.module}';`,
+        ...(usesIcon.value ? ["import { Icon } from '@mapples/ui';"] : []),
+        '',
+        `export default function ${componentName}() {`,
+        '  return (',
+        `    <${kind.name}${screenOptions}>`,
+        ...screenLines,
+        `    </${kind.name}>`,
+        '  );',
+        '}',
+        '',
+    ].join('\n');
+}
+// ---- layout files ----
+/**
+ * Write a CLI-owned layout. A file already there that the CLI did not
+ * generate is the user's: it is deprecated (`_depr_<ts>_…`), never
+ * overwritten (P0); one the CLI generated is simply replaced.
+ */
+export function writeOwnedLayout(root, routesDir, file, content, report) {
+    const rel = join(routesDir, file);
+    const abs = join(root, rel);
+    if (existsSync(abs)) {
+        const current = readFileSync(abs, 'utf8');
+        if (current === content)
+            return;
+        if (!GENERATED_LAYOUT_HEADER.test(current)) {
+            const deprecated = relative(root, deprecateFile(abs));
+            report.files.push({
+                file: rel,
+                action: 'deprecated',
+                detail: `layouts under ${routesDir} are generated from the navigation — yours is kept at ${deprecated}`,
+            });
+        }
+    }
+    mkdirSync(dirname(abs), { recursive: true });
+    writeFileSync(abs, content);
+    report.files.push({ file: rel, action: 'updated', detail: 'CLI-owned layout' });
+}
+/** Remove generated layouts the plan no longer has (a navigator moved or went away). Never a user file. */
+function pruneStaleLayouts(root, routesDir, planned, report) {
+    const routesAbs = join(root, routesDir);
+    // Nothing planned means the document has no usable root: leave the tree alone.
+    if (planned.size === 0 || !existsSync(routesAbs))
+        return;
+    const walk = (rel) => {
+        for (const entry of readdirSync(join(routesAbs, rel), { withFileTypes: true })) {
+            const relPath = rel ? join(rel, entry.name) : entry.name;
+            if (entry.isDirectory()) {
+                if (entry.name === 'node_modules' || entry.name.startsWith('.'))
+                    continue;
+                walk(relPath);
+            }
+            else if (entry.name === '_layout.tsx' && !planned.has(relPath)) {
+                const abs = join(routesAbs, relPath);
+                if (!GENERATED_LAYOUT_HEADER.test(readFileSync(abs, 'utf8')))
+                    continue;
+                unlinkSync(abs);
+                pruneEmptyDirs(root, dirname(join(routesDir, relPath)));
+                report.files.push({
+                    file: join(routesDir, relPath),
+                    action: 'deprecated',
+                    detail: 'generated layout for a navigator that is no longer here — removed',
+                });
+            }
+        }
+    };
+    walk('');
+}
+/**
+ * Place every page file for the navigation document (routed pages under
+ * routesDir, the rest under pagesDir), regenerate the CLI-owned layouts, and
+ * push local file renames back as route renames. Runs BEFORE the page merge
+ * so the merge reads and writes each page at its final location.
+ */
+export function syncNavigatorTree(root, routesDir, pagesDir, pages, pagesMap, baseRaw, remoteRaw, report) {
+    const remoteDoc = extractNavigatorDoc(remoteRaw);
+    const notes = [];
+    const plan = remoteDoc ? buildNavPlan(remoteDoc, pages, notes) : makePlan([]);
+    const baseDoc = extractNavigatorDoc(baseRaw);
+    const basePlan = baseDoc ? buildNavPlan(baseDoc, pages, []) : null;
+    for (const n of notes)
+        report.notes.push(n);
+    const { renames } = placePages({
+        root,
+        routesDir,
+        pagesDir,
+        pages,
+        pagesMap,
+        plan,
+        basePlan,
+        report,
+    });
+    if (!remoteDoc)
+        return { pushOps: [], mergedNavigation: remoteRaw ?? baseRaw };
+    const renameMap = new Map();
+    for (const rename of renames) {
+        renameMap.set(rename.route.routeId, {
+            navigatorId: rename.route.navigatorId,
+            routeId: rename.route.routeId,
+            newName: humanizeSegment(rename.newSegment),
+            newSegment: rename.newSegment,
+        });
+        // The marker's display name follows the pushed route name, in the same sync.
+        const abs = join(root, routesDir, rename.route.file);
+        const source = readFileSync(abs, 'utf8');
+        const next = withRouteMarker(source, rename.route.routeId, humanizeSegment(rename.newSegment));
+        if (next !== source)
+            writeFileSync(abs, next);
+    }
+    // ---- layouts: CLI-owned, regenerated (with local renames reflected) ----
+    const segmentOverrides = new Map(plan.routes.map((r) => [r.routeId, r.segment]));
+    const mergedDoc = applyRenames(remoteDoc, renameMap);
+    const finalLayouts = buildNavPlan(mergedDoc, pages, [], segmentOverrides).layouts;
+    for (const layout of finalLayouts) {
+        writeOwnedLayout(root, routesDir, layout.file, layout.content, report);
+    }
+    pruneStaleLayouts(root, routesDir, new Set(finalLayouts.map((l) => l.file)), report);
+    // ---- push: replace each renamed navigator's routes array wholesale ----
+    const pushOps = [];
+    // Only a rename that changes the document is worth a commit; a no-op patch
+    // still moves HEAD server-side, and every later sync would repeat it.
+    const changedNavigators = [...new Set([...renameMap.values()].map((r) => r.navigatorId))].filter((navId) => !deepEqual(mergedDoc.navigators[navId]?.routes, remoteDoc.navigators[navId]?.routes));
+    if (changedNavigators.length > 0) {
+        const navigatorsPatch = {};
+        for (const navId of changedNavigators) {
+            navigatorsPatch[navId] = { routes: mergedDoc.navigators[navId].routes };
+        }
+        pushOps.push({
+            op: 'update',
+            entity: 'NavigationDocument',
+            id: 'nav_default',
+            patch: { data: { navigators: navigatorsPatch } },
+        });
+        const pushed = [...renameMap.values()].filter((r) => changedNavigators.includes(r.navigatorId));
+        report.notes.push(`navigation: pushing ${pushed.length} route rename(s) to Creator (${pushed.map((r) => r.newName).join(', ')})`);
+    }
+    const mergedNavigation = rewrapDoc(remoteRaw, mergedDoc);
+    return { pushOps, mergedNavigation };
+}
+function applyRenames(doc, renames) {
+    if (renames.size === 0)
+        return doc;
+    const cloned = structuredClone(doc);
+    for (const rename of renames.values()) {
+        const nav = cloned.navigators[rename.navigatorId];
+        const route = nav?.routes.find((r) => r.id === rename.routeId);
+        if (!route)
+            continue;
+        route.name = rename.newName;
+        // A pinned path follows the file, or the next plan would undo the rename.
+        if (route.path !== undefined)
+            route.path = rename.newSegment;
+    }
+    return cloned;
+}
+/** Put the merged doc back into whatever wrapper shape the server used. */
+export function rewrapDoc(raw, doc) {
+    if (raw && typeof raw === 'object' && 'data' in raw) {
+        return { ...raw, data: doc };
+    }
+    return doc;
+}
+//# sourceMappingURL=navigatorTree.js.map

package/dist/nav/navigatorTree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"navigatorTree.js","sourceRoot":"","sources":["../../src/nav/navigatorTree.ts"],"names":[],"mappings":"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"}

package/dist/nav/placement.d.ts

@@ -0,0 +1,53 @@
+import type { PageEntity } from '../api/objects.js';
+import type { PagesMap } from '../project/pagesMap.js';
+import type { SyncReport } from '../ui/report.js';
+export interface PlannedRoute {
+    routeId: string;
+    pageId: string;
+    /** Owning navigator (navigator documents); null for the flat route list. */
+    navigatorId: string | null;
+    /** Directory relative to routesDir ('' at the root). */
+    dir: string;
+    /** File segment without `.tsx`. Local renames rewrite this. */
+    segment: string;
+    /** File relative to routesDir, with `.tsx`. Local renames rewrite this. */
+    file: string;
+    routeName: string;
+    /** Public path, e.g. `/settings` — recorded in pages.json. */
+    routePath: string;
+}
+export interface RoutePlan {
+    routes: PlannedRoute[];
+    byRouteId: Map<string, PlannedRoute>;
+}
+export declare function makePlan(routes: PlannedRoute[]): RoutePlan;
+/** expo-router public path for a file position: `(group)` segments vanish, `index` is the dir itself. */
+export declare function publicPath(dir: string, segment: string): string;
+export interface LocalRename {
+    route: PlannedRoute;
+    oldSegment: string;
+    newSegment: string;
+}
+export interface PlacementInput {
+    root: string;
+    routesDir: string;
+    pagesDir: string;
+    /** Remote pages — the set whose files are being placed. */
+    pages: Map<string, PageEntity>;
+    pagesMap: PagesMap;
+    plan: RoutePlan;
+    basePlan: RoutePlan | null;
+    report: SyncReport;
+}
+export interface PlacementResult {
+    /** Routes whose file the user renamed locally (the plan already reflects the new segment). */
+    renames: LocalRename[];
+}
+/** routeId -> file relative to `dir`, for every `.tsx` under it carrying a route marker. */
+export declare function scanRouteFiles(dir: string): Map<string, string>;
+/** A pre-0.2 route wrapper: nothing but comments and one `export { default } from '…'`. */
+export declare function isReexportWrapper(source: string): boolean;
+export declare function pruneEmptyDirs(rootDir: string, rel: string): void;
+/** `<dir>/<Name>.tsx`, suffixed until it is free of `used`. */
+export declare function mintEntityFile(dir: string, name: string, used: Set<string>): string;
+export declare function placePages(input: PlacementInput): PlacementResult;