@marko/translator-default 5.28.3 → 5.29.1

package/dist/taglib/core/macro/parse.js

@@ -1,35 +1,17 @@
-"use strict";exports.__esModule = true;exports.default = _default;function _default(path) {
-  const attributes = path.get("attributes");
-  const nameAttr = attributes.find((attr) => attr.get("name").node === "name");
-
-  if (!nameAttr) {
-    throw path.
-    get("name").
-    buildCodeFrameError('The "name" attribute is required on "macro" tags.');
-  }
-
-  if (attributes.length > 1) {
-    throw attributes[attributes[0] === nameAttr ? 1 : 0].buildCodeFrameError(
-    'The "macro" tag can only have a "name" attribute.');
-
+"use strict";exports.__esModule = true;exports.default = _default;var _compiler = require("@marko/compiler");
+var _babelUtils = require("@marko/babel-utils");
+
+function _default(path) {
+  const attrs = path.node.attributes;
+  if (attrs.length === 1) {
+    const [attr] = attrs;
+
+    if (
+    _compiler.types.isMarkoAttribute(attr) &&
+    attr.name === "name" &&
+    _compiler.types.isStringLiteral(attr.value))
+    {
+      (0, _babelUtils.registerMacro)(path.get("attributes")[0], attr.value.value);
+    }
   }
-
-  const nameAttrValue = nameAttr.get("value");
-
-  if (!nameAttrValue.isStringLiteral()) {
-    throw nameAttrValue.buildCodeFrameError(
-    'The "name" attribute for "macro" tags must be a string literal.');
-
-  }
-
-  const name = nameAttrValue.node.value;
-  const { file } = path.hub;
-
-  if (file.metadata.marko.macros[name]) {
-    throw nameAttr.buildCodeFrameError(
-    `A macro with the name "${name}" already exists.`);
-
-  }
-
-  file.metadata.marko.macros[name] = file.scope.generateUid(name);
 }

package/dist/taglib/core/macro/translate.js

@@ -1,15 +1,40 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.exit = exit;var _compiler = require("@marko/compiler");
 var _withPreviousLocation = _interopRequireDefault(require("../../../util/with-previous-location"));
+var _babelUtils = require("@marko/babel-utils");
 
 function exit(path) {
   const { node } = path;
-  const { body } = node;
-  const name = node.attributes.find((attr) => attr.name === "name");
+  const { attributes, body } = node;
+  if (attributes.length === 0) {
+    (0, _babelUtils.diagnosticError)(path, {
+      label: "The 'macro' tag must have a 'name' attribute."
+    });
+    path.remove();
+    return;
+  }
+
+  if (attributes.length > 1) {
+    (0, _babelUtils.diagnosticError)(path, {
+      label: "The 'macro' tag can only have a 'name' attribute."
+    });
+    path.remove();
+    return;
+  }
+
+  const [nameAttr] = attributes;
+  if (!_compiler.types.isStringLiteral(nameAttr.value)) {
+    (0, _babelUtils.diagnosticError)(path, {
+      label: "The 'name' attribute for 'macro' tags must be a string literal.",
+      loc: nameAttr.loc || node.loc || undefined
+    });
+    path.remove();
+    return;
+  }
 
   path.replaceWith(
   (0, _withPreviousLocation.default)(
   _compiler.types.functionDeclaration(
-  _compiler.types.identifier(path.hub.file.metadata.marko.macros[name.value.value]),
+  (0, _babelUtils.getMacroIdentifierForName)(path, nameAttr.value.value),
   [_compiler.types.identifier("out"), ...body.params],
   _compiler.types.blockStatement(body.body)),
 

package/dist/taglib/core/parse-class.js

@@ -1,5 +1,9 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = _default;var _compiler = require("@marko/compiler");
 var _babelUtils = require("@marko/babel-utils");
+
+
+
+
 var _getComponentFiles = _interopRequireDefault(require("../../util/get-component-files"));
 
 function _default(path) {
@@ -13,48 +17,59 @@ function _default(path) {
   } = node;
   const meta = file.metadata.marko;
 
-  if ((0, _getComponentFiles.default)(path).componentFile) {
-    throw path.
-    get("name").
-    buildCodeFrameError(
-    'A Marko file can either have an inline class, or an external "component.js", but not both.');
-
+  if (meta.hasComponent) {
+    (0, _babelUtils.diagnosticError)(path.get("name"), {
+      label: "A Marko component can only have one top level class."
+    });
+    path.remove();
+    return;
   }
 
-  if (meta.hasComponent) {
-    throw path.
-    get("name").
-    buildCodeFrameError(
-    "A Marko component can only have one top level class.");
+  meta.hasComponent = true;
 
+  if ((0, _getComponentFiles.default)(path).componentFile) {
+    (0, _babelUtils.diagnosticError)(path.get("name"), {
+      label:
+      'A Marko file can either have an inline class, or an external "component.js", but not both.'
+    });
+
+    path.remove();
+    return;
   }
 
   const parsed = (0, _babelUtils.parseExpression)(file, code.replace(/;\s*$/, ""), start, end);
-
-  if (parsed.id) {
-    throw file.buildCodeFrameError(
-    parsed.id,
-    "Component class cannot have a name.");
-
+  if (parsed.type === "MarkoParseError") {
+    path.replaceWith(_compiler.types.markoClass([_compiler.types.expressionStatement(parsed)]));
+    return;
   }
 
   if (parsed.superClass) {
-    throw file.buildCodeFrameError(
-    parsed.superClass,
-    "Component class cannot have a super class.");
-
+    (0, _babelUtils.diagnosticError)(path, {
+      label: "Component class cannot have a super class.",
+      loc: parsed.superClass.loc
+    });
   }
 
-  const constructorProp = parsed.body.body.find(
+  const constructorPropIndex = parsed.body.body.findIndex(
   (prop) => _compiler.types.isClassMethod(prop) && prop.kind === "constructor");
 
-  if (constructorProp) {
-    throw file.buildCodeFrameError(
-    constructorProp.key,
-    "The constructor method should not be used for a component, use onCreate instead.");
+  if (constructorPropIndex !== -1) {
+    const constructorProp = parsed.body.body[constructorPropIndex];
+    (0, _babelUtils.diagnosticError)(path, {
+      label:
+      "The constructor method should not be used for a component, use onCreate instead.",
+      loc: constructorProp.key.loc
+    });
 
+    parsed.body.body.splice(constructorProp, 1);
+  }
+
+  if (parsed.id) {
+    (0, _babelUtils.diagnosticDeprecate)(path, {
+      label: "Component class should not have a name.",
+      loc: parsed.id.loc
+    });
   }
 
-  meta.hasComponent = true;
   path.replaceWith(_compiler.types.markoClass(parsed.body));
 }

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@marko/translator-default",
   "description": "Translates Marko templates to the default Marko runtime.",
-  "version": "5.28.3",
+  "version": "5.29.1",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@marko/babel-utils": "^6.1.0",
+    "@marko/babel-utils": "^6.2.0",
     "escape-string-regexp": "^4.0.0",
     "magic-string": "^0.27.0",
     "self-closing-tags": "^1.0.1"
   },
   "devDependencies": {
-    "@marko/compiler": "^5.30.3",
-    "marko": "^5.28.3"
+    "@marko/compiler": "^5.31.1",
+    "marko": "^5.29.1"
   },
   "files": [
     "dist",