everything-dev 1.53.2 → 2.0.0-rc.1

package/dist/cli/upgrade.mjs

@@ -1,17 +1,20 @@
-import { loadResolvedConfig } from "../config.mjs";
-import { timePhase } from "./timing.mjs";
-import { syncResolvedSharedDeps } from "../shared-deps.mjs";
+import { MISSING_CONFIG_MESSAGE, readAuthoredConfigInput } from "../config.mjs";
+import { readWorkspaceCatalog, writeWorkspaceCatalog } from "../workspace-catalog.mjs";
 import { saveBosConfig } from "../utils/save-config.mjs";
 import { getExtendsRef, parseBosRef, readJsonFile } from "./utils/helpers.mjs";
-import { buildChildRootScripts, fetchParentConfig, getParentOnlyScriptKeys, resolveCatalogChainSource, runBunInstallForUpgrade, runTypesGen } from "./init.mjs";
-import { readInstalledFrameworkVersion } from "./framework-version.mjs";
+import { buildChildRootScripts, fetchParentConfig, getParentOnlyScriptKeys, resolveCatalogChainSource, runPnpmInstallForUpgrade, runTypesGen } from "./init.mjs";
+import { openResolution } from "../resolution/session.mjs";
+import { timePhase } from "./timing.mjs";
+import { findWorkspaceRoot } from "../workspace.mjs";
+import { syncResolvedSharedDeps } from "../shared-deps.mjs";
 import { syncTemplate } from "./sync.mjs";
