babel-plugin-wallace 0.14.1 → 0.16.0

package/dist/ast-helpers.d.ts

@@ -1,9 +1,22 @@
 import type { NodePath } from "@babel/core";
-import type { Expression, JSXElement, JSXEmptyExpression } from "@babel/types";
-export declare function getJSXElementName(path: NodePath<JSXElement>): string | {
+import type { Expression, JSXElement, JSXAttribute, JSXEmptyExpression } from "@babel/types";
+import { NodeValue } from "./models";
+interface JSXElementData {
+    type: "normal" | "nested" | "stub";
+    repeat?: true;
     name: string;
-    namespace: string;
-};
+}
+/**
+ * A JSXElement's openingElement can be several things:
+ *
+ *  <div                // A normal element
+ *  <Foo                // A nested component
+ *  <Foo.repeat         // A repeated component
+ *  <stub.foo          // A nested stub
+ *  <stub.foo.repeat   // A repeated stub
+ *
+ */
+export declare function getJSXElementData(path: NodePath<JSXElement>): JSXElementData;
 /**
  * An Expression can be one of dozens of types, most of which are not usable.
  */
@@ -12,3 +25,21 @@ export declare function getPlaceholderExpression(path: NodePath, expression: Exp
  * Builds a string concat Expression.
  */
 export declare function buildConcat(parts: Expression[]): Expression;
+/**
+ * Name could be:
+ *  foo
+ *  foo:bar
+ */
+export declare function extractAttributeName(path: NodePath<JSXAttribute>): {
+    base: string;
+    qualifier: string | undefined;
+};
+/**
+ * Value could be:
+ *
+ *   foo
+ *   foo="bar"
+ *   foo={bar}
+ */
+export declare function extractAttributeValue(path: NodePath<JSXAttribute>): NodeValue | undefined;
+export {};

package/dist/ast-helpers.js

@@ -1,32 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getJSXElementName = getJSXElementName;
+exports.getJSXElementData = getJSXElementData;
 exports.getPlaceholderExpression = getPlaceholderExpression;
 exports.buildConcat = buildConcat;
+exports.extractAttributeName = extractAttributeName;
+exports.extractAttributeValue = extractAttributeValue;
 const t = require("@babel/types");
 const errors_1 = require("./errors");
-function getJSXElementName(path) {
+const utils_1 = require("./utils");
+/**
+ * A JSXElement's openingElement can be several things:
+ *
+ *  <div                // A normal element
+ *  <Foo                // A nested component
+ *  <Foo.repeat         // A repeated component
+ *  <stub.foo          // A nested stub
+ *  <stub.foo.repeat   // A repeated stub
+ *
+ */
+function getJSXElementData(path) {
     const openingElementName = path.node.openingElement.name;
-    if (t.isJSXIdentifier(openingElementName)) {
-        return openingElementName.name;
-    }
-    else if (t.isJSXNamespacedName(openingElementName)) {
+    if (t.isJSXNamespacedName(openingElementName)) {
         const { namespace, name } = openingElementName;
-        return { namespace: namespace.name, name: name.name };
+        return { type: "normal", name: `${namespace.name}:${name.name}` };
+    }
+    else if (t.isJSXIdentifier(openingElementName)) {
+        const name = openingElementName.name;
+        return { name, type: (0, utils_1.isCapitalized)(name) ? "nested" : "normal" };
     }
     else if (t.isJSXMemberExpression(openingElementName)) {
         const { object, property } = openingElementName;
         if (t.isJSXIdentifier(object)) {
-            return { namespace: object.name, name: property.name };
+            // Means we have aaa.bbb
+            if ((0, utils_1.isCapitalized)(object.name)) {
+                if (property.name === "repeat") {
+                    return { name: object.name, type: "nested", repeat: true };
+                }
+            }
+            else {
+                if (object.name === "stub") {
+                    return { name: property.name, type: "stub" };
+                }
+            }
         }
-        else {
-            (0, errors_1.error)(path, errors_1.ERROR_MESSAGES.ARROW_FUNCTION_NOT_ASSIGNED);
+        else if (t.isJSXMemberExpression(object)) {
+            // Means we have aaa.bbb.ccc
+            const { object: subObject, property: subProperty } = object;
+            if (t.isJSXIdentifier(subObject) &&
+                subObject.name === "stub" &&
+                property.name === "repeat") {
+                return { name: subProperty.name, type: "stub", repeat: true };
+            }
         }
     }
-    else {
-        console.debug(path.node);
-        throw Error(`Can't read name from ${openingElementName}`);
-    }
+    (0, errors_1.error)(path, errors_1.ERROR_MESSAGES.INVALID_TAG_FORMAT);
 }
 /**
  * An Expression can be one of dozens of types, most of which are not usable.
@@ -48,4 +75,46 @@ function getPlaceholderExpression(path, expression) {
 function buildConcat(parts) {
     return parts.reduce((left, right) => (left ? t.binaryExpression("+", left, right) : right), null);
 }
+/**
+ * Name could be:
+ *  foo
+ *  foo:bar
+ */
+function extractAttributeName(path) {
+    const { name } = path.node;
+    let base, qualifier;
+    if (t.isJSXNamespacedName(name)) {
+        base = name.namespace.name;
+        qualifier = name.name.name;
+    }
+    else {
+        base = name.name;
+    }
+    return { base, qualifier };
+}
+/**
+ * Value could be:
+ *
+ *   foo
+ *   foo="bar"
+ *   foo={bar}
+ */
+function extractAttributeValue(path) {
+    const { value } = path.node;
+    if (t.isStringLiteral(value)) {
+        return { type: "string", value: value.value };
+    }
+    else if (t.isJSXExpressionContainer(value)) {
+        const expression = getPlaceholderExpression(path, value.expression);
+        if (expression) {
+            return { type: "expression", expression: expression, path };
+        }
+    }
+    else if (value === null) {
+        return { type: "null" };
+    }
+    else {
+        (0, errors_1.error)(path, errors_1.ERROR_MESSAGES.JSX_ELEMENTS_NOT_ALLOWED_IN_EXPRESSIONS);
+    }
+}
 //# 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,4DAYC;AAKD,kCAKC;AApDD,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;AAED;;GAEG;AACH,SAAgB,WAAW,CAAC,KAAmB;IAC7C,OAAO,KAAK,CAAC,MAAM,CACjB,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EACtE,IAAI,CACL,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ast-helpers.js","sourceRoot":"","sources":["../src/ast-helpers.ts"],"names":[],"mappings":"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"}

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":"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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

@@ -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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"}