@superblocksteam/vite-plugin-file-sync 2.0.114 → 2.0.115-next.1

package/dist/parsing/imports.js

@@ -1,5 +1,4 @@
 import { parse } from "@babel/parser";
-import { isPropertyInfo, splitJSPath } from "@superblocksteam/library-shared";
 import { traverse } from "../traverse.js";
 export const EXTERNAL_LIBRARY_OPTIONS = [
     {
@@ -21,73 +20,6 @@ export const EXTERNAL_LIBRARY_OPTIONS = [
         ]),
     },
 ];
-export const REQUIRED_IMPORTS_BY_PROPERTY_TYPE = {
-    BINDING: [
-        {
-            importName: "SB",
-            importPath: "@superblocksteam/library",
-        },
-    ],
-    COMPUTED: [
-        {
-            importName: "computed",
-            importPath: "@superblocksteam/library",
-        },
-    ],
-    TEMPLATE: [
-        {
-            importName: "computed",
-            importPath: "@superblocksteam/library",
-        },
-    ],
-    DIMENSION: [
-        {
-            importName: "Dim",
-            importPath: "@superblocksteam/library",
-        },
-    ],
-};
-export const EXPRESSION_IMPORTS_BY_IDENTIFIER = {
-    Theme: {
-        importName: "Theme",
-        importPath: "@superblocksteam/library",
-    },
-    Dim: {
-        importName: "Dim",
-        importPath: "@superblocksteam/library",
-    },
-    Global: {
-        importName: "Global",
-        importPath: "@superblocksteam/library",
-    },
-};
-const EXPRESSION_IDENTIFIERS = new Set(Object.keys(EXPRESSION_IMPORTS_BY_IDENTIFIER));
-export function getRequiredImportsForProperty(property) {
-    const allImports = new Set();
-    function collectImports(prop) {
-        if (isPropertyInfo(prop)) {
-            if (prop.type === "EXPRESSION" && typeof prop.value === "string") {
-                // this is good enough, we don't need to run a larger babel parse step for our common cases
-                const splitPath = splitJSPath(prop.value);
-                const key = splitPath?.[0];
-                if (key && EXPRESSION_IDENTIFIERS.has(key)) {
-                    allImports.add(EXPRESSION_IMPORTS_BY_IDENTIFIER[key]);
-                    return;
-                }
-            }
-            else if (prop.type in REQUIRED_IMPORTS_BY_PROPERTY_TYPE) {
-                REQUIRED_IMPORTS_BY_PROPERTY_TYPE[prop.type]?.forEach((imp) => allImports.add(imp));
-            }
-        }
-        if (typeof prop === "object" && prop !== null && !Array.isArray(prop)) {
-            for (const key in prop) {
-                collectImports(prop[key]);
-            }
-        }
-    }
-    collectImports(property);
-    return Array.from(allImports);
-}
 export function getImports(code) {
     const importPaths = [];
     try {

package/dist/parsing/imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/parsing/imports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/parsing/imports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAO1C,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC;QACE,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;KAC5B;IACD;QACE,OAAO,EAAE,0BAA0B;QACnC,OAAO,EAAE,IAAI,GAAG,CAAC;YACf,iBAAiB;YACjB,YAAY;YACZ,gBAAgB;YAChB,UAAU;YACV,oBAAoB;YACpB,QAAQ;YACR,OAAO;YACP,KAAK;YACL,OAAO;SACR,CAAC;KACH;CACF,CAAC;AAEF,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE;YACtB,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC;SAC/B,CAAC,CAAC;QACH,QAAQ,CAAC,GAAG,EAAE;YACZ,iBAAiB,CAAC,IAAI;gBACpB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC3C,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}

package/dist/parsing/jsx.d.ts

@@ -23,7 +23,5 @@ export declare function isNamedComponent(element: t.JSXOpeningElement): boolean;
 export declare function getDescriptiveName(element: t.JSXElement): string | null;
 export declare function getScopeFunctionName(path: NodePath<t.JSXElement>): string | null;
 export declare function getJSXAttributeType(attr: t.JSXAttribute | t.JSXSpreadAttribute): string;
-export declare function getJSXAttributeName(attr: t.JSXAttribute | t.JSXSpreadAttribute): string | null;
-export declare function getVariableReferences(jsxAttribute: t.Node, variablesToCheck: Set<string>): string[];
 export {};
 //# sourceMappingURL=jsx.d.ts.map

package/dist/parsing/jsx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsx.d.ts","sourceRoot":"","sources":["../../src/parsing/jsx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAQlC,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EACf,UAAU,EAEV,YAAY,EAEb,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAcvE,KAAK,gBAAgB,GAAG,UAAU,GAAG,eAAe,GAAG,YAAY,CAAC;AAEpE,MAAM,MAAM,OAAO,GAAG;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE;QACR,OAAO,EAAE,OAAO,CAAC;QACjB,WAAW,EAAE,SAAS,CAAC;KACxB,EAAE,CAAC;IACJ,YAAY,EAAE;QACZ,OAAO,EAAE,OAAO,CAAC;QACjB,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;KACpC,EAAE,CAAC;IACJ,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,kBAE1D;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAC/B,OAAO,EAAE,OAAO,GACf,UAAU,CA8BZ;AAYD,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAChC,MAAM,EAAE,SAAS,GAAG,gBAAgB,EACpC,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,OAAc,4CAgExB;AA+OD,wBAAgB,UAAU,CACxB,IAAI,EAAE,QAAQ,CACV,CAAC,CAAC,UAAU,GACZ,CAAC,CAAC,sBAAsB,GACxB,CAAC,CAAC,OAAO,GACT,CAAC,CAAC,cAAc,GAChB,CAAC,CAAC,WAAW,CAChB,EACD,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,OAAO,QAWjB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,iBAAiB,GAAG,OAAO,CAMtE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,CAAC,CAAC,UAAU,GAAG,MAAM,GAAG,IAAI,CAwBvE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,GAC3B,MAAM,GAAG,IAAI,CAkBf;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,kBAAkB,GAC1C,MAAM,CA8BR;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,kBAAkB,GAC1C,MAAM,GAAG,IAAI,CAQf;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,CAAC,CAAC,IAAI,EACpB,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,YAgE9B"}
+{"version":3,"file":"jsx.d.ts","sourceRoot":"","sources":["../../src/parsing/jsx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAQlC,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EACf,UAAU,EAEV,YAAY,EAEb,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAcvE,KAAK,gBAAgB,GAAG,UAAU,GAAG,eAAe,GAAG,YAAY,CAAC;AAEpE,MAAM,MAAM,OAAO,GAAG;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE;QACR,OAAO,EAAE,OAAO,CAAC;QACjB,WAAW,EAAE,SAAS,CAAC;KACxB,EAAE,CAAC;IACJ,YAAY,EAAE;QACZ,OAAO,EAAE,OAAO,CAAC;QACjB,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;KACpC,EAAE,CAAC;IACJ,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,kBAE1D;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAC/B,OAAO,EAAE,OAAO,GACf,UAAU,CA8BZ;AAYD,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAChC,MAAM,EAAE,SAAS,GAAG,gBAAgB,EACpC,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,OAAc,4CAgExB;AA+OD,wBAAgB,UAAU,CACxB,IAAI,EAAE,QAAQ,CACV,CAAC,CAAC,UAAU,GACZ,CAAC,CAAC,sBAAsB,GACxB,CAAC,CAAC,OAAO,GACT,CAAC,CAAC,cAAc,GAChB,CAAC,CAAC,WAAW,CAChB,EACD,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,OAAO,QAWjB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,iBAAiB,GAAG,OAAO,CAMtE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,CAAC,CAAC,UAAU,GAAG,MAAM,GAAG,IAAI,CAwBvE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,GAC3B,MAAM,GAAG,IAAI,CAkBf;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,kBAAkB,GAC1C,MAAM,CA8BR"}

package/dist/parsing/jsx.js

@@ -375,66 +375,4 @@ export function getJSXAttributeType(attr) {
     }
     return "string";
 }
-export function getJSXAttributeName(attr) {
-    if (attr.type === "JSXAttribute") {
-        const name = attr.name;
-        if (name.type === "JSXIdentifier") {
-            return name.name;
-        }
-    }
-    return null;
-}
-export function getVariableReferences(jsxAttribute, variablesToCheck) {
-    try {
-        const result = new Set();
-        // Simple recursive function to visit all nodes
-        function visit(node) {
-            if (!node || typeof node !== "object")
-                return;
-            // Handle identifiers
-            if (t.isIdentifier(node)) {
-                if (variablesToCheck.has(node.name)) {
-                    result.add(node.name);
-                }
-            }
-            // Handle member expressions - check the object part
-            if (t.isMemberExpression(node)) {
-                if (t.isIdentifier(node.object) &&
-                    variablesToCheck.has(node.object.name)) {
-                    result.add(node.object.name);
-                }
-            }
-            // Handle call expressions - check the callee
-            if (t.isCallExpression(node)) {
-                if (t.isIdentifier(node.callee) &&
-                    variablesToCheck.has(node.callee.name)) {
-                    result.add(node.callee.name);
-                }
-            }
-            // Recursively visit all child nodes
-            for (const key in node) {
-                if (key === "type" ||
-                    key === "start" ||
-                    key === "end" ||
-                    key === "loc") {
-                    continue;
-                }
-                const child = node[key];
-                if (Array.isArray(child)) {
-                    child.forEach(visit);
-                }
-                else if (child && typeof child === "object") {
-                    visit(child);
-                }
-            }
-        }
-        // Start visiting from the JSX attribute
-        visit(jsxAttribute);
-        return Array.from(result);
-    }
-    catch (e) {
-        console.error("Error analyzing JSX attribute for variable references:", e);
-        return [];
-    }
-}
 //# sourceMappingURL=jsx.js.map

package/dist/parsing/jsx.js.map

@@ -1 +1 @@
-{"version":3,"file":"jsx.js","sourceRoot":"","sources":["../../src/parsing/jsx.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jsx.js","sourceRoot":"","sources":["../../src/parsing/jsx.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,OAAO,EACL,mBAAmB,EACnB,QAAQ,EACR,QAAQ,GAET,MAAM,iCAAiC,CAAC;AAWzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EACL,WAAW,EACX,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,4BAA4B,GAC7B,MAAM,WAAW,CAAC;AAiBnB,MAAM,UAAU,gBAAgB,CAAC,GAAW,EAAE,KAAa;IACzD,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,OAA+B,EAC/B,OAAgB;IAEhB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,MAAM,UAAU,GAAe,EAAE,CAAC;IAClC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACrD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,mCAAmC,OAAO,EAAE,CAAC,CAAC;QAC1D,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChD,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;YAC1B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;YACzD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO;YACT,CAAC;YAED,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAChC,IAAI,KAAK,CAAC,eAAe,EAAE,EAAE,CAAC;gBAC5B,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3D,CAAC;iBAAM,IAAI,KAAK,CAAC,wBAAwB,EAAE,EAAE,CAAC;gBAC5C,MAAM,WAAW,GAAG,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBACxD,IAAI,WAAW,EAAE,CAAC;oBAChB,UAAU,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC;gBACrC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,kBAAkB,CACzB,QAAiC,EACjC,MAAwB,EACxB,OAAgB;IAEhB,QAAQ;SACL,GAAG,CAAC,UAAU,CAAC;SACf,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,QAAgC,EAChC,MAAoC,EACpC,OAAgB,EAChB,UAAmB,IAAI;IAEvB,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC;IAE9B,MAAM,IAAI,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IAEpC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAG,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/C,MAAM,EAAE,GACN,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC;QACrC,KAAK,CAAC,mBAAmB,CAAsC,EAAE,KAAK,CAAC;IAE1E,IAAI,IAAkC,CAAC;IAEvC,qGAAqG;IACrG,yGAAyG;IACzG,MAAM,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;QAC7D,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACzD,OAAO,WAAW,KAAK,IAAI,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,IACE,EAAE;QACF,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC;YAC9C,iBAAiB,CAAC,OAAO,CAAC,CAAC,EAC7B,CAAC;QACD,IAAI,GAAG;YACL,IAAI;YACJ,EAAE;YACF,IAAI,EAAE,QAAQ,CAAC,UAAU;YACzB,UAAU,EAAE,KAAK;YACjB,OAAO;YACP,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;SAClC,CAAC;IACzB,CAAC;SAAM,CAAC;QACN,IAAI,GAAG;YACL,IAAI;YACJ,EAAE,EAAE,EAAE,IAAI,IAAI;YACd,IAAI,EAAE,QAAQ,CAAC,eAAe;YAC9B,UAAU,EAAE,KAAK;YACjB,OAAO;YACP,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;YACtD,SAAS,EAAE,gBAAgB,EAAE,WAAW;SACf,CAAC;IAC9B,CAAC;IAED,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACxB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAC5B,CAAC;IACD,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;QACtB,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7B,QAAQ;aACL,GAAG,CAAC,UAAU,CAAC;aACf,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,2BAA2B,CAClC,UAA6C,EAC7C,MAAwB,EACxB,OAAgB;IAEhB,MAAM,kBAAkB,GAAG;QACzB,GAAG,OAAO;QACV,WAAW,EAAE,IAAI;KAClB,CAAC;IAEF,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAChD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,IAAI,UAAU,CAAC,YAAY,EAAE,IAAI,UAAU,CAAC,aAAa,EAAE,EAAE,CAAC;YAC5D,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;QACrD,CAAC;aAAM,IAAI,UAAU,CAAC,uBAAuB,EAAE,EAAE,CAAC;YAChD,2BAA2B,CAAC,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;QACtE,CAAC;aAAM,IAAI,UAAU,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACzC,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC9C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,IAAI,SAAS,CAAC,YAAY,EAAE,IAAI,SAAS,CAAC,aAAa,EAAE,EAAE,CAAC;YAC1D,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;QACpD,CAAC;aAAM,IAAI,SAAS,CAAC,uBAAuB,EAAE,EAAE,CAAC;YAC/C,2BAA2B,CAAC,SAAS,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;QACrE,CAAC;aAAM,IAAI,SAAS,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACxC,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAC3B,UAAiE,EACjE,MAAwB,EACxB,OAAgB;IAEhB,MAAM,mBAAmB,GAAG,CAC1B,UAAyD,EACzD,EAAE;QACF,MAAM,kBAAkB,GAAG;YACzB,IAAI,EAAE,QAAQ,CAAC,YAAY;YAC3B,IAAI,EAAE,UAAU;YAChB,EAAE,EAAE,qBAAqB,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YAChD,QAAQ,EAAE,EAAE;YACZ,UAAU,EAAE,EAAE;YACd,OAAO,EAAE,EAAE;SACW,CAAC;QACzB,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAE1C,UAAU,CAAC,QAAQ,CAAC;YAClB,UAAU,CAAC,IAAI;gBACb,UAAU,CAAC,IAAI,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;YAChD,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,+CAA+C;IAC/C,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACxC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,OAAO;IACT,CAAC;IAED,IAAI,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC;QAC1B,MAAM,cAAc,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,cAAc,KAAK,UAAU,EAAE,CAAC;YAClC,UAAU,CAAC,QAAQ,CAAC;gBAClB,uBAAuB,CAAC,IAAI;oBAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBAC9B,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;wBACxB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;oBACpC,CAAC;gBACH,CAAC;gBACD,eAAe,CAAC,IAAI;oBAClB,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;oBAC7C,IAAI,eAAe,CAAC,YAAY,EAAE,EAAE,CAAC;wBACnC,UAAU,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;oBAC/C,CAAC;gBACH,CAAC;gBACD,cAAc,CAAC,IAAI;oBACjB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBACrC,IACE,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;wBACzB,CAAC,SAAS,CAAC,kBAAkB,EAAE;4BAC7B,SAAS,CAAC,0BAA0B,EAAE,CAAC,EACzC,CAAC;wBACD,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;wBAC3C,IACE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;4BACxB,QAAQ,CAAC,YAAY,EAAE;4BACvB,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,KAAK,EACzC,CAAC;4BACD,mBAAmB,CAAC,IAAI,CAAC,CAAC;4BAC1B,uDAAuD;4BACvD,IAAI,CAAC,IAAI,EAAE,CAAC;wBACd,CAAC;oBACH,CAAC;gBACH,CAAC;aACF,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,cAAc,EAAE,CAAC;YAC1B,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAC5D,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC;gBACnD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACtC,yDAAyD;gBACzD,IACE,IAAI,CAAC,gBAAgB,EAAE;oBACvB,IAAI,CAAC,yBAAyB,EAAE;oBAChC,IAAI,CAAC,oBAAoB,EAAE,EAC3B,CAAC;oBACD,IAAI,CAAC,QAAQ,CAAC;wBACZ,UAAU,CAAC,OAAO;4BAChB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;4BACrC,OAAO,CAAC,IAAI,EAAE,CAAC;wBACjB,CAAC;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;SAAM,IACL,MAAM,CAAC,kBAAkB,EAAE;QAC3B,MAAM,CAAC,0BAA0B,EAAE,EACnC,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACxC,IACE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YACxB,QAAQ,CAAC,YAAY,EAAE;YACvB,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,KAAK,EACzC,CAAC;YACD,mBAAmB,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,6BAA6B,CACpC,QAA4C,EAC5C,MAAwB,EACxB,OAAgB;IAEhB,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAE9C,MAAM,mBAAmB,GAAG,MAAM,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC;IAEzD,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;QACxB,KAAK,uBAAuB,CAAC,CAAC,CAAC;YAC7B,IAAI,UAAU,CAAC,uBAAuB,EAAE,EAAE,CAAC;gBACzC,2BAA2B,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YAC3D,CAAC;YACD,MAAM;QACR,CAAC;QACD,KAAK,mBAAmB,CAAC,CAAC,CAAC;YACzB,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACtC,IACE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;gBACrB,CAAC,KAAK,CAAC,YAAY,EAAE,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC,EAC/C,CAAC;gBACD,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE;oBACxB,WAAW,EAAE,IAAI;oBACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,YAAY,EAAE,OAAO,CAAC,YAAY;oBAClC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;iBAC7C,CAAC,CAAC;YACL,CAAC;YACD,MAAM;QACR,CAAC;QACD,KAAK,gBAAgB,CAAC;QACtB,KAAK,wBAAwB,CAAC,CAAC,CAAC;YAC9B,IACE,UAAU,CAAC,gBAAgB,EAAE;gBAC7B,UAAU,CAAC,wBAAwB,EAAE,EACrC,CAAC;gBACD,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YACpD,CAAC;YACD,MAAM;QACR,CAAC;QACD,KAAK,YAAY,CAAC,CAAC,CAAC;YAClB,IAAI,UAAU,CAAC,YAAY,EAAE,EAAE,CAAC;gBAC9B,MAAM,cAAc,GAAG,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACzD,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;oBAC5D,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;oBACzD,OAAO,WAAW,KAAK,cAAc,CAAC;gBACxC,CAAC,CAAC,CAAC;gBAEH,IAAI,WAAW,EAAE,CAAC;oBAChB,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC;YACD,MAAM;QACR,CAAC;QACD;YACE,MAAM;IACV,CAAC;IACD,IAAI,mBAAmB,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;QACpD,6EAA6E;QAC7E,4BAA4B,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;AACH,CAAC;AAED,kEAAkE;AAClE,sEAAsE;AACtE,oFAAoF;AACpF,SAAS,4BAA4B,CACnC,QAA4C,EAC5C,MAAwB;IAExB,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC9C,IAAI,IAAI,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;IACjC,IAAI,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QACtB,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC;IACxC,CAAC;IACD,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC;QACpB,UAAU,EAAE,EAAE;QACd,EAAE,EAAE,MAAM,CAAC,EAAE,GAAG,GAAG,GAAG,qBAAqB,CAAC,IAAI,CAAC;QACjD,IAAI;QACJ,IAAI,EAAE,QAAQ,CAAC,WAAW;QAC1B,QAAQ,EAAE,EAAE;KACS,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,cAAc,CACrB,QAA6B,EAC7B,MAAwB;IAExB,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;IACjC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO;IACT,CAAC;IACD,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC;QACpB,EAAE,EAAE,MAAM,CAAC,EAAE,GAAG,GAAG,GAAG,qBAAqB,CAAC,IAAI,CAAC;QACjD,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,QAAQ,CAAC,QAAQ;QACvB,OAAO,EAAE,MAAM;QACf,IAAI,EAAE,IAAI;QACV,aAAa,EAAE,KAAK;KACF,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,IAMC,EACD,MAAwB,EACxB,OAAgB;IAEhB,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;QACzB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;SAAM,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;QAC/B,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;SAAM,IAAI,IAAI,CAAC,wBAAwB,EAAE,EAAE,CAAC;QAC3C,6BAA6B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC;SAAM,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;QAC5B,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAA4B;IAC3D,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CACtC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CACtC,CAAC;IAEhC,OAAO,CAAC,CAAC,QAAQ,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAqB;IACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CACrD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CACtC,CAAC;IAEhC,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,aAAa,GAAG,4BAA4B,CAAC,QAAQ,CAAC,CAAC;QAC7D,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC;QACvB,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC;IAChD,IAAI,WAAW,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;QAC9B,6GAA6G;QAC7G,gFAAgF;QAChF,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,IAA4B;IAE5B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IAEzB,IAAI,KAAK,CAAC,IAAI,EAAE,yBAAyB,EAAE,EAAE,CAAC;QAC5C,0EAA0E;QAC1E,IAAI,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;YAC9C,MAAM,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;YAChC,IAAI,EAAE,IAAI,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC7B,OAAO,gBAAgB,CAAC,EAAE,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,EAAE,qBAAqB,EAAE,EAAE,CAAC;QAC/C,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,EAAE,IAAI,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC;YAC5B,OAAO,gBAAgB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,IAA2C;IAE3C,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;QACvC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,KAAK,eAAe,EAAE,CAAC;QACzC,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,KAAK,wBAAwB,EAAE,CAAC;QAClD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;QACzC,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;YACxB,KAAK,eAAe;gBAClB,OAAO,QAAQ,CAAC;YAClB,KAAK,gBAAgB;gBACnB,OAAO,QAAQ,CAAC;YAClB,KAAK,gBAAgB;gBACnB,OAAO,SAAS,CAAC;YACnB,KAAK,kBAAkB;gBACrB,OAAO,QAAQ,CAAC;YAClB,KAAK,iBAAiB;gBACpB,OAAO,OAAO,CAAC;YACjB;gBACE,MAAM,CAAC,IAAI,CACT,6CAA6C,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAC7E,CAAC;gBACF,OAAO,QAAQ,CAAC;QACpB,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/dist/socket-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket-manager.d.ts","sourceRoot":"","sources":["../src/socket-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAKlC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAIjD,OAAO,KAAK,EAGV,mBAAmB,EACnB,oBAAoB,EAGrB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAIL,kBAAkB,EAEnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAEV,aAAa,EAEd,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAK3D,KAAK,mBAAmB,GAAG;IACzB,gBAAgB,EAAE,CAAC,aAAa,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/D,iBAAiB,EAAE,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACzD,mBAAmB,EAAE,CAAC,MAAM,CAAC,CAAC;CAC/B,CAAC;AAOF,wBAAgB,yBAAyB,IAAI,OAAO,CAEnD;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAEjE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,iBAIjD;AAED,wBAAgB,oBAAoB,SAGnC;AAED,cAAM,aAAc,SAAQ,kBAAkB,CAAC,mBAAmB,CAAC;IACjE,OAAO,CAAC,OAAO,CAA8C;IAE7D,OAAO,CAAC,aAAa,CAAiD;IACtE,OAAO,CAAC,cAAc,CAAkD;IACxE,OAAO,CAAC,SAAS,CAAwB;gBAE7B,MAAM,EAAE,MAAM;IAI1B,OAAO,CAAC,YAAY,CAA8B;IAClD,iBAAiB,CAAC,EAChB,MAAM,EACN,eAAe,EACf,WAAW,EACX,WAAW,EACX,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,kBAAkB,EAClB,IAAI,EACJ,MAAM,EACN,gBAAgB,EAChB,kBAAkB,GACnB,EAAE;QACD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACpB,eAAe,EAAE,iBAAiB,CAAC;QACnC,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;QACtB,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;QAC3D,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B;IA8xCD,iBAAiB,CACf,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAOnE,kBAAkB,CAChB,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,oBAAoB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAOpE,mBAAmB;IAInB,gBAAgB,IAAI,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;IAIhE,eAAe;IASf,OAAO;CAGR"}
+{"version":3,"file":"socket-manager.d.ts","sourceRoot":"","sources":["../src/socket-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAKlC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAIjD,OAAO,KAAK,EAGV,mBAAmB,EACnB,oBAAoB,EAGrB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAIL,kBAAkB,EAEnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAEV,aAAa,EAEd,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAK3D,KAAK,mBAAmB,GAAG;IACzB,gBAAgB,EAAE,CAAC,aAAa,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/D,iBAAiB,EAAE,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACzD,mBAAmB,EAAE,CAAC,MAAM,CAAC,CAAC;CAC/B,CAAC;AAOF,wBAAgB,yBAAyB,IAAI,OAAO,CAEnD;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAEjE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,iBAIjD;AAED,wBAAgB,oBAAoB,SAGnC;AAED,cAAM,aAAc,SAAQ,kBAAkB,CAAC,mBAAmB,CAAC;IACjE,OAAO,CAAC,OAAO,CAA8C;IAE7D,OAAO,CAAC,aAAa,CAAiD;IACtE,OAAO,CAAC,cAAc,CAAkD;IACxE,OAAO,CAAC,SAAS,CAAwB;gBAE7B,MAAM,EAAE,MAAM;IAI1B,OAAO,CAAC,YAAY,CAA8B;IAClD,iBAAiB,CAAC,EAChB,MAAM,EACN,eAAe,EACf,WAAW,EACX,WAAW,EACX,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,kBAAkB,EAClB,IAAI,EACJ,MAAM,EACN,gBAAgB,EAChB,kBAAkB,GACnB,EAAE;QACD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACpB,eAAe,EAAE,iBAAiB,CAAC;QACnC,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;QACtB,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;QAC3D,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B;IAo2CD,iBAAiB,CACf,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAOnE,kBAAkB,CAChB,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,oBAAoB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAOpE,mBAAmB;IAInB,gBAAgB,IAAI,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;IAIhE,eAAe;IASf,OAAO;CAGR"}

package/dist/socket-manager.js

@@ -51,9 +51,26 @@ class SocketManager extends TracedEventEmitter {
         const wss = new WebSocketServer({ path, noServer: true });
         this.socketServer = wss;
         let activeGitService = gitService;
+        // Sticky guard. Set to true by `gitDisconnect` and deliberately NOT
+        // cleared when it finishes: any callers of `getActiveGitService()` that
+        // started before disconnect but resolve after it completes must still
+        // return `undefined` so they can't resurrect a git service (and re-assert
+        // `superblocks/live`) by assigning the activated value and running
+        // `ensureLiveBranchCheckedOut`. The only legitimate path that flips this
+        // back to false is the `gitActivate` RPC, which represents an explicit
+        // user-driven reconnect; automatic paths (editor-reconnect's
+        // fire-and-forget `void activateGitService()`) must not override a manual
+        // disconnect.
+        let disconnectInProgress = false;
         const getActiveGitService = async () => {
+            if (disconnectInProgress) {
+                return undefined;
+            }
             if (activeGitService) {
                 await ensureLiveBranchCheckedOut(activeGitService);
+                if (disconnectInProgress) {
+                    return undefined;
+                }
                 aiService?.setRuntimeGitServices(activeGitService, syncService, gitOperationLock);
                 return activeGitService;
             }
@@ -64,10 +81,20 @@ class SocketManager extends TracedEventEmitter {
             // Retry briefly so users don't need a manual dev server restart.
             const maxAttempts = 5;
             for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+                if (disconnectInProgress) {
+                    return undefined;
+                }
                 try {
-                    activeGitService = await activateGitService();
+                    const activated = await activateGitService();
+                    if (disconnectInProgress) {
+                        return undefined;
+                    }
+                    activeGitService = activated;
                     if (activeGitService) {
                         await ensureLiveBranchCheckedOut(activeGitService);
+                        if (disconnectInProgress) {
+                            return undefined;
+                        }
                         aiService?.setRuntimeGitServices(activeGitService, syncService, gitOperationLock);
                         return activeGitService;
                     }
@@ -170,13 +197,6 @@ class SocketManager extends TracedEventEmitter {
             const middlewares = [recordingMiddleware, authMiddleware].filter((m) => m != null);
             const socket = createISocketClient(new TracedSocket(ws, {
                 editor: {
-                    // Update widgets
-                    setProperties: [fileSyncManager.handleSetProperties],
-                    deleteProperties: [fileSyncManager.handleDeleteProperties],
-                    createComponent: [fileSyncManager.handleCreateComponent],
-                    deleteComponents: [fileSyncManager.handleDeleteComponents],
-                    setProperty: [fileSyncManager.handleSetProperty],
-                    batchUpdate: [fileSyncManager.handleBatchUpdate],
                     // Renames
                     renameElement: [fileSyncManager.handleRenameElement],
                     renameApi: [fileSyncManager.handleRenameApi],
@@ -195,29 +215,37 @@ class SocketManager extends TracedEventEmitter {
                     ],
                     // AI + draft handling
                     aiGenerate: [
-                        async (request, _context, peer) => {
-                            await aiService?.handleAiGenerate(request, peer, peerId);
+                        async (request) => {
+                            await aiService?.handleAiGenerate(request);
                         },
                     ],
                     aiGenerateWithQueue: [
-                        async (request, _context, peer) => {
+                        async (request) => {
                             if (!aiService) {
                                 throw new Error("AI service not available");
                             }
                             const { queueMode, ...aiRequest } = request;
-                            return await aiService.handleAiGenerateWithQueue(aiRequest, peer, peerId, queueMode);
+                            return await aiService.handleAiGenerateWithQueue(aiRequest, queueMode);
+                        },
+                    ],
+                    aiTriggerMigrationTurn: [
+                        async (request) => {
+                            if (!aiService) {
+                                throw new Error("AI service not available");
+                            }
+                            return await aiService.handleAiTriggerMigrationTurn(request);
                         },
                     ],
                     aiRejectDraft: [
-                        async (request, _context, peer) => {
+                        async (request) => {
                             await syncService?.discardLocalDraftChanges("ai:reject");
-                            await aiService?.handleUserRejectedDraft(peer, request.silently);
+                            await aiService?.handleUserRejectedDraft(request.silently);
                         },
                     ],
                     aiAcceptDraft: [
-                        async (request, _context, peer) => {
+                        async (request, _context) => {
                             const result = await syncService?.commitLocalDraftChanges("ai:accept");
-                            await aiService?.handleUserAcceptedDraft(peer, request.silently);
+                            await aiService?.handleUserAcceptedDraft(request.silently);
                             if (result?.commitId) {
                                 // Upload context file to bucketeer asynchronously (fire-and-forget)
                                 if (aiService && syncService) {
@@ -281,23 +309,23 @@ class SocketManager extends TracedEventEmitter {
                         },
                     ],
                     aiInterpretPrompt: [
-                        async (request, _context, peer) => {
-                            await aiService?.handlePromptInterpretation(request, peer);
+                        async (request) => {
+                            await aiService?.handlePromptInterpretation(request);
                         },
                     ],
                     aiExplainCode: [
-                        async (request, _context, peer) => {
-                            await aiService?.handleAiExplainCode(request, peer);
+                        async (request) => {
+                            await aiService?.handleAiExplainCode(request);
                         },
                     ],
                     aiSummarizeApiUsage: [
-                        async (request, _context, peer) => {
-                            await aiService?.handleAiSummarizeApiUsage(request, peer);
+                        async (request) => {
+                            await aiService?.handleAiSummarizeApiUsage(request);
                         },
                     ],
                     aiSummarizeError: [
-                        async (request, _context, peer) => {
-                            await aiService?.handleAiSummarizeError(request, peer);
+                        async (request) => {
+                            await aiService?.handleAiSummarizeError(request);
                         },
                     ],
                     aiSkipTestCase: [
@@ -306,8 +334,8 @@ class SocketManager extends TracedEventEmitter {
                         },
                     ],
                     aiRespondToToolPermission: [
-                        async (request, _context, peer) => {
-                            await aiService?.handleAiRespondToToolPermission(request, peer, peerId);
+                        async (request) => {
+                            await aiService?.handleAiRespondToToolPermission(request);
                         },
                     ],
                     aiLabelAttachment: [
@@ -686,12 +714,27 @@ class SocketManager extends TracedEventEmitter {
                     ],
                     gitActivate: [
                         async () => runWithGitLock(async () => {
+                            // `gitActivate` is fired on explicit user-driven
+                            // (re)connect; it is the sole path allowed to clear the
+                            // sticky `disconnectInProgress` flag set by
+                            // `gitDisconnect`. Without this reset, a user who
+                            // disconnects and then reconnects in the same process
+                            // would be stuck with git permanently disabled.
+                            disconnectInProgress = false;
                             const service = await getActiveGitService();
                             return { activated: !!service };
                         }),
                     ],
                     gitDisconnect: [
                         async () => runWithGitLock(async () => {
+                            // Atomically deactivate git BEFORE any teardown work so
+                            // that concurrent callers of getActiveGitService() can't
+                            // grab the old service and force `superblocks/live` back
+                            // via ensureLiveBranchCheckedOut() while we're switching
+                            // branches and removing `.git`.
+                            const serviceToDisconnect = activeGitService;
+                            activeGitService = undefined;
+                            disconnectInProgress = true;
                             // Ensure DBFS sync context is no longer tied to
                             // `superblocks/live` immediately after native git disconnect.
                             syncService?.setBranchName(DEFAULT_NON_GIT_BRANCH);
@@ -731,12 +774,12 @@ class SocketManager extends TracedEventEmitter {
                                     }
                                 }
                             }
-                            if (activeGitService) {
-                                const gitDir = join(activeGitService.workDir, ".git");
+                            if (serviceToDisconnect) {
+                                const gitDir = join(serviceToDisconnect.workDir, ".git");
                                 let checkoutBranchBeforeDisconnect = DEFAULT_NON_GIT_BRANCH;
                                 try {
                                     checkoutBranchBeforeDisconnect =
-                                        await activeGitService.getDefaultBranch();
+                                        await serviceToDisconnect.getDefaultBranch();
                                 }
                                 catch (defaultBranchErr) {
                                     getLogger().warn("[git] gitDisconnect failed to detect remote default branch before cleanup; falling back to non-git baseline branch", {
@@ -748,7 +791,7 @@ class SocketManager extends TracedEventEmitter {
                                     });
                                 }
                                 try {
-                                    await activeGitService.checkoutOrCreate(checkoutBranchBeforeDisconnect);
+                                    await serviceToDisconnect.checkoutOrCreate(checkoutBranchBeforeDisconnect);
                                 }
                                 catch (checkoutErr) {
                                     getLogger().warn("[git] gitDisconnect failed to checkout branch before removing git metadata", {
@@ -760,8 +803,19 @@ class SocketManager extends TracedEventEmitter {
                                         ...getErrorMeta(checkoutErr),
                                     });
                                 }
-                                activeGitService = undefined;
-                                await rm(gitDir, { recursive: true, force: true });
+                                try {
+                                    await rm(gitDir, { recursive: true, force: true });
+                                }
+                                catch (rmErr) {
+                                    getLogger().warn("[git] gitDisconnect failed to remove .git directory; manual cleanup may be required", {
+                                        gitCategory: "setup",
+                                        gitOperation: "disconnect",
+                                        gitOutcome: "failed",
+                                        gitErrorKind: "git_dir_removal_failed",
+                                        gitDir,
+                                        ...getErrorMeta(rmErr),
+                                    });
+                                }
                             }
                         }),
                     ],
@@ -840,6 +894,29 @@ class SocketManager extends TracedEventEmitter {
                                     });
                                 }
                             }
+                            else if (branch === SUPERBLOCKS_LIVE_GIT_BRANCH) {
+                                // Local superblocks/live can be stale after CSB
+                                // rotations or container restarts. Fetch from origin
+                                // and fast-forward to include any pushed commits from
+                                // previous sessions without losing unpushed local work.
+                                try {
+                                    await readyGitService.fetch("origin", SUPERBLOCKS_LIVE_GIT_BRANCH);
+                                    await readyGitService.raw([
+                                        "merge",
+                                        "--ff-only",
+                                        `origin/${SUPERBLOCKS_LIVE_GIT_BRANCH}`,
+                                    ]);
+                                }
+                                catch (ffErr) {
+                                    getLogger().warn("[git] gitBranchLog live branch fast-forward failed", {
+                                        gitCategory: "branch",
+                                        gitOperation: "branch-log-ff",
+                                        gitOutcome: "failed",
+                                        branch: SUPERBLOCKS_LIVE_GIT_BRANCH,
+                                        ...getErrorMeta(ffErr),
+                                    });
+                                }
+                            }
                             const raw = await readyGitService.raw([
                                 "log",
                                 logRef,