effect-cf 0.27.0 → 0.28.1

package/dist/ComputerWorkspace.mjs

@@ -1,7 +1,7 @@
-import { t as DurableObjectState } from "./DurableObjectState-Dux8KfjG.mjs";
+import { t as DurableObjectState } from "./DurableObjectState-BjkK2kwH.mjs";
 import { fromClient } from "./ComputerArtifacts.mjs";
 import { t as lookup } from "./ComputerWorkspaceHostRegistry-CY5Fv4Ng.mjs";
-import { Context, Effect, Layer, Schema, Stream } from "effect";
+import { Context, Effect, Layer, Predicate, Schema, Stream } from "effect";
 //#region src/ComputerWorkspace.ts
 /**
 * Workspace errors use `Schema.TaggedError`, unlike most local binding errors,
@@ -39,36 +39,50 @@ var WorkspaceAssetsError = class extends Schema.TaggedError()("WorkspaceAssetsEr
 }) {};
 const errorMessage = (cause) => cause instanceof Error ? cause.message : String(cause);
 const errorCode = (cause) => {
-	if (typeof cause !== "object" || cause === null) return;
-	const code = Reflect.get(cause, "code");
-	return typeof code === "string" ? code : void 0;
+	if (Predicate.hasProperty(cause, "code") && Predicate.isString(cause.code)) return cause.code;
+};
+const fsError = (operation, path, cause) => {
+	const properties = {
+		operation,
+		path,
+		message: errorMessage(cause),
+		cause
+	};
+	const code = errorCode(cause);
+	if (code !== void 0) properties.code = code;
+	return WorkspaceFsError.make(properties);
+};
+const gitError = (operation, cause) => {
+	const properties = {
+		operation,
+		message: errorMessage(cause),
+		cause
+	};
+	const code = errorCode(cause);
+	if (code !== void 0) properties.code = code;
+	return WorkspaceGitError.make(properties);
+};
+const execError = (operation, cause) => {
+	const properties = {
+		operation,
+		message: errorMessage(cause),
+		cause
+	};
+	const code = errorCode(cause);
+	if (code !== void 0) properties.code = code;
+	return WorkspaceExecError.make(properties);
+};
+const assetsError = (operation, path, cause) => {
+	const properties = {
+		operation,
+		path,
+		message: errorMessage(cause),
+		cause
+	};
+	const code = errorCode(cause);
+	if (code !== void 0) properties.code = code;
+	return WorkspaceAssetsError.make(properties);
 };
-const fsError = (operation, path, cause) => WorkspaceFsError.make({
-	operation,
-	path,
-	message: errorMessage(cause),
-	cause,
-	...errorCode(cause) === void 0 ? {} : { code: errorCode(cause) }
-});
-const gitError = (operation, cause) => WorkspaceGitError.make({
-	operation,
-	message: errorMessage(cause),
-	cause,
-	...errorCode(cause) === void 0 ? {} : { code: errorCode(cause) }
-});
-const execError = (operation, cause) => WorkspaceExecError.make({
-	operation,
-	message: errorMessage(cause),
-	cause,
-	...errorCode(cause) === void 0 ? {} : { code: errorCode(cause) }
-});
-const assetsError = (operation, path, cause) => WorkspaceAssetsError.make({
-	operation,
-	path,
-	message: errorMessage(cause),
-	cause,
-	...errorCode(cause) === void 0 ? {} : { code: errorCode(cause) }
-});
 const tryFs = (operation, path, evaluate) => Effect.tryPromise({
 	try: evaluate,
 	catch: (cause) => fsError(operation, path, cause)
@@ -223,11 +237,10 @@ const makeGit = (gitClient) => {
 		operation: "log"
 	} })(function* (options) {
 		const { maxCount, ...upstreamOptions } = options ?? {};
+		const logOptions = { ...upstreamOptions };
+		if (logOptions.depth === void 0 && maxCount !== void 0) logOptions.depth = maxCount;
 		return (yield* Effect.tryPromise({
-			try: () => gitClient.log({
-				...upstreamOptions,
-				...upstreamOptions.depth === void 0 && maxCount !== void 0 ? { depth: maxCount } : {}
-			}),
+			try: () => gitClient.log(logOptions),
 			catch: (cause) => gitError("log", cause)
 		})).map(gitCommit);
 	});
@@ -235,7 +248,7 @@ const makeGit = (gitClient) => {
 		family: "git",
 		operation: "revParse"
 	} })(function* (input) {
-		const options = typeof input === "string" ? { ref: input } : input;
+		const options = Predicate.isString(input) ? { ref: input } : input;
 		return yield* Effect.tryPromise({
 			try: () => gitClient.revParse(options),
 			catch: (cause) => gitError("revParse", cause)
@@ -286,35 +299,41 @@ const makeGit = (gitClient) => {
 };
 const runtimeExecOptions = (options) => {
 	const { encoding = "utf8", timeoutMillis, timeoutMs, ...rest } = options ?? {};
-	return {
-		...rest,
-		...encoding === "utf8" ? { encoding: "utf8" } : {},
-		...timeoutMs === void 0 && timeoutMillis === void 0 ? {} : { timeoutMs: timeoutMs ?? timeoutMillis }
-	};
+	const runtimeOptions = { ...rest };
+	if (encoding === "utf8") runtimeOptions.encoding = "utf8";
+	const selectedTimeout = timeoutMs ?? timeoutMillis;
+	if (selectedTimeout !== void 0) runtimeOptions.timeoutMs = selectedTimeout;
+	return runtimeOptions;
 };
 const runtimeGetOptions = (options) => {
 	const { encoding = "utf8", ...rest } = options ?? {};
-	return {
-		...rest,
-		...encoding === "utf8" ? { encoding: "utf8" } : {}
+	const runtimeOptions = { ...rest };
+	if (encoding === "utf8") runtimeOptions.encoding = "utf8";
+	return runtimeOptions;
+};
+const wrapRuntimeResult = (result) => {
+	const stdout = result.stdout;
+	const stderr = result.stderr;
+	const wrapped = {
+		status: result.status,
+		exitCode: result.exitCode,
+		stdout,
+		stderr,
+		pushed: result.pushed,
+		pulled: result.pulled,
+		skipped: result.skipped,
+		sync: result.sync
+	};
+	return result.value === void 0 ? wrapped : {
+		...wrapped,
+		value: result.value
 	};
 };
-const wrapRuntimeResult = (result) => ({
-	status: result.status,
-	exitCode: result.exitCode,
-	stdout: result.stdout,
-	stderr: result.stderr,
-	...result.value === void 0 ? {} : { value: result.value },
-	pushed: result.pushed,
-	pulled: result.pulled,
-	skipped: result.skipped,
-	sync: result.sync
-});
 const wrapRuntimeEvent = (event) => {
 	switch (event.name) {
 		case "stdout": {
 			const chunk = event.value;
-			return typeof chunk === "string" ? {
+			return Predicate.isString(chunk) ? {
 				_tag: "Stdout",
 				id: event.id,
 				sequence: event.seq,
@@ -330,7 +349,7 @@ const wrapRuntimeEvent = (event) => {
 		}
 		case "stderr": {
 			const chunk = event.value;
-			return typeof chunk === "string" ? {
+			return Predicate.isString(chunk) ? {
 				_tag: "Stderr",
 				id: event.id,
 				sequence: event.seq,
@@ -344,20 +363,25 @@ const wrapRuntimeEvent = (event) => {
 				bytes: chunk
 			};
 		}
-		case "exit": return {
-			_tag: "Exit",
-			id: event.id,
-			sequence: event.seq,
-			exitCode: event.code,
-			...event.result === void 0 ? {} : { value: event.result }
-		};
+		case "exit":
+			const exitEvent = {
+				_tag: "Exit",
+				id: event.id,
+				sequence: event.seq,
+				exitCode: event.code
+			};
+			return event.result === void 0 ? exitEvent : {
+				...exitEvent,
+				value: event.result
+			};
 	}
 };
 const wrapRun = (handle) => {
+	const mapRuntimeEvent = wrapRuntimeEvent;
 	const events = Stream.fromReadableStream({
 		evaluate: () => handle,
 		onError: (cause) => execError("events", cause)
-	}).pipe(Stream.map(wrapRuntimeEvent));
+	}).pipe(Stream.map(mapRuntimeEvent));
 	const result = Effect.tryPromise({
 		try: () => handle.result(),
 		catch: (cause) => execError("result", cause)
@@ -386,14 +410,14 @@ const makeRuntime = (client) => {
 		family: "runtime",
 		operation: "exec"
 	} })(function* (source, optionsOrValue, ...remainingValues) {
-		const options = typeof source === "string" ? optionsOrValue : void 0;
+		const options = Predicate.isString(source) ? optionsOrValue : void 0;
 		yield* Effect.annotateCurrentSpan({
 			backend: options?.backend,
 			runId: options?.id
 		});
 		const handle = yield* Effect.acquireRelease(Effect.tryPromise({
 			try: () => {
-				if (typeof source === "string") return client.runtime.exec(source, runtimeExecOptions(options));
+				if (Predicate.isString(source)) return client.runtime.exec(source, runtimeExecOptions(options));
 				const values = optionsOrValue === void 0 ? remainingValues : [optionsOrValue, ...remainingValues];
 				return client.runtime.exec(source, ...values);
 			},
@@ -477,15 +501,23 @@ const makeThink = (client) => {
 		yield* Effect.annotateCurrentSpan("path", path);
 		return yield* tryFs(`think.${operation}`, path, () => evaluate(...args));
 	});
+	const readFile = client.readFile.bind(client);
+	const readFileBytes = client.readFileBytes.bind(client);
+	const writeFile = client.writeFile.bind(client);
+	const readDir = client.readDir.bind(client);
+	const rm = client.rm.bind(client);
+	const glob = client.glob.bind(client);
+	const mkdir = client.mkdir.bind(client);
+	const stat = client.stat.bind(client);
 	return {
-		readFile: method("readFile", (path) => path, (path) => client.readFile(path)),
-		readFileBytes: method("readFileBytes", (path) => path, (path) => client.readFileBytes(path)),
-		writeFile: method("writeFile", (path, _content) => path, (path, content) => client.writeFile(path, content)),
-		readDir: method("readDir", (path, _options) => path, (path, options) => client.readDir(path, options)),
-		rm: method("rm", (path, _options) => path, (path, options) => client.rm(path, options)),
-		glob: method("glob", (pattern) => pattern, (pattern) => client.glob(pattern)),
-		mkdir: method("mkdir", (path, _options) => path, (path, options) => client.mkdir(path, options)),
-		stat: method("stat", (path) => path, (path) => client.stat(path))
+		readFile: method("readFile", (path) => path, (path) => readFile(path)),
+		readFileBytes: method("readFileBytes", (path) => path, (path) => readFileBytes(path)),
+		writeFile: method("writeFile", (path, _content) => path, (path, content) => writeFile(path, content)),
+		readDir: method("readDir", (path, _options) => path, (path, options) => readDir(path, options)),
+		rm: method("rm", (path, _options) => path, (path, options) => rm(path, options)),
+		glob: method("glob", (pattern) => pattern, (pattern) => glob(pattern)),
+		mkdir: method("mkdir", (path, _options) => path, (path, options) => mkdir(path, options)),
+		stat: method("stat", (path) => path, (path) => stat(path))
 	};
 };
 /**

package/dist/ComputerWorkspaceHost.d.mts

@@ -1,4 +1,4 @@
-import { t as ArtifactsBinding } from "./Artifacts-DcoXcRP5.mjs";
+import { t as ArtifactsBinding } from "./Artifacts-DnHQA-Ax.mjs";
 import { GitClientFactory } from "@cloudflare/computer/git";
 import { DurableObjectStorageLike, SyncRetryIntent, SyncRetryOptions, SyncRetryScheduler, WithWorkspaceCtor, WorkspaceAttributeValue, WorkspaceAttributes, WorkspaceObserver, WorkspaceOptions, WorkspaceRegisteredBackend, WorkspaceRetryPendingSyncResult, WorkspaceServiceProxy, WorkspaceSpan } from "@cloudflare/computer";
 import { ShellModuleGroup, WorkerShellBackendOptions, WorkerShellLoader, WorkspaceEgressPolicy } from "@cloudflare/computer/backends/worker-shell";

package/dist/ComputerWorkspaceHost.mjs

@@ -18,24 +18,26 @@ const toWorkspaceOptions = (config) => {
 			egress: egress ?? { mode: "none" }
 		}));
 	}
-	return {
+	const options = {
 		storage: config.storage,
-		git: config.git ?? createGitClient(),
-		...config.gitIdentity === void 0 ? {} : { defaultGitIdentity: config.gitIdentity },
-		...backends.length === 0 ? {} : { backends },
-		...config.sessionId === void 0 ? {} : { sessionId: config.sessionId },
-		...config.mounts === void 0 ? {} : { mounts: config.mounts },
-		...config.observer === void 0 ? {} : { observer: config.observer },
-		...config.retryScheduler === void 0 ? {} : { retryScheduler: config.retryScheduler },
-		...config.retry === void 0 ? {} : { retry: config.retry },
-		...config.assets === void 0 ? {} : { assets: config.assets },
-		...config.artifacts === void 0 ? {} : { artifacts: {
-			binding: config.artifacts.binding,
-			...config.artifacts.sessionId === void 0 ? {} : { sessionId: config.artifacts.sessionId }
-		} },
-		...config.now === void 0 ? {} : { now: config.now },
-		...config.useThink === void 0 ? {} : { useThink: config.useThink }
+		git: config.git ?? createGitClient()
 	};
+	if (config.gitIdentity !== void 0) options.defaultGitIdentity = config.gitIdentity;
+	if (backends.length !== 0) options.backends = backends;
+	if (config.sessionId !== void 0) options.sessionId = config.sessionId;
+	if (config.mounts !== void 0) options.mounts = config.mounts;
+	if (config.observer !== void 0) options.observer = config.observer;
+	if (config.retryScheduler !== void 0) options.retryScheduler = config.retryScheduler;
+	if (config.retry !== void 0) options.retry = config.retry;
+	if (config.assets !== void 0) options.assets = config.assets;
+	if (config.artifacts !== void 0) {
+		const artifacts = { binding: config.artifacts.binding };
+		if (config.artifacts.sessionId !== void 0) artifacts.sessionId = config.artifacts.sessionId;
+		options.artifacts = artifacts;
+	}
+	if (config.now !== void 0) options.now = config.now;
+	if (config.useThink !== void 0) options.useThink = config.useThink;
+	return options;
 };
 const HostArguments = Symbol("effect-cf/ComputerWorkspaceHost/arguments");
 /**

package/dist/{DurableObjectState-Dux8KfjG.mjs → DurableObjectState-BjkK2kwH.mjs}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { t as causeMessage } from "./ErrorMessage-_lg53p3W.mjs";
-import { Cause, Context, Data, Effect, Exit, Option, Result, Schema } from "effect";
+import { t as causeMessage } from "./ErrorMessage-BM0K-Nik.mjs";
+import { Cause, Context, Data, Effect, Exit, Option, Predicate, Result, Schema } from "effect";
 //#region src/DurableObjectStorage.ts
 var DurableObjectStorage_exports = /* @__PURE__ */ __exportAll({
 	StorageOperationError: () => StorageOperationError,
@@ -80,7 +80,7 @@ const fromSyncKvStorage = (kv) => ({
 const fromDurableObjectTransaction = (txn) => ({
 	get: (keyOrKeys, options) => Array.isArray(keyOrKeys) ? tryStoragePromise("transaction.get", () => txn.get(keyOrKeys, options)) : tryStoragePromise("transaction.get", () => txn.get(keyOrKeys, options)),
 	list: (options) => tryStoragePromise("transaction.list", () => txn.list(options)),
-	put: (keyOrEntries, valueOrOptions, maybeOptions) => tryStoragePromise("transaction.put", () => typeof keyOrEntries === "string" ? txn.put(keyOrEntries, valueOrOptions, maybeOptions) : txn.put(keyOrEntries, valueOrOptions)),
+	put: (keyOrEntries, valueOrOptions, maybeOptions) => tryStoragePromise("transaction.put", () => Predicate.isString(keyOrEntries) ? txn.put(keyOrEntries, valueOrOptions, maybeOptions) : txn.put(keyOrEntries, valueOrOptions)),
 	delete: (keyOrKeys, options) => Array.isArray(keyOrKeys) ? tryStoragePromise("transaction.delete", () => txn.delete(keyOrKeys, options)) : tryStoragePromise("transaction.delete", () => txn.delete(keyOrKeys, options)),
 	rollback: () => tryStorageSync("transaction.rollback", () => txn.rollback()),
 	getAlarm: (options) => tryStoragePromise("transaction.getAlarm", () => txn.getAlarm(options)),