mapples 0.2.0-beta.1 → 0.2.0-beta.3

package/dist/services/adoptService.js

@@ -3,23 +3,45 @@
 // prompt. Supported primitives are codemodded via the mapping table; anything
 // else becomes an opaque Custom node. One normal commit; idMap rewrite
 // finishes it. Unadopted files are never touched.
+//
+// A page file under routesDir joins the navigation at its file position in the
+// same commit — a route on the navigator that owns its directory — so the next
+// sync finds it exactly where it is. A directory no navigator owns gets one in
+// the same commit (its kind read from the directory's `_layout.tsx`: Stack,
+// Tabs or Drawer; a stack when there is none), named after the directory and
+// reached through a navigator route on the parent whose path is the directory
+// segment; a project with no navigation at all starts with a root stack. A
+// page elsewhere is adopted outside the navigation. Components are recorded
+// in components.json and merged by every sync.
+import { randomUUID } from 'node:crypto';
 import { readFileSync, writeFileSync, existsSync } from 'node:fs';
-import { join, relative, sep } from 'node:path';
+import { basename, dirname, join, relative, sep } from 'node:path';
 import prompts from 'prompts';
 import { codemodAdopt, extract } from '@mapples/sid-ast';
 import { buildEnvelope, commitWithTransportRetry, mintCid, mintTxId } from '../api/commit.js';
 import { HeadMismatchError } from '../api/errors.js';
+import { fetchProjectState } from '../api/objects.js';
 import { PRIMITIVE_MAPPING } from '../adopt/mappingTable.js';
-import { scanForCandidates } from '../adopt/scan.js';
+import { isUnder, managedFiles, scanForCandidates } from '../adopt/scan.js';
+import { withRouteMarker } from '../codegen/emit.js';
+import { instanceLinker } from '../codegen/instances.js';
 import { diffTree } from '../merge/diff.js';
+import { buildNavPlan, extractNavigatorDoc, humanizeSegment, rewrapDoc, } from '../nav/navigatorTree.js';
 import { BaseStore } from '../project/baseStore.js';
-import { readConfig } from '../project/config.js';
+import { DEFAULT_ROUTES_DIR, readConfig } from '../project/config.js';
 import { readHead, writeHead } from '../project/head.js';
