babel-plugin-wallace 0.14.0 → 0.15.0

package/dist/config.d.ts

@@ -3,6 +3,7 @@ import { Directive } from "./models";
 export declare enum FlagValue {
     allowBase = "allowBase",
     allowCtrl = "allowCtrl",
+    allowDismount = "allowDismount",
     allowMethods = "allowMethods",
     allowParts = "allowParts",
     allowRepeaterSiblings = "allowRepeaterSiblings",
@@ -19,9 +20,11 @@ declare class WallaceConfig {
         [key: string]: typeof Directive;
     };
     flags: Flag;
+    allFLags(): string[];
     applyOptions(options: WallaceOptions): void;
     addDirectives(directives: Array<typeof Directive>): void;
     applyFlags(suppliedFlags: Flag | undefined): void;
+    ensureFlagIsValid(flag: string): void;
     ensureFlagIstrue(path: NodePath<any>, flag: FlagValue): void;
 }
 export declare const wallaceConfig: WallaceConfig;

package/dist/config.js

@@ -19,6 +19,7 @@ var FlagValue;
 (function (FlagValue) {
     FlagValue["allowBase"] = "allowBase";
     FlagValue["allowCtrl"] = "allowCtrl";
+    FlagValue["allowDismount"] = "allowDismount";
     FlagValue["allowMethods"] = "allowMethods";
     FlagValue["allowParts"] = "allowParts";
     FlagValue["allowRepeaterSiblings"] = "allowRepeaterSiblings";
@@ -27,6 +28,7 @@ var FlagValue;
 const DefaultFlagValues = {
     allowBase: true,
     allowCtrl: true,
+    allowDismount: true,
     allowMethods: true,
     allowParts: true,
     allowRepeaterSiblings: true,
@@ -35,6 +37,7 @@ const DefaultFlagValues = {
 const DefaultFlagOverrideValues = {
     allowBase: false,
     allowCtrl: false,
+    allowDismount: false,
     allowMethods: false,
     allowParts: false,
     allowRepeaterSiblings: false,
@@ -45,6 +48,9 @@ class WallaceConfig {
         this.directives = {};
         _WallaceConfig_loaded.set(this, false);
     }
+    allFLags() {
+        return Object.keys(DefaultFlagValues);
+    }
     applyOptions(options) {
         if (__classPrivateFieldGet(this, _WallaceConfig_loaded, "f")) {
             return;
@@ -70,9 +76,7 @@ class WallaceConfig {
     applyFlags(suppliedFlags) {
         if (suppliedFlags) {
             for (const [flag, value] of Object.entries(suppliedFlags)) {
-                if (!DefaultFlagValues.hasOwnProperty(flag)) {
-                    throw new Error(`Unknown flag ${flag} in supplied flags.`);
-                }
+                this.ensureFlagIsValid(flag);
             }
             this.flags = Object.assign({}, DefaultFlagOverrideValues, suppliedFlags);
         }
@@ -80,6 +84,11 @@ class WallaceConfig {
             this.flags = Object.assign({}, DefaultFlagValues, suppliedFlags);
         }
     }
+    ensureFlagIsValid(flag) {
+        if (!DefaultFlagValues.hasOwnProperty(flag)) {
+            throw new Error(`Unknown flag ${flag} in supplied flags.`);
+        }
+    }
     ensureFlagIstrue(path, flag) {
         if (!this.flags[flag]) {
             (0, errors_1.error)(path, errors_1.ERROR_MESSAGES.FLAG_REQUIRED(String(flag)));

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,qCAAiD;AAEjD,6CAAiD;AAEjD,IAAY,SAOX;AAPD,WAAY,SAAS;IACnB,oCAAuB,CAAA;IACvB,oCAAuB,CAAA;IACvB,0CAA6B,CAAA;IAC7B,sCAAyB,CAAA;IACzB,4DAA+C,CAAA;IAC/C,sCAAyB,CAAA;AAC3B,CAAC,EAPW,SAAS,yBAAT,SAAS,QAOpB;AASD,MAAM,iBAAiB,GAAS;IAC9B,SAAS,EAAE,IAAI;IACf,SAAS,EAAE,IAAI;IACf,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE,IAAI;IAChB,qBAAqB,EAAE,IAAI;IAC3B,UAAU,EAAE,IAAI;CACjB,CAAC;AAEF,MAAM,yBAAyB,GAAS;IACtC,SAAS,EAAE,KAAK;IAChB,SAAS,EAAE,KAAK;IAChB,YAAY,EAAE,KAAK;IACnB,UAAU,EAAE,KAAK;IACjB,qBAAqB,EAAE,KAAK;IAC5B,UAAU,EAAE,KAAK;CAClB,CAAC;AAEF,MAAM,aAAa;IAAnB;QACE,eAAU,GAAwC,EAAE,CAAC;QAErD,gCAAmB,KAAK,EAAC;IA0C3B,CAAC;IAzCC,YAAY,CAAC,OAAuB;QAClC,IAAI,uBAAA,IAAI,6BAAQ,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACzC,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC/B,uBAAA,IAAI,yBAAW,IAAI,MAAA,CAAC;IACtB,CAAC;IACD,aAAa,CAAC,UAAmC;QAC/C,KAAK,MAAM,cAAc,IAAI,UAAU,EAAE,CAAC;YACxC,MAAM,aAAa,GAAG,cAAc,CAAC,aAAa,CAAC;YACnD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CACb,qBAAqB,cAAc,CAAC,IAAI,8BAA8B,CACvE,CAAC;YACJ,CAAC;YACD,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,CAAC;gBAClD,OAAO,CAAC,KAAK,CAAC,wBAAwB,aAAa,SAAS,cAAc,GAAG,CAAC,CAAC;YACjF,CAAC;YACD,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,cAAc,CAAC;QAClD,CAAC;IACH,CAAC;IACD,UAAU,CAAC,aAA+B;QACxC,IAAI,aAAa,EAAE,CAAC;YAClB,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC1D,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC5C,MAAM,IAAI,KAAK,CAAC,gBAAgB,IAAI,qBAAqB,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;YACD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,yBAAyB,EAAE,aAAa,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,iBAAiB,EAAE,aAAa,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IACD,gBAAgB,CAAC,IAAmB,EAAE,IAAe;QACnD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,IAAA,cAAK,EAAC,IAAI,EAAE,uBAAc,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;CACF;;AAEY,QAAA,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;AAEjD,qBAAa,CAAC,aAAa,CAAC,8BAAiB,CAAC,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/consolidation/ComponentDefinitionData.d.ts

@@ -2,13 +2,19 @@ import type { Expression, CallExpression, ArrowFunctionExpression, Identifier, S
 import { Component, ExtractedNode } from "../models";
 import { IMPORTABLES } from "../constants";
 import { NodeAddress, Part, ShieldInfo } from "./types";
+interface Declaration {
+    id: Identifier;
+    expression: Expression;
+}
 /**
  * An object with all the consolidated data for writing.
  */
 export declare class ComponentDefinitionData {
     #private;
     stash: Array<Expression>;
-    detachers: Array<Expression>;
+    stashKey: number;
+    additionalDeclarations: Array<Declaration>;
+    dismountKeys: Array<number>;
     component: Component;
     html: Expression;
     watches: Array<ComponentWatch>;
@@ -19,14 +25,12 @@ export declare class ComponentDefinitionData {
     parts: Array<Part>;
     constructor(component: Component);
     saveDynamicElement(address: NodeAddress): number;
-    saveNestedAsDynamicElement(address: NodeAddress, componentCls: Expression): number;
     addLookup(expression: Expression): number;
     getFunctionIdentifier(name: IMPORTABLES): Identifier;
     getLookupCallBackParams(): Array<Identifier>;
     wrapDynamicElementCall(key: number, functionName: IMPORTABLES, remainingArgs: Expression[]): CallExpression;
     stashItem(expression: Expression): number;
-    createDetacher(expression: Expression): string;
-    getDetacherId(index: number): string;
+    addDeclaration(expression: Expression): Identifier;
 }
 export declare class ComponentWatch {
     #private;
@@ -42,3 +46,4 @@ export declare class ComponentWatch {
     add(lookupKey: string | number, statements: Statement[]): void;
     consolidate(): void;
 }
+export {};

package/dist/consolidation/ComponentDefinitionData.js

@@ -17,7 +17,9 @@ const utils_2 = require("../utils");
 class ComponentDefinitionData {
     constructor(component) {
         this.stash = [];
-        this.detachers = [];
+        this.stashKey = -1;
+        this.additionalDeclarations = [];
+        this.dismountKeys = [];
         this.watches = [];
         this.dynamicElements = [];
         this.lookups = new Map();
@@ -31,10 +33,6 @@ class ComponentDefinitionData {
         this.dynamicElements.push((0, utils_1.buildFindElementCall)(this.component.module, address));
         return this.dynamicElements.length - 1;
     }
-    saveNestedAsDynamicElement(address, componentCls) {
-        this.dynamicElements.push((0, utils_1.buildNestedClassCall)(this.component.module, address, componentCls));
-        return this.dynamicElements.length - 1;
-    }
     addLookup(expression) {
         const hashExpression = expr => {
             const copy = JSON.parse(JSON.stringify(expr));
@@ -46,7 +44,9 @@ class ComponentDefinitionData {
             __classPrivateFieldGet(this, _ComponentDefinitionData_lookupKeys, "f").push(hash);
         }
         const key = __classPrivateFieldGet(this, _ComponentDefinitionData_lookupKeys, "f").indexOf(hash);
-        this.lookups.set(key, (0, types_1.arrowFunctionExpression)(this.getLookupCallBackParams(), (0, types_1.blockStatement)([(0, types_1.returnStatement)(expression)])));
+        this.lookups.set(key, (0, types_1.arrowFunctionExpression)(this.getLookupCallBackParams(), expression
+        // blockStatement([expressionStatement(expression)])
+        ));
         return key;
     }
     getFunctionIdentifier(name) {
@@ -61,14 +61,16 @@ class ComponentDefinitionData {
     }
     stashItem(expression) {
         this.stash.push(expression);
-        return this.stash.length - 1;
+        this.stashKey++;
+        return this.stashKey;
     }
-    createDetacher(expression) {
-        this.detachers.push(expression);
-        return this.getDetacherId(this.detachers.length - 1);
-    }
-    getDetacherId(index) {
-        return `detacher${index}`;
+    addDeclaration(expression) {
+        const declarationId = this.component.scope.generateUidIdentifier("tmp");
+        this.additionalDeclarations.push({
+            id: declarationId,
+            expression
+        });
+        return declarationId;
     }
 }
 exports.ComponentDefinitionData = ComponentDefinitionData;

package/dist/consolidation/ComponentDefinitionData.js.map

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

package/dist/consolidation/processNodes.js

@@ -54,55 +54,57 @@ function processNode(componentDefinition, node) {
         isStub ||
         node.isNestedComponent ||
         node.hasConditionalChildren ||
+        node.hasNestedChildren ||
         node.hasRepeatedChildren;
+    if (shouldSaveElement) {
+        if (node.isNestedComponent || isStub) {
+            node.elementKey = createNesterObject(componentDefinition, node, isStub);
+        }
+        else {
+            node.elementKey = componentDefinition.saveDynamicElement(node.address);
+        }
+    }
     // Note the detacher is associated with the parent node of conditionally displayed
     // or repeated nodes.
-    const needsDetacher = node.hasConditionalChildren || (node.hasRepeatedChildren && node.children.length > 1);
+    const needsDetacher = node.hasConditionalChildren ||
+        node.hasNestedChildren ||
+        (node.hasRepeatedChildren && node.children.length > 1);
     if (needsDetacher) {
+        componentDefinition.component.module.requireImport(constants_1.IMPORTABLES.detacher);
         const detacherObject = t.newExpression(t.identifier("Map"), []);
         if (node.hasRepeatedChildren) {
             // We must save it to a variable so we can reference it when creating the
             // repeater.
-            node.detacherVariable = componentDefinition.createDetacher(detacherObject);
-            node.detacherStashKey = componentDefinition.stashItem(t.identifier(node.detacherVariable));
+            node.detacherIdentifier = componentDefinition.addDeclaration(detacherObject);
+            node.detacherStashKey = componentDefinition.stashItem(node.detacherIdentifier);
         }
         else {
             node.detacherStashKey = componentDefinition.stashItem(detacherObject);
         }
-    }
-    if (shouldSaveElement) {
-        if (node.isNestedComponent) {
-            node.elementKey = componentDefinition.saveNestedAsDynamicElement(node.address, t.identifier(node.tagName));
-        }
-        else if (isStub) {
-            const stubExpression = t.callExpression(t.identifier(constants_1.IMPORTABLES.getStub), [
-                t.thisExpression(),
-                t.stringLiteral(node.getStubName())
-            ]);
-            node.elementKey = componentDefinition.saveNestedAsDynamicElement(node.address, stubExpression);
-        }
-        else {
-            node.elementKey = componentDefinition.saveDynamicElement(node.address);
-        }
+        node.detacherObject = detacherObject;
     }
     if (needsWatch) {
         // Must be called before watches are processed.
         const componentWatch = new ComponentDefinitionData_1.ComponentWatch(node, componentDefinition, repeatInstruction ? node.parent.elementKey : node.elementKey, node.address);
-        if (node.isNestedComponent) {
-            processNestedComponent(componentDefinition, componentWatch, node);
-        }
         if (visibilityToggle) {
             processVisibilityToggle(componentDefinition, node, componentWatch, visibilityToggle);
         }
+        if (node.isNestedComponent || isStub) {
+            const parentDetacherArgs = node.parent.detacherObject.arguments;
+            if (parentDetacherArgs.length === 0) {
+                parentDetacherArgs.push(t.arrayExpression([]));
+            }
+            const firstArg = parentDetacherArgs[0];
+            firstArg.elements.push(t.arrayExpression([t.numericLiteral(node.initialIndex), t.numericLiteral(-1)]));
+            // Must happen after calling visibilityToggle
+            addNestedComponentWatch(componentDefinition, node, componentWatch);
+        }
         if (repeatInstruction) {
             processRepeater(componentDefinition, node, repeatInstruction, componentWatch);
         }
         if (hasClassToggles) {
             addToggleCallbackStatement(componentDefinition, node, componentWatch);
         }
-        if (isStub) {
-            processStub(componentDefinition, node, componentWatch);
-        }
         componentWatch.consolidate();
     }
     if (hasEventListeners) {
@@ -118,27 +120,17 @@ function addRequiredImports(componentDefinition, node) {
         componentDefinition.component.module.requireImport(importName);
     });
 }
-function processNestedComponent(componentDefinition, componentWatch, node) {
-    const callbackArgs = [node.getProps() || t.objectExpression([])];
-    if (config_1.wallaceConfig.flags.allowCtrl) {
-        callbackArgs.push(getCtrlExpression(node, componentDefinition.component));
-    }
-    componentWatch.add(constants_1.SPECIAL_SYMBOLS.noLookup, [
-        (0, types_1.expressionStatement)((0, types_1.callExpression)((0, types_1.memberExpression)((0, types_1.identifier)(constants_1.WATCH_AlWAYS_CALLBACK_ARGS.element), (0, types_1.identifier)(constants_1.COMPONENT_PROPERTIES.render)), callbackArgs))
-    ]);
-}
 function processVisibilityToggle(componentDefinition, node, componentWatch, visibilityToggle) {
     const shieldLookupKey = componentDefinition.addLookup(visibilityToggle.expression);
     componentWatch.shieldInfo = {
         skipCount: 0, // gets set later once we've processed all the nodes.
-        key: shieldLookupKey,
+        lookupIndex: shieldLookupKey,
         reverse: visibilityToggle.reverse
     };
     if (visibilityToggle.detach) {
         if (node.parent.detacherStashKey === undefined) {
             throw new Error("Parent node was not given a stash key");
         }
-        componentDefinition.component.module.requireImport(constants_1.IMPORTABLES.detacher);
         componentWatch.shieldInfo.detacher = {
             originalIndex: node.initialIndex,
             stashKey: node.parent.detacherStashKey,
@@ -146,18 +138,39 @@ function processVisibilityToggle(componentDefinition, node, componentWatch, visi
         };
     }
 }
-function processStub(componentDefinition, node, componentWatch) {
-    const component = componentDefinition.component;
-    componentDefinition.component.module.requireImport(constants_1.IMPORTABLES.getStub);
-    const callbackArgs = [component.propsIdentifier];
+function createNesterObject(componentDefinition, node, isStub) {
+    const component = componentDefinition.component, dynamicElements = componentDefinition.dynamicElements, componentCls = isStub
+        ? t.callExpression(t.identifier(constants_1.IMPORTABLES.getStub), [
+            t.thisExpression(),
+            t.stringLiteral(node.getStubName())
+        ])
+        : t.identifier(node.tagName);
+    component.module.requireImport(constants_1.IMPORTABLES.Nester);
+    if (isStub) {
+        component.module.requireImport(constants_1.IMPORTABLES.getStub);
+    }
+    const nesterObject = componentDefinition.addDeclaration((0, types_1.newExpression)((0, types_1.identifier)(constants_1.IMPORTABLES.Nester), [componentCls]));
+    const stashKey = componentDefinition.stashItem(nesterObject);
+    componentDefinition.dismountKeys.push(stashKey);
+    dynamicElements.push(nesterObject);
+    return dynamicElements.length - 1;
+}
+function addNestedComponentWatch(componentDefinition, node, componentWatch) {
+    const callbackArgs = [node.getProps() || t.objectExpression([])];
     if (config_1.wallaceConfig.flags.allowCtrl) {
-        callbackArgs.push(getCtrlExpression(node, component));
+        callbackArgs.push(getCtrlExpression(node, componentDefinition.component));
     }
     componentWatch.add(constants_1.SPECIAL_SYMBOLS.noLookup, [
-        (0, types_1.expressionStatement)((0, types_1.callExpression)((0, types_1.memberExpression)(
-        // In this case "element" is in fact the nested component.
-        (0, types_1.identifier)(constants_1.WATCH_AlWAYS_CALLBACK_ARGS.element), (0, types_1.identifier)(constants_1.COMPONENT_PROPERTIES.render)), callbackArgs))
+        (0, types_1.expressionStatement)((0, types_1.callExpression)((0, types_1.memberExpression)((0, types_1.identifier)(constants_1.WATCH_AlWAYS_CALLBACK_ARGS.element), (0, types_1.identifier)(constants_1.SPECIAL_SYMBOLS.send)), callbackArgs))
     ]);
+    if (!componentWatch.shieldInfo) {
+        componentWatch.shieldInfo = {};
+    }
+    componentWatch.shieldInfo.detacher = {
+        originalIndex: node.initialIndex,
+        stashKey: node.parent.detacherStashKey,
+        parentKey: node.parent.elementKey
+    };
 }
 function createEventsForBoundInputs(componentDefinition, node) {
     let setExpression, setProperty, { expression, event, property } = node.bindInstructions;
@@ -243,16 +256,15 @@ function addToggleCallbackStatement(componentDefinition, node, componentWatch) {
 }
 function processRepeater(componentDefinition, node, repeatInstruction, componentWatch) {
     const component = componentDefinition.component;
-    const detacherInfo = node.parent.detacherVariable
+    const detacherInfo = node.parent.detacherIdentifier
         ? {
             index: node.initialIndex,
-            detacherVariable: node.parent.detacherVariable
+            detacherVariable: node.parent.detacherIdentifier
         }
         : undefined;
     let repeaterClass;
     const repeaterArgs = [(0, types_1.identifier)(repeatInstruction.componentCls)];
     if (repeatInstruction.repeatKey) {
-        repeaterArgs.push(repeatInstruction.poolExpression || t.newExpression(t.identifier("Map"), []));
         repeaterClass = constants_1.IMPORTABLES.KeyedRepeater;
         if (typeof repeatInstruction.repeatKey === "string") {
             repeaterArgs.push(t.stringLiteral(repeatInstruction.repeatKey));
@@ -262,17 +274,16 @@ function processRepeater(componentDefinition, node, repeatInstruction, component
         }
     }
     else {
-        if (repeatInstruction.poolExpression) {
-            (0, errors_1.error)(node.path, errors_1.ERROR_MESSAGES.POOL_EXPRESSION_WITHOUT_REPEAT_KEY);
-        }
-        repeaterArgs.push(t.arrayExpression());
         repeaterClass = constants_1.IMPORTABLES.SequentialRepeater;
     }
     componentDefinition.component.module.requireImport(repeaterClass);
     if (detacherInfo) {
-        repeaterArgs.push(t.identifier(detacherInfo.detacherVariable), (0, types_1.numericLiteral)(detacherInfo.index));
+        repeaterArgs.push(detacherInfo.detacherVariable, (0, types_1.numericLiteral)(detacherInfo.index));
     }
     const stashKey = componentDefinition.stashItem((0, types_1.newExpression)((0, types_1.identifier)(repeaterClass), repeaterArgs));
+    if (config_1.wallaceConfig.flags.allowDismount) {
+        componentDefinition.dismountKeys.push(stashKey);
+    }
     const callbackArgs = [
         (0, types_1.identifier)(constants_1.WATCH_AlWAYS_CALLBACK_ARGS.element),
         repeatInstruction.expression
@@ -281,7 +292,7 @@ function processRepeater(componentDefinition, node, repeatInstruction, component
         callbackArgs.push(getCtrlExpression(node, component));
     }
     componentWatch.add(constants_1.SPECIAL_SYMBOLS.noLookup, [
-        (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.COMPONENT_PROPERTIES.stash)), (0, types_1.numericLiteral)(stashKey), true), (0, types_1.identifier)(constants_1.SPECIAL_SYMBOLS.patch)), callbackArgs))
+        (0, types_1.expressionStatement)((0, types_1.callExpression)((0, types_1.memberExpression)((0, types_1.memberExpression)((0, types_1.identifier)(constants_1.WATCH_AlWAYS_CALLBACK_ARGS.stash), (0, types_1.numericLiteral)(stashKey), true), (0, types_1.identifier)(constants_1.SPECIAL_SYMBOLS.patch)), callbackArgs))
     ]);
 }
 function processPart(componentDefinition, node, name) {

package/dist/consolidation/processNodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"processNodes.js","sourceRoot":"","sources":["../../src/consolidation/processNodes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"processNodes.js","sourceRoot":"","sources":["../../src/consolidation/processNodes.ts"],"names":[],"mappings":";;AA4BA,kCAsIC;AAjKD,wCAUsB;AACtB,kCAAkC;AAClC,sCAA0C;AAE1C,sCAAkD;AAClD,4CAQsB;AACtB,uEAAoF;AACpF,mCAAgF;AAEhF,SAAgB,WAAW,CACzB,mBAA4C,EAC5C,IAAmB;IAEnB,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC7B,gFAAgF;QAChF,sDAAsD;QACtD,8BAA8B;QAC9B,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,IAAI,EAAE,mBAAmB,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACjF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,EAAE,uBAAc,CAAC,8BAA8B,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,CAAC,sBAAa,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;YAC/C,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,IAAI,EAAE,mBAAmB,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;YACjF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,EAAE,uBAAc,CAAC,8BAA8B,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;IACH,CAAC;IACD,uBAAuB;IACvB,+BAA+B,CAAC,IAAI,CAAC,CAAC;IACtC,0BAA0B,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;IACtD,kBAAkB,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;IAE9C,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;IACpD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC5B,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;IACtD,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC;IACxD,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5D,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,KAAK,SAAS,CAAC;IAEhD,MAAM,UAAU,GACd,UAAU;QACV,cAAc;QACd,eAAe;QACf,gBAAgB;QAChB,IAAI,CAAC,iBAAiB;QACtB,iBAAiB;QACjB,MAAM,CAAC;IAET,MAAM,iBAAiB,GACrB,UAAU;QACV,cAAc;QACd,eAAe;QACf,gBAAgB;QAChB,GAAG;QACH,IAAI;QACJ,iBAAiB;QACjB,MAAM;QACN,IAAI,CAAC,iBAAiB;QACtB,IAAI,CAAC,sBAAsB;QAC3B,IAAI,CAAC,iBAAiB;QACtB,IAAI,CAAC,mBAAmB,CAAC;IAE3B,IAAI,iBAAiB,EAAE,CAAC;QACtB,IAAI,IAAI,CAAC,iBAAiB,IAAI,MAAM,EAAE,CAAC;YACrC,IAAI,CAAC,UAAU,GAAG,kBAAkB,CAAC,mBAAmB,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,UAAU,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAED,kFAAkF;IAClF,qBAAqB;IACrB,MAAM,aAAa,GACjB,IAAI,CAAC,sBAAsB;QAC3B,IAAI,CAAC,iBAAiB;QACtB,CAAC,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEzD,IAAI,aAAa,EAAE,CAAC;QAClB,mBAAmB,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,uBAAW,CAAC,QAAQ,CAAC,CAAC;QACzE,MAAM,cAAc,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QAChE,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7B,yEAAyE;YACzE,YAAY;YACZ,IAAI,CAAC,kBAAkB,GAAG,mBAAmB,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;YAC7E,IAAI,CAAC,gBAAgB,GAAG,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACjF,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,gBAAgB,GAAG,mBAAmB,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACxE,CAAC;QACD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,+CAA+C;QAC/C,MAAM,cAAc,GAAG,IAAI,wCAAc,CACvC,IAAI,EACJ,mBAAmB,EACnB,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAC5D,IAAI,CAAC,OAAO,CACb,CAAC;QAEF,IAAI,gBAAgB,EAAE,CAAC;YACrB,uBAAuB,CACrB,mBAAmB,EACnB,IAAI,EACJ,cAAc,EACd,gBAAgB,CACjB,CAAC;QACJ,CAAC;QAED,IAAI,IAAI,CAAC,iBAAiB,IAAI,MAAM,EAAE,CAAC;YACrC,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC;YAChE,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACpC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC;YACjD,CAAC;YACD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAoB,CAAC;YAC1D,QAAQ,CAAC,QAAQ,CAAC,IAAI,CACpB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC/E,CAAC;YACF,6CAA6C;YAC7C,uBAAuB,CAAC,mBAAmB,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,iBAAiB,EAAE,CAAC;YACtB,eAAe,CAAC,mBAAmB,EAAE,IAAI,EAAE,iBAAiB,EAAE,cAAc,CAAC,CAAC;QAChF,CAAC;QAED,IAAI,eAAe,EAAE,CAAC;YACpB,0BAA0B,CAAC,mBAAmB,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QACxE,CAAC;QAED,cAAc,CAAC,WAAW,EAAE,CAAC;IAC/B,CAAC;IAED,IAAI,iBAAiB,EAAE,CAAC;QACtB,qBAAqB,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IACD,IAAI,GAAG;QAAE,UAAU,CAAC,mBAAmB,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACpD,IAAI,IAAI;QAAE,WAAW,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,kBAAkB,CACzB,mBAA4C,EAC5C,IAAmB;IAEnB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QACxC,mBAAmB,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAC9B,mBAA4C,EAC5C,IAAmB,EACnB,cAA8B,EAC9B,gBAAkC;IAElC,MAAM,eAAe,GAAG,mBAAmB,CAAC,SAAS,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACnF,cAAc,CAAC,UAAU,GAAG;QAC1B,SAAS,EAAE,CAAC,EAAE,qDAAqD;QACnE,WAAW,EAAE,eAAe;QAC5B,OAAO,EAAE,gBAAgB,CAAC,OAAO;KAClC,CAAC;IACF,IAAI,gBAAgB,CAAC,MAAM,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;YAC/C,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QACD,cAAc,CAAC,UAAU,CAAC,QAAQ,GAAG;YACnC,aAAa,EAAE,IAAI,CAAC,YAAY;YAChC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;YACtC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;SAClC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CACzB,mBAA4C,EAC5C,IAAmB,EACnB,MAAe;IAEf,MAAM,SAAS,GAAG,mBAAmB,CAAC,SAAS,EAC7C,eAAe,GAAG,mBAAmB,CAAC,eAAe,EACrD,YAAY,GAAG,MAAM;QACnB,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,uBAAW,CAAC,OAAO,CAAC,EAAE;YAClD,CAAC,CAAC,cAAc,EAAE;YAClB,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;SACpC,CAAC;QACJ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAEjC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,uBAAW,CAAC,MAAM,CAAC,CAAC;IAEnD,IAAI,MAAM,EAAE,CAAC;QACX,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,uBAAW,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,YAAY,GAAG,mBAAmB,CAAC,cAAc,CACrD,IAAA,qBAAa,EAAC,IAAA,kBAAU,EAAC,uBAAW,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAC9D,CAAC;IACF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC7D,mBAAmB,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChD,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAEnC,OAAO,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,uBAAuB,CAC9B,mBAA4C,EAC5C,IAAmB,EACnB,cAA8B;IAE9B,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;IACjE,IAAI,sBAAa,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;QAClC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,cAAc,CAAC,GAAG,CAAC,2BAAe,CAAC,QAAQ,EAAE;QAC3C,IAAA,2BAAmB,EACjB,IAAA,sBAAc,EACZ,IAAA,wBAAgB,EACd,IAAA,kBAAU,EAAC,sCAA0B,CAAC,OAAO,CAAC,EAC9C,IAAA,kBAAU,EAAC,2BAAe,CAAC,IAAI,CAAC,CACjC,EACD,YAAY,CACb,CACF;KACF,CAAC,CAAC;IACH,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC;QAC/B,cAAc,CAAC,UAAU,GAAG,EAAE,CAAC;IACjC,CAAC;IACD,cAAc,CAAC,UAAU,CAAC,QAAQ,GAAG;QACnC,aAAa,EAAE,IAAI,CAAC,YAAY;QAChC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;QACtC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;KAClC,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CACjC,mBAA4C,EAC5C,IAAmB;IAEnB,IAAI,aAAa,EACf,WAAW,EACX,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;IAE1D,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,IAAI,KAAK,EAAE,CAAC;YACV,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,EAAE,uBAAc,CAAC,uBAAuB,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO;IACT,CAAC;IACD,KAAK,GAAG,KAAK,IAAI,QAAQ,CAAC;IAC1B,QAAQ,GAAG,QAAQ,IAAI,OAAO,CAAC;IAE/B,oFAAoF;IACpF,0CAA0C;IAC1C,EAAE;IACF,oEAAoE;IACpE,0DAA0D;IAC1D,EAAE;IACF,kFAAkF;IAClF,eAAe;IACf,4EAA4E;IAC5E,+DAA+D;IAC/D,IAAI,QAAQ,IAAI,aAAa,EAAE,CAAC;QAC9B,mBAAmB,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,uBAAW,CAAC,YAAY,CAAC,CAAC;QAC7E,WAAW,GAAG,OAAO,CAAC;QACtB,aAAa,GAAG,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,uBAAW,CAAC,YAAY,CAAC,EAAE;YACvE,UAAU;SACX,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,WAAW,GAAG,QAAQ,CAAC;QACvB,aAAa,GAAG,UAAU,CAAC;IAC7B,CAAC;IAED,gFAAgF;IAChF,iFAAiF;IACjF,gFAAgF;IAChF,4CAA4C;IAC5C,IAAI,CAAC,QAAQ,CACX,2BAAe,CAAC,QAAQ,EACxB,CAAC,CAAC,oBAAoB,CACpB,GAAG,EACH,CAAC,CAAC,gBAAgB,CAChB,CAAC,CAAC,UAAU,CAAC,sCAA0B,CAAC,OAAO,CAAC,EAChD,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAC1B,EACD,aAA2B,CAC5B,CACF,CAAC;IAEF,mDAAmD;IACnD,MAAM,QAAQ,GAAG,CAAC,CAAC,oBAAoB,CACrC,GAAG,EACH,UAAwB,EACxB,CAAC,CAAC,gBAAgB,CAChB,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,+BAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,EACnF,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CACvB,CACF,CAAC;IACF,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,+BAA+B,CAAC,IAAmB;IAC1D,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;QACpF,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,EAAE,uBAAc,CAAC,sCAAsC,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAmB,EAAE,SAAoB;IAClE,OAAO,CACL,IAAI,CAAC,OAAO,EAAE;QACd,IAAA,wBAAgB,EAAC,SAAS,CAAC,mBAAmB,EAAE,IAAA,kBAAU,EAAC,gCAAoB,CAAC,IAAI,CAAC,CAAC,CACvF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,KAA4B;IACrD,IAAI,OAAO,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC7B,OAAO,KAAK;aACT,IAAI,EAAE;aACN,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAClC,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,0BAA0B,CACjC,mBAA4C,EAC5C,IAAmB,EACnB,cAA8B;IAE9B,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;QACnF,MAAM,eAAe,GAAG,MAAM;YAC5B,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC;YACjC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACpC,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;QAC5C,MAAM,SAAS,GAAG,mBAAmB,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,CAAC,MAAwB,EAAE,EAAE,CAC/C,IAAA,sBAAc,EACZ,IAAA,wBAAgB,EACd,IAAA,wBAAgB,EACd,IAAA,kBAAU,EAAC,+BAAmB,CAAC,OAAO,CAAC,EACvC,IAAA,kBAAU,EAAC,WAAW,CAAC,CACxB,EACD,IAAA,kBAAU,EAAC,MAAM,CAAC,CACnB,EACD,eAAe,CAChB,CAAC;QAEJ,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE;YAC5B,CAAC,CAAC,WAAW,CACX,CAAC,CAAC,UAAU,CAAC,+BAAmB,CAAC,QAAQ,CAAC,EAC1C,IAAA,sBAAc,EAAC,CAAC,IAAA,2BAAmB,EAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EACzD,IAAA,sBAAc,EAAC,CAAC,IAAA,2BAAmB,EAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAC7D;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,eAAe,CACtB,mBAA4C,EAC5C,IAAmB,EACnB,iBAAoC,EACpC,cAA8B;IAE9B,MAAM,SAAS,GAAG,mBAAmB,CAAC,SAAS,CAAC;IAChD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB;QACjD,CAAC,CAAC;YACE,KAAK,EAAE,IAAI,CAAC,YAAY;YACxB,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;SACjD;QACH,CAAC,CAAC,SAAS,CAAC;IAEd,IAAI,aAAa,CAAC;IAClB,MAAM,YAAY,GAAQ,CAAC,IAAA,kBAAU,EAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAC;IACvE,IAAI,iBAAiB,CAAC,SAAS,EAAE,CAAC;QAChC,aAAa,GAAG,uBAAW,CAAC,aAAa,CAAC;QAC1C,IAAI,OAAO,iBAAiB,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;YACpD,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACN,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,aAAa,GAAG,uBAAW,CAAC,kBAAkB,CAAC;IACjD,CAAC;IACD,mBAAmB,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAClE,IAAI,YAAY,EAAE,CAAC;QACjB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAA,sBAAc,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IACvF,CAAC;IACD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,SAAS,CAC5C,IAAA,qBAAa,EAAC,IAAA,kBAAU,EAAC,aAAa,CAAC,EAAE,YAAY,CAAC,CACvD,CAAC;IAEF,IAAI,sBAAa,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;QACtC,mBAAmB,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,YAAY,GAAG;QACnB,IAAA,kBAAU,EAAC,sCAA0B,CAAC,OAAO,CAAC;QAC9C,iBAAiB,CAAC,UAAU;KAC7B,CAAC;IACF,IAAI,sBAAa,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;QAClC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,cAAc,CAAC,GAAG,CAAC,2BAAe,CAAC,QAAQ,EAAE;QAC3C,IAAA,2BAAmB,EACjB,IAAA,sBAAc,EACZ,IAAA,wBAAgB,EACd,IAAA,wBAAgB,EACd,IAAA,kBAAU,EAAC,sCAA0B,CAAC,KAAK,CAAC,EAC5C,IAAA,sBAAc,EAAC,QAAQ,CAAC,EACxB,IAAI,CACL,EACD,IAAA,kBAAU,EAAC,2BAAe,CAAC,KAAK,CAAC,CAClC,EACD,YAAY,CACb,CACF;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAClB,mBAA4C,EAC5C,IAAmB,EACnB,IAAY;IAEZ,MAAM,UAAU,GAAG,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC9D,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,EAAE,uBAAc,CAAC,0CAA0C,CAAC,CAAC;IAC9E,CAAC;IACD,2DAA2D;IAC3D,MAAM,cAAc,GAAG,mBAAmB,CAAC,sBAAsB,CAC/D,IAAI,CAAC,UAAU,EACf,uBAAW,CAAC,QAAQ,EACpB,CAAC,CAAC,CAAC,cAAc,EAAE,EAAE,IAAA,kBAAU,EAAC,gCAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CACnF,CAAC;IACF,MAAM,IAAI,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;IAC7D,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,UAAU,CACjB,mBAA4C,EAC5C,IAAmB,EACnB,IAAY;IAEZ,IAAI,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,EAAE,uBAAc,CAAC,yCAAyC,CAAC,CAAC;IAC7E,CAAC;IACD,mBAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,uBAAW,CAAC,OAAO,EAAE;QAC/E,IAAA,kBAAU,EAAC,gCAAoB,CAAC,GAAG,CAAC;QACpC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC;KACtB,CAAC,CAAC;IACH,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC;AAED,SAAS,qBAAqB,CAC5B,mBAA4C,EAC5C,IAAmB;IAEnB,MAAM,SAAS,GAAG,mBAAmB,CAAC,SAAS,CAAC;IAChD,+EAA+E;IAC/E,0EAA0E;IAC1E,0EAA0E;IAC1E,kDAAkD;IAClD,MAAM,oBAAoB,GAA8B;QACtD,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,gCAAoB,CAAC,OAAO;QAClE,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,GAAG,GAAG,GAAG,gCAAoB,CAAC,IAAI,CAAC,EACpE,GAAG,gCAAoB,CAAC,OAAO,IAAI,gCAAoB,CAAC,IAAI,EAAE;QAChE,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,EAC9B,GAAG,gCAAoB,CAAC,OAAO,IAAI,gCAAoB,CAAC,KAAK,EAAE;KAClE,CAAC;IACF,IAAI,SAAS,CAAC,WAAW,CAAC,cAAc,CAAC,iBAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACxD,oBAAoB,CAAC,+BAAmB,CAAC,OAAO,CAAC;YAC/C,GAAG,+BAAmB,CAAC,KAAK,SAAS,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACrC,MAAM,iBAAiB,GAAG,IAAA,mCAA2B,EACnD,QAAQ,CAAC,QAAQ,EACjB,oBAAoB,CACrB,CAAC;QACF,mBAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,uBAAW,CAAC,OAAO,EAAE;YAC/E,IAAA,qBAAa,EAAC,QAAQ,CAAC,SAAS,CAAC;YACjC,IAAA,+BAAuB,EACrB,CAAC,IAAA,kBAAU,EAAC,+BAAmB,CAAC,KAAK,CAAC,CAAC,EACvC,IAAA,sBAAc,EAAC,CAAC,IAAA,2BAAmB,EAAC,iBAAiB,CAAC,CAAC,CAAC,CACzD;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/consolidation/types.d.ts

@@ -6,9 +6,9 @@ export interface Detacher {
     parentKey: number;
 }
 export interface ShieldInfo {
-    key: number;
-    reverse: boolean;
-    skipCount: number;
+    lookupIndex?: number;
+    reverse?: boolean;
+    skipCount?: number;
     detacher?: Detacher;
 }
 export interface Part {

package/dist/consolidation/utils.d.ts

@@ -1,4 +1,4 @@
-import type { ArrayExpression, Expression, CallExpression } from "@babel/types";
+import type { ArrayExpression, Expression } from "@babel/types";
 import { Component, ExtractedNode, Module } from "../models";
 import { NodeAddress } from "./types";
 export declare function getSiblings(node: ExtractedNode, allNodes: Array<ExtractedNode>): ExtractedNode[];
@@ -9,7 +9,6 @@ export declare function buildAddressArray(address: NodeAddress): ArrayExpression
  * root.
  */
 export declare function buildFindElementCall(module: Module, address: NodeAddress): Expression;
-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.

package/dist/consolidation/utils.js

@@ -4,7 +4,6 @@ exports.getSiblings = getSiblings;
 exports.getChildren = getChildren;
 exports.buildAddressArray = buildAddressArray;
 exports.buildFindElementCall = buildFindElementCall;
-exports.buildNestedClassCall = buildNestedClassCall;
 exports.removeKeys = removeKeys;
 exports.renameVariablesInExpression = renameVariablesInExpression;
 exports.buildWatchCallbackParams = buildWatchCallbackParams;
@@ -32,14 +31,6 @@ function buildFindElementCall(module, address) {
         ])
         : (0, types_1.identifier)(constants_1.COMPONENT_PROPERTIES.root);
 }
-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_PROPERTIES.root),
-        buildAddressArray(address),
-        componentCls
-    ]);
-}
 function removeKeys(obj, keys) {
     for (const prop in obj) {
         if (keys.includes(prop))
@@ -88,8 +79,10 @@ function buildWatchCallbackParams(component, noLookup) {
     return noLookup
         ? [
             (0, types_1.identifier)(constants_1.WATCH_CALLBACK_ARGS.element),
+            // We use these as there may have been renames - but should we?
             component.propsIdentifier,
-            component.componentIdentifier
+            component.componentIdentifier,
+            (0, types_1.identifier)(constants_1.WATCH_AlWAYS_CALLBACK_ARGS.stash)
         ]
         : [
             (0, types_1.identifier)(constants_1.WATCH_CALLBACK_ARGS.element),

package/dist/consolidation/utils.js.map

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

package/dist/constants.d.ts

@@ -5,7 +5,7 @@ export declare enum IMPORTABLES {
     extendComponent = "extendComponent",
     findElement = "findElement",
     getStub = "getStub",
-    nestComponent = "nestComponent",
+    Nester = "Nester",
     saveRef = "saveRef",
     savePart = "savePart",
     stashMisc = "stashMisc",
@@ -34,32 +34,34 @@ export declare enum WATCH_CALLBACK_ARGS {
 }
 export declare enum WATCH_AlWAYS_CALLBACK_ARGS {
     element = "element",
-    props = "p",
-    component = "c"
+    stash = "stash"
 }
 export declare enum EVENT_CALLBACK_ARGS {
     event = "event",
     element = "element"
 }
 export declare enum COMPONENT_PROPERTIES {
-    ctrl = "ctrl",
-    props = "props",
-    ref = "ref",
-    part = "part",
-    root = "el",
     elements = "_e",
-    watchLength = "_l",
     stash = "_s",
+    cache = "_c",
+    dismountKeys = "_d",
     previous = "_p",
     template = "_t",
+    updateInner = "_u",
     watches = "_w",
+    watchLength = "_l",
+    root = "el",
+    ctrl = "ctrl",
+    props = "props",
+    ref = "ref",
+    part = "part",
     render = "render",
     tmpThis = "_this",
-    update = "update",
-    updateInner = "_u"
+    update = "update"
 }
 export declare enum SPECIAL_SYMBOLS {
     noLookup = "__",
+    send = "send",
     patch = "patch"
 }
 export declare const DOM_EVENTS: string[];