Fixes #207 - Marko v3: Re-introduce support for "body-function" in taglib

compiler/ast/CustomTag.js

@@ -15,7 +15,10 @@ function removeExt(filename) {
 }
 
 function buildInputProps(node, context) {
+    var tagDef = node.tagDef;
     var inputProps = {};
+    var builder = context.builder;
+
 
     node.forEachAttribute((attr) => {
         var attrName = attr.name;
@@ -65,8 +68,20 @@ function buildInputProps(node, context) {
     });
 
     if (node.body && node.body.length) {
-        var renderBodyFunction = context.builder.renderBodyFunction(node.body);
+
-        inputProps.renderBody = renderBodyFunction;
+        if (tagDef.bodyFunction) {
+            let bodyFunction = tagDef.bodyFunction;
+            let bodyFunctionName = bodyFunction.name;
+            var bodyFunctionParams = bodyFunction.params.map(function(param) {
+                return builder.identifier(param);
+            });
+
+            inputProps[bodyFunctionName] = builder.functionDeclaration(bodyFunctionName, bodyFunctionParams, node.body);
+        } else {
+            var renderBodyFunction = context.builder.renderBodyFunction(node.body);
+            inputProps.renderBody = renderBodyFunction;
+        }
+
     }
 
     return context.builder.literal(inputProps);

compiler/taglib-loader/loader-tag.js

@@ -459,7 +459,10 @@ function loadTag(tagProps, path, taglib, dirname) {
     if (!hasAttributes(tagProps)) {
         // allow any attributes if no attributes are declared
         tagProps.attributes = {
-            '*': 'string'
+            '*': {
+                type: 'string',
+                targetProperty: null
+            }
         };
     }
 

taglibs/layout/marko-taglib.json

@@ -1,42 +1,26 @@
 {
-    "tags": {
+    "<layout-use>": {
-        "layout-use": {
+        "@template": "template",
-            "renderer": "./use-tag",
+        "@*": {
-            "attributes": {
+            "remove-dashes": true,
-                "template": {
+            "type": "string"
-                    "type": "template"
-                },
-                "*": {
-                    "remove-dashes": true,
-                    "type": "string"
-                }
-            },
-            "body-function": "getContent(__layoutHelper)"
         },
-        "layout-put": {
+        "renderer": "./use-tag",
-            "renderer": "./put-tag",
+        "body-function": "getContent(__layoutHelper)"
-            "attributes": {
+    },
-                "into": {
+    "<layout-put>": {
-                    "type": "string"
+        "@into": "string",
-                },
+        "@value": "string",
-                "value": {
+        "renderer": "./put-tag",
-                    "type": "string"
+        "import-var": {
-                }
+            "layout": "__layoutHelper"
-            },
+        }
-            "import-var": {
+    },
-                "layout": "__layoutHelper"
+    "<layout-placeholder>": {
-            }
+        "@name": "string",
-        },
+        "renderer": "./placeholder-tag",
-        "layout-placeholder": {
+        "import-var": {
-            "renderer": "./placeholder-tag",
+            "content": "data.layoutContent"
-            "attributes": {
-                "name": {
-                    "type": "string"
-                }
-            },
-            "import-var": {
-                "content": "data.layoutContent"
-            }
         }
     }
 }

test/fixtures/compiler/autotest/custom-tag-body-function/expected.js

@@ -0,0 +1,20 @@
+function create(__helpers) {
+  var str = __helpers.s,
+      empty = __helpers.e,
+      notEmpty = __helpers.ne,
+      escapeXml = __helpers.x,
+      __renderer = __helpers.r,
+      __tag = __helpers.t,
+      test_body_function_renderer = __renderer(require("../../../taglib/scanned-tags/test-body-function/renderer"));
+
+  return function render(data, out) {
+    __tag(out, test_body_function_renderer, {
+      "name": "World",
+      "myBody": function myBody(foo, bar) {
+        out.w("This is the body content");
+      }
+    });
+  };
+}
+
+(module.exports = require("marko").c(__filename)).c(create);

test/fixtures/compiler/autotest/custom-tag-body-function/template.marko

@@ -0,0 +1,3 @@
+<test-body-function name="World">
+    This is the body content
+</test-body-function>

test/fixtures/taglib/scanned-tags/test-body-function/marko-tag.json

@@ -0,0 +1,4 @@
+{
+    "renderer": "./renderer",
+    "body-function": "myBody(foo, bar)"
+}

test/fixtures/taglib/scanned-tags/test-body-function/renderer.js

@@ -0,0 +1,3 @@
+module.exports = function(input, out) {
+
+};