@fluid-app/fluid-cli-theme-dev 0.1.3 → 0.1.5

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @fluid-app/fluid-cli-theme-dev@0.1.3 build /home/runner/_work/fluid-mono/fluid-mono/packages/cli/theme-dev
+> @fluid-app/fluid-cli-theme-dev@0.1.5 build /home/runner/_work/fluid-mono/fluid-mono/packages/cli/theme-dev
 > tsdown
 
 ℹ tsdown v0.21.0 powered by rolldown v1.0.0-rc.7
@@ -8,11 +8,9 @@
 ℹ target: node18
 ℹ tsconfig: tsconfig.json
 ℹ Build start
-ℹ dist/index.mjs        39.25 kB │ gzip: 11.30 kB
-ℹ dist/index.mjs.map    87.52 kB │ gzip: 21.90 kB
-ℹ dist/index.d.mts.map   0.11 kB │ gzip:  0.12 kB
-ℹ dist/index.d.mts       0.19 kB │ gzip:  0.16 kB
-ℹ 4 files, total: 127.07 kB
-[PLUGIN_TIMINGS] Warning: Your build spent significant time in plugin `rolldown-plugin-dts:generate`. See https://rolldown.rs/options/checks#plugintimings for more details.
-
-✔ Build complete in 3302ms
+ℹ dist/index.mjs         42.13 kB │ gzip: 11.81 kB
+ℹ dist/index.mjs.map    112.29 kB │ gzip: 24.77 kB
+ℹ dist/index.d.mts.map    0.11 kB │ gzip:  0.12 kB
+ℹ dist/index.d.mts        0.19 kB │ gzip:  0.16 kB
+ℹ 4 files, total: 154.73 kB
+✔ Build complete in 1283ms

package/dist/index.mjs

@@ -610,6 +610,92 @@ function watchTheme(root, handler) {
 	return () => watcher.close();
 }
 //#endregion
