bleam 0.0.12 → 0.0.14

package/dist/ai.cjs

@@ -1,9 +1,10 @@
 const require_chunk = require('./chunk-CUT6urMc.cjs');
 require('./native-runtime-CsXnXkQn.cjs');
 require('./crypto-CT3VZ7lF.cjs');
-const require_files = require('./files-DxaQ-Nv0.cjs');
-const require_schema = require('./schema-BnVZOXfu.cjs');
-const require_state = require('./state-LssDgpff.cjs');
+const require_files = require('./files-lMk-CpL_.cjs');
+const require_app_storage = require('./app-storage-D8W4n8ey.cjs');
+const require_schema = require('./schema-B7SLUBLN.cjs');
+const require_state = require('./state-Bm9GiRnU.cjs');
 let expo = require("expo");
 expo = require_chunk.__toESM(expo);
 let react = require("react");
@@ -3594,7 +3595,7 @@ function summaryFromJob(job) {
 	};
 }
 function jobRoot(id) {
-	return require_files.files.directory(require_files.files.paths.shared, "ImageJobs", require_state.currentAppStorageKey(), id);
+	return require_files.files.directory(require_files.files.paths.shared, "ImageJobs", require_app_storage.currentAppStorageKey(), id);
 }
 async function copyInput(source, directory, name, fallbackExtension = ".png") {
 	const path = pathFromUri(source);

package/dist/ai.js

@@ -1,8 +1,9 @@
 import "./native-runtime-C85Nuc4F.js";
 import "./crypto-BB92-Upx.js";
-import { a as nativeCopy, i as files } from "./files-BXVkPrPN.js";
-import { c as object, s as number, u as string } from "./schema-B5BfdswF.js";
-import { a as transactionAtom, d as internalJotaiWritableAtom, f as internalStore, g as currentAppStorageKey, i as queryAtom, n as atomCollection, r as mutateAtom, u as internalJotaiAtom } from "./state-Dh3HLixb.js";
+import { a as nativeCopy, i as files } from "./files-DErLhzCB.js";
+import { t as currentAppStorageKey } from "./app-storage-Isi5Bo0R.js";
+import { c as object, s as number, u as string } from "./schema-B7ELMpuI.js";
+import { a as transactionAtom, d as internalJotaiWritableAtom, f as internalStore, i as queryAtom, n as atomCollection, r as mutateAtom, u as internalJotaiAtom } from "./state-D8Firo9w.js";
 import { requireNativeModule } from "expo";
 import { use, useSyncExternalStore } from "react";
 

package/dist/app-storage-D8W4n8ey.cjs

@@ -0,0 +1,39 @@
+const require_native_runtime = require('./native-runtime-CsXnXkQn.cjs');
+
+//#region src/app-storage.ts
+let cachedStorageKey;
+function launchArgument(name) {
+	const argumentsList = NSProcessInfo.processInfo.arguments();
+	const count = Number(argumentsList.count ?? 0);
+	for (let index = 0; index < count - 1; index += 1) if (String(argumentsList.objectAtIndex(index)) === name) return String(argumentsList.objectAtIndex(index + 1));
+}
+function storageKey(name) {
+	return name.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "") || "app";
+}
+function currentAppStorageKey() {
+	if (cachedStorageKey) return cachedStorageKey;
+	require_native_runtime.ensureNativeScript();
+	const configPath = launchArgument("--bleam-project-config");
+	if (configPath) try {
+		const text = String(NSString.stringWithContentsOfFileEncodingError(configPath, NSUTF8StringEncoding, null));
+		const config = JSON.parse(text);
+		if (typeof config.id === "string" && config.id) {
+			cachedStorageKey = config.id;
+			return cachedStorageKey;
+		}
+		if (typeof config.name === "string" && config.name) {
+			cachedStorageKey = storageKey(config.name);
+			return cachedStorageKey;
+		}
+	} catch {}
+	cachedStorageKey = "app";
+	return cachedStorageKey;
+}
+
+//#endregion
+Object.defineProperty(exports, 'currentAppStorageKey', {
+  enumerable: true,
+  get: function () {
+    return currentAppStorageKey;
+  }
+});

package/dist/app-storage-Isi5Bo0R.js

