@marko/compiler 5.39.14 → 5.39.15

package/dist/babel-plugin/index.js

@@ -1,4 +1,4 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;exports.getMarkoFile = getMarkoFile;var _traverse = _interopRequireDefault(require("@babel/traverse"));
+"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");
 var _crypto = require("crypto");
 var _path = _interopRequireDefault(require("path"));
@@ -15,7 +15,8 @@ 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();var _default =
+const SOURCE_FILES = new WeakMap();
+let currentFile;var _default =
 
 (api, markoOpts) => {
   api.assertVersion(7);
@@ -61,22 +62,18 @@ const SOURCE_FILES = new WeakMap();var _default =
       curOpts = opts;
     },
     parserOverride(code) {
-      const prevFS = _config.default.fs;
-      _config.default.fs = markoOpts.fileSystem;
-      try {
-        const file = getMarkoFile(code, curOpts, markoOpts);
-        const finalAst = t.cloneNode(file.ast, true);
-        SOURCE_FILES.set(finalAst, file);
-        return finalAst;
-      } finally {
-        _config.default.fs = prevFS;
-      }
+      const file = getMarkoFile(code, curOpts, markoOpts);
+      const finalAst = t.cloneNode(file.ast, true);
+      SOURCE_FILES.set(finalAst, file);
+      return finalAst;
     },
     pre(file) {
       const { buildError: prevBuildError } = file.hub;
       const { buildCodeFrameError: prevCodeFrameError } = file;
       const prevFS = _config.default.fs;
+      const prevFile = currentFile;
       _config.default.fs = markoOpts.fileSystem;
+      currentFile = file;
       curOpts = undefined;
       try {
         const { ast, metadata } = file;
@@ -114,6 +111,7 @@ const SOURCE_FILES = new WeakMap();var _default =
         file.path.scope.crawl(); // Ensure all scopes are accurate for subsequent babel plugins
       } finally {
         _config.default.fs = prevFS;
+        currentFile = prevFile;
         file.buildCodeFrameError = prevCodeFrameError;
         file.hub.buildError = prevBuildError;
         file.markoOpts =
@@ -147,6 +145,22 @@ const SOURCE_FILES = new WeakMap();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);
@@ -191,129 +205,137 @@ function getMarkoFile(code, fileOpts, markoOpts) {
     return cached.file;
   }
 
-  const taglibLookup = (0, _taglib.buildLookup)(_path.default.dirname(filename), translator);
-
-  const file = new _file.MarkoFile(fileOpts, {
-    code,
-    ast: {
-      type: "File",
-      program: {
-        type: "Program",
-        sourceType: "module",
-        body: [],
-        directives: [],
-        params: [t.identifier("input")]
+  const prevFs = _config.default.fs;
+  const prevFile = currentFile;
+  _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 meta = file.metadata.marko = {
-    id,
-    deps: [],
-    tags: [],
-    watchFiles: [],
-    diagnostics: []
-  };
+    });
 
-  file.markoOpts = markoOpts;
-  file.___taglibLookup = taglibLookup;
-  file.___getMarkoFile = getMarkoFile;
+    const meta = file.metadata.marko = {
+      id,
+      deps: [],
+      tags: [],
+      watchFiles: [],
+      diagnostics: []
+    };
 
-  file.___compileStage = "parse";
-  (0, _parser.parseMarko)(file);
+    file.markoOpts = markoOpts;
+    file.___taglibLookup = taglibLookup;
+    file.___getMarkoFile = getMarkoFile;
 
-  if (isSource) {
-    return file;
-  }
+    file.___compileStage = "parse";
+    (0, _parser.parseMarko)(file);
+
+    if (isSource) {
+      return file;
+    }
 
-  file.path.scope.crawl(); // Initialize bindings.
+    file.path.scope.crawl(); // Initialize bindings.
 
-  const rootMigrators = [];
-  for (const id in taglibLookup.taglibsById) {
-    for (const migrator of taglibLookup.taglibsById[id].migrators) {
-      addPlugin(meta, rootMigrators, migrator);
+    const rootMigrators = [];
+    for (const id in taglibLookup.taglibsById) {
+      for (const migrator of taglibLookup.taglibsById[id].migrators) {
+        addPlugin(meta, rootMigrators, migrator);
+      }
     }
-  }
 
-  rootMigrators.push(_migrate.visitor);
-  file.___compileStage = "migrate";
-  traverseAll(file, rootMigrators);
-
-  if (file.___hasParseErrors) {
-    if (markoOpts.errorRecovery) {
-      t.traverseFast(file.path.node, (node) => {
-        if (node.type === "MarkoParseError") {
-          (0, _babelUtils.diagnosticError)(file.path, {
-            label: node.label,
-            loc: node.errorLoc || node.loc
-          });
-        }
-      });
-    } else {
-      let errors = [];
-      t.traverseFast(file.path.node, (node) => {
-        if (node.type === "MarkoParseError") {
-          errors.push(
-            (0, _buildCodeFrame.buildCodeFrameError)(
-              file.opts.filename,
-              file.code,
-              node.errorLoc || node.loc,
-              node.label
-            )
-          );
-        }
-      });
+    rootMigrators.push(_migrate.visitor);
+    file.___compileStage = "migrate";
+    traverseAll(file, rootMigrators);
+
+    if (file.___hasParseErrors) {
+      if (markoOpts.errorRecovery) {
+        t.traverseFast(file.path.node, (node) => {
+          if (node.type === "MarkoParseError") {
+            (0, _babelUtils.diagnosticError)(file.path, {
+              label: node.label,
+              loc: node.errorLoc || node.loc
+            });
+          }
+        });
+      } else {
+        let errors = [];
+        t.traverseFast(file.path.node, (node) => {
+          if (node.type === "MarkoParseError") {
+            errors.push(
+              (0, _buildCodeFrame.buildCodeFrameError)(
+                file.opts.filename,
+                file.code,
+                node.errorLoc || node.loc,
+                node.label
+              )
+            );
+          }
+        });
 
-      (0, _mergeErrors.default)(errors);
+        (0, _mergeErrors.default)(errors);
+      }
     }
-  }
 
-  if (isMigrate) {
-    return file;
-  }
+    if (isMigrate) {
+      return file;
+    }
 
-  const rootTransformers = [];
-  for (const id in taglibLookup.taglibsById) {
-    for (const transformer of taglibLookup.taglibsById[id].transformers) {
-      addPlugin(meta, rootTransformers, transformer);
+    const rootTransformers = [];
+    for (const id in taglibLookup.taglibsById) {
+      for (const transformer of taglibLookup.taglibsById[id].transformers) {
+        addPlugin(meta, rootTransformers, transformer);
+      }
     }
-  }
 
-  rootTransformers.push(_transform.visitor);
-  if (translator.transform) {
-    rootTransformers.push(translator.transform);
-  }
-  file.___compileStage = "transform";
-  traverseAll(file, rootTransformers);
+    rootTransformers.push(_transform.visitor);
+    if (translator.transform) {
+      rootTransformers.push(translator.transform);
+    }
+    file.___compileStage = "transform";
+    traverseAll(file, rootTransformers);
 
-  for (const taglibId in taglibLookup.taglibsById) {
-    const { filePath } = taglibLookup.taglibsById[taglibId];
+    for (const taglibId in taglibLookup.taglibsById) {
+      const { filePath } = taglibLookup.taglibsById[taglibId];
 
-    if (
-    filePath[filePath.length - 5] === "." &&
-    filePath.endsWith("marko.json"))
-    {
-      meta.watchFiles.push(filePath);
+      if (
+      filePath[filePath.length - 5] === "." &&
+      filePath.endsWith("marko.json"))
+      {
+        meta.watchFiles.push(filePath);
+      }
     }
-  }
 
-  compileCache.set(cacheKey, {
-    time: Date.now(),
-    file,
-    contentHash
-  });
-
-  if (translator.analyze) {
-    try {
-      file.___compileStage = "analyze";
-      traverseAll(file, translator.analyze);
-    } catch (e) {
-      compileCache.delete(cacheKey);
-      throw e;
+    compileCache.set(cacheKey, {
+      time: Date.now(),
+      file,
+      contentHash
+    });
+
+    if (translator.analyze) {
+      try {
+        file.___compileStage = "analyze";
+        traverseAll(file, translator.analyze);
+      } catch (e) {
+        compileCache.delete(cacheKey);
+        throw e;
+      }
     }
-  }
 
-  return file;
+    return file;
+  } finally {
+    _config.default.fs = prevFs;
+    currentFile = prevFile;
+  }
 }
 
 function shallowClone(data) {

package/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports._clearDefaults = _clearDefaults;exports.compile = compile;exports.compileFile = compileFile;exports.compileFileSync = compileFileSync;exports.compileSync = compileSync;exports.configure = configure;exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.types = exports.taglib = exports.globalConfig = void 0;var _types = _interopRequireWildcard(require("./babel-types"));exports.types = _types;
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports._clearDefaults = _clearDefaults;exports.compile = compile;exports.compileFile = compileFile;exports.compileFileSync = compileFileSync;exports.compileSync = compileSync;exports.configure = configure;exports.getProgram = exports.getFile = void 0;exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.types = exports.taglib = exports.globalConfig = void 0;var _types = _interopRequireWildcard(require("./babel-types"));exports.types = _types;
 var babel = _interopRequireWildcard(require("@babel/core"));
 var _pluginSyntaxTypescript = _interopRequireDefault(require("@babel/plugin-syntax-typescript"));
 var _pluginTransformModulesCommonjs = _interopRequireDefault(require("@babel/plugin-transform-modules-commonjs"));
@@ -6,7 +6,7 @@ var _pluginTransformTypescript = _interopRequireDefault(require("@babel/plugin-t
 var _babelUtils = require("@marko/compiler/babel-utils");
 var _path = _interopRequireDefault(require("path"));
 
-var _babelPlugin = _interopRequireDefault(require("./babel-plugin"));
+var _babelPlugin = _interopRequireWildcard(require("./babel-plugin"));exports.getFile = _babelPlugin.getFile;exports.getProgram = _babelPlugin.getProgram;
 var _config = _interopRequireDefault(require("./config"));
 var taglib = _interopRequireWildcard(require("./taglib"));exports.taglib = taglib;
 var _buildCodeFrame = require("./util/build-code-frame");
@@ -15,6 +15,7 @@ var _shouldOptimize = _interopRequireDefault(require("./util/should-optimize"));
 var _tryLoadTranslator = _interopRequireDefault(require("./util/try-load-translator"));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 CWD = process.cwd();
 
 let globalConfig = exports.globalConfig = { ..._config.default };

package/index.d.ts

@@ -69,6 +69,9 @@ export function getRuntimeEntryFiles(
   translator?: string | undefined,
 ): string[];
 
+export function getFile(): types.BabelFile;
+export function getProgram(): types.NodePath<types.Program>;
+
 export namespace taglib {
   export function resolveOptionalTaglibs(
     taglibIds: string[],

package/package.json

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