perf: switch to tinyglobby

Merge pull request #480 from 43081j/tinyglobby-fix

Author: crutchcorn

packages/node-plop/package.json

@@ -43,13 +43,14 @@
   },
   "dependencies": {
     "@types/inquirer": "^9.0.9",
+    "@types/picomatch": "^4.0.2",
     "change-case": "^5.4.4",
     "dlv": "^1.1.3",
-    "globby": "^14.1.0",
     "handlebars": "^4.7.8",
     "inquirer": "^9.3.8",
     "isbinaryfile": "^5.0.6",
     "resolve": "^1.22.10",
+    "tinyglobby": "^0.2.15",
     "title-case": "^4.3.2"
   }
 }

packages/node-plop/src/actions/addMany.js

@@ -1,6 +1,6 @@
 import path from "path";
 import fs from "fs";
-import { globbySync } from "globby";
+import { globSync } from "tinyglobby";
 import actionInterfaceTest from "./_common-action-interface-check.js";
 import addFile from "./_common-action-add-file.js";
 import { normalizePath } from "./_common-action-utils.js";
@@ -44,14 +44,16 @@ export default async function (data, userConfig, plop) {
   );
 
   const filesAdded = [];
+  const plopFilePath = path.resolve(plop.getPlopfilePath());
+  const absBasePath = path.resolve(plopFilePath, cfg.base || "");
   for (let templateFile of templateFiles) {
-    const absTemplatePath = path.resolve(plop.getPlopfilePath(), templateFile);
+    const relativeTemplatePath = path.relative(absBasePath, templateFile);
     const fileCfg = Object.assign({}, cfg, {
       path: stripExtensions(
         cfg.stripExtensions,
-        resolvePath(cfg.destination, templateFile, cfg.base),
+        resolvePath(cfg.destination, relativeTemplatePath, cfg.base),
       ),
-      templateFile: absTemplatePath,
+      templateFile: templateFile,
     });
     const addedPath = await addFile(data, fileCfg, plop);
     filesAdded.push(addedPath);
@@ -63,21 +65,25 @@ export default async function (data, userConfig, plop) {
 }
 
 function resolveTemplateFiles(templateFilesGlob, basePath, globOptions, plop) {
-  globOptions = Object.assign({ cwd: plop.getPlopfilePath() }, globOptions);
-  return globbySync(
-    templateFilesGlob,
-    Object.assign({ braceExpansion: false }, globOptions),
-  )
-    .filter(isUnder(basePath))
-    .filter(isAbsoluteOrRelativeFileTo(plop.getPlopfilePath()));
+  const absPlopfilePath = path.resolve(plop.getPlopfilePath());
+  const absBasePath = path.resolve(absPlopfilePath, basePath || "");
+  return globSync(templateFilesGlob, {
+    cwd: absPlopfilePath,
+    braceExpansion: false,
+    expandDirectories: true,
+    absolute: true,
+    ...globOptions,
+  })
+    .filter(isUnder(absBasePath))
+    .filter(isAbsoluteOrRelativeFileTo(absPlopfilePath));
 }
-function isAbsoluteOrRelativeFileTo(relativePath) {
-  const isFile = (file) => fs.existsSync(file) && fs.lstatSync(file).isFile();
-  return (file) => isFile(file) || isFile(path.join(relativePath, file));
+function isAbsoluteOrRelativeFileTo(basePath) {
+  return (file) => fs.existsSync(file) && fs.lstatSync(file).isFile();
 }
 
 function isUnder(basePath = "") {
-  return (path) => path.startsWith(basePath);
+  const normalizedBasePath = basePath.replace(/\\/g, "/");
+  return (file) => file.startsWith(normalizedBasePath);
 }
 
 function resolvePath(destination, file, rootPath) {

packages/node-plop/types/index.d.ts

@@ -15,10 +15,7 @@ import inquirer, {
 
 type Inquirer = typeof inquirer;
 
-// @types/globby doesn't export types for GlobOptions, so we have to work a little bit to extract them:
-// GlobOptions is the second parameter of the sync function, which can be extracted with the Parameters<T> type
-import { globbySync } from "globby";
-type GlobOptions = Parameters<typeof globbySync>[1];
+import { type GlobOptions } from "tinyglobby";
 import { HelperDelegate as HelperFunction } from "handlebars";
 
 export interface IncludeDefinitionConfig {

yarn.lock

@@ -1170,13 +1170,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sindresorhus/merge-streams@npm:^2.1.0":
-  version: 2.3.0
-  resolution: "@sindresorhus/merge-streams@npm:2.3.0"
-  checksum: 10/798bcb53cd1ace9df84fcdd1ba86afdc9e0cd84f5758d26ae9b1eefd8e8887e5fc30051132b9e74daf01bb41fa5a2faf1369361f83d76a3b3d7ee938058fd71c
-  languageName: node
-  linkType: hard
-
 "@tootallnate/once@npm:2":
   version: 2.0.0
   resolution: "@tootallnate/once@npm:2.0.0"
@@ -1297,6 +1290,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/picomatch@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "@types/picomatch@npm:4.0.2"
+  checksum: 10/7b74f860c4c2bf30f7952254717df2dd78441b0add79858dffe7f6a30c9dd6da6c3d7769d2a9f0c499bc5ffe820c629bffc7c5128948febfc2b935800169b1c3
+  languageName: node
+  linkType: hard
+
 "@types/through@npm:*":
   version: 0.0.30
   resolution: "@types/through@npm:0.0.30"
@@ -2094,9 +2094,9 @@ __metadata:
   linkType: hard
 
 "chalk@npm:^5.6.0":
-  version: 5.6.2
-  resolution: "chalk@npm:5.6.2"
-  checksum: 10/1b2f48f6fba1370670d5610f9cd54c391d6ede28f4b7062dd38244ea5768777af72e5be6b74fb6c6d54cb84c4a2dff3f3afa9b7cb5948f7f022cfd3d087989e0
+  version: 5.6.0
+  resolution: "chalk@npm:5.6.0"
+  checksum: 10/f0e0646a72adbd0f6e73441d3872d7f2f40ba98052924f08a30c10634ec6b1e2cd19cc3c40cc21081dad640e2a1a2749030418571690b89bd7782babf7f89866
   languageName: node
   linkType: hard
 
@@ -3062,7 +3062,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.3.2, fast-glob@npm:^3.3.3":
+"fast-glob@npm:^3.3.2":
   version: 3.3.3
   resolution: "fast-glob@npm:3.3.3"
   dependencies:
@@ -3593,20 +3593,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globby@npm:^14.1.0":
-  version: 14.1.0
-  resolution: "globby@npm:14.1.0"
-  dependencies:
-    "@sindresorhus/merge-streams": "npm:^2.1.0"
-    fast-glob: "npm:^3.3.3"
-    ignore: "npm:^7.0.3"
-    path-type: "npm:^6.0.0"
-    slash: "npm:^5.1.0"
-    unicorn-magic: "npm:^0.3.0"
-  checksum: 10/e527ff54f0dddf60abfabd0d9e799768619d957feecd8b13ef60481f270bfdce0d28f6b09267c60f8064798fb3003b8ec991375f7fe0233fbce5304e1741368c
-  languageName: node
-  linkType: hard
-
 "graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4":
   version: 4.2.9
   resolution: "graceful-fs@npm:4.2.9"
@@ -3869,7 +3855,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore@npm:^7.0.0, ignore@npm:^7.0.3":
+"ignore@npm:^7.0.0":
   version: 7.0.5
   resolution: "ignore@npm:7.0.5"
   checksum: 10/f134b96a4de0af419196f52c529d5c6120c4456ff8a6b5a14ceaaa399f883e15d58d2ce651c9b69b9388491d4669dda47285d307e827de9304a53a1824801bc6
@@ -4994,15 +4980,16 @@ __metadata:
     "@types/inquirer": "npm:^9.0.9"
     "@types/inquirer-autocomplete-prompt": "npm:^3.0.3"
     "@types/node": "npm:^20.19.17"
+    "@types/picomatch": "npm:^4.0.2"
     change-case: "npm:^5.4.4"
     dlv: "npm:^1.1.3"
     dtslint: "npm:^4.2.1"
-    globby: "npm:^14.1.0"
     handlebars: "npm:^4.7.8"
     inquirer: "npm:^9.3.8"
     isbinaryfile: "npm:^5.0.6"
     plop-pack-fancy-comments: "npm:^0.2.1"
     resolve: "npm:^1.22.10"
+    tinyglobby: "npm:^0.2.15"
     title-case: "npm:^4.3.2"
     typescript: "npm:^5.9.2"
     vitest: "npm:^3.2.4"
@@ -5441,13 +5428,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-type@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "path-type@npm:6.0.0"
-  checksum: 10/b9f6eaf7795c48d5c9bc4c6bc3ac61315b8d36975a73497ab2e02b764c0836b71fb267ea541863153f633a069a1c2ed3c247cb781633842fc571c655ac57c00e
-  languageName: node
-  linkType: hard
-
 "pathe@npm:^2.0.3":
   version: 2.0.3
   resolution: "pathe@npm:2.0.3"
@@ -6213,13 +6193,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"slash@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "slash@npm:5.1.0"
-  checksum: 10/2c41ec6fb1414cd9bba0fa6b1dd00e8be739e3fe85d079c69d4b09ca5f2f86eafd18d9ce611c0c0f686428638a36c272a6ac14799146a8295f259c10cc45cde4
-  languageName: node
-  linkType: hard
-
 "slice-ansi@npm:^7.1.0":
   version: 7.1.2
   resolution: "slice-ansi@npm:7.1.2"
@@ -7016,13 +6989,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unicorn-magic@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "unicorn-magic@npm:0.3.0"
-  checksum: 10/bdd7d7c522f9456f32a0b77af23f8854f9a7db846088c3868ec213f9550683ab6a2bdf3803577eacbafddb4e06900974385841ccb75338d17346ccef45f9cb01
-  languageName: node
-  linkType: hard
-
 "unique-filename@npm:^3.0.0":
   version: 3.0.0
   resolution: "unique-filename@npm:3.0.0"