unikvs 0.0.13 → 0.0.14

package/dist/index.js

@@ -24,7 +24,9 @@ var _MiddlewareNextCalledMultipleTimesError;
 var _StreamEncodingNotSupportedError;
 var _StreamDecodingNotSupportedError;
 var _PluginOperationAggregateError;
+var _InvalidForkError;
 var _MissingStorageError;
+var _UnterminatedPipelineError;
 /**
 * [API Reference](https://tai-kun.github.io/unikvs/packages/unikvs#errors)
 */
@@ -276,6 +278,17 @@ setErrorMessage(PluginOperationAggregateError, ({ action, errors, plugin }) => `
 /**
 * [API Reference](https://tai-kun.github.io/unikvs/packages/unikvs#errors)
 */
+var InvalidForkError = class extends ErrorBase {
+	constructor(options) {
+		super("A forked branch does not reach any storage", options);
+	}
+};
+_InvalidForkError = InvalidForkError;
+_InvalidForkError.prototype.name = "UniKvsInvalidForkError";
+setErrorMessage(InvalidForkError, "ストレージに到達しない分岐があります", "ja");
+/**
+* [API Reference](https://tai-kun.github.io/unikvs/packages/unikvs#errors)
+*/
 var MissingStorageError = class extends ErrorBase {
 	constructor(options) {
 		super("At least one storage is required to use UniKvs", options);
@@ -284,6 +297,17 @@ var MissingStorageError = class extends ErrorBase {
 _MissingStorageError = MissingStorageError;
 _MissingStorageError.prototype.name = "UniKvsMissingStorageError";
 setErrorMessage(MissingStorageError, "UniKvs を使用するためには最低 1 つのストレージが必要です", "ja");
+/**
+* [API Reference](https://tai-kun.github.io/unikvs/packages/unikvs#errors)
+*/
+var UnterminatedPipelineError = class extends ErrorBase {
+	constructor(options) {
+		super("The pipeline does not end with a storage", options);
+	}
+};
+_UnterminatedPipelineError = UnterminatedPipelineError;
+_UnterminatedPipelineError.prototype.name = "UniKvsUnterminatedPipelineError";
+setErrorMessage(UnterminatedPipelineError, "パイプラインがストレージで終わっていません。use() の後に persist() または fork() を呼び出してください", "ja");
 //#endregion
 //#region \0@oxc-project+runtime@0.154.0/helpers/esm/checkPrivateRedeclaration.js
 function _checkPrivateRedeclaration(e, t) {
@@ -572,7 +596,8 @@ var _lifecycle$1 = /* @__PURE__ */ new WeakMap();
 */
 var UniKvsMiddleware = class UniKvsMiddleware {
 	constructor(middleware) {
-		_classPrivateFieldInitSpec(this, _mw, void _initProto$1(this));
+		this.name = void _initProto$1(this);
+		_classPrivateFieldInitSpec(this, _mw, void 0);
 		_classPrivateFieldInitSpec(this, _lifecycle$1, void 0);
 		_classPrivateFieldSet2(_mw, this, middleware);
 		_classPrivateFieldSet2(_lifecycle$1, this, new PluginLifecycle(middleware));
@@ -924,7 +949,8 @@ var _lifecycle = /* @__PURE__ */ new WeakMap();
 */
 var UniKvsStorage = class UniKvsStorage {
 	constructor(storage) {
-		_classPrivateFieldInitSpec(this, _io, void _initProto(this));
+		this.name = void _initProto(this);
+		_classPrivateFieldInitSpec(this, _io, void 0);
 		_classPrivateFieldInitSpec(this, _lifecycle, void 0);
 		_classPrivateFieldSet2(_io, this, storage);
 		_classPrivateFieldSet2(_lifecycle, this, new PluginLifecycle(storage));
@@ -1084,34 +1110,23 @@ _UniKvsStorage = UniKvsStorage;
 */
 const branchStates = /* #__PURE__ */ new WeakMap();
 /**
-* 分岐先のスナップショットを返します。
+* 分岐先を親の接頭辞付きで追加します。
 *
-* 親の `fork` で接頭辞付加するために使用します。
 * `new Branch()` で作成された分岐以外の値が渡されたときは例外を投げます。
 * 外部からは使用しません。
 *
-* @param branch スナップショットを取得する分岐です。
-*
-* @returns 分岐先のコピーを返します。
-*/
-function getBranchDestinationsForFork(branch) {
-	const state = branchStates.get(branch);
-	if (!state) throw new TypeError("fork() expects a branch created by new Branch().");
-	return state.destinations.map((dest) => ({
-		storage: dest.storage,
-		middlewares: [...dest.middlewares]
-	}));
-}
-/**
-* 分岐先を親の接頭辞付きで追加します。
-*
 * @param destinations 追加先の分岐先列です。
 * @param prefix 親のミドルウェア列です。
 * @param branch 追加する分岐です。
+*
+* @throws 分岐がストレージに到達しない場合に `InvalidForkError` を投げます。
 */
 function appendForkDestinations(destinations, prefix, branch) {
+	const state = branchStates.get(branch);
+	if (!state) throw new TypeError("fork() expects a branch created by new Branch().");
+	if (state.destinations.length === 0) throw new InvalidForkError();
 	const prefixSnapshot = [...prefix];
-	for (const dest of getBranchDestinationsForFork(branch)) destinations.push({
+	for (const dest of state.destinations) destinations.push({
 		storage: dest.storage,
 		middlewares: [...prefixSnapshot, ...dest.middlewares]
 	});
@@ -3014,8 +3029,8 @@ var UniKvs = class {
 		let ownsStream = stream !== null;
 		try {
 			try {
-				var _usingCtx6 = _usingCtx();
-				_usingCtx6.u(await asyncmux.readonly(this, signal));
+				var _usingCtx3 = _usingCtx();
+				_usingCtx3.u(await asyncmux.readonly(this, signal));
 				if (_classPrivateFieldGet2(_con, this) === null) throw new UniKvsIsNotOpenError();
 				const useContext = new SetContext({
 					key,
@@ -3029,9 +3044,9 @@ var UniKvs = class {
 					await _assertClassBrand(_UniKvs_brand, this, _setStream).call(this, io, signal, key, store, stream);
 				} else await _assertClassBrand(_UniKvs_brand, this, _setPlain).call(this, io, signal, key, store, value);
 			} catch (_) {
-				_usingCtx6.e = _;
+				_usingCtx3.e = _;
 			} finally {
-				_usingCtx6.d();
+				_usingCtx3.d();
 			}
 		} catch (ex) {
 			if (ownsStream && stream !== null) try {
@@ -3042,7 +3057,7 @@ var UniKvs = class {
 	}
 	async get(...args) {
 		try {
-			var _usingCtx7 = _usingCtx();
+			var _usingCtx4 = _usingCtx();
 			if (_classPrivateFieldGet2(_con, this) === null) throw new UniKvsIsNotOpenError();
 			const [options] = parseInput(GetArgsSchema, args);
 			const { key, vars: varsOption, repair = false, signal: signalOption, throwOnRepairDenied = false } = options;
@@ -3050,7 +3065,7 @@ var UniKvs = class {
 			const { ac, io } = _classPrivateFieldGet2(_con, this);
 			const signal = combineSignals([ac.signal, signalOption]);
 			const store = _assertClassBrand(_UniKvs_brand, this, _createOperationStore).call(this, varsOption);
-			_usingCtx7.u(await asyncmux.readonly(this, signal));
+			_usingCtx4.u(await asyncmux.readonly(this, signal));
 			if (_classPrivateFieldGet2(_con, this) === null) throw new UniKvsIsNotOpenError();
 			const leafNames = _classPrivateFieldGet2(_pipeline, this).leaves.map((leaf) => leaf.name);
 			const useContext = new GetContext({
@@ -3072,8 +3087,8 @@ var UniKvs = class {
 			const missing = [];
 			const errors = [];
 			try {
-				var _usingCtx8 = _usingCtx();
-				_usingCtx8.u(await (repair ? io.lock({
+				var _usingCtx5 = _usingCtx();
+				_usingCtx5.u(await (repair ? io.lock({
 					key,
 					signal
 				}) : io.rLock({
@@ -3126,9 +3141,9 @@ var UniKvs = class {
 				if (hit === null) throw _assertClassBrand(_UniKvs_brand, this, _notFound).call(this, key, errors);
 				if (repair) data = await _assertClassBrand(_UniKvs_brand, this, _repairPlain).call(this, data, hit, missing, store, key, signal, throwOnRepairDenied);
 			} catch (_) {
-				_usingCtx8.e = _;
+				_usingCtx5.e = _;
 			} finally {
-				_usingCtx8.d();
+				_usingCtx5.d();
 			}
 			if (!repair) data = await _classPrivateFieldGet2(_pipeline, this).decode(hit.leaf, {
 				key,
@@ -3138,9 +3153,9 @@ var UniKvs = class {
 			if (valueSchema) data = parseOutput(valueSchema.schema, data);
 			return data;
 		} catch (_) {
-			_usingCtx7.e = _;
+			_usingCtx4.e = _;
 		} finally {
-			_usingCtx7.d();
+			_usingCtx4.d();
 		}
 	}
 	async stream(...args) {
@@ -3152,8 +3167,8 @@ var UniKvs = class {
 		const signal = combineSignals([ac.signal, signalOption]);
 		const store = _assertClassBrand(_UniKvs_brand, this, _createOperationStore).call(this, varsOption);
 		try {
-			var _usingCtx9 = _usingCtx();
-			_usingCtx9.u(await asyncmux.readonly(this, signal));
+			var _usingCtx6 = _usingCtx();
+			_usingCtx6.u(await asyncmux.readonly(this, signal));
 			if (_classPrivateFieldGet2(_con, this) === null) throw new UniKvsIsNotOpenError();
 			const leafNames = _classPrivateFieldGet2(_pipeline, this).leaves.map((leaf) => leaf.name);
 			const useContext = new StreamContext({
@@ -3356,14 +3371,14 @@ var UniKvs = class {
 				throw ex;
 			}
 		} catch (_) {
-			_usingCtx9.e = _;
+			_usingCtx6.e = _;
 		} finally {
-			_usingCtx9.d();
+			_usingCtx6.d();
 		}
 	}
 	async has(...args) {
 		try {
-			var _usingCtx10 = _usingCtx();
+			var _usingCtx7 = _usingCtx();
 			if (_classPrivateFieldGet2(_con, this) === null) throw new UniKvsIsNotOpenError();
 			const [options] = parseInput(HasArgsSchema, args);
 			const { key, vars: varsOption, signal: signalOption } = options;
@@ -3371,7 +3386,7 @@ var UniKvs = class {
 			const { ac, io } = _classPrivateFieldGet2(_con, this);
 			const signal = combineSignals([ac.signal, signalOption]);
 			const store = _assertClassBrand(_UniKvs_brand, this, _createOperationStore).call(this, varsOption);
-			_usingCtx10.u(await asyncmux.readonly(this, signal));
+			_usingCtx7.u(await asyncmux.readonly(this, signal));
 			if (_classPrivateFieldGet2(_con, this) === null) throw new UniKvsIsNotOpenError();
 			const useContext = new HasContext({
 				key,
@@ -3380,7 +3395,7 @@ var UniKvs = class {
 			});
 			await _assertClassBrand(_UniKvs_brand, this, _use).call(this, "read", useContext);
 			throwIfAborted(signal);
-			_usingCtx10.u(await io.rLock({
+			_usingCtx7.u(await io.rLock({
 				key,
 				signal
 			}));
@@ -3412,14 +3427,14 @@ var UniKvs = class {
 			if (errors.length > 0) throw _assertClassBrand(_UniKvs_brand, this, _notFound).call(this, key, errors);
 			return false;
 		} catch (_) {
-			_usingCtx10.e = _;
+			_usingCtx7.e = _;
 		} finally {
-			_usingCtx10.d();
+			_usingCtx7.d();
 		}
 	}
 	async delete(...args) {
 		try {
-			var _usingCtx11 = _usingCtx();
+			var _usingCtx8 = _usingCtx();
 			if (_classPrivateFieldGet2(_con, this) === null) throw new UniKvsIsNotOpenError();
 			const [options] = parseInput(DeleteArgsSchema, args);
 			const { key, vars: varsOption, signal: signalOption } = options;
@@ -3427,7 +3442,7 @@ var UniKvs = class {
 			const { ac, io } = _classPrivateFieldGet2(_con, this);
 			const signal = combineSignals([ac.signal, signalOption]);
 			const store = _assertClassBrand(_UniKvs_brand, this, _createOperationStore).call(this, varsOption);
-			_usingCtx11.u(await asyncmux.readonly(this, signal));
+			_usingCtx8.u(await asyncmux.readonly(this, signal));
 			if (_classPrivateFieldGet2(_con, this) === null) throw new UniKvsIsNotOpenError();
 			const useContext = new DeleteContext({
 				key,
@@ -3435,7 +3450,7 @@ var UniKvs = class {
 				signal
 			});
 			await _assertClassBrand(_UniKvs_brand, this, _use).call(this, "delete", useContext);
-			_usingCtx11.u(await io.lock({
+			_usingCtx8.u(await io.lock({
 				key,
 				signal
 			}));
@@ -3473,23 +3488,23 @@ var UniKvs = class {
 				plugin: "storage"
 			});
 		} catch (_) {
-			_usingCtx11.e = _;
+			_usingCtx8.e = _;
 		} finally {
-			_usingCtx11.d();
+			_usingCtx8.d();
 		}
 	}
 	async clear(...args) {
 		try {
-			var _usingCtx12 = _usingCtx();
+			var _usingCtx9 = _usingCtx();
 			if (_classPrivateFieldGet2(_con, this) === null) throw new UniKvsIsNotOpenError();
 			const [options = {}] = parseInput(ClearArgsSchema, args);
 			const { vars: varsOption, signal: signalOption } = options;
 			const { ac, io } = _classPrivateFieldGet2(_con, this);
 			const signal = combineSignals([ac.signal, signalOption]);
 			const store = _assertClassBrand(_UniKvs_brand, this, _createOperationStore).call(this, varsOption);
-			_usingCtx12.u(await asyncmux.readonly(this, signal));
+			_usingCtx9.u(await asyncmux.readonly(this, signal));
 			if (_classPrivateFieldGet2(_con, this) === null) throw new UniKvsIsNotOpenError();
-			_usingCtx12.u(await io.lock({ signal }));
+			_usingCtx9.u(await io.lock({ signal }));
 			const useContext = new ClearContext({
 				store,
 				signal
@@ -3518,9 +3533,9 @@ var UniKvs = class {
 				plugin: "storage"
 			});
 		} catch (_) {
-			_usingCtx12.e = _;
+			_usingCtx9.e = _;
 		} finally {
-			_usingCtx12.d();
+			_usingCtx9.d();
 		}
 	}
 };
@@ -3533,7 +3548,7 @@ var UniKvs = class {
 */
 function _createOperationVars(vars) {
 	const map = new Map(_classPrivateFieldGet2(_baseVars, this));
-	if (vars) for (const [k, v] of vars) map.set(k, v);
+	if (vars) for (const [k, value] of vars) map.set(k, value);
 	return map;
 }
 /**
@@ -3585,11 +3600,11 @@ function _notFound(key, errors) {
 }
 async function _close(operationVars, signal, con, progress) {
 	try {
-		var _usingCtx3 = _usingCtx();
-		_usingCtx3.u(await asyncmux(this, signal));
+		var _usingCtx10 = _usingCtx();
+		_usingCtx10.u(await asyncmux(this, signal));
 		if (_classPrivateFieldGet2(_con, this) !== con) throw new UniKvsIsNotOpenError();
 		const { io } = _classPrivateFieldGet2(_con, this);
-		_usingCtx3.u(await io.lock({ signal }));
+		_usingCtx10.u(await io.lock({ signal }));
 		const closeFns = [];
 		for (const [index, leaf] of _classPrivateFieldGet2(_pipeline, this).leaves.entries()) {
 			const createContext = () => new CloseContext({
@@ -3656,9 +3671,9 @@ async function _close(operationVars, signal, con, progress) {
 		}
 		_classPrivateFieldSet2(_con, this, null);
 	} catch (_) {
-		_usingCtx3.e = _;
+		_usingCtx10.e = _;
 	} finally {
-		_usingCtx3.d();
+		_usingCtx10.d();
 	}
 }
 /**
@@ -3778,13 +3793,13 @@ async function _use(action, c) {
 */
 async function _setPlain(io, signal, key, store, value) {
 	try {
-		var _usingCtx4 = _usingCtx();
+		var _usingCtx11 = _usingCtx();
 		const targets = await _classPrivateFieldGet2(_pipeline, this).encode({
 			key,
 			store,
 			signal
 		}, value);
-		_usingCtx4.u(await io.lock({
+		_usingCtx11.u(await io.lock({
 			key,
 			signal
 		}));
@@ -3809,9 +3824,9 @@ async function _setPlain(io, signal, key, store, value) {
 		}));
 		await _assertClassBrand(_UniKvs_brand, this, _finishWrites).call(this, targets, store, failed, errors, signal);
 	} catch (_) {
-		_usingCtx4.e = _;
+		_usingCtx11.e = _;
 	} finally {
-		_usingCtx4.d();
+		_usingCtx11.d();
 	}
 }
 /**
@@ -3825,7 +3840,7 @@ async function _setPlain(io, signal, key, store, value) {
 */
 async function _setStream(io, signal, key, store, value) {
 	try {
-		var _usingCtx5 = _usingCtx();
+		var _usingCtx12 = _usingCtx();
 		const streams = /* @__PURE__ */ new Set([value]);
 		let tree;
 		try {
@@ -3838,7 +3853,7 @@ async function _setStream(io, signal, key, store, value) {
 			await cancelStreams(streams, ex);
 			throw ex;
 		}
-		_usingCtx5.u(await io.lock({
+		_usingCtx12.u(await io.lock({
 			key,
 			signal
 		}).catch(async (ex) => {
@@ -3870,9 +3885,9 @@ async function _setStream(io, signal, key, store, value) {
 		}));
 		await _assertClassBrand(_UniKvs_brand, this, _finishWrites).call(this, tree.targets, store, failed, errors, signal);
 	} catch (_) {
-		_usingCtx5.e = _;
+		_usingCtx12.e = _;
 	} finally {
-		_usingCtx5.d();
+		_usingCtx12.d();
 	}
 }
 /**
@@ -3936,6 +3951,7 @@ const UniKvsBuilderOptionsSchema = object({
 const UniKvsBuilderArgsSchema = tuple([optional(UniKvsBuilderOptionsSchema)]);
 var _destinations = /* @__PURE__ */ new WeakMap();
 var _middlewares = /* @__PURE__ */ new WeakMap();
+var _hasUnboundMiddlewares = /* @__PURE__ */ new WeakMap();
 var _valueSchemaResolver = /* @__PURE__ */ new WeakMap();
 var _vars = /* @__PURE__ */ new WeakMap();
 /**
@@ -3945,22 +3961,26 @@ var UniKvsBuilder = class {
 	constructor(...args) {
 		_classPrivateFieldInitSpec(this, _destinations, void 0);
 		_classPrivateFieldInitSpec(this, _middlewares, void 0);
+		_classPrivateFieldInitSpec(this, _hasUnboundMiddlewares, void 0);
 		_classPrivateFieldInitSpec(this, _valueSchemaResolver, void 0);
 		_classPrivateFieldInitSpec(this, _vars, void 0);
 		const [options = {}] = parseInput(UniKvsBuilderArgsSchema, args);
 		const { vars, schema } = options;
 		_classPrivateFieldSet2(_destinations, this, []);
 		_classPrivateFieldSet2(_middlewares, this, []);
+		_classPrivateFieldSet2(_hasUnboundMiddlewares, this, false);
 		_classPrivateFieldSet2(_valueSchemaResolver, this, null);
 		_classPrivateFieldSet2(_vars, this, new Map(vars));
 		if (schema) _classPrivateFieldSet2(_valueSchemaResolver, this, createValueSchemaResolver(schema));
 	}
 	fork(branch) {
 		appendForkDestinations(_classPrivateFieldGet2(_destinations, this), _classPrivateFieldGet2(_middlewares, this), branch);
+		_classPrivateFieldSet2(_hasUnboundMiddlewares, this, false);
 		return this;
 	}
 	use(middleware) {
 		_classPrivateFieldGet2(_middlewares, this).push(UniKvsMiddleware.from(middleware));
+		_classPrivateFieldSet2(_hasUnboundMiddlewares, this, true);
 		return this;
 	}
 	persist(storage) {
@@ -3968,6 +3988,7 @@ var UniKvsBuilder = class {
 			storage: UniKvsStorage.from(storage),
 			middlewares: [..._classPrivateFieldGet2(_middlewares, this)]
 		});
+		_classPrivateFieldSet2(_hasUnboundMiddlewares, this, false);
 		return this;
 	}
 	setVars(...args) {
@@ -3991,9 +4012,23 @@ var UniKvsBuilder = class {
 		this.setVars(target);
 		return this;
 	}
-	build() {
+	isValid() {
+		return _classPrivateFieldGet2(_destinations, this).length > 0 && !_classPrivateFieldGet2(_hasUnboundMiddlewares, this);
+	}
+	build(options = {}) {
 		if (_classPrivateFieldGet2(_destinations, this).length === 0) throw new MissingStorageError();
-		return new UniKvs([..._classPrivateFieldGet2(_vars, this).entries()], PipelineGraph.compile([..._classPrivateFieldGet2(_destinations, this)]), _classPrivateFieldGet2(_valueSchemaResolver, this));
+		if (_classPrivateFieldGet2(_hasUnboundMiddlewares, this)) throw new UnterminatedPipelineError();
+		const beforeAll = options.beforeAll?.map((mw) => UniKvsMiddleware.from(mw)) ?? [];
+		const beforeStorage = options.beforeStorage?.map((mw) => UniKvsMiddleware.from(mw)) ?? [];
+		const destinations = beforeAll.length === 0 && beforeStorage.length === 0 ? _classPrivateFieldGet2(_destinations, this) : _classPrivateFieldGet2(_destinations, this).map((dest) => ({
+			storage: dest.storage,
+			middlewares: [
+				...beforeAll,
+				...dest.middlewares,
+				...beforeStorage
+			]
+		}));
+		return new UniKvs([..._classPrivateFieldGet2(_vars, this).entries()], PipelineGraph.compile(destinations), _classPrivateFieldGet2(_valueSchemaResolver, this));
 	}
 };
 //#endregion
@@ -4027,6 +4062,6 @@ function Value(schema) {
 	return createValueSchemaDescriptor("any", schema);
 }
 //#endregion
-export { UniKvsBranch as Branch, UniKvsBranch, UniKvsBuilder as Builder, UniKvsBuilder, InvalidInputError, InvalidOutputError, InvalidUsageErrorBase, KeyNotFoundError, MiddlewareDestinationFrozenError, MiddlewareDestinationMissingError, MiddlewareIsNotOpenError, MiddlewareNextCalledMultipleTimesError, MiddlewareNextNotAwaitedError, MiddlewareNextNotCalledError, MissingStorageError, MultipartWriteNotSupportedError, PlainValue, PluginOperationAggregateError, ReadableStreamNotSupportedError, StorageIsNotOpenError, StreamDecodingNotSupportedError, StreamEncodingNotSupportedError, StreamValue, UniKvs, UniKvsIsNotOpenError, UniKvsIsOpenError, Value, WritableStreamNotSupportedError };
+export { UniKvsBranch as Branch, UniKvsBranch, UniKvsBuilder as Builder, UniKvsBuilder, InvalidForkError, InvalidInputError, InvalidOutputError, InvalidUsageErrorBase, KeyNotFoundError, MiddlewareDestinationFrozenError, MiddlewareDestinationMissingError, MiddlewareIsNotOpenError, MiddlewareNextCalledMultipleTimesError, MiddlewareNextNotAwaitedError, MiddlewareNextNotCalledError, MissingStorageError, MultipartWriteNotSupportedError, PlainValue, PluginOperationAggregateError, ReadableStreamNotSupportedError, StorageIsNotOpenError, StreamDecodingNotSupportedError, StreamEncodingNotSupportedError, StreamValue, UniKvs, UniKvsIsNotOpenError, UniKvsIsOpenError, UnterminatedPipelineError, Value, WritableStreamNotSupportedError };
 
 //# sourceMappingURL=index.js.map