mapples 0.1.0

package/dist/commands/impl/initImpl.js

@@ -0,0 +1,65 @@
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import chalk from 'chalk';
+import prompts from 'prompts';
+import { JpatchClient, isNetworkError } from '../../api/client.js';
+import { writeConfig, configPath } from '../../project/config.js';
+import { ensureBabelPlugin, writeSidTypes } from '../../services/scaffold.js';
+import { runSyncEngine } from '../../services/syncEngine.js';
+import { renderReport } from '../../ui/report.js';
+import { DEFAULT_API_URL } from './createImpl.js';
+export async function runInit(opts) {
+    const root = process.cwd();
+    if (!existsSync(join(root, 'package.json'))) {
+        throw new Error('run `mapples init` inside an Expo app (no package.json found here)');
+    }
+    if (existsSync(configPath(root))) {
+        throw new Error('this app is already linked (.mapples/config.json exists) — run `mapples sync`');
+    }
+    let projectId = typeof opts.project === 'string' ? opts.project : undefined;
+    if (!projectId) {
+        const answer = await prompts({
+            type: 'text',
+            name: 'projectId',
+            message: 'Mapples project id (from Creator → project settings)',
+        });
+        projectId = answer.projectId;
+    }
+    if (!projectId)
+        throw new Error('a project id is required (pass --project <id>)');
+    const apiUrl = typeof opts.apiUrl === 'string' ? opts.apiUrl : DEFAULT_API_URL;
+    writeConfig(root, {
+        projectId,
+        apiUrl,
+        appDir: 'mapples/pages',
+        routesDir: 'app/(mapples)',
+        schema: 1,
+    });
+    console.log(chalk.bold('\nmapples init'));
+    console.log(`  ${chalk.green('A')} .mapples/config.json`);
+    if (writeSidTypes(root))
+        console.log(`  ${chalk.green('A')} mapples/sid.d.ts`);
+    const babel = ensureBabelPlugin(root);
+    if (babel === 'created')
+        console.log(`  ${chalk.green('A')} babel.config.js`);
+    if (babel === 'manual') {
+        console.log(chalk.yellow(`  ⚠ add 'babel-plugin-mapples-sid' to the plugins of your babel.config.js (not edited automatically)`));
+    }
+    console.log(chalk.gray(`  ℹ ensure mapples/sid.d.ts is included by your tsconfig (add it to "include" if needed)`));
+    const client = new JpatchClient({
+        baseUrl: apiUrl,
+        projectId,
+        origin: 'mapples-cli@0.0.0',
+        ...(process.env.MAPPLES_TOKEN ? { token: process.env.MAPPLES_TOKEN } : {}),
+    });
+    try {
+        const report = await runSyncEngine({ root, client });
+        console.log(renderReport(report));
+    }
+    catch (err) {
+        if (!isNetworkError(err))
+            throw err;
+        console.log(chalk.yellow('  offline — run `mapples sync` once you are online'));
+    }
+}
+//# sourceMappingURL=initImpl.js.map

package/dist/commands/impl/initImpl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"initImpl.js","sourceRoot":"","sources":["../../../src/commands/impl/initImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAA6B;IACzD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC3B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;IACxF,CAAC;IACD,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,GAAG,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5E,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC;YAC3B,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,sDAAsD;SAChE,CAAC,CAAC;QACH,SAAS,GAAG,MAAM,CAAC,SAA+B,CAAC;IACrD,CAAC;IACD,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IAClF,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC;IAE/E,WAAW,CAAC,IAAI,EAAE;QAChB,SAAS;QACT,MAAM;QACN,MAAM,EAAE,eAAe;QACvB,SAAS,EAAE,eAAe;QAC1B,MAAM,EAAE,CAAC;KACV,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAC1D,IAAI,aAAa,CAAC,IAAI,CAAC;QAAE,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAE/E,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC9E,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,MAAM,CACV,sGAAsG,CACvG,CACF,CAAC;IACJ,CAAC;IACD,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CACR,0FAA0F,CAC3F,CACF,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC;QAC9B,OAAO,EAAE,MAAM;QACf,SAAS;QACT,MAAM,EAAE,mBAAmB;QAC3B,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3E,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;YAAE,MAAM,GAAG,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,oDAAoD,CAAC,CAAC,CAAC;IAClF,CAAC;AACH,CAAC"}

