view-ignored 0.6.0 → 0.7.0

package/out/patterns/signedPattern.d.ts

@@ -10,7 +10,7 @@ import type { Source } from "./source.js";
  * @see {@link signedPatternCompile} compiles the signed pattern.
  * Use this or an extractor's method to compile.
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export type SignedPattern = {
     /**
@@ -18,7 +18,7 @@ export type SignedPattern = {
      *
      * @see {@link signedPatternIgnores} provides the ignoring algorithm.
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     include: Pattern;
     /**
@@ -26,7 +26,7 @@ export type SignedPattern = {
      *
      * @see {@link signedPatternIgnores} provides the ignoring algorithm.
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     exclude: Pattern;
     /**
@@ -34,7 +34,7 @@ export type SignedPattern = {
      *
      * @see {@link signedPatternIgnores} provides the ignoring algorithm.
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     compiled: null | {
         /**
@@ -42,7 +42,7 @@ export type SignedPattern = {
          *
          * @see {@link signedPatternIgnores} provides the ignoring algorithm.
          *
-         * @since 0.0.6
+         * @since 0.6.0
          */
         include: PatternMinimatch[];
         /**
@@ -50,7 +50,7 @@ export type SignedPattern = {
          *
          * @see {@link signedPatternIgnores} provides the ignoring algorithm.
          *
-         * @since 0.0.6
+         * @since 0.6.0
          */
         exclude: PatternMinimatch[];
     };
