zeed 1.2.4 → 1.3.1

package/dist/common/exec/pool.d.cts

@@ -1,84 +1,2 @@
-import { Disposer, DisposerFunction } from '../dispose-types.cjs';
-import { Progress } from './progress.cjs';
-import { Emitter, DefaultListener } from '../msg/emitter.cjs';
-import '../global.cjs';
-import '../log/log.cjs';
-import '../log/log-console-original.cjs';
-import '../schema/export-swift.cjs';
-import '../schema/parse-args.cjs';
-import '../schema/parse-env.cjs';
-import '../log/log-base.cjs';
-import '../schema/schema.cjs';
-
-type PoolTaskIdConflictResolution = 'replace' | 'memoize' | 'prioritize' | 'error';
-interface PoolConfig {
-    name?: string;
-    maxParallel?: number;
-    idConflictResolution?: PoolTaskIdConflictResolution;
-}
-type PoolTaskFn<T = any> = (taskInfo: PoolTask<T>) => Promise<T>;
-type PoolTaskState = 'waiting' | 'running' | 'finished';
-/** Task */
-interface PoolTask<T> {
-    readonly id: string;
-    readonly task: PoolTaskFn<T>;
-    readonly done: (result?: any) => void;
-    readonly setMax: (max: number) => void;
-    readonly setResolved: (resolved: number) => void;
-    readonly incResolved: (inc?: number) => void;
-    state: PoolTaskState;
-    priority: number;
-    /** Same groups are executed only one at a time */
-    group?: string;
-    progress: Progress;
-    max: number;
-    resolved: number;
-    result?: T;
-    payload?: unknown;
-}
-interface PoolTaskEvents {
-    didUpdate: (max: number, resolved: number, presentMax: number, presentResolved: number) => void;
-    didStart: (id: string) => void;
-    didCancel: (id: string) => void;
-    didFinish: () => void;
-    didResolve: (id: string, value: any) => void;
-    didReject: (id: string, error: any) => void;
-}
-declare function usePool<T = any>(config?: PoolConfig): {
-    events: Emitter<PoolTaskEvents, DefaultListener>;
-    cancel: (id: string) => void;
-    cancelAll: () => void;
-    hasById: (id: string) => boolean;
-    progress: Progress;
-    enqueue: <P>(task: PoolTaskFn<T>, config?: {
-        id?: string;
-        max?: number;
-        resolved?: number;
-        group?: string;
-        idConflictResolution?: PoolTaskIdConflictResolution;
-        payload?: P;
-    }) => {
-        id: string;
-        promise: Promise<any>;
-        dispose: () => void;
-        cancel: () => void;
-    };
-    dispose: ((strictSync?: boolean) => Promise<any> | void) & {
-        disposed: number;
-        add: (obj?: Disposer) => DisposerFunction | undefined;
-        remove: (disposable: Disposer) => Promise<void> | void;
-        track: (obj?: Disposer) => DisposerFunction | undefined;
-        untrack: (disposable: Disposer) => Promise<void> | void;
-        dispose: (strictSync?: boolean) => Promise<any> | void;
-        disposeSync: () => void;
-        sync: () => void;
-        exec: (strictSync?: boolean) => Promise<any> | void;
-        getSize(): number;
-        isDisposed(): boolean;
-        [Symbol.dispose](): void | Promise<any>;
-        [Symbol.asyncDispose](): Promise<any>;
-    };
-    waitFinishAll: () => Promise<unknown>;
-};
-
-export { type PoolConfig, type PoolTask, type PoolTaskEvents, type PoolTaskFn, type PoolTaskIdConflictResolution, type PoolTaskState, usePool };
+import { a as PoolTask, c as PoolTaskIdConflictResolution, i as PoolConfig, l as PoolTaskState, o as PoolTaskEvents, s as PoolTaskFn, u as usePool } from "../../index-DHXVOH8h.cjs";
+export { PoolConfig, PoolTask, PoolTaskEvents, PoolTaskFn, PoolTaskIdConflictResolution, PoolTaskState, usePool };

package/dist/common/exec/pool.d.mts

@@ -0,0 +1,2 @@
+import { a as PoolTask, c as PoolTaskIdConflictResolution, i as PoolConfig, l as PoolTaskState, o as PoolTaskEvents, s as PoolTaskFn, u as usePool } from "../../index-DMaPyx9O.mjs";
+export { PoolConfig, PoolTask, PoolTaskEvents, PoolTaskFn, PoolTaskIdConflictResolution, PoolTaskState, usePool };

package/dist/common/exec/pool.mjs