package/dist/commands/impl/syncImpl.d.ts

@@ -0,0 +1 @@
+export declare function runSync(opts: Record<string, unknown>): Promise<void>;

package/dist/commands/impl/syncImpl.js

@@ -0,0 +1,34 @@
+import chalk from 'chalk';
+import { JpatchClient } from '../../api/client.js';
+import { readConfig } from '../../project/config.js';
+import { runSyncEngine } from '../../services/syncEngine.js';
+import { renderReport } from '../../ui/report.js';
+export async function runSync(opts) {
+    const root = process.cwd();
+    const config = readConfig(root);
+    const client = new JpatchClient({
+        baseUrl: config.apiUrl,
+        projectId: config.projectId,
+        origin: 'mapples-cli@0.0.0',
+        ...(process.env.MAPPLES_TOKEN ? { token: process.env.MAPPLES_TOKEN } : {}),
+    });
+    const report = await runSyncEngine({ root, client });
+    if (opts.adopt !== false) {
+        const { proposeAdoptions } = await import('../../services/adoptService.js');
+        await proposeAdoptions({ root, client, report, yes: opts.yes === true });
+    }
+    if (opts.json === true) {
+        console.log(JSON.stringify({
+            ...report,
+            files: report.files,
+            warnings: report.warnings,
+            conflicts: report.conflicts,
+        }, null, 2));
+        return;
+    }
+    console.log(chalk.bold('\nmapples sync'));
+    console.log(renderReport(report));
+    if (report.conflicts.length > 0)
+        process.exitCode = 2;
+}
+//# sourceMappingURL=syncImpl.js.map

package/dist/commands/impl/syncImpl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"syncImpl.js","sourceRoot":"","sources":["../../../src/commands/impl/syncImpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAA6B;IACzD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC;QAC9B,OAAO,EAAE,MAAM,CAAC,MAAM;QACtB,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,MAAM,EAAE,mBAAmB;QAC3B,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3E,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAErD,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;QACzB,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,gCAAgC,CAAC,CAAC;QAC5E,MAAM,gBAAgB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,SAAS,CACZ;YACE,GAAG,MAAM;YACT,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,EACD,IAAI,EACJ,CAAC,CACF,CACF,CAAC;QACF,OAAO;IACT,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAClC,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACxD,CAAC"}

package/dist/commands/init.d.ts

@@ -0,0 +1,2 @@
+import type { Command } from 'commander';
+export declare function registerInit(program: Command): void;

package/dist/commands/init.js

@@ -0,0 +1,13 @@
+export function registerInit(program) {
+    program
+        .command('init')
+        .description('Link an existing Expo app to a Mapples project')
+        .option('--project <id>', 'Mapples project id to link')
+        .option('--api-url <url>', 'Mapples API base URL')
+        .option('--json', 'machine-readable output')
+        .action(async (opts) => {
+        const { runInit } = await import('./impl/initImpl.js');
+        await runInit(opts);
+    });
+}
+//# sourceMappingURL=init.js.map

package/dist/commands/init.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,YAAY,CAAC,OAAgB;IAC3C,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,gDAAgD,CAAC;SAC7D,MAAM,CAAC,gBAAgB,EAAE,4BAA4B,CAAC;SACtD,MAAM,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;SACjD,MAAM,CAAC,QAAQ,EAAE,yBAAyB,CAAC;SAC3C,MAAM,CAAC,KAAK,EAAE,IAA6B,EAAE,EAAE;QAC9C,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;QACvD,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/commands/sync.d.ts

@@ -0,0 +1,2 @@
+import type { Command } from 'commander';
+export declare function registerSync(program: Command): void;

package/dist/commands/sync.js

