devflare 1.0.0-next.66 → 1.0.0-next.67

package/dist/_chunks/{cli-CWKMIIcG.js → cli-DXnofibT.js}

@@ -1144,7 +1144,7 @@ async function runDev(parsed, logger, options) {
 	return runDevCommand(parsed, logger, options);
 }
 async function runWorkspace(parsed, logger, options) {
-	const { runWorkspaceCommand } = await import("./workspace-CaTsTpDI.js");
+	const { runWorkspaceCommand } = await import("./workspace-DE60No0K.js");
 	return runWorkspaceCommand(parsed, logger, options);
 }
 async function runBuild(parsed, logger, options) {

package/dist/_chunks/{workspace-CaTsTpDI.js → workspace-DE60No0K.js}

@@ -13,12 +13,17 @@ import { n as bundleWorkflowEntrypointScript } from "./r2-presign-runtime-C75FkL
 import { dirname, resolve } from "pathe";
 import { createConsola } from "consola";
 //#region src/dev-server/workspace/merge-config.ts
+const NAMESPACE_SEPARATOR = "-";
+/** Join an app namespace to one of its worker names for the merged instance. */
+function namespacedWorkerName(appName, workerName) {
+	return `${appName}${NAMESPACE_SEPARATOR}${workerName}`;
+}
 /**
 * Prefix `name` with `${appName}/` — but only when it is one of this app's own
 * worker names. External/cross-app targets are left untouched.
 */
 function namespaceIfLocal(name, appName, localNames) {
-	return localNames.has(name) ? `${appName}/${name}` : name;
+	return localNames.has(name) ? namespacedWorkerName(appName, name) : name;
 }
 /** Rewrite an intra-app worker reference on a service-binding value (object or string form). */
 function rewriteServiceBindingTarget(value, appName, localNames) {
@@ -47,9 +52,9 @@ function namespaceAppWorkers(appName, workers, options) {
 			for (const value of Object.values(worker.durableObjects)) if (value && typeof value === "object" && typeof value.scriptName === "string") value.scriptName = namespaceIfLocal(value.scriptName, appName, localNames);
 		}
 		if (worker.outboundService !== void 0) worker.outboundService = rewriteServiceBindingTarget(worker.outboundService, appName, localNames);
-		worker.name = `${appName}/${worker.name}`;
+		worker.name = namespacedWorkerName(appName, String(worker.name));
 	}
-	const gatewayWorkerName = `${appName}/gateway`;
+	const gatewayWorkerName = namespacedWorkerName(appName, "gateway");
 	const gatewayWorker = workers.find((worker) => worker.name === gatewayWorkerName) ?? workers[0];
 	gatewayWorker.unsafeDirectSockets = [{
 		host: options.host,
@@ -109,6 +114,12 @@ function buildMergedWorkspaceConfig(input) {
 			port: app.directSocketPort
 		});
 	}
+	const seenWorkerNames = /* @__PURE__ */ new Set();
+	for (const worker of mergedWorkers) {
+		const workerName = String(worker.name);
+		if (seenWorkerNames.has(workerName)) throw new Error(`Workspace produced two workers named "${workerName}" after namespacing. Rename one of the conflicting apps so their namespaced worker names stay distinct.`);
+		seenWorkerNames.add(workerName);
+	}
 	const persistPaths = resolveWorkspacePersistPaths(input.persist, input.persistDir);
 	return {
 		config: {

package/dist/cli/index.js

@@ -1,2 +1,2 @@
-import { n as runCli, t as parseArgs } from "../_chunks/cli-CWKMIIcG.js";
+import { n as runCli, t as parseArgs } from "../_chunks/cli-DXnofibT.js";
 export { parseArgs, runCli };

package/dist/dev-server/workspace/merge-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-config.d.ts","sourceRoot":"","sources":["../../../src/dev-server/workspace/merge-config.ts"],"names":[],"mappings":"AAiBA,+EAA+E;AAC/E,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAE1C,qDAAqD;AACrD,MAAM,WAAW,mBAAmB;IACnC,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAA;IACf,oFAAoF;IACpF,OAAO,EAAE,eAAe,EAAE,CAAA;IAC1B,mEAAmE;IACnE,gBAAgB,EAAE,MAAM,CAAA;CACxB;AAED,sFAAsF;AACtF,MAAM,WAAW,qBAAqB;IACrC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAA;CACtB;AAyBD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAClC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EAAE,EAC1B,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAE,GACjD;IAAE,OAAO,EAAE,eAAe,EAAE,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,CAwD3D;AAED,sFAAsF;AACtF,wBAAgB,4BAA4B,CAC3C,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,GAChB,qBAAqB,GAAG,SAAS,CAcnC;AAED,oDAAoD;AACpD,MAAM,WAAW,+BAA+B;IAC/C,sEAAsE;IACtE,IAAI,EAAE,mBAAmB,EAAE,CAAA;IAC3B,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAA;IACZ,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAA;IAChB,yEAAyE;IACzE,UAAU,EAAE,MAAM,CAAA;IAClB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CAClB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,+BAA+B,GAAG;IACnF,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC3B,aAAa,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAClF,CA2CA"}
+{"version":3,"file":"merge-config.d.ts","sourceRoot":"","sources":["../../../src/dev-server/workspace/merge-config.ts"],"names":[],"mappings":"AAiBA,+EAA+E;AAC/E,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAsB1C,qDAAqD;AACrD,MAAM,WAAW,mBAAmB;IACnC,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAA;IACf,oFAAoF;IACpF,OAAO,EAAE,eAAe,EAAE,CAAA;IAC1B,mEAAmE;IACnE,gBAAgB,EAAE,MAAM,CAAA;CACxB;AAED,sFAAsF;AACtF,MAAM,WAAW,qBAAqB;IACrC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAA;CACtB;AAyBD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAClC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EAAE,EAC1B,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAE,GACjD;IAAE,OAAO,EAAE,eAAe,EAAE,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,CAwD3D;AAED,sFAAsF;AACtF,wBAAgB,4BAA4B,CAC3C,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,GAChB,qBAAqB,GAAG,SAAS,CAcnC;AAED,oDAAoD;AACpD,MAAM,WAAW,+BAA+B;IAC/C,sEAAsE;IACtE,IAAI,EAAE,mBAAmB,EAAE,CAAA;IAC3B,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAA;IACZ,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAA;IAChB,yEAAyE;IACzE,UAAU,EAAE,MAAM,CAAA;IAClB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CAClB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,+BAA+B,GAAG;IACnF,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC3B,aAAa,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAClF,CA4DA"}

package/dist/index.js

@@ -5,6 +5,6 @@ import { a as ConfigResourceResolutionError, d as configSchema, n as ConfigValid
 import { n as compileConfig, s as stringifyConfig } from "./_chunks/compiler-UxXQgEPq.js";
 import { t as workerName } from "./_chunks/workerName-kEXwmV2m.js";
 import { n as getDurableObjectOptions, t as durableObject } from "./_chunks/decorators-eXNZ1S0N.js";
-import { n as runCli, t as parseArgs } from "./_chunks/cli-CWKMIIcG.js";
+import { n as runCli, t as parseArgs } from "./_chunks/cli-DXnofibT.js";
 import { i as vars, r as env } from "./_chunks/env-DyL6JOXI.js";
 export { ConfigNotFoundError, ConfigResourceResolutionError, ConfigValidationError, compileConfig, configSchema, defineConfig as default, defineConfig, defineWorkspace, durableObject, env, getDurableObjectOptions, loadConfig, loadResolvedConfig, parseArgs, preview, ref, runCli, stringifyConfig, vars, workerName };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "devflare",
-	"version": "1.0.0-next.66",
+	"version": "1.0.0-next.67",
 	"description": "Devflare is a developer-first toolkit for Cloudflare Workers that sits on top of Miniflare and Wrangler-compatible config",
 	"repository": {
 		"type": "git",