view-ignored 0.8.1 → 0.9.0

package/out/targets/deno.js

@@ -1,4 +1,7 @@
-import { signedPatternIgnores, signedPatternCompile, extractJsrJson, extractJsrJsonc, } from "../patterns/index.js";
+import { type } from "arktype";
+import { signedPatternIgnores, signedPatternCompile, extractJsrJson, extractJsrJsonc, extractPackageJson, } from "../patterns/index.js";
+import { unixify } from "../unixify.js";
+import { jsrManifestParse } from "./jsrManifest.js";
 const extractors = [
     {
         extract: extractJsrJson,
@@ -16,18 +19,45 @@ const extractors = [
         extract: extractJsrJsonc,
         path: "jsr.jsonc",
     },
+    {
+        extract: extractPackageJson,
+        path: "package.json",
+    },
+];
+const internal = [
+    signedPatternCompile({
+        excludes: true,
+        pattern: [".git", ".DS_Store"],
+        compiled: null,
+    }),
 ];
-const internal = {
-    exclude: [".git", ".DS_Store"],
-    include: [],
-    compiled: null,
-};
-signedPatternCompile(internal);
 /**
  * @since 0.8.1
  */
 export const Deno = {
-    // TODO: Deno should validate manifest
+    async init({ fs, cwd }) {
+        let content;
+        const normalCwd = unixify(cwd);
+        let path;
+        for (const [i, { path: p }] of extractors.entries()) {
+            path = p;
+            try {
+                content = await fs.promises.readFile(normalCwd + "/" + path);
+            }
+            catch (error) {
+                if (error.code === "ENOENT") {
+                    if (i < extractors.length - 1) {
+                        continue;
+                    }
+                }
+                throw new Error("Error while initializing Deno", { cause: error });
+            }
+        }
+        const dist = jsrManifestParse(content.toString());
+        if (dist instanceof type.errors) {
+            throw new Error("Invalid '" + path + "': " + dist.summary, { cause: dist });
+        }
+    },
     extractors,
     ignores(o) {
         return signedPatternIgnores({

package/out/targets/git.js

@@ -9,12 +9,13 @@ const extractors = [
         path: ".git/info/exclude",
     },
 ];
-const internal = {
-    exclude: [".git", ".DS_Store"],
-    include: [],
-    compiled: null,
-};
-signedPatternCompile(internal);
+const internal = [
+    signedPatternCompile({
+        excludes: true,
+        pattern: [".git", ".DS_Store"],
+        compiled: null,
+    }),
+];
 /**
  * @since 0.6.0
  */

package/out/targets/jsr.js

@@ -1,4 +1,7 @@
+import { type } from "arktype";
 import { signedPatternIgnores, signedPatternCompile, extractJsrJson, extractJsrJsonc, } from "../patterns/index.js";
+import { unixify } from "../unixify.js";
+import { jsrManifestParse } from "./jsrManifest.js";
 const extractors = [
     {
         extract: extractJsrJson,
@@ -9,17 +12,40 @@ const extractors = [
         path: "jsr.jsonc",
     },
 ];
-const internal = {
-    exclude: [".git", ".DS_Store"],
-    include: [],
-    compiled: null,
-};
-signedPatternCompile(internal);
+const internal = [
+    signedPatternCompile({
+        excludes: true,
+        pattern: [".git", ".DS_Store"],
+        compiled: null,
+    }),
+];
 /**
  * @since 0.6.0
  */
 export const JSR = {
-    // TODO: JSR should validate manifest
+    async init({ fs, cwd }) {
+        let content;
+        const normalCwd = unixify(cwd);
+        let path;
+        for (const [i, { path: p }] of extractors.entries()) {
+            path = p;
+            try {
+                content = await fs.promises.readFile(normalCwd + "/" + path);
+            }
+            catch (error) {
+                if (error.code === "ENOENT") {
+                    if (i < extractors.length - 1) {
+                        continue;
+                    }
+                }
+                throw new Error("Error while initializing Deno", { cause: error });
+            }
+        }
+        const dist = jsrManifestParse(content.toString());
+        if (dist instanceof type.errors) {
+            throw new Error("Invalid '" + path + "': " + dist.summary, { cause: dist });
+        }
+    },
     extractors,
     ignores(o) {
         return signedPatternIgnores({

package/out/targets/jsrManifest.d.ts

@@ -0,0 +1,10 @@
+export declare const jsrManifest: import("arktype/internal/variants/object.ts").ObjectType<{
+    name: string;
+    version: string;
+    exports: string | Record<string, string>;
+}, {}>;
+export declare const jsrManifestParse: import("arktype/internal/variants/object.ts").ObjectType<(In: string) => import("arktype/internal/attributes.ts").To<{
+    name: string;
+    version: string;
+    exports: string | Record<string, string>;
+}>, {}>;

package/out/targets/jsrManifest.js

@@ -0,0 +1,9 @@
+import { type } from "arktype";
+export const jsrManifest = type({
+    name: "string",
+    version: "string",
+    exports: "string | Record<string, string>",
+});
+export const jsrManifestParse = type("string")
+    .pipe((s) => JSON.parse(s))
+    .pipe(jsrManifest);

package/out/targets/npm.js

@@ -1,4 +1,7 @@
+import { type } from "arktype";
 import { signedPatternIgnores, signedPatternCompile, extractPackageJson, extractGitignore, } from "../patterns/index.js";
+import { unixify } from "../unixify.js";
+import { npmManifestParse } from "./npmManifest.js";
 const extractors = [
     {
         extract: extractPackageJson,
@@ -13,57 +16,86 @@ const extractors = [
         path: ".gitignore",
     },
 ];
-const internal = {
-    exclude: [
-        // https://github.com/npm/npm-packlist/blob/main/lib/index.js#L16
-        ".npmignore",
-        ".gitignore",
-        ".git",
-        ".svn",
-        ".hg",
-        "CVS",
-        ".git",
-        ".svn",
-        ".hg",
-        "CVS",
-        "/.lock-wscript",
-        "/.wafpickle-*",
-        "/build/config.gypi",
-        "npm-debug.log",
-        ".npmrc",
-        ".*.swp",
-        ".DS_Store",
-        "._*",
-        "*.orig",
-        "/archived-packages/**",
-        // https://github.com/npm/npm-packlist/blob/main/lib/index.js#L294
-        "/node_modules",
-        "/package-lock.json",
-        "/yarn.lock",
-        "/pnpm-lock.yaml",
-        "/bun.lockb",
-    ],
-    include: [
-        // https://github.com/npm/npm-packlist/blob/main/lib/index.js#L287
-        "bin",
-        "package.json",
-        "README",
-        "COPYING",
-        "LICENSE",
-        "LICENCE",
-        "README.*",
-        "COPYING.*",
-        "LICENSE.*",
-        "LICENCE.*",
-    ],
-    compiled: null,
+const internalInclude = {
+    excludes: false,
+    pattern: [], // filled within init
+    compiled: [],
 };
-signedPatternCompile(internal);
+const internal = [
+    internalInclude,
+    signedPatternCompile({
+        excludes: true,
+        pattern: [
+            // https://github.com/npm/npm-packlist/blob/main/lib/index.js#L16
+            ".npmignore",
+            ".gitignore",
+            ".git",
+            ".svn",
+            ".hg",
+            "CVS",
+            ".git",
+            ".svn",
+            ".hg",
+            "CVS",
+            "/.lock-wscript",
+            "/.wafpickle-*",
+            "/build/config.gypi",
+            "npm-debug.log",
+            ".npmrc",
+            ".*.swp",
+            ".DS_Store",
+            "._*",
+            "*.orig",
+            "/archived-packages/**",
+            // https://github.com/npm/npm-packlist/blob/main/lib/index.js#L294
+            "/node_modules",
+            "/package-lock.json",
+            "/yarn.lock",
+            "/pnpm-lock.yaml",
+            "/bun.lockb",
+        ],
+        compiled: null,
+    }),
+    signedPatternCompile({
+        excludes: false,
+        pattern: [
+            // https://github.com/npm/npm-packlist/blob/main/lib/index.js#L287
+            "bin",
+            "package.json",
+            "README",
+            "COPYING",
+            "LICENSE",
+            "LICENCE",
+            "README.*",
+            "COPYING.*",
+            "LICENSE.*",
+            "LICENCE.*",
+        ],
+        compiled: null,
+    }),
+];
 /**
  * @since 0.6.0
  */
 export const NPM = {
-    // TODO: NPM should validate package.json
+    async init({ fs, cwd }) {
+        let content;
+        const normalCwd = unixify(cwd);
+        try {
+            content = await fs.promises.readFile(normalCwd + "/" + "package.json");
+        }
+        catch (error) {
+            throw new Error("Error while initializing NPM", { cause: error });
+        }
+        const dist = npmManifestParse(content.toString());
+        if (dist instanceof type.errors) {
+            throw new Error("Invalid 'package.json': " + dist.summary, { cause: dist });
+        }
+        // const set = new Set<string>()
+        // TODO: NPM should include bundled deps
+        // internalInclude.pattern = Array.from(set)
+        // signedPatternCompile(internalInclude, { nocase: true })
+    },
     extractors,
     ignores(o) {
         return signedPatternIgnores({

package/out/targets/npmManifest.d.ts

@@ -0,0 +1,46 @@
+export declare const npmManifest: import("arktype/internal/variants/object.ts").ObjectType<{
+    main?: string | undefined;
+    module?: string | undefined;
+    browser?: string | undefined;
+    files?: string[] | undefined;
+    bin?: string | Record<string, string> | undefined;
+    optionalDependencies?: Record<string, string> | undefined;
+    devDependencies?: Record<string, string> | undefined;
+    dependencies?: Record<string, string> | undefined;
+    bundleDependencies?: string[] | undefined;
+    bundledDependencies?: undefined;
+} | {
+    main?: string | undefined;
+    module?: string | undefined;
+    browser?: string | undefined;
+    files?: string[] | undefined;
+    bin?: string | Record<string, string> | undefined;
+    optionalDependencies?: Record<string, string> | undefined;
+    devDependencies?: Record<string, string> | undefined;
+    dependencies?: Record<string, string> | undefined;
+    bundledDependencies?: string[] | undefined;
+    bundleDependencies?: undefined;
+}, {}>;
+export declare const npmManifestParse: import("arktype/internal/variants/object.ts").ObjectType<(In: string) => import("arktype/internal/attributes.ts").To<{
+    main?: string | undefined;
+    module?: string | undefined;
+    browser?: string | undefined;
+    files?: string[] | undefined;
+    bin?: string | Record<string, string> | undefined;
+    optionalDependencies?: Record<string, string> | undefined;
+    devDependencies?: Record<string, string> | undefined;
+    dependencies?: Record<string, string> | undefined;
+    bundleDependencies?: string[] | undefined;
+    bundledDependencies?: undefined;
+}> | import("arktype/internal/attributes.ts").To<{
+    main?: string | undefined;
+    module?: string | undefined;
+    browser?: string | undefined;
+    files?: string[] | undefined;
+    bin?: string | Record<string, string> | undefined;
+    optionalDependencies?: Record<string, string> | undefined;
+    devDependencies?: Record<string, string> | undefined;
+    dependencies?: Record<string, string> | undefined;
+    bundledDependencies?: string[] | undefined;
+    bundleDependencies?: undefined;
+}>, {}>;

package/out/targets/npmManifest.js

@@ -0,0 +1,23 @@
+import { type } from "arktype";
+const baseManifest = type({
+    "main?": "string",
+    "module?": "string",
+    "browser?": "string",
+    "files?": "string[]",
+    "bin?": "string | Record<string, string>",
+    "optionalDependencies?": "Record<string, string>",
+    "devDependencies?": "Record<string, string>",
+    "dependencies?": "Record<string, string>",
+});
+const withBundle = baseManifest.and({
+    "bundleDependencies?": "string[]",
+    "bundledDependencies?": "never",
+});
+const withBundled = baseManifest.and({
+    "bundledDependencies?": "string[]",
+    "bundleDependencies?": "never",
+});
+export const npmManifest = withBundle.or(withBundled);
+export const npmManifestParse = type("string")
+    .pipe((s) => JSON.parse(s))
+    .pipe(npmManifest);

package/out/targets/vsce.js

@@ -1,4 +1,7 @@
+import { type } from "arktype";
 import { signedPatternIgnores, signedPatternCompile, extractPackageJson, extractGitignore, } from "../patterns/index.js";
+import { unixify } from "../unixify.js";
+import { npmManifest } from "./npmManifest.js";
 const extractors = [
     {
         extract: extractPackageJson,
@@ -13,49 +16,73 @@ const extractors = [
         path: ".gitignore",
     },
 ];
-const internal = {
-    exclude: [
-        // https://github.com/microsoft/vscode-vsce/blob/main/src/package.ts#L1633
-        ".vscodeignore",
-        "package-lock.json",
-        "npm-debug.log",
-        "yarn.lock",
-        "yarn-error.log",
-        "npm-shrinkwrap.json",
-        ".editorconfig",
-        ".npmrc",
-        ".yarnrc",
-        ".gitattributes",
-        "*.todo",
-        "tslint.yaml",
-        ".eslintrc*",
-        ".babelrc*",
-        ".prettierrc*",
-        ".cz-config.js",
-        ".commitlintrc*",
-        "webpack.config.js",
-        "ISSUE_TEMPLATE.md",
-        "CONTRIBUTING.md",
-        "PULL_REQUEST_TEMPLATE.md",
-        "CODE_OF_CONDUCT.md",
-        ".github",
-        ".travis.yml",
-        "appveyor.yml",
-        ".git",
-        "*.vsix",
-        ".DS_Store",
-        "*.vsixmanifest",
-        ".vscode-test",
-        ".vscode-test-web",
-    ],
-    include: [],
-    compiled: null,
-};
-signedPatternCompile(internal);
+const internal = [
+    signedPatternCompile({
+        excludes: true,
+        pattern: [
+            // https://github.com/microsoft/vscode-vsce/blob/main/src/package.ts#L1633
+            ".vscodeignore",
+            "package-lock.json",
+            "npm-debug.log",
+            "yarn.lock",
+            "yarn-error.log",
+            "npm-shrinkwrap.json",
+            ".editorconfig",
+            ".npmrc",
+            ".yarnrc",
+            ".gitattributes",
+            "*.todo",
+            "tslint.yaml",
+            ".eslintrc*",
+            ".babelrc*",
+            ".prettierrc*",
+            ".cz-config.js",
+            ".commitlintrc*",
+            "webpack.config.js",
+            "ISSUE_TEMPLATE.md",
+            "CONTRIBUTING.md",
+            "PULL_REQUEST_TEMPLATE.md",
+            "CODE_OF_CONDUCT.md",
+            ".github",
+            ".travis.yml",
+            "appveyor.yml",
+            ".git",
+            "*.vsix",
+            ".DS_Store",
+            "*.vsixmanifest",
+            ".vscode-test",
+            ".vscode-test-web",
+        ],
+        compiled: null,
+    }),
+];
+const vsceManifest = npmManifest.and({
+    engines: {
+        // https://github.com/microsoft/vscode-vsce/blob/main/src/validation.ts#L52
+        vscode: "/^\\*$|^(\\^|>=)?((\\d+)|x)\\.((\\d+)|x)\\.((\\d+)|x)(\\-.*)?$/",
+    },
+});
+const vsceManifestParse = type("string")
+    .pipe((s) => JSON.parse(s))
+    .pipe(vsceManifest);
 /**
  * @since 0.6.0
  */
 export const VSCE = {
+    async init({ fs, cwd }) {
+        let content;
+        const normalCwd = unixify(cwd);
+        try {
+            content = await fs.promises.readFile(normalCwd + "/" + "package.json");
+        }
+        catch (error) {
+            throw new Error("Error while initializing VSCE", { cause: error });
+        }
+        const dist = vsceManifestParse(content.toString());
+        if (dist instanceof type.errors) {
+            throw new Error("Invalid 'package.json': " + dist.summary, { cause: dist });
+        }
+    },
     extractors,
     ignores(o) {
         return signedPatternIgnores({

package/out/targets/yarn.js

@@ -1,6 +1,7 @@
 import { type } from "arktype";
 import { signedPatternIgnores, signedPatternCompile, extractPackageJsonNocase, extractGitignoreNocase, } from "../patterns/index.js";
 import { join, unixify } from "../unixify.js";
+import { npmManifestParse } from "./npmManifest.js";
 const extractors = [
     {
         extract: extractPackageJsonNocase,
@@ -15,42 +16,44 @@ const extractors = [
         path: ".gitignore",
     },
 ];
-const include = [
-    // https://github.com/yarnpkg/berry/blob/master/packages/plugin-pack/sources/packUtils.ts#L10
-    "/package.json",
-    "/README",
-    "/README.*",
-    "/LICENSE",
-    "/LICENSE.*",
-    "/LICENCE",
-    "/LICENCE.*",
-];
-const internal = {
-    exclude: [
-        // https://github.com/yarnpkg/berry/blob/master/packages/plugin-pack/sources/packUtils.ts#L26
-        "/package.tgz",
-        ".github",
-        ".git",
-        ".hg",
-        "node_modules",
-        ".npmignore",
-        ".gitignore",
-        ".#*",
-        ".DS_Store",
-    ],
-    include: [...include],
-    compiled: null,
+const internalInclude = {
+    excludes: false,
+    pattern: [],
+    compiled: [],
 };
-signedPatternCompile(internal, { nocase: true });
-const npmManifest = type({
-    "main?": "string",
-    "module?": "string",
-    "browser?": "string",
-    "bin?": "string | Record<string, string>",
-});
-const parse = type("string")
-    .pipe((s) => JSON.parse(s))
-    .pipe(npmManifest);
+const internal = [
+    internalInclude,
+    signedPatternCompile({
+        excludes: true,
+        pattern: [
+            // https://github.com/yarnpkg/berry/blob/master/packages/plugin-pack/sources/packUtils.ts#L26
+            "/package.tgz",
+            ".github",
+            ".git",
+            ".hg",
+            "node_modules",
+            ".npmignore",
+            ".gitignore",
+            ".#*",
+            ".DS_Store",
+        ],
+        compiled: null,
+    }),
+    signedPatternCompile({
+        excludes: false,
+        pattern: [
+            // https://github.com/yarnpkg/berry/blob/master/packages/plugin-pack/sources/packUtils.ts#L10
+            "/package.json",
+            "/README",
+            "/README.*",
+            "/LICENSE",
+            "/LICENSE.*",
+            "/LICENCE",
+            "/LICENCE.*",
+        ],
+        compiled: null,
+    }, { nocase: true }),
+];
 /**
  * @since 0.6.0
  */
@@ -62,17 +65,14 @@ export const Yarn = {
             content = await fs.promises.readFile(normalCwd + "/" + "package.json");
         }
         catch (error) {
-            if (error.code === "ENOENT") {
-                return; // no package.json
-            }
-            throw new Error("Error while initializing Yarn's ignoring implementation", { cause: error });
+            throw new Error("Error while initializing Yarn", { cause: error });
         }
-        const dist = parse(content.toString());
+        const dist = npmManifestParse(content.toString());
         if (dist instanceof type.errors) {
             throw new Error("Invalid 'package.json': " + dist.summary, { cause: dist });
         }
         // https://github.com/yarnpkg/berry/blob/master/packages/plugin-pack/sources/packUtils.ts#L215-L231
-        const set = new Set(include);
+        const set = new Set();
         function normal(path) {
             const result = unixify(join(normalCwd, path)).substring(normalCwd.length);
             return result;
@@ -89,9 +89,8 @@ export const Yarn = {
         else if (typeof dist.bin === "object" && dist.bin !== null) {
             Object.values(dist.bin).forEach((binPath) => set.add(normal(binPath)));
         }
-        internal.include.length = 0;
-        internal.include.push(...set);
-        signedPatternCompile(internal, { nocase: true });
+        internalInclude.pattern = Array.from(set);
+        signedPatternCompile(internalInclude, { nocase: true });
     },
     extractors,
     ignores(o) {