@@ -0,0 +1,181 @@
+import { createPromise } from "./promise.mjs";
+import { useDispose } from "../dispose-defer.mjs";
+import { Emitter } from "../msg/emitter.mjs";
+import { uname, uuid } from "../uuid.mjs";
+import { Progress } from "./progress.mjs";
+
+//#region src/common/exec/pool.ts
+function usePool(config = {}) {
+	const { maxParallel = 3, name = uname("pool"), idConflictResolution = "memoize" } = config;
+	const events = new Emitter();
+	const dispose = useDispose();
+	dispose.add(cancelAll);
+	const progress = new Progress({ name });
+	progress.on("progressCancelled", cancelAll);
+	let countMax = 0;
+	let countResolved = 0;
+	let currentParallel = 0;
+	let priority = 0;
+	const tasks = {};
+	async function waitFinishAll() {
+		if (countMax > 0) {
+			const [promise, resolve] = createPromise();
+			events.once("didFinish", resolve);
+			return promise;
+		}
+	}
+	async function cleanupFinished() {
+		for (const id of Object.keys(tasks)) if (tasks[id].state === "finished") {
+			await tasks[id].progress.dispose();
+			delete tasks[id];
+		}
+	}
+	function didFinish() {
+		events.emit("didFinish");
+		countMax = 0;
+		countResolved = 0;
+		cleanupFinished();
+		progress.reset();
+	}
+	function didUpdate() {
+		let presentMax = 0;
+		let presentResolved = 0;
+		for (const { max, resolved, state } of Object.values(tasks)) {
+			presentMax += max;
+			presentResolved += state === "finished" ? max : Math.min(max, resolved);
+		}
+		events.emit("didUpdate", countMax, countResolved, presentMax, presentResolved);
+	}
+	function performNext() {
+		didUpdate();
+		if (countMax > 0 && countMax === countResolved) didFinish();
+		if (currentParallel >= maxParallel) return;
+		const waitingTasks = Object.values(tasks).filter((t) => t.state === "waiting");
+		if (waitingTasks.length > 0) {
+			let taskInfo;
+			for (const t of waitingTasks) {
+				if (t.group != null && Object.values(tasks).some((tt) => tt.state === "running" && tt.id !== t.id && tt.group === t.group)) continue;
+				if (taskInfo == null || t.priority < taskInfo.priority) taskInfo = t;
+			}
+			if (taskInfo != null) {
+				const id = taskInfo.id;
+				const done = taskInfo.done;
+				taskInfo.state = "running";
+				++currentParallel;
+				events.emit("didStart", id);
+				const taskFinished = (result) => {
+					if (taskInfo) {
+						taskInfo.result = result;
+						taskInfo.state = "finished";
+						taskInfo.resolved = taskInfo.max;
+						taskInfo.progress?.setCompleted();
+					}
+					--currentParallel;
+					++countResolved;
+					performNext();
+				};
+				taskInfo.task(taskInfo).then((r) => {
+					done(r);
+					events.emit("didResolve", id, r);
+					taskFinished(r);
+				}).catch((err) => {
+					done();
+					events.emit("didReject", id, err);
+					taskFinished();
+				});
+			}
+		}
+	}
+	function cancel(id) {
+		const taskInfo = tasks[id];
+		if (taskInfo && taskInfo.state === "waiting") {
+			tasks[id].state = "finished";
+			++countResolved;
+			events.emit("didCancel", id);
+			tasks[id].progress.dispose();
+			didUpdate();
+		}
+	}
+	function cancelAll() {
+		Object.keys(tasks).forEach(cancel);
+	}
+	function hasById(id) {
+		return tasks[id] != null;
+	}
+	function enqueue(task, config = {}) {
+		let done;
+		const promise = new Promise((resolve) => done = resolve);
+		const id = config.id ?? uuid();
+		if (tasks[id] != null) {
+			const resolution = config.idConflictResolution ?? idConflictResolution;
+			if (resolution === "replace") cancel(id);
+			else if (resolution === "memoize" || resolution === "prioritize") {
+				const runningTask = tasks[id];
+				if (resolution === "prioritize") runningTask.priority = ++priority;
+				return {
+					id,
+					promise: (async () => {
+						if (runningTask.state === "finished") return tasks[id].result;
+					})(),
+					dispose: () => cancel(id),
+					cancel: () => cancel(id)
+				};
+			} else throw new Error(`Pool task with id=${id} already exists!`);
+		}
+		const taskProgress = new Progress({
+			name: id,
+			totalUnits: config.max ?? 1,
+			completeUnits: config.resolved ?? 0
+		});
+		progress.addChild(taskProgress);
+		tasks[id] = {
+			id,
+			task,
+			priority: ++priority,
+			group: config.group,
+			state: "waiting",
+			max: config.max ?? 1,
+			resolved: config.resolved ?? 0,
+			done,
+			payload: config.payload,
+			progress: taskProgress,
+			setMax(units) {
+				taskProgress.setTotalUnits(units);
+				tasks[id].max = units;
+				didUpdate();
+			},
+			setResolved(units) {
+				taskProgress.setCompletetedUnits(units);
+				tasks[id].resolved = units;
+				didUpdate();
+			},
+			incResolved(inc = 1) {
+				taskProgress.incCompletedUnits(inc);
+				tasks[id].resolved += inc;
+				didUpdate();
+			}
+		};
+		++countMax;
+		performNext();
+		return {
+			id,
+			promise,
+			dispose: () => cancel(id),
+			cancel: () => cancel(id)
+		};
+	}
+	return {
+		events,
+		cancel,
+		cancelAll,
+		hasById,
+		progress,
+		enqueue,
+		dispose,
+		waitFinishAll
+	};
+}
+
+//#endregion
+export { usePool };
+//# sourceMappingURL=pool.mjs.map

