everything-dev 1.12.4 → 1.14.0

package/dist/merge.cjs

@@ -0,0 +1,113 @@
+const require_runtime = require('./_virtual/_rolldown/runtime.cjs');
+let defu = require("defu");
+
+//#region src/merge.ts
+const BOS_CONFIG_ORDER = [
+	"extends",
+	"account",
+	"domain",
+	"testnet",
+	"staging",
+	"repository",
+	"app",
+	"plugins",
+	"shared"
+];
+const ARRAY_UNION_KEYS = new Set(["secrets"]);
+function isPlainObject(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function unionArrays(a, b) {
+	const aArr = Array.isArray(a) ? a : [];
+	const bArr = Array.isArray(b) ? b : [];
+	if (aArr.length === 0 && bArr.length === 0) return void 0;
+	const seen = /* @__PURE__ */ new Set();
+	const result = [];
+	for (const item of [...aArr, ...bArr]) {
+		if (typeof item === "string") {
+			if (seen.has(item)) continue;
+			seen.add(item);
+		}
+		result.push(item);
+	}
+	return result;
+}
+function cleanNullSentinels(obj) {
+	const out = {};
+	for (const [key, value] of Object.entries(obj)) {
+		if (value === null || value === void 0) continue;
+		if (isPlainObject(value)) {
+			const cleaned = cleanNullSentinels(value);
+			if (Object.keys(cleaned).length > 0) out[key] = cleaned;
+		} else out[key] = value;
+	}
+	return out;
+}
+const bosConfigMerger = (0, defu.createDefu)((obj, key, value) => {
+	if (obj[key] === null) return true;
+	if (value === null) {
+		obj[key] = null;
+		return true;
+	}
+	if (Array.isArray(obj[key]) && Array.isArray(value)) {
+		if (ARRAY_UNION_KEYS.has(key)) obj[key] = unionArrays(obj[key], value);
+		else obj[key] = value;
+		return true;
+	}
+	return false;
+});
+function resolveExtendsRef(extendsField, env) {
+	if (!extendsField) return void 0;
+	if (typeof extendsField === "string") return extendsField;
+	return extendsField[env] ?? extendsField.production ?? Object.values(extendsField).find(Boolean);
+}
+function mergeBosConfigWithExtends(parent, child) {
+	const merged = bosConfigMerger(child, parent);
+	if (isPlainObject(parent.plugins) && isPlainObject(child.plugins)) {
+		const plugins = { ...parent.plugins };
+		for (const [key, rawValue] of Object.entries(child.plugins)) {
+			const value = rawValue;
+			if (value === null || value === false) delete plugins[key];
+			else if (isPlainObject(plugins[key]) && isPlainObject(value)) plugins[key] = bosConfigMerger(value, plugins[key]);
+			else plugins[key] = value;
+		}
+		merged.plugins = plugins;
+	} else if (child.plugins !== void 0) merged.plugins = cleanNullSentinels(child.plugins);
+	const mergedRecord = merged;
+	if (isPlainObject(mergedRecord.app)) for (const entryVal of Object.values(mergedRecord.app)) {
+		if (!isPlainObject(entryVal)) continue;
+		for (const secretKey of ARRAY_UNION_KEYS) if (Array.isArray(entryVal[secretKey])) entryVal[secretKey] = unionArrays(entryVal[secretKey], [])?.filter(Boolean) ?? entryVal[secretKey];
+	}
+	if (isPlainObject(mergedRecord.plugins)) for (const pluginVal of Object.values(mergedRecord.plugins)) {
+		if (!isPlainObject(pluginVal)) continue;
+		for (const secretKey of ARRAY_UNION_KEYS) if (Array.isArray(pluginVal[secretKey])) pluginVal[secretKey] = unionArrays(pluginVal[secretKey], [])?.filter(Boolean) ?? pluginVal[secretKey];
+	}
+	return rebuildOrderedConfig(mergedRecord);
+}
+function mergeBosConfigWithTemplate(local, template) {
+	return rebuildOrderedConfig(mergeJsonValuesPreservingLocalOrder(local, template));
+}
+function mergeJsonValuesPreservingLocalOrder(local, template) {
+	if (isPlainObject(local) && isPlainObject(template)) {
+		const merged = {};
+		for (const key of Object.keys(local)) merged[key] = mergeJsonValuesPreservingLocalOrder(local[key], template[key]);
+		for (const key of Object.keys(template)) if (!(key in merged)) merged[key] = template[key];
+		return merged;
+	}
+	return local ?? template;
+}
+function rebuildOrderedConfig(config) {
+	const ordered = {};
+	for (const key of BOS_CONFIG_ORDER) if (key in config) ordered[key] = config[key];
+	for (const key of Object.keys(config)) if (!BOS_CONFIG_ORDER.includes(key)) ordered[key] = config[key];
+	return ordered;
+}
+
+//#endregion
+exports.BOS_CONFIG_ORDER = BOS_CONFIG_ORDER;
+exports.isPlainObject = isPlainObject;
+exports.mergeBosConfigWithExtends = mergeBosConfigWithExtends;
+exports.mergeBosConfigWithTemplate = mergeBosConfigWithTemplate;
+exports.rebuildOrderedConfig = rebuildOrderedConfig;
+exports.resolveExtendsRef = resolveExtendsRef;
+//# sourceMappingURL=merge.cjs.map

package/dist/merge.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.cjs","names":[],"sources":["../src/merge.ts"],"sourcesContent":["import { createDefu } from \"defu\";\nimport type { BosConfigInput, ExtendsConfig } from \"./types\";\n\nexport const BOS_CONFIG_ORDER = [\n  \"extends\",\n  \"account\",\n  \"domain\",\n  \"testnet\",\n  \"staging\",\n  \"repository\",\n  \"app\",\n  \"plugins\",\n  \"shared\",\n] as const;\n\nexport type BosConfigFieldName = (typeof BOS_CONFIG_ORDER)[number];\n\nexport type BosEnv = \"development\" | \"production\" | \"staging\";\n\nexport interface ResolvedConfigMeta {\n  env: BosEnv;\n  resolvedAt: string;\n  extendsChain: string[];\n  source?: string;\n}\n\nconst ARRAY_UNION_KEYS = new Set([\"secrets\"]);\n\nexport function isPlainObject(value: unknown): value is Record<string, unknown> {\n  return Boolean(value) && typeof value === \"object\" && !Array.isArray(value);\n}\n\nfunction unionArrays(a: unknown, b: unknown): unknown[] | undefined {\n  const aArr = Array.isArray(a) ? a : [];\n  const bArr = Array.isArray(b) ? b : [];\n  if (aArr.length === 0 && bArr.length === 0) return undefined;\n  const seen = new Set<string>();\n  const result: unknown[] = [];\n  for (const item of [...aArr, ...bArr]) {\n    if (typeof item === \"string\") {\n      if (seen.has(item)) continue;\n      seen.add(item);\n    }\n    result.push(item);\n  }\n  return result;\n}\n\nfunction cleanNullSentinels(obj: Record<string, unknown>): Record<string, unknown> {\n  const out: Record<string, unknown> = {};\n  for (const [key, value] of Object.entries(obj)) {\n    if (value === null || value === undefined) continue;\n    if (isPlainObject(value)) {\n      const cleaned = cleanNullSentinels(value);\n      if (Object.keys(cleaned).length > 0) {\n        out[key] = cleaned;\n      }\n    } else {\n      out[key] = value;\n    }\n  }\n  return out;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst bosConfigMerger = createDefu((obj: any, key: any, value: any): boolean | undefined => {\n  if (obj[key] === null) return true;\n  if (value === null) {\n    obj[key] = null;\n    return true;\n  }\n  if (Array.isArray(obj[key]) && Array.isArray(value)) {\n    if (ARRAY_UNION_KEYS.has(key)) {\n      obj[key] = unionArrays(obj[key], value);\n    } else {\n      obj[key] = value;\n    }\n    return true;\n  }\n  return false;\n});\n\nexport function resolveExtendsRef(\n  extendsField: string | ExtendsConfig | undefined,\n  env: BosEnv,\n): string | undefined {\n  if (!extendsField) return undefined;\n  if (typeof extendsField === \"string\") return extendsField;\n  return extendsField[env] ?? extendsField.production ?? Object.values(extendsField).find(Boolean);\n}\n\nexport function mergeBosConfigWithExtends(\n  parent: BosConfigInput,\n  child: BosConfigInput,\n): BosConfigInput {\n  const merged = bosConfigMerger(child, parent) as BosConfigInput;\n\n  if (isPlainObject(parent.plugins) && isPlainObject(child.plugins)) {\n    const plugins: Record<string, unknown> = { ...parent.plugins };\n    for (const [key, rawValue] of Object.entries(child.plugins)) {\n      const value = rawValue as unknown;\n      if (value === null || value === false) {\n        delete plugins[key];\n      } else if (isPlainObject(plugins[key]) && isPlainObject(value)) {\n        plugins[key] = bosConfigMerger(\n          value as Record<string, unknown>,\n          plugins[key] as Record<string, unknown>,\n        );\n      } else {\n        plugins[key] = value;\n      }\n    }\n    (merged as Record<string, unknown>).plugins = plugins;\n  } else if (child.plugins !== undefined) {\n    (merged as Record<string, unknown>).plugins = cleanNullSentinels(\n      child.plugins as Record<string, unknown>,\n    );\n  }\n\n  const mergedRecord = merged as Record<string, unknown>;\n\n  if (isPlainObject(mergedRecord.app)) {\n    for (const entryVal of Object.values(mergedRecord.app as Record<string, unknown>)) {\n      if (!isPlainObject(entryVal)) continue;\n      for (const secretKey of ARRAY_UNION_KEYS) {\n        if (Array.isArray(entryVal[secretKey])) {\n          entryVal[secretKey] =\n            (unionArrays(entryVal[secretKey] as unknown[], []) as string[] | undefined)?.filter(\n              Boolean,\n            ) ?? entryVal[secretKey];\n        }\n      }\n    }\n  }\n\n  if (isPlainObject(mergedRecord.plugins)) {\n    for (const pluginVal of Object.values(mergedRecord.plugins as Record<string, unknown>)) {\n      if (!isPlainObject(pluginVal)) continue;\n      for (const secretKey of ARRAY_UNION_KEYS) {\n        if (Array.isArray(pluginVal[secretKey])) {\n          pluginVal[secretKey] =\n            (unionArrays(pluginVal[secretKey] as unknown[], []) as string[] | undefined)?.filter(\n              Boolean,\n            ) ?? pluginVal[secretKey];\n        }\n      }\n    }\n  }\n\n  return rebuildOrderedConfig(mergedRecord) as BosConfigInput;\n}\n\nexport function mergeBosConfigWithTemplate(\n  local: BosConfigInput,\n  template: BosConfigInput,\n): BosConfigInput {\n  const merged = mergeJsonValuesPreservingLocalOrder(local, template) as BosConfigInput;\n  return rebuildOrderedConfig(merged as Record<string, unknown>) as BosConfigInput;\n}\n\nfunction mergeJsonValuesPreservingLocalOrder(local: unknown, template: unknown): unknown {\n  if (isPlainObject(local) && isPlainObject(template)) {\n    const merged: Record<string, unknown> = {};\n    for (const key of Object.keys(local)) {\n      merged[key] = mergeJsonValuesPreservingLocalOrder(\n        local[key],\n        (template as Record<string, unknown>)[key],\n      );\n    }\n    for (const key of Object.keys(template as Record<string, unknown>)) {\n      if (!(key in merged)) {\n        merged[key] = (template as Record<string, unknown>)[key];\n      }\n    }\n    return merged;\n  }\n  return local ?? template;\n}\n\nexport function rebuildOrderedConfig<T extends Record<string, unknown>>(config: T): T {\n  const ordered: Record<string, unknown> = {};\n\n  for (const key of BOS_CONFIG_ORDER) {\n    if (key in config) {\n      ordered[key] = config[key];\n    }\n  }\n\n  for (const key of Object.keys(config)) {\n    if (!BOS_CONFIG_ORDER.includes(key as BosConfigFieldName)) {\n      ordered[key] = config[key];\n    }\n  }\n\n  return ordered as T;\n}\n\nexport { bosConfigMerger };\n"],"mappings":"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"}