@@ -0,0 +1,13 @@
+export function registerSync(program) {
+    program
+        .command('sync')
+        .description('Pull remote changes and push local edits in one run')
+        .option('--yes', 'accept all adoption proposals without prompting')
+        .option('--no-adopt', 'skip the adoption scan')
+        .option('--json', 'machine-readable output')
+        .action(async (opts) => {
+        const { runSync } = await import('./impl/syncImpl.js');
+        await runSync(opts);
+    });
+}
+//# sourceMappingURL=sync.js.map

package/dist/commands/sync.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,YAAY,CAAC,OAAgB;IAC3C,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,qDAAqD,CAAC;SAClE,MAAM,CAAC,OAAO,EAAE,iDAAiD,CAAC;SAClE,MAAM,CAAC,YAAY,EAAE,wBAAwB,CAAC;SAC9C,MAAM,CAAC,QAAQ,EAAE,yBAAyB,CAAC;SAC3C,MAAM,CAAC,KAAK,EAAE,IAA6B,EAAE,EAAE;QAC9C,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;QACvD,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/index.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/index.js

@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+import { Command } from 'commander';
+import { registerCreate } from './commands/create.js';
+import { registerInit } from './commands/init.js';
+import { registerSync } from './commands/sync.js';
+import { registerAdopt } from './commands/adopt.js';
+import { registerDoctor } from './commands/doctor.js';
+const program = new Command();
+program
+    .name('mapples')
+    .description('Mapples CLI — two-way code sync between Mapples Creator and your Expo project')
+    .version('0.0.0');
+registerCreate(program);
+registerInit(program);
+registerSync(program);
+registerAdopt(program);
+registerDoctor(program);
+program.parseAsync(process.argv).catch((err) => {
+    // Top-level failure surface: print and exit non-zero. Never swallow.
+    console.error(err instanceof Error ? err.message : String(err));
+    process.exitCode = 1;
+});
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,SAAS,CAAC;KACf,WAAW,CAAC,+EAA+E,CAAC;KAC5F,OAAO,CAAC,OAAO,CAAC,CAAC;AAEpB,cAAc,CAAC,OAAO,CAAC,CAAC;AACxB,YAAY,CAAC,OAAO,CAAC,CAAC;AACtB,YAAY,CAAC,OAAO,CAAC,CAAC;AACtB,aAAa,CAAC,OAAO,CAAC,CAAC;AACvB,cAAc,CAAC,OAAO,CAAC,CAAC;AAExB,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;IACtD,qEAAqE;IACrE,OAAO,CAAC,KAAK,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAChE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC"}

package/dist/merge/applyOps.d.ts

@@ -0,0 +1,11 @@
+import type { JpatchOp, RenderDomNode } from '../types.js';
+/**
+ * Apply RenderNode ops to one page tree. Ops whose target is not in this tree
+ * are ignored (they belong to another page) and returned in `skipped` so the
+ * caller can route them; nothing is dropped silently.
+ */
+export declare function applyNodeOps(root: RenderDomNode | null, ops: JpatchOp[]): {
+    root: RenderDomNode | null;
+    skipped: JpatchOp[];
+    orphans: Map<string, RenderDomNode>;
+};

package/dist/merge/applyOps.js

