acrylblends 1.2.0 → 1.3.1

package/dist/index.d.ts

@@ -187,7 +187,8 @@ export declare function assertTargetFree(target: string): void;
 export declare function copyTemplate(source: string, target: string, name: string): string[];
 export declare function readTemplatePlugins(templateDir: string): string[];
 /**
- * Add run-time dependencies to an app's package.json, keeping what is there and sorting the keys. Returns the names added. A package the app lists as a development
+ * Add run-time dependencies to an app's package.json and sort the keys. Returns the names to install: those added, and those moved because a plugin asks for a newer
+ * version than the app lists (the plugin's new code needs it). A version the app lists that is the same or newer stays. A package the app lists as a development
  * dependency too is taken out of that list: npm lets the development entry win, so `npm install --omit=dev` would leave a run-time dependency out.
  */
 export declare function mergeDependencies(appDir: string, dependencies: Readonly<Record<string, string>>): string[];

package/dist/index.js

@@ -74,7 +74,7 @@ var packages = {
 	},
 	"acryl-blends-frame": {
 		"name": "blends-frame",
-		"version": "0.1.0"
+		"version": "0.1.1"
 	}
 };
 //#endregion
@@ -1002,6 +1002,18 @@ function applyIdeProfile(root, input) {
 //#region src/version.ts
 /** The version of this package. */
 const VERSION = createRequire(import.meta.url)("../package.json").version;
+/** Semver order for the release versions (numeric segments; a pre-release sorts before its release). */
+function compareVersions(a, b) {
+	const pa = a.split(/[.-]/u).map((part) => Number.isNaN(Number(part)) ? part : Number(part));
+	const pb = b.split(/[.-]/u).map((part) => Number.isNaN(Number(part)) ? part : Number(part));
+	for (let i = 0; i < Math.max(pa.length, pb.length); i += 1) {
+		const x = pa[i] ?? 0;
+		const y = pb[i] ?? 0;
+		if (x < y) return -1;
+		if (x > y) return 1;
+	}
+	return 0;
+}
 /** The DSH release the frame's packages pin as peers, so an app's DSH pin is the same one. */
 const FRAME_DSH_VERSION = dshVersion;
 /** Every package the frame publishes, in the file's order. */
@@ -1151,6 +1163,11 @@ const HOST_PROVIDED_IDS = /* @__PURE__ */ new Set([
 	"save",
 	"acryl-door"
 ]);
+/**
+* Services the app's rows provide that the host's own rows call: the door and the frame reach `pluginShare`, and no host row provides that name. Left out of
+* the isolate list, so they find it; every other service stays in the app's realm.
+*/
+const REACHED_FROM_HOST = /* @__PURE__ */ new Set(["pluginShare"]);
 /** The generated `frame/app-plugins.mjs`, by the row that mounts it. */
 const APP_PLUGINS_FILE = "frame/app-plugins.mjs";
 /**
@@ -1176,12 +1193,14 @@ function appPluginsRow(prefix) {
 		"  return path === base || path.startsWith(base + '/') ? path : base + (path.startsWith('/') ? '' : '/') + path",
 		"}",
 		"",
-		"/** The router as the app's rows see it: mounts land under the prefix, every other member is the host router's. */",
+		"/** The router as the app's rows see it: mounts land under the prefix, and a plugin's own request (its install check) finds them there; every other member is the host router's. */",
 		"function appRouter(router, prefix) {",
 		"  const route = (path, app) => router.route(prefixedAppRoute(prefix, path), app)",
+		"  const request = (input, ...rest) => router.request(typeof input === 'string' && input.startsWith('/') ? prefixedAppRoute(prefix, input) : input, ...rest)",
 		"  return new Proxy(router, {",
 		"    get(target, property) {",
 		"      if (property === 'route') return route",
+		"      if (property === 'request') return request",
 		"      const value = Reflect.get(target, property, target)",
 		"      return typeof value === 'function' ? value.bind(target) : value",
 		"    },",
@@ -1190,8 +1209,10 @@ function appPluginsRow(prefix) {
 		"",
 		"export async function apply(ctx, config) {",
 		`  const prefix = typeof config?.appPrefix === 'string' ? config.appPrefix : ${JSON.stringify(prefix)}`,
-		"  // The rows read ctx.router as the app's own router: the same paths as on their own server, under the frame's prefix.",
-		"  const appScope = ctx.extend({ router: appRouter(ctx.router, prefix) })",
+		"  // The rows read ctx.router as the app's own router: the same paths as on their own server, under the frame's prefix. A getter, read by each plugin",
+		"  // from its own context: it gets the host router traced for that context, so a route it mounts is its own and goes when the plugin is removed",
+		"  // (a router taken once here would make every route this row's, served until the whole app reloads).",
+		"  const appScope = ctx.extend({ get router() { return appRouter(this.get('router'), prefix) } })",
 		"  const fibers = await composeInto(appScope, ctx.appInstance, { host: true })",
 		"  ctx.effect(() => () => { for (const fiber of [...fibers].reverse()) void fiber.dispose() }, 'app-plugins: dispose')",
 		"}",
@@ -1229,7 +1250,7 @@ function providedServices(appDir) {
 		}
 	};
 	for (const row of ownRowIds(appDir)) walk(join(appDir, "plugins", row));
-	return Object.fromEntries([...provided].sort().map((name) => [name, true]));
+	return Object.fromEntries([...provided].filter((name) => !REACHED_FROM_HOST.has(name)).sort().map((name) => [name, true]));
 }
 /**
 * The frame rows for an app: its routes row when it carries `src/frame.ts`, and the composition row when its `src/app.ts` exports `composeInto`.
@@ -1662,8 +1683,19 @@ function readTemplatePlugins(templateDir) {
 	const { plugins } = JSON.parse(readFileSync(file, "utf8"));
 	return plugins ?? [];
 }
+/** A version a plugin's pin can be compared with: an exact one or a caret or tilde range. A tag, a path or a URL is the app's own choice. */
+function comparableVersion(spec) {
+	return /^[\^~]?\d+\.\d+\.\d+(?:-[\w.]+)?$/u.test(spec) ? spec.replace(/^[\^~]/u, "") : void 0;
+}
+/** Whether a plugin's pin asks for more than what the app has: the plugin's code was written against that version. */
+function asksForNewer(wanted, current) {
+	const a = comparableVersion(wanted);
+	const b = comparableVersion(current);
+	return a !== void 0 && b !== void 0 && compareVersions(a, b) > 0;
+}
 /**
-* Add run-time dependencies to an app's package.json, keeping what is there and sorting the keys. Returns the names added. A package the app lists as a development
+* Add run-time dependencies to an app's package.json and sort the keys. Returns the names to install: those added, and those moved because a plugin asks for a newer
+* version than the app lists (the plugin's new code needs it). A version the app lists that is the same or newer stays. A package the app lists as a development
 * dependency too is taken out of that list: npm lets the development entry win, so `npm install --omit=dev` would leave a run-time dependency out.
 */
 function mergeDependencies(appDir, dependencies) {
@@ -1671,14 +1703,16 @@ function mergeDependencies(appDir, dependencies) {
 	const manifest = JSON.parse(readFileSync(file, "utf8"));
 	const current = manifest.dependencies ?? {};
 	const added = Object.keys(dependencies).filter((name) => !(name in current));
+	const moved = Object.entries(dependencies).filter(([name, wanted]) => current[name] !== void 0 && asksForNewer(wanted, current[name]));
 	const merged = {
 		...dependencies,
-		...current
+		...current,
+		...Object.fromEntries(moved)
 	};
 	manifest.dependencies = Object.fromEntries(Object.entries(merged).sort(([a], [b]) => a.localeCompare(b)));
 	if (manifest.devDependencies !== void 0) manifest.devDependencies = Object.fromEntries(Object.entries(manifest.devDependencies).filter(([name]) => !(name in merged)));
 	writeFileSync(file, `${JSON.stringify(manifest, null, 2)}\n`);
-	return added;
+	return [...added, ...moved.map(([name]) => name)];
 }
 /** Add `package.json` "imports" entries (`#acryl-kv`: `./plugins/acryl-kv/src/index.ts`); an entry the app already has is kept. Returns the names added. */
 function mergeImports(appDir, imports, pluginsDir) {
@@ -2142,7 +2176,7 @@ async function add(options, io) {
 		if (refused !== 0) return refused;
 	}
 	io.stdout.write(`added ${toCopy.map((plugin) => plugin.name).join(", ")} to ${appDir}\n`);
-	if (addedDependencies.length > 0) io.stdout.write(`new dependencies: ${addedDependencies.join(", ")} (run npm install)\n`);
+	if (addedDependencies.length > 0) io.stdout.write(`dependencies to install: ${addedDependencies.join(", ")} (run npm install)\n`);
 	for (const plugin of toCopy.filter((plugin) => names.includes(plugin.name))) {
 		const mounted = MOUNTED.find((candidate) => candidate.name === plugin.name);
 		const result = mounted ? mount(appDir, mounted) : void 0;
@@ -3765,7 +3799,7 @@ async function upgrade(options, io) {
 		const upgradedPlugins = plans.filter((p) => [...p.files.values()].some((s) => s !== "same" && s !== "extra") || p.isNew).map((p) => p.plugin.name);
 		io.stdout.write(`\nupgraded ${[...upgradedPlugins, ...frameChanged ? ["the frame"] : []].join(", ")}\n`);
 		if (conflicts + frameBackups > 0) io.stdout.write(`the ${conflicts + frameBackups} edited file(s) replaced by --force are saved in ${posix$1(relative(appDir, backup))}/\n`);
-		io.stdout.write(`acrylblends is now ^${VERSION} in package.json${addedDependencies.length > 0 ? `; new dependencies: ${[...new Set(addedDependencies)].join(", ")}` : ""}: run npm install, then npm run check and npm test\n`);
+		io.stdout.write(`acrylblends is now ^${VERSION} in package.json${addedDependencies.length > 0 ? `; dependencies to install: ${[...new Set(addedDependencies)].join(", ")}` : ""}: run npm install, then npm run check and npm test\n`);
 		return 0;
 	} finally {
 		rmSync(scratch, {