@dsh-workbench/adapter-supply 1.1.7 → 1.1.9

package/dist/index.d.ts

@@ -1,12 +1,11 @@
 export * from './registry-declaration.js';
-export * from './installed-module.js';
 export * from './package-route.js';
 export * from './plugin-login-hint.js';
-export * from './package-kind.js';
-export * from './package-content.js';
 export * from './plugin-units.js';
 export * from './plugin-tools.js';
-export * from './dsh-plugins.js';
+export { dshPluginsHandler, readDshPlugins } from '@dsh-workbench/shared/host';
 export * from './plugin-catalog.js';
-export * from './bundle-manager.js';
 export * from './plugin-source.js';
+export { OPENCLI_MANIFEST_FILE } from '@dsh-workbench/adapter-runtime';
+export { createDeclarationLookup, dshMarkersOf, isCommandFile, pluginManifestOf, splitNpmSpec, verdictOf, withPackageDir, declarationGaps, declaredPluginCommands, isLocalDependencySpec, isPackedArtifactSpec, isPackageName, isRegistryDependencySpec, moduleDeclarationOf, packageVersionAt, profileDirOf, profileManifestOf, profileModules, readBundleManager, readInstalledModule, readProfilePackage, } from '@dsh-workbench/shared/host';
+export type { BundleManager } from '@dsh-workbench/shared/host';

package/dist/index.js

@@ -1,12 +1,10 @@
 export * from './registry-declaration.js';
-export * from './installed-module.js';
 export * from './package-route.js';
 export * from './plugin-login-hint.js';
-export * from './package-kind.js';
-export * from './package-content.js';
 export * from './plugin-units.js';
 export * from './plugin-tools.js';
-export * from './dsh-plugins.js';
+export { dshPluginsHandler, readDshPlugins } from '@dsh-workbench/shared/host';
 export * from './plugin-catalog.js';
-export * from './bundle-manager.js';
 export * from './plugin-source.js';
+export { OPENCLI_MANIFEST_FILE } from '@dsh-workbench/adapter-runtime';
+export { createDeclarationLookup, dshMarkersOf, isCommandFile, pluginManifestOf, splitNpmSpec, verdictOf, withPackageDir, declarationGaps, declaredPluginCommands, isLocalDependencySpec, isPackedArtifactSpec, isPackageName, isRegistryDependencySpec, moduleDeclarationOf, packageVersionAt, profileDirOf, profileManifestOf, profileModules, readBundleManager, readInstalledModule, readProfilePackage, } from '@dsh-workbench/shared/host';

package/dist/package-kind.d.ts

