babel-plugin-wallace 0.14.1 → 0.16.0

package/dist/models/node.d.ts

@@ -1,5 +1,5 @@
 import type { NodePath } from "@babel/core";
-import type { Expression, JSXElement, JSXExpressionContainer, JSXText } from "@babel/types";
+import type { Expression, JSXElement, JSXExpressionContainer, JSXText, Identifier, NewExpression } from "@babel/types";
 import { IMPORTABLES, SPECIAL_SYMBOLS } from "../constants";
 interface Attribute {
     name: string;
@@ -9,12 +9,6 @@ interface Watch {
     expression: Expression | SPECIAL_SYMBOLS.noLookup;
     callback: string | Expression;
 }
-export interface RepeatInstruction {
-    expression: Expression;
-    componentCls: string;
-    repeatKey: Expression | string | undefined;
-    poolExpression?: Expression;
-}
 interface EventListener {
     eventName: string;
     callback: Expression;
@@ -44,13 +38,13 @@ export declare class ExtractedNode {
     tagName: string;
     element: HTMLElement | Text | undefined;
     elementKey?: number;
-    detacherVariable?: string;
+    detacherIdentifier?: Identifier;
+    detacherObject?: NewExpression;
     detacherStashKey?: number;
     isNestedComponent: boolean;
     isRepeatedComponent: boolean;
-    repeatNode?: ExtractedNode;
+    isStub: boolean;
     repeatKey: Expression | string | undefined;
-    repeatPool?: Expression;
     address: Array<number>;
     initialIndex: number;
     path: NodePath<ValidElementType>;
@@ -60,6 +54,7 @@ export declare class ExtractedNode {
     eventListeners: EventListener[];
     bindInstructions: BindInstruction;
     hasConditionalChildren: boolean;
+    hasNestedChildren: boolean;
     hasRepeatedChildren: boolean;
     requiredImports: Set<IMPORTABLES>;
     /**
@@ -90,30 +85,37 @@ export declare class ExtractedNode {
     getRef(): string | undefined;
     setPart(name: string): void;
     getPart(): string | undefined;
-    setRepeatExpression(expression: Expression): void;
     setRepeatKey(expression: Expression | string): void;
-    setRepeatPool(expression: Expression): void;
-    /**
-     * Called on the parent of a repeat.
-     */
-    getRepeatInstruction(): RepeatInstruction | undefined;
-    setStub(name: string): void;
-    getStubName(): string | undefined;
     requiredImport(name: IMPORTABLES): void;
 }
+/**
+ * Class for standard tag nodes:
+ * <img />
+ * <div>...</div>
+ */
 export declare class TagNode extends ExtractedNode {
     parent: TagNode;
     address: Array<number>;
     path: NodePath<JSXElement>;
     attributes: Attribute[];
     constructor(path: NodePath<JSXElement>, address: Array<number>, initialIndex: number, parent: TagNode, component: any, // TODO: fix type circular import.
-    tagName: string, isNestedComponent: boolean, isRepeatedComponent: boolean);
+    tagName: string);
     addFixedAttribute(name: string, value?: string): void;
     addStaticAttribute(name: string, expression: Expression): void;
     getElement(): HTMLElement | Text;
 }
-export declare class StubNode extends ExtractedNode {
-    constructor(path: NodePath<JSXElement>, address: Array<number>, initialIndex: number, parent: TagNode, name: string);
+/**
+ * Class for nested component tag nodes:
+ *
+ * <NestedComponent />
+ */
+export declare class NestedComponentTagNode extends TagNode {
+    parent: TagNode;
+    address: Array<number>;
+    path: NodePath<JSXElement>;
+    attributes: Attribute[];
+    constructor(path: NodePath<JSXElement>, address: Array<number>, initialIndex: number, parent: TagNode, component: any, // TODO: fix type circular import.
+    tagName: string, isRepeat: boolean, isStub: boolean);
     getElement(): HTMLElement | Text;
 }
 export declare class DynamicTextNode extends ExtractedNode {

package/dist/models/node.js

@@ -10,24 +10,26 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     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 _ExtractedNode_repeatExpression, _ExtractedNode_stubName, _ExtractedNode_visibilityToggle, _ExtractedNode_ref, _ExtractedNode_part, _ExtractedNode_props, _ExtractedNode_ctrl;
+var _ExtractedNode_visibilityToggle, _ExtractedNode_ref, _ExtractedNode_part, _ExtractedNode_props, _ExtractedNode_ctrl;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PlainTextNode = exports.DynamicTextNode = exports.StubNode = exports.TagNode = exports.ExtractedNode = void 0;
+exports.PlainTextNode = exports.DynamicTextNode = exports.NestedComponentTagNode = exports.TagNode = exports.ExtractedNode = void 0;
 const utils_1 = require("../utils");
 const errors_1 = require("../errors");
 const constants_1 = require("../constants");
+const config_1 = require("../config");
 class ExtractedNode {
     constructor(path, address, initialIndex, parent) {
         this.isNestedComponent = false;
         this.isRepeatedComponent = false;
+        this.isStub = false;
         this.children = [];
         this.watches = [];
         this.eventListeners = [];
         this.bindInstructions = {};
         this.hasConditionalChildren = false;
+        this.hasNestedChildren = false;
         this.hasRepeatedChildren = false;
         this.requiredImports = new Set();
-        // poolExpression: Expression | undefined;
         /**
          * The sets of classes that may be toggled.
          */
@@ -37,8 +39,6 @@ class ExtractedNode {
          */
         this.classToggleTriggers = [];
         // Private to prevent being set more thant once by directives.
-        _ExtractedNode_repeatExpression.set(this, void 0);
-        _ExtractedNode_stubName.set(this, void 0);
         _ExtractedNode_visibilityToggle.set(this, void 0);
         _ExtractedNode_ref.set(this, void 0);
         _ExtractedNode_part.set(this, void 0);
@@ -90,7 +90,7 @@ class ExtractedNode {
         __classPrivateFieldSet(this, _ExtractedNode_ctrl, expression, "f");
     }
     getCtrl() {
-        return this.repeatNode ? this.repeatNode.getCtrl() : __classPrivateFieldGet(this, _ExtractedNode_ctrl, "f");
+        return __classPrivateFieldGet(this, _ExtractedNode_ctrl, "f");
     }
     setProps(expression) {
         if (__classPrivateFieldGet(this, _ExtractedNode_props, "f")) {
@@ -134,71 +134,27 @@ class ExtractedNode {
     getPart() {
         return __classPrivateFieldGet(this, _ExtractedNode_part, "f");
     }
-    setRepeatExpression(expression) {
-        if (__classPrivateFieldGet(this, _ExtractedNode_repeatExpression, "f")) {
-            (0, errors_1.error)(this.path, errors_1.ERROR_MESSAGES.DIRECTIVE_ALREADY_DEFINED("items"));
-        }
-        this.isRepeatedComponent = true;
-        __classPrivateFieldSet(this, _ExtractedNode_repeatExpression, expression, "f");
-        // this.parent.repeatNode = this;
-    }
     setRepeatKey(expression) {
         this.repeatKey = expression;
     }
-    setRepeatPool(expression) {
-        this.repeatPool = expression;
-    }
-    /**
-     * Called on the parent of a repeat.
-     */
-    getRepeatInstruction() {
-        if (this.isRepeatedComponent) {
-            return {
-                expression: __classPrivateFieldGet(this, _ExtractedNode_repeatExpression, "f"),
-                componentCls: this.tagName,
-                repeatKey: this.repeatKey,
-                poolExpression: this.repeatPool
-            };
-        }
-    }
-    setStub(name) {
-        if (!this.parent) {
-            (0, errors_1.error)(this.path, errors_1.ERROR_MESSAGES.CANNOT_MAKE_ROOT_ELEMENT_A_STUB);
-        }
-        if (__classPrivateFieldGet(this, _ExtractedNode_stubName, "f")) {
-            (0, errors_1.error)(this.path, errors_1.ERROR_MESSAGES.STUB_ALREADY_DEFINED);
-        }
-        __classPrivateFieldSet(this, _ExtractedNode_stubName, name, "f");
-    }
-    getStubName() {
-        return __classPrivateFieldGet(this, _ExtractedNode_stubName, "f");
-    }
     requiredImport(name) {
         this.requiredImports.add(name);
     }
 }
 exports.ExtractedNode = ExtractedNode;
-_ExtractedNode_repeatExpression = new WeakMap(), _ExtractedNode_stubName = new WeakMap(), _ExtractedNode_visibilityToggle = new WeakMap(), _ExtractedNode_ref = new WeakMap(), _ExtractedNode_part = new WeakMap(), _ExtractedNode_props = new WeakMap(), _ExtractedNode_ctrl = new WeakMap();
+_ExtractedNode_visibilityToggle = new WeakMap(), _ExtractedNode_ref = new WeakMap(), _ExtractedNode_part = new WeakMap(), _ExtractedNode_props = new WeakMap(), _ExtractedNode_ctrl = new WeakMap();
+/**
+ * Class for standard tag nodes:
+ * <img />
+ * <div>...</div>
+ */
 class TagNode extends ExtractedNode {
     constructor(path, address, initialIndex, parent, component, // TODO: fix type circular import.
-    tagName, isNestedComponent, isRepeatedComponent) {
+    tagName) {
         super(path, address, initialIndex, parent);
         this.attributes = [];
         this.component = component;
         this.tagName = tagName;
-        this.isNestedComponent = isNestedComponent;
-        this.isRepeatedComponent = isRepeatedComponent;
-        if (!this.parent) {
-            if (this.isRepeatedComponent) {
-                (0, errors_1.error)(this.path, errors_1.ERROR_MESSAGES.REPEAT_NOT_ALLOWED_ON_ROOT);
-            }
-            else if (this.isNestedComponent) {
-                (0, errors_1.error)(this.path, errors_1.ERROR_MESSAGES.NESTED_COMPONENT_NOT_ALLOWED_ON_ROOT);
-            }
-        }
-        if (this.isRepeatedComponent) {
-            this.parent.hasRepeatedChildren = true;
-        }
     }
     addFixedAttribute(name, value) {
         this.attributes.push({ name, value });
@@ -208,9 +164,6 @@ class TagNode extends ExtractedNode {
         this.attributes.push({ name, value: constants_1.HTML_SPLITTER });
     }
     getElement() {
-        if (this.isRepeatedComponent) {
-            return undefined;
-        }
         const element = (0, utils_1.createElement)(this.tagName);
         this.attributes.forEach(({ name, value }) => {
             element.setAttribute(name, value || "");
@@ -220,17 +173,37 @@ class TagNode extends ExtractedNode {
     }
 }
 exports.TagNode = TagNode;
-class StubNode extends ExtractedNode {
-    constructor(path, address, initialIndex, parent, name) {
-        super(path, address, initialIndex, parent);
-        this.setStub(name);
+/**
+ * Class for nested component tag nodes:
+ *
+ * <NestedComponent />
+ */
+class NestedComponentTagNode extends TagNode {
+    constructor(path, address, initialIndex, parent, component, // TODO: fix type circular import.
+    tagName, isRepeat, isStub) {
+        super(path, address, initialIndex, parent, component, tagName);
+        this.attributes = [];
+        if (!this.parent) {
+            (0, errors_1.error)(this.path, errors_1.ERROR_MESSAGES.NESTED_COMPONENT_NOT_ALLOWED_ON_ROOT);
+        }
+        if (isStub) {
+            this.isStub = true;
+            config_1.wallaceConfig.ensureFlagIstrue(path, config_1.FlagValue.allowStubs);
+        }
+        if (isRepeat) {
+            this.isRepeatedComponent = true;
+            this.parent.hasRepeatedChildren = true;
+        }
+        else {
+            this.isNestedComponent = true;
+            this.parent.hasNestedChildren = true;
+        }
     }
     getElement() {
-        this.element = (0, utils_1.createElement)("div");
-        return this.element;
+        return undefined;
     }
 }
-exports.StubNode = StubNode;
+exports.NestedComponentTagNode = NestedComponentTagNode;
 class DynamicTextNode extends ExtractedNode {
     constructor(path, address, initialIndex, parent, expression) {
         super(path, address, initialIndex, parent);

package/dist/models/node.js.map

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

package/dist/visitors/attribute.d.ts

@@ -4,8 +4,9 @@ import { Component, TagNode } from "../models";
 interface State {
     extractedNode: TagNode;
     component: Component;
+    allowAttributes: boolean;
 }
 export declare const attributeVisitors: {
-    JSXAttribute(path: NodePath<JSXAttribute>, { extractedNode, component }: State): void;
+    JSXAttribute(path: NodePath<JSXAttribute>, { extractedNode, component, allowAttributes }: State): void;
 };
 export {};

package/dist/visitors/attribute.js

@@ -1,61 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.attributeVisitors = void 0;
-const t = require("@babel/types");
 const config_1 = require("../config");
 const constants_1 = require("../constants");
 const errors_1 = require("../errors");
 const ast_helpers_1 = require("../ast-helpers");
-/**
- * Name could be:
- *  foo
- *  foo:bar
- */
-function extractName(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 extractValue(path) {
-    const { value } = path.node;
-    if (t.isStringLiteral(value)) {
-        return { type: "string", value: value.value };
-    }
-    else if (t.isJSXExpressionContainer(value)) {
-        const expression = (0, ast_helpers_1.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);
-    }
-}
 exports.attributeVisitors = {
-    JSXAttribute(path, { extractedNode, component }) {
+    JSXAttribute(path, { extractedNode, component, allowAttributes }) {
         if (extractedNode.path.node !== path.parentPath.parentPath.node) {
             // We exit here as otherwise we'd traverse attributes of nested JSXElements too.
             return;
         }
-        const { base, qualifier } = extractName(path);
-        const extractedValue = extractValue(path);
+        const { base, qualifier } = (0, ast_helpers_1.extractAttributeName)(path);
+        const extractedValue = (0, ast_helpers_1.extractAttributeValue)(path);
         if (!extractedValue) {
             return;
         }
@@ -69,6 +26,9 @@ exports.attributeVisitors = {
             handler.apply(extractedNode, extractedValue, qualifier, base);
         }
         else {
+            if (!allowAttributes) {
+                (0, errors_1.error)(path, errors_1.ERROR_MESSAGES.NESTED_COMPONENT_WITH_ATTRIBUTES);
+            }
             const attName = qualifier ? `${base}:${qualifier}` : base;
             switch (extractedValue.type) {
                 case "expression":

package/dist/visitors/attribute.js.map

@@ -1 +1 @@
-{"version":3,"file":"attribute.js","sourceRoot":"","sources":["../../src/visitors/attribute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"attribute.js","sourceRoot":"","sources":["../../src/visitors/attribute.ts"],"names":[],"mappings":";;;AAEA,sCAA0C;AAC1C,4CAAkD;AAElD,sCAAkD;AAClD,gDAA6E;AAQhE,QAAA,iBAAiB,GAAG;IAC/B,YAAY,CACV,IAA4B,EAC5B,EAAE,aAAa,EAAE,SAAS,EAAE,eAAe,EAAS;QAEpD,IAAI,aAAa,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YAChE,gFAAgF;YAChF,OAAO;QACT,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAA,kCAAoB,EAAC,IAAI,CAAC,CAAC;QACvD,MAAM,cAAc,GAAG,IAAA,mCAAqB,EAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,MAAM,cAAc,GAAG,8BAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACvE,MAAM,cAAc,GAAG,cAAc;YACnC,CAAC,CAAC,sBAAa,CAAC,UAAU,CAAC,KAAK,CAAC;YACjC,CAAC,CAAC,sBAAa,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC;YACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,EAAE,cAAc,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;YAC5E,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,cAAc,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAChE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,IAAA,cAAK,EAAC,IAAI,EAAE,uBAAc,CAAC,gCAAgC,CAAC,CAAC;YAC/D,CAAC;YACD,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAC1D,QAAQ,cAAc,CAAC,IAAI,EAAE,CAAC;gBAC5B,KAAK,YAAY;oBACf,aAAa,CAAC,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;oBACjE,MAAM;gBACR,KAAK,QAAQ;oBACX,aAAa,CAAC,iBAAiB,CAAC,OAAO,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;oBAC/D,MAAM;gBACR,KAAK,MAAM;oBACT,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBACzC,MAAM;YACV,CAAC;QACH,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;CACF,CAAC"}

package/dist/visitors/jsx.js

@@ -2,39 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsxVisitors = void 0;
 const ast_helpers_1 = require("../ast-helpers");
-const config_1 = require("../config");
 const errors_1 = require("../errors");
-const utils_1 = require("../utils");
 // Calls itself recursively, using trackers to identify where we are.
 // Must delete visited nodes to avoid reprocessing them with recursion.
 exports.jsxVisitors = {
     JSXElement(path, { component, tracker = { childIndex: 0, initialIndex: 0, parent: undefined } }) {
-        const tagName = (0, ast_helpers_1.getJSXElementName)(path);
-        if (typeof tagName === "string") {
-            if ((0, utils_1.isCapitalized)(tagName)) {
-                (0, errors_1.error)(path, errors_1.ERROR_MESSAGES.INCORRECTLY_NESTED_COMPONENT);
-            }
-            component.processJSXElement(path, tracker, tagName, exports.jsxVisitors);
-        }
-        else {
-            const { namespace, name } = tagName;
-            if (name === "nest" || name === "repeat") {
-                const componentCls = namespace;
-                if (!(0, utils_1.isCapitalized)(componentCls)) {
-                    (0, errors_1.error)(path, errors_1.ERROR_MESSAGES.NESTED_COMPONENT_MUST_BE_CAPTIALIZED);
-                }
-                component.processNestedOrRepeatedElement(path, tracker, componentCls, name === "repeat");
+        const tagData = (0, ast_helpers_1.getJSXElementData)(path);
+        switch (tagData.type) {
+            case "stub":
+            case "nested":
                 path.traverse(errorIfJSXelementsFoundUnderNested);
-            }
-            else if (namespace === "stub") {
-                // TODO: ensure there is nothing inside and no other attributes.
-                // alternatively, allow attributes to control the stub.
-                config_1.wallaceConfig.ensureFlagIstrue(path, config_1.FlagValue.allowStubs);
-                component.processStub(path, name, tracker);
-            }
-            else {
-                (0, errors_1.error)(path, errors_1.ERROR_MESSAGES.UNSUPPORTED_NAMESPACE);
-            }
+                component.processNestedComponentTagNode(path, tracker, tagData.name, tagData.repeat, tagData.type === "stub");
+                break;
+            case "normal":
+                component.processJSXElement(path, tracker, tagData.name, exports.jsxVisitors);
+                break;
         }
         path.remove();
     },

package/dist/visitors/jsx.js.map

@@ -1 +1 @@
-{"version":3,"file":"jsx.js","sourceRoot":"","sources":["../../src/visitors/jsx.ts"],"names":[],"mappings":";;;AAEA,gDAAmD;AACnD,sCAAqD;AAErD,sCAAkD;AAClD,oCAAyC;AAOzC,qEAAqE;AACrE,uEAAuE;AAC1D,QAAA,WAAW,GAAG;IACzB,UAAU,CACR,IAA0B,EAC1B,EAAE,SAAS,EAAE,OAAO,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAS;QAErF,MAAM,OAAO,GAAG,IAAA,+BAAiB,EAAC,IAAI,CAAC,CAAC;QACxC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,IAAI,IAAA,qBAAa,EAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,IAAA,cAAK,EAAC,IAAI,EAAE,uBAAc,CAAC,4BAA4B,CAAC,CAAC;YAC3D,CAAC;YACD,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,mBAAW,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YACpC,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACzC,MAAM,YAAY,GAAG,SAAS,CAAC;gBAC/B,IAAI,CAAC,IAAA,qBAAa,EAAC,YAAY,CAAC,EAAE,CAAC;oBACjC,IAAA,cAAK,EAAC,IAAI,EAAE,uBAAc,CAAC,oCAAoC,CAAC,CAAC;gBACnE,CAAC;gBACD,SAAS,CAAC,8BAA8B,CACtC,IAAI,EACJ,OAAO,EACP,YAAY,EACZ,IAAI,KAAK,QAAQ,CAClB,CAAC;gBACF,IAAI,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAC;YACpD,CAAC;iBAAM,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;gBAChC,gEAAgE;gBAChE,uDAAuD;gBACvD,sBAAa,CAAC,gBAAgB,CAAC,IAAI,EAAE,kBAAS,CAAC,UAAU,CAAC,CAAC;gBAC3D,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACN,IAAA,cAAK,EAAC,IAAI,EAAE,uBAAc,CAAC,qBAAqB,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IACD,OAAO,CAAC,IAAuB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAS;QAC5D,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAClC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IACD,sBAAsB,CACpB,IAAsC,EACtC,EAAE,SAAS,EAAE,OAAO,EAAS;QAE7B,IAAI,CAAC,QAAQ,CAAC,mCAAmC,CAAC,CAAC;QACnD,kFAAkF;QAClF,sBAAsB;QACtB,SAAS,CAAC,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;CACF,CAAC;AAEF,SAAS,qCAAqC,CAAC,YAAoB;IACjE,OAAO;QACL,UAAU,CAAC,IAA0B;YACnC,IAAA,cAAK,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC5B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,mCAAmC,GAAG,qCAAqC,CAC/E,uBAAc,CAAC,uCAAuC,CACvD,CAAC;AAEF,MAAM,kCAAkC,GAAG,qCAAqC,CAC9E,uBAAc,CAAC,8BAA8B,CAC9C,CAAC"}
+{"version":3,"file":"jsx.js","sourceRoot":"","sources":["../../src/visitors/jsx.ts"],"names":[],"mappings":";;;AAEA,gDAAmD;AAEnD,sCAAkD;AAOlD,qEAAqE;AACrE,uEAAuE;AAC1D,QAAA,WAAW,GAAG;IACzB,UAAU,CACR,IAA0B,EAC1B,EAAE,SAAS,EAAE,OAAO,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAS;QAErF,MAAM,OAAO,GAAG,IAAA,+BAAiB,EAAC,IAAI,CAAC,CAAC;QACxC,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;YACrB,KAAK,MAAM,CAAC;YACZ,KAAK,QAAQ;gBACX,IAAI,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAC;gBAClD,SAAS,CAAC,6BAA6B,CACrC,IAAI,EACJ,OAAO,EACP,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,IAAI,KAAK,MAAM,CACxB,CAAC;gBACF,MAAM;YACR,KAAK,QAAQ;gBACX,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,mBAAW,CAAC,CAAC;gBACtE,MAAM;QACV,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IACD,OAAO,CAAC,IAAuB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAS;QAC5D,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAClC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IACD,sBAAsB,CACpB,IAAsC,EACtC,EAAE,SAAS,EAAE,OAAO,EAAS;QAE7B,IAAI,CAAC,QAAQ,CAAC,mCAAmC,CAAC,CAAC;QACnD,kFAAkF;QAClF,sBAAsB;QACtB,SAAS,CAAC,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;CACF,CAAC;AAEF,SAAS,qCAAqC,CAAC,YAAoB;IACjE,OAAO;QACL,UAAU,CAAC,IAA0B;YACnC,IAAA,cAAK,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC5B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,mCAAmC,GAAG,qCAAqC,CAC/E,uBAAc,CAAC,uCAAuC,CACvD,CAAC;AAEF,MAAM,kCAAkC,GAAG,qCAAqC,CAC9E,uBAAc,CAAC,8BAA8B,CAC9C,CAAC"}

package/dist/visitors/library.d.ts

@@ -1,25 +1,33 @@
 import type { NodePath } from "@babel/core";
-import type { AssignmentExpression, FunctionDeclaration, Identifier, IfStatement, MemberExpression, VariableDeclarator } from "@babel/types";
-/**
- * Very simple visitor which replaces the entire if statement with its consequent or
- * alternate.
- *
- * The test must be in this exact format:
- *
- *    if (wallaceConfig.flags.allowStubs) {}
- *
- */
+import type { IfStatement, VariableDeclarator } from "@babel/types";
 export declare const flagVisitor: {
+    /**
+     * Conditionally removes statement/expressions/identifiers etc...
+     * based on leading comments:
+     *
+     *   #INCLUDE-IF: allowCtrl
+     *   #EXCLUDE-IF: allowCtrl
+     *
+     * WARNING: NOT RELIABLE! It sometimes knocks out subsequent nodes, so only use on
+     * ende nodes.
+     */
+    enter(path: NodePath): void;
+    /**
+     * Replaces the entire if statement with its consequent or alternate:
+     *
+     * The test must be in this exact format:
+     *
+     *    if (wallaceConfig.flags.allowStubs) {
+     *      // code to keep
+     *    } else {
+     *      // code to remove (optional)
+     *    }
+     *
+     * You can't do anything more complex in the test or the conditions.
+     * There are places where this can't be used, in which case use a comment.
+     */
     IfStatement(path: NodePath<IfStatement>): void;
 };
-/**
- * This set of visitors removes references to `ctrl`.
- */
-export declare const removeCtrl: {
-    AssignmentExpression(path: NodePath<AssignmentExpression>): void;
-    MemberExpression(path: NodePath<MemberExpression>): void;
-    Identifier(path: NodePath<Identifier>): void;
-};
 /**
  * This flattens the `update` and `_u` methods into one, which are
  * only separate to allow parts, as this inproves performance when
@@ -28,9 +36,3 @@ export declare const removeCtrl: {
 export declare const flattenUpdate: {
     VariableDeclarator(path: NodePath<VariableDeclarator>): void;
 };
-/**
- * Removes the last two parameters from repeaters, which aren't used.
- */
-export declare const removeRepeaterDetacherParams: {
-    FunctionDeclaration(path: NodePath<FunctionDeclaration>): void;
-};

package/dist/visitors/library.js

@@ -1,20 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeRepeaterDetacherParams = exports.flattenUpdate = exports.removeCtrl = exports.flagVisitor = void 0;
-/* These visitors should only run on the wallace/lib source files. */
+exports.flattenUpdate = exports.flagVisitor = void 0;
+/**
+ * These visitors should only run on the wallace source files and tests.
+ * */
 const t = require("@babel/types");
+const errors_1 = require("../errors");
 const config_1 = require("../config");
 const constants_1 = require("../constants");
-/**
- * Very simple visitor which replaces the entire if statement with its consequent or
- * alternate.
- *
- * The test must be in this exact format:
- *
- *    if (wallaceConfig.flags.allowStubs) {}
- *
- */
 exports.flagVisitor = {
+    /**
+     * Conditionally removes statement/expressions/identifiers etc...
+     * based on leading comments:
+     *
+     *   #INCLUDE-IF: allowCtrl
+     *   #EXCLUDE-IF: allowCtrl
+     *
+     * WARNING: NOT RELIABLE! It sometimes knocks out subsequent nodes, so only use on
+     * ende nodes.
+     */
+    enter(path) {
+        const leadingComments = path.node.leadingComments;
+        if (!leadingComments || leadingComments.length === 0)
+            return;
+        path.node.leadingComments.forEach(comment => {
+            const value = comment.value, include = value.includes("#INCLUDE-IF:"), exclude = value.includes("#EXCLUDE-IF:");
+            if (include || exclude) {
+                const flag = getFlagFromComment(path, value);
+                const flagEnabled = config_1.wallaceConfig.flags[flag];
+                if ((flagEnabled && exclude) || (!flagEnabled && include)) {
+                    path.remove();
+                }
+            }
+        });
+    },
+    /**
+     * Replaces the entire if statement with its consequent or alternate:
+     *
+     * The test must be in this exact format:
+     *
+     *    if (wallaceConfig.flags.allowStubs) {
+     *      // code to keep
+     *    } else {
+     *      // code to remove (optional)
+     *    }
+     *
+     * You can't do anything more complex in the test or the conditions.
+     * There are places where this can't be used, in which case use a comment.
+     */
     IfStatement(path) {
         const test = path.node.test;
         if (t.isMemberExpression(test)) {
@@ -39,30 +72,6 @@ exports.flagVisitor = {
         }
     }
 };
-/**
- * This set of visitors removes references to `ctrl`.
- */
-exports.removeCtrl = {
-    AssignmentExpression(path) {
-        // @ts-ignore
-        if (path.node.right.name === "ctrl") {
-            path.remove();
-        }
-    },
-    MemberExpression(path) {
-        // @ts-ignore
-        const name = path.node.property.name;
-        if (name === "ctrl") {
-            path.remove();
-        }
-    },
-    Identifier(path) {
-        const name = path.node.name;
-        if (name === "ctrl") {
-            path.remove();
-        }
-    }
-};
 /**
  * This flattens the `update` and `_u` methods into one, which are
  * only separate to allow parts, as this inproves performance when
@@ -93,17 +102,13 @@ exports.flattenUpdate = {
         }
     }
 };
-/**
- * Removes the last two parameters from repeaters, which aren't used.
- */
-exports.removeRepeaterDetacherParams = {
-    FunctionDeclaration(path) {
-        var _a, _b;
-        // @ts-ignore
-        if ((_b = (_a = path.node.id) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.endsWith("Repeater")) {
-            path.node.params.pop();
-            path.node.params.pop();
-        }
+function getFlagFromComment(path, comment) {
+    const chunks = comment.split(":");
+    if (chunks.length !== 2) {
+        (0, errors_1.error)(path, "Badly formed compiler comment");
     }
-};
+    const flag = chunks[1].trim();
+    config_1.wallaceConfig.ensureFlagIsValid(flag);
+    return flag;
+}
 //# sourceMappingURL=library.js.map