babel-plugin-wallace 0.12.2 → 0.14.0

package/dist/config.d.ts

@@ -1,11 +1,12 @@
 import type { NodePath } from "@babel/core";
 import { Directive } from "./models";
 export declare enum FlagValue {
-    useBase = "useBase",
-    useControllers = "useControllers",
-    useMethods = "useMethods",
-    useParts = "useParts",
-    useStubs = "useStubs"
+    allowBase = "allowBase",
+    allowCtrl = "allowCtrl",
+    allowMethods = "allowMethods",
+    allowParts = "allowParts",
+    allowRepeaterSiblings = "allowRepeaterSiblings",
+    allowStubs = "allowStubs"
 }
 type Flag = Record<FlagValue, boolean>;
 interface WallaceOptions {

package/dist/config.js

@@ -17,25 +17,28 @@ const errors_1 = require("./errors");
 const directives_1 = require("./directives");
 var FlagValue;
 (function (FlagValue) {
-    FlagValue["useBase"] = "useBase";
-    FlagValue["useControllers"] = "useControllers";
-    FlagValue["useMethods"] = "useMethods";
-    FlagValue["useParts"] = "useParts";
-    FlagValue["useStubs"] = "useStubs";
+    FlagValue["allowBase"] = "allowBase";
+    FlagValue["allowCtrl"] = "allowCtrl";
+    FlagValue["allowMethods"] = "allowMethods";
+    FlagValue["allowParts"] = "allowParts";
+    FlagValue["allowRepeaterSiblings"] = "allowRepeaterSiblings";
+    FlagValue["allowStubs"] = "allowStubs";
 })(FlagValue || (exports.FlagValue = FlagValue = {}));
 const DefaultFlagValues = {
-    useBase: true,
-    useControllers: true,
-    useMethods: true,
-    useParts: true,
-    useStubs: true
+    allowBase: true,
+    allowCtrl: true,
+    allowMethods: true,
+    allowParts: true,
+    allowRepeaterSiblings: true,
+    allowStubs: true
 };
 const DefaultFlagOverrideValues = {
-    useBase: false,
-    useControllers: false,
-    useMethods: false,
-    useParts: false,
-    useStubs: false
+    allowBase: false,
+    allowCtrl: false,
+    allowMethods: false,
+    allowParts: false,
+    allowRepeaterSiblings: false,
+    allowStubs: false
 };
 class WallaceConfig {
     constructor() {

package/dist/config.js.map

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

package/dist/consolidation/ComponentDefinitionData.d.ts

@@ -1,23 +1,20 @@
-import type { Expression, CallExpression, FunctionExpression, Identifier } from "@babel/types";
-import { Component } from "../models";
+import type { Expression, CallExpression, ArrowFunctionExpression, Identifier, Statement } from "@babel/types";
+import { Component, ExtractedNode } from "../models";
 import { IMPORTABLES } from "../constants";
-import { ComponentWatch, NodeAddress, Part } from "./types";
+import { NodeAddress, Part, ShieldInfo } from "./types";
 /**
  * An object with all the consolidated data for writing.
  */
 export declare class ComponentDefinitionData {
     #private;
     stash: Array<Expression>;
+    detachers: Array<Expression>;
     component: Component;
     html: Expression;
     watches: Array<ComponentWatch>;
-    dynamicElements: {
-        [key: number]: Expression;
-    };
+    dynamicElements: Expression[];
     baseComponent: Expression | undefined;
-    lookups: {
-        [key: string]: FunctionExpression;
-    };
+    lookups: Map<number, ArrowFunctionExpression>;
     refs: string[];
     parts: Array<Part>;
     constructor(component: Component);
@@ -28,4 +25,20 @@ export declare class ComponentDefinitionData {
     getLookupCallBackParams(): Array<Identifier>;
     wrapDynamicElementCall(key: number, functionName: IMPORTABLES, remainingArgs: Expression[]): CallExpression;
     stashItem(expression: Expression): number;
+    createDetacher(expression: Expression): string;
+    getDetacherId(index: number): string;
+}
+export declare class ComponentWatch {
+    #private;
+    shieldInfo?: ShieldInfo | undefined;
+    node: ExtractedNode;
+    componentDefinition: ComponentDefinitionData;
+    elementKey: number;
+    address: NodeAddress;
+    callbacks: {
+        [key: string | number]: ArrowFunctionExpression;
+    };
+    constructor(node: ExtractedNode, componentDefinition: ComponentDefinitionData, elementKey: number, address: NodeAddress);
+    add(lookupKey: string | number, statements: Statement[]): void;
+    consolidate(): void;
 }

package/dist/consolidation/ComponentDefinitionData.js

@@ -4,44 +4,36 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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_lookupKeys;
+var _ComponentDefinitionData_lookupKeys, _ComponentWatch_tmpCallbacks;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ComponentDefinitionData = void 0;
+exports.ComponentWatch = exports.ComponentDefinitionData = void 0;
 const types_1 = require("@babel/types");
+const constants_1 = require("../constants");
 const utils_1 = require("./utils");
+const utils_2 = require("../utils");
 /**
  * An object with all the consolidated data for writing.
  */
 class ComponentDefinitionData {
     constructor(component) {
         this.stash = [];
+        this.detachers = [];
         this.watches = [];
-        this.dynamicElements = {};
-        this.lookups = {};
+        this.dynamicElements = [];
+        this.lookups = new Map();
         this.refs = [];
         this.parts = [];
-        _ComponentDefinitionData_dynamicElementKey.set(this, -1);
         _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");
-        this.dynamicElements[__classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f")] = (0, utils_1.buildFindElementCall)(this.component.module, address);
-        return __classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f");
+        this.dynamicElements.push((0, utils_1.buildFindElementCall)(this.component.module, address));
+        return this.dynamicElements.length - 1;
     }
     saveNestedAsDynamicElement(address, componentCls) {
-        var _a;
-        __classPrivateFieldSet(this, _ComponentDefinitionData_dynamicElementKey, (_a = __classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f"), _a++, _a), "f");
-        this.dynamicElements[__classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f")] = (0, utils_1.buildNestedClassCall)(this.component.module, address, componentCls);
-        return __classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f");
+        this.dynamicElements.push((0, utils_1.buildNestedClassCall)(this.component.module, address, componentCls));
+        return this.dynamicElements.length - 1;
     }
     addLookup(expression) {
         const hashExpression = expr => {
@@ -54,7 +46,7 @@ class ComponentDefinitionData {
             __classPrivateFieldGet(this, _ComponentDefinitionData_lookupKeys, "f").push(hash);
         }
         const key = __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)]));
+        this.lookups.set(key, (0, types_1.arrowFunctionExpression)(this.getLookupCallBackParams(), (0, types_1.blockStatement)([(0, types_1.returnStatement)(expression)])));
         return key;
     }
     getFunctionIdentifier(name) {
@@ -71,7 +63,52 @@ class ComponentDefinitionData {
         this.stash.push(expression);
         return this.stash.length - 1;
     }
+    createDetacher(expression) {
+        this.detachers.push(expression);
+        return this.getDetacherId(this.detachers.length - 1);
+    }
+    getDetacherId(index) {
+        return `detacher${index}`;
+    }
 }
 exports.ComponentDefinitionData = ComponentDefinitionData;
-_ComponentDefinitionData_dynamicElementKey = new WeakMap(), _ComponentDefinitionData_lookupKeys = new WeakMap();
+_ComponentDefinitionData_lookupKeys = new WeakMap();
+class ComponentWatch {
+    constructor(node, componentDefinition, elementKey, address) {
+        _ComponentWatch_tmpCallbacks.set(this, {});
+        this.callbacks = {};
+        this.node = node;
+        this.componentDefinition = componentDefinition;
+        this.elementKey = elementKey;
+        this.address = address;
+        if (this.elementKey === undefined) {
+            // Means we messed up shouldSaveElement vs needsWatch
+            throw "Internal Error: elementKey is undefined";
+        }
+        node.watches.forEach(watch => {
+            if (watch.expression == constants_1.SPECIAL_SYMBOLS.noLookup) {
+                this.add(constants_1.SPECIAL_SYMBOLS.noLookup, (0, utils_2.codeToNode)(watch.callback));
+            }
+            else {
+                const lookupKey = componentDefinition.addLookup(watch.expression);
+                this.add(lookupKey, (0, utils_2.codeToNode)(watch.callback));
+            }
+        });
+        componentDefinition.watches.push(this);
+    }
+    add(lookupKey, statements) {
+        if (!__classPrivateFieldGet(this, _ComponentWatch_tmpCallbacks, "f").hasOwnProperty(lookupKey)) {
+            __classPrivateFieldGet(this, _ComponentWatch_tmpCallbacks, "f")[lookupKey] = [];
+        }
+        __classPrivateFieldGet(this, _ComponentWatch_tmpCallbacks, "f")[lookupKey].push(...statements);
+    }
+    consolidate() {
+        for (const key in __classPrivateFieldGet(this, _ComponentWatch_tmpCallbacks, "f")) {
+            const args = (0, utils_1.buildWatchCallbackParams)(this.componentDefinition.component, key === constants_1.SPECIAL_SYMBOLS.noLookup);
+            this.callbacks[key] = (0, types_1.arrowFunctionExpression)(args, (0, types_1.blockStatement)(__classPrivateFieldGet(this, _ComponentWatch_tmpCallbacks, "f")[key]));
+        }
+    }
+}
+exports.ComponentWatch = ComponentWatch;
+_ComponentWatch_tmpCallbacks = new WeakMap();
 //# sourceMappingURL=ComponentDefinitionData.js.map

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":";;;;;;;;;AAOA,wCAMsB;AAEtB,4CAA4D;AAE5D,mCAKiB;AACjB,oCAAsC;AAEtC;;GAEG;AACH,MAAa,uBAAuB;IAYlC,YAAY,SAAoB;QAXhC,UAAK,GAAsB,EAAE,CAAC;QAC9B,cAAS,GAAsB,EAAE,CAAC;QAGlC,YAAO,GAA0B,EAAE,CAAC;QACpC,oBAAe,GAAiB,EAAE,CAAC;QAEnC,YAAO,GAAyC,IAAI,GAAG,EAAE,CAAC;QAC1D,SAAI,GAAa,EAAE,CAAC;QACpB,UAAK,GAAgB,EAAE,CAAC;QACxB,8CAA6B,EAAE,EAAC;QAE9B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,aAAa,CAAC;IAC/C,CAAC;IAED,kBAAkB,CAAC,OAAoB;QACrC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAA,4BAAoB,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC;IACzC,CAAC;IACD,0BAA0B,CAAC,OAAoB,EAAE,YAAwB;QACvE,IAAI,CAAC,eAAe,CAAC,IAAI,CACvB,IAAA,4BAAoB,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,CACnE,CAAC;QACF,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC;IACzC,CAAC;IACD,SAAS,CAAC,UAAsB;QAC9B,MAAM,cAAc,GAAG,IAAI,CAAC,EAAE;YAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9C,IAAA,kBAAU,EAAC,IAAI,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;YAC1C,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC,CAAC;QACF,MAAM,IAAI,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,uBAAA,IAAI,2CAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,uBAAA,IAAI,2CAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;QACD,MAAM,GAAG,GAAG,uBAAA,IAAI,2CAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,GAAG,CACd,GAAG,EACH,IAAA,+BAAuB,EACrB,IAAI,CAAC,uBAAuB,EAAE,EAC9B,IAAA,sBAAc,EAAC,CAAC,IAAA,uBAAe,EAAC,UAAU,CAAC,CAAC,CAAC,CAC9C,CACF,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IACD,qBAAqB,CAAC,IAAiB;QACrC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1C,OAAO,IAAA,kBAAU,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IACD,uBAAuB;QACrB,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;IAC9E,CAAC;IACD,sBAAsB,CACpB,GAAW,EACX,YAAyB,EACzB,aAA2B;QAE3B,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,IAAA,sBAAc,EAChD,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,EACxC,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,GAAG,aAAa,CAAC,CAC9C,CAAC,CAAC;IACL,CAAC;IACD,SAAS,CAAC,UAAsB;QAC9B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAC/B,CAAC;IACD,cAAc,CAAC,UAAsB;QACnC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvD,CAAC;IACD,aAAa,CAAC,KAAa;QACzB,OAAO,WAAW,KAAK,EAAE,CAAC;IAC5B,CAAC;CACF;AA3ED,0DA2EC;;AAED,MAAa,cAAc;IAQzB,YACE,IAAmB,EACnB,mBAA4C,EAC5C,UAAkB,EAClB,OAAoB;QANtB,uCAA8D,EAAE,EAAC;QACjE,cAAS,GAAwD,EAAE,CAAC;QAOlE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAClC,qDAAqD;YACrD,MAAM,yCAAyC,CAAC;QAClD,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC3B,IAAI,KAAK,CAAC,UAAU,IAAI,2BAAe,CAAC,QAAQ,EAAE,CAAC;gBACjD,IAAI,CAAC,GAAG,CAAC,2BAAe,CAAC,QAAQ,EAAE,IAAA,kBAAU,EAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;YACjE,CAAC;iBAAM,CAAC;gBACN,MAAM,SAAS,GAAG,mBAAmB,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBAClE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAA,kBAAU,EAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClD,CAAC;QACH,CAAC,CAAC,CAAC;QACH,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IACD,GAAG,CAAC,SAA0B,EAAE,UAAuB;QACrD,IAAI,CAAC,uBAAA,IAAI,oCAAc,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;YAClD,uBAAA,IAAI,oCAAc,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;QACrC,CAAC;QACD,uBAAA,IAAI,oCAAc,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;IACpD,CAAC;IACD,WAAW;QACT,KAAK,MAAM,GAAG,IAAI,uBAAA,IAAI,oCAAc,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,IAAA,gCAAwB,EACnC,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAClC,GAAG,KAAK,2BAAe,CAAC,QAAQ,CACjC,CAAC;YACF,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAA,+BAAuB,EAC3C,IAAI,EACJ,IAAA,sBAAc,EAAC,uBAAA,IAAI,oCAAc,CAAC,GAAG,CAAC,CAAC,CACxC,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAlDD,wCAkDC"}

package/dist/consolidation/consolidateComponent.js

@@ -32,7 +32,9 @@ function hoistTextNodes(component) {
 function consolidateComponent(component) {
     const componentDefinition = new ComponentDefinitionData_1.ComponentDefinitionData(component);
     hoistTextNodes(component);
-    (0, processNodes_1.processNodes)(component, componentDefinition);
+    component.extractedNodes.forEach(node => {
+        (0, processNodes_1.processNode)(componentDefinition, node);
+    });
     (0, postProcessing_1.postProcessing)(componentDefinition);
     // This must be done after all the processing, as DOM may have changed.
     componentDefinition.html = component.buildHTMLString();

package/dist/consolidation/consolidateComponent.js.map

@@ -1 +1 @@
-{"version":3,"file":"consolidateComponent.js","sourceRoot":"","sources":["../../src/consolidation/consolidateComponent.ts"],"names":[],"mappings":";;AA8BA,oDAQC;AAtCD,sCAAuD;AACvD,qDAAkD;AAClD,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,IAAI,CAAC,EAAE;QACtC,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,IAAI,CAAC,EAAE;QAC3B,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,CAAC,SAAoB;IACvD,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,+BAAc,EAAC,mBAAmB,CAAC,CAAC;IACpC,uEAAuE;IACvE,mBAAmB,CAAC,IAAI,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC;IACvD,OAAO,mBAAmB,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"consolidateComponent.js","sourceRoot":"","sources":["../../src/consolidation/consolidateComponent.ts"],"names":[],"mappings":";;AA8BA,oDAWC;AAzCD,sCAAuD;AACvD,qDAAkD;AAClD,uEAAoE;AACpE,iDAA6C;AAC7C,mCAAsC;AAEtC;;;GAGG;AACH,SAAS,cAAc,CAAC,SAAoB;IAC1C,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACtC,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,IAAI,CAAC,EAAE;QAC3B,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,CAAC,SAAoB;IACvD,MAAM,mBAAmB,GAAG,IAAI,iDAAuB,CAAC,SAAS,CAAC,CAAC;IACnE,cAAc,CAAC,SAAS,CAAC,CAAC;IAE1B,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACtC,IAAA,0BAAW,EAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IACH,IAAA,+BAAc,EAAC,mBAAmB,CAAC,CAAC;IACpC,uEAAuE;IACvE,mBAAmB,CAAC,IAAI,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC;IACvD,OAAO,mBAAmB,CAAC;AAC7B,CAAC"}

package/dist/consolidation/processNodes.d.ts

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