view-ignored 0.9.0 → 0.10.0

package/README.md

@@ -56,9 +56,9 @@ if (match.kind === "external") {
 import {
 	type Extractor,
 	extractGitignore,
-	signedPatternIgnores,
-	signedPatternCompile,
-	type SignedPattern,
+	ruleTest,
+	ruleCompile,
+	type Rule,
 } from "view-ignored/patterns"
 
 import type { Target } from "view-ignored/targets"
@@ -74,24 +74,21 @@ const extractors: Extractor[] = [
 	},
 ]
 
-const internal: SignedPattern = {
-	exclude: [".git", ".DS_Store"],
-	include: [],
-	compiled: null,
-}
-
-signedPatternCompile(internal)
+const internal: Rule[] = [
+	ruleCompile({
+		excludes: true,
+		pattern: [".git", ".DS_Store"],
+		compiled: null,
+	}),
+]
 
 export const Git: Target = {
+	internalRules: internal,
 	extractors,
-	ignores(o) {
-		return signedPatternIgnores({
-			...o,
-			internal,
-			root: "/",
-			target: Git,
-		})
-	},
+	root: "/",
+	// TODO: Git should read configs
+	init() {},
+	ignores: ruleTest,
 }
 
 const ctx = await vign.scan({ target })

package/out/browser_scan.js

@@ -1,5 +1,5 @@
 import { opendir } from "./opendir.js";
-import { unixify, relative, join } from "./unixify.js";
+import { unixify, join } from "./unixify.js";
 import { walkIncludes } from "./walk.js";
 /**
  * Scan the directory for included files based on the provided targets.
@@ -41,10 +41,10 @@ export function scan(options) {
         target,
     };
     return (async () => {
-        await target.init?.({ ctx, cwd, fs, signal });
-        let from = join(unixify(normalCwd), within);
-        await opendir(fs, from, (entry) => {
-            const path = relative(normalCwd, unixify(entry.parentPath) + "/" + entry.name);
+        await target.init?.({ ctx, cwd, fs, signal, target });
+        let from = join(normalCwd, within);
+        await opendir(fs, from, (entry, from) => {
+            const path = from.substring(normalCwd.length + 1);
             return walkIncludes({
                 path,
                 entry,

package/out/opendir.d.ts

@@ -1,3 +1,3 @@
 import type { Dirent, PathLike } from "node:fs";
 import type { FsAdapter } from "./types.js";
-export declare function opendir(fs: FsAdapter, path: PathLike, cb: (entry: Dirent) => Promise<0 | 1 | 2>): Promise<void | 2>;
+export declare function opendir(fs: FsAdapter, path: PathLike, cb: (entry: Dirent, from: string) => Promise<0 | 1 | 2>): Promise<void | 2>;

package/out/opendir.js

@@ -1,18 +1,22 @@
 export async function opendir(fs, path, cb) {
     const dir = await fs.promises.opendir(path);
+    const tasks = [];
     for await (const entry of dir) {
-        const r = await cb(entry);
-        if (r === 2) {
-            return 2;
-        }
-        if (r === 1) {
-            continue;
-        }
-        if (entry.isDirectory()) {
-            const r = await opendir(fs, path + "/" + entry.name, cb);
-            if (r === 2) {
+        const from = path + "/" + entry.name;
+        const task = (async () => {
+            const r = await cb(entry, from);
+            if (r === 2)
                 return 2;
+            if (r === 1)
+                return;
+            if (entry.isDirectory()) {
+                return await opendir(fs, from, cb);
             }
-        }
+        })();
+        tasks.push(task);
+    }
+    const results = await Promise.all(tasks);
+    if (results.includes(2)) {
+        return 2;
     }
 }

package/out/patterns/extractor.d.ts

@@ -41,7 +41,7 @@ export interface Extractor {
  * Options for finding and extracting patterns from source files.
  *
  * @see {@link resolveSources}
- * @see {@link signedPatternIgnores}
+ * @see {@link ruleTest}
  *
  * @since 0.6.0
  */