package/dist/merge.d.cts

@@ -0,0 +1,7 @@
+//#region src/merge.d.ts
+declare const BOS_CONFIG_ORDER: readonly ["extends", "account", "domain", "testnet", "staging", "repository", "app", "plugins", "shared"];
+type BosEnv = "development" | "production" | "staging";
+declare function rebuildOrderedConfig<T extends Record<string, unknown>>(config: T): T;
+//#endregion
+export { BOS_CONFIG_ORDER, BosEnv, rebuildOrderedConfig };
+//# sourceMappingURL=merge.d.cts.map

package/dist/merge.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.cts","names":[],"sources":["../src/merge.ts"],"mappings":";cAGa,gBAAA;AAAA,KAcD,MAAA;AAAA,iBAkKI,oBAAA,WAA+B,MAAA,kBAAA,CAAyB,MAAA,EAAQ,CAAA,GAAI,CAAA"}

package/dist/merge.d.mts

@@ -0,0 +1,7 @@
+//#region src/merge.d.ts
+declare const BOS_CONFIG_ORDER: readonly ["extends", "account", "domain", "testnet", "staging", "repository", "app", "plugins", "shared"];
+type BosEnv = "development" | "production" | "staging";
+declare function rebuildOrderedConfig<T extends Record<string, unknown>>(config: T): T;
+//#endregion
+export { BOS_CONFIG_ORDER, BosEnv, rebuildOrderedConfig };
+//# sourceMappingURL=merge.d.mts.map

