@illumine/npm-diff 0.0.1 → 0.2.0

package/README.md

@@ -0,0 +1,26 @@
+# @illumine/npm-diff
+
+Diff two versions of an npm package in VS Code, unminified and formatted.
+
+## CLI
+
+```sh
+npx @illumine/npm-diff react 18.2.0 18.3.0
+```
+
+Omit the versions to pick them interactively. Opens VS Code with the
+[compare-folders](https://marketplace.visualstudio.com/items?itemName=moshfeu.compare-folders)
+extension, so a `code` CLI on your `PATH` is required.
+
+## Options
+
+| Option            | Description                                    | Default                       |
+| ----------------- | ---------------------------------------------- | ----------------------------- |
+| `-r, --registry`  | npm registry to query.                         | `https://registry.npmjs.org`  |
+| `-w, --workspace` | Directory to place the two versions.           | a temp dir, removed on exit   |
+| `-u, --unminify`  | Unminify sources before diffing.               | off                           |
+| `-p, --pattern`   | Compare only files matching this glob (repeat for more). | all files            |
+
+## License
+
+MIT

package/lib/index.cjs

@@ -5,15 +5,17 @@ var extraTypings = require('@commander-js/extra-typings');
 var zx = require('zx');
 var path = require('path');
 var semver = require('semver');
-var tar = require('tar');
 var prompts = require('@inquirer/prompts');
 var promises = require('fs/promises');
 var unminify = require('@illumine/unminify');
 var oxfmt = require('oxfmt');
+var picomatch = require('picomatch');
+var tar = require('tar');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var semver__default = /*#__PURE__*/_interopDefault(semver);
+var picomatch__default = /*#__PURE__*/_interopDefault(picomatch);
 
 // src/error.ts
 var CliError = class extends Error {
@@ -69,13 +71,34 @@ async function formatTree(dir) {
     try {
       const { code: formatted } = await oxfmt.format(path.basename(file), code, {
         tabWidth: 2,
-        printWidth: 120
+        printWidth: 100
       });
       await promises.writeFile(file, formatted);
     } catch {
     }
   }
 }
+async function unpack(tarball, dir, patterns) {
+  const isMatch = compilePattern(patterns);
+  const filter = isMatch ? (path) => {
+    const rel = path.split("/").slice(1).join("/");
+    return rel !== "" && isMatch(rel);
+  } : void 0;
+  await tar.extract({ file: tarball, cwd: dir, strip: 1, filter });
+  await promises.rm(tarball);
+}
+function compilePattern(patterns) {
+  if (patterns.length === 0) return void 0;
+  const include = [];
+  const ignore = [];
+  for (const pattern of patterns) {
+    const negated = pattern.startsWith("!");
+    const base = (negated ? pattern.slice(1) : pattern).replace(/\/+$/, "");
+    const target = negated ? ignore : include;
+    target.push(base, `${base}/**`);
+  }
+  return picomatch__default.default(include.length ? include : "**", { dot: true, ignore });
+}
 var EXTENSION_ID = "moshfeu.compare-folders";
 async function ensureVscode() {
   const code = await zx.which("code", { nothrow: true });
@@ -105,32 +128,41 @@ async function launchDiff(left, right) {
 
 // src/npm-diff.ts
 var NpmDiff = class {
-  constructor(pkg, registry = DEFAULT_REGISTRY) {
+  constructor(pkg, options = {}) {
     this.pkg = pkg;
-    this.registry = registry;
+    this.registry = options.registry ?? DEFAULT_REGISTRY;
+    this.workdir = options.workspace ? path.resolve(options.workspace) : zx.tmpdir("npmdiff-");
+    this.clean = options.workspace === void 0;
+    this.unminify = options.unminify ?? false;
+    this.patterns = options.pattern ?? [];
   }
   pkg;
-  registry;
   packument;
-  workdir = zx.tmpdir("npmdiff-");
+  registry;
+  workdir;
+  clean;
+  unminify;
+  patterns;
   async run(specA, specB) {
     await ensureVscode();
     this.packument = await zx.spinner(
       `Fetching '${this.pkg}' from npm\u2026`,
       () => fetchPackument(this.pkg, this.registry)
     );
-    const [left, right] = specA && specB ? sortVersions(this.resolve(specA), this.resolve(specB)) : await this.pickVersions(specA);
-    if (left === right) {
-      throw new CliError(`Both specs resolve to ${left} \u2014 there is nothing to diff.`);
+    const [versionA, versionB] = specA && specB ? sortVersions(this.resolve(specA), this.resolve(specB)) : await this.pickVersions(specA);
+    if (versionA === versionB) {
+      throw new CliError(`Both specs resolve to ${versionA} \u2014 there is nothing to diff.`);
     }
     try {
-      await this.prepare(left);
-      await this.prepare(right);
-      console.log(zx.chalk.green(`Opening VS Code to diff ${this.pkg} ${left} \u2194 ${right}`));
-      await launchDiff(path.join(this.workdir, left), path.join(this.workdir, right));
-      console.log(zx.chalk.dim("VS Code closed \u2014 cleaning up temporary files."));
+      const left = await this.prepare(versionA);
+      const right = await this.prepare(versionB);
+      console.log(zx.chalk.green(`Opening VS Code to diff ${this.pkg} ${versionA} \u2194 ${versionB}`));
+      await launchDiff(left, right);
+      console.log(
+        this.clean ? zx.chalk.dim("VS Code closed \u2014 cleaning up temporary files.") : zx.chalk.dim(`VS Code closed \u2014 files kept in ${this.workdir}`)
+      );
     } finally {
-      await zx.fs.remove(this.workdir);
+      if (this.clean) await zx.fs.remove(this.workdir);
     }
   }
   /** Resolve a version or dist-tag into a concrete published version. */
@@ -160,27 +192,30 @@ var NpmDiff = class {
     const dir = path.join(this.workdir, version);
     await zx.fs.mkdirp(dir);
     const tarball = await zx.spinner(`Downloading ${label}`, () => this.download(version, dir));
-    await zx.spinner(`Unpacking ${label}`, () => this.unpack(tarball, dir));
-    await zx.spinner(`Unminifying ${label}`, () => unminifyTree(dir));
+    await zx.spinner(`Unpacking ${label}`, () => unpack(tarball, dir, this.patterns));
+    if (this.unminify) await zx.spinner(`Unminifying ${label}`, () => unminifyTree(dir));
     await zx.spinner(`Formatting ${label}`, () => formatTree(dir));
+    return dir;
   }
   async download(version, dir) {
     const { stdout } = await zx.$`npm pack ${this.pkg}@${version} --registry ${this.registry} --pack-destination ${dir} --json`;
     const [{ filename }] = JSON.parse(stdout);
     return path.join(dir, filename);
   }
-  async unpack(tarball, dir) {
-    await tar.extract({ file: tarball, cwd: dir, strip: 1 });
-    await zx.fs.remove(tarball);
-  }
 };
 
 // src/index.ts
 zx.$.verbose = false;
 var program = new extraTypings.Command();
-program.name("npmdiff").description("Diff two versions of an npm package in VS Code, unminified and formatted").argument("<pkgname>", "npm package name (scoped names supported)").argument("[spec-a]", "a version or dist-tag").argument("[spec-b]", "a version or dist-tag").option("--registry <url>", "npm registry to query", DEFAULT_REGISTRY).action(
-  (pkgname, specA, specB, options) => new NpmDiff(pkgname, options.registry).run(specA, specB)
-);
+program.name("npmdiff").description("Diff two versions of an npm package in VS Code, unminified and formatted").argument("<pkgname>", "npm package name (scoped names supported)").argument("[spec-a]", "a version or dist-tag").argument("[spec-b]", "a version or dist-tag").option("-r, --registry <url>", "npm registry to query", DEFAULT_REGISTRY).option(
+  "-w, --workspace <dir>",
+  "directory to place the two versions; kept instead of auto-cleaned when set"
+).option("-u, --unminify", "unminify sources before diffing", false).option(
+  "-p, --pattern <glob>",
+  "compare only files matching this glob; repeat for more",
+  (value, previous) => [...previous, value],
+  []
+).action((pkgname, specA, specB, options) => new NpmDiff(pkgname, options).run(specA, specB));
 program.parseAsync().catch((error) => {
   if (error instanceof CliError) {
     console.error(zx.chalk.red(error.message));

package/lib/index.js

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 import { Command } from '@commander-js/extra-typings';
 import { $, chalk, tmpdir, spinner, fs, which, glob } from 'zx';
-import { join, basename } from 'path';
+import { resolve, join, basename } from 'path';
 import semver from 'semver';
-import { extract } from 'tar';
 import { confirm, search } from '@inquirer/prompts';
-import { readFile, writeFile } from 'fs/promises';
+import { rm, readFile, writeFile } from 'fs/promises';
 import { unminify } from '@illumine/unminify';
 import { format } from 'oxfmt';
+import picomatch from 'picomatch';
+import { extract } from 'tar';
 
 // src/error.ts
 var CliError = class extends Error {
@@ -63,13 +64,34 @@ async function formatTree(dir) {
     try {
       const { code: formatted } = await format(basename(file), code, {
         tabWidth: 2,
-        printWidth: 120
+        printWidth: 100
       });
       await writeFile(file, formatted);
     } catch {
     }
   }
 }
+async function unpack(tarball, dir, patterns) {
+  const isMatch = compilePattern(patterns);
+  const filter = isMatch ? (path) => {
+    const rel = path.split("/").slice(1).join("/");
+    return rel !== "" && isMatch(rel);
+  } : void 0;
+  await extract({ file: tarball, cwd: dir, strip: 1, filter });
+  await rm(tarball);
+}
+function compilePattern(patterns) {
+  if (patterns.length === 0) return void 0;
+  const include = [];
+  const ignore = [];
+  for (const pattern of patterns) {
+    const negated = pattern.startsWith("!");
+    const base = (negated ? pattern.slice(1) : pattern).replace(/\/+$/, "");
+    const target = negated ? ignore : include;
+    target.push(base, `${base}/**`);
+  }
+  return picomatch(include.length ? include : "**", { dot: true, ignore });
+}
 var EXTENSION_ID = "moshfeu.compare-folders";
 async function ensureVscode() {
   const code = await which("code", { nothrow: true });
@@ -99,32 +121,41 @@ async function launchDiff(left, right) {
 
 // src/npm-diff.ts
 var NpmDiff = class {
-  constructor(pkg, registry = DEFAULT_REGISTRY) {
+  constructor(pkg, options = {}) {
     this.pkg = pkg;
-    this.registry = registry;
+    this.registry = options.registry ?? DEFAULT_REGISTRY;
+    this.workdir = options.workspace ? resolve(options.workspace) : tmpdir("npmdiff-");
+    this.clean = options.workspace === void 0;
+    this.unminify = options.unminify ?? false;
+    this.patterns = options.pattern ?? [];
   }
   pkg;
-  registry;
   packument;
-  workdir = tmpdir("npmdiff-");
+  registry;
+  workdir;
+  clean;
+  unminify;
+  patterns;
   async run(specA, specB) {
     await ensureVscode();
     this.packument = await spinner(
       `Fetching '${this.pkg}' from npm\u2026`,
       () => fetchPackument(this.pkg, this.registry)
     );
-    const [left, right] = specA && specB ? sortVersions(this.resolve(specA), this.resolve(specB)) : await this.pickVersions(specA);
-    if (left === right) {
-      throw new CliError(`Both specs resolve to ${left} \u2014 there is nothing to diff.`);
+    const [versionA, versionB] = specA && specB ? sortVersions(this.resolve(specA), this.resolve(specB)) : await this.pickVersions(specA);
+    if (versionA === versionB) {
+      throw new CliError(`Both specs resolve to ${versionA} \u2014 there is nothing to diff.`);
     }
     try {
-      await this.prepare(left);
-      await this.prepare(right);
-      console.log(chalk.green(`Opening VS Code to diff ${this.pkg} ${left} \u2194 ${right}`));
-      await launchDiff(join(this.workdir, left), join(this.workdir, right));
-      console.log(chalk.dim("VS Code closed \u2014 cleaning up temporary files."));
+      const left = await this.prepare(versionA);
+      const right = await this.prepare(versionB);
+      console.log(chalk.green(`Opening VS Code to diff ${this.pkg} ${versionA} \u2194 ${versionB}`));
+      await launchDiff(left, right);
+      console.log(
+        this.clean ? chalk.dim("VS Code closed \u2014 cleaning up temporary files.") : chalk.dim(`VS Code closed \u2014 files kept in ${this.workdir}`)
+      );
     } finally {
-      await fs.remove(this.workdir);
+      if (this.clean) await fs.remove(this.workdir);
     }
   }
   /** Resolve a version or dist-tag into a concrete published version. */
@@ -154,27 +185,30 @@ var NpmDiff = class {
     const dir = join(this.workdir, version);
     await fs.mkdirp(dir);
     const tarball = await spinner(`Downloading ${label}`, () => this.download(version, dir));
-    await spinner(`Unpacking ${label}`, () => this.unpack(tarball, dir));
-    await spinner(`Unminifying ${label}`, () => unminifyTree(dir));
+    await spinner(`Unpacking ${label}`, () => unpack(tarball, dir, this.patterns));
+    if (this.unminify) await spinner(`Unminifying ${label}`, () => unminifyTree(dir));
     await spinner(`Formatting ${label}`, () => formatTree(dir));
+    return dir;
   }
   async download(version, dir) {
     const { stdout } = await $`npm pack ${this.pkg}@${version} --registry ${this.registry} --pack-destination ${dir} --json`;
     const [{ filename }] = JSON.parse(stdout);
     return join(dir, filename);
   }
-  async unpack(tarball, dir) {
-    await extract({ file: tarball, cwd: dir, strip: 1 });
-    await fs.remove(tarball);
-  }
 };
 
 // src/index.ts
 $.verbose = false;
 var program = new Command();
-program.name("npmdiff").description("Diff two versions of an npm package in VS Code, unminified and formatted").argument("<pkgname>", "npm package name (scoped names supported)").argument("[spec-a]", "a version or dist-tag").argument("[spec-b]", "a version or dist-tag").option("--registry <url>", "npm registry to query", DEFAULT_REGISTRY).action(
-  (pkgname, specA, specB, options) => new NpmDiff(pkgname, options.registry).run(specA, specB)
-);
+program.name("npmdiff").description("Diff two versions of an npm package in VS Code, unminified and formatted").argument("<pkgname>", "npm package name (scoped names supported)").argument("[spec-a]", "a version or dist-tag").argument("[spec-b]", "a version or dist-tag").option("-r, --registry <url>", "npm registry to query", DEFAULT_REGISTRY).option(
+  "-w, --workspace <dir>",
+  "directory to place the two versions; kept instead of auto-cleaned when set"
+).option("-u, --unminify", "unminify sources before diffing", false).option(
+  "-p, --pattern <glob>",
+  "compare only files matching this glob; repeat for more",
+  (value, previous) => [...previous, value],
+  []
+).action((pkgname, specA, specB, options) => new NpmDiff(pkgname, options).run(specA, specB));
 program.parseAsync().catch((error) => {
   if (error instanceof CliError) {
     console.error(chalk.red(error.message));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@illumine/npm-diff",
-  "version": "0.0.1",
+  "version": "0.2.0",
   "description": "Diff two versions of an npm package in VS Code, unminified and formatted",
   "type": "module",
   "bin": {
@@ -36,6 +36,7 @@
     "@commander-js/extra-typings": "^15.0.0",
     "commander": "^15.0.0",
     "oxfmt": "~0.53.0",
+    "picomatch": "^4.0.5",
     "semver": "^7.8.5",
     "tar": "^7.5.19",
     "zx": "^8.8.5",