@marko/compiler 5.39.16 → 5.39.17

package/dist/babel-plugin/index.js

@@ -1,9 +1,11 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;exports.getFile = getFile;exports.getProgram = getProgram;var _traverse = _interopRequireDefault(require("@babel/traverse"));
-var _babelUtils = require("@marko/compiler/babel-utils");
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _traverse = _interopRequireDefault(require("@babel/traverse"));
 var _crypto = require("crypto");
 var _path = _interopRequireDefault(require("path"));
 
 var t = _interopRequireWildcard(require("../babel-types"));
+var _diagnostics = require("../babel-utils/diagnostics");
+var _getFile = require("../babel-utils/get-file");
+var _tags = require("../babel-utils/tags");
 var _taglib = require("../taglib");
 var _config = _interopRequireDefault(require("../taglib/config"));
 var _buildCodeFrame = require("../util/build-code-frame");
@@ -15,8 +17,7 @@ var _parser = require("./parser");
 var _migrate = require("./plugins/migrate");
 var _transform = require("./plugins/transform");function _getRequireWildcardCache(e) {if ("function" != typeof WeakMap) return null;var r = new WeakMap(),t = new WeakMap();return (_getRequireWildcardCache = function (e) {return e ? t : r;})(e);}function _interopRequireWildcard(e, r) {if (!r && e && e.__esModule) return e;if (null === e || "object" != typeof e && "function" != typeof e) return { default: e };var t = _getRequireWildcardCache(r);if (t && t.has(e)) return t.get(e);var n = { __proto__: null },a = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) {var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u];}return n.default = e, t && t.set(e, n), n;}
 
-const SOURCE_FILES = new WeakMap();
-let currentFile;var _default =
+const SOURCE_FILES = new WeakMap();var _default =
 
 (api, markoOpts) => {
   api.assertVersion(7);
@@ -71,9 +72,9 @@ let currentFile;var _default =
       const { buildError: prevBuildError } = file.hub;
       const { buildCodeFrameError: prevCodeFrameError } = file;
       const prevFS = _config.default.fs;
-      const prevFile = currentFile;
+      const prevFile = (0, _getFile.getFileInternal)();
       _config.default.fs = markoOpts.fileSystem;
-      currentFile = file;
+      (0, _getFile.setFileInternal)(file);
       curOpts = undefined;
       try {
         const { ast, metadata } = file;
@@ -111,7 +112,7 @@ let currentFile;var _default =
         file.path.scope.crawl(); // Ensure all scopes are accurate for subsequent babel plugins
       } finally {
         _config.default.fs = prevFS;
-        currentFile = prevFile;
+        (0, _getFile.setFileInternal)(prevFile);
         file.buildCodeFrameError = prevCodeFrameError;
         file.hub.buildError = prevBuildError;
         file.markoOpts =
@@ -145,22 +146,6 @@ let currentFile;var _default =
   };
 };exports.default = _default;
 
