bleam 0.0.12 → 0.0.13

package/dist/cli.js

@@ -609,13 +609,14 @@ function writeBiomeConfig(configPath) {
 		}
 	}, null, 2)}\n`);
 }
-function writeProjectRuntimeConfig(projectRoot, config, origin) {
+function writeProjectRuntimeConfig(projectRoot, config, origin, client) {
 	const projectConfigPath = path.join(projectRoot, ".bleam", "project.json");
 	mkdirSync(path.dirname(projectConfigPath), { recursive: true });
 	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,
@@ -1154,19 +1155,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 = path.join(projectRoot, ".bleam", "client", "Bleam.app");
+function devProjectId(projectRoot) {
+	const idPath = path.join(projectRoot, ".bleam", "project-id");
+	if (existsSync(idPath)) {
+		const projectId$1 = 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 = randomUUID().replaceAll("-", "");
+	mkdirSync(path.dirname(idPath), { recursive: true });
+	writeFileSync(idPath, `${projectId}\n`);
+	return projectId;
+}
+function devBundleIdentifier(projectId) {
+	return `dev.bleam.project.p${projectId}`;
+}
+function runBundleCommand(command, args) {
+	const result = 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) {
+	spawnSync("plutil", [
+		"-remove",
+		key,
+		plistPath
+	], { stdio: "ignore" });
+	runBundleCommand("plutil", [
+		"-insert",
+		key,
+		type,
+		value,
+		plistPath
+	]);
+}
+function removePlistValue(plistPath, key) {
+	spawnSync("plutil", [
+		"-remove",
+		key,
+		plistPath
+	], { stdio: "ignore" });
+}
+function personalizeRuntimeClient(options) {
+	const appPlist = path.join(options.appPath, "Contents", "Info.plist");
+	const servicePath = path.join(options.appPath, "Contents", "XPCServices", "GenerationService.xpc");
+	const servicePlist = path.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 (existsSync(servicePlist)) {
+		setPlistValue(servicePlist, "CFBundleIdentifier", "-string", `${options.bundleIdentifier}.GenerationService`);
+		removePlistValue(servicePlist, "AppGroupIdentifier");
+	}
+	if (options.iconPath) {
+		const iconName = "BleamProjectIcon.png";
+		cpSync(options.iconPath, path.join(options.appPath, "Contents", "Resources", iconName));
+		setPlistValue(appPlist, "CFBundleIconFile", "-string", iconName);
+		setPlistValue(appPlist, "CFBundleIcons", "-json", JSON.stringify({ CFBundlePrimaryIcon: {
+			CFBundleIconFiles: ["BleamProjectIcon"],
+			CFBundleIconName: "BleamProjectIcon"
+		} }));
+	}
+	rmSync(path.join(options.appPath, "Contents", "embedded.provisionprofile"), { force: true });
+	rmSync(path.join(servicePath, "Contents", "embedded.provisionprofile"), { force: true });
+	if (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 = path.join(projectRoot, ".bleam", "client");
+	const appFileName = devAppFileName(config.name);
+	const clientAppPath = path.join(clientRoot, appFileName);
 	console.log(`Preparing Bleam app at ${prettyPath(clientAppPath)}`);
-	rmSync(clientAppPath, {
+	rmSync(clientRoot, {
 		recursive: true,
 		force: true
 	});
-	mkdirSync(path.dirname(clientAppPath), { recursive: true });
+	mkdirSync(clientRoot, { recursive: true });
 	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 = path.join(projectRoot, ".bleam");
@@ -1348,11 +1457,12 @@ function openRuntimeClient(appPath, projectConfigPath, manifest) {
 		if (code && code !== 0) console.error(`Failed to open Bleam runtime at ${appPath}`);
 	});
 }
-function quitRuntimeClient() {
-	spawnSync("osascript", ["-e", "tell application id \"dev.bleam.app\" to quit"], { stdio: "ignore" });
+function quitRuntimeClient(bundleIdentifier) {
+	const application = `application id ${JSON.stringify(bundleIdentifier)}`;
+	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) {
@@ -1441,8 +1551,14 @@ async function startLocalUpdateService() {
 		serviceUrl
 	};
 }
-function focusRuntimeClient() {
-	return 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 = 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, {
@@ -1581,12 +1697,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));
 					}
@@ -1770,11 +1888,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 = spawn(process.execPath, [
 		fileURLToPath(import.meta.url),
@@ -1815,7 +1933,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) => {
@@ -1841,15 +1959,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)}`);
@@ -1933,6 +2055,9 @@ if (process.env.VITEST !== "true") main().catch((error) => {
 const __test = {
 	createProject,
 	createBuildNativeWorkspace,
+	devAppFileName,
+	devBundleIdentifier,
+	devProjectId,
 	hasCurrentPodInstall,
 	installedAppPath,
 	installArchivedApp,
@@ -1943,6 +2068,7 @@ const __test = {
 	parseBuildOptions,
 	parseNewOptions,
 	parsePublishOtaOptions,
+	personalizeRuntimeClient,
 	podInstallInputStamp,
 	replaceOrInsertPlistString
 };

package/dist/config.d.ts

@@ -1,2 +1,2 @@
-import { a as HexColor, c as defineConfig, i as BleamUserInterfaceStyle, n as BleamConfig, o as appConfig, r as BleamInternalExpoConfig, s as createExpoConfig, t as BleamAppearance } from "./config-Chi-flpJ.js";
+import { a as HexColor, c as defineConfig, i as BleamUserInterfaceStyle, n as BleamConfig, o as appConfig, r as BleamInternalExpoConfig, s as createExpoConfig, t as BleamAppearance } from "./config-Cms0rvqg.js";
 export { BleamAppearance, BleamConfig, BleamInternalExpoConfig, BleamUserInterfaceStyle, HexColor, appConfig, createExpoConfig, defineConfig };

package/dist/elements-CFk0QHw0.d.cts

@@ -0,0 +1,127 @@
+import * as react4 from "react";
+import { ReactNode } from "react";
+import { ColorValue, PressableProps, StyleProp, TextStyle, ViewStyle } from "react-native";
+import * as _nativescript_react_native26 from "@nativescript/react-native";
+
+//#region src/elements/shared.d.ts
+type NativeStyle = ViewStyle & TextStyle;
+//#endregion
+//#region src/elements/blur-view.d.ts
+type BlurIntensity = 'ultraThin' | 'thin' | 'regular' | 'thick' | 'chrome';
+type BlurColorScheme = 'auto' | 'light' | 'dark';
+type BlurViewProps = {
+  children?: ReactNode;
+  style?: StyleProp<NativeStyle>;
+  intensity?: BlurIntensity;
+  colorScheme?: BlurColorScheme;
+};
+declare const BlurView: _nativescript_react_native26.UIKitViewComponent<BlurViewProps, _nativescript_react_native26.UIKitContainerResult<UIVisualEffectView, UIView>>;
+//#endregion
+//#region src/elements/glass-shared.d.ts
+type GlassStyle = 'regular' | 'clear' | 'none';
+type GlassEffectStyleConfig = {
+  style: GlassStyle;
+  animate?: boolean;
+  animationDuration?: number;
+};
+type GlassVisualStyle = {
+  cornerRadius?: number;
+  borderWidth?: number;
+  borderColor?: ColorValue;
+};
+type GlassViewProps = {
+  children?: ReactNode;
+  style?: StyleProp<NativeStyle>;
+  glassStyle?: GlassVisualStyle;
+  glassEffectStyle?: GlassStyle | GlassEffectStyleConfig;
+  tintColor?: string;
+  isInteractive?: boolean;
+};
+type GlassContainerProps = {
+  children?: ReactNode;
+  style?: StyleProp<NativeStyle>;
+  glassStyle?: GlassVisualStyle;
+  spacing?: number;
+};
+//#endregion
+//#region src/elements/glass-view.d.ts
+declare const GlassView: _nativescript_react_native26.UIKitViewComponent<GlassViewProps, _nativescript_react_native26.UIKitContainerResult<UIVisualEffectView, UIView>>;
+//#endregion
+//#region src/elements/button.d.ts
+type ButtonVariant = 'primary' | 'secondary' | 'plain';
+type ButtonSize = 'small' | 'regular' | 'large';
+type ButtonBaseProps = Omit<PressableProps, 'children' | 'disabled'> & {
+  label?: string;
+  icon?: ReactNode;
+  loading?: boolean;
+  disabled?: boolean;
+  size?: ButtonSize;
+  activeOpacity?: number;
+  labelStyle?: StyleProp<TextStyle>;
+};
+type ButtonProps = ButtonBaseProps & {
+  variant?: ButtonVariant;
+};
+type GlassButtonProps = ButtonBaseProps & Pick<GlassViewProps, 'glassEffectStyle' | 'tintColor'> & {
+  glassStyle?: GlassVisualStyle;
+};
+declare function Button({
+  accessibilityRole,
+  accessibilityState,
+  activeOpacity,
+  disabled,
+  icon,
+  label,
+  labelStyle,
+  loading,
+  size,
+  style,
+  variant,
+  ...props
+}: ButtonProps): react4.JSX.Element;
+declare function GlassButton({
+  accessibilityRole,
+  accessibilityState,
+  activeOpacity,
+  disabled,
+  glassEffectStyle,
+  glassStyle,
+  icon,
+  label,
+  labelStyle,
+  loading,
+  size,
+  style,
+  tintColor,
+  ...props
+}: GlassButtonProps): react4.JSX.Element;
+//#endregion
+//#region src/elements/glass-container.d.ts
+declare const GlassContainer: _nativescript_react_native26.UIKitViewComponent<GlassContainerProps, _nativescript_react_native26.UIKitContainerResult<UIVisualEffectView, UIView>>;
+//#endregion
+//#region src/elements/label.d.ts
+type LabelTone = 'primary' | 'secondary' | 'tertiary';
+type LabelProps = {
+  children?: ReactNode;
+  text?: string;
+  tone?: LabelTone;
+  numberOfLines?: number;
+  style?: StyleProp<NativeStyle>;
+};
+declare const Label: _nativescript_react_native26.UIKitViewComponent<LabelProps, UILabel>;
+//#endregion
+//#region src/elements/symbol.d.ts
+type SymbolName = string;
+type SymbolWeight = 'ultraLight' | 'thin' | 'light' | 'regular' | 'medium' | 'semibold' | 'bold' | 'heavy' | 'black';
+type SymbolScale = 'small' | 'medium' | 'large';
+type SymbolProps = {
+  symbol: SymbolName;
+  size?: number;
+  weight?: SymbolWeight;
+  scale?: SymbolScale;
+  color?: ColorValue;
+  style?: StyleProp<NativeStyle>;
+};
+declare const SFSymbol: _nativescript_react_native26.UIKitViewComponent<SymbolProps, UIImageView>;
+//#endregion
+export { BlurIntensity as C, BlurColorScheme as S, BlurViewProps as T, GlassContainerProps as _, SymbolWeight as a, GlassViewProps as b, LabelTone as c, ButtonProps as d, ButtonSize as f, GlassView as g, GlassButtonProps as h, SymbolScale as i, GlassContainer as l, GlassButton as m, SymbolName as n, Label as o, ButtonVariant as p, SymbolProps as r, LabelProps as s, SFSymbol as t, Button as u, GlassEffectStyleConfig as v, BlurView as w, GlassVisualStyle as x, GlassStyle as y };

package/dist/elements-ClGQ41Sc.d.ts

@@ -0,0 +1,127 @@
+import * as _nativescript_react_native25 from "@nativescript/react-native";
+import * as react3 from "react";
+import { ReactNode } from "react";
+import { ColorValue, PressableProps, StyleProp, TextStyle, ViewStyle } from "react-native";
+
+//#region src/elements/shared.d.ts
+type NativeStyle = ViewStyle & TextStyle;
+//#endregion
+//#region src/elements/blur-view.d.ts
+type BlurIntensity = 'ultraThin' | 'thin' | 'regular' | 'thick' | 'chrome';
+type BlurColorScheme = 'auto' | 'light' | 'dark';
+type BlurViewProps = {
+  children?: ReactNode;
+  style?: StyleProp<NativeStyle>;
+  intensity?: BlurIntensity;
+  colorScheme?: BlurColorScheme;
+};
+declare const BlurView: _nativescript_react_native25.UIKitViewComponent<BlurViewProps, _nativescript_react_native25.UIKitContainerResult<UIVisualEffectView, UIView>>;
+//#endregion
+//#region src/elements/glass-shared.d.ts
+type GlassStyle = 'regular' | 'clear' | 'none';
+type GlassEffectStyleConfig = {
+  style: GlassStyle;
+  animate?: boolean;
+  animationDuration?: number;
+};
+type GlassVisualStyle = {
+  cornerRadius?: number;
+  borderWidth?: number;
+  borderColor?: ColorValue;
+};
+type GlassViewProps = {
+  children?: ReactNode;
+  style?: StyleProp<NativeStyle>;
+  glassStyle?: GlassVisualStyle;
+  glassEffectStyle?: GlassStyle | GlassEffectStyleConfig;
+  tintColor?: string;
+  isInteractive?: boolean;
+};
+type GlassContainerProps = {
+  children?: ReactNode;
+  style?: StyleProp<NativeStyle>;
+  glassStyle?: GlassVisualStyle;
+  spacing?: number;
+};
+//#endregion
+//#region src/elements/glass-view.d.ts
+declare const GlassView: _nativescript_react_native25.UIKitViewComponent<GlassViewProps, _nativescript_react_native25.UIKitContainerResult<UIVisualEffectView, UIView>>;
+//#endregion
+//#region src/elements/button.d.ts
+type ButtonVariant = 'primary' | 'secondary' | 'plain';
+type ButtonSize = 'small' | 'regular' | 'large';
+type ButtonBaseProps = Omit<PressableProps, 'children' | 'disabled'> & {
+  label?: string;
+  icon?: ReactNode;
+  loading?: boolean;
+  disabled?: boolean;
+  size?: ButtonSize;
+  activeOpacity?: number;
+  labelStyle?: StyleProp<TextStyle>;
+};
+type ButtonProps = ButtonBaseProps & {
+  variant?: ButtonVariant;
+};
+type GlassButtonProps = ButtonBaseProps & Pick<GlassViewProps, 'glassEffectStyle' | 'tintColor'> & {
+  glassStyle?: GlassVisualStyle;
+};
+declare function Button({
+  accessibilityRole,
+  accessibilityState,
+  activeOpacity,
+  disabled,
+  icon,
+  label,
+  labelStyle,
+  loading,
+  size,
+  style,
+  variant,
+  ...props
+}: ButtonProps): react3.JSX.Element;
+declare function GlassButton({
+  accessibilityRole,
+  accessibilityState,
+  activeOpacity,
+  disabled,
+  glassEffectStyle,
+  glassStyle,
+  icon,
+  label,
+  labelStyle,
+  loading,
+  size,
+  style,
+  tintColor,
+  ...props
+}: GlassButtonProps): react3.JSX.Element;
+//#endregion
+//#region src/elements/glass-container.d.ts
+declare const GlassContainer: _nativescript_react_native25.UIKitViewComponent<GlassContainerProps, _nativescript_react_native25.UIKitContainerResult<UIVisualEffectView, UIView>>;
+//#endregion
+//#region src/elements/label.d.ts
+type LabelTone = 'primary' | 'secondary' | 'tertiary';
+type LabelProps = {
+  children?: ReactNode;
+  text?: string;
+  tone?: LabelTone;
+  numberOfLines?: number;
+  style?: StyleProp<NativeStyle>;
+};
+declare const Label: _nativescript_react_native25.UIKitViewComponent<LabelProps, UILabel>;
+//#endregion
+//#region src/elements/symbol.d.ts
+type SymbolName = string;
+type SymbolWeight = 'ultraLight' | 'thin' | 'light' | 'regular' | 'medium' | 'semibold' | 'bold' | 'heavy' | 'black';
+type SymbolScale = 'small' | 'medium' | 'large';
+type SymbolProps = {
+  symbol: SymbolName;
+  size?: number;
+  weight?: SymbolWeight;
+  scale?: SymbolScale;
+  color?: ColorValue;
+  style?: StyleProp<NativeStyle>;
+};
+declare const SFSymbol: _nativescript_react_native25.UIKitViewComponent<SymbolProps, UIImageView>;
+//#endregion
+export { BlurIntensity as C, BlurColorScheme as S, BlurViewProps as T, GlassContainerProps as _, SymbolWeight as a, GlassViewProps as b, LabelTone as c, ButtonProps as d, ButtonSize as f, GlassView as g, GlassButtonProps as h, SymbolScale as i, GlassContainer as l, GlassButton as m, SymbolName as n, Label as o, ButtonVariant as p, SymbolProps as r, LabelProps as s, SFSymbol as t, Button as u, GlassEffectStyleConfig as v, BlurView as w, GlassVisualStyle as x, GlassStyle as y };