@marko/compiler 5.24.0 → 5.25.0

package/dist/babel-plugin/index.js

@@ -8,7 +8,7 @@ var _parser = require("./parser");
 var _migrate = require("./plugins/migrate");
 var _transform = require("./plugins/transform");
 var _file = require("./file");
-var _fs = require("../taglib/fs");
+var _config = _interopRequireDefault(require("../taglib/config"));
 var _tryLoadTranslator = _interopRequireDefault(require("../util/try-load-translator"));
 var _shouldOptimize = _interopRequireDefault(require("../util/should-optimize"));function _getRequireWildcardCache(nodeInterop) {if (typeof WeakMap !== "function") return null;var cacheBabelInterop = new WeakMap();var cacheNodeInterop = new WeakMap();return (_getRequireWildcardCache = function (nodeInterop) {return nodeInterop ? cacheNodeInterop : cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj, nodeInterop) {if (!nodeInterop && obj && obj.__esModule) {return obj;}if (obj === null || typeof obj !== "object" && typeof obj !== "function") {return { default: obj };}var cache = _getRequireWildcardCache(nodeInterop);if (cache && cache.has(obj)) {return cache.get(obj);}var newObj = {};var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var key in obj) {if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;if (desc && (desc.get || desc.set)) {Object.defineProperty(newObj, key, desc);} else {newObj[key] = obj[key];}}}newObj.default = obj;if (cache) {cache.set(obj, newObj);}return newObj;}
 
@@ -49,21 +49,21 @@ const SOURCE_FILES = new WeakMap();var _default =
       curOpts = opts;
     },
     parserOverride(code) {
-      let prevFS = _fs.curFS;
-      (0, _fs.setFS)(markoOpts.fileSystem);
+      let 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 {
-        (0, _fs.setFS)(prevFS);
+        _config.default.fs = prevFS;
       }
     },
     pre(file) {
-      let prevFS = _fs.curFS;
+      let prevFS = _config.default.fs;
+      _config.default.fs = markoOpts.fileSystem;
       curOpts = undefined;
-      (0, _fs.setFS)(markoOpts.fileSystem);
       try {
         if (markoOpts.output === "source" || markoOpts.output === "migrate") {
           return file;
@@ -104,7 +104,7 @@ const SOURCE_FILES = new WeakMap();var _default =
         metadata.marko.watchFiles = metadata.marko.watchFiles.filter(unique);
         file.path.scope.crawl(); // Ensure all scopes are accurate for subsequent babel plugins
       } finally {
-        (0, _fs.setFS)(prevFS);
+        _config.default.fs = prevFS;
       }
     }
   };

package/dist/config.js

@@ -156,7 +156,7 @@ var _lassoPackageRoot = require("lasso-package-root");
 
 
 
-var _fs2 = require("./taglib/fs");let config;const globalThis = typeof window === "undefined" ? global : window;const MARKO_CONFIG_KEY = Symbol("Default Marko Compiler Config");if (globalThis[MARKO_CONFIG_KEY]) {config = globalThis[MARKO_CONFIG_KEY];} else {config = globalThis[MARKO_CONFIG_KEY] = { // The default output mode for compiled templates
+var _config = _interopRequireDefault(require("./taglib/config"));let config;const globalThis = typeof window === "undefined" ? global : window;const MARKO_CONFIG_KEY = Symbol("Default Marko Compiler Config");if (globalThis[MARKO_CONFIG_KEY]) {config = globalThis[MARKO_CONFIG_KEY];} else {config = globalThis[MARKO_CONFIG_KEY] = { // The default output mode for compiled templates
     output: "html", // Override the runtimeid used when calling `marko/components.init` in the `hydrate` output.
     runtimeId: null, /**
      * Remove all typescript types from the output.
@@ -206,4 +206,4 @@ var _fs2 = require("./taglib/fs");let config;const globalThis = typeof window ==
      * A regexp or function that receives an import path that matches file types known to be client side assets.
      */hydrateIncludeImports: /\.(css|less|s[ac]ss|styl|png|jpe?g|gif|svg|ico|webp|avif|mp4|webm|ogg|mp3|wav|flac|aac|woff2?|eot|ttf|otf)$/, /**
      * Set to true in order to bring in the hot module replacement runtime.
-     */hot: false };if (process.env.MARKO_CONFIG) {Object.assign(config, JSON.parse(process.env.MARKO_CONFIG));}}var _default = config;exports.default = _default;(0, _fs2.setFS)(config.fileSystem);
+     */hot: false };if (process.env.MARKO_CONFIG) {Object.assign(config, JSON.parse(process.env.MARKO_CONFIG));}}var _default = config;exports.default = _default;_config.default.fs = config.fileSystem;

