@pagepocket/cli 0.11.0 → 0.12.0

package/dist/services/user-packages/user-package-store.js

@@ -1,71 +1,32 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserPackageStore = void 0;
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_module_1 = require("node:module");
-const node_path_1 = __importDefault(require("node:path"));
-const node_url_1 = require("node:url");
-const parse_json_1 = require("../../utils/parse-json");
-const isRecord = (value) => {
-    return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-};
+import fs from "node:fs";
+import { createRequire } from "node:module";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+import { parseJson } from "../../utils/parse-json.js";
+const isRecord = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
 const isStringRecord = (value) => {
     if (!value || typeof value !== "object" || Array.isArray(value)) {
         return false;
     }
-    return Object.values(value).every((v) => typeof v === "string");
+    return Object.values(value).every((entryValue) => typeof entryValue === "string");
 };
-class UserPackageStore {
+export class UserPackageStore {
+    configService;
+    kind;
     constructor(configService, kind) {
         this.configService = configService;
         this.kind = kind;
     }
     getInstallDir() {
-        return node_path_1.default.join(this.configService.getDataDir(), this.kind);
+        return path.join(this.configService.getDataDir(), this.kind);
     }
     ensureInstallDir() {
-        node_fs_1.default.mkdirSync(this.getInstallDir(), { recursive: true });
+        fs.mkdirSync(this.getInstallDir(), { recursive: true });
     }
     ensureInstallDirPackageJson(packageJsonName) {
         this.ensureInstallDir();
-        const pkgJsonPath = node_path_1.default.join(this.getInstallDir(), "package.json");
-        if (node_fs_1.default.existsSync(pkgJsonPath)) {
+        const pkgJsonPath = path.join(this.getInstallDir(), "package.json");
+        if (fs.existsSync(pkgJsonPath)) {
             return pkgJsonPath;
         }
         const pkgJson = {
@@ -73,12 +34,12 @@ class UserPackageStore {
             private: true,
             version: "0.0.0"
         };
-        node_fs_1.default.writeFileSync(pkgJsonPath, `${JSON.stringify(pkgJson, undefined, 2)}\n`, "utf8");
+        fs.writeFileSync(pkgJsonPath, `${JSON.stringify(pkgJson, undefined, 2)}\n`, "utf8");
         return pkgJsonPath;
     }
     createRequire(packageJsonName) {
         const pkgJsonPath = this.ensureInstallDirPackageJson(packageJsonName);
-        return (0, node_module_1.createRequire)(pkgJsonPath);
+        return createRequire(pkgJsonPath);
     }
     resolveInstalledPackageJsonPath(packageJsonName, packageName) {
         const req = this.createRequire(packageJsonName);
@@ -87,16 +48,18 @@ class UserPackageStore {
     readInstalledPackageMeta(packageJsonName, packageName) {
         try {
             const pkgJsonPath = this.resolveInstalledPackageJsonPath(packageJsonName, packageName);
-            const text = node_fs_1.default.readFileSync(pkgJsonPath, "utf8");
-            const json = (0, parse_json_1.parseJson)(text);
+            const text = fs.readFileSync(pkgJsonPath, "utf8");
+            const json = parseJson(text);
             if (!json.ok || !isRecord(json.value)) {
                 return { name: packageName };
             }
-            const o = json.value;
+            const packageJsonRecord = json.value;
             return {
-                name: typeof o.name === "string" ? o.name : packageName,
-                description: typeof o.description === "string" ? o.description : undefined,
-                version: typeof o.version === "string" ? o.version : undefined
+                name: typeof packageJsonRecord.name === "string" ? packageJsonRecord.name : packageName,
+                description: typeof packageJsonRecord.description === "string"
+                    ? packageJsonRecord.description
+                    : undefined,
+                version: typeof packageJsonRecord.version === "string" ? packageJsonRecord.version : undefined
             };
         }
         catch {
@@ -105,8 +68,8 @@ class UserPackageStore {
     }
     readInstalledDependencyVersions(packageJsonName) {
         const pkgJsonPath = this.ensureInstallDirPackageJson(packageJsonName);
-        const text = node_fs_1.default.readFileSync(pkgJsonPath, "utf8");
-        const parsed = (0, parse_json_1.parseJson)(text);
+        const text = fs.readFileSync(pkgJsonPath, "utf8");
+        const parsed = parseJson(text);
         if (!parsed.ok || !isRecord(parsed.value)) {
             return {};
         }
@@ -119,8 +82,7 @@ class UserPackageStore {
     async importModule(packageJsonName, packageName) {
         const req = this.createRequire(packageJsonName);
         const resolved = req.resolve(packageName);
-        const mod = await Promise.resolve(`${(0, node_url_1.pathToFileURL)(resolved).href}`).then(s => __importStar(require(s)));
+        const mod = await import(pathToFileURL(resolved).href);
         return isRecord(mod) ? mod : {};
     }
 }
-exports.UserPackageStore = UserPackageStore;

package/dist/stages/prepare-output.js

@@ -1,18 +1,11 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareOutputDir = void 0;
-const node_path_1 = __importDefault(require("node:path"));
-const filename_1 = require("../lib/filename");
-const prepareOutputDir = async (title, outputFlag) => {
-    const safeTitle = (0, filename_1.safeFilename)(title || "snapshot");
-    const baseDir = outputFlag ? node_path_1.default.resolve(outputFlag) : process.cwd();
-    const outputDir = node_path_1.default.join(baseDir, safeTitle);
+import path from "node:path";
+import { safeFilename } from "../lib/filename.js";
+export const prepareOutputDir = async (title, outputFlag) => {
+    const safeTitle = safeFilename(title || "snapshot");
+    const baseDir = outputFlag ? path.resolve(outputFlag) : process.cwd();
+    const outputDir = path.join(baseDir, safeTitle);
     return {
         safeTitle,
         outputDir
     };
 };
-exports.prepareOutputDir = prepareOutputDir;

package/dist/units/network-observer-unit.js

@@ -1,24 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NetworkObserverUnit = void 0;
-const contracts_1 = require("@pagepocket/contracts");
-const lib_1 = require("@pagepocket/lib");
+import { NETWORK } from "@pagepocket/contracts";
+import { Unit } from "@pagepocket/lib";
 /**
  * Observes the network@1 channel and forwards events to user-provided callbacks.
  *
  * This unit is intentionally UI-agnostic (no CLI/spinner coupling).
  */
-class NetworkObserverUnit extends lib_1.Unit {
+export class NetworkObserverUnit extends Unit {
+    id = "networkObserver";
+    kind = "observe.network";
+    config;
     constructor(config = {}) {
         super();
-        this.id = "networkObserver";
-        this.kind = "observe.network";
         this.config = config;
     }
     async run(_ctx, rt) {
         const config = this.config;
         const task = (async () => {
-            for await (const event of rt.subscribe(contracts_1.NETWORK)) {
+            for await (const event of rt.subscribe(NETWORK)) {
                 await config.onEvent?.(event);
                 if (event.type === "request") {
                     await config.onRequest?.(event);
@@ -34,4 +32,3 @@ class NetworkObserverUnit extends lib_1.Unit {
         rt.defer(task);
     }
 }
-exports.NetworkObserverUnit = NetworkObserverUnit;

package/dist/utils/array.js

@@ -1,7 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.uniq = void 0;
-const uniq = (items) => {
-    return [...new Set(items)];
-};
-exports.uniq = uniq;
+export const uniq = (items) => [...new Set(items)];

package/dist/utils/normalize-argv.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeArgv = exports.isUrlLike = void 0;
-const isUrlLike = (value) => {
+export const isUrlLike = (value) => {
     try {
         const url = new URL(value);
         return url.protocol === "http:" || url.protocol === "https:";
@@ -10,8 +7,7 @@ const isUrlLike = (value) => {
         return false;
     }
 };
-exports.isUrlLike = isUrlLike;
-const normalizeArgv = (argv) => {
+export const normalizeArgv = (argv) => {
     // pnpm forwards args to scripts by inserting a literal `--`.
     // oclif does not treat that as a flag; strip it if present.
     if (argv[0] === "--") {
@@ -22,9 +18,8 @@ const normalizeArgv = (argv) => {
     }
     const first = argv[0];
     // If the first token is a URL, treat it as implicit `archive`.
-    if (first && (0, exports.isUrlLike)(first)) {
+    if (first && isUrlLike(first)) {
         return ["archive", ...argv];
     }
     return argv;
 };
-exports.normalizeArgv = normalizeArgv;

package/dist/utils/parse-json.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseJson = void 0;
 const toErrorMessage = (value) => {
     if (value instanceof Error) {
         return value.message;
@@ -13,7 +10,7 @@ const toErrorMessage = (value) => {
     }
     return JSON.stringify(value);
 };
-const parseJson = (text) => {
+export const parseJson = (text) => {
     try {
         return { ok: true, value: JSON.parse(text) };
     }
@@ -21,4 +18,3 @@ const parseJson = (text) => {
         return { ok: false, error: new Error(toErrorMessage(e)) };
     }
 };
-exports.parseJson = parseJson;

package/dist/utils/parse-plugin-options.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsePluginOptions = void 0;
 /**
  * Parse plugin options from argv tokens.
  *
  * Usage:
  * const parsed = parsePluginOptions(["--option-mode", "strict"]);
  */
-const parsePluginOptions = (argv) => {
+export const parsePluginOptions = (argv) => {
     const tokens = argv.filter(Boolean);
     const pairs = tokens
         .map((t, i) => ({ t, next: tokens[i + 1] }))
@@ -45,4 +42,3 @@ const parsePluginOptions = (argv) => {
     }
     return { kind: "none" };
 };
-exports.parsePluginOptions = parsePluginOptions;

package/dist/utils/parse-plugin-spec.js

@@ -1,17 +1,12 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsePluginSpec = void 0;
-const node_path_1 = __importDefault(require("node:path"));
-const node_module_1 = require("node:module");
-const parsePluginSpec = (spec) => {
+import { createRequire } from "node:module";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+export const parsePluginSpec = (spec) => {
     const trimmed = spec.trim();
     if (!trimmed) {
         throw new Error("plugin spec is empty");
     }
-    const req = (0, node_module_1.createRequire)(typeof __filename === "string" ? __filename : node_path_1.default.join(process.cwd(), "package.json"));
+    const req = createRequire(import.meta.url ? fileURLToPath(import.meta.url) : path.join(process.cwd(), "package.json"));
     const npa = req("npm-package-arg");
     const parsed = npa(trimmed);
     if (!parsed || typeof parsed.name !== "string" || !parsed.name) {
@@ -19,4 +14,3 @@ const parsePluginSpec = (spec) => {
     }
     return { name: parsed.name, spec: trimmed };
 };
-exports.parsePluginSpec = parsePluginSpec;

package/dist/utils/validate-plugin-default-export.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validatePluginDefaultExport = void 0;
 const isRecord = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
 const isPagePocketPlugin = (value) => {
     if (!isRecord(value)) {
@@ -23,7 +20,7 @@ const toError = (value) => {
     }
     return new Error(typeof value === "string" ? value : JSON.stringify(value));
 };
-const validatePluginDefaultExport = (input) => {
+export const validatePluginDefaultExport = (input) => {
     const { pluginName, moduleExports, options } = input;
     const defaultExport = moduleExports.default;
     if (typeof defaultExport !== "function") {
@@ -51,4 +48,3 @@ const validatePluginDefaultExport = (input) => {
         return { ok: false, error: toError(e) };
     }
 };
-exports.validatePluginDefaultExport = validatePluginDefaultExport;

package/dist/utils/with-spinner.js

@@ -1,12 +1,6 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withSpinner = void 0;
-const ora_1 = __importDefault(require("ora"));
-const withSpinner = async (run, spinnerText) => {
-    const spinner = (0, ora_1.default)(spinnerText).start();
+import ora from "ora";
+export const withSpinner = async (run, spinnerText) => {
+    const spinner = ora(spinnerText).start();
     try {
         const result = await run(spinner);
         spinner.succeed(spinnerText.replace(/\.$/, "") || spinnerText);
@@ -17,4 +11,3 @@ const withSpinner = async (run, spinnerText) => {
         throw error;
     }
 };
-exports.withSpinner = withSpinner;

package/dist/view.js

@@ -1,25 +1,19 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createViewServer = void 0;
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_path_1 = __importDefault(require("node:path"));
-const koa_1 = __importDefault(require("koa"));
-const koa_send_1 = __importDefault(require("koa-send"));
-const koa_static_1 = __importDefault(require("koa-static"));
-const createViewServer = async (args) => {
-    const indexPath = node_path_1.default.join(args.rootDir, "index.html");
-    const stat = await node_fs_1.default.promises.stat(args.rootDir).catch(() => undefined);
+import fs from "node:fs";
+import path from "node:path";
+import Koa from "koa";
+import send from "koa-send";
+import serve from "koa-static";
+export const createViewServer = async (args) => {
+    const indexPath = path.join(args.rootDir, "index.html");
+    const stat = await fs.promises.stat(args.rootDir).catch(() => undefined);
     if (!stat || !stat.isDirectory()) {
         throw new Error(`view: directory not found: ${args.rootDir}`);
     }
-    const indexStat = await node_fs_1.default.promises.stat(indexPath).catch(() => undefined);
+    const indexStat = await fs.promises.stat(indexPath).catch(() => undefined);
     if (!indexStat || !indexStat.isFile()) {
         throw new Error(`view: index.html not found under: ${args.rootDir}`);
     }
-    const app = new koa_1.default();
+    const app = new Koa();
     // Avoid Koa's generator-function detection (and its dependency chain) by
     // not calling `app.use()`.
     //
@@ -27,18 +21,18 @@ const createViewServer = async (args) => {
     // `is-generator-function` can break ("getGeneratorFunction is not a function")
     // when it tries to require `generator-function`. We don't need generator
     // middleware support here, so bypass it entirely.
-    const staticMw = (0, koa_static_1.default)(args.rootDir, { index: false });
+    const staticMw = serve(args.rootDir, { index: false });
     app.middleware.push(staticMw);
     app.middleware.push(async (ctx) => {
         // SPA fallback (anything not matched by static middleware)
         ctx.status = 200;
-        await (0, koa_send_1.default)(ctx, "index.html", {
+        await send(ctx, "index.html", {
             root: args.rootDir
         });
     });
     const server = await new Promise((resolve, reject) => {
-        const s = app.listen(args.port, args.host, () => resolve(s));
-        s.on("error", reject);
+        const httpServer = app.listen(args.port, args.host, () => resolve(httpServer));
+        httpServer.on("error", reject);
     });
     const address = server.address();
     const port = typeof address === "object" && address ? address.port : args.port;
@@ -53,4 +47,3 @@ const createViewServer = async (args) => {
         }
     };
 };
-exports.createViewServer = createViewServer;

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@pagepocket/cli",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "CLI for capturing offline snapshots of web pages.",
+  "type": "module",
   "main": "dist/index.js",
   "bin": {
     "pp": "dist/index.js"
@@ -21,22 +22,25 @@
     "koa-static": "^5.0.0",
     "npm-package-arg": "^13.0.2",
     "ora": "^9.0.0",
-    "@pagepocket/build-snapshot-unit": "0.11.0",
-    "@pagepocket/capture-http-lighterceptor-unit": "0.11.0",
-    "@pagepocket/capture-http-cdp-unit": "0.11.0",
-    "@pagepocket/capture-http-puppeteer-unit": "0.11.0",
-    "@pagepocket/contracts": "0.11.0",
-    "@pagepocket/lib": "0.11.0",
-    "@pagepocket/builtin-strategy": "0.11.0",
-    "@pagepocket/plugin-yt-dlp": "0.11.0",
-    "@pagepocket/single-file-unit": "0.11.0",
-    "@pagepocket/write-down-unit": "0.11.0"
+    "@pagepocket/main-content-unit": "0.12.0",
+    "@pagepocket/build-snapshot-unit": "0.12.0",
+    "@pagepocket/capture-http-cdp-unit": "0.12.0",
+    "@pagepocket/capture-http-lighterceptor-unit": "0.12.0",
+    "@pagepocket/capture-http-puppeteer-unit": "0.12.0",
+    "@pagepocket/contracts": "0.12.0",
+    "@pagepocket/builtin-strategy": "0.12.0",
+    "@pagepocket/lib": "0.12.0",
+    "@pagepocket/plugin-yt-dlp": "0.12.0",
+    "@pagepocket/shared": "0.12.0",
+    "@pagepocket/single-file-unit": "0.12.0",
+    "@pagepocket/write-down-unit": "0.12.0"
   },
   "devDependencies": {
     "@types/koa": "^2.15.0",
     "@types/koa-send": "^4.1.5",
     "@types/koa-static": "^4.0.4",
     "@types/node": "^20.11.30",
+    "rimraf": "^6.0.1",
     "tsx": "^4.19.3",
     "typescript": "^5.4.5"
   },
@@ -49,7 +53,7 @@
     }
   },
   "scripts": {
-    "build": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\" && tsc",
+    "build": "rimraf dist && tsc",
     "start": "node dist/index.js",
     "test": "pnpm build && tsx --test specs/*.spec.ts"
   }