@@ -70,13 +70,6 @@ export interface PatternFinderOptions {
      * @since 0.6.0
      */
     target: Target;
-    /**
-     * Initial search directory.
-     * Relative to the `cwd` path or absolute path.
-     *
-     * @since 0.6.0
-     */
-    root: string;
     /**
      * Return as soon as possible.
      *

package/out/patterns/gitignore.d.ts

@@ -2,7 +2,7 @@ import { type Source } from "./source.js";
 /**
  * Extracts and compiles patterns from the file.
  *
- * @see {@link signedPatternCompile}
+ * @see {@link ruleCompile}
  *
  * @since 0.6.0
  */
@@ -10,8 +10,8 @@ export declare function extractGitignore(source: Source, content: Buffer): void;
 /**
  * Extracts and compiles patterns from the file.
  *
- * @see {@link signedPatternCompile}
+ * @see {@link ruleCompile}
  *
- * @since 0.6.0
+ * @since 0.8.0
  */
 export declare function extractGitignoreNocase(source: Source, content: Buffer): void;

package/out/patterns/gitignore.js

@@ -1,29 +1,29 @@
-import { signedPatternCompile } from "./resolveSources.js";
-import { sourcePushNegatable } from "./source.js";
+import { ruleCompile } from "./resolveSources.js";
+import { resolveNegatable } from "./source.js";
 /**
  * Extracts and compiles patterns from the file.
  *
- * @see {@link signedPatternCompile}
+ * @see {@link ruleCompile}
  *
  * @since 0.6.0
  */
 export function extractGitignore(source, content) {
     extract(source, content);
     for (const element of source.pattern) {
-        signedPatternCompile(element);
+        ruleCompile(element);
     }
 }
 /**
  * Extracts and compiles patterns from the file.
  *
- * @see {@link signedPatternCompile}
+ * @see {@link ruleCompile}
  *
- * @since 0.6.0
+ * @since 0.8.0
  */
 export function extractGitignoreNocase(source, content) {
     extract(source, content);
     for (const element of source.pattern) {
-        signedPatternCompile(element, { nocase: true });
+        ruleCompile(element, { nocase: true });
     }
 }
 extractGitignore;
@@ -39,7 +39,7 @@ function extract(source, content) {
         if (cdx >= 0) {
             line = line.substring(-cdx);
         }
-        sourcePushNegatable(line, false, include, exclude);
+        resolveNegatable(line, false, include, exclude);
     }
     source.pattern.push(include, exclude);
 }

package/out/patterns/ignores.d.ts

@@ -1,5 +1,5 @@
-import type { SignedPatternMatch } from "../patterns/signedPattern.js";
 import type { InitState } from "./initState.js";
+import type { RuleMatch } from "./rule.js";
 /**
  * Used in {@link Ignores}.
  *
@@ -17,9 +17,9 @@ export interface IgnoresOptions extends InitState {
  * Checks whether a given entry path should be ignored based on its patterns.
  *
  * @see {@link resolveSources}
- * @see {@link signedPatternIgnores}
+ * @see {@link ruleTest}
  * @see {@link https://github.com/Mopsgamer/view-ignored/tree/main/src/targets} for usage examples.
  *
  * @since 0.6.0
  */
-export type Ignores = (options: IgnoresOptions) => Promise<SignedPatternMatch>;
+export type Ignores = (options: IgnoresOptions) => Promise<RuleMatch>;

package/out/patterns/index.d.ts

@@ -8,9 +8,8 @@ export * from "./matcherContext.js";
 export * from "./matcherContextPatch.js";
 export * from "./matcherStream.js";
 export * from "./packagejson.js";
-export * from "./pattern.js";
-export * from "./patternMatcher.js";
+export * from "./patternList.js";
 export * from "./resolveSources.js";
-export * from "./signedPattern.js";
+export * from "./rule.js";
 export * from "./source.js";
-export * from "./stringCompile.js";
+export * from "./patternCompile.js";

package/out/patterns/index.js

@@ -8,9 +8,8 @@ export * from "./matcherContext.js";
 export * from "./matcherContextPatch.js";
 export * from "./matcherStream.js";
 export * from "./packagejson.js";
-export * from "./pattern.js";
-export * from "./patternMatcher.js";
+export * from "./patternList.js";
 export * from "./resolveSources.js";
