@pagepocket/cli 0.11.0 → 0.12.0

package/dist/services/strategy/strategy-fetch.js

@@ -1,16 +1,8 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchStrategyFile = void 0;
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_path_1 = __importDefault(require("node:path"));
-const parse_json_1 = require("../../utils/parse-json");
-const normalize_argv_1 = require("../../utils/normalize-argv");
-const isRecord = (value) => {
-    return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-};
+import fs from "node:fs";
+import path from "node:path";
+import { isUrlLike } from "../../utils/normalize-argv.js";
+import { parseJson } from "../../utils/parse-json.js";
+const isRecord = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
 const isStrategyFile = (value) => {
     if (!isRecord(value)) {
         return false;
@@ -31,15 +23,15 @@ const isStrategyFile = (value) => {
     return true;
 };
 const readTextFromPath = (p) => {
-    const full = node_path_1.default.resolve(p);
-    return node_fs_1.default.readFileSync(full, "utf8");
+    const full = path.resolve(p);
+    return fs.readFileSync(full, "utf8");
 };
-const fetchStrategyFile = async (input) => {
+export const fetchStrategyFile = async (input) => {
     const raw = input.trim();
     if (!raw) {
         throw new Error("strategy source is empty");
     }
-    if ((0, normalize_argv_1.isUrlLike)(raw)) {
+    if (isUrlLike(raw)) {
         const url = new URL(raw);
         if (url.protocol !== "https:" && url.protocol !== "http:") {
             throw new Error(`Unsupported strategy URL protocol: ${url.protocol}`);
@@ -49,7 +41,7 @@ const fetchStrategyFile = async (input) => {
             throw new Error(`Failed to fetch strategy: ${res.status} ${res.statusText}`);
         }
         const text = await res.text();
-        const parsed = (0, parse_json_1.parseJson)(text);
+        const parsed = parseJson(text);
         if (!parsed.ok) {
             throw parsed.error;
         }
@@ -59,13 +51,12 @@ const fetchStrategyFile = async (input) => {
         return { strategy: parsed.value, source: { type: "url", value: url.toString() } };
     }
     const text = readTextFromPath(raw);
-    const parsed = (0, parse_json_1.parseJson)(text);
+    const parsed = parseJson(text);
     if (!parsed.ok) {
         throw parsed.error;
     }
     if (!isStrategyFile(parsed.value)) {
         throw new Error(`Invalid strategy JSON from file: ${raw}`);
     }
-    return { strategy: parsed.value, source: { type: "file", value: node_path_1.default.resolve(raw) } };
+    return { strategy: parsed.value, source: { type: "file", value: path.resolve(raw) } };
 };
-exports.fetchStrategyFile = fetchStrategyFile;

package/dist/services/strategy/strategy-io.js

@@ -1,15 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeJsonAtomic = exports.readStrategyFile = exports.getStrategyPath = exports.getStrategiesDir = void 0;
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_path_1 = __importDefault(require("node:path"));
-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 path from "node:path";
+import { parseJson } from "../../utils/parse-json.js";
+const isRecord = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
 const isStrategyFile = (value) => {
     if (!isRecord(value)) {
         return false;
@@ -29,17 +21,11 @@ const isStrategyFile = (value) => {
     }
     return true;
 };
-const getStrategiesDir = (configService) => {
-    return node_path_1.default.join(configService.getConfigDir(), "strategies");
-};
-exports.getStrategiesDir = getStrategiesDir;
-const getStrategyPath = (configService, name) => {
-    return node_path_1.default.join((0, exports.getStrategiesDir)(configService), `${name}.json`);
-};
-exports.getStrategyPath = getStrategyPath;
-const readStrategyFile = (filePath) => {
-    const text = node_fs_1.default.readFileSync(filePath, "utf8");
-    const parsed = (0, parse_json_1.parseJson)(text);
+export const getStrategiesDir = (configService) => path.join(configService.getConfigDir(), "strategies");
+export const getStrategyPath = (configService, name) => path.join(getStrategiesDir(configService), `${name}.json`);
+export const readStrategyFile = (filePath) => {
+    const text = fs.readFileSync(filePath, "utf8");
+    const parsed = parseJson(text);
     if (!parsed.ok) {
         throw parsed.error;
     }
@@ -48,12 +34,10 @@ const readStrategyFile = (filePath) => {
     }
     return parsed.value;
 };
-exports.readStrategyFile = readStrategyFile;
-const writeJsonAtomic = (filePath, value) => {
-    const dir = node_path_1.default.dirname(filePath);
-    node_fs_1.default.mkdirSync(dir, { recursive: true });
+export const writeJsonAtomic = (filePath, value) => {
+    const dir = path.dirname(filePath);
+    fs.mkdirSync(dir, { recursive: true });
     const tmpPath = `${filePath}.tmp`;
-    node_fs_1.default.writeFileSync(tmpPath, `${JSON.stringify(value, undefined, 2)}\n`, "utf8");
-    node_fs_1.default.renameSync(tmpPath, filePath);
+    fs.writeFileSync(tmpPath, `${JSON.stringify(value, undefined, 2)}\n`, "utf8");
+    fs.renameSync(tmpPath, filePath);
 };
-exports.writeJsonAtomic = writeJsonAtomic;

package/dist/services/strategy/strategy-normalize.js

@@ -1,29 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeStrategyUnits = void 0;
-const parse_pinned_spec_1 = require("../user-packages/parse-pinned-spec");
-const isRecord = (value) => {
-    return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-};
+import { parsePinnedSpec } from "../user-packages/parse-pinned-spec.js";
+const isRecord = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
 const isJsonValue = (value) => {
     if (value === null) {
         return true;
     }
-    const t = typeof value;
-    if (t === "string" || t === "number" || t === "boolean") {
+    const valueType = typeof value;
+    if (valueType === "string" || valueType === "number" || valueType === "boolean") {
         return true;
     }
     if (Array.isArray(value)) {
-        return value.every((v) => isJsonValue(v));
+        return value.every((item) => isJsonValue(item));
     }
     if (isRecord(value)) {
-        return Object.values(value).every((v) => isJsonValue(v));
+        return Object.values(value).every((entryValue) => isJsonValue(entryValue));
     }
     return false;
 };
 const normalizeUnitSpec = (spec, idx) => {
     if (typeof spec === "string") {
-        const pinned = (0, parse_pinned_spec_1.parsePinnedSpec)(spec);
+        const pinned = parsePinnedSpec(spec);
         return { ref: pinned.spec, args: [] };
     }
     if (!isRecord(spec)) {
@@ -33,7 +28,7 @@ const normalizeUnitSpec = (spec, idx) => {
     if (typeof ref !== "string") {
         throw new Error(`Invalid unit ref at index ${idx}`);
     }
-    const pinned = (0, parse_pinned_spec_1.parsePinnedSpec)(ref);
+    const pinned = parsePinnedSpec(ref);
     const argsRaw = spec.args;
     const args = typeof argsRaw === "undefined" ? [] : argsRaw;
     if (!Array.isArray(args)) {
@@ -44,8 +39,7 @@ const normalizeUnitSpec = (spec, idx) => {
     }
     return { ref: pinned.spec, args };
 };
-const normalizeStrategyUnits = (strategy) => {
+export const normalizeStrategyUnits = (strategy) => {
     const units = strategy.pipeline.units;
     return units.map((spec, idx) => normalizeUnitSpec(spec, idx));
 };
-exports.normalizeStrategyUnits = normalizeStrategyUnits;

package/dist/services/strategy/strategy-pack-read.js

@@ -1,15 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readStrategiesFromPackRoot = void 0;
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_path_1 = __importDefault(require("node:path"));
-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 path from "node:path";
+import { parseJson } from "../../utils/parse-json.js";
+const isRecord = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
 const isStrategyFile = (value) => {
     if (!isRecord(value)) {
         return false;
@@ -29,19 +21,19 @@ const isStrategyFile = (value) => {
     }
     return true;
 };
-const readStrategiesFromPackRoot = (packRoot) => {
-    const strategiesDir = node_path_1.default.join(packRoot, "strategies");
-    if (!node_fs_1.default.existsSync(strategiesDir)) {
+export const readStrategiesFromPackRoot = (packRoot) => {
+    const strategiesDir = path.join(packRoot, "strategies");
+    if (!fs.existsSync(strategiesDir)) {
         return [];
     }
-    const fileNames = node_fs_1.default
+    const fileNames = fs
         .readdirSync(strategiesDir)
-        .filter((f) => f.endsWith(".strategy.json"))
+        .filter((fileName) => fileName.endsWith(".strategy.json"))
         .sort((a, b) => a.localeCompare(b));
     return fileNames.map((fileName) => {
-        const filePath = node_path_1.default.join(strategiesDir, fileName);
-        const text = node_fs_1.default.readFileSync(filePath, "utf8");
-        const parsed = (0, parse_json_1.parseJson)(text);
+        const filePath = path.join(strategiesDir, fileName);
+        const text = fs.readFileSync(filePath, "utf8");
+        const parsed = parseJson(text);
         if (!parsed.ok) {
             throw parsed.error;
         }
@@ -51,4 +43,3 @@ const readStrategiesFromPackRoot = (packRoot) => {
         return parsed.value;
     });
 };
-exports.readStrategiesFromPackRoot = readStrategiesFromPackRoot;

package/dist/services/strategy/strategy-pack-store.js

@@ -1,19 +1,14 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StrategyPackStore = void 0;
-const node_path_1 = __importDefault(require("node:path"));
-const user_package_installer_1 = require("../user-packages/user-package-installer");
-const user_package_installer_2 = require("../user-packages/user-package-installer");
-const parse_pinned_spec_1 = require("../user-packages/parse-pinned-spec");
-const user_package_store_1 = require("../user-packages/user-package-store");
+import path from "node:path";
+import { parsePinnedSpec } from "../user-packages/parse-pinned-spec.js";
+import { installPinnedPackage } from "../user-packages/user-package-installer.js";
+import { updatePackageToLatest } from "../user-packages/user-package-installer.js";
+import { UserPackageStore } from "../user-packages/user-package-store.js";
 const STRATEGY_PACKS_KIND = "strategy-packs";
 const STRATEGY_PACKS_PACKAGE_JSON_NAME = "pagepocket-user-strategy-packs";
-class StrategyPackStore {
+export class StrategyPackStore {
+    store;
     constructor(configService) {
-        this.store = new user_package_store_1.UserPackageStore(configService, STRATEGY_PACKS_KIND);
+        this.store = new UserPackageStore(configService, STRATEGY_PACKS_KIND);
     }
     getInstallDir() {
         return this.store.getInstallDir();
@@ -22,15 +17,15 @@ class StrategyPackStore {
         return this.store.readInstalledDependencyVersions(STRATEGY_PACKS_PACKAGE_JSON_NAME);
     }
     installPinned(spec) {
-        const pinned = (0, parse_pinned_spec_1.parsePinnedSpec)(spec);
-        (0, user_package_installer_1.installPinnedPackage)(this.store, {
+        const pinned = parsePinnedSpec(spec);
+        installPinnedPackage(this.store, {
             packageJsonName: STRATEGY_PACKS_PACKAGE_JSON_NAME,
             packageSpec: pinned.spec
         });
         return pinned;
     }
     updateToLatest(packageName) {
-        (0, user_package_installer_2.updatePackageToLatest)(this.store, {
+        updatePackageToLatest(this.store, {
             packageJsonName: STRATEGY_PACKS_PACKAGE_JSON_NAME,
             packageName
         });
@@ -39,7 +34,6 @@ class StrategyPackStore {
         this.store.ensureInstallDirPackageJson(STRATEGY_PACKS_PACKAGE_JSON_NAME);
         const req = this.store.createRequire(STRATEGY_PACKS_PACKAGE_JSON_NAME);
         const pkgJsonPath = req.resolve(`${packageName}/package.json`);
-        return node_path_1.default.dirname(pkgJsonPath);
+        return path.dirname(pkgJsonPath);
     }
 }
-exports.StrategyPackStore = StrategyPackStore;