view-ignored 0.9.0 → 0.9.1

package/out/patterns/index.d.ts

@@ -9,7 +9,6 @@ export * from "./matcherContextPatch.js";
 export * from "./matcherStream.js";
 export * from "./packagejson.js";
 export * from "./pattern.js";
-export * from "./patternMatcher.js";
 export * from "./resolveSources.js";
 export * from "./signedPattern.js";
 export * from "./source.js";

package/out/patterns/index.js

@@ -9,7 +9,6 @@ export * from "./matcherContextPatch.js";
 export * from "./matcherStream.js";
 export * from "./packagejson.js";
 export * from "./pattern.js";
-export * from "./patternMatcher.js";
 export * from "./resolveSources.js";
 export * from "./signedPattern.js";
 export * from "./source.js";

package/out/patterns/jsrjson.d.ts

@@ -1,5 +1,5 @@
 import type { MatcherContext } from "./matcherContext.js";
-import type { Source } from "./source.js";
+import { type Source } from "./source.js";
 /**
  * Extracts and compiles patterns from the file.
  *

package/out/patterns/jsrjson.js

@@ -1,6 +1,7 @@
 import { type } from "arktype";
 import stripJsonComments from "strip-json-comments";
 import { signedPatternCompile } from "./resolveSources.js";
+import { sourcePushNegatable } from "./source.js";
 const jsrManifest = type({
     exclude: "string[]?",
     include: "string[]?",
@@ -18,6 +19,24 @@ const parse = type("string")
  * @since 0.6.0
  */
 export function extractJsrJson(source, content, ctx) {
+    extract(source, content, ctx);
+    for (const element of source.pattern) {
+        signedPatternCompile(element);
+    }
+}
+extractJsrJson;
+/**
+ * Extracts and compiles patterns from the file.
+ *
+ * @see {@link signedPatternCompile}
+ *
+ * @since 0.6.0
+ */
+export function extractJsrJsonc(source, content, ctx) {
+    extractJsrJson(source, Buffer.from(stripJsonComments(content.toString())), ctx);
+}
+extractJsrJsonc;
+function extract(source, content, ctx) {
     const dist = parse(content.toString());
     const include = { compiled: null, excludes: false, pattern: [] };
     const exclude = { compiled: null, excludes: true, pattern: [] };
@@ -42,19 +61,10 @@ export function extractJsrJson(source, content, ctx) {
     else if (dist.publish.include) {
         include.pattern.push(...dist.publish.include);
     }
-    for (const element of source.pattern) {
-        signedPatternCompile(element);
+    for (const si of [include, exclude]) {
+        for (const pattern of si.pattern) {
+            sourcePushNegatable(pattern, true, include, exclude);
+        }
     }
+    source.pattern.push(include, exclude);
 }
-extractJsrJson;
-/**
- * Extracts and compiles patterns from the file.
- *
- * @see {@link signedPatternCompile}
- *
- * @since 0.6.0
- */
-export function extractJsrJsonc(source, content, ctx) {
-    extractJsrJson(source, Buffer.from(stripJsonComments(content.toString())), ctx);
-}
-extractJsrJsonc;

package/out/patterns/signedPattern.d.ts

@@ -5,7 +5,6 @@ import { type Pattern, type PatternMinimatch } from "./pattern.js";
  * Represents a set of include and exclude patterns.
  * These patterns are positive minimatch patterns.
  *
- * @see {@link PatternMatcher} uses it.
  * @see {@link signedPatternIgnores} provides the ignoring algorithm.
  * @see {@link signedPatternCompile} compiles the signed pattern.
  * Use this or an extractor's method to compile.
@@ -39,32 +38,57 @@ export type SignedPattern = {
     compiled: null | PatternMinimatch[];
 };
 /**
- * @see {@link signedPatternIgnores}
+ * The kind of a pattern match.
  *
- * @since 0.6.0
+ * @since 0.9.1
  */
-export type SignedPatternMatch = {
-    kind: "none" | "missing-source";
-    ignored: boolean;
-} | {
-    kind: "no-match" | "broken-source" | "invalid-pattern";
+export type MatchKind = SignedPatternMatch["kind"];
+/**
+ * @see {@link SignedPatternMatch}
+ *
+ * @since 0.9.1
+ */
+export interface MatchBase<K extends string> {
+    kind: K;
     ignored: boolean;
+}
+/**
+ * @see {@link SignedPatternMatch}
+ *
+ * @since 0.9.1
+ */
+export interface MatchBaseSource<K extends string> extends MatchBase<K> {
     source: Source;
-} | {
-    kind: "invalid-internal-pattern";
+}
+/**
+ * @see {@link SignedPatternMatch}
+ *
+ * @since 0.9.1
+ */
+export interface MatchBasePattern<K extends string> extends MatchBase<K> {
     pattern: string;
+}
+/**
+ * @see {@link SignedPatternMatch}
+ *
+ * @since 0.9.1
+ */
+export interface MatchBaseErrorPattern<K extends string> extends MatchBasePattern<K> {
     error: Error;
-    ignored: boolean;
-} | {
-    kind: "internal";
-    pattern: string;
-    ignored: boolean;
-} | {
-    kind: "external";
-    pattern: string;
-    source: Source;
-    ignored: boolean;
-};
+}
+/**
+ * @see {@link SignedPatternMatch}
+ *
+ * @since 0.9.1
+ */
+export interface MatchBaseSourcePattern<K extends string> extends MatchBasePattern<K>, MatchBaseSource<K> {
+}
+/**
+ * @see {@link signedPatternIgnores}
+ *
+ * @since 0.6.0
+ */
+export type SignedPatternMatch = MatchBase<"none" | "missing-source"> | MatchBaseSource<"no-match" | "broken-source" | "invalid-pattern"> | MatchBaseErrorPattern<"invalid-internal-pattern"> | MatchBasePattern<"internal"> | MatchBaseSourcePattern<"external">;
 /**
  * @see {@link signedPatternIgnores}
  *

package/out/patterns/signedPattern.js

@@ -15,64 +15,56 @@ function patternRegExpTest(path, rs) {
     return ["", undefined];
 }
 function signedPatternCompiledMatchInternal(options, path) {
-    let patternMatch = "";
-    let err;
-    const kind = "internal";
-    const signedPattern = options.internal;
-    try {
-        for (const si of signedPattern) {
-            const compiled = si.compiled;
-            if (compiled === null) {
-                continue;
-            }
-            ;
-            [patternMatch, err] = patternRegExpTest(path, compiled);
-            if (err) {
-                throw err;
-            }
-            if (patternMatch) {
-                // return true
-                return { kind, pattern: patternMatch, ignored: si.excludes };
-            }
-        }
-    }
-    catch (error) {
-        return {
-            kind: "invalid-internal-pattern",
-            pattern: patternMatch,
-            error: error,
-            ignored: false,
-        };
+    for (const si of options.internal) {
+        const compiled = si.compiled;
+        if (compiled === null)
+            continue;
+        let [patternMatch, error] = patternRegExpTest(path, compiled);
+        if (error)
+            return {
+                kind: "invalid-internal-pattern",
+                pattern: patternMatch,
+                error,
+                ignored: false,
+            };
+        if (patternMatch)
+            return {
+                kind: "internal",
+                pattern: patternMatch,
+                ignored: si.excludes,
+            };
     }
     return null;
 }
 function signedPatternCompiledMatchExternal(options, path, source) {
-    let patternMatch = "";
-    let err;
-    const kind = "external";
-    try {
-        for (const si of source.pattern) {
-            const compiled = si.compiled;
-            if (compiled === null) {
-                continue;
-            }
-            ;
-            [patternMatch, err] = patternRegExpTest(path, compiled);
-            if (err) {
-                throw err;
-            }
-            if (patternMatch) {
-                // return true
-                return { kind, pattern: patternMatch, ignored: si.excludes, source };
-            }
+    for (const si of source.pattern) {
+        const compiled = si.compiled;
+        if (compiled === null) {
+            continue;
         }
+        let [patternMatch, err] = patternRegExpTest(path, compiled);
+        if (err) {
+            source.error = err;
+            options.ctx?.failed.push(source);
+            return {
+                kind: "invalid-pattern",
+                ignored: false,
+                source,
+            };
+        }
+        if (patternMatch)
+            return {
+                kind: "external",
+                pattern: patternMatch,
+                ignored: si.excludes,
+                source,
+            };
     }
-    catch (err) {
-        source.error = err;
-        options.ctx?.failed.push(source);
-        return { kind: "invalid-pattern", ignored: false, source };
-    }
-    return { kind: "no-match", ignored: source.inverted, source };
+    return {
+        kind: "no-match",
+        ignored: source.inverted,
+        source,
+    };
 }
 /**
  * Checks whether a given entry should be ignored based on internal and external patterns.

package/out/patterns/source.d.ts

@@ -9,7 +9,6 @@ export type Source = {
      * Patterns defined within the source file.
      * Those patterns are for ignoring files.
      *
-     * @see {@link PatternMatcher}
      * @see {@link signedPatternIgnores}
      *
      * @since 0.6.0
@@ -32,7 +31,6 @@ export type Source = {
      * For example, `package.json` `files` field inverts the matching logic,
      * because it specifies files to include rather than exclude.
      *
-     * @see {@link PatternMatcher}
      * @see {@link signedPatternIgnores}
      *
      * @since 0.6.0

package/package.json

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

package/out/patterns/patternMatcher.d.ts

@@ -1,23 +0,0 @@
-import type { SignedPattern } from "./signedPattern.js";
-/**
- * Combined internal and external patterns for matching.
- *
- * @see {@link signedPatternIgnores}
- *
- * @since 0.6.0
- */
-export type PatternMatcher = {
-    /**
-     * Internal patterns are provided by the target.
-     * Almost always they are predefined.
-     *
-     * @since 0.6.0
-     */
-    internal: SignedPattern[];
-    /**
-     * External patterns are sourced from existing project files at runtime.
-     *
-     * @since 0.6.0
-     */
-    external: SignedPattern[];
-};

package/out/patterns/patternMatcher.js

@@ -1 +0,0 @@
-export {};