@@ -0,0 +1,134 @@
+// Apply RenderNode ops to a page tree (the pull direction). The inverse of
+// diffTree: applyNodeOps(base, diffTree(base, x)) ≡ x.
+import { applyMergePatch } from './mergePatch.js';
+function buildState(root) {
+    const index = new Map();
+    const parents = new Map();
+    const walk = (node) => {
+        index.set(node.sid, node);
+        for (const child of node.children) {
+            parents.set(child.sid, node.sid);
+            walk(child);
+        }
+    };
+    const cloned = root ? structuredClone(root) : null;
+    if (cloned)
+        walk(cloned);
+    return { root: cloned, index, parents };
+}
+/**
+ * Apply RenderNode ops to one page tree. Ops whose target is not in this tree
+ * are ignored (they belong to another page) and returned in `skipped` so the
+ * caller can route them; nothing is dropped silently.
+ */
+export function applyNodeOps(root, ops) {
+    const state = buildState(root);
+    const skipped = [];
+    // Created-but-not-yet-linked nodes park here until a children directive links them.
+    const orphans = new Map();
+    for (const op of ops) {
+        if (op.entity !== 'RenderNode') {
+            skipped.push(op);
+            continue;
+        }
+        if (op.op === 'create') {
+            const id = op.id ?? op.cid;
+            const data = op.data;
+            if (!id || !data || typeof data.type !== 'string') {
+                throw new Error(`malformed RenderNode create op: ${JSON.stringify(op)}`);
+            }
+            const node = {
+                sid: id,
+                type: data.type,
+                props: data.props ?? {},
+                children: [],
+            };
+            state.index.set(id, node);
+            orphans.set(id, node);
+            continue;
+        }
+        const id = op.id;
+        if (!id)
+            throw new Error(`op missing id: ${JSON.stringify(op)}`);
+        const node = state.index.get(id);
+        if (!node) {
+            skipped.push(op);
+            continue;
+        }
+        if (op.op === 'delete') {
+            const unlink = (sid) => {
+                const target = state.index.get(sid);
+                if (!target)
+                    return;
+                for (const child of target.children)
+                    unlink(child.sid);
+                state.index.delete(sid);
+                orphans.delete(sid);
+            };
+            const parentSid = state.parents.get(id);
+            unlink(id);
+            if (parentSid) {
+                const parent = state.index.get(parentSid);
+                if (parent)
+                    parent.children = parent.children.filter((c) => c.sid !== id);
+            }
+            else if (state.root?.sid === id) {
+                state.root = null;
+            }
+            continue;
+        }
+        // update
+        if (op.patch) {
+            const patched = applyMergePatch({ type: node.type, props: node.props }, op.patch);
+            node.type = patched.type;
+            node.props = patched.props ?? {};
+        }
+        if (op.children) {
+            applyChildrenDirective(state, node, op.children, orphans);
+        }
+    }
+    // Root replacement: the old root was deleted and a new tree created with no
+    // parent to link it — exactly one unlinked tree becomes the new root.
+    if (state.root === null && orphans.size > 0) {
+        const candidates = [...orphans.values()];
+        if (candidates.length === 1) {
+            state.root = candidates[0];
+            orphans.clear();
+        }
+    }
+    return { root: state.root, skipped, orphans };
+}
+function applyChildrenDirective(state, node, directive, orphans) {
+    if (directive.remove) {
+        for (const ref of directive.remove) {
+            const removed = node.children.find((c) => c.sid === ref);
+            node.children = node.children.filter((c) => c.sid !== ref);
+            if (removed) {
+                state.parents.delete(ref);
+                orphans.set(ref, removed); // may be re-linked under a new parent
+            }
+        }
+    }
+    if (directive.insert) {
+        for (const ins of directive.insert) {
+            const child = state.index.get(ins.ref) ?? orphans.get(ins.ref);
+            if (!child)
+                throw new Error(`children.insert references unknown node ${ins.ref}`);
+            orphans.delete(ins.ref);
+            const at = Math.max(0, Math.min(ins.at, node.children.length));
+            node.children.splice(at, 0, child);
+            state.parents.set(ins.ref, node.sid);
+        }
+    }
+    if (directive.move) {
+        for (const mv of directive.move) {
+            const from = node.children.findIndex((c) => c.sid === mv.ref);
+            if (from === -1)
+                continue; // clamped server-side; mirror the tolerance
+            const [child] = node.children.splice(from, 1);
+            const to = Math.max(0, Math.min(mv.to, node.children.length));
+            node.children.splice(to, 0, child);
+        }
+    }
+}
+//# sourceMappingURL=applyOps.js.map

package/dist/merge/applyOps.js.map

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

package/dist/merge/deprecate.d.ts

@@ -0,0 +1,3 @@
+export declare function deprecationName(filePath: string, now?: Date): string;
+/** Rename `filePath` to its deprecation name; returns the new path. Never overwrites. */
+export declare function deprecateFile(filePath: string, now?: Date): string;

package/dist/merge/deprecate.js

