@marko/translator-default 5.25.8 → 5.25.9

package/dist/util/get-component-files.js

@@ -12,12 +12,11 @@ function getComponentFiles({ hub: { file } }) {
 
   const { filename } = file.opts;
   const fs = file.markoOpts.fileSystem;
-  const ext = _path.default.extname(filename);
   const dirname = _path.default.dirname(filename);
   const dirFiles = fs.readdirSync(dirname).sort();
-  const nameNoExt = _path.default.basename(filename, ext);
-  const isEntry = "index" === nameNoExt;
-  const fileMatch = `(${(0, _escapeStringRegexp.default)(nameNoExt)}\\.${isEntry ? "|" : ""})`;
+  const base = getBase(filename);
+  const isEntry = "index" === base;
+  const fileMatch = `(${(0, _escapeStringRegexp.default)(base)}\\.${isEntry ? "|" : ""})`;
   const styleMatch = new RegExp(`^${fileMatch}style\\.\\w+$`);
   const componentMatch = new RegExp(`^${fileMatch}component\\.\\w+$`);
   const splitComponentMatch = new RegExp(
@@ -49,4 +48,38 @@ function getComponentFiles({ hub: { file } }) {
     componentFile,
     componentBrowserFile
   };
+}
+
+/**
+ * Given a filename, gets the base name, strips off the file extension
+ * and removes any arc flags (https://github.com/eBay/arc).
+ *
+ * @example
+ * getBase("/dir/foo.marko") // => "foo"
+ * getBase("/dir/foo.bar.marko") // => "foo.bar"
+ * getBase("/dir/foo[bar].marko") // => "foo"
+ * getBase("/dir/foo[bar].baz.marko") // => "foo.baz"
+ */
+function getBase(filename) {
+  const start = filename.lastIndexOf(_path.default.sep) + 1;
+  const leftDot = filename.indexOf(".", start);
+
+  if (leftDot === -1) {
+    return filename.slice(start);
+  }
+
+  const rightDot = filename.lastIndexOf(".");
+  const closeBracket = leftDot - 1;
+  if (filename[closeBracket] === "]") {
+    const openBracket = filename.lastIndexOf("[", closeBracket);
+    if (openBracket > start) {
+      // If we match a "]" before the extension and find a "[" before that,
+      // then we have an arc flag. Strip it off.
+      return (
+        filename.slice(start, openBracket) + filename.slice(leftDot, rightDot));
+
+    }
+  }
+
+  return filename.slice(start, rightDot);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/translator-default",
   "description": "Translates Marko templates to the default Marko runtime.",
-  "version": "5.25.8",
+  "version": "5.25.9",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "dependencies": {
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@marko/compiler": "^5.27.8",
-    "marko": "^5.25.12"
+    "marko": "^5.25.17"
   },
   "files": [
     "dist",