-export * from "./signedPattern.js";
+export * from "./rule.js";
 export * from "./source.js";
-export * from "./stringCompile.js";
+export * from "./patternCompile.js";

package/out/patterns/initState.d.ts

@@ -1,3 +1,4 @@
+import type { Target } from "../targets/target.js";
 import type { FsAdapter } from "../types.js";
 import type { MatcherContext } from "./matcherContext.js";
 /**
@@ -22,6 +23,12 @@ export interface InitState {
      * @since 0.6.0
      */
     ctx: MatcherContext;
+    /**
+     * The target implementation.
+     *
+     * @since 0.10.0
+     */
+    target: Target;
     /**
      * Return as soon as possible.
      *

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.
  *
@@ -9,7 +9,7 @@ export declare function extractJsrJson(source: Source, content: Buffer, ctx: Mat
 /**
  * Extracts and compiles patterns from the file.
  *
- * @see {@link signedPatternCompile}
+ * @see {@link ruleCompile}
  *
  * @since 0.6.0
  */

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 { ruleCompile } from "./resolveSources.js";
+import { resolveNegatable } 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) {
+        ruleCompile(element);
+    }
+}
+extractJsrJson;
+/**
+ * Extracts and compiles patterns from the file.
+ *
+ * @see {@link ruleCompile}
+ *
+ * @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) {
+            resolveNegatable(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/matcherContext.d.ts

@@ -1,4 +1,4 @@
-import type { SignedPatternMatch } from "./signedPattern.js";
+import type { RuleMatch } from "./rule.js";
 import type { Source } from "./source.js";
 /**
  * Post-scan results.
@@ -12,7 +12,7 @@ export interface MatcherContext {
      *
      * @since 0.6.0
      */
-    paths: Map<string, SignedPatternMatch>;
+    paths: Map<string, RuleMatch>;
     /**
      * Maps directory paths to their corresponding sources.
      *

package/out/patterns/matcherContextPatch.js

@@ -1,7 +1,7 @@
-import { resolve, dirname } from "node:path";
+import { dirname } from "node:path";
 import { getDepth } from "../getDepth.js";
 import { opendir } from "../opendir.js";
-import { unixify, relative } from "../unixify.js";
+import { unixify, join } from "../unixify.js";
 import { walkIncludes } from "../walk.js";
 /**
  * Provides patching abilities for the given {@link MatcherContext}.
@@ -21,7 +21,7 @@ export async function matcherContextAddPath(ctx, options, entry) {
         if (direntPath === ".") {
             return true;
         }
-        ctx.paths.set(entry, await target.ignores({ fs, cwd, entry: direntPath, ctx, signal }));
+        ctx.paths.set(entry, await target.ignores({ fs, cwd, entry: direntPath, ctx, signal, target }));
         if (ctx.totalFiles >= 0) {
             ctx.totalDirs++;
         }
@@ -42,7 +42,7 @@ export async function matcherContextAddPath(ctx, options, entry) {
     // 1. recursively populate parents
     await matcherContextAddPath(ctx, options, parent + "/");
     // 2. if ignored, remove, otherwise add
-    const match = await target.ignores({ fs, cwd, entry, ctx, signal });
+    const match = await target.ignores({ fs, cwd, entry, ctx, signal, target });
     if (match.ignored) {
         // 2.1. remove
         await matcherContextRemovePath(ctx, options, entry);
@@ -141,8 +141,9 @@ export async function matcherContextRemovePath(ctx, options, entry) {
 }
 async function rescan(ctx, options) {
     const normalCwd = unixify(options.cwd);
-    await opendir(options.fs, resolve(normalCwd, options.within), (entry) => {
-        const path = relative(normalCwd, unixify(entry.parentPath) + "/" + entry.name);
+    let from = join(normalCwd, options.within);
+    await opendir(options.fs, from, (entry, from) => {
+        const path = from.substring(normalCwd.length + 1);
         return walkIncludes({
             path,
             entry,

package/out/patterns/matcherStream.d.ts

@@ -2,7 +2,7 @@ import type { Dirent } from "node:fs";
 import { EventEmitter } from "node:events";
 import type { MatcherContext } from "../patterns/matcherContext.js";
 import type { ScanOptions, FsAdapter } from "../types.js";
-import type { SignedPatternMatch } from "./signedPattern.js";
+import type { RuleMatch } from "./rule.js";
 /**
  * Post-scan entry information.
  *
@@ -26,7 +26,7 @@ export type EntryInfo = {
      *
      * @since 0.6.0
      */