@@ -0,0 +1,34 @@
+import { t as ensureNativeScript } from "./native-runtime-C85Nuc4F.js";
+
+//#region src/app-storage.ts
+let cachedStorageKey;
+function launchArgument(name) {
+	const argumentsList = NSProcessInfo.processInfo.arguments();
+	const count = Number(argumentsList.count ?? 0);
+	for (let index = 0; index < count - 1; index += 1) if (String(argumentsList.objectAtIndex(index)) === name) return String(argumentsList.objectAtIndex(index + 1));
+}
+function storageKey(name) {
+	return name.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "") || "app";
+}
+function currentAppStorageKey() {
+	if (cachedStorageKey) return cachedStorageKey;
+	ensureNativeScript();
+	const configPath = launchArgument("--bleam-project-config");
+	if (configPath) try {
+		const text = String(NSString.stringWithContentsOfFileEncodingError(configPath, NSUTF8StringEncoding, null));
+		const config = JSON.parse(text);
+		if (typeof config.id === "string" && config.id) {
+			cachedStorageKey = config.id;
+			return cachedStorageKey;
+		}
+		if (typeof config.name === "string" && config.name) {
+			cachedStorageKey = storageKey(config.name);
+			return cachedStorageKey;
+		}
+	} catch {}
+	cachedStorageKey = "app";
+	return cachedStorageKey;
+}
+
+//#endregion
+export { currentAppStorageKey as t };

package/dist/cli.cjs