+import { readComponentsMap, writeComponentsMap } from '../project/componentsMap.js';
 import { readPagesMap, writePagesMap } from '../project/pagesMap.js';
 export async function proposeAdoptions(input) {
     const { root, client, report } = input;
+    const config = readConfig(root);
+    const routesDir = config.routesDir ?? DEFAULT_ROUTES_DIR;
     const pagesMap = readPagesMap(root);
-    let candidates = scanForCandidates(root, pagesMap);
+    const componentsMap = readComponentsMap(root);
+    let candidates = scanForCandidates(root, managedFiles(root), {
+        routesDir,
+        pagesDir: config.pagesDir,
+    });
     if (input.file) {
         const rel = relative(root, join(root, input.file));
         candidates = candidates.filter((c) => c.file === rel);
@@ -43,7 +65,7 @@ export async function proposeAdoptions(input) {
             name: 'files',
             message: 'Adopt these files into Mapples Creator?',
             choices: candidates.map((c) => ({
-                title: `${c.file} (${c.kind})`,
+                title: `${c.file} (${c.kind}${c.routed ? ', in the navigation' : ''})`,
                 value: c.file,
                 selected: true,
             })),
@@ -53,17 +75,52 @@ export async function proposeAdoptions(input) {
     }
     if (accepted.length === 0)
         return;
-    const config = readConfig(root);
     const head = readHead(root);
     if (!head)
         throw new Error('run `mapples sync` once before adopting (no local head yet)');
+    const baseStore = new BaseStore(root);
+    const snapshot = baseStore.readAll();
+    const navMode = navigationMode(snapshot.navigation);
+    const navContext = {
+        root,
+        routesDir,
+        pages: snapshot.pages,
+        minted: new Map(),
+        rootId: randomUUID(),
+        report,
+    };
     const ops = [];
+    const pendingWrites = new Map();
     const adoptedPages = [];
     const adoptedComponents = [];
+    // A page adopted alongside the component it uses links to it in the same
+    // commit: components get their ids and uuids up front, and the linker
+    // knows them before any page is read.
+    const componentIds = new Map();
+    const provisionalMap = { ...componentsMap };
+    const provisionalComponents = new Map(snapshot.components);
+    for (const candidate of accepted) {
+        if (candidate.kind !== 'component')
+            continue;
+        const ids = { cid: mintCid(), uuid: randomUUID() };
+        componentIds.set(candidate.file, ids);
+        provisionalMap[ids.cid] = { file: candidate.file, name: candidate.componentName };
+        provisionalComponents.set(ids.cid, {
+            id: ids.cid,
+            name: candidate.componentName,
+            root: { sid: '', type: 'View', props: {}, children: [] },
+            uuid: ids.uuid,
+        });
+    }
+    const linker = instanceLinker(provisionalMap, provisionalComponents);
     for (const candidate of accepted) {
         const filePath = join(root, candidate.file);
         const source = readFileSync(filePath, 'utf8');
-        const result = codemodAdopt(source, { mapping: PRIMITIVE_MAPPING, mintSid: mintCid });
+        const result = codemodAdopt(source, {
+            mapping: PRIMITIVE_MAPPING,
+            mintSid: mintCid,
+            isLinked: (origin) => linker.isLinked(origin, candidate.file),
+        });
         for (const skip of result.skipped) {
             report.warnings.push({
                 kind: 'UNKNOWN_ELEMENT_WITH_SID',
@@ -74,7 +131,9 @@ export async function proposeAdoptions(input) {
             report.notes.push(`${candidate.file}: nothing adoptable inside — left untouched`);
             continue;
         }
-        writeFileSync(filePath, result.source);
+        // The codemodded source is written only once the commit succeeds: a
+        // rejected commit must leave the file exactly as the user had it.
+        pendingWrites.set(filePath, result.source);
         const extracted = extract(result.source);
         for (const w of extracted.warnings) {
             if (w.kind !== 'NON_LITERAL_PROP')
@@ -84,99 +143,348 @@ export async function proposeAdoptions(input) {
             report.notes.push(`${candidate.file}: no root element extracted — skipped`);
             continue;
         }
+        linker.link(extracted.dom, candidate.file, (w) => report.warnings.push({ ...w, file: candidate.file }));
         ops.push(...diffTree(null, extracted.dom));
         if (candidate.kind === 'page') {
             const pageCid = mintCid();
-            const route = routeForFile(candidate, config.routesDir ?? 'app/(mapples)');
+            const pageUuid = randomUUID();
+            const route = routeForFile(candidate.file, routesDir);
             ops.push({
                 op: 'create',
                 entity: 'Page',
                 cid: pageCid,
-                data: { name: candidate.componentName, route, root: extracted.dom.sid },
+                // `route` is the flat contract's field; navigator documents own routes
+                // themselves and the real backend ignores it on a page (RFC-0001 §4).
+                data: { name: candidate.componentName, uuid: pageUuid, route, root: extracted.dom.sid },
             });
-            adoptedPages.push({ candidate, dom: extracted.dom, pageCid, route });
+            const adopted = { candidate, dom: extracted.dom, pageCid, pageUuid, route };
+            if (candidate.routed) {
+                if (navMode === 'flat') {
+                    adopted.routeCid = mintCid();
+                    ops.push({
+                        op: 'create',
+                        entity: 'NavigationRoute',
+                        cid: adopted.routeCid,
+                        data: { name: candidate.componentName, path: route, pageId: pageCid },
+                    });
+                }
+                else {
+                    const rel = relative(routesDir, candidate.file);
+                    const segment = basename(rel, '.tsx');
+                    const dir = dirname(rel) === '.' ? '' : dirname(rel);
+                    adopted.navRoute = {
+                        dir,
+                        segment,
+                        // `path` pins the file position: the route answers at the segment the
+                        // user chose. (An `index.tsx` opening a fresh navigator becomes that
+                        // navigator's initial route instead — decided in navigatorDocAfter.)
+                        route: {
+                            id: randomUUID(),
+                            name: routeNameFor(segment, dir, candidate.componentName),
+                            target: { kind: 'page', pageUuid },
+                            path: segment,
+                        },
+                    };
+                }
+            }
+            adoptedPages.push(adopted);
         }
         else {
-            const cmpCid = mintCid();
+            const ids = componentIds.get(candidate.file);
+            if (!ids)
+                throw new Error(`internal: component ${candidate.file} was not pre-registered`);
             ops.push({
                 op: 'create',
                 entity: 'Component',
-                cid: cmpCid,
-                data: { name: candidate.componentName, root: extracted.dom.sid },
+                cid: ids.cid,
+                // `uuid` is what a page's ComponentInstance links to (the Creator
+                // mints one the same way when it saves a component).
+                data: { name: candidate.componentName, root: extracted.dom.sid, uuid: ids.uuid },
             });
-            adoptedComponents.push({ candidate, dom: extracted.dom, cmpCid });
+            adoptedComponents.push({ candidate, dom: extracted.dom, cmpCid: ids.cid, uuid: ids.uuid });
         }
         report.files.push({
             file: candidate.file,
             action: 'updated',
-            detail: `adopted as ${candidate.kind} (${result.adopted.length} node(s))`,
+            detail: `adopted as ${candidate.kind}${candidate.routed ? ` at ${route(candidate, routesDir)}` : ''} (${result.adopted.length} node(s))`,
         });
     }
     if (ops.length === 0)
         return;
+    // The navigation patch is computed against the document at the commit
+    // base, so a rebase recomputes it from the fresh state.
+    let navigation = snapshot.navigation;
+    let mergedDoc = navigatorDocAfter(navigation, adoptedPages, navContext);
+    let navOp = navigationOp(navigation, mergedDoc);
     // One normal commit, with the standard rebase loop.
     const txId = mintTxId();
     let base = head.head;
     let result;
     for (let attempt = 0;; attempt++) {
         try {
-            result = await commitWithTransportRetry(client, buildEnvelope(client, { base, ops, txId }));
+            result = await commitWithTransportRetry(client, buildEnvelope(client, { base, ops: navOp ? [...ops, navOp] : ops, txId }));
             break;
         }
         catch (err) {
             if (err instanceof HeadMismatchError && attempt < 5) {
                 base = err.head;
                 report.notes.push(`adoption rebase: HEAD moved to ${err.head}`);
+                const fresh = await fetchProjectState(client, await client.bootstrap());
+                navigation = fresh.navigation;
+                navContext.pages = fresh.pages;
+                mergedDoc = navigatorDocAfter(navigation, adoptedPages, navContext);
+                navOp = navigationOp(navigation, mergedDoc);
                 continue;
             }
             throw err;
         }
     }
-    report.pushedOps += ops.length;
+    report.pushedOps += ops.length + (navOp ? 1 : 0);
+    for (const [filePath, source] of pendingWrites)
+        writeFileSync(filePath, source);
     // idMap rewrite finishes it: c_ -> nd_/pg_/cmp_ in files, base, mapping.
     const idMap = result.idMap;
     const renameTree = (node) => {
         node.sid = idMap[node.sid] ?? node.sid;
         node.children.forEach(renameTree);
     };
-    const baseStore = new BaseStore(root);
-    const snapshot = baseStore.readAll();
-    for (const { candidate, dom, pageCid, route } of adoptedPages) {
+    for (const adopted of adoptedPages) {
+        const { candidate, dom, pageCid, pageUuid, route } = adopted;
         rewriteFileSids(join(root, candidate.file), idMap);
         renameTree(dom);
         const pageId = idMap[pageCid];
         if (!pageId)
             throw new Error(`server did not mint an id for page cid ${pageCid}`);
-        snapshot.pages.set(pageId, { id: pageId, name: candidate.componentName, route, root: dom });
-        pagesMap[pageId] = { file: candidate.file, name: candidate.componentName, route };
+        const page = {
+            id: pageId,
+            name: candidate.componentName,
+            route,
+            root: dom,
+            uuid: pageUuid,
+        };
+        snapshot.pages.set(pageId, page);
+        let routeId;
+        let routeName;
+        if (adopted.navRoute) {
+            routeId = adopted.navRoute.route.id;
+            routeName = adopted.navRoute.route.name;
+        }
+        else if (adopted.routeCid) {
+            routeId = idMap[adopted.routeCid];
+            if (!routeId)
+                throw new Error(`server did not mint an id for route cid ${adopted.routeCid}`);
+            routeName = candidate.componentName;
+            const flat = (navigation ?? { routes: [] });
+            flat.routes = [...(flat.routes ?? []), { id: routeId, name: routeName, path: route, pageId }];
+            navigation = flat;
+        }
+        if (routeId && routeName) {
+            const filePath = join(root, candidate.file);
+            writeFileSync(filePath, withRouteMarker(readFileSync(filePath, 'utf8'), routeId, routeName));
+        }
+        pagesMap[pageId] = {
+            file: candidate.file,
+            name: candidate.componentName,
+            route,
+            ...(routeId ? { routeId } : {}),
+        };
     }
-    for (const { candidate, dom, cmpCid } of adoptedComponents) {
+    for (const { candidate, dom, cmpCid, uuid } of adoptedComponents) {
         rewriteFileSids(join(root, candidate.file), idMap);
         renameTree(dom);
         const cmpId = idMap[cmpCid];
         if (!cmpId)
             throw new Error(`server did not mint an id for component cid ${cmpCid}`);
-        snapshot.components.set(cmpId, { id: cmpId, name: candidate.componentName, root: dom });
-        // TODO(RFC-0002 §8): component files are not yet merged by sync — record only.
+        snapshot.components.set(cmpId, { id: cmpId, name: candidate.componentName, root: dom, uuid });
+        componentsMap[cmpId] = { file: candidate.file, name: candidate.componentName };
     }
+    snapshot.navigation = mergedDoc ? rewrapDoc(navigation, mergedDoc) : navigation;
     baseStore.writeAll(snapshot);
+    baseStore.writeStamp(result.head);
     writePagesMap(root, pagesMap);
+    writeComponentsMap(root, componentsMap);
     writeHead(root, { head: result.head, seq: result.seq });
     report.head = result.head;
     report.notes.push(`adopted ${adoptedPages.length} page(s), ${adoptedComponents.length} component(s) @ ${result.head}`);
 }
-function routeForFile(candidate, _routesDir) {
-    const parts = candidate.file.split(sep);
-    if (parts[0] === 'app') {
-        // expo-router semantics: (group) segments don't contribute to the path.
-        const segments = parts
-            .slice(1)
-            .filter((p) => !(p.startsWith('(') && p.endsWith(')')))
-            .join('/')
-            .replace(/\.tsx$/, '');
-        return segments === 'index' || segments === '' ? '/' : `/${segments}`;
-    }
-    return `/${candidate.componentName.replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase()}`;
+/**
+ * Which navigation contract the project speaks: Creator navigator documents
+ * (`{data: {navigators…}}`, also when `data` is still the empty seed) or the
+ * flat `{routes: [...]}` list of the mock server / pre-navigator backends.
+ */
+function navigationMode(navigation) {
+    if (navigation &&
+        typeof navigation === 'object' &&
+        ('data' in navigation || 'legacy' in navigation)) {
+        return 'navigator';
+    }
+    return extractNavigatorDoc(navigation) ? 'navigator' : 'flat';
+}
+/**
+ * Route name for an adopted file: the segment, humanized (`add-device` ->
+ * "Add device"). A directory's `index.tsx` takes the directory's name (it IS
+ * that navigator's front page); a dynamic segment (`[id]`) or the root
+ * `index.tsx` take the component's name — the segment is not a name.
+ */
+function routeNameFor(segment, dir, componentName) {
+    if (segment === 'index')
+        return dir ? humanizeSegment(basename(dir)) : componentName;
+    if (/[[\]]/.test(segment))
+        return componentName;
+    return humanizeSegment(segment);
+}
+/** Navigator kind an expo-router layout renders: `<Tabs>` / `<Drawer>` / otherwise a stack. */
+export function navigatorTypeOfLayout(source) {
+    if (/<\s*(?:Native)?Tabs\b/.test(source) ||
+        /import\s*\{[^}]*\b(?:Native)?Tabs\b[^}]*\}\s*from\s*['"]expo-router/.test(source)) {
+        return 'tabs';
+    }
+    if (/<\s*Drawer\b/.test(source) || /from\s*['"]expo-router\/drawer['"]/.test(source)) {
+        return 'drawer';
+    }
+    return 'stack';
+}
+function mintNavigator(ctx, dir) {
+    const layoutPath = join(ctx.root, ctx.routesDir, dir, '_layout.tsx');
+    const fromLayout = existsSync(layoutPath);
+    return {
+        id: randomUUID(),
+        routeId: randomUUID(),
+        type: fromLayout ? navigatorTypeOfLayout(readFileSync(layoutPath, 'utf8')) : 'stack',
+        name: humanizeSegment(basename(dir)),
+        fromLayout,
+    };
+}
+/**
+ * The navigator document once the adopted routes are in — null in flat mode
+ * or when nothing routed. Computed against the document at the commit base
+ * (recomputed on rebase): a directory with no navigator gets one, chained up
+ * to the nearest navigator that exists; a project with no navigation starts
+ * with a root stack.
+ */
+function navigatorDocAfter(navigation, adopted, ctx) {
+    const routed = adopted.filter((a) => a.navRoute);
+    if (routed.length === 0)
+        return null;
+    const current = extractNavigatorDoc(navigation);
+    let doc;
+    if (current) {
+        doc = structuredClone(current);
+    }
+    else {
+        doc = {
+            version: 1,
+            rootNavigatorId: ctx.rootId,
+            navigators: {
+                [ctx.rootId]: { id: ctx.rootId, type: 'stack', name: 'Root', routes: [] },
+            },
+        };
+        ctx.report.notes.push('the project had no navigation — created a root stack for the adopted page(s)');
+    }
+    const byDir = buildNavPlan(doc, ctx.pages, []).navigatorByDir;
+    const names = new Set(Object.values(doc.navigators).map((n) => n.name));
+    const navigatorAt = (dir) => {
+        const known = byDir.get(dir);
+        if (known)
+            return doc.navigators[known];
+        if (dir === '') {
+            const root = doc.navigators[doc.rootNavigatorId];
+            if (!root)
+                throw new Error(`navigation document has no root navigator ${doc.rootNavigatorId}`);
+            return root;
+        }
+        const parentDir = dirname(dir) === '.' ? '' : dirname(dir);
+        const parent = navigatorAt(parentDir);
+        let minted = ctx.minted.get(dir);
+        if (!minted) {
+            minted = mintNavigator(ctx, dir);
+            ctx.minted.set(dir, minted);
+        }
+        let name = minted.name;
+        for (let n = 2; names.has(name); n++)
+            name = `${minted.name} ${n}`;
+        names.add(name);
+        const nav = { id: minted.id, type: minted.type, name, routes: [] };
+        doc.navigators[nav.id] = nav;
+        // The route's path is the directory segment: the navigator answers exactly where its files are.
+        parent.routes.push({
+            id: minted.routeId,
+            name,
+            target: { kind: 'navigator', navigatorId: nav.id },
+            path: basename(dir),
+        });
+        byDir.set(dir, nav.id);
+        ctx.report.notes.push(`navigation: ${join(ctx.routesDir, dir)}/ had no navigator — created ${nav.type} navigator “${name}” on “${parent.name}” (${minted.fromLayout ? 'kind read from its _layout.tsx' : 'no _layout.tsx: a stack'})`);
+        return nav;
+    };
+    // `index.tsx` files first: the one opening a fresh navigator is its initial route.
+    const ordered = [...routed].sort((a, b) => Number(b.navRoute.segment === 'index') - Number(a.navRoute.segment === 'index'));
+    for (const { navRoute } of ordered) {
+        const { dir, segment, route } = navRoute;
+        const nav = navigatorAt(dir);
+        if (segment === 'index' && nav.routes.length === 0) {
+            // Front page of a fresh navigator: initial route, position implied — no pinned path.
+            delete route.path;
+            nav.initialRouteId = route.id;
+        }
+        else {
+            route.path = segment;
+        }
+        nav.routes.push(route);
+    }
+    return doc;
+}
+function navigationOp(navigation, merged) {
+    if (!merged)
+        return null;
+    const current = extractNavigatorDoc(navigation);
+    const patch = {};
+    if (current) {
+        // Arrays replace wholesale (RFC 7386): send each touched navigator's
+        // routes (and initial route); a navigator minted here goes whole.
+        const navigators = {};
+        for (const [id, nav] of Object.entries(merged.navigators)) {
+            const before = current.navigators[id];
+            if (!before) {
+                navigators[id] = nav;
+                continue;
+            }
+            const navPatch = {};
+            if (JSON.stringify(nav.routes) !== JSON.stringify(before.routes))
+                navPatch.routes = nav.routes;
+            if (nav.initialRouteId !== before.initialRouteId) {
+                navPatch.initialRouteId = nav.initialRouteId ?? null;
+            }
+            if (Object.keys(navPatch).length > 0)
+                navigators[id] = navPatch;
+        }
+        patch.data = { navigators };
+    }
+    else {
+        patch.data = merged;
+        // A backfilled blob still wrapped in `legacy` unwraps on the first native write.
+        if (navigation && 'legacy' in navigation && navigation.legacy !== null)
+            patch.legacy = null;
+    }
+    return { op: 'update', entity: 'NavigationDocument', id: 'nav_default', patch };
+}
+/** expo-router path for a file: relative to routesDir (or app/), groups dropped, index is the dir. */
+function routeForFile(file, routesDir) {
+    const rel = isUnder(file, routesDir)
+        ? relative(routesDir, file)
+        : file.split(sep)[0] === 'app'
+            ? relative('app', file)
+            : basename(file);
+    const segments = rel
+        .replace(/\.tsx$/, '')
+        .split(sep)
+        .filter((p) => !(p.startsWith('(') && p.endsWith(')')));
+    if (segments[segments.length - 1] === 'index')
+        segments.pop();
+    return `/${segments.join('/')}`;
+}
+function route(candidate, routesDir) {
+    return routeForFile(candidate.file, routesDir);
 }
 function rewriteFileSids(filePath, idMap) {
     if (!existsSync(filePath))

package/dist/services/adoptService.js.map

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

package/dist/services/clientFactory.js

@@ -3,13 +3,15 @@
 // the internal --denv flag can point a single run at another stage.
 import { JpatchClient } from '../api/client.js';
 import { readConfig } from '../project/config.js';
-import { resolveApiUrl } from '../project/env.js';
+import { assetUrlFor, resolveApiUrl } from '../project/env.js';
 import { readSecret } from '../project/secret.js';
 import { cliOrigin } from '../version.js';
 export function clientForApp(root, opts) {
     const config = readConfig(root);
+    const baseUrl = resolveApiUrl({ denv: opts.denv, configuredUrl: config.apiUrl });
     return new JpatchClient({
-        baseUrl: resolveApiUrl({ denv: opts.denv, configuredUrl: config.apiUrl }),
+        baseUrl,
+        assetsBaseUrl: assetUrlFor(baseUrl),
         projectId: config.projectId,
         token: readSecret(root),
         origin: cliOrigin(),

package/dist/services/clientFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"clientFactory.js","sourceRoot":"","sources":["../../src/services/clientFactory.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,+EAA+E;AAC/E,oEAAoE;AAEpE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,IAA6B;IACtE,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,IAAI,YAAY,CAAC;QACtB,OAAO,EAAE,aAAa,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QACzE,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC;QACvB,MAAM,EAAE,SAAS,EAAE;KACpB,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"clientFactory.js","sourceRoot":"","sources":["../../src/services/clientFactory.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,+EAA+E;AAC/E,oEAAoE;AAEpE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,IAA6B;IACtE,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IACjF,OAAO,IAAI,YAAY,CAAC;QACtB,OAAO;QACP,aAAa,EAAE,WAAW,CAAC,OAAO,CAAC;QACnC,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC;QACvB,MAAM,EAAE,SAAS,EAAE;KACpB,CAAC,CAAC;AACL,CAAC"}