@cjser/globby 16.2.2-cjser.2 → 16.2.3-cjser.2

package/dist-cjser/index.cjs

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// packages/@cjser/globby.tmp-26-1784218928215/index.js
+// packages/@cjser/globby.tmp-26-1786379054379/index.js
 var index_exports = {};
 __export(index_exports, {
   convertPathToPattern: () => convertPathToPattern,
@@ -50,7 +50,7 @@ var import_sindresorhus_merge_streams = __toESM(require("@cjser/sindresorhus__me
 var import_fast_glob3 = __toESM(require("fast-glob"), 1);
 var import_node2 = require("@cjser/unicorn-magic/node");
 
-// packages/@cjser/globby.tmp-26-1784218928215/ignore.js
+// packages/@cjser/globby.tmp-26-1786379054379/ignore.js
 var import_node_process = __toESM(require("node:process"), 1);
 var import_node_fs2 = __toESM(require("node:fs"), 1);
 var import_promises = __toESM(require("node:fs/promises"), 1);
@@ -62,7 +62,7 @@ var import_is_path_inside2 = __toESM(require("@cjser/is-path-inside"), 1);
 var import_slash2 = __toESM(require("@cjser/slash"), 1);
 var import_node = require("@cjser/unicorn-magic/node");
 
-// packages/@cjser/globby.tmp-26-1784218928215/utilities.js
+// packages/@cjser/globby.tmp-26-1786379054379/utilities.js
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_node_util = require("node:util");
@@ -274,8 +274,10 @@ var GITIGNORE_WILDCARDS = /(?<!\\)[*?[]/u;
 var hasGitignoreWildcards = (value) => GITIGNORE_WILDCARDS.test(value);
 var MICROMATCH_ONLY_SYNTAX = /[(){}|\\]/u;
 var unescapeGitignorePattern = (value) => value.replaceAll(/\\(.)/gu, "$1");
+var normalizeGitignorePatternForIgnore = (value) => value.replaceAll(/\\(.)/gu, (match, character) => "*[]\\".includes(character) ? match : character);
 var toLiteralPattern = (value) => import_fast_glob.default.escapePath(unescapeGitignorePattern(value));
 var finalSegment = (value) => value.replace(/\/+$/u, "").split("/").pop();
+var toStandaloneRule = (value) => value.replace(/^([#!])/u, String.raw`\$1`);
 var isInsideCwd = (relativePath) => relativePath !== "" && !relativePath.startsWith("..") && !import_node_path.default.isAbsolute(relativePath);
 var anchorToCwd = (directory, body, cwd) => {
   const relativePath = (0, import_slash.default)(import_node_path.default.relative(cwd, import_node_path.default.join(directory, body)));
@@ -284,12 +286,17 @@ var anchorToCwd = (directory, body, cwd) => {
 var createNameComparer = () => {
   const nameMatchers = /* @__PURE__ */ new Map();
   const matchesName = (pattern, name) => {
-    let nameMatcher = nameMatchers.get(pattern);
+    const namePath = unescapeGitignorePattern(name);
+    if (!(0, import_ignore.isPathValid)(namePath)) {
+      return true;
+    }
+    const normalizedPattern = normalizeGitignorePatternForIgnore(pattern);
+    let nameMatcher = nameMatchers.get(normalizedPattern);
     if (!nameMatcher) {
-      nameMatcher = (0, import_ignore.default)().add([pattern]);
-      nameMatchers.set(pattern, nameMatcher);
+      nameMatcher = (0, import_ignore.default)().add([toStandaloneRule(normalizedPattern)]);
+      nameMatchers.set(normalizedPattern, nameMatcher);
     }
-    return nameMatcher.ignores(name);
+    return nameMatcher.ignores(namePath);
   };
   return (pattern, name) => {
     if (hasGitignoreWildcards(pattern) && hasGitignoreWildcards(name)) {
@@ -334,8 +341,9 @@ var getRulePrune = ({ pattern, directory }, { cwd, matcher, hasNegations, canSki
   if (target === void 0) {
     return void 0;
   }
+  const guardName = finalSegment(anchoredBody);
   if (isGlob) {
-    return hasNegations ? void 0 : { pattern: toFastGlob(target), guardName: finalSegment(target) };
+    return hasNegations ? void 0 : { pattern: toFastGlob(target), guardName };
   }
   if (!matcher(import_node_path.default.resolve(cwd, target) + import_node_path.default.sep).ignored) {
     return void 0;
@@ -343,7 +351,7 @@ var getRulePrune = ({ pattern, directory }, { cwd, matcher, hasNegations, canSki
   const needsGuard = !gitignoreOnlySearch || target.includes("/");
   return {
     pattern: toFastGlob(import_fast_glob.default.escapePath(target)),
-    guardName: needsGuard ? finalSegment(target) : void 0
+    guardName: needsGuard ? guardName : void 0
   };
 };
 var buildPrunePatternsAndGuards = (rules, matcher, cwd, { gitignoreOnlySearch = false, searchesForGitignoreFiles = false } = {}) => {
@@ -376,7 +384,7 @@ var buildPrunePatternsAndGuards = (rules, matcher, cwd, { gitignoreOnlySearch =
 };
 var convertPatternsForFastGlob = (rules, matcher, cwd) => buildPrunePatternsAndGuards(rules, matcher, cwd).patterns;
 
-// packages/@cjser/globby.tmp-26-1784218928215/ignore.js
+// packages/@cjser/globby.tmp-26-1786379054379/ignore.js
 var defaultIgnoredDirectories = [
   "**/node_modules",
   "**/flow-typed",
@@ -1064,7 +1072,7 @@ var getIgnorePatternsAndPredicateSync = (patterns, options, includeParentIgnoreF
 var isGitIgnored = (options) => isIgnoredByIgnoreFiles(GITIGNORE_FILES_PATTERN, options);
 var isGitIgnoredSync = (options) => isIgnoredByIgnoreFilesSync(GITIGNORE_FILES_PATTERN, options);
 
-// packages/@cjser/globby.tmp-26-1784218928215/index.js
+// packages/@cjser/globby.tmp-26-1786379054379/index.js
 var assertPatternsInput = (patterns) => {
   if (patterns.some((pattern) => typeof pattern !== "string")) {
     throw new TypeError("Patterns must be a string or an array of strings");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjser/globby",
-  "version": "16.2.2-cjser.2",
+  "version": "16.2.3-cjser.2",
   "description": "User-friendly glob matching",
   "license": "MIT",
   "repository": {
@@ -99,11 +99,11 @@
   "types": "./index.d.ts",
   "main": "./dist-cjser/index.cjs",
   "cjser": {
-    "sourceVersion": "16.2.2",
+    "sourceVersion": "16.2.3",
     "cjserVersion": 2,
     "original": {
       "name": "globby",
-      "version": "16.2.2",
+      "version": "16.2.3",
       "exports": {
         "types": "./index.d.ts",
         "default": "./index.js"

package/utilities.js

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import {promisify} from 'node:util';
 import fastGlob from 'fast-glob';
-import gitIgnore from 'ignore';
+import gitIgnore, {isPathValid} from 'ignore';
 import isPathInside from '@cjser/is-path-inside';
 import slash from '@cjser/slash';
 
@@ -359,12 +359,18 @@ const MICROMATCH_ONLY_SYNTAX = /[(){}|\\]/u;
 // In gitignore, `\x` means the literal character x.
 const unescapeGitignorePattern = value => value.replaceAll(/\\(.)/gu, '$1');
 
+// Normalize ordinary escaped characters for the ignore package, while preserving escapes that it handles as literals. An escaped question mark is widened to a wildcard because the ignore package does not match it literally, and a possible match is safer here than pruning too much.
+const normalizeGitignorePatternForIgnore = value => value.replaceAll(/\\(.)/gu, (match, character) => '*[]\\'.includes(character) ? match : character);
+
 // Turn gitignore-literal text into fast-glob-literal text, so characters like `+(` cannot be
 // misread as micromatch syntax.
 const toLiteralPattern = value => fastGlob.escapePath(unescapeGitignorePattern(value));
 
 const finalSegment = value => value.replace(/\/+$/u, '').split('/').pop();
 
+// A fragment of rule text is not a rule on its own: `#name` would open a comment and `!name` a negation, both of which stop naming anything. Escape the leading character so the fragment keeps naming what it did inside the rule it came from.
+const toStandaloneRule = value => value.replace(/^([#!])/u, String.raw`\$1`);
+
 const isInsideCwd = relativePath => relativePath !== '' && !relativePath.startsWith('..') && !path.isAbsolute(relativePath);
 
 /**
@@ -385,13 +391,20 @@ const anchorToCwd = (directory, body, cwd) => {
 const createNameComparer = () => {
 	const nameMatchers = new Map();
 	const matchesName = (pattern, name) => {
-		let nameMatcher = nameMatchers.get(pattern);
+		// The name is rule text, not a path: in gitignore `\#foo` names the file `#foo`. `Ignore#ignores()` only accepts a `path.relative()`d string and throws otherwise, so unescape first and treat whatever it still rejects (`.`, `..`, anything anchored) as a possible match.
+		const namePath = unescapeGitignorePattern(name);
+		if (!isPathValid(namePath)) {
+			return true;
+		}
+
+		const normalizedPattern = normalizeGitignorePatternForIgnore(pattern);
+		let nameMatcher = nameMatchers.get(normalizedPattern);
 		if (!nameMatcher) {
-			nameMatcher = gitIgnore().add([pattern]);
-			nameMatchers.set(pattern, nameMatcher);
+			nameMatcher = gitIgnore().add([toStandaloneRule(normalizedPattern)]);
+			nameMatchers.set(normalizedPattern, nameMatcher);
 		}
 
-		return nameMatcher.ignores(name);
+		return nameMatcher.ignores(namePath);
 	};
 
 	// A negation can only re-include the excluded path itself; nothing below it can be re-included once the directory is excluded. Two globs cannot be compared this way, so treat them as a possible match.
@@ -472,11 +485,14 @@ const getRulePrune = ({pattern, directory}, {cwd, matcher, hasNegations, canSkip
 		return undefined;
 	}
 
+	// The guard name is compared against negations as rule text, so it has to keep the escapes the rule was written with; the target has already lost them.
+	const guardName = finalSegment(anchoredBody);
+
 	if (isGlob) {
 		// A glob does not name a concrete path, so the matcher cannot confirm it is ignored.
 		return hasNegations
 			? undefined
-			: {pattern: toFastGlob(target), guardName: finalSegment(target)};
+			: {pattern: toFastGlob(target), guardName};
 	}
 
 	if (!matcher(path.resolve(cwd, target) + path.sep).ignored) {
@@ -487,7 +503,7 @@ const getRulePrune = ({pattern, directory}, {cwd, matcher, hasNegations, canSkip
 	const needsGuard = !gitignoreOnlySearch || target.includes('/');
 	return {
 		pattern: toFastGlob(fastGlob.escapePath(target)),
-		guardName: needsGuard ? finalSegment(target) : undefined,
+		guardName: needsGuard ? guardName : undefined,
 	};
 };