package/dist/common/exec/pool.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"pool.mjs","names":[],"sources":["../../../src/common/exec/pool.ts"],"sourcesContent":["import { useDispose } from '../dispose-defer'\nimport { Emitter } from '../msg/emitter'\nimport { uname, uuid } from '../uuid'\nimport { Progress } from './progress'\nimport { createPromise } from './promise'\n\nexport type PoolTaskIdConflictResolution = 'replace' | 'memoize' | 'prioritize' | 'error'\n\n// export enum PoolTaskIdConflictResolution {\n//   /**\n//    * Tasks with same `id` are replaced. Newest wins.\n//    */\n//   replace = 0,\n\n//   /**\n//    * Task with same `id` will continue to run. Reference is returned with option to cancel.\n//    * Named \"memoize\" because the result of the task should always be the same for the same `id`,\n//    * like e.g. a download.\n//    */\n//   memoize = 1,\n\n//   /** Like memoize, but try to put on top of the list */\n//   prioritize = 2,\n\n//   /**\n//    * Tasks with same `id` throw error\n//    */\n//   error = 3,\n\n// }\n\nexport interface PoolConfig {\n  name?: string\n  maxParallel?: number\n  idConflictResolution?: PoolTaskIdConflictResolution\n}\n\nexport type PoolTaskFn<T = any> = (taskInfo: PoolTask<T>) => Promise<T>\n\nexport type PoolTaskState = 'waiting' | 'running' | 'finished'\n\n/** Task */\nexport interface PoolTask<T> {\n  readonly id: string\n  readonly task: PoolTaskFn<T>\n  readonly done: (result?: any) => void\n  readonly setMax: (max: number) => void\n  readonly setResolved: (resolved: number) => void\n  readonly incResolved: (inc?: number) => void\n  state: PoolTaskState\n  priority: number\n  /** Same groups are executed only one at a time */\n  group?: string\n\n  progress: Progress\n  max: number\n  resolved: number\n\n  result?: T\n  payload?: unknown\n}\n\nexport interface PoolTaskEvents {\n  didUpdate: (\n    max: number,\n    resolved: number,\n    presentMax: number,\n    presentResolved: number,\n  ) => void\n  didStart: (id: string) => void\n  didCancel: (id: string) => void\n  didFinish: () => void\n  didResolve: (id: string, value: any) => void\n  didReject: (id: string, error: any) => void\n}\n\n// todo: barrier\n// todo: dependents\n\nexport function usePool<T = any>(config: PoolConfig = {}) {\n  const {\n    maxParallel = 3,\n    name = uname('pool'),\n    idConflictResolution = 'memoize',\n  } = config\n\n  const events = new Emitter<PoolTaskEvents>()\n\n  const dispose = useDispose()\n  dispose.add(cancelAll)\n\n  const progress = new Progress({ name })\n\n  progress.on('progressCancelled', cancelAll)\n\n  let countMax = 0\n  let countResolved = 0\n  let currentParallel = 0\n  let priority = 0\n  const tasks: Record<string, PoolTask<T>> = {}\n\n  // const [allFinishedPromise, allFinishedResolve] = createPromise()\n\n  async function waitFinishAll() {\n    if (countMax > 0) {\n      const [promise, resolve] = createPromise()\n      events.once('didFinish', resolve)\n      return promise\n    }\n  }\n\n  async function cleanupFinished() {\n    for (const id of Object.keys(tasks)) {\n      const task = tasks[id]\n      if (task.state === 'finished') {\n        await tasks[id].progress.dispose()\n        delete tasks[id]\n      }\n    }\n  }\n\n  function didFinish() {\n    void events.emit('didFinish')\n    // allFinishedResolve(countMax)\n    countMax = 0\n    countResolved = 0\n    void cleanupFinished()\n    progress.reset()\n  }\n\n  function didUpdate() {\n    let presentMax = 0\n    let presentResolved = 0\n    for (const { max, resolved, state } of Object.values(tasks)) {\n      presentMax += max\n      presentResolved += state === 'finished' ? max : Math.min(max, resolved)\n    }\n    void events.emit(\n      'didUpdate',\n      countMax,\n      countResolved,\n      presentMax,\n      presentResolved,\n    )\n  }\n\n  function performNext() {\n    didUpdate()\n    if (countMax > 0 && countMax === countResolved)\n      didFinish()\n    if (currentParallel >= maxParallel)\n      return\n    const waitingTasks = Object.values(tasks).filter(\n      t => t.state === 'waiting',\n    )\n    if (waitingTasks.length > 0) {\n      let taskInfo: PoolTask<T> | undefined\n      for (const t of waitingTasks) {\n        // Skip task if one of same group is running.\n        // Forces serialized execution for subgroup of tasks.\n        if (\n          t.group != null\n          && Object.values(tasks).some(\n            tt =>\n              tt.state === 'running'\n              && tt.id !== t.id\n              && tt.group === t.group,\n          )\n        ) {\n          continue\n        }\n\n        // fifo\n        if (taskInfo == null || t.priority < taskInfo.priority)\n          taskInfo = t\n      }\n      if (taskInfo != null) {\n        const id = taskInfo.id\n        const done = taskInfo.done\n        taskInfo.state = 'running'\n        ++currentParallel\n        void events.emit('didStart', id)\n\n        const taskFinished = (result?: T) => {\n          if (taskInfo) {\n            taskInfo.result = result\n            taskInfo.state = 'finished'\n            taskInfo.resolved = taskInfo.max\n            taskInfo.progress?.setCompleted()\n            // void taskInfo.progress.dispose()\n          }\n          --currentParallel\n          ++countResolved\n          performNext()\n        }\n\n        taskInfo\n          .task(taskInfo)\n          .then((r) => {\n            done(r)\n            void events.emit('didResolve', id, r)\n            taskFinished(r)\n          })\n          .catch((err) => {\n            done()\n            void events.emit('didReject', id, err)\n            taskFinished()\n          })\n      }\n    }\n  }\n\n  function cancel(id: string) {\n    const taskInfo = tasks[id]\n    if (taskInfo && taskInfo.state === 'waiting') {\n      tasks[id].state = 'finished'\n      ++countResolved\n      void events.emit('didCancel', id)\n      void tasks[id].progress.dispose()\n      didUpdate()\n    }\n  }\n\n  function cancelAll() {\n    Object.keys(tasks).forEach(cancel)\n    // progress.dispose()\n  }\n\n  function hasById(id: string) {\n    return tasks[id] != null\n  }\n\n  function enqueue<P>(\n    task: PoolTaskFn<T>,\n    config: {\n      id?: string\n      max?: number\n      resolved?: number\n      group?: string\n      idConflictResolution?: PoolTaskIdConflictResolution\n      payload?: P\n    } = {},\n  ) {\n    let done: any\n    const promise: Promise<any> = new Promise(resolve => (done = resolve))\n    const id = config.id ?? uuid()\n\n    if (tasks[id] != null) {\n      const resolution = config.idConflictResolution ?? idConflictResolution\n\n      if (resolution === 'replace') {\n        cancel(id)\n      }\n      else if (resolution === 'memoize' || resolution === 'prioritize') {\n        const runningTask = tasks[id]\n\n        if (resolution === 'prioritize')\n          runningTask.priority = ++priority\n\n        return {\n          id,\n          promise: (async () => {\n            if (runningTask.state === 'finished')\n              return tasks[id].result\n\n            // todo: wait for task to finish\n          })(),\n          dispose: () => cancel(id),\n          cancel: () => cancel(id),\n        }\n      }\n      else {\n        throw new Error(`Pool task with id=${id} already exists!`)\n      }\n    }\n\n    const taskProgress = new Progress({\n      name: id,\n      totalUnits: config.max ?? 1,\n      completeUnits: config.resolved ?? 0,\n    })\n\n    progress.addChild(taskProgress)\n\n    tasks[id] = {\n      id,\n      task,\n      priority: ++priority,\n      group: config.group,\n      state: 'waiting',\n      max: config.max ?? 1,\n      resolved: config.resolved ?? 0,\n      done,\n      payload: config.payload,\n      progress: taskProgress,\n\n      /** @deprecated should use `.progress` */\n      setMax(units) {\n        taskProgress.setTotalUnits(units)\n        tasks[id].max = units\n        didUpdate()\n      },\n\n      /** @deprecated should use `.progress` */\n      setResolved(units) {\n        taskProgress.setCompletetedUnits(units)\n        tasks[id].resolved = units\n        didUpdate()\n      },\n\n      /** @deprecated should use `.progress` */\n      incResolved(inc = 1) {\n        taskProgress.incCompletedUnits(inc)\n        tasks[id].resolved += inc\n        didUpdate()\n      },\n    }\n    ++countMax\n    performNext()\n\n    return {\n      id,\n      promise,\n      dispose: () => cancel(id),\n      cancel: () => cancel(id),\n    }\n  }\n\n  return {\n    events,\n    cancel,\n    cancelAll,\n    hasById,\n    progress,\n    enqueue,\n    dispose,\n    waitFinishAll,\n  }\n}\n"],"mappings":"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"}