@@ -0,0 +1,28 @@
+// The conflict fallback (RFC-0002 §4 / §6 P0): a user file is NEVER silently
+// overwritten or deleted. Deprecation renames it out of the way; the caller
+// then regenerates a fresh file from the merged (remote-wins) DOM.
+import { existsSync, renameSync } from 'node:fs';
+import { basename, dirname, join } from 'node:path';
+export function deprecationName(filePath, now = new Date()) {
+    const ts = [
+        now.getFullYear(),
+        String(now.getMonth() + 1).padStart(2, '0'),
+        String(now.getDate()).padStart(2, '0'),
+        String(now.getHours()).padStart(2, '0'),
+        String(now.getMinutes()).padStart(2, '0'),
+        String(now.getSeconds()).padStart(2, '0'),
+    ].join('');
+    return join(dirname(filePath), `_depr_${ts}_${basename(filePath)}.old`);
+}
+/** Rename `filePath` to its deprecation name; returns the new path. Never overwrites. */
+export function deprecateFile(filePath, now = new Date()) {
+    let target = deprecationName(filePath, now);
+    let counter = 1;
+    while (existsSync(target)) {
+        target = target.replace(/\.old$/, `.${counter}.old`);
+        counter += 1;
+    }
+    renameSync(filePath, target);
+    return target;
+}
+//# sourceMappingURL=deprecate.js.map

package/dist/merge/deprecate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deprecate.js","sourceRoot":"","sources":["../../src/merge/deprecate.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,4EAA4E;AAC5E,mEAAmE;AAEnE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEpD,MAAM,UAAU,eAAe,CAAC,QAAgB,EAAE,GAAG,GAAG,IAAI,IAAI,EAAE;IAChE,MAAM,EAAE,GAAG;QACT,GAAG,CAAC,WAAW,EAAE;QACjB,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;QAC3C,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;QACvC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;QACzC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;KAC1C,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACX,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC1E,CAAC;AAED,yFAAyF;AACzF,MAAM,UAAU,aAAa,CAAC,QAAgB,EAAE,GAAG,GAAG,IAAI,IAAI,EAAE;IAC9D,IAAI,MAAM,GAAG,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC5C,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,OAAO,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,OAAO,MAAM,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC,CAAC;IACf,CAAC;IACD,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/merge/diff.d.ts

@@ -0,0 +1,15 @@
+import type { JpatchOp, RenderDomNode } from '../types.js';
+interface Indexed {
+    node: RenderDomNode;
+    parentSid: string | null;
+    index: number;
+}
+export declare function indexTree(root: RenderDomNode | null): Map<string, Indexed>;
+/**
+ * Diff `base` against `next` for one page tree. Emits, in order: creates
+ * (parents before children), per-node updates, per-parent children directives,
+ * then deletes. Creates reference the node's own sid as cid (the caller mints
+ * `c_` sids for genuinely new nodes before diffing).
+ */
+export declare function diffTree(base: RenderDomNode | null, next: RenderDomNode | null): JpatchOp[];
+export {};

package/dist/merge/diff.js