+//#region ../../api-clients/themes/src/namespaces/v0.ts
+/**
+* List application themes
+* Get all application themes with optional filters
+*
+* @param client - Fetch client instance
+* @param [params] - params
+*/
+async function listApplicationThemes(client, params) {
+	return client.get(`/api/application_themes`, params);
+}
+/**
+* Create an application theme
+*
+*
+* @param client - Fetch client instance
+* @param body - body
+*/
+async function createApplicationTheme(client, body) {
+	return client.post(`/api/application_themes`, body);
+}
+/**
+* Get an application theme
+*
+*
+* @param client - Fetch client instance
+* @param id - id
+* @param [params] - params
+*/
+async function getApplicationTheme(client, id, params) {
+	return client.get(`/api/application_themes/${id}`, params);
+}
+/**
+* Returns available themeables for a given type scoped to the theme's company
+*
+*
+* @param client - Fetch client instance
+* @param id - id
+* @param [params] - params
+*/
+async function getApplicationThemeAvailableThemeables(client, id, params) {
+	return client.get(`/api/application_themes/${id}/available_themeables`, params);
+}
+/**
+* Publishes the theme
+*
+*
+* @param client - Fetch client instance
+* @param id - id
+*/
+async function publishApplicationTheme(client, id) {
+	return client.post(`/api/application_themes/${id}/publish`);
+}
+/**
+* Lists all theme resources
+*
+*
+* @param client - Fetch client instance
+* @param application_theme_id - application_theme_id
+*/
+async function listThemeResources(client, application_theme_id) {
+	return client.get(`/api/application_themes/${application_theme_id}/resources`);
+}
+/**
+* Updates a theme resource
+*
+*
+* @param client - Fetch client instance
+* @param application_theme_id - application_theme_id
+* @param body - body
+*/
+async function updateThemeResource(client, application_theme_id, body) {
+	return client.put(`/api/application_themes/${application_theme_id}/resources`, body);
+}
+/**
+* Deletes a theme resource
+*
+*
+* @param client - Fetch client instance
+* @param application_theme_id - application_theme_id
+* @param body - body
+*/
+async function deleteThemeResource(client, application_theme_id, body) {
+	return client.delete(`/api/application_themes/${application_theme_id}/resources`, { body });
+}
+//#endregion
 //#region src/theme/syncer.ts
 var Syncer = class {
 	checksums = /* @__PURE__ */ new Map();
@@ -619,11 +705,11 @@ var Syncer = class {
 		this.themeRoot = themeRoot;
 	}
 	async fetchChecksums() {
-		const body = await this.api.get(`/api/application_themes/${this.themeId}/resources`);
+		const body = await listThemeResources(this.api, this.themeId);
 		this.updateChecksums(body.application_theme_resources ?? []);
 	}
 	updateChecksums(resources) {
-		for (const r of resources) if (r.key) this.checksums.set(r.key, r.checksum);
+		for (const r of resources) if (r.key && r.checksum) this.checksums.set(r.key, r.checksum);
 		for (const key of this.checksums.keys()) if (this.checksums.has(`${key}.liquid`)) this.checksums.delete(key);
 	}
 	hasChanged(file) {
@@ -633,14 +719,13 @@ var Syncer = class {
 		return [...this.checksums.keys()];
 	}
 	async uploadFile(file) {
-		const path = `/api/application_themes/${this.themeId}/resources`;
-		if (file.isText) await this.api.put(path, { application_theme_resource: {
+		if (file.isText) await updateThemeResource(this.api, this.themeId, { application_theme_resource: {
 			key: file.relativePath,
 			content: file.read()
 		} });
-		else await this.uploadBinaryFile(file, path);
+		else await this.uploadBinaryFile(file);
 	}
-	async uploadBinaryFile(file, resourcePath) {
+	async uploadBinaryFile(file) {
 		const asset = (await this.api.post("/api/dam/assets", { placeholder_asset: {
 			description: `Uploaded via Fluid CLI: ${file.name}`,
 			mime_type: file.mime.name,
@@ -675,7 +760,7 @@ var Syncer = class {
 		if (ikBody.height) backfillPayload["asset"]["height"] = ikBody.height;
 		if (ikBody.width) backfillPayload["asset"]["width"] = ikBody.width;
 		const backfillBody = await this.api.post("/api/dam/assets/backfill_imagekit", backfillPayload);
-		await this.api.put(resourcePath, { application_theme_resource: {
+		await updateThemeResource(this.api, this.themeId, { application_theme_resource: {
 			key: file.relativePath,
 			dam_asset: {
 				dam_asset_code: backfillBody.asset.code,
@@ -702,13 +787,13 @@ var Syncer = class {
 		}[category] ?? "files"}/${assetCode}`;
 	}
 	async deleteRemoteFile(relativePath) {
-		await this.api.delete(`/api/application_themes/${this.themeId}/resources`, { body: { application_theme_resource: { key: relativePath } } });
+		await deleteThemeResource(this.api, this.themeId, { application_theme_resource: { key: relativePath } });
 		this.checksums.delete(relativePath);
 	}
 	async downloadAll() {
-		const body = await this.api.get(`/api/application_themes/${this.themeId}/resources`);
-		this.updateChecksums(body.application_theme_resources ?? []);
-		return body.application_theme_resources ?? [];
+		const resources = (await listThemeResources(this.api, this.themeId)).application_theme_resources ?? [];
+		this.updateChecksums(resources);
+		return resources;
 	}
 	async downloadBinaryAsset(url) {
 		const resp = await fetch(url);
@@ -767,7 +852,10 @@ var Syncer = class {
 				if (resource.resource_type === "FileResource" && resource.url) {
 					const buf = await this.downloadBinaryAsset(resource.url);
 					file.write(buf);
-				} else if (resource.content !== void 0) file.write(resource.content);
+				} else if (resource.content !== void 0 && resource.content !== null) {
+					const content = typeof resource.content === "string" ? resource.content : JSON.stringify(resource.content);
+					file.write(content);
+				}
 				result.downloaded++;
 			} catch (e) {
 				result.errors.push(`Download ${resource.key}: ${e}`);
@@ -856,7 +944,7 @@ async function startDevServer(api, theme, themeRoot, opts, onReady) {
 //#region src/commands/dev.ts
 async function ensureDevTheme(api, identifier) {
 	if (identifier) {
-		const body = await api.get("/api/application_themes");
+		const body = await listApplicationThemes(api);
 		const found = (body.application_themes ?? []).find((t) => String(t.id) === identifier) ?? (body.application_themes ?? []).find((t) => t.name.toLowerCase() === identifier.toLowerCase());
 		if (!found) {
 			console.error(`Theme not found: ${identifier}`);
@@ -866,17 +954,16 @@ async function ensureDevTheme(api, identifier) {
 	}
 	const { devThemeId } = getPluginState();
 	if (devThemeId) try {
-		const body = await api.get(`/api/application_themes/${devThemeId}`);
+		const body = await getApplicationTheme(api, devThemeId);
 		if (body.application_theme) {
 			console.log(`Using existing dev theme #${devThemeId}`);
 			return body.application_theme;
 		}
 	} catch {}
 	const { hostname } = await import("node:os");
-	const name = `Development (${hostname().split(".")[0] ?? "dev"}-${Math.random().toString(36).slice(2, 8)})`.slice(0, 50);
-	const theme = (await api.post("/api/application_themes", { application_theme: {
-		name,
-		role: "development"
+	const theme = (await createApplicationTheme(api, { application_theme: {
+		name: `Development (${hostname().split(".")[0] ?? "dev"}-${Math.random().toString(36).slice(2, 8)})`.slice(0, 50),
+		status: "development"
 	} })).application_theme;
 	setPluginState({
 		devThemeId: theme.id,
@@ -917,7 +1004,7 @@ function createDevCommand() {
 			id: theme.id,
 			name: theme.name,
 			company,
-			editorUrl: theme.editor_url
+			editorUrl: theme.editor_url ?? void 0
 		}, themeRoot, {
 			host: opts.host,
 			port,
@@ -934,8 +1021,8 @@ function createDevCommand() {
 //#endregion
 //#region src/commands/push.ts
 async function selectTheme(api) {
-	const themes = (await api.get("/api/application_themes")).application_themes ?? [];
-	if (!themes.length) {
+	const themeList = (await listApplicationThemes(api)).application_themes ?? [];
+	if (!themeList.length) {
 		console.error("No themes found.");
 		process.exit(1);
 	}
@@ -943,7 +1030,7 @@ async function selectTheme(api) {
 		type: "select",
 		name: "id",
 		message: "Select a theme to push to",
-		choices: themes.map((t) => ({
+		choices: themeList.map((t) => ({
 			title: `${t.name} (#${t.id})`,
 			value: t.id
 		}))
@@ -952,11 +1039,11 @@ async function selectTheme(api) {
 		console.error("No theme selected.");
 		process.exit(1);
 	}
-	return themes.find((t) => t.id === id);
+	return themeList.find((t) => t.id === id);
 }
 async function findTheme(api, identifier) {
-	const themes = (await api.get("/api/application_themes")).application_themes ?? [];
-	const found = themes.find((t) => String(t.id) === identifier) ?? themes.find((t) => t.name.toLowerCase() === identifier.toLowerCase());
+	const themeList = (await listApplicationThemes(api)).application_themes ?? [];
+	const found = themeList.find((t) => String(t.id) === identifier) ?? themeList.find((t) => t.name.toLowerCase() === identifier.toLowerCase());
 	if (!found) {
 		console.error(`No theme found with identifier: ${identifier}`);
 		process.exit(1);
@@ -964,7 +1051,7 @@ async function findTheme(api, identifier) {
 	return found;
 }
 function createPushCommand() {
-	return new Command("push").description("Push local theme files to a remote theme").option("-t, --theme <name-or-id>", "Theme name or ID to push to").option("-n, --nodelete", "Do not delete remote files missing locally").option("-f, --force", "Skip schema validation").option("-p, --publish", "Publish the theme after pushing").option("--root <path>", "Theme root directory", ".").action(async (opts) => {
+	return new Command("push").description("Push local theme files to a remote theme").option("-t, --theme <name-or-id>", "Theme name or ID to push to").option("-n, --nodelete", "Do not delete remote files missing locally").option("-f, --force", "Skip schema validation").option("-p, --publish", "Publish the theme after pushing").option("-u, --unpublished", "Create a new unpublished theme and push to it").option("--root <path>", "Theme root directory", ".").action(async (opts) => {
 		requireToken();
 		const themeRoot = new ThemeRoot(opts.root);
 		if (!themeRoot.isValid()) {
@@ -972,7 +1059,23 @@ function createPushCommand() {
 			process.exit(1);
 		}
 		const api = createApiClient();
-		const theme = opts.theme ? await findTheme(api, opts.theme) : await selectTheme(api);
+		let theme;
+		if (opts.unpublished) {
+			const { name } = await prompts({
+				type: "text",
+				name: "name",
+				message: "Name for the new theme"
+			}, { onCancel: () => process.exit(130) });
+			if (!name) {
+				console.error("Theme name is required.");
+				process.exit(1);
+			}
+			theme = (await createApplicationTheme(api, { application_theme: {
+				name,
+				status: "draft"
+			} })).application_theme;
+			console.log(`Created unpublished theme: ${theme.name} (#${theme.id})`);
+		} else theme = opts.theme ? await findTheme(api, opts.theme) : await selectTheme(api);
 		const syncer = new Syncer(api, theme.id, themeRoot);
 		const spinner = ora(`Pushing to ${theme.name} (#${theme.id})…`).start();
 		const result = await syncer.uploadTheme({
@@ -988,7 +1091,7 @@ function createPushCommand() {
 		if (opts.publish) {
 			const pubSpinner = ora("Publishing theme…").start();
 			try {
-				await api.post(`/api/application_themes/${theme.id}/publish`);
+				await publishApplicationTheme(api, theme.id);
 				pubSpinner.succeed("Theme published.");
 			} catch (e) {
 				pubSpinner.fail(`Publish failed: ${e}`);
@@ -999,13 +1102,13 @@ function createPushCommand() {
 //#endregion
 //#region src/commands/pull.ts
 async function selectOrFindTheme(api, identifier) {
-	const themes = (await api.get("/api/application_themes")).application_themes ?? [];
-	if (!themes.length) {
+	const themeList = (await listApplicationThemes(api)).application_themes ?? [];
+	if (!themeList.length) {
 		console.error("No themes found.");
 		process.exit(1);
 	}
 	if (identifier) {
-		const found = themes.find((t) => String(t.id) === identifier) ?? themes.find((t) => t.name.toLowerCase() === identifier.toLowerCase());
+		const found = themeList.find((t) => String(t.id) === identifier) ?? themeList.find((t) => t.name.toLowerCase() === identifier.toLowerCase());
 		if (!found) {
 			console.error(`No theme found with identifier: ${identifier}`);
 			process.exit(1);
@@ -1016,7 +1119,7 @@ async function selectOrFindTheme(api, identifier) {
 		type: "select",
 		name: "id",
 		message: "Select a theme to pull",
-		choices: themes.map((t) => ({
+		choices: themeList.map((t) => ({
 			title: `${t.name} (#${t.id})`,
 			value: t.id
 		}))
@@ -1025,7 +1128,7 @@ async function selectOrFindTheme(api, identifier) {
 		console.error("No theme selected.");
 		process.exit(1);
 	}
-	return themes.find((t) => t.id === id);
+	return themeList.find((t) => t.id === id);
 }
 function createPullCommand() {
 	return new Command("pull").description("Pull a remote theme to your local directory").option("-t, --theme <name-or-id>", "Theme name or ID to pull").option("-n, --nodelete", "Do not delete local files missing on remote").option("--root <path>", "Theme root directory", ".").action(async (opts) => {
@@ -1159,6 +1262,12 @@ const RESOURCE_ROUTES = [
 		type: "enrollment_pack",
 		template: "/home/enrollments/%s",
 		fallback: "/home/join"
+	},
+	{
+		label: "Page",
+		type: "page",
+		template: "/home/pages/%s",
+		fallback: "/home/pages"
 	}
 ];
 function createNavigateCommand() {
@@ -1193,7 +1302,7 @@ function createNavigateCommand() {
 		let path;
 		if (typeof dest === "string") path = dest;
 		else {
-			const resources = (await createApiClient().get(`/api/application_themes/${themeId}/available_themeables`, {
+			const resources = (await getApplicationThemeAvailableThemeables(createApiClient(), themeId, {
 				themeable: dest.resourceType,
 				per_page: 50
 			})).available_themeables ?? [];
@@ -1206,7 +1315,7 @@ function createNavigateCommand() {
 					name: "slug",
 					message: `Select a ${dest.label.toLowerCase()}`,
 					choices: resources.map((r) => ({
-						title: r.title ?? r.slug,
+						title: r.title ?? r.slug ?? "Untitled",
 						value: r.slug
 					}))
 				}, { onCancel });