package/dist/merge.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.mts","names":[],"sources":["../src/merge.ts"],"mappings":";cAGa,gBAAA;AAAA,KAcD,MAAA;AAAA,iBAkKI,oBAAA,WAA+B,MAAA,kBAAA,CAAyB,MAAA,EAAQ,CAAA,GAAI,CAAA"}

package/dist/merge.mjs

@@ -0,0 +1,107 @@
+import { createDefu } from "defu";
+
+//#region src/merge.ts
+const BOS_CONFIG_ORDER = [
+	"extends",
+	"account",
+	"domain",
+	"testnet",
+	"staging",
+	"repository",
+	"app",
+	"plugins",
+	"shared"
+];
+const ARRAY_UNION_KEYS = new Set(["secrets"]);
+function isPlainObject(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function unionArrays(a, b) {
+	const aArr = Array.isArray(a) ? a : [];
+	const bArr = Array.isArray(b) ? b : [];
+	if (aArr.length === 0 && bArr.length === 0) return void 0;
+	const seen = /* @__PURE__ */ new Set();
+	const result = [];
+	for (const item of [...aArr, ...bArr]) {
+		if (typeof item === "string") {
+			if (seen.has(item)) continue;
+			seen.add(item);
+		}
+		result.push(item);
+	}
+	return result;
+}
+function cleanNullSentinels(obj) {
+	const out = {};
+	for (const [key, value] of Object.entries(obj)) {
+		if (value === null || value === void 0) continue;
+		if (isPlainObject(value)) {
+			const cleaned = cleanNullSentinels(value);
+			if (Object.keys(cleaned).length > 0) out[key] = cleaned;
+		} else out[key] = value;
+	}
+	return out;
+}
+const bosConfigMerger = createDefu((obj, key, value) => {
+	if (obj[key] === null) return true;
+	if (value === null) {
+		obj[key] = null;
+		return true;
+	}
+	if (Array.isArray(obj[key]) && Array.isArray(value)) {
+		if (ARRAY_UNION_KEYS.has(key)) obj[key] = unionArrays(obj[key], value);
+		else obj[key] = value;
+		return true;
+	}
+	return false;
+});
+function resolveExtendsRef(extendsField, env) {
+	if (!extendsField) return void 0;
+	if (typeof extendsField === "string") return extendsField;
+	return extendsField[env] ?? extendsField.production ?? Object.values(extendsField).find(Boolean);
+}
+function mergeBosConfigWithExtends(parent, child) {
+	const merged = bosConfigMerger(child, parent);
+	if (isPlainObject(parent.plugins) && isPlainObject(child.plugins)) {
+		const plugins = { ...parent.plugins };
+		for (const [key, rawValue] of Object.entries(child.plugins)) {
+			const value = rawValue;
+			if (value === null || value === false) delete plugins[key];
+			else if (isPlainObject(plugins[key]) && isPlainObject(value)) plugins[key] = bosConfigMerger(value, plugins[key]);
+			else plugins[key] = value;
+		}
+		merged.plugins = plugins;
+	} else if (child.plugins !== void 0) merged.plugins = cleanNullSentinels(child.plugins);
+	const mergedRecord = merged;
+	if (isPlainObject(mergedRecord.app)) for (const entryVal of Object.values(mergedRecord.app)) {
+		if (!isPlainObject(entryVal)) continue;
+		for (const secretKey of ARRAY_UNION_KEYS) if (Array.isArray(entryVal[secretKey])) entryVal[secretKey] = unionArrays(entryVal[secretKey], [])?.filter(Boolean) ?? entryVal[secretKey];
+	}
+	if (isPlainObject(mergedRecord.plugins)) for (const pluginVal of Object.values(mergedRecord.plugins)) {
+		if (!isPlainObject(pluginVal)) continue;
+		for (const secretKey of ARRAY_UNION_KEYS) if (Array.isArray(pluginVal[secretKey])) pluginVal[secretKey] = unionArrays(pluginVal[secretKey], [])?.filter(Boolean) ?? pluginVal[secretKey];
+	}
+	return rebuildOrderedConfig(mergedRecord);
+}
+function mergeBosConfigWithTemplate(local, template) {
+	return rebuildOrderedConfig(mergeJsonValuesPreservingLocalOrder(local, template));
+}
+function mergeJsonValuesPreservingLocalOrder(local, template) {
+	if (isPlainObject(local) && isPlainObject(template)) {
+		const merged = {};
+		for (const key of Object.keys(local)) merged[key] = mergeJsonValuesPreservingLocalOrder(local[key], template[key]);
+		for (const key of Object.keys(template)) if (!(key in merged)) merged[key] = template[key];
+		return merged;
+	}
+	return local ?? template;
+}
+function rebuildOrderedConfig(config) {
+	const ordered = {};
+	for (const key of BOS_CONFIG_ORDER) if (key in config) ordered[key] = config[key];
+	for (const key of Object.keys(config)) if (!BOS_CONFIG_ORDER.includes(key)) ordered[key] = config[key];
+	return ordered;
+}
+
+//#endregion
+export { BOS_CONFIG_ORDER, isPlainObject, mergeBosConfigWithExtends, mergeBosConfigWithTemplate, rebuildOrderedConfig, resolveExtendsRef };
+//# sourceMappingURL=merge.mjs.map

package/dist/merge.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.mjs","names":[],"sources":["../src/merge.ts"],"sourcesContent":["import { createDefu } from \"defu\";\nimport type { BosConfigInput, ExtendsConfig } from \"./types\";\n\nexport const BOS_CONFIG_ORDER = [\n  \"extends\",\n  \"account\",\n  \"domain\",\n  \"testnet\",\n  \"staging\",\n  \"repository\",\n  \"app\",\n  \"plugins\",\n  \"shared\",\n] as const;\n\nexport type BosConfigFieldName = (typeof BOS_CONFIG_ORDER)[number];\n\nexport type BosEnv = \"development\" | \"production\" | \"staging\";\n\nexport interface ResolvedConfigMeta {\n  env: BosEnv;\n  resolvedAt: string;\n  extendsChain: string[];\n  source?: string;\n}\n\nconst ARRAY_UNION_KEYS = new Set([\"secrets\"]);\n\nexport function isPlainObject(value: unknown): value is Record<string, unknown> {\n  return Boolean(value) && typeof value === \"object\" && !Array.isArray(value);\n}\n\nfunction unionArrays(a: unknown, b: unknown): unknown[] | undefined {\n  const aArr = Array.isArray(a) ? a : [];\n  const bArr = Array.isArray(b) ? b : [];\n  if (aArr.length === 0 && bArr.length === 0) return undefined;\n  const seen = new Set<string>();\n  const result: unknown[] = [];\n  for (const item of [...aArr, ...bArr]) {\n    if (typeof item === \"string\") {\n      if (seen.has(item)) continue;\n      seen.add(item);\n    }\n    result.push(item);\n  }\n  return result;\n}\n\nfunction cleanNullSentinels(obj: Record<string, unknown>): Record<string, unknown> {\n  const out: Record<string, unknown> = {};\n  for (const [key, value] of Object.entries(obj)) {\n    if (value === null || value === undefined) continue;\n    if (isPlainObject(value)) {\n      const cleaned = cleanNullSentinels(value);\n      if (Object.keys(cleaned).length > 0) {\n        out[key] = cleaned;\n      }\n    } else {\n      out[key] = value;\n    }\n  }\n  return out;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst bosConfigMerger = createDefu((obj: any, key: any, value: any): boolean | undefined => {\n  if (obj[key] === null) return true;\n  if (value === null) {\n    obj[key] = null;\n    return true;\n  }\n  if (Array.isArray(obj[key]) && Array.isArray(value)) {\n    if (ARRAY_UNION_KEYS.has(key)) {\n      obj[key] = unionArrays(obj[key], value);\n    } else {\n      obj[key] = value;\n    }\n    return true;\n  }\n  return false;\n});\n\nexport function resolveExtendsRef(\n  extendsField: string | ExtendsConfig | undefined,\n  env: BosEnv,\n): string | undefined {\n  if (!extendsField) return undefined;\n  if (typeof extendsField === \"string\") return extendsField;\n  return extendsField[env] ?? extendsField.production ?? Object.values(extendsField).find(Boolean);\n}\n\nexport function mergeBosConfigWithExtends(\n  parent: BosConfigInput,\n  child: BosConfigInput,\n): BosConfigInput {\n  const merged = bosConfigMerger(child, parent) as BosConfigInput;\n\n  if (isPlainObject(parent.plugins) && isPlainObject(child.plugins)) {\n    const plugins: Record<string, unknown> = { ...parent.plugins };\n    for (const [key, rawValue] of Object.entries(child.plugins)) {\n      const value = rawValue as unknown;\n      if (value === null || value === false) {\n        delete plugins[key];\n      } else if (isPlainObject(plugins[key]) && isPlainObject(value)) {\n        plugins[key] = bosConfigMerger(\n          value as Record<string, unknown>,\n          plugins[key] as Record<string, unknown>,\n        );\n      } else {\n        plugins[key] = value;\n      }\n    }\n    (merged as Record<string, unknown>).plugins = plugins;\n  } else if (child.plugins !== undefined) {\n    (merged as Record<string, unknown>).plugins = cleanNullSentinels(\n      child.plugins as Record<string, unknown>,\n    );\n  }\n\n  const mergedRecord = merged as Record<string, unknown>;\n\n  if (isPlainObject(mergedRecord.app)) {\n    for (const entryVal of Object.values(mergedRecord.app as Record<string, unknown>)) {\n      if (!isPlainObject(entryVal)) continue;\n      for (const secretKey of ARRAY_UNION_KEYS) {\n        if (Array.isArray(entryVal[secretKey])) {\n          entryVal[secretKey] =\n            (unionArrays(entryVal[secretKey] as unknown[], []) as string[] | undefined)?.filter(\n              Boolean,\n            ) ?? entryVal[secretKey];\n        }\n      }\n    }\n  }\n\n  if (isPlainObject(mergedRecord.plugins)) {\n    for (const pluginVal of Object.values(mergedRecord.plugins as Record<string, unknown>)) {\n      if (!isPlainObject(pluginVal)) continue;\n      for (const secretKey of ARRAY_UNION_KEYS) {\n        if (Array.isArray(pluginVal[secretKey])) {\n          pluginVal[secretKey] =\n            (unionArrays(pluginVal[secretKey] as unknown[], []) as string[] | undefined)?.filter(\n              Boolean,\n            ) ?? pluginVal[secretKey];\n        }\n      }\n    }\n  }\n\n  return rebuildOrderedConfig(mergedRecord) as BosConfigInput;\n}\n\nexport function mergeBosConfigWithTemplate(\n  local: BosConfigInput,\n  template: BosConfigInput,\n): BosConfigInput {\n  const merged = mergeJsonValuesPreservingLocalOrder(local, template) as BosConfigInput;\n  return rebuildOrderedConfig(merged as Record<string, unknown>) as BosConfigInput;\n}\n\nfunction mergeJsonValuesPreservingLocalOrder(local: unknown, template: unknown): unknown {\n  if (isPlainObject(local) && isPlainObject(template)) {\n    const merged: Record<string, unknown> = {};\n    for (const key of Object.keys(local)) {\n      merged[key] = mergeJsonValuesPreservingLocalOrder(\n        local[key],\n        (template as Record<string, unknown>)[key],\n      );\n    }\n    for (const key of Object.keys(template as Record<string, unknown>)) {\n      if (!(key in merged)) {\n        merged[key] = (template as Record<string, unknown>)[key];\n      }\n    }\n    return merged;\n  }\n  return local ?? template;\n}\n\nexport function rebuildOrderedConfig<T extends Record<string, unknown>>(config: T): T {\n  const ordered: Record<string, unknown> = {};\n\n  for (const key of BOS_CONFIG_ORDER) {\n    if (key in config) {\n      ordered[key] = config[key];\n    }\n  }\n\n  for (const key of Object.keys(config)) {\n    if (!BOS_CONFIG_ORDER.includes(key as BosConfigFieldName)) {\n      ordered[key] = config[key];\n    }\n  }\n\n  return ordered as T;\n}\n\nexport { bosConfigMerger };\n"],"mappings":"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"}