-    match: SignedPatternMatch;
+    match: RuleMatch;
     /**
      * The matcher context.
      *

package/out/patterns/matcherStream.js

@@ -1,6 +1,6 @@
 import { EventEmitter } from "node:events";
 import { opendir } from "../opendir.js";
-import { join, relative, unixify } from "../unixify.js";
+import { join, unixify } from "../unixify.js";
 import { walkIncludes } from "../walk.js";
 /**
  * Event emitter.
@@ -49,10 +49,10 @@ export class MatcherStream extends EventEmitter {
             signal,
             target,
         };
-        await target.init?.({ ctx, cwd, fs, signal });
-        let from = join(unixify(normalCwd), within);
-        await opendir(fs, from, (entry) => {
-            const path = relative(normalCwd, unixify(entry.parentPath) + "/" + entry.name);
+        await target.init?.({ ctx, cwd, fs, signal, target });
+        let from = join(normalCwd, within);
+        await opendir(fs, from, (entry, from) => {
+            const path = from.substring(normalCwd.length + 1);
             return walkIncludes({
                 path,
                 entry,

package/out/patterns/packagejson.d.ts

@@ -2,7 +2,7 @@ import { type Source } from "./source.js";
 /**
  * Extracts and compiles patterns from the file.
  *
- * @see {@link signedPatternCompile}
+ * @see {@link ruleCompile}
  *
  * @since 0.6.0
  */
@@ -10,7 +10,7 @@ export declare function extractPackageJson(source: Source, content: Buffer): voi
 /**
  * Extracts and compiles patterns from the file.
  *
- * @see {@link signedPatternCompile}
+ * @see {@link ruleCompile}
  *
  * @since 0.8.0
  */

package/out/patterns/packagejson.js

@@ -1,11 +1,11 @@
 import { type } from "arktype";
 import { npmManifestParse } from "../targets/npmManifest.js";
-import { signedPatternCompile } from "./resolveSources.js";
-import { sourcePushNegatable } from "./source.js";
+import { ruleCompile } from "./resolveSources.js";
+import { resolveNegatable } from "./source.js";
 /**
  * Extracts and compiles patterns from the file.
  *
- * @see {@link signedPatternCompile}
+ * @see {@link ruleCompile}
  *
  * @since 0.6.0
  */