package/dist/taglib/config.js

@@ -0,0 +1,6 @@
+"use strict";module.exports = {
+  fs: undefined,
+  onError: (err) => {
+    throw err;
+  }
+};

package/dist/taglib/finder/index.js

@@ -1,7 +1,7 @@
 "use strict";
 var nodePath = require("path");
 var resolveFrom = require("resolve-from").silent;
-var taglibFS = require("../fs");
+var taglibConfig = require("../config");
 var taglibLoader = require("../loader");
 var lassoPackageRoot = require("lasso-package-root");
 var findCache = {};
@@ -148,7 +148,7 @@ function excludePackage(name) {
 
 function existsSync(file) {
   try {
-    taglibFS.curFS.statSync(file);
+    taglibConfig.fs.statSync(file);
     return true;
   } catch (_) {
     return false;

package/dist/taglib/index.js

@@ -1,6 +1,7 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports._loader = exports._finder = void 0;exports.buildLookup = buildLookup;exports.clearCaches = clearCaches;exports.excludePackage = exports.excludeDir = void 0;exports.register = register;var _loader2 = _interopRequireDefault(require("./loader"));
 var _finder2 = _interopRequireDefault(require("./finder"));
 var _lookup = _interopRequireDefault(require("./lookup"));
+var _config = _interopRequireDefault(require("./config"));
 var _tryLoadTranslator = _interopRequireDefault(require("../util/try-load-translator"));
 
 
@@ -18,7 +19,7 @@ register("marko/html", _markoHtml.default);
 register("marko/svg", _markoSvg.default);
 register("marko/math", _markoMath.default);
 
-function buildLookup(dirname, requestedTranslator) {
+function buildLookup(dirname, requestedTranslator, onError) {
   const translator = (0, _tryLoadTranslator.default)(requestedTranslator);
   if (!translator || !Array.isArray(translator.taglibs)) {
     throw new Error(
@@ -26,19 +27,35 @@ function buildLookup(dirname, requestedTranslator) {
 
   }
 
-  if (!loadedTranslatorsTaglibs.has(translator)) {
+  let taglibsForDir = loadedTranslatorsTaglibs.get(translator);
+
+  if (!taglibsForDir) {
     loadedTranslatorsTaglibs.set(
     translator,
-    translator.taglibs.map(([id, props]) => loadTaglib(id, props)));
+    taglibsForDir = registeredTaglibs.concat(
+    translator.taglibs.map(([id, props]) => loadTaglib(id, props))));
 
-  }
 
-  const taglibsForDir = _finder2.default.find(
-  dirname,
-  registeredTaglibs.concat(loadedTranslatorsTaglibs.get(translator)));
+  }
 
+  if (onError) {
+    const prevOnError = _config.default.onError;
+    _config.default.onError = onError;
+    try {
+      taglibsForDir = _finder2.default.find(dirname, taglibsForDir);
+    } catch (err) {
+      _config.default.onError(err);
+    } finally {
+      _config.default.onError = prevOnError;
+    }
+  } else {
+    taglibsForDir = _finder2.default.find(dirname, taglibsForDir);
+  }
 
-  const cacheKey = taglibsForDir.map((it) => it.id).join();
+  const cacheKey = taglibsForDir.
+  map((it) => it.id).
+  sort().
+  join();
   let lookup = lookupCache[cacheKey];
 
   if (!lookup) {

package/dist/taglib/loader/json-file-reader.js

@@ -1,9 +1,9 @@
-"use strict";var taglibFS = require("../fs");
+"use strict";var taglibConfig = require("../config");
 var stripJsonComments = require("strip-json-comments");
 var fsReadOptions = { encoding: "utf8" };
 
 exports.readFileSync = function (path) {
-  var json = String(taglibFS.curFS.readFileSync(path, fsReadOptions));
+  var json = String(taglibConfig.fs.readFileSync(path, fsReadOptions));
 
   try {
     var taglibProps = JSON.parse(stripJsonComments(json));

package/dist/taglib/loader/loadAttributeFromProps.js

@@ -2,7 +2,7 @@
 
 var assert = require("assert");
 var raptorRegexp = require("raptor-regexp");
-var propertyHandlers = require("property-handlers");
+var propertyHandlers = require("./property-handlers");
 var types = require("./types");
 var createError = require("raptor-util/createError");
 var hasOwnProperty = Object.prototype.hasOwnProperty;

package/dist/taglib/loader/loadTagFromProps.js

@@ -2,11 +2,11 @@
 
 var ok = require("assert").ok;
 var resolveFrom = require("resolve-from").silent;
-var propertyHandlers = require("property-handlers");
+var propertyHandlers = require("./property-handlers");
 var isObjectEmpty = require("raptor-util/isObjectEmpty");
 var nodePath = require("path");
 var createError = require("raptor-util/createError");
-var taglibFS = require("../fs");
+var taglibConfig = require("../config");
 var types = require("./types");
 var loaders = require("./loaders");
 var markoModules = require("../../../modules");
@@ -315,7 +315,7 @@ class TagLoader {
     var path = nodePath.resolve(dirname, value);
 
     try {
-      taglibFS.curFS.statSync(path);
+      taglibConfig.fs.statSync(path);
       tag.template = path;
     } catch (_) {
       throw new Error('Template at path "' + path + '" does not exist.');

package/dist/taglib/loader/loadTaglibFromProps.js

@@ -4,9 +4,9 @@ var ok = require("assert").ok;
 var resolveFrom = require("resolve-from").silent;
 var nodePath = require("path");
 var types = require("./types");
-var taglibFS = require("../fs");
+var taglibFS = require("../config");
 var scanTagsDir = require("./scanTagsDir");
-var propertyHandlers = require("property-handlers");
+var propertyHandlers = require("./property-handlers");
 var jsonFileReader = require("./json-file-reader");
 var DependencyChain = require("./DependencyChain");
 var createError = require("raptor-util/createError");
@@ -98,7 +98,7 @@ class TaglibLoader {
       tagFilePath = nodePath.resolve(this.dirname, value);
 
       try {
-        taglibFS.curFS.statSync(tagFilePath);
+        taglibFS.fs.statSync(tagFilePath);
       } catch (_) {
         throw new Error(
         'Tag at path "' +

package/dist/taglib/loader/property-handlers.js

@@ -0,0 +1,85 @@
+"use strict";
+
+const { hasOwnProperty } = Object.prototype;
+const taglibConfig = require("../config");
+
+function removeDashes(str) {
+  return str.replace(/-([a-z])/g, function (match, lower) {
+    return lower.toUpperCase();
+  });
+}
+
+module.exports = function invokeHandlers(config, handlers, path) {
+  function error(message, cause) {
+    if (cause) {
+      if (cause.__propertyHandlers) {
+        throw cause;
+      }
+
+      message += ". Cause: " + (cause.stack || cause);
+    }
+
+    if (path) {
+      message += " (" + path + ")";
+    }
+
+    var e = new Error(message);
+    e.__propertyHandlers = true;
+    taglibConfig.onError(e);
+  }
+
+  if (!config) {
+    error('"config" argument is required');
+  }
+
+  if (typeof config !== "object") {
+    error("object expected");
+  }
+
+  for (var k in config) {
+    if (hasOwnProperty.call(config, k)) {
+      var value = config[k];
+      var keyNoDashes = removeDashes(k);
+      var handler = handlers[keyNoDashes];
+      var isDefaultHandler = false;
+
+      if (!handler) {
+        handler = handlers["*"];
+        isDefaultHandler = true;
+      }
+
+      if (!handler) {
+        var badProperty = JSON.stringify(k);
+        if (k !== keyNoDashes) {
+          badProperty += "/" + JSON.stringify(keyNoDashes);
+        }
+        error(
+        "Invalid option of " +
+        badProperty +
+        ". Allowed: " +
+        Object.keys(handlers).join(", "));
+
+      }
+
+      try {
+        if (isDefaultHandler) {
+          if (handler.call(handlers, k, value) === false) {
+            error("Invalid option: " + k);
+          }
+        } else {
+          handler.call(handlers, value);
+        }
+      } catch (e) {
+        error('Error while applying option of "' + k + '"', e);
+      }
+    }
+  }
+
+  if (handlers._end) {
+    try {
+      handlers._end();
+    } catch (e) {
+      error("Error after applying properties", e);
+    }
+  }
+};

package/dist/taglib/loader/scanTagsDir.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const nodePath = require("path");
-const taglibFS = require("../fs");
+const taglibConfig = require("../config");
 const jsonFileReader = require("./json-file-reader");
 const tagDefFromCode = require("./tag-def-from-code");
 const loaders = require("./loaders");
@@ -48,7 +48,7 @@ function createDefaultTagDef() {
 
 function getFileMap(dirname) {
   let fileMap = {};
-  let files = taglibFS.curFS.readdirSync(dirname);
+  let files = taglibConfig.fs.readdirSync(dirname);
 
   files.forEach((file) => {
     let extName = nodePath.extname(file);
@@ -77,7 +77,7 @@ function getPath(filename, fileMap) {
 
 function findAndSetFile(tagDef, tagDirname) {
   try {
-    if (!taglibFS.curFS.statSync(tagDirname).isDirectory()) {
+    if (!taglibConfig.fs.statSync(tagDirname).isDirectory()) {
       return;
     }
   } catch (_) {
@@ -133,7 +133,7 @@ dependencyChain)
   }
 
   dir = nodePath.resolve(tagsConfigDirname, dir);
-  let children = taglibFS.curFS.readdirSync(dir);
+  let children = taglibConfig.fs.readdirSync(dir);
 
   for (let i = 0, len = children.length; i < len; i++) {
     let childFilename = children[i];
@@ -160,7 +160,7 @@ dependencyChain)
 
       let hasTagJson = false;
       try {
-        taglibFS.curFS.statSync(tagJsonPath);
+        taglibConfig.fs.statSync(tagJsonPath);
         hasTagJson = true;
         // eslint-disable-next-line no-empty
       } catch (_) {}
@@ -191,7 +191,7 @@ dependencyChain)
 
       if (!hasTagJson && (tagDef.renderer || tagDef.template)) {
         let templateCode = String(
-        taglibFS.curFS.readFileSync(
+        taglibConfig.fs.readFileSync(
         tagDef.renderer || tagDef.template,
         fsReadOptions));
 

package/index.d.ts

@@ -1,8 +1,9 @@
 import { SourceMap } from "magic-string";
 import { TaglibLookup } from "@marko/babel-utils";
 import * as types from "./babel-types";
-import Config from "./config";
-export { type Config, types };
+export { types };
+
+export type Config = typeof import("./config");
 
 type Dep = {
   type: string;
@@ -65,7 +66,8 @@ export namespace taglib {
   export function register(id: string, props: { [x: string]: unknown }): void;
   export function buildLookup(
     dirname: string,
-    translator?: unknown
+    translator?: unknown,
+    onError?: (err: Error) => void
   ): TaglibLookup;
   export function clearCaches(): void;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/compiler",
   "description": "Marko template to JS compiler.",
-  "version": "5.24.0",
+  "version": "5.25.0",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "dependencies": {
@@ -21,7 +21,6 @@
     "htmljs-parser": "^5.1.5",
     "jsesc": "^3.0.2",
     "lasso-package-root": "^1.0.1",
-    "property-handlers": "^1.1.1",
     "raptor-regexp": "^1.0.1",
     "raptor-util": "^3.2.0",
     "resolve-from": "^5.0.0",
@@ -30,7 +29,7 @@
     "strip-json-comments": "^3.1.1"
   },
   "devDependencies": {
-    "@marko/translator-default": "^5.22.6"
+    "@marko/translator-default": "^5.23.0"
   },
   "files": [
     "dist",

package/dist/taglib/fs.js

@@ -1,4 +0,0 @@
-"use strict";exports.__esModule = true;exports.curFS = void 0;exports.setFS = setFS;let curFS;exports.curFS = curFS;
-function setFS(fs) {
-  exports.curFS = curFS = fs;
-}