@marko/compiler 5.21.3 → 5.21.6

package/dist/babel-plugin/parser.js

@@ -10,8 +10,9 @@ const noop = () => {};
 const emptyRange = (part) => part.start === part.end;
 const isAttrTag = (tag) => {var _tag$name$value;return ((_tag$name$value = tag.name.value) == null ? void 0 : _tag$name$value[0]) === "@";};
 const toBabelPosition = ({ line, character }) => ({
+  // Babel lines start at 1 and use "column" instead of "character".
   line: line + 1,
-  column: character ? character - 1 : character });
+  column: character });
 
 
 function parseMarko(file) {
@@ -28,8 +29,6 @@ function parseMarko(file) {
   let onNext = noop;
   const positionAt = (index) => toBabelPosition(parser.positionAt(index));
   const locationAt = (range) => {
-    // Babel columns start at 0, but that is silly.
-    // Here we normalize the parsers 1 based columns.
     const { start, end } = parser.locationAt(range);
     return {
       start: toBabelPosition(start),
@@ -214,7 +213,7 @@ function parseMarko(file) {
 
 
     },
-    onTagName(part) {
+    onOpenTagName(part) {
       const tagName = parseTemplateString(part);
       const node = t.markoTag(tagName, [], t.markoTagBody());
       let parseType = _htmljsParser.TagType.html;
@@ -326,12 +325,18 @@ function parseMarko(file) {
     },
 
     onAttrMethod(part) {
-      const prefix = "function";
       currentAttr.end = part.end;
-      currentAttr.value = (0, _babelUtils.parseExpression)(
+      currentAttr.value = withLoc(
+      t.functionExpression(
+      undefined,
+      (0, _babelUtils.parseExpression)(
       file,
-      prefix + parser.read(part),
-      part.start - prefix.length);
+      `${parser.read(part.params)}=>{}`,
+      part.params.start).
+      params,
+      (0, _babelUtils.parseScript)(file, parser.read(part.body), part.body.start).body[0]),
+
+      part);
 
     },
 
@@ -431,13 +436,13 @@ function parseMarko(file) {
         parseOptions.statement ||
         parseOptions.openTagOnly)
         {
-          this.onCloseTag(part);
+          this.onCloseTagEnd(part);
         }
       } else if (part.selfClosed) {
-        this.onCloseTag(part);
+        this.onCloseTagEnd(part);
       }
     },
-    onCloseTag(part) {var _node$tagDef3;
+    onCloseTagEnd(part) {var _node$tagDef3;
       const { node } = currentTag;
       const parserPlugin = (_node$tagDef3 = node.tagDef) == null ? void 0 : _node$tagDef3.parser;
       if (preservingWhitespaceUntil === node) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/compiler",
   "description": "Marko template to JS compiler.",
-  "version": "5.21.3",
+  "version": "5.21.6",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "dependencies": {
@@ -16,7 +16,7 @@
     "@marko/babel-utils": "^5.21.1",
     "complain": "^1.6.0",
     "he": "^1.2.0",
-    "htmljs-parser": "^3.3.4",
+    "htmljs-parser": "^5.0.0",
     "jsesc": "^3.0.2",
     "lasso-package-root": "^1.0.1",
     "property-handlers": "^1.1.1",