@@ -1,4 +1,4 @@
-export type PackageKind = 'opencli-plugin' | 'dsh-bundle' | 'both' | 'neither';
+export type PackageKind = 'runtime-plugin' | 'dsh-bundle' | 'both' | 'neither';
 export interface PackageVerdict {
     readonly kind: PackageKind;
     readonly pkg?: string;

package/dist/package-kind.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { isPackageName } from './installed-module.js';
+import { isPackageName } from '@dsh-workbench/shared/host';
 import { dshRecordOf, packageManifestOf, packageNameOf } from './registry-declaration.js';
 export const OPENCLI_MANIFEST_FILE = 'opencli-plugin.json';
 const VERSION = /^[a-zA-Z0-9][a-zA-Z0-9._+-]*$/;
@@ -60,7 +60,7 @@ export function verdictOf(dir) {
     if (packageManifestOf(dir) === undefined && plugin === undefined)
         return undefined;
     const dsh = dshMarkersOf(dshRecordOf(dir));
-    const kind = plugin !== undefined && dsh ? 'both' : plugin !== undefined ? 'opencli-plugin' : dsh ? 'dsh-bundle' : 'neither';
+    const kind = plugin !== undefined && dsh ? 'both' : plugin !== undefined ? 'runtime-plugin' : dsh ? 'dsh-bundle' : 'neither';
     const pkg = packageNameOf(dir);
     return {
         kind,

package/dist/package-route.d.ts

@@ -1,11 +1,5 @@
-import type { DshShell } from '@dsh-workbench/shared';
-import { type ResolvedPluginSource } from './plugin-source.js';
-export type PackageRouteKind = 'opencli-plugin' | 'dsh-bundle' | 'neither';
-export interface PackageRoute {
-    readonly kind: PackageRouteKind;
-    readonly pkg?: string;
-    readonly pluginName?: string;
-}
+import type { DshShell, ResolvedPluginSource } from '@dsh-workbench/shared';
+import type { PackageRoute } from '@dsh-workbench/shared/host';
 export declare const LOCAL_PLUGIN_ENV = "DSH_WB_OPENCLI_PLUGIN_PATH";
 export declare const PLUGIN_REGISTRY_ENV = "DSH_WB_OPENCLI_PLUGIN_REGISTRY";
 export declare function packageRouteOf(options: {

package/dist/package-route.js

@@ -1,55 +1,19 @@
-import { VERSION_CHECK_TTL_MS } from '@dsh-workbench/shared/host';
+import { createPackageRouter, localDirOf, splitNpmSpec } from '@dsh-workbench/shared/host';
+import { npmCacheDir, OPENCLI_MANIFEST_FILE } from '@dsh-workbench/adapter-runtime';
+import { registryDshOf } from './registry-declaration.js';
 import { resolvePluginSource } from './plugin-source.js';
-import { dshMarkersOf, splitNpmSpec, verdictOf } from './package-kind.js';
-import { withPackageDir } from './package-content.js';
-import { localDirOf, registryDshOf } from './registry-declaration.js';
 export const LOCAL_PLUGIN_ENV = 'DSH_WB_OPENCLI_PLUGIN_PATH';
 export const PLUGIN_REGISTRY_ENV = 'DSH_WB_OPENCLI_PLUGIN_REGISTRY';
-const cache = new Map();
-function routeOfVerdict(verdict, fallback) {
-    const pkg = verdict.pkg ?? fallback;
-    if (verdict.kind === 'neither')
-        return { kind: 'neither', ...(pkg === undefined ? {} : { pkg }) };
-    if (verdict.kind === 'dsh-bundle' || verdict.kind === 'both')
-        return { kind: 'dsh-bundle' };
-    return {
-        kind: 'opencli-plugin',
-        ...(pkg === undefined ? {} : { pkg }),
-        ...(verdict.pluginName === undefined ? {} : { pluginName: verdict.pluginName }),
-    };
-}
+const router = createPackageRouter({
+    manifestFile: OPENCLI_MANIFEST_FILE,
+    cacheDir: npmCacheDir(),
+    dshLookup: (options) => registryDshOf(options),
+});
 export async function packageRouteOf(options) {
-    const local = localDirOf(options.spec);
-    if (local !== undefined) {
-        const verdict = verdictOf(local);
-        return verdict === undefined ? undefined : routeOfVerdict(verdict, splitNpmSpec(options.spec)?.name);
-    }
-    const ref = splitNpmSpec(options.spec);
-    if (ref === undefined)
-        return undefined;
-    const shell = options.shell;
-    const registry = options.registry;
-    if (shell === undefined || registry === undefined)
-        return undefined;
-    const key = `${registry}|${options.spec}`;
-    const hit = cache.get(key);
-    if (options.force !== true && hit !== undefined && Date.now() - hit.at < VERSION_CHECK_TTL_MS) {
-        return hit.route ?? undefined;
-    }
-    const found = await registryDshOf({ shell, name: options.spec, registry });
-    let route;
-    if (found.readable && dshMarkersOf(found.raw)) {
-        route = { kind: 'dsh-bundle' };
-    }
-    else {
-        const verdict = await withPackageDir({ shell, spec: options.spec, registry }, (dir) => verdictOf(dir));
-        route = verdict === undefined ? undefined : routeOfVerdict(verdict, ref.name);
-    }
-    cache.set(key, { at: Date.now(), route: route ?? null });
-    return route;
+    return router.packageRouteOf(options);
 }
 export function resetPackageRouteCache() {
-    cache.clear();
+    router.reset();
 }
 export function pluginInstallPlan(options) {
     const local = localDirOf(options.spec);

package/dist/plugin-source.d.ts

@@ -1,2 +1,5 @@
-export type { ProvisionProblem } from '@dsh-workbench/shared/host';
-export { npmRegistryOf, resolvePluginSource, type PluginSourceCommand, type PluginSourceOptions, type ResolvedPluginSource, } from '@dsh-workbench/shared/host';
+import type { SupplySource } from '@dsh-workbench/shared';
+import type { PluginSourceOptions, ResolvedPluginSource } from '@dsh-workbench/shared';
+export type { PluginSourceCommand, PluginSourceOptions, ResolvedPluginSource, } from '@dsh-workbench/shared';
+export { npmRegistryOf } from '@dsh-workbench/shared/host';
+export declare function resolvePluginSource(source: SupplySource | undefined, env: Readonly<Record<string, string | undefined>>, options?: PluginSourceOptions): ResolvedPluginSource;

package/dist/plugin-source.js

@@ -1 +1,80 @@
-export { npmRegistryOf, resolvePluginSource, } from '@dsh-workbench/shared/host';
+import { npmRegistryOf, quoteShellArg } from '@dsh-workbench/shared/host';
+import { npmCacheDir, toolchainOpencliDir, vendorPeerLink, vendorPrefix } from '@dsh-workbench/adapter-runtime';
+export { npmRegistryOf } from '@dsh-workbench/shared/host';
+function envValue(env, name) {
+    const value = env[name]?.trim();
+    return value === undefined || value === '' ? { ok: false } : { ok: true, value };
+}
+function mergeLines(commands) {
+    return commands.map((item) => (item.optional === true ? `(${item.line} || true)` : item.line)).join(' && ');
+}
+function installOne(command, spec) {
+    const line = `${quoteShellArg(command)} plugin install ${quoteShellArg(spec)}`;
+    return { ok: true, commands: [{ line }], line };
+}
+function pluginPackageOf(source, plugin) {
+    if (source.kind === 'npm') {
+        const pkg = source.package?.trim() ?? '';
+        if (pkg !== '')
+            return pkg;
+        return plugin.trim() === '' ? '' : `opencli-plugin-${plugin.trim()}`;
+    }
+    if (source.kind === 'git')
+        return source.url.trim();
+    return '';
+}
+function npmSource(source, env, options) {
+    const registry = npmRegistryOf(source, env);
+    if (!registry.ok)
+        return { ok: false, problem: 'env-missing', env: registry.env };
+    const { command = 'opencli', plugin = '', version = 'latest', mode = 'install' } = options;
+    const name = pluginPackageOf(source, plugin);
+    if (name === '')
+        return { ok: false, problem: 'malformed' };
+    const prefix = vendorPrefix();
+    const dirInPrefix = `${prefix}/node_modules/${name}`;
+    const peer = vendorPeerLink();
+    const commands = [
+        {
+            line: [
+                'npm i',
+                `--prefix ${quoteShellArg(prefix)}`,
+                quoteShellArg(`${name}@${version}`),
+                `--registry ${quoteShellArg(registry.value)}`,
+                `--cache ${quoteShellArg(npmCacheDir())}`,
+            ].join(' '),
+        },
+        {
+            line: `rm -rf ${quoteShellArg(peer.dir)} && mkdir -p ${quoteShellArg(peer.parent)} && ln -s ${quoteShellArg(toolchainOpencliDir())} ${quoteShellArg(peer.dir)}`,
+        },
+    ];
+    if (mode === 'install') {
+        if (plugin !== '') {
+            commands.push({
+                line: `${quoteShellArg(command)} plugin uninstall ${quoteShellArg(plugin)}`,
+                optional: true,
+            });
+        }
+        commands.push({
+            line: `NPM_CONFIG_REGISTRY=${quoteShellArg(registry.value)} ${quoteShellArg(command)} plugin install ${quoteShellArg(dirInPrefix)}`,
+        });
+    }
+    return { ok: true, commands, line: mergeLines(commands) };
+}
+export function resolvePluginSource(source, env, options = {}) {
+    if (source === undefined)
+        return { ok: false, problem: 'not-declared' };
+    const command = options.command ?? 'opencli';
+    if (source.kind === 'git') {
+        const url = source.url.trim();
+        return url === '' ? { ok: false, problem: 'malformed' } : installOne(command, url);
+    }
+    if (source.kind === 'npm')
+        return npmSource(source, env, options);
+    const value = source.env === undefined ? { ok: false } : envValue(env, source.env);
+    if (value.ok)
+        return installOne(command, value.value);
+    if (source.path !== undefined && source.path.trim() !== '')
+        return installOne(command, source.path.trim());
+    return { ok: false, problem: 'env-missing', env: source.env ?? '' };
+}

package/dist/plugin-units.js

@@ -102,7 +102,7 @@ function faceOf(unit, opencliFor, note) {
         tools: unit.tools.map((tool) => ({
             name: tool.name,
             writes: pluginToolWrites(tool.command),
-            opencli: {
+            runtime: {
                 plugin: unit.plugin,
                 command: tool.command.name,
                 args: tool.command.args.map((arg) => arg.name),

package/dist/registry-declaration.d.ts

@@ -1,23 +1,18 @@
 import type { DshShell } from '@dsh-workbench/shared';
-export declare function localDirOf(spec: string): string | undefined;
-export declare function packageManifestOf(dir: string): Readonly<Record<string, unknown>> | undefined;
-export declare function dshRecordOf(dir: string): unknown | undefined;
-export declare function packageNameOf(dir: string): string | undefined;
-export declare function pathDeclarationOf(spec: string): unknown | undefined;
-export interface RegistryDshLookup {
-    readonly readable: boolean;
-    readonly raw: unknown;
-}
+export { declarationRefusalOf, dshRecordOf, localDirOf, packageManifestOf, packageNameOf, pathDeclarationOf, } from '@dsh-workbench/shared/host';
+export type { RegistryDshLookup } from '@dsh-workbench/shared/host';
 export declare function registryDshOf(options: {
     shell: DshShell;
     name: string;
     registry?: string | undefined;
     force?: boolean;
-}): Promise<RegistryDshLookup>;
+}): Promise<{
+    readonly readable: boolean;
+    readonly raw: unknown;
+}>;
 export declare function registryDeclarationOf(options: {
     shell: DshShell;
     name: string;
     registry: string;
     force?: boolean;
 }): Promise<unknown | undefined>;
-export declare function declarationRefusalOf(name: string, raw: unknown): readonly string[];

package/dist/registry-declaration.js

@@ -1,56 +1,10 @@
-import fs from 'node:fs';
 import { npmCacheDir } from '@dsh-workbench/adapter-runtime';
-import path from 'node:path';
-import { declarationProblemsOf, parseJsonLoose, quoteShellArg, runShell, VERSION_CHECK_TIMEOUT_MS, VERSION_CHECK_TTL_MS, } from '@dsh-workbench/shared/host';
-const cache = new Map();
-function asRecord(value) {
-    return typeof value === 'object' && value !== null ? value : undefined;
-}
-export function localDirOf(spec) {
-    const dir = spec.trim().replace(/^(?:file|link):/, '');
-    return path.isAbsolute(dir) ? dir : undefined;
-}
-export function packageManifestOf(dir) {
-    try {
-        const parsed = JSON.parse(fs.readFileSync(path.join(dir, 'package.json'), 'utf8'));
-        return asRecord(parsed);
-    }
-    catch {
-        return undefined;
-    }
-}
-export function dshRecordOf(dir) {
-    return packageManifestOf(dir)?.dsh;
-}
-export function packageNameOf(dir) {
-    const name = packageManifestOf(dir)?.name;
-    return typeof name === 'string' && name.trim() !== '' ? name.trim() : undefined;
-}
-export function pathDeclarationOf(spec) {
-    const dir = localDirOf(spec);
-    return dir === undefined ? undefined : asRecord(dshRecordOf(dir))?.workbench;
-}
+import { createRegistryLookup } from '@dsh-workbench/shared/host';
+export { declarationRefusalOf, dshRecordOf, localDirOf, packageManifestOf, packageNameOf, pathDeclarationOf, } from '@dsh-workbench/shared/host';
+const lookup = createRegistryLookup();
 export async function registryDshOf(options) {
-    const { shell, name, registry, force = false } = options;
-    const key = `${registry ?? ''}|${name}`;
-    const hit = cache.get(key);
-    if (!force && hit !== undefined && Date.now() - hit.at < VERSION_CHECK_TTL_MS) {
-        return { readable: true, raw: hit.raw };
-    }
-    const at = registry === undefined ? '' : ` --registry ${quoteShellArg(registry)}`;
-    const result = await runShell(shell, `npm view ${quoteShellArg(name)} dsh --json${at} --cache ${quoteShellArg(npmCacheDir())}`, { timeoutMs: VERSION_CHECK_TIMEOUT_MS }).catch(() => undefined);
-    const parsed = result?.exitCode === 0 ? parseJsonLoose(result.stdout) : undefined;
-    if (parsed === undefined)
-        return { readable: false, raw: undefined };
-    cache.set(key, { at: Date.now(), raw: parsed });
-    return { readable: true, raw: parsed };
+    return lookup.registryDshOf({ ...options, cacheDir: npmCacheDir() });
 }
 export async function registryDeclarationOf(options) {
-    const found = await registryDshOf(options);
-    return found.readable ? asRecord(found.raw)?.workbench : undefined;
-}
-export function declarationRefusalOf(name, raw) {
-    if (raw === undefined)
-        return [];
-    return declarationProblemsOf(name, raw);
+    return lookup.registryDeclarationOf({ ...options, cacheDir: npmCacheDir() });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/adapter-supply",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Workbench supply adapter package.",
   "type": "module",
   "exports": {
@@ -22,8 +22,8 @@
     "directory": "packages/adapter-supply"
   },
   "dependencies": {
-    "@dsh-workbench/adapter-runtime": "1.1.7",
-    "@dsh-workbench/shared": "1.1.7"
+    "@dsh-workbench/shared": "1.1.9",
+    "@dsh-workbench/adapter-runtime": "1.1.9"
   },
   "devDependencies": {
     "@types/node": "^24.19.0",