-function getFile() {
-  if (currentFile) {
-    return currentFile;
-  }
-
-  throw new Error("Unable to access Marko File outside of a compilation");
-}
-
-function getProgram() {
-  if (currentFile) {
-    return currentFile.path;
-  }
-
-  throw new Error("Unable to access Marko Program outside of a compilation");
-}
-
 function getMarkoFile(code, fileOpts, markoOpts) {
   const { translator } = markoOpts;
   let compileCache = markoOpts.cache.get(translator);
@@ -173,7 +158,7 @@ function getMarkoFile(code, fileOpts, markoOpts) {
   const isSource = markoOpts.output === "source";
   const isMigrate = markoOpts.output === "migrate";
   const canCache = !(isSource || isMigrate);
-  const id = (0, _babelUtils.getTemplateId)(markoOpts, filename);
+  const id = (0, _tags.getTemplateId)(markoOpts, filename);
   const contentHash = canCache && (0, _crypto.createHash)("MD5").update(code).digest("hex");
   const cacheKey = canCache && (0, _crypto.createHash)("MD5").update(id).digest("hex");
 
@@ -206,24 +191,26 @@ function getMarkoFile(code, fileOpts, markoOpts) {
   }
 
   const prevFs = _config.default.fs;
-  const prevFile = currentFile;
+  const prevFile = (0, _getFile.getFileInternal)();
   _config.default.fs = markoOpts.fileSystem;
 
   try {
     const taglibLookup = (0, _taglib.buildLookup)(_path.default.dirname(filename), translator);
-    const file = currentFile = new _file.MarkoFile(fileOpts, {
-      code,
-      ast: {
-        type: "File",
-        program: {
-          type: "Program",
-          sourceType: "module",
-          body: [],
-          directives: [],
-          params: [t.identifier("input")]
+    const file = (0, _getFile.setFileInternal)(
+      new _file.MarkoFile(fileOpts, {
+        code,
+        ast: {
+          type: "File",
+          program: {
+            type: "Program",
+            sourceType: "module",
+            body: [],
+            directives: [],
+            params: [t.identifier("input")]
+          }
         }
-      }
-    });
+      })
+    );
 
     const meta = file.metadata.marko = {
       id,
@@ -261,7 +248,7 @@ function getMarkoFile(code, fileOpts, markoOpts) {
       if (markoOpts.errorRecovery) {
         t.traverseFast(file.path.node, (node) => {
           if (node.type === "MarkoParseError") {
-            (0, _babelUtils.diagnosticError)(file.path, {
+            (0, _diagnostics.diagnosticError)(file.path, {
               label: node.label,
               loc: node.errorLoc || node.loc
             });
@@ -334,7 +321,7 @@ function getMarkoFile(code, fileOpts, markoOpts) {
     return file;
   } finally {
     _config.default.fs = prevFs;
-    currentFile = prevFile;
+    (0, _getFile.setFileInternal)(prevFile);
   }
 }
 

package/dist/babel-utils/get-file.js

@@ -0,0 +1,25 @@
+"use strict";exports.__esModule = true;exports.getFile = getFile;exports.getFileInternal = getFileInternal;exports.getProgram = getProgram;exports.setFileInternal = setFileInternal;let currentFile;
+
+function getFile() {
+  if (currentFile) {
+    return currentFile;
+  }
+
+  throw new Error("Unable to access Marko File outside of a compilation");
+}
+
+function getProgram() {
+  if (currentFile) {
+    return currentFile.path;
+  }
+
+  throw new Error("Unable to access Marko Program outside of a compilation");
+}
+
+function getFileInternal() {
+  return currentFile;
+}
+
+function setFileInternal(file) {
+  return currentFile = file;
+}

package/dist/babel-utils/index.js

@@ -1,5 +1,4 @@
-"use strict";exports.__esModule = true;exports.computeNode = exports.assertNoVar = exports.assertNoParams = exports.assertNoAttributes = exports.assertNoAttributeTags = exports.assertNoArgs = exports.assertAttributesOrSingleArg = exports.assertAttributesOrArgs = exports.assertAllowedAttributes = exports.DiagnosticType = void 0;exports.defineTag = defineTag;exports.withLoc = exports.resolveTagImport = exports.resolveRelativePath = exports.registerMacro = exports.parseVar = exports.parseTypeParams = exports.parseTypeArgs = exports.parseTemplateLiteral = exports.parseStatements = exports.parseParams = exports.parseExpression = exports.parseArgs = exports.normalizeTemplateString = exports.loadFileForTag = exports.loadFileForImport = exports.isTransparentTag = exports.isNativeTag = exports.isMacroTag = exports.isLoopTag = exports.isDynamicTag = exports.isAttributeTag = exports.importStar = exports.importNamed = exports.importDefault = exports.hasMacro = exports.getTemplateId = exports.getTaglibLookup = exports.getTagTemplate = exports.getTagDefForTagName = exports.getTagDef = exports.getStart = exports.getProgram = exports.getMacroIdentifierForName = exports.getMacroIdentifier = exports.getLocRange = exports.getLoc = exports.getFullyResolvedTagName = exports.getFile = exports.getEnd = exports.getArgOrSequence = exports.findParentTag = exports.findAttributeTags = exports.diagnosticWarn = exports.diagnosticSuggest = exports.diagnosticError = exports.diagnosticDeprecate = void 0;var _babelPlugin = require("../babel-plugin");exports.getFile = _babelPlugin.getFile;exports.getProgram = _babelPlugin.getProgram;
-var _assert = require("./assert");exports.assertAllowedAttributes = _assert.assertAllowedAttributes;exports.assertAttributesOrArgs = _assert.assertAttributesOrArgs;exports.assertAttributesOrSingleArg = _assert.assertAttributesOrSingleArg;exports.assertNoArgs = _assert.assertNoArgs;exports.assertNoAttributes = _assert.assertNoAttributes;exports.assertNoAttributeTags = _assert.assertNoAttributeTags;exports.assertNoParams = _assert.assertNoParams;exports.assertNoVar = _assert.assertNoVar;
+"use strict";exports.__esModule = true;exports.computeNode = exports.assertNoVar = exports.assertNoParams = exports.assertNoAttributes = exports.assertNoAttributeTags = exports.assertNoArgs = exports.assertAttributesOrSingleArg = exports.assertAttributesOrArgs = exports.assertAllowedAttributes = exports.DiagnosticType = void 0;exports.defineTag = defineTag;exports.withLoc = exports.resolveTagImport = exports.resolveRelativePath = exports.registerMacro = exports.parseVar = exports.parseTypeParams = exports.parseTypeArgs = exports.parseTemplateLiteral = exports.parseStatements = exports.parseParams = exports.parseExpression = exports.parseArgs = exports.normalizeTemplateString = exports.loadFileForTag = exports.loadFileForImport = exports.isTransparentTag = exports.isNativeTag = exports.isMacroTag = exports.isLoopTag = exports.isDynamicTag = exports.isAttributeTag = exports.importStar = exports.importNamed = exports.importDefault = exports.hasMacro = exports.getTemplateId = exports.getTaglibLookup = exports.getTagTemplate = exports.getTagDefForTagName = exports.getTagDef = exports.getStart = exports.getProgram = exports.getMacroIdentifierForName = exports.getMacroIdentifier = exports.getLocRange = exports.getLoc = exports.getFullyResolvedTagName = exports.getFile = exports.getEnd = exports.getArgOrSequence = exports.findParentTag = exports.findAttributeTags = exports.diagnosticWarn = exports.diagnosticSuggest = exports.diagnosticError = exports.diagnosticDeprecate = void 0;var _assert = require("./assert");exports.assertAllowedAttributes = _assert.assertAllowedAttributes;exports.assertAttributesOrArgs = _assert.assertAttributesOrArgs;exports.assertAttributesOrSingleArg = _assert.assertAttributesOrSingleArg;exports.assertNoArgs = _assert.assertNoArgs;exports.assertNoAttributes = _assert.assertNoAttributes;exports.assertNoAttributeTags = _assert.assertNoAttributeTags;exports.assertNoParams = _assert.assertNoParams;exports.assertNoVar = _assert.assertNoVar;
 
 
 
@@ -17,6 +16,7 @@ var _diagnostics = require("./diagnostics");exports.diagnosticDeprecate = _diagn
 
 
 
+var _getFile = require("./get-file");exports.getFile = _getFile.getFile;exports.getProgram = _getFile.getProgram;
 var _imports = require("./imports");exports.importDefault = _imports.importDefault;exports.importNamed = _imports.importNamed;exports.importStar = _imports.importStar;exports.resolveRelativePath = _imports.resolveRelativePath;
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.39.16",
+  "version": "5.39.17",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",