@@ -0,0 +1,124 @@
+// Two RenderDom trees -> JpatchOp[]. RFC 7386 merge-patch for prop objects;
+// explicit children move/insert/remove directives for ordering — arrays are
+// never merge-patched (RFC-0001 invariant 7).
+import { buildMergePatch, deepEqual } from './mergePatch.js';
+export function indexTree(root) {
+    const map = new Map();
+    const walk = (node, parentSid, index) => {
+        if (map.has(node.sid)) {
+            throw new Error(`duplicate sid in tree: ${node.sid}`);
+        }
+        map.set(node.sid, { node, parentSid, index });
+        node.children.forEach((child, i) => walk(child, node.sid, i));
+    };
+    if (root)
+        walk(root, null, 0);
+    return map;
+}
+/**
+ * Diff `base` against `next` for one page tree. Emits, in order: creates
+ * (parents before children), per-node updates, per-parent children directives,
+ * then deletes. Creates reference the node's own sid as cid (the caller mints
+ * `c_` sids for genuinely new nodes before diffing).
+ */
+export function diffTree(base, next) {
+    const baseIdx = indexTree(base);
+    const nextIdx = indexTree(next);
+    const ops = [];
+    // Creates — walk `next` top-down so parents are minted before children.
+    const created = new Set();
+    const walkCreates = (node) => {
+        if (!baseIdx.has(node.sid)) {
+            created.add(node.sid);
+            ops.push({
+                op: 'create',
+                entity: 'RenderNode',
+                cid: node.sid,
+                data: { type: node.type, props: node.props },
+            });
+        }
+        for (const child of node.children)
+            walkCreates(child);
+    };
+    if (next)
+        walkCreates(next);
+    // Updates on surviving nodes.
+    for (const [sid, { node }] of nextIdx) {
+        const baseEntry = baseIdx.get(sid);
+        if (!baseEntry)
+            continue;
+        const patch = buildMergePatch({ type: baseEntry.node.type, props: baseEntry.node.props }, { type: node.type, props: node.props });
+        if (patch !== null) {
+            ops.push({ op: 'update', entity: 'RenderNode', id: sid, patch });
+        }
+    }
+    // Children directives per surviving parent.
+    for (const [sid, { node }] of nextIdx) {
+        const baseEntry = baseIdx.get(sid);
+        if (!baseEntry) {
+            // Newly created parents carry their children via inserts below? No —
+            // created nodes get their children linked with an explicit directive too,
+            // because `create.data` never embeds children.
+            if (node.children.length > 0) {
+                ops.push({
+                    op: 'update',
+                    entity: 'RenderNode',
+                    id: sid, // a cid — the server resolves refs minted earlier in this tx
+                    children: { insert: node.children.map((c, i) => ({ ref: c.sid, at: i })) },
+                });
+            }
+            continue;
+        }
+        const directive = childrenDirective(baseEntry.node, node, baseIdx, nextIdx);
+        if (directive) {
+            ops.push({ op: 'update', entity: 'RenderNode', id: sid, children: directive });
+        }
+    }
+    // Deletes last (children removed via cascade; only delete the topmost gone node).
+    for (const [sid, entry] of baseIdx) {
+        if (nextIdx.has(sid))
+            continue;
+        const parentGone = entry.parentSid !== null && !nextIdx.has(entry.parentSid) && baseIdx.has(entry.parentSid);
+        if (parentGone)
+            continue; // covered by the ancestor's cascade
+        ops.push({ op: 'delete', entity: 'RenderNode', id: sid, cascade: true });
+    }
+    return ops;
+}
+function childrenDirective(baseNode, nextNode, baseIdx, nextIdx) {
+    const baseIds = baseNode.children.map((c) => c.sid);
+    const nextIds = nextNode.children.map((c) => c.sid);
+    const removed = baseIds.filter((id) => {
+        const entry = nextIdx.get(id);
+        return entry === undefined || entry.parentSid !== nextNode.sid;
+    });
+    const inserted = nextIds.filter((id) => {
+        const entry = baseIdx.get(id);
+        return entry === undefined || entry.parentSid !== baseNode.sid;
+    });
+    // Simulate remove + insert over the base order; if that already yields the
+    // desired order, no moves are needed.
+    const simulated = baseIds.filter((id) => !removed.includes(id));
+    for (const id of inserted) {
+        const at = Math.min(nextIds.indexOf(id), simulated.length);
+        simulated.splice(at, 0, id);
+    }
+    const needsMoves = !deepEqual(simulated, nextIds);
+    const directive = {};
+    if (removed.length > 0) {
+        // A child that moved to another parent is removed here (its new parent
+        // inserts it); a deleted child is unlinked by its own delete op, but the
+        // explicit remove keeps directives self-contained for rebase.
+        directive.remove = removed;
+    }
+    if (inserted.length > 0) {
+        directive.insert = inserted.map((id) => ({ ref: id, at: nextIds.indexOf(id) }));
+    }
+    if (needsMoves) {
+        // Full move list, ascending target index: deterministic and rebase-safe
+        // under the server's clamp semantics.
+        directive.move = nextIds.map((id, i) => ({ ref: id, to: i }));
+    }
+    return directive.remove || directive.insert || directive.move ? directive : null;
+}
+//# sourceMappingURL=diff.js.map