@@ -13,7 +13,7 @@ export function extractPackageJson(source, content) {
     const result = extract(source, content);
     if (result === undefined) {
         for (const element of source.pattern) {
-            signedPatternCompile(element);
+            ruleCompile(element);
         }
     }
     if (result === "error")
@@ -23,7 +23,7 @@ export function extractPackageJson(source, content) {
 /**
  * Extracts and compiles patterns from the file.
  *
- * @see {@link signedPatternCompile}
+ * @see {@link ruleCompile}
  *
  * @since 0.8.0
  */
@@ -31,7 +31,7 @@ export function extractPackageJsonNocase(source, content) {
     const result = extract(source, content);
     if (result === undefined) {
         for (const element of source.pattern) {
-            signedPatternCompile(element, { nocase: true });
+            ruleCompile(element, { nocase: true });
         }
     }
     if (result === "error")
@@ -51,7 +51,7 @@ function extract(source, content) {
         return "none";
     }
     for (const pattern of dist.files) {
-        sourcePushNegatable(pattern, true, include, exclude);
+        resolveNegatable(pattern, true, include, exclude);
     }
     source.pattern.push(include, exclude);
 }

package/out/patterns/patternCompile.d.ts

@@ -0,0 +1,22 @@
+import type { PatternCache, PatternList } from "./patternList.js";
+/**
+ * @since 0.8.0
+ */
+export type PatternCompileOptions = {
+    /**
+     * Disables case sensitivity.
+     *
+     * @default false
+     *
+     * @since 0.8.0
+     */
+    nocase?: boolean;
+};
+/**
+ * Compiles a string of the {@link PatternList}.
+ *
+ * @see {@link patternCompile}
+ *
+ * @since 0.8.0
+ */
+export declare function patternCompile(pattern: string, context?: PatternList, options?: PatternCompileOptions): PatternCache;

package/out/patterns/{stringCompile.js → patternCompile.js}

@@ -1,12 +1,12 @@
 import { makeRe } from "minimatch";
 /**
- * Compiles a string of the {@link Pattern}.
+ * Compiles a string of the {@link PatternList}.
  *
  * @see {@link patternCompile}
  *
  * @since 0.8.0
  */
-export function stringCompile(pattern, context = [], options) {
+export function patternCompile(pattern, context = [], options) {
     const original = pattern;
     if (pattern.endsWith("/")) {
         pattern = pattern.substring(0, pattern.length - 1);

package/out/patterns/{pattern.d.ts → patternList.d.ts}

@@ -1,13 +1,13 @@
-import { type StringCompileOptions } from "./stringCompile.js";
+import { type PatternCompileOptions } from "./patternCompile.js";
 /**
  * Compiled pattern.
  *
- * @see {@link stringCompile}
- * @see {@link signedPatternCompile}
+ * @see {@link patternCompile}
+ * @see {@link ruleCompile}
  *
  * @since 0.6.0
  */
-export type PatternMinimatch = {
+export type PatternCache = {
     /**
      * The regular expression instance.
      *
@@ -25,26 +25,26 @@ export type PatternMinimatch = {
      *
      * @since 0.6.0
      */
-    patternContext: Pattern;
+    patternContext: PatternList;
 };
 /**
  * Safely calls RegExp.test.
  *
  * @since 0.6.0
  */
-export declare function patternMinimatchTest(pattern: PatternMinimatch, path: string): boolean;
+export declare function patternCacheTest(cache: PatternCache, path: string): boolean;
 /**
  * Represents a list of positive minimatch patterns.
  *
  * @since 0.6.0
  */
-export type Pattern = string[];
+export type PatternList = string[];
 /**
- * Compiles the {@link Pattern}.
+ * Compiles the {@link PatternList}.
  *
- * @see {@link stringCompile}
- * @see {@link signedPatternCompile}
+ * @see {@link patternCompile}
+ * @see {@link ruleCompile}
  *
  * @since 0.6.0
  */
-export declare function patternCompile(pattern: Pattern, options?: StringCompileOptions): PatternMinimatch[];
+export declare function patternListCompile(list: PatternList, options?: PatternCompileOptions): PatternCache[];

package/out/patterns/patternList.js

@@ -0,0 +1,21 @@
+import { patternCompile } from "./patternCompile.js";
+/**
+ * Safely calls RegExp.test.
+ *
+ * @since 0.6.0
+ */
+export function patternCacheTest(cache, path) {
+    cache.re.lastIndex = 0;
+    return cache.re.test(path);
+}
+/**
+ * Compiles the {@link PatternList}.
+ *
+ * @see {@link patternCompile}
+ * @see {@link ruleCompile}
+ *
+ * @since 0.6.0
+ */
+export function patternListCompile(list, options) {
+    return list.map((p, _, pattern) => patternCompile(p, pattern, options));
+}

package/out/patterns/resolveSources.d.ts

@@ -1,16 +1,16 @@
 import type { PatternFinderOptions } from "./extractor.js";
-import type { SignedPattern } from "./signedPattern.js";
-import type { StringCompileOptions } from "./stringCompile.js";
+import type { PatternCompileOptions } from "./patternCompile.js";
+import type { Rule } from "./rule.js";
 /**
- * Compiles the {@link SignedPattern} (forced).
+ * Compiles the {@link Rule} (forced).
  * Can be compiled at any time.
  * Extractors are compiling it.
  *
- * @see {@link patternCompile}
+ * @see {@link patternListCompile}
  *
  * @since 0.6.0
  */
-export declare function signedPatternCompile(signedPattern: SignedPattern, options?: StringCompileOptions): SignedPattern;
+export declare function ruleCompile(signedPattern: Rule, options?: PatternCompileOptions): Rule;
 /**
  * @see {@link resolveSources}
  *