@pagepocket/cli 0.11.0 → 0.12.0

package/dist/lib/filename.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeFilename = void 0;
-const safeFilename = (input) => {
+export const safeFilename = (input) => {
     const trimmed = input.trim();
     if (!trimmed) {
         return "snapshot";
@@ -11,4 +8,3 @@ const safeFilename = (input) => {
         .replace(/^_+|_+$/g, "")
         .slice(0, 120) || "snapshot");
 };
-exports.safeFilename = safeFilename;

package/dist/services/config-service.js

@@ -1,55 +1,50 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConfigService = void 0;
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_os_1 = __importDefault(require("node:os"));
-const node_path_1 = __importDefault(require("node:path"));
-const env_paths_1 = __importDefault(require("env-paths"));
-const parse_json_1 = require("../utils/parse-json");
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import envPaths from "env-paths";
+import { parseJson } from "../utils/parse-json.js";
 const defaultConfig = {
     plugins: [],
     strategies: [],
     strategyPacks: []
 };
-class ConfigService {
+export class ConfigService {
+    appName;
     constructor(appName = "pagepocket") {
         this.appName = appName;
     }
     getConfigDir() {
         if (process.platform === "win32") {
-            const p = (0, env_paths_1.default)(this.appName, { suffix: "" });
-            return p.config;
+            const envPathsResult = envPaths(this.appName, { suffix: "" });
+            return envPathsResult.config;
         }
-        const homeDir = node_os_1.default.homedir();
+        const homeDir = os.homedir();
         const xdgConfigHome = process.env.XDG_CONFIG_HOME;
-        const base = xdgConfigHome && xdgConfigHome.trim() ? xdgConfigHome : node_path_1.default.join(homeDir, ".config");
-        return node_path_1.default.join(base, this.appName);
+        const base = xdgConfigHome && xdgConfigHome.trim() ? xdgConfigHome : path.join(homeDir, ".config");
+        return path.join(base, this.appName);
     }
     getDataDir() {
-        const p = (0, env_paths_1.default)(this.appName, { suffix: "" });
-        return p.data;
+        const envPathsResult = envPaths(this.appName, { suffix: "" });
+        return envPathsResult.data;
     }
     getConfigPath() {
-        return node_path_1.default.join(this.getConfigDir(), "config.json");
+        return path.join(this.getConfigDir(), "config.json");
     }
     getPluginsInstallDir() {
-        return node_path_1.default.join(this.getDataDir(), "plugins");
+        return path.join(this.getDataDir(), "plugins");
     }
     ensureConfigDirExists() {
         this.ensureDirExists(this.getConfigDir());
     }
     ensureDirExists(dirPath) {
-        node_fs_1.default.mkdirSync(dirPath, { recursive: true });
+        fs.mkdirSync(dirPath, { recursive: true });
     }
     writeJsonAtomic(filePath, value) {
-        const dir = node_path_1.default.dirname(filePath);
+        const dir = path.dirname(filePath);
         this.ensureDirExists(dir);
         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);
     }
     isObject(value) {
         return Boolean(value) && typeof value === "object" && !Array.isArray(value);
@@ -78,13 +73,13 @@ class ConfigService {
                 }
                 return undefined;
             })
-                .filter((x) => typeof x !== "undefined")
+                .filter((pluginEntry) => typeof pluginEntry !== "undefined")
             : [];
         const strategiesRaw = value.strategies;
         const strategies = Array.isArray(strategiesRaw)
             ? strategiesRaw
-                .map((x) => (typeof x === "string" ? x.trim() : ""))
-                .filter((x) => x.length > 0)
+                .map((strategyName) => (typeof strategyName === "string" ? strategyName.trim() : ""))
+                .filter((strategyName) => strategyName.length > 0)
             : [];
         const packsRaw = value.strategyPacks;
         const strategyPacks = Array.isArray(packsRaw)
@@ -103,7 +98,7 @@ class ConfigService {
                 }
                 return undefined;
             })