package/dist/orchestrator.d.cts

@@ -37,7 +37,7 @@ declare const makeDevProcess: (pkg: string, callbacks: ProcessCallbacks, portOve
   kill: Effect.Effect<void, never, never>;
   waitForReady: Effect.Effect<void, Error, never>;
   waitForExit: Effect.Effect<ExitCode, _$_effect_platform_Error0.PlatformError, never>;
-}, string | Error | _$_effect_platform_Error0.PlatformError, ServiceDescriptorMap | DevRuntimeConfig | _$effect_Scope0.Scope | _$_effect_platform_CommandExecutor0.CommandExecutor>;
+}, string | Error | _$_effect_platform_Error0.PlatformError, _$effect_Scope0.Scope | ServiceDescriptorMap | DevRuntimeConfig | _$_effect_platform_CommandExecutor0.CommandExecutor>;
 declare function getProcessStates(packages: string[], services: Map<string, ServiceDescriptor>, portOverride?: number): ProcessState[];
 //#endregion
 export { ProcessCallbacks, ProcessHandle, ProcessState, ProcessStatus, getProcessStates, makeDevProcess };

package/dist/orchestrator.d.mts

@@ -37,7 +37,7 @@ declare const makeDevProcess: (pkg: string, callbacks: ProcessCallbacks, portOve
   kill: Effect.Effect<void, never, never>;
   waitForReady: Effect.Effect<void, Error, never>;
   waitForExit: Effect.Effect<ExitCode, _$_effect_platform_Error0.PlatformError, never>;
-}, string | Error | _$_effect_platform_Error0.PlatformError, ServiceDescriptorMap | DevRuntimeConfig | _$effect_Scope0.Scope | _$_effect_platform_CommandExecutor0.CommandExecutor>;
+}, string | Error | _$_effect_platform_Error0.PlatformError, _$effect_Scope0.Scope | ServiceDescriptorMap | DevRuntimeConfig | _$_effect_platform_CommandExecutor0.CommandExecutor>;
 declare function getProcessStates(packages: string[], services: Map<string, ServiceDescriptor>, portOverride?: number): ProcessState[];
 //#endregion
 export { ProcessCallbacks, ProcessHandle, ProcessState, ProcessStatus, getProcessStates, makeDevProcess };