package/dist/common/exec/progress.cjs

@@ -1,2 +1,150 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _chunkKYNPDWX4cjs = require('../../chunk-KYNPDWX4.cjs');require('../../chunk-ABCQXAMV.cjs');require('../../chunk-WEF4N7J4.cjs');require('../../chunk-7UA33BQW.cjs');require('../../chunk-KYDHX5HW.cjs');require('../../chunk-B2XPF5R4.cjs');require('../../chunk-VX3R7DUJ.cjs');require('../../chunk-JLB5ALZ5.cjs');require('../../chunk-ZJQITDTA.cjs');require('../../chunk-CWGNDC2T.cjs');require('../../chunk-DLVWYIS2.cjs');require('../../chunk-SEQAFKIV.cjs');require('../../chunk-IVUEQANC.cjs');require('../../chunk-IXH5D35S.cjs');require('../../chunk-DRKHTT76.cjs');require('../../chunk-FMMEBQFR.cjs');require('../../chunk-5VHLMAKU.cjs');require('../../chunk-L5IXZXHR.cjs');require('../../chunk-LUPESR7S.cjs');require('../../chunk-A6DSKTWF.cjs');require('../../chunk-OGP3AZFM.cjs');require('../../chunk-TNMEWZPW.cjs');require('../../chunk-BPWOWVF7.cjs');require('../../chunk-ZEDMMWJI.cjs');require('../../chunk-UXW3L3L6.cjs');require('../../chunk-5RHVNJKM.cjs');require('../../chunk-P7XCQ7WV.cjs');exports.Progress = _chunkKYNPDWX4cjs.a;
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_common_data_array = require('../data/array.cjs');
+const require_common_dispose_defer = require('../dispose-defer.cjs');
+const require_common_msg_emitter = require('../msg/emitter.cjs');
+const require_common_uuid = require('../uuid.cjs');
+
+//#region src/common/exec/progress.ts
+/**
+* Progress helper with these properties:
+*
+* - `totalUnits` and `completedUnits` for progress
+* - Can be cancelled
+* - Sends events on cancel, changed and dispose
+* - Supports children and propagates values.
+*   Total progress is sum of all units in the tree.
+* - On `dispose` child removes itself from parent.
+*/
+var Progress = class Progress extends require_common_msg_emitter.Emitter {
+	_totalUnits;
+	_completedUnits;
+	_isCancelled = false;
+	_resetWhenFinished = true;
+	_children = [];
+	dispose = require_common_dispose_defer.useDispose();
+	name;
+	constructor(opt = {}) {
+		super();
+		this._totalUnits = opt.totalUnits ?? 0;
+		this._completedUnits = opt.completeUnits ?? 0;
+		this._resetWhenFinished = opt.resetWhenFinished ?? true;
+		this.name = opt.name ?? require_common_uuid.uname("progress");
+		this.dispose.add(async () => {
+			for (const child of this._children) await child.dispose();
+			await this.emit("progressDispose", this);
+		});
+	}
+	/** Notify others about changes and reset on completion, if flag is set. */
+	update() {
+		this.emit("progressChanged", this);
+		if (this._isCancelled && this._resetWhenFinished) {
+			if (this.getTotalUnits() <= this.getCompletedUnits()) this.reset();
+		}
+	}
+	/** Fresh start */
+	reset() {
+		if (this._isCancelled) {
+			this._isCancelled = false;
+			for (const child of this._children) child.reset();
+			this.update();
+		}
+	}
+	/** Notify and mark as cancelled. May take some time before having an effect. */
+	async cancel() {
+		if (!this._isCancelled) {
+			this._isCancelled = true;
+			await this.emit("progressCancelled", this);
+			for (const child of this._children) await child.cancel();
+			this.update();
+		}
+	}
+	/** Add child progress, which count into its parents units. On `dispose` it will auto remove itself from parent. */
+	addChild(child) {
+		child.on("progressDispose", () => this.removeChild(child));
+		child.on("progressChanged", () => this.update());
+		if (!this._children.includes(child)) this._children.push(child);
+		this.update();
+	}
+	/** Create child progress.  */
+	createChildProgress(opt) {
+		const progress = new Progress(opt);
+		this.addChild(progress);
+		return progress;
+	}
+	removeChild(child) {
+		require_common_data_array.arrayRemoveElement(this._children, child);
+		this.update();
+	}
+	/** Total units including children */
+	getTotalUnits() {
+		if (this.isIndeterminate()) return 0;
+		let units = this._totalUnits;
+		for (const child of this._children) units += child.getTotalUnits();
+		return units;
+	}
+	/** Completed units including children */
+	getCompletedUnits() {
+		if (this.isIndeterminate()) return 0;
+		let units = this._completedUnits;
+		for (const child of this._children) units += child.getCompletedUnits();
+		return units;
+	}
+	/** Cannot calculate progress, because totalUnits are missing. Special representation in UI. */
+	isIndeterminate() {
+		return this._totalUnits <= 0 && this._children.length <= 0;
+	}
+	isCancelled() {
+		return this._isCancelled;
+	}
+	/** Either disposed or all units completed. */
+	isFinished() {
+		return this.dispose.isDisposed() || !this.isIndeterminate() && this.getTotalUnits() <= this.getCompletedUnits();
+	}
+	/** Value from 0 to 1, where 1 is 100% completeness. */
+	getFraction() {
+		if (this.isIndeterminate()) return 0;
+		let value = this.getCompletedUnits() / this.getTotalUnits();
+		if (Number.isNaN(value)) value = 0;
+		return Math.min(1, Math.max(0, value));
+	}
+	getChildrenCount() {
+		return this._children.length;
+	}
+	/** Change total units. */
+	setTotalUnits(units, completedUnits) {
+		this._totalUnits = units;
+		if (completedUnits != null) this._completedUnits = completedUnits;
+		this.update();
+	}
+	/** Relatively change total units. */
+	incTotalUnits(step = 1) {
+		this._totalUnits += step;
+		this.update();
+	}
+	/** Set fixed number of completed units. */
+	setCompletetedUnits(units) {
+		this._completedUnits = units;
+		this.update();
+	}
+	/** Set to 100% without disposing. */
+	setCompleted() {
+		this._completedUnits = this._totalUnits;
+		this.update();
+	}
+	/** Dynamically change completed units. */
+	incCompletedUnits(step = 1) {
+		this._completedUnits += step;
+		this.update();
+	}
+	/** Progress tree to string for debuggin purposes. Consider using `name` attribute of Progress. */
+	toString(indent = 0) {
+		let s = `${"  ".repeat(indent)}${this.name}: ${this._completedUnits} of ${this._totalUnits} units, ${Math.floor(this.getFraction() * 100)} %, cancel=${this._isCancelled}\n`;
+		for (const child of this._children) s += child.toString(indent + 1);
+		if (indent === 0) return s.trim();
+		return s;
+	}
+};
+
+//#endregion
+exports.Progress = Progress;
 //# sourceMappingURL=progress.cjs.map

