@dsh-workbench/shared 1.0.0-beta.0 → 1.0.0-beta.1

package/dist/components/FormNodes.js

@@ -144,14 +144,18 @@ export function formRowsOf(args) {
     return args.fields.map((field) => h(FormRow, {
         key: field.key,
         label: field.label,
+        htmlFor: controlIdOf(field.key),
         hint: field.hint,
         problem: args.showProblem ? args.problems[field.key] : undefined,
         layout: field.layout,
     }, controlOf(field, args.problems, args.showProblem, args.busy)));
 }
+function controlIdOf(key) {
+    return `wb-form-${key}`;
+}
 function controlOf(field, problems, showProblem, busy) {
     return field.control({
-        id: `wb-form-${field.key}`,
+        id: controlIdOf(field.key),
         name: field.key,
         invalid: showProblem && Boolean(problems[field.key]),
         disabled: busy || field.disabled === true,

package/dist/components/FormRows.css

@@ -29,6 +29,7 @@
 }
 
 .wb-formLabel {
+  justify-self: start;
   min-width: 0;
   font-size: var(--dsw-font-xs-13-font-size);
   color: var(--dsw-alias-label-secondary);

package/dist/components/FormRows.d.ts

@@ -17,6 +17,7 @@ export declare function FormRows({ children }: FormRowsProps): JSX.Element;
  */
 export interface FormRowProps {
     readonly label: ReactNode;
+    readonly htmlFor?: string | undefined;
     readonly hint?: ReactNode | undefined;
     readonly problem?: ReactNode | undefined;
     readonly layout?: 'inline' | 'stacked' | undefined;
@@ -25,10 +26,11 @@ export interface FormRowProps {
 /**
  * 表单一行：左边标签、右边控件，提示与错误占控件下面那一格。
  * @param props.label - 这一行的标签；进了这一行，控件自己就别再给 `label`，否则会多一个标签。
+ * @param props.htmlFor - 标签挂到哪个控件（同一个 `id`）；不给就只是排布，点标签不聚焦 —— `Form` 会自己接好。
  * @param props.hint - 控件下的说明；给了 `problem` 就不画它 —— 同一格不叠两段话。
  * @param props.problem - 校验失败那句话；给了就顶掉 `hint` 并给整行加上出错标记。
  * @param props.layout - `stacked` 才是标签在上、控件在下（默认 `inline`：标签在左）。
  * @param props.children - 控件本体。
- * @returns 一个 `<label>`。
+ * @returns 一个 `<div>`：里面的 `<label>` 只包标签文字，不包控件、提示与整行的空白。
  */
-export declare function FormRow({ label, hint, problem, layout, children }: FormRowProps): JSX.Element;
+export declare function FormRow({ label, htmlFor, hint, problem, layout, children }: FormRowProps): JSX.Element;

package/dist/components/FormRows.js

@@ -11,15 +11,16 @@ export function FormRows({ children }) {
 /**
  * 表单一行：左边标签、右边控件，提示与错误占控件下面那一格。
  * @param props.label - 这一行的标签；进了这一行，控件自己就别再给 `label`，否则会多一个标签。
+ * @param props.htmlFor - 标签挂到哪个控件（同一个 `id`）；不给就只是排布，点标签不聚焦 —— `Form` 会自己接好。
  * @param props.hint - 控件下的说明；给了 `problem` 就不画它 —— 同一格不叠两段话。
  * @param props.problem - 校验失败那句话；给了就顶掉 `hint` 并给整行加上出错标记。
  * @param props.layout - `stacked` 才是标签在上、控件在下（默认 `inline`：标签在左）。
  * @param props.children - 控件本体。
- * @returns 一个 `<label>`。
+ * @returns 一个 `<div>`：里面的 `<label>` 只包标签文字，不包控件、提示与整行的空白。
  */
-export function FormRow({ label, hint, problem, layout = 'inline', children }) {
-    return (h("label", { className: "wb-formRow", "data-layout": layout, "data-wb-problem": problem === undefined ? undefined : '' },
-        h("span", { className: "wb-formLabel" }, label),
+export function FormRow({ label, htmlFor, hint, problem, layout = 'inline', children }) {
+    return (h("div", { className: "wb-formRow", "data-layout": layout, "data-wb-problem": problem === undefined ? undefined : '' },
+        h("label", { className: "wb-formLabel", htmlFor: htmlFor }, label),
         h("span", { className: "wb-formControl" }, children),
         problem === undefined ? (hint === undefined ? null : (h("span", { className: "wb-formHint" }, hint))) : (h("span", { className: "wb-formProblem" }, problem))));
 }

package/dist/config/constants.d.ts

@@ -1,7 +1,5 @@
 /** 外壳插件的包名：浏览器模块表与宿主按它注册、认领这枚插件。 */
 export declare const PLUGIN_ID = "@dsh-workbench/core";
-/** 与外壳同批发布的兄弟包名：`release.ts` 用它判一版三包是否都已在源上。 */
-export declare const RELEASE_SIBLINGS: readonly ["@dsh-workbench/shared", "@dsh-workbench/module-tools"];
 /** 外壳宿主 HTTP API 的根前缀；prefs / actions / provision 等路由都挂在它下面。 */
 export declare const API_PREFIX = "/workbench/api";
 /** 模块偏好读写的路由前缀，挂在外壳 API 下：走写通道，拒写回 write-refused。 */

package/dist/config/constants.js

@@ -1,10 +1,5 @@
 /** 外壳插件的包名：浏览器模块表与宿主按它注册、认领这枚插件。 */
 export const PLUGIN_ID = "@dsh-workbench/core";
-/** 与外壳同批发布的兄弟包名：`release.ts` 用它判一版三包是否都已在源上。 */
-export const RELEASE_SIBLINGS = [
-    "@dsh-workbench/shared",
-    "@dsh-workbench/module-tools",
-];
 /** 外壳宿主 HTTP API 的根前缀；prefs / actions / provision 等路由都挂在它下面。 */
 export const API_PREFIX = "/workbench/api";
 /** 模块偏好读写的路由前缀，挂在外壳 API 下：走写通道，拒写回 write-refused。 */

package/dist/contract/command.d.ts

@@ -0,0 +1,22 @@
+export interface CommandFile {
+    readonly content: string;
+    readonly suffix?: string | undefined;
+}
+export interface CommandRequest {
+    readonly argv: readonly string[];
+    readonly timeoutMs?: number | undefined;
+    readonly cwd?: string | undefined;
+    readonly files?: readonly CommandFile[] | undefined;
+    readonly appendFileArgs?: string | undefined;
+}
+export interface CommandResult {
+    readonly stdout: string;
+    readonly stderr: string;
+    readonly exitCode: number;
+    readonly timedOut: boolean;
+    readonly filePaths: readonly string[];
+    readonly error?: string | undefined;
+}
+export interface CommandReader {
+    run(request: CommandRequest): Promise<CommandResult>;
+}

package/dist/contract/command.js

@@ -0,0 +1 @@
+export {};

package/dist/contract/data.d.ts

@@ -16,7 +16,8 @@ export interface BrowserDataRequest extends DataRequestBase {
 }
 export interface CommandDataRequest extends DataRequestBase {
     readonly kind: 'command';
-    readonly command: string;
+    readonly adapter: string;
+    readonly argv: readonly string[];
 }
 export type DataRequest = HttpDataRequest | BrowserDataRequest | CommandDataRequest;
 export type DataErrorCode = 'invalid-request' | 'http' | 'auth' | 'timeout' | 'parse' | 'command' | 'browser';

package/dist/contract/extension.d.ts

@@ -0,0 +1,14 @@
+export type ExtensionSession = 'persistent' | 'ephemeral' | 'none';
+export interface ExtensionCallOptions {
+    readonly key?: string;
+    readonly workdir?: string;
+    readonly session?: ExtensionSession;
+    readonly timeoutMs?: number;
+}
+export interface ExtensionValue<T = unknown> {
+    readonly value: T;
+    readonly at: number;
+}
+export interface ExtensionCaller {
+    json(args: readonly string[], options?: ExtensionCallOptions): Promise<ExtensionValue>;
+}

package/dist/contract/extension.js

@@ -0,0 +1 @@
+export {};

package/dist/contract/git.d.ts

@@ -0,0 +1,38 @@
+export type OriginRead = {
+    readonly kind: 'ok';
+    readonly remote: string;
+} | {
+    readonly kind: 'no-origin';
+    readonly detail?: string;
+} | {
+    readonly kind: 'unknown';
+    readonly reason: string;
+    readonly detail?: string;
+};
+export type BranchRead = {
+    readonly kind: 'ok';
+    readonly branch: string;
+} | {
+    readonly kind: 'no-branch';
+    readonly detail?: string | undefined;
+} | {
+    readonly kind: 'unknown';
+    readonly reason: string;
+    readonly detail?: string | undefined;
+};
+export type HeadRead = {
+    readonly kind: 'ok';
+    readonly commit: string;
+} | {
+    readonly kind: 'no-head';
+    readonly detail?: string;
+} | {
+    readonly kind: 'unknown';
+    readonly reason: string;
+    readonly detail?: string;
+};
+export interface GitReader {
+    origin(path: string): Promise<OriginRead>;
+    branch(path: string): Promise<BranchRead>;
+    head(path: string): Promise<HeadRead>;
+}

package/dist/contract/git.js

@@ -0,0 +1 @@
+export {};

package/dist/contract/lib.d.ts

@@ -0,0 +1,4 @@
+import type { LibNeed } from './needs.js';
+export interface LibReader {
+    load<T = unknown>(need: LibNeed, entry: string): Promise<T>;
+}

package/dist/contract/lib.js

@@ -0,0 +1 @@
+export {};

package/dist/host/adapter-set.js

@@ -220,6 +220,7 @@ export function withDefaultAdapterSet(defaults, loaded) {
         id: set.id ?? defaults.id,
         version: set.version ?? defaults.version,
         data: set.data ?? defaults.data,
+        libs: set.libs ?? defaults.libs,
         supply: set.supply ?? defaults.supply,
         modules: set.modules ?? defaults.modules,
         profile: set.profile ?? defaults.profile,

package/dist/host/adapters.d.ts

@@ -1,5 +1,8 @@
 import type { DshHostContext } from '../api/dsh.js';
 import type { DataReader } from '../contract/data.js';
+import type { LibReader } from '../contract/lib.js';
+import type { GitReader } from '../contract/git.js';
+import type { CommandReader } from '../contract/command.js';
 import type { EnvSupplyPort, HostActions, ModulePort, PluginSurface, ProbePort, ProfilePort, RuntimePort } from './port-types.js';
 export declare const WORKBENCH_ADAPTERS = "workbenchAdapters";
 export declare const ADAPTER_SET_API_VERSION = 1;
@@ -9,6 +12,9 @@ export interface AdapterSet {
     readonly id: string;
     readonly version: string;
     readonly data: DataReader;
+    readonly libs?: LibReader | undefined;
+    readonly git?: GitReader | undefined;
+    readonly commands?: CommandReader | undefined;
     readonly supply: EnvSupplyPort;
     readonly modules: ModulePort;
     readonly profile: ProfilePort;

package/dist/host/extension.d.ts

@@ -0,0 +1,7 @@
+import type { DataReader } from '../contract/data.js';
+import type { ExtensionCaller } from '../contract/extension.js';
+import type { ExtensionNeed } from '../contract/needs.js';
+export interface ExtensionCallerOptions {
+    readonly suiteId?: string | undefined;
+}
+export declare function extensionCallerOf(data: DataReader, need: ExtensionNeed, callerOptions?: ExtensionCallerOptions): ExtensionCaller;

package/dist/host/extension.js

@@ -0,0 +1,39 @@
+import { WorkbenchDataError } from './data-error.js';
+function cliCodeOf(code) {
+    if (code === 'auth')
+        return 'auth-required';
+    if (code === 'timeout')
+        return 'cli-timeout';
+    if (code === 'parse')
+        return 'cli-bad-output';
+    return 'cli-exec-failed';
+}
+export function extensionCallerOf(data, need, callerOptions = {}) {
+    return {
+        async json(args, options = {}) {
+            const result = await data.read({
+                kind: 'command',
+                adapter: need.runtime,
+                argv: [need.name, ...args],
+                ...(options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs }),
+            });
+            if (result.ok)
+                return { value: result.data, at: Date.now() };
+            const code = result.error.pageCode ?? cliCodeOf(result.error.code);
+            const command = [need.name, ...args].join(' ');
+            const advice = code === 'cli-unclassified'
+                ? `这条命令（${command}）在这份 ${need.name} 插件里可能不存在（插件版本旧就会缺）：用 workbench_modules_update（id=${callerOptions.suiteId ?? need.name}）升级，或在面板的模块状态里点更新，再重试。终端确认：opencli ${need.name} ${args[0] ?? ''} --help`
+                : undefined;
+            const hint = advice === undefined
+                ? result.error.hint
+                : result.error.hint === undefined
+                    ? advice
+                    : `${advice}\n${result.error.hint}`;
+            throw new WorkbenchDataError(code, advice === undefined ? result.error.message : `${result.error.message}。${advice}`, {
+                ...(result.error.detail === undefined ? {} : { detail: result.error.detail }),
+                ...(hint === undefined ? {} : { hint }),
+                ...(result.error.helpUrl === undefined ? {} : { helpUrl: result.error.helpUrl }),
+            });
+        },
+    };
+}

package/dist/host/git.d.ts

@@ -1,39 +1,8 @@
 import type { DshShell } from '../api/dsh.js';
-export type OriginRead = {
-    readonly kind: 'ok';
-    readonly remote: string;
-} | {
-    readonly kind: 'no-origin';
-    readonly detail?: string;
-} | {
-    readonly kind: 'unknown';
-    readonly reason: string;
-    readonly detail?: string;
-};
+export type { BranchRead, HeadRead, OriginRead, } from '../contract/git.js';
+import type { BranchRead, HeadRead, OriginRead } from '../contract/git.js';
 export type OriginReader = (path: string) => Promise<OriginRead>;
-export type BranchRead = {
-    readonly kind: 'ok';
-    readonly branch: string;
-} | {
-    readonly kind: 'no-branch';
-    readonly detail?: string | undefined;
-} | {
-    readonly kind: 'unknown';
-    readonly reason: string;
-    readonly detail?: string | undefined;
-};
 export type BranchReader = (path: string) => Promise<BranchRead>;
-export type HeadRead = {
-    readonly kind: 'ok';
-    readonly commit: string;
-} | {
-    readonly kind: 'no-head';
-    readonly detail?: string;
-} | {
-    readonly kind: 'unknown';
-    readonly reason: string;
-    readonly detail?: string;
-};
 export type HeadReader = (path: string) => Promise<HeadRead>;
 export declare function createHeadReader(options: {
     shell: DshShell;

package/dist/host/http.js

@@ -70,7 +70,7 @@ export function registerApi(ctx, routes) {
                 sendJson(res, 200, await handler(search));
             }
             catch (error) {
-                if (error instanceof WorkbenchDataError) {
+                if (isDataError(error)) {
                     sendJson(res, 200, { ok: false, error: toErrorPayload(error) });
                     return;
                 }

package/dist/host/market-index.js

@@ -1,6 +1,7 @@
 import { createHash } from 'node:crypto';
 import { MARKET_INDEX_FORMAT } from '../contract/protocol/market-index.js';
 import { marketText } from '../lib/market-index.js';
+import { compareVersions, isValidVersion } from './version.js';
 export { marketBranchOk, marketInstallTarget, marketText } from '../lib/market-index.js';
 export const MARKET_INDEX_SEED = '{\n  "format": 1,\n  "plugins": []\n}\n';
 export const MARKET_INDEX_README_LINES = [
@@ -23,7 +24,6 @@ export const MARKET_INDEX_README_LINES = [
     '在工作台的「模块市场 → 发现」里添加本仓库地址，即可浏览与安装。',
     '',
 ];
-const SEMVER = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+([0-9A-Za-z.-]+))?$/;
 const NPM_NAME = /^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/;
 const GIT_COMMIT = /^[0-9a-f]{40}$/;
 const MAX_ICON_CHARS = 32 * 1024;
@@ -52,48 +52,7 @@ function problem(kind, detail, at) {
     return { kind, detail, ...(at === undefined ? {} : { at }) };
 }
 export function compareSemver(left, right) {
-    const a = SEMVER.exec(left);
-    const b = SEMVER.exec(right);
-    if (a === null || b === null)
-        return undefined;
-    for (let index = 1; index <= 3; index += 1) {
-        const diff = Number(a[index]) - Number(b[index]);
-        if (diff !== 0)
-            return diff > 0 ? 1 : -1;
-    }
-    const preA = a[4];
-    const preB = b[4];
-    if (preA === undefined && preB === undefined)
-        return 0;
-    if (preA === undefined)
-        return 1;
-    if (preB === undefined)
-        return -1;
-    const leftParts = preA.split('.');
-    const rightParts = preB.split('.');
-    for (let index = 0; index < Math.max(leftParts.length, rightParts.length); index += 1) {
-        const one = leftParts[index];
-        const other = rightParts[index];
-        if (one === undefined)
-            return -1;
-        if (other === undefined)
-            return 1;
-        const oneNumber = /^\d+$/.test(one);
-        const otherNumber = /^\d+$/.test(other);
-        if (oneNumber && otherNumber) {
-            const diff = Number(one) - Number(other);
-            if (diff !== 0)
-                return diff > 0 ? 1 : -1;
-            continue;
-        }
-        if (oneNumber)
-            return -1;
-        if (otherNumber)
-            return 1;
-        if (one !== other)
-            return one > other ? 1 : -1;
-    }
-    return 0;
+    return compareVersions(left, right);
 }
 function sourceOf(raw, at) {
     const record = asRecord(raw);
@@ -129,7 +88,7 @@ function versionOf(raw, at) {
     if (record === undefined)
         return problem('version', '版本必须是一个对象', at);
     const version = asText(record['version']);
-    if (!SEMVER.test(version))
+    if (!isValidVersion(version))
         return problem('version', `版本号不是合法 SemVer：${JSON.stringify(version)}`, at);
     const source = sourceOf(record['source'], `${at}.source`);
     if ('kind' in source)

package/dist/host/port-types.d.ts

@@ -43,6 +43,7 @@ export interface SupplyLatestOptions {
 }
 export interface SupplyMissingPartsOptions {
     readonly shell: DshShell;
+    readonly name: string;
     readonly registry: string;
     readonly version: string;
     readonly force?: boolean;

package/dist/host/release-packages.generated.d.ts

@@ -0,0 +1 @@
+export declare const RELEASE_PACKAGES: readonly ["@dsh-workbench/adapter-probe", "@dsh-workbench/adapter-profile", "@dsh-workbench/adapter-runtime", "@dsh-workbench/adapter-supply", "@dsh-workbench/adapters-default", "@dsh-workbench/core", "@dsh-workbench/module-tools", "@dsh-workbench/shared"];

package/dist/host/release-packages.generated.js

@@ -0,0 +1,10 @@
+export const RELEASE_PACKAGES = [
+    '@dsh-workbench/adapter-probe',
+    '@dsh-workbench/adapter-profile',
+    '@dsh-workbench/adapter-runtime',
+    '@dsh-workbench/adapter-supply',
+    '@dsh-workbench/adapters-default',
+    '@dsh-workbench/core',
+    '@dsh-workbench/module-tools',
+    '@dsh-workbench/shared',
+];

package/dist/host/tool-kit.d.ts

@@ -12,9 +12,3 @@ export declare const TEXT_OUTPUT: {
     render: typeof textRender;
 };
 export declare function jsonText(value: unknown): string;
-export interface CommandHintNames {
-    readonly plugin: string;
-    readonly suiteId: string;
-}
-export type CommandHint = <T>(command: string, run: () => Promise<T>) => Promise<T>;
-export declare function commandHintFor(names: CommandHintNames): CommandHint;

package/dist/host/tool-kit.js

@@ -1,4 +1,3 @@
-import { WorkbenchDataError } from './data-error.js';
 export function sessionWorkspace(exec) {
     const cwd = exec?.agent?.session?.header?.cwd;
     return typeof cwd === 'string' && cwd.trim() !== '' ? cwd.trim() : null;
@@ -18,24 +17,3 @@ export const TEXT_OUTPUT = { schema: { type: 'object', properties: {}, additiona
 export function jsonText(value) {
     return JSON.stringify(value);
 }
-const UNCLASSIFIED = 'cli-unclassified';
-export function commandHintFor(names) {
-    return async (command, run) => {
-        try {
-            return await run();
-        }
-        catch (error) {
-            if (!(error instanceof WorkbenchDataError) || error.code !== UNCLASSIFIED)
-                throw error;
-            const advice = `这条命令（${command}）在这份 ${names.plugin} 插件里可能不存在（插件版本旧就会缺）：` +
-                `用 workbench_modules_update（id=${names.suiteId}）升级插件，或在面板的模块状态里点更新，再重试。`;
-            throw new WorkbenchDataError(error.code, `${error.message}。${advice}`, {
-                ...(error.detail === undefined ? {} : { detail: error.detail }),
-                hint: `升级：workbench_modules_update（id=${names.suiteId}）。` +
-                    `终端确认：opencli ${names.plugin} ${command} --help${error.hint === undefined ? '' : `\n${error.hint}`}`,
-                ...(error.helpUrl === undefined ? {} : { helpUrl: error.helpUrl }),
-                ...(error.project === undefined ? {} : { project: error.project }),
-            });
-        }
-    };
-}

package/dist/host/unit-face.d.ts

@@ -8,6 +8,9 @@ import type { ApprovalCall, ApprovalFacts, ApprovalPolicy } from '../host/tool-a
 import type { ValueHandoff } from '../host/value-handoff.js';
 import type { WorkspaceStore } from '../host/workspace-store.js';
 import type { DataReader } from '../contract/data.js';
+import type { LibReader } from '../contract/lib.js';
+import type { GitReader } from '../contract/git.js';
+import type { CommandReader } from '../contract/command.js';
 export interface ToolScopeContext {
     readonly workspace: string | null;
     readonly preset: string | null;
@@ -23,6 +26,10 @@ export interface UnitMountDeps {
     readonly ownedUnits: () => readonly string[];
     readonly installable?: (() => readonly string[]) | undefined;
     readonly data: DataReader;
+    readonly env?: Readonly<Record<string, string | undefined>> | undefined;
+    readonly libs?: LibReader | undefined;
+    readonly git?: GitReader | undefined;
+    readonly commands?: CommandReader | undefined;
     readonly store: WorkspaceStore;
     readonly values?: ValueHandoff | undefined;
     readonly probe?: (unit: string, options?: {

package/dist/host/version-range.js

@@ -1,73 +1,13 @@
-import { compareVersions } from './version.js';
-function readable(version) {
-    return compareVersions(version, '0.0.0') !== undefined;
-}
-function segmentsOf(version) {
-    if (!readable(version))
-        return undefined;
-    return version.split('.').map((part) => Number.parseInt(part, 10));
-}
-function caretUpper(base) {
-    const [major = 0, minor = 0, patch = 0] = base;
-    if (major > 0)
-        return `${major + 1}.0.0`;
-    return minor > 0 ? `0.${minor + 1}.0` : `0.0.${patch + 1}`;
-}
-function tildeUpper(base) {
-    const [major = 0, minor = 0] = base;
-    return `${major}.${minor + 1}.0`;
-}
-function comparator(token, version) {
-    const match = /^(>=|<=|>|<|=|\^|~)?\s*(.+)$/.exec(token.trim());
-    if (match === null)
-        return undefined;
-    const [, operator = '', raw = ''] = match;
-    const base = segmentsOf(raw.trim());
-    if (base === undefined)
-        return undefined;
-    const at = (other) => compareVersions(version, other);
-    switch (operator) {
-        case '^':
-            return (at(raw) ?? -1) >= 0 && (at(caretUpper(base)) ?? 1) < 0;
-        case '~':
-            return (at(raw) ?? -1) >= 0 && (at(tildeUpper(base)) ?? 1) < 0;
-        default:
-            break;
-    }
-    const compared = at(raw.trim());
-    if (compared === undefined)
-        return undefined;
-    switch (operator) {
-        case '>=':
-            return compared >= 0;
-        case '<=':
-            return compared <= 0;
-        case '>':
-            return compared > 0;
-        case '<':
-            return compared < 0;
-        case '=':
-        case '':
-            return compared === 0;
-        default:
-            return undefined;
-    }
-}
+import semver from 'semver';
 export function checkVersionRange(contract, version) {
     const spec = contract?.trim() ?? '';
     if (spec === '')
         return 'satisfied';
-    if (!readable(version))
+    const range = semver.validRange(spec);
+    if (range === null)
         return 'malformed';
-    const tokens = spec.split(/\s+/).filter((token) => token !== '');
-    if (tokens.length === 0)
-        return 'satisfied';
-    for (const token of tokens) {
-        const verdict = comparator(token, version);
-        if (verdict === undefined)
-            return 'malformed';
-        if (!verdict)
-            return 'unsatisfied';
-    }
-    return 'satisfied';
+    const parsed = semver.coerce(version);
+    if (parsed === null)
+        return 'malformed';
+    return semver.satisfies(parsed, range) ? 'satisfied' : 'unsatisfied';
 }

package/dist/host/version.d.ts

@@ -1,3 +1,4 @@
-export declare function runningVersionOf(moduleUrl: string): string | undefined;
-export declare function compareVersions(a: string, b: string): number | undefined;
+export declare function compareVersions(left: string, right: string): number | undefined;
+export declare function isValidVersion(value: string): boolean;
 export declare function isNewerVersion(latest: string, installed: string): boolean;
+export declare function runningVersionOf(moduleUrl: string): string | undefined;

package/dist/host/version.js

@@ -1,25 +1,14 @@
 import { readFileSync } from 'node:fs';
-export function runningVersionOf(moduleUrl) {
-    try {
-        const read = JSON.parse(readFileSync(new URL('../../package.json', moduleUrl), 'utf8'));
-        return typeof read.version === 'string' && read.version !== '' ? read.version : undefined;
-    }
-    catch {
+import semver from 'semver';
+export function compareVersions(left, right) {
+    const a = semver.valid(left.trim());
+    const b = semver.valid(right.trim());
+    if (a === null || b === null)
         return undefined;
-    }
+    return semver.compare(a, b);
 }
-export function compareVersions(a, b) {
-    const na = a.split('.').map((part) => Number.parseInt(part, 10));
-    const nb = b.split('.').map((part) => Number.parseInt(part, 10));
-    if (na.some(Number.isNaN) || nb.some(Number.isNaN))
-        return undefined;
-    for (let index = 0; index < Math.max(na.length, nb.length); index += 1) {
-        const left = na[index] ?? 0;
-        const right = nb[index] ?? 0;
-        if (left !== right)
-            return left > right ? 1 : -1;
-    }
-    return 0;
+export function isValidVersion(value) {
+    return semver.valid(value.trim()) !== null;
 }
 export function isNewerVersion(latest, installed) {
     if (latest === installed)
@@ -27,3 +16,12 @@ export function isNewerVersion(latest, installed) {
     const compared = compareVersions(latest, installed);
     return compared === undefined ? true : compared > 0;
 }
+export function runningVersionOf(moduleUrl) {
+    try {
+        const read = JSON.parse(readFileSync(new URL('../../package.json', moduleUrl), 'utf8'));
+        return typeof read.version === 'string' && read.version !== '' ? read.version : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}