babel-plugin-wallace 0.0.5 → 0.0.7

package/dist/ast-helpers.d.ts

@@ -7,4 +7,4 @@ export declare function getJSXElementName(path: NodePath<JSXElement>): string |
 /**
  * An Expression can be one of dozens of types, most of which are not usable.
  */
-export declare function getPlaceholderExpression(path: NodePath, expression: Expression | JSXEmptyExpression): Expression;
+export declare function getPlaceholderExpression(path: NodePath, expression: Expression | JSXEmptyExpression): Expression | undefined;

package/dist/ast-helpers.js

@@ -31,22 +31,14 @@ function getJSXElementName(path) {
  * An Expression can be one of dozens of types, most of which are not usable.
  */
 function getPlaceholderExpression(path, expression) {
-    // if (
-    //   // TODO: I probably need to expand this...
-    //   t.isIdentifier(expression) ||
-    //   t.isMemberExpression(expression) ||
-    //   t.isCallExpression(expression)
-    // ) {
-    //   return expression;
-    // } else
     if (t.isJSXEmptyExpression(expression)) {
-        (0, errors_1.error)(path, errors_1.ERROR_MESSAGES.PLACEHOLDER_MAY_NOT_BE_EMPTY);
+        // This is really to handle comments
+        return undefined;
     }
     else if (t.isObjectExpression(expression)) {
         // The code is copied, so the object would be created afresh each time.
         (0, errors_1.error)(path, errors_1.ERROR_MESSAGES.PLACEHOLDER_MAY_NOT_BE_LITERAL_OBJECT);
     }
-    //error(path, ERROR_MESSAGES.INVALID_PLACEHOLDER_EXPRESSION);
     return expression;
 }
 //# sourceMappingURL=ast-helpers.js.map

package/dist/ast-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"ast-helpers.js","sourceRoot":"","sources":["../src/ast-helpers.ts"],"names":[],"mappings":";;AAKA,8CAoBC;AAKD,4DAoBC;AAlDD,kCAAkC;AAGlC,qCAAiD;AAEjD,SAAgB,iBAAiB,CAC/B,IAA0B;IAE1B,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;IACzD,IAAI,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC1C,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACjC,CAAC;SAAM,IAAI,CAAC,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACrD,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAC;QAC/C,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IACxD,CAAC;SAAM,IAAI,CAAC,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACvD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,kBAAkB,CAAC;QAChD,IAAI,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,IAAA,cAAK,EAAC,IAAI,EAAE,uBAAc,CAAC,2BAA2B,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,KAAK,CAAC,wBAAwB,kBAAkB,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,wBAAwB,CACtC,IAAc,EACd,UAA2C;IAE3C,OAAO;IACP,+CAA+C;IAC/C,kCAAkC;IAClC,wCAAwC;IACxC,mCAAmC;IACnC,MAAM;IACN,uBAAuB;IACvB,SAAS;IACT,IAAI,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC;QACvC,IAAA,cAAK,EAAC,IAAI,EAAE,uBAAc,CAAC,4BAA4B,CAAC,CAAC;IAC3D,CAAC;SAAM,IAAI,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5C,uEAAuE;QACvE,IAAA,cAAK,EAAC,IAAI,EAAE,uBAAc,CAAC,qCAAqC,CAAC,CAAC;IACpE,CAAC;IACD,6DAA6D;IAC7D,OAAO,UAAwB,CAAC;AAClC,CAAC"}
+{"version":3,"file":"ast-helpers.js","sourceRoot":"","sources":["../src/ast-helpers.ts"],"names":[],"mappings":";;AAKA,8CAoBC;AAKD,4DAYC;AA1CD,kCAAkC;AAGlC,qCAAiD;AAEjD,SAAgB,iBAAiB,CAC/B,IAA0B;IAE1B,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;IACzD,IAAI,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC1C,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACjC,CAAC;SAAM,IAAI,CAAC,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACrD,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAC;QAC/C,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IACxD,CAAC;SAAM,IAAI,CAAC,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACvD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,kBAAkB,CAAC;QAChD,IAAI,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,IAAA,cAAK,EAAC,IAAI,EAAE,uBAAc,CAAC,2BAA2B,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,KAAK,CAAC,wBAAwB,kBAAkB,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,wBAAwB,CACtC,IAAc,EACd,UAA2C;IAE3C,IAAI,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC;QACvC,oCAAoC;QACpC,OAAO,SAAS,CAAC;IACnB,CAAC;SAAM,IAAI,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5C,uEAAuE;QACvE,IAAA,cAAK,EAAC,IAAI,EAAE,uBAAc,CAAC,qCAAqC,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,UAAwB,CAAC;AAClC,CAAC"}

