@marko/compiler 5.27.0 → 5.27.2

package/dist/babel-plugin/index.js

@@ -46,6 +46,14 @@ const SOURCE_FILES = new WeakMap();var _default =
   return {
     name: "marko",
     manipulateOptions(opts) {
+      // We need to allow these for now since we are not parsing the entire file
+      // These types of syntax errors will be picked up by the bundler / runtime anyways.
+      opts.parserOpts.allowAwaitOutsideFunction =
+      opts.parserOpts.allowImportExportEverywhere =
+      opts.parserOpts.allowReturnOutsideFunction =
+      opts.parserOpts.allowSuperOutsideMethod =
+      opts.parserOpts.allowUndeclaredExports =
+      true;
       curOpts = opts;
     },
     parserOverride(code) {
@@ -65,7 +73,7 @@ const SOURCE_FILES = new WeakMap();var _default =
       _config.default.fs = markoOpts.fileSystem;
       curOpts = undefined;
       try {
-        if (markoOpts.output === "source" || markoOpts.output === "migrate") {
+        if (isMarkoOutput(markoOpts.output)) {
           return file;
         }
 
@@ -106,7 +114,21 @@ const SOURCE_FILES = new WeakMap();var _default =
       } finally {
         _config.default.fs = prevFS;
       }
-    }
+    },
+    visitor:
+    markoOpts.stripTypes && isMarkoOutput(markoOpts.output) ?
+    {
+      ExportNamedDeclaration: {
+        exit(path) {
+          // The babel typescript plugin will add an empty export declaration
+          // if there are no other imports/exports in the file.
+          // This is not needed for Marko file outputs since there is always
+          // a default export.
+          if (path.node.specifiers.length === 0) path.remove();
+        }
+      }
+    } :
+    undefined
   };
 };exports.default = _default;
 
@@ -324,4 +346,8 @@ function addPlugin(meta, arr, plugin) {
 
 function unique(item, i, list) {
   return list.indexOf(item) === i;
+}
+
+function isMarkoOutput(output) {
+  return output === "source" || output === "migrate";
 }

package/dist/index.js

@@ -71,6 +71,7 @@ function loadBabelConfig(filename, config) {
   {
     isTSX: false,
     allowNamespaces: true,
+    allowDeclareFields: true,
     optimizeConstEnums: true,
     onlyRemoveTypeImports: true,
     disallowAmbiguousJSXLike: false

package/dist/taglib/loader/scanTagsDir.js

@@ -3,10 +3,7 @@
 const nodePath = require("path");
 const taglibConfig = require("../config");
 const jsonFileReader = require("./json-file-reader");
-const tagDefFromCode = require("./tag-def-from-code");
 const loaders = require("./loaders");
-const fsReadOptions = { encoding: "utf8" };
-const extend = require("raptor-util/extend");
 const types = require("./types");
 
 const tagFileTypes = [
@@ -188,19 +185,6 @@ dependencyChain)
           }
         }
       }
-
-      if (!hasTagJson && (tagDef.renderer || tagDef.template)) {
-        let templateCode = String(
-        taglibConfig.fs.readFileSync(
-        tagDef.renderer || tagDef.template,
-        fsReadOptions));
-
-
-        let extractedTagDef = tagDefFromCode.extractTagDef(templateCode);
-        if (extractedTagDef) {
-          extend(tagDef, extractedTagDef);
-        }
-      }
     }
 
     let tagDependencyChain;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/compiler",
   "description": "Marko template to JS compiler.",
-  "version": "5.27.0",
+  "version": "5.27.2",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "dependencies": {
@@ -29,7 +29,7 @@
     "strip-json-comments": "^3.1.1"
   },
   "devDependencies": {
-    "@marko/translator-default": "^5.25.0"
+    "@marko/translator-default": "^5.25.2"
   },
   "files": [
     "dist",

package/dist/taglib/loader/tag-def-from-code.js

@@ -1,58 +0,0 @@
-"use strict"; // Rather than using a full-blown JavaScript parser, we are going to use a few regular expressions
-// to tokenize the code and find what we are interested in
-var tagStartRegExp = /(^\s*(?:(?:exports.(?:tag|TAG))|(?:TAG))\s*=\s*)\{/m;
-
-// Tokens: "<string>", '<string>', /*<some comment*/, //<single line comment>, {, }, ;
-var tokensRegExp =
-/"(?:[^"]|\\")*"|'(?:[^'])|(\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/)|(\/\/.*)|[{};]/g;
-
-function extractTagDef(code) {
-  var startMatches = tagStartRegExp.exec(code);
-
-  var tagDefStart;
-  var tagDefEnd;
-
-  if (startMatches) {
-    tagDefStart = startMatches.index + startMatches[1].length;
-    var nextTokenMatches;
-    tokensRegExp.lastIndex = tagDefStart;
-    var depth = 0;
-
-    while (nextTokenMatches = tokensRegExp.exec(code)) {
-      if (nextTokenMatches[0] === "{") {
-        depth++;
-        continue;
-      } else if (nextTokenMatches[0] === "}") {
-        if (--depth === 0) {
-          tagDefEnd = tokensRegExp.lastIndex;
-          break;
-        }
-      } else if (nextTokenMatches[0] === ";") {
-        tagDefEnd = nextTokenMatches.index;
-        break;
-      }
-    }
-
-    if (tagDefStart != null && tagDefEnd != null) {
-      var jsTagDef = code.substring(tagDefStart, tagDefEnd);
-      var tagDefObject;
-
-      try {
-        // Try parsing it as JSON
-        tagDefObject = JSON.parse(jsTagDef);
-      } catch (e) {
-        // Try parsing it as JavaScript
-        try {
-          tagDefObject = eval("(" + jsTagDef + ")");
-        } catch (e) {
-          tagDefObject = {};
-        }
-      }
-      return tagDefObject;
-    }
-  } else {
-    return null;
-  }
-}
-
-exports.extractTagDef = extractTagDef;