@fluid-app/fluid-cli-portal 0.1.42 → 0.1.44

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { C as writeMappings, S as updateMapping, _ as deriveSlug, a as buildThemeIdToSlugMap, b as resolveIdToSlug, c as transformNavigationItems, d as transformTheme, f as buildSnapshot, g as writeSnapshot, h as readSnapshot, i as buildNavigationIdToSlugMap, l as transformProfile, m as diffAgainstSnapshot, o as deriveScreenSlug, p as computeFileHash, r as buildIdToSlugMap, s as transformNavigation, t as pullCommand, u as transformScreen, v as readMappings, x as resolveSlugToId, y as removeMapping } from "./pull-Cl7omGLf.mjs";
+import { A as fluid_os_v0_create_fluid_osversion, B as fluid_os_v0_update_fluid_osnavigation, C as writeMappings, D as fluid_os_v0_create_fluid_osprofile, E as fluid_os_v0_create_fluid_osnavigation_item, F as fluid_os_v0_delete_fluid_osscreen, G as fluid_os_v0_update_fluid_osversion, H as fluid_os_v0_update_fluid_osprofile, I as fluid_os_v0_delete_fluid_ostheme, K as createFetchClient, L as fluid_os_v0_list_fluid_osdefinitions, M as fluid_os_v0_delete_fluid_osnavigation, N as fluid_os_v0_delete_fluid_osnavigation_item, O as fluid_os_v0_create_fluid_osscreen, P as fluid_os_v0_delete_fluid_osprofile, R as fluid_os_v0_list_fluid_osnavigation_items, S as updateMapping, T as fluid_os_v0_create_fluid_osnavigation, U as fluid_os_v0_update_fluid_osscreen, V as fluid_os_v0_update_fluid_osnavigation_item, W as fluid_os_v0_update_fluid_ostheme, _ as deriveSlug, a as buildThemeIdToSlugMap, b as resolveIdToSlug, c as transformNavigationItems, d as transformTheme, f as buildSnapshot, g as writeSnapshot, h as readSnapshot, i as buildNavigationIdToSlugMap, j as fluid_os_v0_create_widget_package_version, k as fluid_os_v0_create_fluid_ostheme, l as transformProfile, m as diffAgainstSnapshot, o as deriveScreenSlug, p as computeFileHash, r as buildIdToSlugMap, s as transformNavigation, t as pullCommand, u as transformScreen, v as readMappings, w as fluid_os_v0_complete_widget_package_version_upload, x as resolveSlugToId, y as removeMapping, z as fluid_os_v0_list_fluid_osversions } from "./pull-CG5dELOX.mjs";
 import { createRequire } from "node:module";
 import { Command } from "commander";
 import chalk from "chalk";