-                .filter((x) => Boolean(x))
+                .filter((strategyPackEntry) => Boolean(strategyPackEntry))
             : [];
         return {
             plugins,
@@ -113,20 +108,20 @@ class ConfigService {
     }
     readConfig() {
         const configPath = this.getConfigPath();
-        const rawText = node_fs_1.default.readFileSync(configPath, "utf8");
-        const parsed = (0, parse_json_1.parseJson)(rawText);
+        const rawText = fs.readFileSync(configPath, "utf8");
+        const parsed = parseJson(rawText);
         return this.normalizeConfig(parsed.ok ? parsed.value : undefined);
     }
     isConfigFilePresent() {
-        return node_fs_1.default.existsSync(this.getConfigPath());
+        return fs.existsSync(this.getConfigPath());
     }
     readConfigOrDefault() {
         const configPath = this.getConfigPath();
-        const text = node_fs_1.default.existsSync(configPath) ? node_fs_1.default.readFileSync(configPath, "utf8") : undefined;
+        const text = fs.existsSync(configPath) ? fs.readFileSync(configPath, "utf8") : undefined;
         if (!text) {
             return defaultConfig;
         }
-        const parsed = (0, parse_json_1.parseJson)(text);
+        const parsed = parseJson(text);
         return parsed.ok ? this.normalizeConfig(parsed.value) : defaultConfig;
     }
     writeConfig(config) {
@@ -134,11 +129,10 @@ class ConfigService {
     }
     ensureConfigFileExists() {
         const configPath = this.getConfigPath();
-        if (node_fs_1.default.existsSync(configPath)) {
+        if (fs.existsSync(configPath)) {
             return this.readConfigOrDefault();
         }
         this.writeConfig(defaultConfig);
         return defaultConfig;
     }
 }
-exports.ConfigService = ConfigService;

package/dist/services/load-configured-plugins.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadConfiguredPlugins = void 0;
-const validate_plugin_default_export_1 = require("../utils/validate-plugin-default-export");
-const config_service_1 = require("./config-service");
-const plugin_store_1 = require("./plugin-store");
-const loadConfiguredPlugins = async () => {
+import { validatePluginDefaultExport } from "../utils/validate-plugin-default-export.js";
+import { ConfigService } from "./config-service.js";
+import { normalizePluginConfigEntry, PluginStore } from "./plugin-store.js";
+export const loadConfiguredPlugins = async () => {
     const getErrorMessage = (error) => {
         if (error instanceof Error) {
             return error.message;
@@ -17,15 +14,15 @@ const loadConfiguredPlugins = async () => {
         }
         return String(error);
     };
-    const configService = new config_service_1.ConfigService();
-    const store = new plugin_store_1.PluginStore(configService);
+    const configService = new ConfigService();
+    const store = new PluginStore(configService);
     configService.ensureConfigFileExists();
     const config = configService.readConfigOrDefault();
-    const specs = config.plugins.map(plugin_store_1.normalizePluginConfigEntry);
+    const specs = config.plugins.map(normalizePluginConfigEntry);
     const loaded = await Promise.all(specs.map(async (spec) => {
         try {
             const mod = await store.importPluginModule(spec.name);
-            const validation = (0, validate_plugin_default_export_1.validatePluginDefaultExport)({
+            const validation = validatePluginDefaultExport({
                 pluginName: spec.name,
                 moduleExports: mod,
                 options: spec.options
@@ -44,4 +41,3 @@ const loadConfiguredPlugins = async () => {
     }));
     return loaded.filter((x) => typeof x !== "undefined");
 };
-exports.loadConfiguredPlugins = loadConfiguredPlugins;

package/dist/services/plugin-installer.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.uninstallPluginPackage = exports.updatePluginPackageToLatest = exports.installPluginPackage = void 0;
-const node_child_process_1 = require("node:child_process");
+import { spawnSync } from "node:child_process";
 /**
  * Install a package spec with pnpm first, then fallback to npm.
  *
@@ -10,16 +7,16 @@ const node_child_process_1 = require("node:child_process");
  */
 const tryInstallWithFallback = (installDir, packageSpec) => {
     const tryRun = (cmd, args) => {
-        const r = (0, node_child_process_1.spawnSync)(cmd, args, {
+        const result = spawnSync(cmd, args, {
             cwd: installDir,
             stdio: "inherit",
             shell: false
         });
-        if (r.error) {
-            return { ok: false, error: r.error };
+        if (result.error) {
+            return { ok: false, error: result.error };
         }
-        if (typeof r.status === "number" && r.status !== 0) {
-            return { ok: false, error: new Error(`${cmd} exited with code ${r.status}`) };
+        if (typeof result.status === "number" && result.status !== 0) {
+            return { ok: false, error: new Error(`${cmd} exited with code ${result.status}`) };
         }
         return { ok: true };
     };
@@ -33,39 +30,37 @@ const tryInstallWithFallback = (installDir, packageSpec) => {
     }
     throw new Error(`Failed to install ${packageSpec}. Ensure pnpm or npm is available.`);
 };
-const installPluginPackage = (store, input) => {
+export const installPluginPackage = (store, input) => {
     store.ensurePluginPackageJson();
     const installDir = store.getInstallDir();
     tryInstallWithFallback(installDir, input.packageName);
 };
-exports.installPluginPackage = installPluginPackage;
-const updatePluginPackageToLatest = (store, input) => {
+export const updatePluginPackageToLatest = (store, input) => {
     store.ensurePluginPackageJson();
     const installDir = store.getInstallDir();
     const packageSpec = `${input.packageName}@latest`;
     tryInstallWithFallback(installDir, packageSpec);
 };
-exports.updatePluginPackageToLatest = updatePluginPackageToLatest;
 /**
  * Uninstall a package name with pnpm first, then fallback to npm.
  *
  * Usage:
  * uninstallPluginPackage(store, { packageName: "@scope/plugin" });
  */
-const uninstallPluginPackage = (store, input) => {
+export const uninstallPluginPackage = (store, input) => {
     store.ensurePluginPackageJson();
     const installDir = store.getInstallDir();
     const tryRun = (cmd, args) => {
-        const r = (0, node_child_process_1.spawnSync)(cmd, args, {
+        const result = spawnSync(cmd, args, {
             cwd: installDir,
             stdio: "inherit",
             shell: false
         });
-        if (r.error) {
-            return { ok: false, error: r.error };
+        if (result.error) {
+            return { ok: false, error: result.error };
         }
-        if (typeof r.status === "number" && r.status !== 0) {
-            return { ok: false, error: new Error(`${cmd} exited with code ${r.status}`) };
+        if (typeof result.status === "number" && result.status !== 0) {
+            return { ok: false, error: new Error(`${cmd} exited with code ${result.status}`) };
         }
         return { ok: true };
     };
@@ -79,4 +74,3 @@ const uninstallPluginPackage = (store, input) => {
     }
     throw new Error(`Failed to uninstall ${input.packageName}. Ensure pnpm or npm is available.`);
 };
-exports.uninstallPluginPackage = uninstallPluginPackage;

package/dist/services/plugin-store.js

@@ -1,49 +1,10 @@
-"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.PluginStore = exports.getPluginNameFromSpec = exports.normalizePluginConfigEntry = 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 validate_plugin_default_export_1 = require("../utils/validate-plugin-default-export");
-const normalizePluginConfigEntry = (entry) => {
+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";
+import { validatePluginDefaultExport } from "../utils/validate-plugin-default-export.js";
+export const normalizePluginConfigEntry = (entry) => {
     if (typeof entry === "string") {
         return { name: entry };
     }
@@ -53,22 +14,17 @@ const normalizePluginConfigEntry = (entry) => {
         ...(typeof entry.options === "undefined" ? {} : { options: entry.options })
     };
 };
-exports.normalizePluginConfigEntry = normalizePluginConfigEntry;
-const getPluginNameFromSpec = (spec) => spec.name;
-exports.getPluginNameFromSpec = getPluginNameFromSpec;
-const isRecord = (value) => {
-    return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-};
-const isCallable = (value) => {
-    return typeof value === "function";
-};
+export const getPluginNameFromSpec = (spec) => spec.name;
+const isRecord = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
+const isCallable = (value) => typeof value === "function";
 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 PluginStore {
+export class PluginStore {
+    configService;
     constructor(configService) {
         this.configService = configService;
     }
@@ -76,12 +32,12 @@ class PluginStore {
         return this.configService.getPluginsInstallDir();
     }
     ensureInstallDir() {
-        node_fs_1.default.mkdirSync(this.getInstallDir(), { recursive: true });
+        fs.mkdirSync(this.getInstallDir(), { recursive: true });
     }
     ensurePluginPackageJson() {
         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 = {
@@ -89,20 +45,20 @@ class PluginStore {
             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;
     }
     createPluginsRequireFromDir(dirPath) {
-        const pkgJsonPath = node_path_1.default.join(dirPath, "package.json");
-        if (!node_fs_1.default.existsSync(pkgJsonPath)) {
+        const pkgJsonPath = path.join(dirPath, "package.json");
+        if (!fs.existsSync(pkgJsonPath)) {
             const pkgJson = {
                 name: "pagepocket-user-plugins",
                 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 (0, node_module_1.createRequire)(pkgJsonPath);
+        return createRequire(pkgJsonPath);
     }
     createPluginsRequire() {
         this.ensurePluginPackageJson();
@@ -115,16 +71,18 @@ class PluginStore {
     readInstalledPackageMeta(pluginName) {
         try {
             const pkgJsonPath = this.resolveInstalledPackageJsonPath(pluginName);
-            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 || !json.value || typeof json.value !== "object") {
                 return { name: pluginName };
             }
-            const o = json.value;
+            const packageJsonRecord = json.value;
             return {
-                name: typeof o.name === "string" ? o.name : pluginName,
-                description: typeof o.description === "string" ? o.description : undefined,
-                version: typeof o.version === "string" ? o.version : undefined
+                name: typeof packageJsonRecord.name === "string" ? packageJsonRecord.name : pluginName,
+                description: typeof packageJsonRecord.description === "string"
+                    ? packageJsonRecord.description
+                    : undefined,
+                version: typeof packageJsonRecord.version === "string" ? packageJsonRecord.version : undefined
             };
         }
         catch {
@@ -139,8 +97,8 @@ class PluginStore {
      */
     readInstalledDependencyNames() {
         const pkgJsonPath = this.ensurePluginPackageJson();
-        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 || !parsed.value || typeof parsed.value !== "object") {
             return [];
         }
@@ -157,12 +115,12 @@ class PluginStore {
         return this.importResolvedPath(resolved);
     }
     async importResolvedPath(resolved) {
-        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 : {};
     }
     async instantiatePluginFromSpec(spec) {
         const mod = await this.importPluginModule(spec.name);
-        const result = (0, validate_plugin_default_export_1.validatePluginDefaultExport)({
+        const result = validatePluginDefaultExport({
             pluginName: spec.name,
             moduleExports: mod,
             options: spec.options
@@ -186,10 +144,10 @@ class PluginStore {
         this.configService.writeConfig(next);
     }
     hasPlugin(config, pluginName) {
-        return config.plugins.some((e) => (0, exports.getPluginNameFromSpec)((0, exports.normalizePluginConfigEntry)(e)) === pluginName);
+        return config.plugins.some((pluginEntry) => getPluginNameFromSpec(normalizePluginConfigEntry(pluginEntry)) === pluginName);
     }
     addPluginToConfig(config, entry) {
-        const spec = (0, exports.normalizePluginConfigEntry)(entry);
+        const spec = normalizePluginConfigEntry(entry);
         if (this.hasPlugin(config, spec.name)) {
             return config;
         }
@@ -197,11 +155,10 @@ class PluginStore {
     }
     removePluginFromConfig(config, pluginName) {
         const before = config.plugins;
-        const after = before.filter((e) => (0, exports.getPluginNameFromSpec)((0, exports.normalizePluginConfigEntry)(e)) !== pluginName);
+        const after = before.filter((pluginEntry) => getPluginNameFromSpec(normalizePluginConfigEntry(pluginEntry)) !== pluginName);
         return {
             config: { ...config, plugins: after },
             removed: after.length !== before.length
         };
     }
 }
-exports.PluginStore = PluginStore;

package/dist/services/strategy/builtin-strategy-registry.js

@@ -1,32 +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.readBuiltinStrategy = exports.listBuiltinStrategyNames = exports.readBuiltinStrategies = void 0;
-const node_path_1 = __importDefault(require("node:path"));
-const node_module_1 = require("node:module");
-const strategy_pack_read_1 = require("./strategy-pack-read");
-const readBuiltinStrategiesUnsafe = () => {
-    const req = (0, node_module_1.createRequire)(__filename);
-    const pkgJsonPath = req.resolve("@pagepocket/builtin-strategy/package.json");
-    const packRoot = node_path_1.default.dirname(pkgJsonPath);
-    return (0, strategy_pack_read_1.readStrategiesFromPackRoot)(packRoot);
-};
-const readBuiltinStrategies = () => {
-    try {
-        return readBuiltinStrategiesUnsafe();
-    }
-    catch {
-        return [];
-    }
-};
-exports.readBuiltinStrategies = readBuiltinStrategies;
-const listBuiltinStrategyNames = () => {
-    return (0, exports.readBuiltinStrategies)().map((strategy) => strategy.name);
-};
-exports.listBuiltinStrategyNames = listBuiltinStrategyNames;
-const readBuiltinStrategy = (name) => {
-    return (0, exports.readBuiltinStrategies)().find((strategy) => strategy.name === name);
-};
-exports.readBuiltinStrategy = readBuiltinStrategy;
+import { createRequire } from "node:module";
+import path from "node:path";
+import { MemoryCache } from "@pagepocket/shared";
+import { readStrategiesFromPackRoot } from "./strategy-pack-read.js";
+const BUILTIN_KEY = "builtin";
+const cache = new MemoryCache();
+const resolveBuiltinPackRoot = () => {
+    const require = createRequire(import.meta.url);
+    const packageJsonPath = require.resolve("@pagepocket/builtin-strategy/package.json");
+    return path.dirname(packageJsonPath);
+};
+const loadBuiltinStrategies = () => cache.getOrSet(BUILTIN_KEY, () => readStrategiesFromPackRoot(resolveBuiltinPackRoot()));
+export const listBuiltinStrategyNames = () => loadBuiltinStrategies().map((strategy) => strategy.name);
+export const readBuiltinStrategy = (name) => loadBuiltinStrategies().find((strategy) => strategy.name === name);

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

@@ -1,22 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureNoInstalledVersionConflicts = exports.computeDrift = exports.computeConflicts = exports.collectWantedVersions = void 0;
-const parse_pinned_spec_1 = require("../user-packages/parse-pinned-spec");
-const collectWantedVersions = (strategies) => {
-    var _a, _b, _c;
+import { parsePinnedSpec } from "../user-packages/parse-pinned-spec.js";
+export const collectWantedVersions = (strategies) => {
     const wanted = {};
-    for (const s of strategies) {
-        for (const u of s.units) {
-            const pinned = (0, parse_pinned_spec_1.parsePinnedSpec)(u.ref);
-            wanted[_a = pinned.name] ?? (wanted[_a] = {});
-            (_b = wanted[pinned.name])[_c = pinned.version] ?? (_b[_c] = []);
-            wanted[pinned.name][pinned.version].push(s.name);
+    for (const strategy of strategies) {
+        for (const unit of strategy.units) {
+            const pinned = parsePinnedSpec(unit.ref);
+            wanted[pinned.name] ??= {};
+            wanted[pinned.name][pinned.version] ??= [];
+            wanted[pinned.name][pinned.version].push(strategy.name);
         }
     }
     return wanted;
 };
-exports.collectWantedVersions = collectWantedVersions;
-const computeConflicts = (wanted) => {
+export const computeConflicts = (wanted) => {
     const conflicts = [];
     for (const [name, versions] of Object.entries(wanted)) {
         const uniqueVersions = Object.keys(versions);
@@ -27,10 +22,9 @@ const computeConflicts = (wanted) => {
     }
     return conflicts;
 };
-exports.computeConflicts = computeConflicts;
-const computeDrift = (input) => {
-    const items = input.units.flatMap((u) => {
-        const pinned = (0, parse_pinned_spec_1.parsePinnedSpec)(u.ref);
+export const computeDrift = (input) => {
+    const items = input.units.flatMap((unit) => {
+        const pinned = parsePinnedSpec(unit.ref);
         const installedVersion = input.installed[pinned.name];
         if (!installedVersion || installedVersion !== pinned.version) {
             return [
@@ -45,11 +39,10 @@ const computeDrift = (input) => {
     });
     return { strategy: input.strategyName, items };
 };
-exports.computeDrift = computeDrift;
-const ensureNoInstalledVersionConflicts = (installed, refs) => {
+export const ensureNoInstalledVersionConflicts = (installed, refs) => {
     const byName = {};
     for (const ref of refs) {
-        const pinned = (0, parse_pinned_spec_1.parsePinnedSpec)(ref);
+        const pinned = parsePinnedSpec(ref);
         const already = byName[pinned.name];
         if (already && already !== pinned.version) {
             throw new Error(`Strategy contains conflicting versions for ${pinned.name}: ${already} vs ${pinned.version}`);
@@ -64,4 +57,3 @@ const ensureNoInstalledVersionConflicts = (installed, refs) => {
         }
     }
 };
-exports.ensureNoInstalledVersionConflicts = ensureNoInstalledVersionConflicts;

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

@@ -1,25 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withoutStrategyInConfig = exports.withStrategyInConfig = exports.requireStrategyInstalled = exports.listStrategyNamesFromConfig = void 0;
-const array_1 = require("../../utils/array");
-const listStrategyNamesFromConfig = (config) => {
-    return (0, array_1.uniq)((config.strategies ?? []).map((s) => s.trim()).filter((s) => s.length > 0));
-};
-exports.listStrategyNamesFromConfig = listStrategyNamesFromConfig;
-const requireStrategyInstalled = (config, name) => {
-    const installed = (0, exports.listStrategyNamesFromConfig)(config);
+import { uniq } from "../../utils/array.js";
+export const listStrategyNamesFromConfig = (config) => uniq((config.strategies ?? [])
+    .map((strategyName) => strategyName.trim())
+    .filter((strategyName) => strategyName.length > 0));
+export const requireStrategyInstalled = (config, name) => {
+    const installed = listStrategyNamesFromConfig(config);
     if (!installed.includes(name)) {
         throw new Error(`Strategy not installed: ${name}`);
     }
 };
-exports.requireStrategyInstalled = requireStrategyInstalled;
-const withStrategyInConfig = (config, name) => {
-    const strategies = (0, array_1.uniq)([...(config.strategies ?? []), name]);
+export const withStrategyInConfig = (config, name) => {
+    const strategies = uniq([...(config.strategies ?? []), name]);
     return { ...config, strategies };
 };
-exports.withStrategyInConfig = withStrategyInConfig;
-const withoutStrategyInConfig = (config, name) => {
-    const strategies = (config.strategies ?? []).filter((s) => s !== name);
+export const withoutStrategyInConfig = (config, name) => {
+    const strategies = (config.strategies ?? []).filter((strategyName) => strategyName !== name);
     return { ...config, strategies };
 };
-exports.withoutStrategyInConfig = withoutStrategyInConfig;