Merge c97e639 into 08f6f39

Author: DylanPiercey

src/compiler/CompileContext.js

@@ -56,62 +56,74 @@ function requireResolve(builder, path) {
 }
 
 const helpers = {
-    assign: { module: "marko/runtime/helper-assign" },
-    attr: "a",
-    attrs: "as",
-    mergeAttrs: "am",
-    classAttr: "ca",
-    classList: "cl",
-    const: "const",
-    createElement: "e",
+    assign: "marko/runtime/helpers/assign",
+    merge: "marko/runtime/helpers/merge",
+    attr: {
+        html: "marko/runtime/html/helpers/attr",
+        vdom: "marko/runtime/vdom/helpers/attr"
+    },
+    attrs: {
+        html: "marko/runtime/html/helpers/attrs",
+        vdom: "marko/runtime/vdom/helpers/attrs"
+    },
+    mergeAttrs: { html: "marko/runtime/html/helpers/merge-attrs" },
+    classAttr: { html: "marko/runtime/html/helpers/class-attr" },
+    classValue: "marko/runtime/helpers/class-value",
+    const: { vdom: "marko/runtime/vdom/helpers/const" },
+    createElement: { vdom: "marko/runtime/vdom/helpers/v-element" },
+    createText: { vdom: "marko/runtime/vdom/helpers/v-text" },
     defineComponent: {
-        module: "marko/runtime/components/helpers",
-        method: "c"
+        vdom: "marko/runtime/components/defineComponent"
     },
     "defineComponent-legacy": {
-        module: "marko/runtime/components/legacy/helpers",
-        method: "c"
+        vdom: "marko/runtime/components/legacy/defineComponent-legacy",
+        html: "marko/runtime/helpers/noop"
     },
     "defineWidget-legacy": {
-        module: "marko/runtime/components/legacy/helpers",
-        method: "w"
+        html: "marko/runtime/components/legacy/defineWidget-legacy",
+        vdom: "marko/runtime/components/legacy/defineWidget-legacy-browser"
+    },
+    dynamicTag: "marko/runtime/helpers/dynamic-tag",
+    escapeXml: {
+        html: {
+            module: "marko/runtime/html/helpers/escape-xml",
+            method: "x"
+        }
     },
-    dynamicTag: "d",
-    escapeXml: "x",
-    escapeXmlAttr: "xa",
-    escapeScript: "xs",
-    escapeStyle: "xc",
-    forEach: "f",
-    forEachProp: { module: "marko/runtime/helper-forEachProperty" },
-    forRange: { module: "marko/runtime/helper-forRange" },
-    getWidgetFromOut: {
-        module: "marko/runtime/components/legacy/helper-getWidgetFromOut"
+    escapeDoubleQuoteAttrValue: {
+        html: {
+            module: "marko/runtime/html/helpers/escape-xml",
+            method: "d"
+        }
     },
-    include: "i",
-    loadNestedTag: { module: "marko/runtime/helper-loadNestedTag" },
-    loadTag: "t",
-    loadTemplate: { module: "marko/runtime/helper-loadTemplate" },
-    mergeNestedTagsHelper: { module: "marko/runtime/helper-mergeNestedTags" },
-    merge: { module: "marko/runtime/helper-merge" },
-    propsForPreviousNode: "p",
-    renderer: {
-        module: "marko/runtime/components/helpers",
-        method: "r"
+    escapeScript: {
+        html: "marko/runtime/html/helpers/escape-script-placeholder"
     },
-    rendererLegacy: {
-        module: "marko/runtime/components/legacy/helpers",
-        method: "r"
+    escapeStyle: {
+        html: "marko/runtime/html/helpers/escape-style-placeholder"
     },
+    forOf: "marko/runtime/helpers/for-of",
+    forIn: "marko/runtime/helpers/for-in",
+    forRange: "marko/runtime/helpers/for-range",
+    getWidgetFromOut: "marko/runtime/components/legacy/helper-getWidgetFromOut",
+    loadNestedTag: "marko/runtime/helpers/load-nested-tag",
+    loadTag: "marko/runtime/helpers/load-tag",
+    loadTemplate: "marko/runtime/helpers/load-template",
+    mergeNestedTagsHelper: "marko/runtime/helpers/merge-nested-tags",
+    propsForPreviousNode: { html: "marko/runtime/html/helpers/props-script" },
+    renderer: "marko/runtime/components/renderer",
+    rendererLegacy: "marko/runtime/components/legacy/renderer-legacy",
     registerComponent: {
-        module: "marko/runtime/components/helpers",
-        method: "rc"
+        vdom: {
+            module: "marko/runtime/components/registry-browser",
+            method: "r"
+        }
     },
-    str: "s",
+    str: "marko/runtime/helpers/to-string",
+    styleValue: "marko/runtime/helpers/style-value",
     styleAttr: {
-        vdom: { module: "marko/runtime/vdom/helper-styleAttr" },
-        html: "sa"
-    },
-    createText: "t"
+        html: "marko/runtime/html/helpers/style-attr"
+    }
 };
 
 class CompileContext extends EventEmitter {
@@ -897,17 +909,10 @@ class CompileContext extends EventEmitter {
             }
 
             if (typeof helperInfo === "string") {
-                let methodName = helperInfo;
-                var methodIdentifier = this.builder.identifier(methodName);
-
-                helperIdentifier = this.addStaticVar(
-                    "marko_" + name,
-                    this.builder.memberExpression(
-                        this.helpersIdentifier,
-                        methodIdentifier
-                    )
-                );
-            } else if (helperInfo && helperInfo.module) {
+                helperInfo = { module: helperInfo };
+            }
+
+            if (helperInfo && helperInfo.module) {
                 if (helperInfo.method) {
                     let moduleIdentifier = this.importModule(
                         "marko_" + helperInfo.module,

src/compiler/Normalizer.js

@@ -44,7 +44,7 @@ function mergeShorthandClassNames(el, shorthandClassNames, context) {
     } else {
         el.setAttributeValue(
             "class",
-            builder.functionCall(context.helper("classList"), [
+            builder.functionCall(context.helper("classValue"), [
                 builder.literal(finalClassNames)
             ])
         );

src/compiler/ast/ForEach.js

@@ -15,7 +15,7 @@ class ForEach extends Node {
         var context = codegen.context;
         var builder = codegen.builder;
 
-        return builder.functionCall(context.helper("forEach"), [
+        return builder.functionCall(context.helper("forOf"), [
             this.of,
             builder.functionDeclaration(null, this.params, this.body)
         ]);

src/compiler/ast/ForEachProp.js

@@ -18,7 +18,7 @@ class ForEachProp extends Node {
         var body = this.body;
         var builder = codegen.builder;
 
-        return builder.functionCall(context.helper("forEachProp"), [
+        return builder.functionCall(context.helper("forIn"), [
             inExpression,
             builder.functionDeclaration(null, params, body)
         ]);

src/compiler/ast/HtmlAttribute/html/generateCode.js

@@ -1,8 +1,7 @@
 "use strict";
 
-var runtimeHtmlHelpers = require("../../../../runtime/html/helpers");
-var attr = runtimeHtmlHelpers.a;
-var escapeXmlAttr = runtimeHtmlHelpers.xa;
+var attr = require("../../../../runtime/html/helpers/attr");
+var escapeXmlAttr = require("../../../../runtime/html/helpers/escape-xml").d;
 
 function isStringLiteral(node) {
     return node.type === "Literal" && typeof node.value === "string";
@@ -86,7 +85,7 @@ function generateCodeForExpressionAttr(name, value, escape, codegen) {
                 } else {
                     if (escape !== false) {
                         part = builder.functionCall(
-                            context.helper("escapeXmlAttr"),
+                            context.helper("escapeDoubleQuoteAttrValue"),
                             [part]
                         );
                     }

src/compiler/ast/HtmlAttribute/vdom/generateCode.js

@@ -24,13 +24,15 @@ module.exports = function generateCode(node, codegen, vdomUtil) {
             }
         } else {
             if (name === "class") {
-                node.value = builder.functionCall(context.helper("classAttr"), [
-                    attrValue
-                ]);
+                node.value = builder.functionCall(
+                    context.helper("classValue"),
+                    [attrValue]
+                );
             } else if (name === "style") {
-                node.value = builder.functionCall(context.helper("styleAttr"), [
-                    attrValue
-                ]);
+                node.value = builder.functionCall(
+                    context.helper("styleValue"),
+                    [attrValue]
+                );
             }
         }
     }

src/compiler/ast/Text/html/generateCode.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var escapeXml = require("../../../../runtime/html/helpers").x;
+var escapeXml = require("../../../../runtime/html/helpers/escape-xml").x;
 var Literal = require("../../Literal");
 
 module.exports = function(node, codegen) {

src/core-tags/components/TransformHelper/convertToComponent.js

@@ -22,6 +22,7 @@ module.exports = function handleComponentBind(options) {
     let rootNodes = options.rootNodes;
     let isLegacyInnerBind = options.isLegacyInnerBind;
     var isImplicitComponent = options.isImplicitComponent === true;
+    var isBrowserTarget = context.outputType === "vdom";
     var hasTagParams = context.isFlagSet("hasTagParams");
     var isSplit = false;
 
@@ -137,7 +138,7 @@ module.exports = function handleComponentBind(options) {
 
     var defineComponentHelper;
 
-    if (!isSplit && !isLegacyComponent) {
+    if (!isSplit && !isLegacyComponent && isBrowserTarget) {
         defineComponentHelper = this.context.helper("defineComponent");
     }
 
@@ -180,7 +181,7 @@ module.exports = function handleComponentBind(options) {
                 )
             );
 
-            if (!isSplit && !isLegacyComponent) {
+            if (!isSplit && !isLegacyComponent && isBrowserTarget) {
                 nodes.push(
                     builder.assignment(
                         builder.memberExpression(