Improve tag scanning perf (#1860)

* fix: improve tag dir scanning cache (#1859)

(cherry picked from commit 412e2eb)

* chore: update htmljs-parser

Author: DylanPiercey

.changeset/ten-rocks-compete.md

@@ -0,0 +1,7 @@
+---
+"@marko/compiler": patch
+"marko": patch
+"@marko/translator-default": patch
+---
+
+Improve tag scanning performance.

.changeset/tidy-boats-reflect.md

@@ -0,0 +1,7 @@
+---
+"@marko/compiler": patch
+"@marko/translator-default": patch
+"marko": patch
+---
+
+Update htmljs-parser version.

package-lock.json

@@ -18,7 +18,7 @@
     "@marko/babel-utils": "^5.21.3",
     "complain": "^1.6.0",
     "he": "^1.2.0",
-    "htmljs-parser": "^5.1.3",
+    "htmljs-parser": "^5.1.5",
     "jsesc": "^3.0.2",
     "lasso-package-root": "^1.0.1",
     "property-handlers": "^1.1.1",

packages/compiler/package.json

@@ -4,10 +4,6 @@ var resolveFrom = require("resolve-from").silent;
 var taglibFS = require("../fs");
 var taglibLoader = require("../loader");
 var lassoPackageRoot = require("lasso-package-root");
-var scanTagsDir = require("../loader/scanTagsDir");
-var DependencyChain = require("../loader/DependencyChain");
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-
 var findCache = {};
 var excludedDirs = {};
 var excludedPackages = {};
@@ -65,9 +61,6 @@ function find(dirname, registeredTaglibs) {
   var added = {};
 
   var helper = {
-    alreadyAdded: function (taglibId) {
-      return hasOwnProperty.call(added, taglibId);
-    },
     addTaglib: function (taglib) {
       if (added[taglib.id]) {
         return;
@@ -99,22 +92,10 @@ function find(dirname, registeredTaglibs) {
       }
 
       if (!taglib || taglib.tagsDir === undefined) {
-        let componentsPath = nodePath.join(curDirname, "components");
-
-        if (
-          existsSync(componentsPath) &&
-          !excludedDirs[componentsPath] &&
-          !helper.alreadyAdded(componentsPath)
-        ) {
-          let taglib = taglibLoader.createTaglib(componentsPath);
-          scanTagsDir(
-            componentsPath,
-            nodePath.dirname(componentsPath),
-            "components",
-            taglib,
-            new DependencyChain([componentsPath])
-          );
-          helper.addTaglib(taglib);
+        const componentsPath = nodePath.join(curDirname, "components");
+
+        if (existsSync(componentsPath) && !excludedDirs[componentsPath]) {
+          helper.addTaglib(taglibLoader.loadTaglibFromDir(curDirname));
         }
       }
     }

packages/compiler/src/taglib/finder/index.js

@@ -12,6 +12,10 @@ function loadTaglibFromFile(filePath) {
   return loaders.loadTaglibFromFile(filePath);
 }
 
+function loadTaglibFromDir(filePath) {
+  return loaders.loadTaglibFromDir(filePath);
+}
+
 function clearCache() {
   cache.clear();
 }
@@ -34,4 +38,5 @@ exports.clearCache = clearCache;
 exports.createTaglib = createTaglib;
 exports.loadTaglibFromProps = loadTaglibFromProps;
 exports.loadTaglibFromFile = loadTaglibFromFile;
+exports.loadTaglibFromDir = loadTaglibFromDir;
 exports.loadTag = loadTag;

packages/compiler/src/taglib/loader/index.js

@@ -0,0 +1,32 @@
+var nodePath = require("path");
+var types = require("./types");
+var cache = require("./cache");
+var DependencyChain = require("./DependencyChain");
+var scanTagsDir = require("./scanTagsDir");
+
+var ok = require("assert").ok;
+
+function loadFromDir(dir) {
+  ok(dir, '"dir" is required');
+
+  var componentsPath = nodePath.join(dir, "components");
+  var taglib = cache.get(componentsPath);
+
+  // Only load a taglib once by caching the loaded taglibs using the file
+  // system file path as the key
+  if (!taglib) {
+    taglib = new types.Taglib(componentsPath);
+    cache.put(componentsPath, taglib);
+    scanTagsDir(
+      componentsPath,
+      dir,
+      "components",
+      taglib,
+      new DependencyChain([componentsPath])
+    );
+  }
+
+  return taglib;
+}
+
+module.exports = loadFromDir;

packages/compiler/src/taglib/loader/loadTaglibFromDir.js

@@ -18,6 +18,7 @@ exports.loadTagFromProps = require("./loadTagFromProps");
 exports.loadTagFromFile = require("./loadTagFromFile");
 exports.loadTaglibFromProps = require("./loadTaglibFromProps");
 exports.loadTaglibFromFile = require("./loadTaglibFromFile");
+exports.loadTaglibFromDir = require("./loadTaglibFromDir");
 exports.loadAttributes = require("./loadAttributes");
 exports.isSupportedAttributeProperty = isSupportedAttributeProperty;
 exports.isSupportedTagProperty = isSupportedTagProperty;

packages/compiler/src/taglib/loader/loaders.js

@@ -0,0 +1 @@
+<some-tag/>

packages/translator-default/test/fixtures/error-missing-entry-marko-tag-json/snapshots/generated-expected.marko

@@ -1,3 +1,3 @@
-Invalid tag file: packages/translator-default/test/fixtures/error-missing-entry-marko-tag-json/components/some-tag/marko-tag.json. Neither a renderer or a template was found for tag. {
-  "@a": "string"
-}
+packages/translator-default/test/fixtures/error-missing-entry-marko-tag-json/template.marko(1,2): Unable to find entry point for custom tag <some-tag>.
+> 1 | <some-tag/>
+    |  ^^^^^^^^