@@ -189,7 +189,7 @@ function parseDevOptions(argv) {
 function parseNewOptions(argv) {
 	const root = invocationRoot();
 	let projectRoot;
-	let template = "text-generation";
+	let template = "basic";
 	for (let index = 0; index < argv.length; index += 1) {
 		const arg = argv[index];
 		if (arg === "--help" || arg === "-h") {
@@ -621,13 +621,14 @@ function writeBiomeConfig(configPath) {
 		}
 	}, null, 2)}\n`);
 }
-function writeProjectRuntimeConfig(projectRoot, config, origin) {
+function writeProjectRuntimeConfig(projectRoot, config, origin, client) {
 	const projectConfigPath = node_path.default.join(projectRoot, ".bleam", "project.json");
 	(0, node_fs.mkdirSync)(node_path.default.dirname(projectConfigPath), { recursive: true });
 	(0, node_fs.writeFileSync)(projectConfigPath, `${JSON.stringify({
 		name: config.name,
+		id: client.projectId,
 		version: config.version,
-		bundleIdentifier: config.bundleIdentifier,
+		bundleIdentifier: client.bundleIdentifier,
 		teamId: config.teamId,
 		appearance: config.appearance,
 		devServer: origin,
@@ -1166,19 +1167,127 @@ async function resolveRuntimeArtifact() {
 		throw new Error(`Failed to resolve the Bleam runtime.\n${runtimeResolutionDetails()}\n\nCause: ${error instanceof Error ? error.message : String(error)}`);
 	}
 }
-function copyRuntimeClient(projectRoot, runtime) {
-	const clientAppPath = node_path.default.join(projectRoot, ".bleam", "client", "Bleam.app");
+function devProjectId(projectRoot) {
+	const idPath = node_path.default.join(projectRoot, ".bleam", "project-id");
+	if ((0, node_fs.existsSync)(idPath)) {
+		const projectId$1 = (0, node_fs.readFileSync)(idPath, "utf8").trim();
+		if (/^[0-9a-f]{32}$/i.test(projectId$1)) return projectId$1.toLowerCase();
+		throw new Error(`Invalid Bleam project ID at ${prettyPath(idPath)}`);
+	}
+	const projectId = (0, node_crypto.randomUUID)().replaceAll("-", "");
+	(0, node_fs.mkdirSync)(node_path.default.dirname(idPath), { recursive: true });
+	(0, node_fs.writeFileSync)(idPath, `${projectId}\n`);
+	return projectId;
+}
+function devBundleIdentifier(projectId) {
+	return `dev.bleam.project.p${projectId}`;
+}
+function runBundleCommand(command, args) {
+	const result = (0, node_child_process.spawnSync)(command, args, {
+		encoding: "utf8",
+		env: process.env
+	});
+	if (result.error) throw result.error;
+	if (result.status !== 0) {
+		const detail = result.stderr.trim() || result.stdout.trim();
+		throw new Error(`${commandText(command, args)} failed${detail ? `: ${detail}` : ""}`);
+	}
+}
+function devAppFileName(name) {
+	return `${name.replaceAll("/", "-")}.app`;
+}
+function setPlistValue(plistPath, key, type, value) {
+	(0, node_child_process.spawnSync)("plutil", [
+		"-remove",
+		key,
+		plistPath
+	], { stdio: "ignore" });
+	runBundleCommand("plutil", [
+		"-insert",
+		key,
+		type,
+		value,
+		plistPath
+	]);
+}
+function removePlistValue(plistPath, key) {
+	(0, node_child_process.spawnSync)("plutil", [
+		"-remove",
+		key,
+		plistPath
+	], { stdio: "ignore" });
+}
+function personalizeRuntimeClient(options) {
+	const appPlist = node_path.default.join(options.appPath, "Contents", "Info.plist");
+	const servicePath = node_path.default.join(options.appPath, "Contents", "XPCServices", "GenerationService.xpc");
+	const servicePlist = node_path.default.join(servicePath, "Contents", "Info.plist");
+	setPlistValue(appPlist, "CFBundleIdentifier", "-string", options.bundleIdentifier);
+	setPlistValue(appPlist, "CFBundleDisplayName", "-string", options.name);
+	setPlistValue(appPlist, "CFBundleName", "-string", options.name);
+	removePlistValue(appPlist, "AppGroupIdentifier");
+	if ((0, node_fs.existsSync)(servicePlist)) {
+		setPlistValue(servicePlist, "CFBundleIdentifier", "-string", `${options.bundleIdentifier}.GenerationService`);
+		removePlistValue(servicePlist, "AppGroupIdentifier");
+	}
+	if (options.iconPath) {
+		const iconName = "BleamProjectIcon.png";
+		(0, node_fs.cpSync)(options.iconPath, node_path.default.join(options.appPath, "Contents", "Resources", iconName));
+		setPlistValue(appPlist, "CFBundleIconFile", "-string", iconName);
+		setPlistValue(appPlist, "CFBundleIcons", "-json", JSON.stringify({ CFBundlePrimaryIcon: {
+			CFBundleIconFiles: ["BleamProjectIcon"],
+			CFBundleIconName: "BleamProjectIcon"
+		} }));
+	}
+	(0, node_fs.rmSync)(node_path.default.join(options.appPath, "Contents", "embedded.provisionprofile"), { force: true });
+	(0, node_fs.rmSync)(node_path.default.join(servicePath, "Contents", "embedded.provisionprofile"), { force: true });
+	if ((0, node_fs.existsSync)(servicePath)) runBundleCommand("codesign", [
+		"--force",
+		"--sign",
+		"-",
+		"--timestamp=none",
+		servicePath
+	]);
+	runBundleCommand("codesign", [
+		"--force",
+		"--sign",
+		"-",
+		"--timestamp=none",
+		options.appPath
+	]);
+	runBundleCommand("codesign", [
+		"--verify",
+		"--deep",
+		"--strict",
+		options.appPath
+	]);
+}
+function copyRuntimeClient(projectRoot, runtime, config) {
+	const projectId = devProjectId(projectRoot);
+	const bundleIdentifier = devBundleIdentifier(projectId);
+	const clientRoot = node_path.default.join(projectRoot, ".bleam", "client");
+	const appFileName = devAppFileName(config.name);
+	const clientAppPath = node_path.default.join(clientRoot, appFileName);
 	console.log(`Preparing Bleam app at ${prettyPath(clientAppPath)}`);
-	(0, node_fs.rmSync)(clientAppPath, {
+	(0, node_fs.rmSync)(clientRoot, {
 		recursive: true,
 		force: true
 	});
-	(0, node_fs.mkdirSync)(node_path.default.dirname(clientAppPath), { recursive: true });
+	(0, node_fs.mkdirSync)(clientRoot, { recursive: true });
 	(0, node_fs.cpSync)(runtime.appPath, clientAppPath, {
 		recursive: true,
 		verbatimSymlinks: true
 	});
-	return clientAppPath;
+	personalizeRuntimeClient({
+		appPath: clientAppPath,
+		name: config.name,
+		bundleIdentifier,
+		iconPath: config.iconPath
+	});
+	return {
+		appPath: clientAppPath,
+		bundleIdentifier,
+		projectId
+	};
 }
 function cleanDevArtifacts(projectRoot) {
 	const bleamRoot = node_path.default.join(projectRoot, ".bleam");
@@ -1360,11 +1469,12 @@ function openRuntimeClient(appPath, projectConfigPath, manifest) {
 		if (code && code !== 0) console.error(`Failed to open Bleam runtime at ${appPath}`);
 	});
 }
-function quitRuntimeClient() {
-	(0, node_child_process.spawnSync)("osascript", ["-e", "tell application id \"dev.bleam.app\" to quit"], { stdio: "ignore" });
+function quitRuntimeClient(bundleIdentifier) {
+	const application = `application id ${JSON.stringify(bundleIdentifier)}`;
+	(0, node_child_process.spawnSync)("osascript", ["-e", `if ${application} is running then tell ${application} to quit`], { stdio: "ignore" });
 }
-async function launchRuntimeClient(appPath, projectConfigPath, manifest) {
-	quitRuntimeClient();
+async function launchRuntimeClient(appPath, bundleIdentifier, projectConfigPath, manifest) {
+	quitRuntimeClient(bundleIdentifier);
 	openRuntimeClient(appPath, projectConfigPath, manifest);
 }
 async function updateServiceHealthy(serviceUrl) {
@@ -1453,8 +1563,14 @@ async function startLocalUpdateService() {
 		serviceUrl
 	};
 }
-function focusRuntimeClient() {
-	return (0, node_child_process.spawnSync)("osascript", ["-e", "tell application id \"dev.bleam.app\" to activate"], { stdio: "ignore" }).status === 0;
+function focusRuntimeClient(bundleIdentifier) {
+	const application = `application id ${JSON.stringify(bundleIdentifier)}`;
+	const result = (0, node_child_process.spawnSync)("osascript", ["-e", `if ${application} is running then
+tell ${application} to activate
+return true
+end if
+return false`], { encoding: "utf8" });
+	return result.status === 0 && result.stdout.trim() === "true";
 }
 function sendJson(res, status, value) {
 	res.writeHead(status, {
@@ -1593,12 +1709,14 @@ function setupInteractiveControls(options) {
 			if (key === "o") {
 				(async () => {
 					try {
-						if (focusRuntimeClient()) {
-							console.log("Focused Bleam app");
+						if (focusRuntimeClient(options.bundleIdentifier)) {
+							options.onOpen();
+							console.log("Focused project app");
 							return;
 						}
 						console.log(`Opening Bleam app at ${prettyPath(options.clientAppPath)}`);
-						await launchRuntimeClient(options.clientAppPath, options.projectConfigPath, options.manifest);
+						await launchRuntimeClient(options.clientAppPath, options.bundleIdentifier, options.projectConfigPath, options.manifest);
+						options.onOpen();
 					} catch (error) {
 						console.error(error instanceof Error ? error.message : String(error));
 					}
@@ -1782,11 +1900,11 @@ async function startDevServer(options) {
 	const config = readProjectConfig(options);
 	if (options.clean) cleanDevArtifacts(options.projectRoot);
 	const runtime = await resolveRuntimeArtifact();
-	const clientAppPath = copyRuntimeClient(options.projectRoot, runtime);
+	const client = copyRuntimeClient(options.projectRoot, runtime, config);
 	console.log("Preparing Bleam dev workspace");
 	const workspaceRoot = createDevWorkspace(options.projectRoot, config);
 	const origin = `http://localhost:${options.port}`;
-	const projectConfigPath = writeProjectRuntimeConfig(options.projectRoot, config, origin);
+	const projectConfigPath = writeProjectRuntimeConfig(options.projectRoot, config, origin, client);
 	const updateService = await startLocalUpdateService();
 	const child = (0, node_child_process.spawn)(process.execPath, [
 		(0, node_url.fileURLToPath)(require("url").pathToFileURL(__filename).href),
@@ -1827,7 +1945,7 @@ async function startDevServer(options) {
 		if (didCleanupDevSession) return;
 		didCleanupDevSession = true;
 		cleanupInteractiveControls();
-		if (didLaunchRuntimeClient) quitRuntimeClient();
+		if (didLaunchRuntimeClient) quitRuntimeClient(client.bundleIdentifier);
 		if (updateService.child?.exitCode === null) updateService.child.kill("SIGTERM");
 	};
 	const stop = (signal) => {
@@ -1853,15 +1971,19 @@ async function startDevServer(options) {
 		const manifest = await readDevManifest(origin);
 		cleanupInteractiveControls = setupInteractiveControls({
 			origin,
-			clientAppPath,
+			clientAppPath: client.appPath,
+			bundleIdentifier: client.bundleIdentifier,
 			projectConfigPath,
 			manifest,
+			onOpen: () => {
+				didLaunchRuntimeClient = true;
+			},
 			stop: () => stop("SIGINT")
 		});
 		if (options.run && process.env.BLEAM_NO_OPEN !== "1") try {
 			await waitForDevBundle(manifest.bundleUrl);
-			console.log(`Opening Bleam app at ${prettyPath(clientAppPath)}`);
-			await launchRuntimeClient(clientAppPath, projectConfigPath, manifest);
+			console.log(`Opening project app at ${prettyPath(client.appPath)}`);
+			await launchRuntimeClient(client.appPath, client.bundleIdentifier, projectConfigPath, manifest);
 			didLaunchRuntimeClient = true;
 		} catch (error) {
 			console.error(`Initial app launch failed: ${error instanceof Error ? error.message : String(error)}`);
@@ -1945,6 +2067,9 @@ if (process.env.VITEST !== "true") main().catch((error) => {
 const __test = {
 	createProject,
 	createBuildNativeWorkspace,
+	devAppFileName,
+	devBundleIdentifier,
+	devProjectId,
 	hasCurrentPodInstall,
 	installedAppPath,
 	installArchivedApp,
@@ -1955,6 +2080,7 @@ const __test = {
 	parseBuildOptions,
 	parseNewOptions,
 	parsePublishOtaOptions,
+	personalizeRuntimeClient,
 	podInstallInputStamp,
 	replaceOrInsertPlistString
 };

package/dist/cli.d.cts

@@ -55,9 +55,21 @@ declare function nativeArchiveArgs(options: {
 }): string[];
 declare function installArchivedApp(archivePath: string, applications?: string): string;
 declare function installedAppPath(appName: string): string;
+declare function devProjectId(projectRoot: string): string;
+declare function devBundleIdentifier(projectId: string): string;
+declare function devAppFileName(name: string): string;
+declare function personalizeRuntimeClient(options: {
+  appPath: string;
+  name: string;
+  bundleIdentifier: string;
+  iconPath?: string;
+}): void;
 declare const __test: {
   createProject: typeof createProject;
   createBuildNativeWorkspace: typeof createBuildNativeWorkspace;
+  devAppFileName: typeof devAppFileName;
+  devBundleIdentifier: typeof devBundleIdentifier;
+  devProjectId: typeof devProjectId;
   hasCurrentPodInstall: typeof hasCurrentPodInstall;
   installedAppPath: typeof installedAppPath;
   installArchivedApp: typeof installArchivedApp;
@@ -68,6 +80,7 @@ declare const __test: {
   parseBuildOptions: typeof parseBuildOptions;
   parseNewOptions: typeof parseNewOptions;
   parsePublishOtaOptions: typeof parsePublishOtaOptions;
+  personalizeRuntimeClient: typeof personalizeRuntimeClient;
   podInstallInputStamp: typeof podInstallInputStamp;
   replaceOrInsertPlistString: typeof replaceOrInsertPlistString;
 };

package/dist/cli.d.ts

@@ -55,9 +55,21 @@ declare function nativeArchiveArgs(options: {
 }): string[];
 declare function installArchivedApp(archivePath: string, applications?: string): string;
 declare function installedAppPath(appName: string): string;
+declare function devProjectId(projectRoot: string): string;
+declare function devBundleIdentifier(projectId: string): string;
+declare function devAppFileName(name: string): string;
+declare function personalizeRuntimeClient(options: {
+  appPath: string;
+  name: string;
+  bundleIdentifier: string;
+  iconPath?: string;
+}): void;
 declare const __test: {
   createProject: typeof createProject;
   createBuildNativeWorkspace: typeof createBuildNativeWorkspace;
+  devAppFileName: typeof devAppFileName;
+  devBundleIdentifier: typeof devBundleIdentifier;
+  devProjectId: typeof devProjectId;
   hasCurrentPodInstall: typeof hasCurrentPodInstall;
   installedAppPath: typeof installedAppPath;
   installArchivedApp: typeof installArchivedApp;
@@ -68,6 +80,7 @@ declare const __test: {
   parseBuildOptions: typeof parseBuildOptions;
   parseNewOptions: typeof parseNewOptions;
   parsePublishOtaOptions: typeof parsePublishOtaOptions;
+  personalizeRuntimeClient: typeof personalizeRuntimeClient;
   podInstallInputStamp: typeof podInstallInputStamp;
   replaceOrInsertPlistString: typeof replaceOrInsertPlistString;
 };