@superblocksteam/vite-plugin-file-sync 2.0.3-next.98 → 2.0.3

package/dist/parsing/events/to-code-events.js

@@ -1,6 +1,30 @@
+import { containsStringInterpolation, isComputedPropertyInfo, } from "@superblocksteam/library-shared";
 import { TriggerStepType } from "@superblocksteam/library-shared/types";
 import { ApplicationScope, containsBindingsAnywhere, isValidStepDef, } from "@superblocksteam/shared";
 import { getLogger } from "../../util/logger.js";
+import { parser as computedParser } from "../computed/index.js";
+const getDynamicValue = (value) => {
+    if (value === undefined) {
+        return "undefined";
+    }
+    else if (isComputedPropertyInfo(value)) {
+        return computedParser.toCode(value.value);
+    }
+    else if (containsStringInterpolation(value)) {
+        return `sbComputed(() => \`${value}\`)`;
+    }
+    if (typeof value === "object" && value != null) {
+        return JSON.stringify(value);
+    }
+    if (typeof value === "string") {
+        let strValue = `"${value}"`;
+        if (value.includes('"')) {
+            strValue = `\`${value}\``;
+        }
+        return strValue;
+    }
+    return value;
+};
 export function toCodeEventFlow(stepDefs_) {
     if (!stepDefs_.length) {
         return "SbEventFlow.start()";
@@ -35,7 +59,11 @@ export function toCodeEventFlow(stepDefs_) {
                     const emptySuccessCode = !onSuccessCode ? ", undefined" : "";
                     onErrorCode = `${emptySuccessCode}, ${toCodeEventFlow(stepDef.onError)}`;
                 }
-                code = `${code}.runApis([${apiNames.map((apiName) => `"${apiName}"`).join(", ")}]${onSuccessCode}${onErrorCode})`;
+                code = `${code}.runApis([${apiNames.map((apiName) => `${apiName}`).join(", ")}]${onSuccessCode}${onErrorCode})`;
+                break;
+            }
+            case TriggerStepType.CANCEL_APIS: {
+                code = `${code}.cancelApis([${stepDef.apiNames.map((apiName) => `${apiName}`).join(", ")}])`;
                 break;
             }
             case TriggerStepType.NAVIGATE_TO: {
@@ -53,28 +81,33 @@ export function toCodeEventFlow(stepDefs_) {
                 break;
             }
             case TriggerStepType.SET_STATE_VAR: {
-                const name = `${stepDef.state?.scope === ApplicationScope.APP ? "App." : ""}${stepDef.state?.name ?? ""}`;
-                const value = stepDef.value ?? "";
-                if (containsBindingsAnywhere(value)) {
-                    code = `${code}.setStateVar("${name}", SB\`${value}\`)`;
-                }
-                else if (typeof value === "object" && value != null) {
-                    code = `${code}.setStateVar("${name}", ${JSON.stringify(value)})`;
-                }
-                else if (typeof value === "string") {
-                    let strValue = `"${value}"`;
-                    if (value.includes('"')) {
-                        strValue = `\`${value}\``;
-                    }
-                    code = `${code}.setStateVar("${name}", ${strValue})`;
-                }
-                else {
-                    code = `${code}.setStateVar("${name}", ${value})`;
-                }
+                const variableName = stepDef.state?.name !== undefined
+                    ? `${stepDef.state?.scope === ApplicationScope.APP ? "App." : ""}${stepDef.state.name}`
+                    : "undefined";
+                const value = stepDef.value;
+                const valueToCode = getDynamicValue(value);
+                code = `${code}.setStateVar(${variableName}, ${valueToCode})`;
+                break;
+            }
+            case TriggerStepType.RESET_STATE_VAR: {
+                const variableName = stepDef.state?.name !== undefined
+                    ? `${stepDef.state?.scope === ApplicationScope.APP ? "App." : ""}${stepDef.state.name}`
+                    : "undefined";
+                code = `${code}.resetStateVar(${variableName})`;
                 break;
             }
             case TriggerStepType.CONTROL_MODAL: {
-                code = `${code}.controlModal("${stepDef.name}", "${stepDef.direction ?? "open"}")`;
+                code = `${code}.controlModal(${stepDef.name}, "${stepDef.direction ?? "open"}")`;
+                break;
+            }
+            case TriggerStepType.SHOW_ALERT: {
+                const message = stepDef.message ?? "";
+                const styleArg = `"${stepDef.style ?? "success"}"`;
+                const durationArg = `, ${stepDef.alertDuration ?? 4}`;
+                const positionArg = stepDef.alertPosition !== undefined
+                    ? `, "${stepDef.alertPosition}"`
+                    : ``;
+                code = `${code}.showAlert(${getDynamicValue(message)}, ${styleArg}${durationArg}${positionArg})`;
                 break;
             }
             default:

package/dist/parsing/events/to-code-events.js.map

@@ -1 +1 @@
-{"version":3,"file":"to-code-events.js","sourceRoot":"","sources":["../../../src/parsing/events/to-code-events.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"to-code-events.js","sourceRoot":"","sources":["../../../src/parsing/events/to-code-events.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,cAAc,GACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,MAAM,IAAI,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGhE,MAAM,eAAe,GAAG,CAAC,KAAU,EAAE,EAAE;IACrC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,WAAW,CAAC;IACrB,CAAC;SAAM,IAAI,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;SAAM,IAAI,2BAA2B,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9C,OAAO,sBAAsB,KAAK,KAAK,CAAC;IAC1C,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,QAAQ,GAAG,IAAI,KAAK,GAAG,CAAC;QAC5B,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,QAAQ,GAAG,KAAK,KAAK,IAAI,CAAC;QAC5B,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,UAAU,eAAe,CAAC,SAAoB;IAClD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QACtB,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAED,IAAI,IAAI,GAAG,aAAa,CAAC;IACzB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,sEAAsE;QACtE,uFAAuF;QACvF,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;YAAE,SAAS;QACxC,MAAM,OAAO,GAAG,QAAQ,CAAC;QAEzB,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;YACrB,KAAK,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,UAAU,CAAC;gBACpD,IAAI,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBACzD,yGAAyG;oBACzG,IAAI,GAAG,GAAG,IAAI,UAAU,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;gBACnD,CAAC;qBAAM,CAAC;oBACN,IAAI,GAAG,GAAG,IAAI,UAAU,QAAQ,GAAG,CAAC;gBACtC,CAAC;gBACD,MAAM;YACR,CAAC;YACD,KAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;gBAExC,IAAI,aAAa,GAAW,EAAE,CAAC;gBAC/B,IAAI,WAAW,GAAW,EAAE,CAAC;gBAC7B,IAAI,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;oBAClC,aAAa,GAAG,KAAK,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC5D,CAAC;gBACD,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;oBAChC,MAAM,gBAAgB,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC7D,WAAW,GAAG,GAAG,gBAAgB,KAAK,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3E,CAAC;gBACD,IAAI,GAAG,GAAG,IAAI,aAAa,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAe,EAAE,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,aAAa,GAAG,WAAW,GAAG,CAAC;gBACxH,MAAM;YACR,CAAC;YACD,KAAK,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;gBACjC,IAAI,GAAG,GAAG,IAAI,gBAAgB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAe,EAAE,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;gBACrG,MAAM;YACR,CAAC;YACD,KAAK,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;gBACjC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;gBACxB,IAAI,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC;oBAClC,IAAI,GAAG,GAAG,IAAI;qBACH,GAAG;WACb,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,IAAI,GAAG,GAAG,IAAI;kBACN,OAAO,CAAC,GAAG;WAClB,CAAC;gBACJ,CAAC;gBACD,MAAM;YACR,CAAC;YACD,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;gBACnC,MAAM,YAAY,GAChB,OAAO,CAAC,KAAK,EAAE,IAAI,KAAK,SAAS;oBAC/B,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,KAAK,KAAK,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE;oBACvF,CAAC,CAAC,WAAW,CAAC;gBAElB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;gBAC5B,MAAM,WAAW,GAAW,eAAe,CAAC,KAAK,CAAC,CAAC;gBACnD,IAAI,GAAG,GAAG,IAAI,gBAAgB,YAAY,KAAK,WAAW,GAAG,CAAC;gBAC9D,MAAM;YACR,CAAC;YACD,KAAK,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC;gBACrC,MAAM,YAAY,GAChB,OAAO,CAAC,KAAK,EAAE,IAAI,KAAK,SAAS;oBAC/B,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,KAAK,KAAK,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE;oBACvF,CAAC,CAAC,WAAW,CAAC;gBAElB,IAAI,GAAG,GAAG,IAAI,kBAAkB,YAAY,GAAG,CAAC;gBAChD,MAAM;YACR,CAAC;YACD,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;gBACnC,IAAI,GAAG,GAAG,IAAI,iBAAiB,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC,SAAS,IAAI,MAAM,IAAI,CAAC;gBACjF,MAAM;YACR,CAAC;YACD,KAAK,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;gBAChC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;gBACtC,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAC,KAAK,IAAI,SAAS,GAAG,CAAC;gBACnD,MAAM,WAAW,GAAG,KAAK,OAAO,CAAC,aAAa,IAAI,CAAC,EAAE,CAAC;gBACtD,MAAM,WAAW,GACf,OAAO,CAAC,aAAa,KAAK,SAAS;oBACjC,CAAC,CAAC,MAAM,OAAO,CAAC,aAAa,GAAG;oBAChC,CAAC,CAAC,EAAE,CAAC;gBAET,IAAI,GAAG,GAAG,IAAI,cAAc,eAAe,CAAC,OAAO,CAAC,KAAK,QAAQ,GAAG,WAAW,GAAG,WAAW,GAAG,CAAC;gBAEjG,MAAM;YACR,CAAC;YAED;gBACE,SAAS,EAAE,CAAC,IAAI,CACd,mDAAmD,OAAO,CAAC,IAAI,EAAE,CAClE,CAAC;QACN,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/parsing/events/to-value-events.d.ts

@@ -1,5 +1,10 @@
 import type { NodePath } from "@babel/traverse";
 import type t from "@babel/types";
 import type { ValidStepDef } from "@superblocksteam/shared";
+export declare function getDynamicValue(valueNodePath: NodePath<t.Node>): string | {
+    type: "BINDING" | "EXPRESSION" | "TEMPLATE" | "STATIC" | "EVENT" | "DIMENSION";
+    value: string | undefined;
+    __info: true;
+} | import("@superblocksteam/library-shared/types").ComputedPropertyInfo<string | undefined>;
 export declare function toValueEventFlow(nodePath: NodePath<t.CallExpression>, existingSteps?: ValidStepDef[], parentId?: string): ValidStepDef[];
 //# sourceMappingURL=to-value-events.d.ts.map

package/dist/parsing/events/to-value-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"to-value-events.d.ts","sourceRoot":"","sources":["../../../src/parsing/events/to-value-events.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAmB5D,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,EACpC,aAAa,GAAE,YAAY,EAAO,EAClC,QAAQ,CAAC,EAAE,MAAM,GAChB,YAAY,EAAE,CAuKhB"}
+{"version":3,"file":"to-value-events.d.ts","sourceRoot":"","sources":["../../../src/parsing/events/to-value-events.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAClC,OAAO,KAAK,EAEV,YAAY,EACb,MAAM,yBAAyB,CAAC;AAmBjC,wBAAgB,eAAe,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;;;;6FAuB9D;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,EACpC,aAAa,GAAE,YAAY,EAAO,EAClC,QAAQ,CAAC,EAAE,MAAM,GAChB,YAAY,EAAE,CAyOhB"}

package/dist/parsing/events/to-value-events.js

@@ -1,6 +1,11 @@
 import { isCallExpression, isIdentifier, isMemberExpression, } from "@babel/types";
+import { Property } from "@superblocksteam/library-shared";
 import { ApplicationScope, TriggerStepType } from "@superblocksteam/shared";
+import { generate } from "../../generate.js";
 import { getLogger } from "../../util/logger.js";
+import { parser as computedParser } from "../computed/index.js";
+import { parser as dimensionParser } from "../dim/index.js";
+import { isDimNode, isSbComputedNode } from "../jsx-utils.js";
 import { nodeToValue, objectExpressionToObject } from "../util.js";
 const getApiCallbackNode = (nodePath) => {
     if (nodePath &&
@@ -12,6 +17,28 @@ const getApiCallbackNode = (nodePath) => {
     }
     return [];
 };
+export function getDynamicValue(valueNodePath) {
+    if (isSbComputedNode(valueNodePath)) {
+        return Property.Computed(computedParser.toValue(valueNodePath));
+        // TODO: make dimensions work as Dim instead of objects
+    }
+    else if (isDimNode(valueNodePath)) {
+        return Property.Computed(JSON.stringify(dimensionParser.toValue(valueNodePath)));
+    }
+    try {
+        const value = nodeToValue(valueNodePath.node);
+        if (typeof value === "string") {
+            return value;
+        }
+        if (value !== null || valueNodePath.node.type === "NullLiteral") {
+            return Property.Computed(JSON.stringify(value));
+        }
+    }
+    catch (_e) {
+        // do nothing
+    }
+    return Property.Computed(generate(valueNodePath.node).code);
+}
 export function toValueEventFlow(nodePath, existingSteps = [], parentId) {
     const logger = getLogger();
     const callee = nodePath.get("callee");
@@ -102,6 +129,16 @@ export function toValueEventFlow(nodePath, existingSteps = [], parentId) {
                 },
             ];
         }
+        case "cancelApis": {
+            if (args.length !== 1) {
+                return existingSteps;
+            }
+            const apiNames = nodeToValue(expression.node);
+            return [
+                ...existingSteps,
+                { id, type: TriggerStepType.CANCEL_APIS, apiNames },
+            ];
+        }
         case "setStateVar": {
             if (args.length !== 2) {
                 return existingSteps;
@@ -111,24 +148,51 @@ export function toValueEventFlow(nodePath, existingSteps = [], parentId) {
                 return existingSteps;
             }
             const name = nodeToValue(expression.node);
-            const value = nodeToValue(valueNodePath.node);
-            const isAppScoped = name.includes("App");
-            const variableName = isAppScoped ? name.split(".")[1] : name;
-            if (!variableName)
-                return existingSteps;
+            const value = getDynamicValue(valueNodePath);
+            const isAppScoped = name && name.startsWith("App.");
+            const variableName = isAppScoped ? name.split(".", 2)[1] : name;
             return [
                 ...existingSteps,
                 {
                     id,
                     type: TriggerStepType.SET_STATE_VAR,
-                    state: {
-                        id: variableName,
-                        name: variableName,
-                        scope: isAppScoped ? ApplicationScope.APP : ApplicationScope.PAGE,
-                    },
+                    state: variableName
+                        ? {
+                            name: variableName,
+                            scope: isAppScoped
+                                ? ApplicationScope.APP
+                                : ApplicationScope.PAGE,
+                        }
+                        : undefined,
                     value,
                 },
-            ];
+            ]; // TODO: until we bump packages/shared - kevin to follow up
+        }
+        case "resetStateVar": {
+            if (args.length !== 1) {
+                return existingSteps;
+            }
+            if (!args[0]?.node) {
+                return existingSteps;
+            }
+            const name = nodeToValue(args[0].node);
+            const isAppScoped = name && name.startsWith("App.");
+            const variableName = isAppScoped ? name.split(".", 2)[1] : name;
+            return [
+                ...existingSteps,
+                {
+                    id,
+                    type: TriggerStepType.RESET_STATE_VAR,
+                    state: variableName
+                        ? {
+                            name: variableName,
+                            scope: isAppScoped
+                                ? ApplicationScope.APP
+                                : ApplicationScope.PAGE,
+                        }
+                        : undefined,
+                },
+            ]; // TODO: until we bump packages/shared - kevin to follow up
         }
         case "controlModal": {
             if (args.length !== 2) {
@@ -149,6 +213,27 @@ export function toValueEventFlow(nodePath, existingSteps = [], parentId) {
                 },
             ];
         }
+        case "showAlert": {
+            const message = args[0] ? getDynamicValue(args[0]) : "";
+            const type = args[1]
+                ? nodeToValue(args[1].node)
+                : "success";
+            const duration = args[2] ? nodeToValue(args[2].node) : 4;
+            const position = args[3]
+                ? nodeToValue(args[3].node)
+                : undefined;
+            return [
+                ...existingSteps,
+                {
+                    id,
+                    type: TriggerStepType.SHOW_ALERT,
+                    message,
+                    style: type,
+                    alertDuration: duration,
+                    alertPosition: position,
+                },
+            ];
+        }
         default:
             logger.warn(`unknown event: ${eventName}`);
             return existingSteps;

package/dist/parsing/events/to-value-events.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"ids.d.ts","sourceRoot":"","sources":["../../src/parsing/ids.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EACV,gBAAgB,EAChB,iBAAiB,EACjB,IAAI,EACJ,cAAc,EACd,cAAc,EACf,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAEvE,KAAK,KAAK,GAAG,GAAG,CACd,SAAS,EACT,QAAQ,CACN,iBAAiB,GAAG,gBAAgB,GAAG,cAAc,GAAG,cAAc,CACvE,CACF,CAAC;AAIF,wBAAgB,oBAAoB,CAAC,EACnC,QAAQ,EACR,GAAG,EACH,eAAe,EACf,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,IAAI,CAAC;IACV,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE,CAmHnB;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,iBAAiB,GAAG,cAAc,GAAG,cAAc,EACzD,EAAE,EAAE,SAAS,QAId;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,iBAAiB,GAAG,cAAc,GAAG,cAAc,GAEvB,SAAS,GAAG,SAAS,CACxD;AAiBD,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAAE,EACpB,KAAK,EAAE,MAAM,GACZ,SAAS,CAEX"}
+{"version":3,"file":"ids.d.ts","sourceRoot":"","sources":["../../src/parsing/ids.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EACV,gBAAgB,EAChB,iBAAiB,EACjB,IAAI,EACJ,cAAc,EACd,cAAc,EACf,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAEvE,KAAK,KAAK,GAAG,GAAG,CACd,SAAS,EACT,QAAQ,CACN,iBAAiB,GAAG,gBAAgB,GAAG,cAAc,GAAG,cAAc,CACvE,CACF,CAAC;AAIF,wBAAgB,oBAAoB,CAAC,EACnC,QAAQ,EACR,GAAG,EACH,eAAe,EACf,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,IAAI,CAAC;IACV,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE,CAkJnB;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,iBAAiB,GAAG,cAAc,GAAG,cAAc,EACzD,EAAE,EAAE,SAAS,QAId;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,iBAAiB,GAAG,cAAc,GAAG,cAAc,GAEvB,SAAS,GAAG,SAAS,CACxD;AAiBD,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAAE,EACpB,KAAK,EAAE,MAAM,GACZ,SAAS,CAEX"}

package/dist/parsing/ids.js

@@ -1,9 +1,9 @@
 import { isObjectExpression, stringLiteral, objectProperty, identifier, isCallExpression, } from "@babel/types";
-import { WIDGET_SOURCE_ID_ATTRIBUTE } from "@superblocksteam/library-shared";
+import { getStableEntityId, WIDGET_SOURCE_ID_ATTRIBUTE, } from "@superblocksteam/library-shared";
 import { generatePredictableId } from "../ids.js";
 import { traverse } from "../traverse.js";
 import { makeJSXAttribute } from "./jsx.js";
-import { getTagName, isSbScopeFunction, isScopeFunction, nodeToValue, } from "./util.js";
+import { getTagName, isSbScopeFunction, nodeToValue } from "./util.js";
 // TODO(code-mode): profile if a two-pass approach is too slow for actual usage
 // this makes generating stable ids nice and easy, though
 export function supplementElementIds({ fileName, ast, shouldModifyAst, scopeId, }) {
@@ -29,42 +29,63 @@ export function supplementElementIds({ fileName, ast, shouldModifyAst, scopeId,
             }
         },
         CallExpression(path) {
-            // old scope registration (registerScope)
-            const isRegisterScope = path.type === "CallExpression" &&
-                path.node.callee.type === "Identifier" &&
-                isScopeFunction(path.node.callee.name);
-            // new scope registration (createSbScope)
+            // Check for createSbScope calls
             const isCreateSbScope = path.type === "CallExpression" &&
                 path.node.callee.type === "Identifier" &&
                 isSbScopeFunction(path.node.callee.name);
-            if (!isRegisterScope && !isCreateSbScope) {
+            if (!isCreateSbScope) {
                 path.skip();
                 return;
             }
-            const entities = isRegisterScope
-                ? path.get("arguments.1")
-                : path.get("arguments.0");
-            if (isObjectExpression(entities.node) && scopeId) {
-                entities.node.properties.forEach((property, index) => {
-                    if (property.type === "ObjectProperty") {
-                        const name = nodeToValue(property.key);
-                        const id = getSbElementId(property) ??
-                            `SB-${generatePredictableId(scopeId + name)}`;
-                        idMap.set(id, entities.get(`properties.${index}`));
-                        setSbElementId(property, id);
-                        if (shouldModifyAst) {
-                            if (isCallExpression(property.value) &&
-                                isObjectExpression(property.value.arguments[0])) {
-                                const entityConfig = property.value.arguments[0];
-                                entityConfig.properties.push(objectProperty(identifier("id"), stringLiteral(id)));
+            // For createSbScope, the first argument is now a function that returns an object
+            if (scopeId && path.node.arguments.length > 0) {
+                const firstArg = path.get("arguments.0");
+                // Handle function-based scope: createSbScope(() => ({ ... }))
+                if (!Array.isArray(firstArg) &&
+                    (firstArg.isArrowFunctionExpression() ||
+                        firstArg.isFunctionExpression())) {
+                    const functionBody = firstArg.get("body");
+                    let entitiesObject = null;
+                    if (!Array.isArray(functionBody) &&
+                        functionBody.isObjectExpression()) {
+                        // Arrow function with expression body: () => ({ ... })
+                        entitiesObject = functionBody;
+                    }
+                    else if (!Array.isArray(functionBody) &&
+                        functionBody.isBlockStatement()) {
+                        // Function with block body: () => { return { ... }; }
+                        functionBody.traverse({
+                            ReturnStatement(returnPath) {
+                                const argument = returnPath.get("argument");
+                                if (argument.isObjectExpression()) {
+                                    entitiesObject = argument;
+                                }
+                            },
+                        });
+                    }
+                    // Process the entities object if found
+                    if (entitiesObject && isObjectExpression(entitiesObject.node)) {
+                        entitiesObject.node.properties.forEach((property, index) => {
+                            if (property.type === "ObjectProperty") {
+                                const name = nodeToValue(property.key);
+                                const id = getStableEntityId(scopeId, name);
+                                idMap.set(id, entitiesObject.get(`properties.${index}`));
+                                setSbElementId(property, id);
+                                if (shouldModifyAst) {
+                                    if (isCallExpression(property.value) &&
+                                        isObjectExpression(property.value.arguments[0])) {
+                                        const entityConfig = property.value.arguments[0];
+                                        entityConfig.properties.push(objectProperty(identifier("id"), stringLiteral(id)));
+                                    }
+                                }
                             }
-                        }
+                        });
                     }
-                });
+                }
             }
             // Also keep track of component types defined in the createSbScope call
             // we use a different id for these (than for the actual component)
-            if (isCreateSbScope && scopeId && path.node.typeParameters) {
+            if (scopeId && path.node.typeParameters) {
                 const typeParams = path.node.typeParameters.params;
                 if (typeParams.length > 0 && typeParams[0]?.type === "TSTypeLiteral") {
                     const typeMembers = typeParams[0].members;

package/dist/parsing/ids.js.map

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

package/dist/parsing/imports.d.ts

@@ -3,4 +3,19 @@ export type Import = {
     importPath: string;
 };
 export declare const REQUIRED_IMPORTS_BY_PROPERTY_TYPE: Record<string, Array<Import>>;
+export declare const EXPRESSION_IMPORTS_BY_IDENTIFIER: {
+    Theme: {
+        importName: string;
+        importPath: string;
+    };
+    Dim: {
+        importName: string;
+        importPath: string;
+    };
+    Global: {
+        importName: string;
+        importPath: string;
+    };
+};
+export declare function getRequiredImportsForProperty(property: unknown): Import[];
 //# sourceMappingURL=imports.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/parsing/imports.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,GAAG;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,iCAAiC,EAAE,MAAM,CACpD,MAAM,EACN,KAAK,CAAC,MAAM,CAAC,CA0Bd,CAAC"}
+{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/parsing/imports.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,MAAM,GAAG;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,iCAAiC,EAAE,MAAM,CACpD,MAAM,EACN,KAAK,CAAC,MAAM,CAAC,CA8Bd,CAAC;AAEF,eAAO,MAAM,gCAAgC;;;;;;;;;;;;;CAa5C,CAAC;AAMF,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,OAAO,YAkC9D"}

package/dist/parsing/imports.js

@@ -1,9 +1,14 @@
+import { isPropertyInfo, splitJSPath } from "@superblocksteam/library-shared";
 export const REQUIRED_IMPORTS_BY_PROPERTY_TYPE = {
     EVENT: [
         {
             importName: "SbEventFlow",
             importPath: "@superblocksteam/library",
         },
+        {
+            importName: "sbComputed",
+            importPath: "@superblocksteam/library",
+        },
     ],
     BINDING: [
         {
@@ -24,4 +29,45 @@ export const REQUIRED_IMPORTS_BY_PROPERTY_TYPE = {
         },
     ],
 };
+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);
+}
 //# sourceMappingURL=imports.js.map

package/dist/parsing/imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/parsing/imports.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,iCAAiC,GAG1C;IACF,KAAK,EAAE;QACL;YACE,UAAU,EAAE,aAAa;YACzB,UAAU,EAAE,0BAA0B;SACvC;KACF;IACD,OAAO,EAAE;QACP;YACE,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,0BAA0B;SACvC;KACF;IACD,QAAQ,EAAE;QACR;YACE,UAAU,EAAE,YAAY;YACxB,UAAU,EAAE,0BAA0B;SACvC;KACF;IACD,QAAQ,EAAE;QACR;YACE,UAAU,EAAE,YAAY;YACxB,UAAU,EAAE,0BAA0B;SACvC;KACF;CACF,CAAC"}
+{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/parsing/imports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAO9E,MAAM,CAAC,MAAM,iCAAiC,GAG1C;IACF,KAAK,EAAE;QACL;YACE,UAAU,EAAE,aAAa;YACzB,UAAU,EAAE,0BAA0B;SACvC;QACD;YACE,UAAU,EAAE,YAAY;YACxB,UAAU,EAAE,0BAA0B;SACvC;KACF;IACD,OAAO,EAAE;QACP;YACE,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,0BAA0B;SACvC;KACF;IACD,QAAQ,EAAE;QACR;YACE,UAAU,EAAE,YAAY;YACxB,UAAU,EAAE,0BAA0B;SACvC;KACF;IACD,QAAQ,EAAE;QACR;YACE,UAAU,EAAE,YAAY;YACxB,UAAU,EAAE,0BAA0B;SACvC;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,gCAAgC,GAAG;IAC9C,KAAK,EAAE;QACL,UAAU,EAAE,OAAO;QACnB,UAAU,EAAE,0BAA0B;KACvC;IACD,GAAG,EAAE;QACH,UAAU,EAAE,KAAK;QACjB,UAAU,EAAE,0BAA0B;KACvC;IACD,MAAM,EAAE;QACN,UAAU,EAAE,QAAQ;QACpB,UAAU,EAAE,0BAA0B;KACvC;CACF,CAAC;AAEF,MAAM,sBAAsB,GAAG,IAAI,GAAG,CACpC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAC9C,CAAC;AAEF,MAAM,UAAU,6BAA6B,CAAC,QAAiB;IAC7D,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAErC,SAAS,cAAc,CAAC,IAAa;QACnC,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACjE,2FAA2F;gBAC3F,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC1C,MAAM,GAAG,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC3B,IAAI,GAAG,IAAI,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC3C,UAAU,CAAC,GAAG,CACZ,gCAAgC,CAC9B,GAAoD,CACrD,CACF,CAAC;oBACF,OAAO;gBACT,CAAC;YACH,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,IAAI,iCAAiC,EAAE,CAAC;gBAC1D,iCAAiC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAC5D,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CACpB,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACtE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,cAAc,CAAE,IAAgC,CAAC,GAAG,CAAC,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;IACH,CAAC;IAED,cAAc,CAAC,QAAQ,CAAC,CAAC;IAEzB,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAChC,CAAC"}

package/dist/parsing/jsx-utils.d.ts

@@ -5,5 +5,5 @@ export declare function isSbComputedNode(node: NodePath<t.Node>): node is NodePa
 export declare function isSbTemplateNode(node: NodePath<t.Node>): node is NodePath<TemplateLiteral | CallExpression>;
 export declare function isSbEventFlowNode(node: NodePath<t.Node>): node is NodePath<CallExpression>;
 export declare function isDimNode(node: NodePath<t.Node>): node is NodePath<CallExpression>;
-export declare function isSBTemplateNode(node: NodePath<t.Node>): node is NodePath<t.TaggedTemplateExpression>;
+export declare function isSBBindingTemplateNode(node: NodePath<t.Node>): node is NodePath<t.TaggedTemplateExpression>;
 //# sourceMappingURL=jsx-utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"jsx-utils.d.ts","sourceRoot":"","sources":["../../src/parsing/jsx-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GACrB,IAAI,IAAI,QAAQ,CAAC,cAAc,CAAC,CAOlC;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GACrB,IAAI,IAAI,QAAQ,CAAC,eAAe,GAAG,cAAc,CAAC,CAUpD;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GACrB,IAAI,IAAI,QAAQ,CAAC,cAAc,CAAC,CAUlC;AAED,wBAAgB,SAAS,CACvB,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GACrB,IAAI,IAAI,QAAQ,CAAC,cAAc,CAAC,CAUlC;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GACrB,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAO9C"}
+{"version":3,"file":"jsx-utils.d.ts","sourceRoot":"","sources":["../../src/parsing/jsx-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GACrB,IAAI,IAAI,QAAQ,CAAC,cAAc,CAAC,CAOlC;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GACrB,IAAI,IAAI,QAAQ,CAAC,eAAe,GAAG,cAAc,CAAC,CAqBpD;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GACrB,IAAI,IAAI,QAAQ,CAAC,cAAc,CAAC,CAUlC;AAED,wBAAgB,SAAS,CACvB,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GACrB,IAAI,IAAI,QAAQ,CAAC,cAAc,CAAC,CAUlC;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GACrB,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAO9C"}

package/dist/parsing/jsx-utils.js

@@ -9,10 +9,16 @@ export function isSbComputedNode(node) {
 export function isSbTemplateNode(node) {
     if (isSbComputedNode(node)) {
         const argument = node.get("arguments.0");
-        if (!argument.isArrowFunctionExpression()) {
-            return false;
+        if (argument.isArrowFunctionExpression()) {
+            return argument.get("body").isTemplateLiteral();
         }
-        return argument.get("body").isTemplateLiteral();
+        if (argument.isFunctionExpression() &&
+            argument.node.body.body.length === 1) {
+            const returnStatement = argument.get("body.body.0");
+            const expression = returnStatement.get("argument");
+            return expression?.isTemplateLiteral();
+        }
+        return false;
     }
     return node.isTemplateLiteral();
 }
@@ -32,7 +38,7 @@ export function isDimNode(node) {
     return (callee.isMemberExpression() &&
         getIdentiferName(callee.get("object").node) === "Dim");
 }
-export function isSBTemplateNode(node) {
+export function isSBBindingTemplateNode(node) {
     if (!node.isTaggedTemplateExpression()) {
         return false;
     }

package/dist/parsing/jsx-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"jsx-utils.js","sourceRoot":"","sources":["../../src/parsing/jsx-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAK7C,MAAM,UAAU,gBAAgB,CAC9B,IAAsB;IAEtB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,YAAY,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAAsB;IAEtB,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAqB,CAAC;QAC7D,IAAI,CAAC,QAAQ,CAAC,yBAAyB,EAAE,EAAE,CAAC;YAC1C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAClD,CAAC;IACD,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,IAAsB;IAEtB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClC,OAAO,CACL,MAAM,CAAC,kBAAkB,EAAE;QAC3B,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,aAAa,CAC9D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,IAAsB;IAEtB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClC,OAAO,CACL,MAAM,CAAC,kBAAkB,EAAE;QAC3B,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,KAAK,CACtD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAAsB;IAEtB,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,CAAC;QACvC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5B,OAAO,GAAG,CAAC,YAAY,EAAE,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;AACnE,CAAC"}
+{"version":3,"file":"jsx-utils.js","sourceRoot":"","sources":["../../src/parsing/jsx-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAK7C,MAAM,UAAU,gBAAgB,CAC9B,IAAsB;IAEtB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,YAAY,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAAsB;IAEtB,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAqB,CAAC;QAC7D,IAAI,QAAQ,CAAC,yBAAyB,EAAE,EAAE,CAAC;YACzC,OAAO,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,CAAC;QAClD,CAAC;QAED,IACE,QAAQ,CAAC,oBAAoB,EAAE;YAC/B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EACpC,CAAC;YACD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAClC,aAAa,CACiB,CAAC;YACjC,MAAM,UAAU,GAAG,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACnD,OAAO,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACzC,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,IAAsB;IAEtB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClC,OAAO,CACL,MAAM,CAAC,kBAAkB,EAAE;QAC3B,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,aAAa,CAC9D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,IAAsB;IAEtB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClC,OAAO,CACL,MAAM,CAAC,kBAAkB,EAAE;QAC3B,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,KAAK,CACtD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,IAAsB;IAEtB,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,CAAC;QACvC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5B,OAAO,GAAG,CAAC,YAAY,EAAE,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;AACnE,CAAC"}

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,CAAC,MAAM,cAAc,CAAC;AAM7B,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAatD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EACf,UAAU,EAEX,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAEvE,KAAK,OAAO,GAAG;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE;QACR,OAAO,EAAE,OAAO,CAAC;QACjB,WAAW,EAAE,SAAS,CAAC;KACxB,EAAE,CAAC;CACL,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,kBAE1D;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,CAsChE;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,UAAU,CA8BzE;AAkJD,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,UAAU,GAAG,eAAe,EACpC,OAAO,EAAE,OAAO,QAWjB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,iBAAiB,GAAG,OAAO,CAStE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,CAAC,CAAC,UAAU,GAAG,MAAM,GAAG,IAAI,CAoCvE;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,YAAY,EAC5B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,YAgE9B"}
+{"version":3,"file":"jsx.d.ts","sourceRoot":"","sources":["../../src/parsing/jsx.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,cAAc,CAAC;AAM7B,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAatD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EACf,UAAU,EAEX,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAEvE,KAAK,OAAO,GAAG;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE;QACR,OAAO,EAAE,OAAO,CAAC;QACjB,WAAW,EAAE,SAAS,CAAC;KACxB,EAAE,CAAC;CACL,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,kBAE1D;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,CAyChE;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,UAAU,CA8BzE;AAkJD,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,UAAU,GAAG,eAAe,EACpC,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,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,YAAY,EAC5B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,YAgE9B"}