+import { readInstalledFrameworkVersion } from "./framework-version.mjs";
 import { existsSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import process from "node:process";
-import * as p from "@clack/prompts";
 import { glob } from "glob";
+import process from "node:process";
 import { spawnSync } from "node:child_process";
+import * as p from "@clack/prompts";
 
 //#region src/cli/upgrade.ts
 const FRAMEWORK_PACKAGES = ["everything-dev", "every-plugin"];
@@ -59,11 +62,14 @@ function extractSemver(value) {
 	if (!value) return null;
 	return value.match(/\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?/)?.[0] ?? null;
 }
+function workspaceDirOf(projectDir) {
+	return findWorkspaceRoot(projectDir)?.dir ?? projectDir;
+}
 function readRootPackageJson(projectDir) {
-	return readJsonFile(join(projectDir, "package.json"));
+	return readJsonFile(join(workspaceDirOf(projectDir), "package.json"));
 }
 function readRootCatalogEntry(projectDir, packageName) {
-	return readRootPackageJson(projectDir).workspaces?.catalog?.[packageName];
+	return readWorkspaceCatalog(workspaceDirOf(projectDir))[packageName];
 }
 function readCurrentPackageSpecifier(projectDir, packageName) {
 	const pkg = readRootPackageJson(projectDir);
@@ -157,35 +163,26 @@ function updatePackageFileAuthCoreRef(filePath) {
 	return modified;
 }
 function syncRootCatalogWithParent(projectDir, parentCatalog) {
-	const pkgPath = join(projectDir, "package.json");
+	const workspaceDir = workspaceDirOf(projectDir);
+	const pkgPath = join(workspaceDir, "package.json");
 	const pkg = readJsonFile(pkgPath);
-	let modified = syncPackageObjectCatalogRefs(pkg, Object.keys(parentCatalog));
-	if (!pkg.workspaces || typeof pkg.workspaces !== "object") {
-		pkg.workspaces = {
-			packages: [],
-			catalog: {}
-		};
-		modified = true;
-	}
-	const workspaces = pkg.workspaces;
-	if (!workspaces.catalog || typeof workspaces.catalog !== "object") {
-		workspaces.catalog = {};
-		modified = true;
-	}
-	for (const [packageName, version] of Object.entries(parentCatalog)) if (workspaces.catalog[packageName] !== version) {
-		workspaces.catalog[packageName] = version;
-		modified = true;
-	}
+	const modified = syncPackageObjectCatalogRefs(pkg, Object.keys(parentCatalog));
+	let catalogChanged = false;
+	const catalog = readWorkspaceCatalog(workspaceDir);
+	for (const [packageName, version] of Object.entries(parentCatalog)) if (catalog[packageName] !== version) {
+		catalog[packageName] = version;
+		catalogChanged = true;
+	}
+	if (catalogChanged) writeWorkspaceCatalog(workspaceDir, catalog);
 	if (modified) writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
-	return modified;
+	return modified || catalogChanged;
 }
 async function readExtendedRootSource(projectDir) {
-	const configPath = join(projectDir, "bos.config.json");
-	if (!existsSync(configPath)) return {
+	const localConfig = await readAuthoredConfigInput(projectDir);
+	if (!localConfig) return {
 		catalog: {},
 		extendsChain: []
 	};
-	const localConfig = JSON.parse(readFileSync(configPath, "utf-8"));
 	let extendsRef = getExtendsRef(localConfig);
 	if (!extendsRef?.startsWith("bos://")) return {
 		catalog: {},
@@ -425,9 +422,8 @@ async function migrateBosConfigFiles(projectDir) {
 	return migrated;
 }
 async function loadParentPluginOptions(projectDir) {
-	const configPath = join(projectDir, "bos.config.json");
-	if (!existsSync(configPath)) return null;
-	const localConfig = JSON.parse(readFileSync(configPath, "utf-8"));
+	const localConfig = await readAuthoredConfigInput(projectDir);
+	if (!localConfig) return null;
 	const extendsRef = getExtendsRef(localConfig);
 	if (!extendsRef?.startsWith("bos://")) return null;
 	const parsed = parseBosRef(extendsRef);
@@ -485,32 +481,20 @@ function setCatalogRef(field, packageName) {
 	return true;
 }
 async function findWorkspacePackageJsons(projectDir) {
-	const rootPkgPath = join(projectDir, "package.json");
-	if (!existsSync(rootPkgPath)) return [];
-	const workspaceConfig = JSON.parse(readFileSync(rootPkgPath, "utf-8")).workspaces;
-	const patterns = [];
-	if (Array.isArray(workspaceConfig)) patterns.push(...workspaceConfig);
-	else if (workspaceConfig?.packages && Array.isArray(workspaceConfig.packages)) patterns.push(...workspaceConfig.packages);
-	if (patterns.length === 0) return [];
+	const root = findWorkspaceRoot(projectDir);
+	if (!root) return [];
 	const pkgPaths = [];
-	for (const pattern of patterns) {
-		const matches = await glob(pattern, {
-			cwd: projectDir,
-			dot: false,
-			absolute: false
-		});
-		for (const match of matches) {
-			const pkgPath = join(projectDir, match, "package.json");
-			if (existsSync(pkgPath) && statSync(pkgPath).isFile()) pkgPaths.push(pkgPath);
-		}
+	for (const member of root.members) {
+		const pkgPath = join(member.dir, "package.json");
+		if (existsSync(pkgPath) && statSync(pkgPath).isFile()) pkgPaths.push(pkgPath);
 	}
 	return [...new Set(pkgPaths)];
 }
 async function migrateChildRootPackageJson(projectDir) {
-	const configPath = join(projectDir, "bos.config.json");
-	const pkgPath = join(projectDir, "package.json");
-	if (!existsSync(configPath) || !existsSync(pkgPath)) return false;
-	if (!getExtendsRef(readJsonFile(configPath))?.startsWith("bos://")) return false;
+	const config = await readAuthoredConfigInput(projectDir);
+	const pkgPath = join(workspaceDirOf(projectDir), "package.json");
+	if (!config || !existsSync(pkgPath)) return false;
+	if (!getExtendsRef(config)?.startsWith("bos://")) return false;
 	const pkg = readJsonFile(pkgPath);
 	let changed = false;
 	if (pkg.private !== true) {
@@ -616,7 +600,7 @@ async function rewriteLegacyUiImports(projectDir) {
 	}
 	return migrated;
 }
-const LEGACY_DIST_IMPORT_REWRITES = [["from \"everything-dev/", "from \"everything-dev/"], ["from 'everything-dev/", "from 'everything-dev/"]];
+const LEGACY_DIST_IMPORT_REWRITES = [["from \"everything-dev/dist/", "from \"everything-dev/"], ["from 'everything-dev/dist/", "from 'everything-dev/"]];
 function escapeRegex(s) {
 	return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -694,7 +678,7 @@ function rewritePipeEffectProvideForm(source, relPath) {
 		const layerExpr = result.slice(call.argStart, call.endIdx).trim();
 		const tagName = deriveTagFromLayerExpr(layerExpr);
 		if (!tagName) {
-			console.warn(`[Upgrade] ${relPath}: found .pipe(Effect.provide(${layerExpr})) but could not derive a tag name — skipping. Migrate manually to tools.buildService(<Tag>, ${layerExpr}).`);
+			console.warn(`[Upgrade] ${relPath}: found .pipe(Effect.provide(${layerExpr})) but could not derive a tag name — skipping. Migrate manually to Layer.buildWithScope(${layerExpr}, yield* Effect.scope) + Context.get.`);
 			continue;
 		}
 		const tagUseRe = new RegExp(`(yield\\*\\s+)${escapeRegex(tagName)}(\\s*;?)`, "g");
@@ -707,12 +691,54 @@ function rewritePipeEffectProvideForm(source, relPath) {
 		const tagStart = tm.index ?? -1;
 		if (tagStart < 0) continue;
 		const tagLen = tm[0].length;
-		const replacement = `${tm[1]}tools.buildService(${tagName}, ${layerExpr})${tm[2]}`;
+		const replacement = `${tm[1]}Layer.buildWithScope(${layerExpr}, yield* Effect.scope).pipe(Effect.map((context) => Context.get(context, ${tagName})))${tm[2]}`;
 		if (tagStart < call.dotIdx) result = result.slice(0, tagStart) + replacement + result.slice(tagStart + tagLen, call.dotIdx) + result.slice(call.pipeCloseEnd);
 		else result = result.slice(0, call.dotIdx) + result.slice(call.pipeCloseEnd, tagStart) + replacement + result.slice(tagStart + tagLen);
 	}
 	return result;
 }
+function rewriteTwoArgEffectProvideForm(source, relPath) {
+	const matches = [...source.matchAll(/\byield\*\s*Effect\.provide\(/g)];
+	if (matches.length === 0) return source;
+	let result = source;
+	for (let k = matches.length - 1; k >= 0; k--) {
+		const m = matches[k];
+		const openIdx = (m.index ?? -1) + m[0].length - 1;
+		if (openIdx < 0) continue;
+		const closeIdx = balancedParenEnd(source, openIdx + 1);
+		if (closeIdx === -1) continue;
+		const inner = source.slice(openIdx + 1, closeIdx);
+		const commaIdx = findTopLevelComma(inner);
+		if (commaIdx === -1) {
+			console.warn(`[Upgrade] ${relPath}: found \`yield* Effect.provide(...)\` without a top-level Tag, Layer argument pair — skipping. Migrate manually to Layer.buildWithScope + Context.get.`);
+			continue;
+		}
+		const tagExpr = inner.slice(0, commaIdx).trim();
+		const layerExpr = inner.slice(commaIdx + 1).trim();
+		const replacement = `${m[0].replace(/Effect\.provide\($/, "")}Layer.buildWithScope(${layerExpr}, yield* Effect.scope).pipe(Effect.map((context) => Context.get(context, ${tagExpr})))`;
+		result = result.slice(0, m.index) + replacement + result.slice(closeIdx + 1);
+	}
+	return result;
+}
+function findTopLevelComma(inner) {
+	let depth = 0;
+	for (let i = 0; i < inner.length; i++) {
+		const ch = inner[i];
+		if (ch === "(" || ch === "[" || ch === "{") depth++;
+		else if (ch === ")" || ch === "]" || ch === "}") depth--;
+		else if (ch === "," && depth === 0) return i;
+	}
+	return -1;
+}
+function ensureEffectImports(source) {
+	const m = source.match(/import\s*\{([^}]*)\}\s*from\s*["']every-plugin\/effect["']/);
+	if (!m) return source;
+	const names = m[1].split(",").map((s) => s.trim()).filter(Boolean);
+	if (!names.includes("Context")) names.push("Context");
+	if (!names.includes("Layer")) names.push("Layer");
+	names.sort((a, b) => a.localeCompare(b));
+	return source.replace(m[0], `import { ${names.join(", ")} } from "effect"`);
+}
 async function rewriteLegacyPluginScopedLayerPatterns(projectDir) {
 	const files = await glob(["plugins/*/src/index.ts", "api/src/index.ts"], {
 		cwd: projectDir,
@@ -722,18 +748,14 @@ async function rewriteLegacyPluginScopedLayerPatterns(projectDir) {
 	});
 	if (files.length === 0) return [];
 	const migrated = [];
-	const effectProvidePattern = /\byield\*\s*Effect\.provide\(/g;
 	for (const file of files) {
 		const filePath = join(projectDir, file);
 		const original = readFileSync(filePath, "utf-8");
 		let next = original;
-		next = next.replaceAll(effectProvidePattern, "yield* tools.buildService(");
+		next = rewriteTwoArgEffectProvideForm(next, file);
 		next = rewritePipeEffectProvideForm(next, file);
-		if (next.includes("tools.buildService(")) next = next.replace(/(initialize:\s*)\((\w+)(?:,\s*(\w+))?\s*\)\s*=>/g, (_match, prefix, p1, p2) => {
-			if (p2) return `${prefix}(${p1}, ${p2}, tools) =>`;
-			return `${prefix}(${p1}, _plugins, tools) =>`;
-		});
 		if (next !== original) {
+			next = ensureEffectImports(next);
 			writeFileSync(filePath, next);
 			migrated.push(file);
 		}
@@ -779,12 +801,12 @@ async function runMigrationPhase(projectDir, options, parentSource) {
 		}));
 	}
 	await timePhase(timings, "sync shared deps", async () => {
-		const configResult = await loadResolvedConfig({ cwd: projectDir });
-		if (!configResult) throw new Error("No bos.config.json found in current directory");
+		const configSession = await openResolution({ cwd: projectDir });
+		if (!configSession?.config) throw new Error(`${MISSING_CONFIG_MESSAGE} in current directory`);
 		return syncResolvedSharedDeps({
 			configDir: projectDir,
 			hostMode: "local",
-			bosConfig: configResult.config
+			bosConfig: configSession.config
 		});
 	});
 	if (!options.noInstall) await timePhase(timings, "generate types", () => runTypesGen(projectDir));
@@ -830,7 +852,8 @@ async function runMigrationPhase(projectDir, options, parentSource) {
 }
 async function upgradeTemplate(projectDir, options) {
 	const timings = [];
-	if (!existsSync(join(projectDir, "package.json"))) return {
+	const pkgPath = join(workspaceDirOf(projectDir), "package.json");
+	if (!existsSync(pkgPath)) return {
 		status: "error",
 		packages: [],
 		timings,
@@ -898,15 +921,17 @@ async function upgradeTemplate(projectDir, options) {
 		if (inheritedCatalogPackageNames.length > 0) for (const pkgPath of workspacePkgPaths) updatePackageFileCatalogRefs(pkgPath, inheritedCatalogPackageNames);
 	});
 	const needsInstall = (hasUpdates || hasCatalogUpdates) && !options.noInstall;
-	if (needsInstall) await timePhase(timings, "install dependencies", () => runBunInstallForUpgrade(projectDir));
+	if (needsInstall) await timePhase(timings, "install dependencies", () => runPnpmInstallForUpgrade(workspaceDirOf(projectDir)));
 	if (needsInstall && hasFrameworkUpdates) {
-		const childResult = spawnSync(join(projectDir, "node_modules", ".bin", "bos"), [
+		const bosPath = join(workspaceDirOf(projectDir), "node_modules", ".bin", "bos");
+		const childArgs = [
 			"upgrade",
 			"--migrations-only",
 			"--no-install",
 			...options.noSync ? ["--no-sync"] : [],
 			"--json"
-		], {
+		];
+		const childResult = spawnSync(bosPath, childArgs, {
 			cwd: projectDir,
 			stdio: [
 				"inherit",
@@ -972,5 +997,5 @@ async function upgradeTemplate(projectDir, options) {
 }
 
 //#endregion
-export { migrateBosConfigFiles, migrateChildRootPackageJson, rewriteLegacyPluginScopedLayerPatterns, upgradeTemplate };
+export { migrateBosConfigFiles, migrateChildRootPackageJson, rewriteLegacyDistImports, rewriteLegacyPluginScopedLayerPatterns, upgradeTemplate };
 //# sourceMappingURL=upgrade.mjs.map