@@ -58,10 +58,19 @@ export type SignedPattern = {
 /**
  * @see {@link signedPatternIgnores}
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export type SignedPatternMatch = {
-    kind: "none" | "no-match" | "invalid-internal-pattern" | "missing-source" | "broken-source" | "invalid-pattern";
+    kind: "none" | "missing-source";
+    ignored: boolean;
+} | {
+    kind: "no-match" | "broken-source" | "invalid-pattern";
+    ignored: boolean;
+    source: Source;
+} | {
+    kind: "invalid-internal-pattern";
+    pattern: string;
+    error: Error;
     ignored: boolean;
 } | {
     kind: "internal";
@@ -76,7 +85,7 @@ export type SignedPatternMatch = {
 /**
  * @see {@link signedPatternIgnores}
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export interface SignedPatternIgnoresOptions extends PatternFinderOptions {
     /**
@@ -86,13 +95,13 @@ export interface SignedPatternIgnoresOptions extends PatternFinderOptions {
      * "dir/subdir"
      * "dir/subdir/index.js"
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     entry: string;
     /**
      * The internal pattern. Should be compiled.
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     internal: SignedPattern;
 }
@@ -112,6 +121,6 @@ export interface SignedPatternIgnoresOptions extends PatternFinderOptions {
  *      b. Check external include patterns. If matched, return false.
  * 4. If no patterns matched, return the inverted state.
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export declare function signedPatternIgnores(options: SignedPatternIgnoresOptions): Promise<SignedPatternMatch>;

package/out/patterns/signedPattern.js

@@ -3,59 +3,95 @@ import { patternMinimatchTest } from "./pattern.js";
 import { resolveSources } from "./resolveSources.js";
 function patternRegExpTest(path, rs) {
     for (const r of rs) {
-        if (patternMinimatchTest(r, path)) {
-            return r.pattern;
+        try {
+            if (patternMinimatchTest(r, path)) {
+                return [r.pattern, undefined];
+            }
+        }
+        catch (err) {
+            return [r.pattern, err];
         }
     }
-    return "";
+    return ["", undefined];
 }
 function signedPatternCompiledMatchInternal(options, path) {
     let patternMatch = "";
+    let err;
     const kind = "internal";
     const signedPattern = options.internal;
     const compiled = signedPattern.compiled; // no null
     try {
-        patternMatch = patternRegExpTest(path, compiled.exclude);
+        ;
+        [patternMatch, err] = patternRegExpTest(path, compiled.exclude);
+        if (err) {
+            throw err;
+        }
         if (patternMatch) {
             // return true
             return { kind, pattern: patternMatch, ignored: true };
         }
-        patternMatch = patternRegExpTest(path, compiled.include);
+        ;
+        [patternMatch, err] = patternRegExpTest(path, compiled.include);
+        if (err) {
+            throw err;
+        }
         if (patternMatch) {
             // return false
             return { kind, pattern: patternMatch, ignored: false };
         }
     }
-    catch {
-        return { kind: "invalid-internal-pattern", ignored: false };
+    catch (error) {
+        return {
+            kind: "invalid-internal-pattern",
+            pattern: patternMatch,
+            error: error,
+            ignored: false,
+        };
     }
-    return { kind: "no-match", ignored: true };
+    return null;
 }
 function signedPatternCompiledMatchExternal(options, path, source) {
     let patternMatch = "";
+    let err;
     const kind = "external";
     const signedPattern = source.pattern;
     const compiled = signedPattern.compiled; // no null
     try {
         if (source.inverted) {
-            patternMatch = patternRegExpTest(path, compiled.exclude);
+            ;
+            [patternMatch, err] = patternRegExpTest(path, compiled.exclude);
+            if (err) {
+                throw err;
+            }
             if (patternMatch) {
                 // return true
                 return { kind, source, pattern: patternMatch, ignored: true };
             }
-            patternMatch = patternRegExpTest(path, compiled.include);
+            ;
+            [patternMatch, err] = patternRegExpTest(path, compiled.include);
+            if (err) {
+                throw err;
+            }
             if (patternMatch) {
                 // return false
                 return { kind, source, pattern: patternMatch, ignored: false };
             }
         }
         else {
-            patternMatch = patternRegExpTest(path, compiled.include);
+            ;
+            [patternMatch, err] = patternRegExpTest(path, compiled.include);
+            if (err) {
+                throw err;
+            }
             if (patternMatch) {
                 // return false
                 return { kind, source, pattern: patternMatch, ignored: false };
             }
-            patternMatch = patternRegExpTest(path, compiled.exclude);
+            ;
+            [patternMatch, err] = patternRegExpTest(path, compiled.exclude);
+            if (err) {
+                throw err;
+            }
             if (patternMatch) {
                 // return true
                 return { kind, source, pattern: patternMatch, ignored: true };
@@ -64,10 +100,10 @@ function signedPatternCompiledMatchExternal(options, path, source) {
     }
     catch (err) {
         source.error = err;
-        options.ctx.failed.push(source);
-        return { kind: "invalid-pattern", ignored: false };
+        options.ctx?.failed.push(source);
+        return { kind: "invalid-pattern", ignored: false, source };
     }
-    return { kind: "no-match", ignored: source.inverted };
+    return { kind: "no-match", ignored: source.inverted, source };
 }
 /**
  * Checks whether a given entry should be ignored based on internal and external patterns.
@@ -85,26 +121,25 @@ function signedPatternCompiledMatchExternal(options, path, source) {
  *      b. Check external include patterns. If matched, return false.
  * 4. If no patterns matched, return the inverted state.
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export async function signedPatternIgnores(options) {
     const parent = dirname(options.entry);
-    let source = options.ctx.external.get(parent);
+    let source = options.ctx?.external.get(parent);
     if (source === undefined) {
-        const failedPrev = options.ctx.failed.length;
         await resolveSources({ ...options, dir: parent, root: options.root });
-        if (failedPrev < options.ctx.failed.length) {
-            return { kind: "broken-source", ignored: false };
-        }
         source = options.ctx.external.get(parent);
     }
+    if (source === undefined || source === "none") {
+        return { kind: "missing-source", ignored: true };
+    }
+    if (typeof source === "object" && source.error) {
+        return { kind: "broken-source", ignored: true, source };
+    }
     let internalMatch = signedPatternCompiledMatchInternal(options, options.entry);
-    if (internalMatch.kind !== "no-match") {
+    if (internalMatch !== null) {
         return internalMatch;
     }
-    if (source === undefined || source === "none") {
-        return { kind: "no-match", ignored: false };
-    }
     const externalMatch = signedPatternCompiledMatchExternal(options, options.entry, source);
     return externalMatch;
 }

package/out/patterns/source.d.ts

@@ -2,7 +2,7 @@ import type { SignedPattern } from "./signedPattern.js";
 /**
  * Represents a source of external patterns.
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export type Source = {
     /**
@@ -12,19 +12,19 @@ export type Source = {
      * @see {@link PatternMatcher}
      * @see {@link signedPatternIgnores}
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     pattern: SignedPattern;
     /**
      * Name of the source file.
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     name: string;
     /**
      * Relative path to the source file.
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     path: string;
     /**
@@ -35,7 +35,7 @@ export type Source = {
      * @see {@link PatternMatcher}
      * @see {@link signedPatternIgnores}
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     inverted: boolean;
     /**
@@ -43,7 +43,7 @@ export type Source = {
      *
      * @see {@link ExtractorFn}
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     error?: Error;
 };
@@ -52,6 +52,6 @@ export type Source = {
  * Strips the leading '!' for include patterns,
  * and adds to exclude patterns otherwise.
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export declare function sourcePushNegatable(source: Source, pattern: string): void;

package/out/patterns/source.js

@@ -3,7 +3,7 @@
  * Strips the leading '!' for include patterns,
  * and adds to exclude patterns otherwise.
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export function sourcePushNegatable(source, pattern) {
     let exclude = source.pattern.exclude, include = source.pattern.include;

package/out/patterns/stringCompile.d.ts

@@ -4,6 +4,6 @@ import type { PatternMinimatch, Pattern } from "./pattern.js";
  *
  * @see {@link patternCompile}
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export declare function stringCompile(pattern: string, _?: number, array?: Pattern): PatternMinimatch;

package/out/patterns/stringCompile.js

@@ -4,7 +4,7 @@ import { makeRe } from "minimatch";
  *
  * @see {@link patternCompile}
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export function stringCompile(pattern, _ = -1, array = []) {
     const original = pattern;

package/out/scan.d.ts

@@ -12,6 +12,6 @@ export type * from "./types.js";
  * @param options Scan options.
  * @returns A promise that resolves to a {@link MatcherContext} containing the scan results.
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export declare function scan(options: ScanOptions): Promise<MatcherContext>;

package/out/scan.js

@@ -12,7 +12,7 @@ import { scan as browserScan } from "./browser_scan.js";
  * @param options Scan options.
  * @returns A promise that resolves to a {@link MatcherContext} containing the scan results.
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export function scan(options) {
     const { cwd = process.cwd(), fs = nodefs } = options;

package/out/stream.d.ts

@@ -4,6 +4,6 @@ export type * from "./types.js";
 /**
  * @see {@link scan}
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export declare function scanStream(options: ScanOptions): MatcherStream;

package/out/stream.js

@@ -4,7 +4,7 @@ import { scanStream as browserStream } from "./browser_stream.js";
 /**
  * @see {@link scan}
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export function scanStream(options) {
     const { cwd = process.cwd(), fs = nodefs } = options;

package/out/targets/git.d.ts

@@ -1,5 +1,5 @@
 import type { Target } from "./target.js";
 /**
- * @since 0.0.6
+ * @since 0.6.0
  */
 export declare const Git: Target;

package/out/targets/git.js

@@ -16,7 +16,7 @@ const internal = {
 };
 signedPatternCompile(internal);
 /**
- * @since 0.0.6
+ * @since 0.6.0
  */
 export const Git = {
     extractors,

package/out/targets/jsr.d.ts

@@ -1,5 +1,5 @@
 import type { Target } from "./target.js";
 /**
- * @since 0.0.6
+ * @since 0.6.0
  */
 export declare const JSR: Target;

package/out/targets/jsr.js

@@ -24,7 +24,7 @@ const internal = {
 };
 signedPatternCompile(internal);
 /**
- * @since 0.0.6
+ * @since 0.6.0
  */
 export const JSR = {
     extractors,

package/out/targets/npm.d.ts

@@ -1,5 +1,5 @@
 import type { Target } from "./target.js";
 /**
- * @since 0.0.6
+ * @since 0.6.0
  */
 export declare const NPM: Target;

package/out/targets/npm.js

@@ -38,7 +38,7 @@ const internal = {
 };
 signedPatternCompile(internal);
 /**
- * @since 0.0.6
+ * @since 0.6.0
  */
 export const NPM = {
     extractors,

package/out/targets/target.d.ts

@@ -3,14 +3,14 @@ import type { Ignores } from "../patterns/ignores.js";
 /**
  * Contains the matcher used for scanning.
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export interface Target {
     /**
      * The set of extractors.
      * Required for context-patching APIs (ctx add/remove path).
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     extractors: Extractor[];
     /**
@@ -18,7 +18,7 @@ export interface Target {
      *
      * @see {@link Ignores}
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     ignores: Ignores;
 }

package/out/targets/vsce.d.ts

@@ -1,5 +1,5 @@
 import type { Target } from "./target.js";
 /**
- * @since 0.0.6
+ * @since 0.6.0
  */
 export declare const VSCE: Target;

package/out/targets/vsce.js

@@ -20,7 +20,7 @@ const internal = {
 };
 signedPatternCompile(internal);
 /**
- * @since 0.0.6
+ * @since 0.6.0
  */
 export const VSCE = {
     extractors,

package/out/targets/yarn.d.ts

@@ -1,5 +1,5 @@
 import type { Target } from "./target.js";
 /**
- * @since 0.0.6
+ * @since 0.6.0
  */
 export declare const Yarn: Target;

package/out/targets/yarn.js

@@ -44,7 +44,7 @@ const internal = {
 };
 signedPatternCompile(internal);
 /**
- * @since 0.0.6
+ * @since 0.6.0
  */
 export const Yarn = {
     extractors,

package/out/types.d.ts

@@ -3,7 +3,7 @@ import type { Target } from "./targets/target.js";
 /**
  * Minimal FS implementation needed for `scan`, `scanStream`, and their browser versions.
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export interface FsAdapter {
     promises: {
@@ -14,13 +14,13 @@ export interface FsAdapter {
 /**
  * Used in multiple methods, primarily `scan`, `scanStream`, and their browser versions.
  *
- * @since 0.0.6
+ * @since 0.6.0
  */
 export type ScanOptions = {
     /**
      * Provides the matcher to use for scanning.
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     target: Target;
     /**
@@ -28,7 +28,7 @@ export type ScanOptions = {
      *
      * @default `normalizeCwd(process.cwd())`
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     cwd?: string;
     /**
@@ -39,7 +39,7 @@ export type ScanOptions = {
      *
      * @default `"."`
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     within?: string;
     /**
@@ -47,7 +47,7 @@ export type ScanOptions = {
      *
      * @default `false`
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     invert?: boolean;
     /**
@@ -56,7 +56,7 @@ export type ScanOptions = {
      *
      * @default `Infinity`
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     depth?: number;
     /**
@@ -64,7 +64,7 @@ export type ScanOptions = {
      *
      * @default `undefined`
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     signal?: AbortSignal | null;
     /**
@@ -83,7 +83,7 @@ export type ScanOptions = {
      *
      * @default `false`
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     fastDepth?: boolean;
     /**
@@ -102,7 +102,7 @@ export type ScanOptions = {
      *
      * @default `false`
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     fastInternal?: boolean;
     /**
@@ -110,7 +110,7 @@ export type ScanOptions = {
      *
      * @default `await import("node:fs")`
      *
-     * @since 0.0.6
+     * @since 0.6.0
      */
     fs?: FsAdapter;
 };

package/out/walk.d.ts

@@ -3,6 +3,7 @@ import type { MatcherContext } from "./patterns/matcherContext.js";
 import type { MatcherStream } from "./patterns/matcherStream.js";
 import type { ScanOptions } from "./types.js";
 export type WalkOptions = {
+    path: string;
     entry: Dirent;
     ctx: MatcherContext;
     stream: MatcherStream | undefined;

package/out/walk.js

@@ -1,11 +1,8 @@
-import { relative } from "node:path/posix";
 import { getDepth } from "./getDepth.js";
-import { normalizeCwd } from "./normalizeCwd.js";
 export async function walkIncludes(options) {
-    const { entry, ctx, stream, scanOptions } = options;
+    const { entry, ctx, stream, scanOptions, path } = options;
     const { fs, target, cwd, depth: maxDepth, invert, signal, fastDepth, fastInternal } = scanOptions;
     signal?.throwIfAborted();
-    const path = relative(cwd, normalizeCwd(entry.parentPath) + "/" + entry.name);
     const isDir = entry.isDirectory();
     let direntPath;
     if (isDir) {
@@ -91,7 +88,7 @@ export async function walkIncludes(options) {
         if (lastSlash >= 0) {
             const dir = path.substring(0, lastSlash) + "/";
             const dirMatch = ctx.paths.get(dir);
-            if (!dirMatch || dirMatch.ignored) {
+            if (dirMatch?.ignored) {
                 ctx.paths.set(dir, match);
                 if (stream) {
                     stream.emit("dirent", { dirent: entry, match, path: direntPath, ctx });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "view-ignored",
-	"version": "0.6.0",
+	"version": "0.7.0",
 	"description": "Retrieve list of files ignored/included by Git, NPM, Yarn, JSR, VSCE or other tools.",
 	"keywords": [
 		".gitignore",