@@ -12,7 +12,6 @@ import { chmodSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileS
 import Handlebars from "handlebars";
 import { execa } from "execa";
 import os from "node:os";
-import { createFetchClient, fluidOs } from "@fluid-app/fluidos-api-client";
 import { createHash } from "node:crypto";
 import fs from "fs-extra";
 import { isJsonValue } from "@fluid-app/portal-core/remote-dom-widget-package";
@@ -700,11 +699,14 @@ async function gitRemoteBranchExists(cwd, remoteUrl, branch = "main") {
 /**
 * Adopt `FETCH_HEAD` as the current (unborn) branch's base: point the
 * branch ref at it and load its tree into the index, leaving the working
-* tree untouched. The next auto-commit then records the local project
-* tree as a child of the remote history — local files win, remote-only
-* files are recorded as deletions — so the push fast-forwards instead of
-* being rejected for unrelated history. Only call when `hasCommits` is
-* false; with local commits it would silently rewrite the branch ref.
+* tree untouched. The next auto-commit (run with `ignoreRemovals`) then
+* records the local project tree on top of the remote history — local
+* additions/edits win, and remote-only files survive because a
+* content-only local dir (e.g. populated by `fluid portal pull`) is no
+* statement about what the full repo tracks — so the push fast-forwards
+* instead of being rejected for unrelated history. Only call when
+* `hasCommits` is false; with local commits it would silently rewrite
+* the branch ref.
 * Mirrors the widget CLI's first-push adoption (the backend provisions
 * repos with an auto-init/template commit, so a fresh root commit is
 * always unrelated history).
@@ -781,7 +783,9 @@ async function gitMergeFastForward(cwd) {
 	}
 }
 /**
-* `git add -A && git commit -m <message>`.
+* `git add -A && git commit -m <message>` (or, with
+* `{ ignoreRemovals: true }`, `git add --ignore-removal .` — see
+* GitAutoCommitOptions).
 *
 * `git add -A` intentionally stages the whole work tree: a portal's
 * provisioned repo tracks the entire project (it's seeded from the
@@ -795,9 +799,14 @@ async function gitMergeFastForward(cwd) {
 * identity so the commit isn't rejected. "nothing to commit" is treated
 * as a no-op, not an error.
 */
-async function gitAutoCommit(cwd, message) {
+async function gitAutoCommit(cwd, message, options = {}) {
+	const addArgs = options.ignoreRemovals ? [
+		"add",
+		"--ignore-removal",
+		"."
+	] : ["add", "-A"];
 	try {
-		await execa("git", ["add", "-A"], { cwd });
+		await execa("git", addArgs, { cwd });
 	} catch (err) {
 		throw toGitError(err, "add");
 	}
@@ -820,7 +829,7 @@ async function gitAutoCommit(cwd, message) {
 			cwd,
 			stdio: [
 				"ignore",
-				"inherit",
+				"pipe",
 				"pipe"
 			]
 		});
@@ -829,7 +838,7 @@ async function gitAutoCommit(cwd, message) {
 		if (missing) throw missing;
 		const e = err;
 		const streams = `${typeof e.stdout === "string" ? e.stdout : ""}\n${typeof e.stderr === "string" ? e.stderr : ""}`;
-		if (/nothing to commit/i.test(streams)) return;
+		if (/nothing to commit|no changes added to commit/i.test(streams)) return;
 		throw toGitError(err, "commit");
 	}
 }
@@ -1150,7 +1159,7 @@ async function autoPull(cwd) {
 	console.log(chalk.yellow("No portal/ directory found.") + " Attempting to pull content...");
 	console.log();
 	try {
-		const { pullCommand } = await import("./pull-Cl7omGLf.mjs").then((n) => n.n);
+		const { pullCommand } = await import("./pull-CG5dELOX.mjs").then((n) => n.n);
 		await pullCommand.parseAsync([], { from: "user" });
 		return hasPortalContent(cwd);
 	} catch (err) {
@@ -1508,7 +1517,7 @@ async function runPortalGitSync(options) {
 				await gitFetch(cwd, remoteUrl, branch);
 				await gitAdoptFetchHead(cwd);
 			}
-			if (await hasUncommittedChanges(cwd)) await gitAutoCommit(cwd, commitMessage);
+			if (await hasUncommittedChanges(cwd)) await gitAutoCommit(cwd, commitMessage, { ignoreRemovals: true });
 			return await pushCommitted(cwd, remoteUrl, branch);
 		}
 		await gitFetch(cwd, remoteUrl, branch);
@@ -1653,7 +1662,7 @@ async function pushScreens(client, defId, portalDir, changes, mappings) {
 		const slug = slugFromPath(file);
 		try {
 			const local = await readPortalFile(portalDir, file);
-			const newId = (await fluidOs.fluid_os_v0_create_fluid_osscreen(client, defId, { screen: {
+			const newId = (await fluid_os_v0_create_fluid_osscreen(client, defId, { screen: {
 				name: local.name,
 				slug,
 				component_tree: toApiComponentTree(local.component_tree)
@@ -1694,7 +1703,7 @@ async function pushScreens(client, defId, portalDir, changes, mappings) {
 		}
 		try {
 			const local = await readPortalFile(portalDir, file);
-			await fluidOs.fluid_os_v0_update_fluid_osscreen(client, defId, screenId, { screen: {
+			await fluid_os_v0_update_fluid_osscreen(client, defId, screenId, { screen: {
 				name: local.name,
 				slug,
 				component_tree: toApiComponentTree(local.component_tree)
@@ -1733,7 +1742,7 @@ async function pushScreens(client, defId, portalDir, changes, mappings) {
 			};
 		}
 		try {
-			await fluidOs.fluid_os_v0_delete_fluid_osscreen(client, defId, screenId);
+			await fluid_os_v0_delete_fluid_osscreen(client, defId, screenId);
 			currentMappings = removeMapping(currentMappings, "screens", slug);
 			results.push({
 				file,
@@ -1768,7 +1777,7 @@ async function pushThemes(client, defId, portalDir, changes, mappings) {
 		const slug = slugFromPath(file);
 		try {
 			const local = await readPortalFile(portalDir, file);
-			const newId = (await fluidOs.fluid_os_v0_create_fluid_ostheme(client, defId, { theme: {
+			const newId = (await fluid_os_v0_create_fluid_ostheme(client, defId, { theme: {
 				name: local.name,
 				active: local.active,
 				config: local.config
@@ -1809,7 +1818,7 @@ async function pushThemes(client, defId, portalDir, changes, mappings) {
 		}
 		try {
 			const local = await readPortalFile(portalDir, file);
-			await fluidOs.fluid_os_v0_update_fluid_ostheme(client, defId, themeId, { theme: {
+			await fluid_os_v0_update_fluid_ostheme(client, defId, themeId, { theme: {
 				name: local.name,
 				active: local.active,
 				config: local.config
@@ -1848,7 +1857,7 @@ async function pushThemes(client, defId, portalDir, changes, mappings) {
 			};
 		}
 		try {
-			await fluidOs.fluid_os_v0_delete_fluid_ostheme(client, defId, themeId);
+			await fluid_os_v0_delete_fluid_ostheme(client, defId, themeId);
 			currentMappings = removeMapping(currentMappings, "themes", slug);
 			results.push({
 				file,
@@ -1918,7 +1927,7 @@ async function pushNavigations(client, defId, portalDir, changes, mappings) {
 		const slug = slugFromPath(file);
 		try {
 			const local = await readPortalFile(portalDir, file);
-			const newId = (await fluidOs.fluid_os_v0_create_fluid_osnavigation(client, defId, { navigation: {
+			const newId = (await fluid_os_v0_create_fluid_osnavigation(client, defId, { navigation: {
 				name: local.name,
 				platform: local.platform
 			} })).navigation?.id;
@@ -1928,7 +1937,7 @@ async function pushNavigations(client, defId, portalDir, changes, mappings) {
 				const localToServerId = /* @__PURE__ */ new Map();
 				for (const item of resolvedItems) {
 					const resolvedParentId = item.parent_id != null ? localToServerId.get(item.parent_id) ?? item.parent_id : void 0;
-					const created = await fluidOs.fluid_os_v0_create_fluid_osnavigation_item(client, defId, newId, { navigation_item: {
+					const created = await fluid_os_v0_create_fluid_osnavigation_item(client, defId, newId, { navigation_item: {
 						label: item.label ?? "",
 						position: item.position ?? 0,
 						icon: item.icon ?? void 0,
@@ -1975,15 +1984,15 @@ async function pushNavigations(client, defId, portalDir, changes, mappings) {
 		}
 		try {
 			const local = await readPortalFile(portalDir, file);
-			await fluidOs.fluid_os_v0_update_fluid_osnavigation(client, defId, navId, { navigation: {
+			await fluid_os_v0_update_fluid_osnavigation(client, defId, navId, { navigation: {
 				name: local.name,
 				platform: local.platform
 			} });
 			const resolvedItems = flattenNavigationItems(resolveNavigationItemScreenIds(local.navigation_items, currentMappings));
-			const serverItems = (await fluidOs.fluid_os_v0_list_fluid_osnavigation_items(client, defId, navId)).navigation_items ?? [];
+			const serverItems = (await fluid_os_v0_list_fluid_osnavigation_items(client, defId, navId)).navigation_items ?? [];
 			const serverById = new Map(serverItems.map((s) => [s.id, s]));
 			const localIds = new Set(resolvedItems.filter((i) => i.id).map((i) => i.id));
-			for (const serverItem of serverItems) if (!localIds.has(serverItem.id)) await fluidOs.fluid_os_v0_delete_fluid_osnavigation_item(client, defId, navId, serverItem.id);
+			for (const serverItem of serverItems) if (!localIds.has(serverItem.id)) await fluid_os_v0_delete_fluid_osnavigation_item(client, defId, navId, serverItem.id);
 			const localToServerId = /* @__PURE__ */ new Map();
 			for (const item of resolvedItems) {
 				const resolvedParentId = item.parent_id != null ? localToServerId.get(item.parent_id) ?? item.parent_id : void 0;
@@ -1996,9 +2005,9 @@ async function pushNavigations(client, defId, portalDir, changes, mappings) {
 					source: item.source ?? void 0,
 					parent_id: resolvedParentId
 				};
-				if (item.id && serverById.has(item.id)) await fluidOs.fluid_os_v0_update_fluid_osnavigation_item(client, defId, navId, item.id, { navigation_item: body });
+				if (item.id && serverById.has(item.id)) await fluid_os_v0_update_fluid_osnavigation_item(client, defId, navId, item.id, { navigation_item: body });
 				else {
-					const created = await fluidOs.fluid_os_v0_create_fluid_osnavigation_item(client, defId, navId, { navigation_item: {
+					const created = await fluid_os_v0_create_fluid_osnavigation_item(client, defId, navId, { navigation_item: {
 						...body,
 						label: body.label ?? "",
 						position: body.position ?? 0
@@ -2040,7 +2049,7 @@ async function pushNavigations(client, defId, portalDir, changes, mappings) {
 			};
 		}
 		try {
-			await fluidOs.fluid_os_v0_delete_fluid_osnavigation(client, defId, navId);
+			await fluid_os_v0_delete_fluid_osnavigation(client, defId, navId);
 			currentMappings = removeMapping(currentMappings, "navigations", slug);
 			results.push({
 				file,
@@ -2074,8 +2083,7 @@ async function pushProfiles(client, defId, portalDir, changes, mappings) {
 	for (const file of changes.new) {
 		const slug = slugFromPath(file);
 		try {
-			const body = resolveProfileBody(await readPortalFile(portalDir, file), currentMappings);
-			const newId = (await fluidOs.fluid_os_v0_create_fluid_osprofile(client, defId, { profile: body })).profile?.id;
+			const newId = (await fluid_os_v0_create_fluid_osprofile(client, defId, { profile: resolveProfileBody(await readPortalFile(portalDir, file), currentMappings) })).profile?.id;
 			if (newId != null) currentMappings = updateMapping(currentMappings, "profiles", slug, newId);
 			results.push({
 				file,
@@ -2111,8 +2119,7 @@ async function pushProfiles(client, defId, portalDir, changes, mappings) {
 			};
 		}
 		try {
-			const body = resolveProfileBody(await readPortalFile(portalDir, file), currentMappings);
-			await fluidOs.fluid_os_v0_update_fluid_osprofile(client, defId, profileId, { profile: body });
+			await fluid_os_v0_update_fluid_osprofile(client, defId, profileId, { profile: resolveProfileBody(await readPortalFile(portalDir, file), currentMappings) });
 			results.push({
 				file,
 				action: "updated",
@@ -2147,7 +2154,7 @@ async function pushProfiles(client, defId, portalDir, changes, mappings) {
 			};
 		}
 		try {
-			await fluidOs.fluid_os_v0_delete_fluid_osprofile(client, defId, profileId);
+			await fluid_os_v0_delete_fluid_osprofile(client, defId, profileId);
 			currentMappings = removeMapping(currentMappings, "profiles", slug);
 			results.push({
 				file,
@@ -2404,7 +2411,7 @@ async function selectDefinition(client, appName) {
 	const definitions = [];
 	let page = 1;
 	while (true) {
-		const response = await fluidOs.fluid_os_v0_list_fluid_osdefinitions(client, {
+		const response = await fluid_os_v0_list_fluid_osdefinitions(client, {
 			page,
 			per_page: 500
 		});
@@ -3871,7 +3878,7 @@ function getWidgetPackageCompleteUploadRoute(owner, version) {
 async function requestWidgetPackageUploadSession(client, owner, request) {
 	const payload = buildWidgetPackageUploadSessionPayload(request);
 	try {
-		return normalizeWidgetPackageUploadSession(owner.kind === "company" ? await fluidOs.fluid_os_v0_create_widget_package_version(client, payload) : await client.post(getWidgetPackageUploadSessionRoute(owner), payload), request.version, request.artifacts);
+		return normalizeWidgetPackageUploadSession(owner.kind === "company" ? await fluid_os_v0_create_widget_package_version(client, payload) : await client.post(getWidgetPackageUploadSessionRoute(owner), payload), request.version, request.artifacts);
 	} catch (err) {
 		if (err instanceof WidgetPackageUploadError) throw err;
 		throw new WidgetPackageUploadError("SESSION_REQUEST_FAILED", `Failed to create widget package upload session: ${formatUnknownError(err)}`);
@@ -3910,7 +3917,7 @@ async function uploadWidgetPackageArtifacts(session, artifacts, fetchImpl = fetc
 async function completeWidgetPackageUpload(client, owner, version, packageKey, artifacts) {
 	const payload = buildWidgetPackageCompleteUploadPayload(packageKey, artifacts);
 	try {
-		return normalizeWidgetPackageCompleteResponse(owner.kind === "company" ? await fluidOs.fluid_os_v0_complete_widget_package_version_upload(client, version, payload) : await client.post(getWidgetPackageCompleteUploadRoute(owner, version), payload), version);
+		return normalizeWidgetPackageCompleteResponse(owner.kind === "company" ? await fluid_os_v0_complete_widget_package_version_upload(client, version, payload) : await client.post(getWidgetPackageCompleteUploadRoute(owner, version), payload), version);
 	} catch (err) {
 		if (err instanceof WidgetPackageUploadError) throw err;
 		throw new WidgetPackageUploadError("COMPLETE_UPLOAD_FAILED", `Failed to complete widget package upload: ${formatUnknownError(err)}`);
@@ -4527,7 +4534,7 @@ const createVersionCommand = new Command("create").description("Create a new ver
 	console.log(chalk.bold("Creating version..."));
 	let result;
 	try {
-		result = await fluidOs.fluid_os_v0_create_fluid_osversion(client, definitionId);
+		result = await fluid_os_v0_create_fluid_osversion(client, definitionId);
 	} catch (err) {
 		console.error(chalk.red("Error:") + " Failed to create version — " + (err instanceof Error ? err.message : String(err)));
 		process.exit(1);
@@ -4545,7 +4552,7 @@ const createVersionCommand = new Command("create").description("Create a new ver
 	if (options.activate) {
 		console.log("Activating version...");
 		try {
-			await fluidOs.fluid_os_v0_update_fluid_osversion(client, definitionId, version.id, { version: { active: true } });
+			await fluid_os_v0_update_fluid_osversion(client, definitionId, version.id, { version: { active: true } });
 		} catch (err) {
 			console.error(chalk.red("Error:") + " Failed to activate version — " + (err instanceof Error ? err.message : String(err)));
 			process.exit(1);
@@ -4560,7 +4567,7 @@ const listVersionCommand = new Command("list").description("List all versions of
 	const definitionId = await requireDefinitionId();
 	let result;
 	try {
-		result = await fluidOs.fluid_os_v0_list_fluid_osversions(client, definitionId);
+		result = await fluid_os_v0_list_fluid_osversions(client, definitionId);
 	} catch (err) {
 		console.error(chalk.red("Error:") + " Failed to list versions — " + (err instanceof Error ? err.message : String(err)));
 		process.exit(1);
@@ -4603,7 +4610,7 @@ const activateVersionCommand = new Command("activate").description("Activate a s
 	console.log();
 	console.log(chalk.bold("Activating version..."));
 	try {
-		await fluidOs.fluid_os_v0_update_fluid_osversion(client, definitionId, versionId, { version: { active: true } });
+		await fluid_os_v0_update_fluid_osversion(client, definitionId, versionId, { version: { active: true } });
 	} catch (err) {
 		console.error(chalk.red("Error:") + " Failed to activate version — " + (err instanceof Error ? err.message : String(err)));
 		process.exit(1);