package/dist/common/exec/progress.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/dirk/work/github-zeed/dist/common/exec/progress.cjs"],"names":[],"mappings":"AAAA,qIAAuC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,oCAAiC,uCAAsB","file":"/Users/dirk/work/github-zeed/dist/common/exec/progress.cjs"}
+{"version":3,"file":"progress.cjs","names":["Emitter","useDispose","uname"],"sources":["../../../src/common/exec/progress.ts"],"sourcesContent":["// Inspired by https://developer.apple.com/documentation/foundation/progress\n\nimport { arrayRemoveElement } from '../data/array'\nimport { useDispose } from '../dispose-defer'\nimport { Emitter } from '../msg/emitter'\nimport { uname } from '../uuid'\n\nexport interface ProgressOptions {\n  totalUnits?: number\n  completeUnits?: number\n  resetWhenFinished?: boolean\n  name?: string\n}\n\n/**\n * Progress helper with these properties:\n *\n * - `totalUnits` and `completedUnits` for progress\n * - Can be cancelled\n * - Sends events on cancel, changed and dispose\n * - Supports children and propagates values.\n *   Total progress is sum of all units in the tree.\n * - On `dispose` child removes itself from parent.\n */\nexport class Progress extends Emitter<{\n  progressCancelled: (progress: Progress) => void\n  progressChanged: (progress: Progress) => void\n  progressDispose: (progress: Progress) => void\n}> {\n  private _totalUnits: number\n  private _completedUnits: number\n  private _isCancelled = false\n  private _resetWhenFinished = true\n  private _children: Progress[] = []\n\n  dispose = useDispose()\n  name: string\n\n  constructor(opt: ProgressOptions = {}) {\n    super()\n\n    this._totalUnits = opt.totalUnits ?? 0\n    this._completedUnits = opt.completeUnits ?? 0\n    this._resetWhenFinished = opt.resetWhenFinished ?? true\n    this.name = opt.name ?? uname('progress')\n\n    // Make sure to cleanup also children\n    this.dispose.add(async () => {\n      for (const child of this._children)\n        await child.dispose()\n      await this.emit('progressDispose', this)\n    })\n  }\n\n  /** Notify others about changes and reset on completion, if flag is set. */\n  private update() {\n    void this.emit('progressChanged', this)\n\n    if (this._isCancelled && this._resetWhenFinished) {\n      if (this.getTotalUnits() <= this.getCompletedUnits())\n        this.reset()\n    }\n  }\n\n  /** Fresh start */\n  reset() {\n    if (this._isCancelled) {\n      this._isCancelled = false\n      for (const child of this._children)\n        child.reset()\n      this.update()\n    }\n  }\n\n  /** Notify and mark as cancelled. May take some time before having an effect. */\n  async cancel() {\n    if (!this._isCancelled) {\n      this._isCancelled = true\n      await this.emit('progressCancelled', this)\n      for (const child of this._children)\n        await child.cancel()\n      this.update()\n    }\n  }\n\n  /** Add child progress, which count into its parents units. On `dispose` it will auto remove itself from parent. */\n  addChild(child: Progress) {\n    child.on('progressDispose', () => this.removeChild(child))\n    child.on('progressChanged', () => this.update())\n    if (!this._children.includes(child))\n      this._children.push(child)\n    this.update()\n  }\n\n  /** Create child progress.  */\n  createChildProgress(opt?: ProgressOptions) {\n    const progress = new Progress(opt)\n    this.addChild(progress)\n    return progress\n  }\n\n  removeChild(child: Progress) {\n    arrayRemoveElement(this._children, child)\n    this.update()\n  }\n\n  /** Total units including children */\n  getTotalUnits(): number {\n    if (this.isIndeterminate())\n      return 0\n    let units = this._totalUnits\n    for (const child of this._children)\n      units += child.getTotalUnits()\n    return units\n  }\n\n  /** Completed units including children */\n  getCompletedUnits(): number {\n    if (this.isIndeterminate())\n      return 0\n    let units = this._completedUnits\n    for (const child of this._children)\n      units += child.getCompletedUnits()\n    return units\n    //  return Math.min(this.getTotalUnits(), units)\n  }\n\n  /** Cannot calculate progress, because totalUnits are missing. Special representation in UI. */\n  isIndeterminate(): boolean {\n    return this._totalUnits <= 0 && this._children.length <= 0\n  }\n\n  isCancelled() {\n    return this._isCancelled\n  }\n\n  /** Either disposed or all units completed. */\n  isFinished() {\n    return this.dispose.isDisposed() || (!this.isIndeterminate() && (this.getTotalUnits() <= this.getCompletedUnits()))\n  }\n\n  /** Value from 0 to 1, where 1 is 100% completeness. */\n  getFraction() {\n    if (this.isIndeterminate())\n      return 0\n    let value = this.getCompletedUnits() / this.getTotalUnits()\n    if (Number.isNaN(value))\n      value = 0\n    return Math.min(1, Math.max(0, value))\n  }\n\n  getChildrenCount() {\n    return this._children.length\n  }\n\n  /** Change total units. */\n  setTotalUnits(units: number, completedUnits?: number) {\n    this._totalUnits = units\n    if (completedUnits != null)\n      this._completedUnits = completedUnits\n    this.update()\n  }\n\n  /** Relatively change total units. */\n  incTotalUnits(step = 1) {\n    this._totalUnits += step\n    this.update()\n  }\n\n  /** Set fixed number of completed units. */\n  setCompletetedUnits(units: number) {\n    this._completedUnits = units\n    this.update()\n  }\n\n  /** Set to 100% without disposing. */\n  setCompleted() {\n    this._completedUnits = this._totalUnits\n    this.update()\n  }\n\n  /** Dynamically change completed units. */\n  incCompletedUnits(step = 1) {\n    this._completedUnits += step\n    this.update()\n  }\n\n  /** Progress tree to string for debuggin purposes. Consider using `name` attribute of Progress. */\n  toString(indent = 0) {\n    let s = `${'  '.repeat(indent)}${this.name}: ${this._completedUnits} of ${this._totalUnits} units, ${Math.floor(this.getFraction() * 100)} %, cancel=${this._isCancelled}\\n`\n    for (const child of this._children)\n      s += child.toString(indent + 1)\n    if (indent === 0)\n      return s.trim()\n    return s\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAwBA,IAAa,WAAb,MAAa,iBAAiBA,mCAI3B;CACD,AAAQ;CACR,AAAQ;CACR,AAAQ,eAAe;CACvB,AAAQ,qBAAqB;CAC7B,AAAQ,YAAwB,EAAE;CAElC,UAAUC,yCAAY;CACtB;CAEA,YAAY,MAAuB,EAAE,EAAE;AACrC,SAAO;AAEP,OAAK,cAAc,IAAI,cAAc;AACrC,OAAK,kBAAkB,IAAI,iBAAiB;AAC5C,OAAK,qBAAqB,IAAI,qBAAqB;AACnD,OAAK,OAAO,IAAI,QAAQC,0BAAM,WAAW;AAGzC,OAAK,QAAQ,IAAI,YAAY;AAC3B,QAAK,MAAM,SAAS,KAAK,UACvB,OAAM,MAAM,SAAS;AACvB,SAAM,KAAK,KAAK,mBAAmB,KAAK;IACxC;;;CAIJ,AAAQ,SAAS;AACf,EAAK,KAAK,KAAK,mBAAmB,KAAK;AAEvC,MAAI,KAAK,gBAAgB,KAAK,oBAC5B;OAAI,KAAK,eAAe,IAAI,KAAK,mBAAmB,CAClD,MAAK,OAAO;;;;CAKlB,QAAQ;AACN,MAAI,KAAK,cAAc;AACrB,QAAK,eAAe;AACpB,QAAK,MAAM,SAAS,KAAK,UACvB,OAAM,OAAO;AACf,QAAK,QAAQ;;;;CAKjB,MAAM,SAAS;AACb,MAAI,CAAC,KAAK,cAAc;AACtB,QAAK,eAAe;AACpB,SAAM,KAAK,KAAK,qBAAqB,KAAK;AAC1C,QAAK,MAAM,SAAS,KAAK,UACvB,OAAM,MAAM,QAAQ;AACtB,QAAK,QAAQ;;;;CAKjB,SAAS,OAAiB;AACxB,QAAM,GAAG,yBAAyB,KAAK,YAAY,MAAM,CAAC;AAC1D,QAAM,GAAG,yBAAyB,KAAK,QAAQ,CAAC;AAChD,MAAI,CAAC,KAAK,UAAU,SAAS,MAAM,CACjC,MAAK,UAAU,KAAK,MAAM;AAC5B,OAAK,QAAQ;;;CAIf,oBAAoB,KAAuB;EACzC,MAAM,WAAW,IAAI,SAAS,IAAI;AAClC,OAAK,SAAS,SAAS;AACvB,SAAO;;CAGT,YAAY,OAAiB;AAC3B,+CAAmB,KAAK,WAAW,MAAM;AACzC,OAAK,QAAQ;;;CAIf,gBAAwB;AACtB,MAAI,KAAK,iBAAiB,CACxB,QAAO;EACT,IAAI,QAAQ,KAAK;AACjB,OAAK,MAAM,SAAS,KAAK,UACvB,UAAS,MAAM,eAAe;AAChC,SAAO;;;CAIT,oBAA4B;AAC1B,MAAI,KAAK,iBAAiB,CACxB,QAAO;EACT,IAAI,QAAQ,KAAK;AACjB,OAAK,MAAM,SAAS,KAAK,UACvB,UAAS,MAAM,mBAAmB;AACpC,SAAO;;;CAKT,kBAA2B;AACzB,SAAO,KAAK,eAAe,KAAK,KAAK,UAAU,UAAU;;CAG3D,cAAc;AACZ,SAAO,KAAK;;;CAId,aAAa;AACX,SAAO,KAAK,QAAQ,YAAY,IAAK,CAAC,KAAK,iBAAiB,IAAK,KAAK,eAAe,IAAI,KAAK,mBAAmB;;;CAInH,cAAc;AACZ,MAAI,KAAK,iBAAiB,CACxB,QAAO;EACT,IAAI,QAAQ,KAAK,mBAAmB,GAAG,KAAK,eAAe;AAC3D,MAAI,OAAO,MAAM,MAAM,CACrB,SAAQ;AACV,SAAO,KAAK,IAAI,GAAG,KAAK,IAAI,GAAG,MAAM,CAAC;;CAGxC,mBAAmB;AACjB,SAAO,KAAK,UAAU;;;CAIxB,cAAc,OAAe,gBAAyB;AACpD,OAAK,cAAc;AACnB,MAAI,kBAAkB,KACpB,MAAK,kBAAkB;AACzB,OAAK,QAAQ;;;CAIf,cAAc,OAAO,GAAG;AACtB,OAAK,eAAe;AACpB,OAAK,QAAQ;;;CAIf,oBAAoB,OAAe;AACjC,OAAK,kBAAkB;AACvB,OAAK,QAAQ;;;CAIf,eAAe;AACb,OAAK,kBAAkB,KAAK;AAC5B,OAAK,QAAQ;;;CAIf,kBAAkB,OAAO,GAAG;AAC1B,OAAK,mBAAmB;AACxB,OAAK,QAAQ;;;CAIf,SAAS,SAAS,GAAG;EACnB,IAAI,IAAI,GAAG,KAAK,OAAO,OAAO,GAAG,KAAK,KAAK,IAAI,KAAK,gBAAgB,MAAM,KAAK,YAAY,UAAU,KAAK,MAAM,KAAK,aAAa,GAAG,IAAI,CAAC,aAAa,KAAK,aAAa;AACzK,OAAK,MAAM,SAAS,KAAK,UACvB,MAAK,MAAM,SAAS,SAAS,EAAE;AACjC,MAAI,WAAW,EACb,QAAO,EAAE,MAAM;AACjB,SAAO"}

package/dist/common/exec/progress.d.cts

@@ -1,92 +1,2 @@
-import { Disposer, DisposerFunction } from '../dispose-types.cjs';
-import { Emitter } from '../msg/emitter.cjs';
-import '../global.cjs';
-import '../log/log.cjs';
-import '../log/log-console-original.cjs';
-import '../schema/export-swift.cjs';
-import '../schema/parse-args.cjs';
-import '../schema/parse-env.cjs';
-import '../log/log-base.cjs';
-import '../schema/schema.cjs';
-
-interface ProgressOptions {
-    totalUnits?: number;
-    completeUnits?: number;
-    resetWhenFinished?: boolean;
-    name?: string;
-}
-/**
- * Progress helper with these properties:
- *
- * - `totalUnits` and `completedUnits` for progress
- * - Can be cancelled
- * - Sends events on cancel, changed and dispose
- * - Supports children and propagates values.
- *   Total progress is sum of all units in the tree.
- * - On `dispose` child removes itself from parent.
- */
-declare class Progress extends Emitter<{
-    progressCancelled: (progress: Progress) => void;
-    progressChanged: (progress: Progress) => void;
-    progressDispose: (progress: Progress) => void;
-}> {
-    private _totalUnits;
-    private _completedUnits;
-    private _isCancelled;
-    private _resetWhenFinished;
-    private _children;
-    dispose: ((strictSync?: boolean) => Promise<any> | void) & {
-        disposed: number;
-        add: (obj?: Disposer) => DisposerFunction | undefined;
-        remove: (disposable: Disposer) => Promise<void> | void;
-        track: (obj?: Disposer) => DisposerFunction | undefined;
-        untrack: (disposable: Disposer) => Promise<void> | void;
-        dispose: (strictSync?: boolean) => Promise<any> | void;
-        disposeSync: () => void;
-        sync: () => void;
-        exec: (strictSync?: boolean) => Promise<any> | void;
-        getSize(): number;
-        isDisposed(): boolean;
-        [Symbol.dispose](): void | Promise<any>;
-        [Symbol.asyncDispose](): Promise<any>;
-    };
-    name: string;
-    constructor(opt?: ProgressOptions);
-    /** Notify others about changes and reset on completion, if flag is set. */
-    private update;
-    /** Fresh start */
-    reset(): void;
-    /** Notify and mark as cancelled. May take some time before having an effect. */
-    cancel(): Promise<void>;
-    /** Add child progress, which count into its parents units. On `dispose` it will auto remove itself from parent. */
-    addChild(child: Progress): void;
-    /** Create child progress.  */
-    createChildProgress(opt?: ProgressOptions): Progress;
-    removeChild(child: Progress): void;
-    /** Total units including children */
-    getTotalUnits(): number;
-    /** Completed units including children */
-    getCompletedUnits(): number;
-    /** Cannot calculate progress, because totalUnits are missing. Special representation in UI. */
-    isIndeterminate(): boolean;
-    isCancelled(): boolean;
-    /** Either disposed or all units completed. */
-    isFinished(): boolean;
-    /** Value from 0 to 1, where 1 is 100% completeness. */
-    getFraction(): number;
-    getChildrenCount(): number;
-    /** Change total units. */
-    setTotalUnits(units: number, completedUnits?: number): void;
-    /** Relatively change total units. */
-    incTotalUnits(step?: number): void;
-    /** Set fixed number of completed units. */
-    setCompletetedUnits(units: number): void;
-    /** Set to 100% without disposing. */
-    setCompleted(): void;
-    /** Dynamically change completed units. */
-    incCompletedUnits(step?: number): void;
-    /** Progress tree to string for debuggin purposes. Consider using `name` attribute of Progress. */
-    toString(indent?: number): string;
-}
-
-export { Progress, type ProgressOptions };
+import { d as Progress, f as ProgressOptions } from "../../index-DHXVOH8h.cjs";
+export { Progress, ProgressOptions };

package/dist/common/exec/progress.d.mts

@@ -0,0 +1,2 @@
+import { d as Progress, f as ProgressOptions } from "../../index-DMaPyx9O.mjs";
+export { Progress, ProgressOptions };