package/dist/{builders/consolidation.d.ts → consolidation/ComponentDefinitionData.d.ts}

@@ -2,12 +2,15 @@ import type { Expression, CallExpression, FunctionExpression, Identifier } from
 import { Component } from "../models";
 import { IMPORTABLES } from "../constants";
 import { ComponentWatch, NodeAddress } from "./types";
+/**
+ * An object with all the consolidated data for writing.
+ */
 export declare class ComponentDefinitionData {
     #private;
     component: Component;
     html: string;
     watches: Array<ComponentWatch>;
-    stash: {
+    dynamicElements: {
         [key: string]: CallExpression;
     };
     baseComponent: Expression | undefined;
@@ -16,15 +19,11 @@ export declare class ComponentDefinitionData {
     };
     collectedRefs: Array<string>;
     constructor(component: Component);
-    saveElementToStash(address: NodeAddress): string;
-    saveNestedClassToStash(address: NodeAddress, componentCls: Expression): string;
+    saveDynamicElement(address: NodeAddress): string;
+    saveNestedAsDynamicElement(address: NodeAddress, componentCls: Expression): string;
     addLookup(expression: Expression): string;
     getFunctionIdentifier(name: IMPORTABLES): Identifier;
     getLookupCallBackParams(): Array<Identifier>;
-    wrapStashCall(key: string, functionName: IMPORTABLES, remainingArgs: Expression[]): void;
-    getNextMiscObjectKey(): number;
+    wrapDynamicElementCall(key: string, functionName: IMPORTABLES, remainingArgs: Expression[]): void;
+    getNextmiscStashKey(): number;
 }
-/**
- * Deals with shielding, setting ref keys and such.
- */
-export declare function consolidateComponent(component: Component): ComponentDefinitionData;

package/dist/consolidation/ComponentDefinitionData.js

@@ -0,0 +1,79 @@
+"use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _ComponentDefinitionData_dynamicElementKey, _ComponentDefinitionData_miscStashKey, _ComponentDefinitionData_lookupKeys;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ComponentDefinitionData = void 0;
+const types_1 = require("@babel/types");
+const utils_1 = require("./utils");
+/**
+ * An object with all the consolidated data for writing.
+ */
+class ComponentDefinitionData {
+    constructor(component) {
+        this.watches = [];
+        this.dynamicElements = {};
+        this.lookups = {};
+        this.collectedRefs = [];
+        _ComponentDefinitionData_dynamicElementKey.set(this, 0);
+        _ComponentDefinitionData_miscStashKey.set(this, 0);
+        _ComponentDefinitionData_lookupKeys.set(this, []);
+        this.component = component;
+        this.baseComponent = component.baseComponent;
+    }
+    saveDynamicElement(address) {
+        var _a;
+        __classPrivateFieldSet(this, _ComponentDefinitionData_dynamicElementKey, (_a = __classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f"), _a++, _a), "f");
+        const key = String(__classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f"));
+        this.dynamicElements[key] = (0, utils_1.buildFindElementCall)(this.component.module, address);
+        return key;
+    }
+    saveNestedAsDynamicElement(address, componentCls) {
+        var _a;
+        __classPrivateFieldSet(this, _ComponentDefinitionData_dynamicElementKey, (_a = __classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f"), _a++, _a), "f");
+        const key = String(__classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f"));
+        this.dynamicElements[key] = (0, utils_1.buildNestedClassCall)(this.component.module, address, componentCls);
+        return key;
+    }
+    addLookup(expression) {
+        const hashExpression = (expr) => {
+            const copy = JSON.parse(JSON.stringify(expr));
+            (0, utils_1.removeKeys)(copy, ["start", "end", "loc"]);
+            return JSON.stringify(copy);
+        };
+        const hash = hashExpression(expression);
+        if (__classPrivateFieldGet(this, _ComponentDefinitionData_lookupKeys, "f").indexOf(hash) === -1) {
+            __classPrivateFieldGet(this, _ComponentDefinitionData_lookupKeys, "f").push(hash);
+        }
+        const key = String(__classPrivateFieldGet(this, _ComponentDefinitionData_lookupKeys, "f").indexOf(hash));
+        this.lookups[key] = (0, types_1.functionExpression)(null, this.getLookupCallBackParams(), (0, types_1.blockStatement)([(0, types_1.returnStatement)(expression)]));
+        return key;
+    }
+    getFunctionIdentifier(name) {
+        this.component.module.requireImport(name);
+        return (0, types_1.identifier)(name);
+    }
+    getLookupCallBackParams() {
+        return [this.component.propsIdentifier, this.component.componentIdentifier];
+    }
+    wrapDynamicElementCall(key, functionName, remainingArgs) {
+        this.dynamicElements[key] = (0, types_1.callExpression)(this.getFunctionIdentifier(functionName), [this.dynamicElements[key], ...remainingArgs]);
+    }
+    getNextmiscStashKey() {
+        var _a;
+        __classPrivateFieldSet(this, _ComponentDefinitionData_miscStashKey, (_a = __classPrivateFieldGet(this, _ComponentDefinitionData_miscStashKey, "f"), _a++, _a), "f");
+        return __classPrivateFieldGet(this, _ComponentDefinitionData_miscStashKey, "f") - 1;
+    }
+}
+exports.ComponentDefinitionData = ComponentDefinitionData;
+_ComponentDefinitionData_dynamicElementKey = new WeakMap(), _ComponentDefinitionData_miscStashKey = new WeakMap(), _ComponentDefinitionData_lookupKeys = new WeakMap();
+//# sourceMappingURL=ComponentDefinitionData.js.map

package/dist/consolidation/ComponentDefinitionData.js.map

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

package/dist/consolidation/consolidateComponent.d.ts

@@ -0,0 +1,6 @@
+import { Component } from "../models";
+import { ComponentDefinitionData } from "./ComponentDefinitionData";
+/**
+ * Deals with visibility toggles, setting ref keys and such.
+ */
+export declare function consolidateComponent(component: Component): ComponentDefinitionData;

package/dist/consolidation/consolidateComponent.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.consolidateComponent = consolidateComponent;
+const models_1 = require("../models");
+const visibility_1 = require("./visibility");
+const ComponentDefinitionData_1 = require("./ComponentDefinitionData");
+const processNodes_1 = require("./processNodes");
+const utils_1 = require("./utils");
+/**
+ * If a node contains only a JSXExpression, then rather than make a span, we set
+ * textContent on that node.
+ */
+function hoistTextNodes(component) {
+    const nodesToDelete = [];
+    component.extractedNodes.forEach((node) => {
+        if (node instanceof models_1.DynamicTextNode) {
+            if ((0, utils_1.getSiblings)(node, component.extractedNodes).length === 0) {
+                const parent = node.parent;
+                parent.watches.push(...node.watches);
+                nodesToDelete.push(node);
+                node.element.remove();
+            }
+        }
+    });
+    nodesToDelete.forEach((node) => {
+        component.extractedNodes.splice(component.extractedNodes.indexOf(node), 1);
+    });
+}
+/**
+ * Deals with visibility toggles, setting ref keys and such.
+ */
+function consolidateComponent(component) {
+    const componentDefinition = new ComponentDefinitionData_1.ComponentDefinitionData(component);
+    hoistTextNodes(component);
+    (0, processNodes_1.processNodes)(component, componentDefinition);
+    (0, visibility_1.processeVisibilityToggles)(componentDefinition.watches);
+    // This must be done after all the processing, as DOM may have changed.
+    componentDefinition.html = component.rootElement.outerHTML;
+    return componentDefinition;
+}
+//# sourceMappingURL=consolidateComponent.js.map

package/dist/consolidation/consolidateComponent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"consolidateComponent.js","sourceRoot":"","sources":["../../src/consolidation/consolidateComponent.ts"],"names":[],"mappings":";;AA8BA,oDAUC;AAxCD,sCAAuD;AACvD,6CAAyD;AACzD,uEAAoE;AACpE,iDAA8C;AAC9C,mCAAsC;AAEtC;;;GAGG;AACH,SAAS,cAAc,CAAC,SAAoB;IAC1C,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACxC,IAAI,IAAI,YAAY,wBAAe,EAAE,CAAC;YACpC,IAAI,IAAA,mBAAW,EAAC,IAAI,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBAC3B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACzB,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACxB,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7B,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,SAAgB,oBAAoB,CAClC,SAAoB;IAEpB,MAAM,mBAAmB,GAAG,IAAI,iDAAuB,CAAC,SAAS,CAAC,CAAC;IACnE,cAAc,CAAC,SAAS,CAAC,CAAC;IAC1B,IAAA,2BAAY,EAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;IAC7C,IAAA,sCAAyB,EAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACvD,uEAAuE;IACvE,mBAAmB,CAAC,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC;IAC3D,OAAO,mBAAmB,CAAC;AAC7B,CAAC"}

package/dist/consolidation/index.d.ts

@@ -0,0 +1,2 @@
+export { ComponentDefinitionData } from "./ComponentDefinitionData";
+export { consolidateComponent } from "./consolidateComponent";

package/dist/consolidation/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.consolidateComponent = exports.ComponentDefinitionData = void 0;
+var ComponentDefinitionData_1 = require("./ComponentDefinitionData");
+Object.defineProperty(exports, "ComponentDefinitionData", { enumerable: true, get: function () { return ComponentDefinitionData_1.ComponentDefinitionData; } });
+var consolidateComponent_1 = require("./consolidateComponent");
+Object.defineProperty(exports, "consolidateComponent", { enumerable: true, get: function () { return consolidateComponent_1.consolidateComponent; } });
+//# sourceMappingURL=index.js.map

package/dist/consolidation/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/consolidation/index.ts"],"names":[],"mappings":";;;AAAA,qEAAoE;AAA3D,kIAAA,uBAAuB,OAAA;AAChC,+DAA8D;AAArD,4HAAA,oBAAoB,OAAA"}

package/dist/consolidation/processNodes.d.ts

@@ -0,0 +1,3 @@
+import { Component } from "../models";
+import { ComponentDefinitionData } from "./ComponentDefinitionData";
+export declare function processNodes(component: Component, componentDefinition: ComponentDefinitionData): void;

package/dist/consolidation/processNodes.js

@@ -0,0 +1,219 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processNodes = processNodes;
+const types_1 = require("@babel/types");
+const t = require("@babel/types");
+const utils_1 = require("../utils");
+const errors_1 = require("../errors");
+const constants_1 = require("../constants");
+const utils_2 = require("./utils");
+function addBindInstruction(node) {
+    if (node.tagName.toLowerCase() == "input") {
+        // @ts-ignore
+        const inputType = node.element.type.toLowerCase();
+        const attribute = inputType === "checkbox" ? "checked" : "value";
+        node.bindInstructions.forEach(({ eventName, expression }) => {
+            node.watchAttribute(attribute, expression);
+            const callback = t.assignmentExpression("=", expression, t.memberExpression(t.identifier(constants_1.EVENT_CALLBACK_VARIABLES.element), t.identifier(attribute)));
+            node.addEventListener(eventName, callback);
+        });
+    }
+    else {
+        (0, errors_1.error)(node.path, errors_1.ERROR_MESSAGES.BIND_ONLY_ALLOWED_ON_INPUT);
+    }
+}
+function ensureToggleTargetsHaveTriggers(node) {
+    node.toggleTargets.forEach((target) => {
+        const match = node.toggleTriggers.find((trigger) => trigger.name == target.name);
+        if (!match) {
+            (0, errors_1.error)(node.path, errors_1.ERROR_MESSAGES.TOGGLE_TARGETS_WITHOUT_TOGGLE_TRIGGERS);
+        }
+    });
+}
+function extractCssClasses(value) {
+    if (typeof value == "string") {
+        return value
+            .trim()
+            .split(" ")
+            .map((v) => t.stringLiteral(v));
+    }
+    else {
+        return [t.spreadElement(value)];
+    }
+}
+// Notes: toggles are implemented as add/remove because:
+//  a) they allow multiple classes
+//  b) it's less brittle around truthiness
+function addToggleCallbackStatement(componentDefinition, node, addCallbackStatement) {
+    node.toggleTriggers.forEach((trigger) => {
+        const target = node.toggleTargets.find((target) => target.name == trigger.name);
+        const classesToToggle = target
+            ? extractCssClasses(target.value)
+            : [t.stringLiteral(trigger.name)];
+        const toBoolExpression = trigger.expression;
+        const lookupKey = componentDefinition.addLookup(toBoolExpression);
+        const getCallback = (method) => (0, types_1.callExpression)((0, types_1.memberExpression)((0, types_1.memberExpression)((0, types_1.identifier)(constants_1.WATCH_CALLBACK_PARAMS.element), (0, types_1.identifier)("classList")), (0, types_1.identifier)(method)), classesToToggle);
+        addCallbackStatement(lookupKey, [
+            t.ifStatement(t.identifier(constants_1.WATCH_CALLBACK_PARAMS.newValue), (0, types_1.blockStatement)([(0, types_1.expressionStatement)(getCallback("add"))]), (0, types_1.blockStatement)([(0, types_1.expressionStatement)(getCallback("remove"))])),
+        ]);
+    });
+}
+// TODO: break this up.
+function processNodes(component, componentDefinition) {
+    component.extractedNodes.forEach((node) => {
+        if (node.isRepeatedNode) {
+            // The watch should already have been added to the parent node, which is already
+            // processed. All we do here is run some extra checks.
+            const siblings = (0, utils_2.getSiblings)(node, component.extractedNodes);
+            if (siblings.length > 0) {
+                (0, errors_1.error)(node.path, errors_1.ERROR_MESSAGES.REPEAT_DIRECTIVE_WITH_SIBLINGS);
+            }
+            const children = (0, utils_2.getChildren)(node, component.extractedNodes);
+            if (children.length > 0) {
+                (0, errors_1.error)(node.path, errors_1.ERROR_MESSAGES.REPEAT_DIRECTIVE_WITH_CHILDREN);
+            }
+            return;
+        }
+        const stubName = node.getStub();
+        const stubComponentName = stubName
+            ? t.memberExpression(t.identifier(constants_1.COMPONENT_BUILD_PARAMS.component), t.identifier(stubName))
+            : undefined;
+        const visibilityToggle = node.getVisibilityToggle();
+        const ref = node.getRef();
+        const repeatInstruction = node.getRepeatInstruction();
+        const createWatch = node.watches.length > 0 ||
+            node.bindInstructions.length > 0 ||
+            node.toggleTriggers.length > 0 ||
+            visibilityToggle ||
+            node.isNestedClass ||
+            stubName ||
+            repeatInstruction;
+        // TODO: should ref really save the element?
+        const shouldSaveElement = createWatch ||
+            ref ||
+            node.eventListeners.length > 0 ||
+            node.hasConditionalChildren;
+        ensureToggleTargetsHaveTriggers(node);
+        if (shouldSaveElement) {
+            const nestedComponentCls = node.isNestedClass
+                ? t.identifier(node.tagName)
+                : stubComponentName;
+            node.elementKey = nestedComponentCls
+                ? componentDefinition.saveNestedAsDynamicElement(node.address, nestedComponentCls)
+                : componentDefinition.saveDynamicElement(node.address);
+            if (node.bindInstructions.length) {
+                addBindInstruction(node);
+            }
+            if (node.hasConditionalChildren) {
+                node.detacherStashKey = componentDefinition.getNextmiscStashKey();
+                componentDefinition.wrapDynamicElementCall(node.elementKey, constants_1.IMPORTABLES.stashMisc, [
+                    (0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.component),
+                    t.objectExpression([]),
+                ]);
+            }
+            if (createWatch) {
+                const _callbacks = {};
+                const addCallbackStatement = (key, statements) => {
+                    if (!_callbacks.hasOwnProperty(key)) {
+                        _callbacks[key] = [];
+                    }
+                    _callbacks[key].push(...statements);
+                };
+                const componentWatch = {
+                    elementKey: node.elementKey,
+                    callbacks: {},
+                    address: node.address,
+                };
+                componentDefinition.watches.push(componentWatch);
+                node.watches.forEach((watch) => {
+                    const lookupKey = componentDefinition.addLookup(watch.expression);
+                    addCallbackStatement(lookupKey, (0, utils_1.codeToNode)(watch.callback));
+                });
+                if (node.isNestedClass) {
+                    const props = node.getProps();
+                    const args = props ? [props] : [];
+                    addCallbackStatement(constants_1.SPECIAL_SYMBOLS.alwaysUpdate, [
+                        (0, types_1.expressionStatement)((0, types_1.callExpression)((0, types_1.memberExpression)((0, types_1.identifier)(constants_1.WATCH_CALLBACK_PARAMS.element), (0, types_1.identifier)("render")), args)),
+                    ]);
+                }
+                if (node.toggleTriggers.length) {
+                    addToggleCallbackStatement(componentDefinition, node, addCallbackStatement);
+                }
+                // Need to be careful with WATCH_CALLBACK_PARAMS
+                if (stubName) {
+                    addCallbackStatement(constants_1.SPECIAL_SYMBOLS.alwaysUpdate, [
+                        (0, types_1.expressionStatement)((0, types_1.callExpression)((0, types_1.memberExpression)((0, types_1.identifier)(constants_1.WATCH_CALLBACK_PARAMS.element), (0, types_1.identifier)("render")), [component.propsIdentifier])),
+                    ]);
+                }
+                if (visibilityToggle) {
+                    const shieldLookupKey = componentDefinition.addLookup(visibilityToggle.expression);
+                    componentWatch.shieldInfo = {
+                        skipCount: 0, // gets set later once we've processed all the nodes.
+                        key: shieldLookupKey,
+                        reverse: visibilityToggle.reverse,
+                    };
+                    if (visibilityToggle.detach) {
+                        if (node.parent.detacherStashKey === undefined) {
+                            throw new Error("Parent node was not given a stash key");
+                        }
+                        componentWatch.shieldInfo.detacher = {
+                            index: node.address[node.address.length - 1],
+                            stashKey: node.parent.detacherStashKey,
+                            parentKey: node.parent.elementKey,
+                        };
+                    }
+                }
+                if (repeatInstruction) {
+                    componentDefinition.component.module.requireImport(constants_1.IMPORTABLES.getSequentialPool);
+                    const poolInstance = repeatInstruction.poolExpression ||
+                        (0, types_1.callExpression)((0, types_1.identifier)(constants_1.IMPORTABLES.getSequentialPool), [
+                            (0, types_1.identifier)(repeatInstruction.componentCls),
+                        ]);
+                    // TODO: couple the stash index with the call to save - if possible?
+                    // Or make it an object and pass the key when saving.
+                    const miscStashKey = componentDefinition.getNextmiscStashKey();
+                    componentDefinition.wrapDynamicElementCall(node.elementKey, constants_1.IMPORTABLES.stashMisc, [(0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.component), poolInstance]);
+                    addCallbackStatement(constants_1.SPECIAL_SYMBOLS.alwaysUpdate, [
+                        (0, types_1.expressionStatement)((0, types_1.callExpression)((0, types_1.memberExpression)((0, types_1.memberExpression)((0, types_1.memberExpression)(component.componentIdentifier, (0, types_1.identifier)(constants_1.SPECIAL_SYMBOLS.objectStash)), (0, types_1.numericLiteral)(miscStashKey), true), (0, types_1.identifier)(constants_1.SPECIAL_SYMBOLS.patch)), [
+                            (0, types_1.identifier)(constants_1.WATCH_CALLBACK_PARAMS.element),
+                            repeatInstruction.expression,
+                            component.componentIdentifier,
+                        ])),
+                    ]);
+                }
+                for (const key in _callbacks) {
+                    const args = key === constants_1.SPECIAL_SYMBOLS.alwaysUpdate
+                        ? [
+                            (0, types_1.identifier)(constants_1.WATCH_CALLBACK_PARAMS.element),
+                            component.propsIdentifier,
+                            component.componentIdentifier,
+                        ]
+                        : (0, utils_2.buildWatchCallbackParams)();
+                    componentWatch.callbacks[key] = (0, types_1.functionExpression)(null, args, (0, types_1.blockStatement)(_callbacks[key]));
+                }
+            }
+            if (ref) {
+                if (componentDefinition.collectedRefs.includes(ref)) {
+                    (0, errors_1.error)(node.path, errors_1.ERROR_MESSAGES.REFS_MUST_BE_UNIQUE_WITHIN_EACH_COMPONENT);
+                }
+                componentDefinition.collectedRefs.push(ref);
+                componentDefinition.wrapDynamicElementCall(node.elementKey, constants_1.IMPORTABLES.saveRef, [(0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.component), (0, types_1.stringLiteral)(ref)]);
+            }
+            // Note that some things will already have been renamed, but here we are renaming
+            // specifically inside the buildComponent scope.
+            const eventVariableMapping = {
+                [component.componentIdentifier.name]: constants_1.COMPONENT_BUILD_PARAMS.component,
+                [component.propsIdentifier.name]: `${constants_1.COMPONENT_BUILD_PARAMS.component}.props`,
+                [constants_1.EVENT_CALLBACK_VARIABLES.element]: `${constants_1.EVENT_CALLBACK_VARIABLES.event}.target`,
+            };
+            node.eventListeners.forEach((listener) => {
+                const updatedExpression = (0, utils_2.renameVariablesInExpression)(listener.callback, eventVariableMapping);
+                componentDefinition.wrapDynamicElementCall(node.elementKey, constants_1.IMPORTABLES.onEvent, [
+                    (0, types_1.stringLiteral)(listener.eventName),
+                    (0, types_1.functionExpression)(null, [(0, types_1.identifier)(constants_1.EVENT_CALLBACK_VARIABLES.event)], (0, types_1.blockStatement)([(0, types_1.expressionStatement)(updatedExpression)])),
+                ]);
+            });
+        }
+    });
+}
+//# sourceMappingURL=processNodes.js.map

package/dist/consolidation/processNodes.js.map

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

package/dist/{builders → consolidation}/types.d.ts

@@ -1,12 +1,18 @@
 import type { FunctionExpression } from "@babel/types";
 export type NodeAddress = Array<number>;
+export interface Detacher {
+    index: number;
+    stashKey: number;
+    parentKey: string;
+}
 export interface ShieldInfo {
     key: string;
     reverse: boolean;
-    count: number;
+    skipCount: number;
+    detacher?: Detacher;
 }
 export interface ComponentWatch {
-    stashRef: string;
+    elementKey: string;
     shieldInfo?: ShieldInfo | undefined;
     callbacks: {
         [key: string]: FunctionExpression;

package/dist/{builders → consolidation}/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/builders/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/consolidation/types.ts"],"names":[],"mappings":""}

package/dist/consolidation/utils.d.ts

@@ -0,0 +1,21 @@
+import type { ArrayExpression, Expression, CallExpression } from "@babel/types";
+import { ExtractedNode, Module } from "../models";
+import { NodeAddress } from "./types";
+export declare function getSiblings(node: ExtractedNode, allNodes: Array<ExtractedNode>): ExtractedNode[];
+export declare function getChildren(node: ExtractedNode, allNodes: Array<ExtractedNode>): ExtractedNode[];
+export declare function buildAddressArray(address: NodeAddress): ArrayExpression;
+export declare function buildFindElementCall(module: Module, address: NodeAddress): CallExpression;
+export declare function buildNestedClassCall(module: Module, address: NodeAddress, componentCls: Expression): CallExpression;
+export declare function removeKeys(obj: Object, keys: Array<string>): void;
+/**
+ * Use this to rename variables when there is no scope.
+ * It came from chatGTP.
+ */
+export declare function renameVariablesInExpression(originalExpression: Expression, variableMapping: {
+    [key: string]: string;
+}): Expression;
+/**
+ * No user code gets copied into the watch callback functions, so we can hardcode params
+ * as they won't clash with anything.
+ */
+export declare function buildWatchCallbackParams(): import("@babel/types").Identifier[];

package/dist/consolidation/utils.js

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSiblings = getSiblings;
+exports.getChildren = getChildren;
+exports.buildAddressArray = buildAddressArray;
+exports.buildFindElementCall = buildFindElementCall;
+exports.buildNestedClassCall = buildNestedClassCall;
+exports.removeKeys = removeKeys;
+exports.renameVariablesInExpression = renameVariablesInExpression;
+exports.buildWatchCallbackParams = buildWatchCallbackParams;
+const types_1 = require("@babel/types");
+const constants_1 = require("../constants");
+function getSiblings(node, allNodes) {
+    return allNodes.filter((n) => n.parent === node.parent && n !== node);
+}
+function getChildren(node, allNodes) {
+    return allNodes.filter((n) => n.parent === node);
+}
+function buildAddressArray(address) {
+    return (0, types_1.arrayExpression)(address.map((i) => (0, types_1.numericLiteral)(i)));
+}
+function buildFindElementCall(module, address) {
+    module.requireImport(constants_1.IMPORTABLES.findElement);
+    return (0, types_1.callExpression)((0, types_1.identifier)(constants_1.IMPORTABLES.findElement), [
+        (0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.rootElement),
+        buildAddressArray(address),
+    ]);
+}
+function buildNestedClassCall(module, address, componentCls) {
+    module.requireImport(constants_1.IMPORTABLES.nestComponent);
+    return (0, types_1.callExpression)((0, types_1.identifier)(constants_1.IMPORTABLES.nestComponent), [
+        (0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.rootElement),
+        buildAddressArray(address),
+        componentCls,
+        (0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.component),
+    ]);
+}
+function removeKeys(obj, keys) {
+    for (const prop in obj) {
+        if (keys.includes(prop))
+            delete obj[prop];
+        else if (typeof obj[prop] === "object")
+            removeKeys(obj[prop], keys);
+    }
+}
+/**
+ * Use this to rename variables when there is no scope.
+ * It came from chatGTP.
+ */
+function renameVariablesInExpression(originalExpression, variableMapping) {
+    // Clone the original expression to avoid modifying it
+    const clonedExpression = (0, types_1.cloneNode)(originalExpression);
+    // Function to replace identifiers based on the mapping
+    function replaceIdentifiers(node) {
+        if ((0, types_1.isIdentifier)(node) && variableMapping[node.name]) {
+            return (0, types_1.identifier)(variableMapping[node.name]);
+        }
+        return node;
+    }
+    // Recursive function to traverse and update the AST
+    function traverseAndReplace(node) {
+        // If the node is an array (e.g., arguments), handle each element
+        if (Array.isArray(node)) {
+            return node.map(traverseAndReplace);
+        }
+        // Replace identifiers if applicable
+        const newNode = replaceIdentifiers(node);
+        // Recursively handle child nodes
+        for (const key of Object.keys(newNode)) {
+            if (newNode[key] && typeof newNode[key] === "object") {
+                newNode[key] = traverseAndReplace(newNode[key]);
+            }
+        }
+        return newNode;
+    }
+    return traverseAndReplace(clonedExpression);
+}
+/**
+ * No user code gets copied into the watch callback functions, so we can hardcode params
+ * as they won't clash with anything.
+ */
+function buildWatchCallbackParams() {
+    return [
+        constants_1.WATCH_CALLBACK_PARAMS.newValue,
+        constants_1.WATCH_CALLBACK_PARAMS.oldValue,
+        constants_1.WATCH_CALLBACK_PARAMS.element,
+        constants_1.WATCH_CALLBACK_PARAMS.props,
+        constants_1.WATCH_CALLBACK_PARAMS.component,
+    ].map((letter) => (0, types_1.identifier)(letter));
+}
+//# sourceMappingURL=utils.js.map

package/dist/consolidation/utils.js.map

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

package/dist/consolidation/visibility.d.ts

@@ -0,0 +1,2 @@
+import { ComponentWatch } from "./types";
+export declare function processeVisibilityToggles(watches: Array<ComponentWatch>): void;