package/dist/merge/diff.js.map

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

package/dist/merge/mergePatch.d.ts

@@ -0,0 +1,8 @@
+export declare function applyMergePatch(target: unknown, patch: unknown): unknown;
+/**
+ * Build the minimal RFC 7386 patch turning `from` into `to`. Returns null when
+ * they are equal (no patch needed). Arrays and non-objects replace wholesale.
+ * A key present in `from` but absent in `to` becomes `null` (delete).
+ */
+export declare function buildMergePatch(from: Record<string, unknown>, to: Record<string, unknown>): Record<string, unknown> | null;
+export declare function deepEqual(a: unknown, b: unknown): boolean;

package/dist/merge/mergePatch.js

@@ -0,0 +1,63 @@
+// RFC 7386 JSON Merge Patch — exactly: `null` deletes a key, objects merge
+// recursively, everything else (arrays included) replaces wholesale.
+function isPlainObject(v) {
+    return typeof v === 'object' && v !== null && !Array.isArray(v);
+}
+export function applyMergePatch(target, patch) {
+    if (!isPlainObject(patch))
+        return patch;
+    const result = isPlainObject(target) ? { ...target } : {};
+    for (const [key, value] of Object.entries(patch)) {
+        if (value === null) {
+            delete result[key];
+        }
+        else {
+            result[key] = applyMergePatch(result[key], value);
+        }
+    }
+    return result;
+}
+/**
+ * Build the minimal RFC 7386 patch turning `from` into `to`. Returns null when
+ * they are equal (no patch needed). Arrays and non-objects replace wholesale.
+ * A key present in `from` but absent in `to` becomes `null` (delete).
+ */
+export function buildMergePatch(from, to) {
+    const patch = {};
+    for (const key of Object.keys(from)) {
+        if (!(key in to))
+            patch[key] = null;
+    }
+    for (const [key, toVal] of Object.entries(to)) {
+        if (toVal === undefined)
+            continue;
+        const fromVal = from[key];
+        if (deepEqual(fromVal, toVal))
+            continue;
+        if (isPlainObject(fromVal) && isPlainObject(toVal)) {
+            const sub = buildMergePatch(fromVal, toVal);
+            if (sub !== null)
+                patch[key] = sub;
+        }
+        else {
+            patch[key] = toVal;
+        }
+    }
+    return Object.keys(patch).length === 0 ? null : patch;
+}
+export function deepEqual(a, b) {
+    if (a === b)
+        return true;
+    if (Array.isArray(a) && Array.isArray(b)) {
+        return a.length === b.length && a.every((x, i) => deepEqual(x, b[i]));
+    }
+    if (isPlainObject(a) && isPlainObject(b)) {
+        const ka = Object.keys(a).filter((k) => a[k] !== undefined);
+        const kb = Object.keys(b).filter((k) => b[k] !== undefined);
+        if (ka.length !== kb.length)
+            return false;
+        return ka.every((k) => deepEqual(a[k], b[k]));
+    }
+    return false;
+}
+//# sourceMappingURL=mergePatch.js.map

package/dist/merge/mergePatch.js.map

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

package/dist/merge/threeWay.d.ts

@@ -0,0 +1,15 @@
+import type { RenderDomNode } from '../types.js';
+export interface ConflictDetail {
+    sid: string;
+    reason: 'same-prop' | 'delete-vs-edit';
+    props?: string[];
+    localValue?: unknown;
+    remoteValue?: unknown;
+    detail: string;
+}
+export interface ThreeWayResult {
+    /** The merged tree the FILE should show. On conflict the caller discards this and uses remote. */
+    merged: RenderDomNode | null;
+    conflicts: ConflictDetail[];
+}
+export declare function threeWayMerge(base: RenderDomNode | null, local: RenderDomNode | null, remote: RenderDomNode | null): ThreeWayResult;