@tantawowa/hosanna-tools 3.1.0 → 3.3.0

package/dist/run/run-config.d.ts

@@ -4,15 +4,22 @@ export interface RunPlatformDefaults {
     device?: string;
     model?: string;
     vitePort?: number;
+    profile?: string;
+    appConfig?: string;
+    passthroughArgs?: string[];
     sourceRoot?: string;
     appPackage?: string;
     files?: string[];
+    hsconfig?: string;
     hscProject?: string;
 }
 export interface RunAppDefaults {
     appName?: string;
     env?: string;
     vitePort?: number;
+    profile?: string;
+    appConfig?: string;
+    passthroughArgs?: string[];
     platforms?: Partial<Record<RunPlatform, RunPlatformDefaults>>;
 }
 export interface RunConfig {
@@ -22,6 +29,9 @@ export interface RunConfig {
         appName?: string;
         env?: string;
         vitePort?: number;
+        profile?: string;
+        appConfig?: string;
+        passthroughArgs?: string[];
         platforms?: Partial<Record<RunPlatform, RunPlatformDefaults>>;
     };
     apps?: Record<string, RunAppDefaults>;

package/dist/run/run-config.js

@@ -43,6 +43,7 @@ function normalizeRunConfig(raw, filePath) {
         if (typeof defaultsRecord.vitePort === 'number' && Number.isFinite(defaultsRecord.vitePort)) {
             config.defaults.vitePort = defaultsRecord.vitePort;
         }
+        normalizeSharedDefaults(defaultsRecord, config.defaults);
         const defaultsPlatforms = normalizePlatformDefaults(defaultsRecord.platforms, filePath);
         if (defaultsPlatforms) {
             config.defaults.platforms = defaultsPlatforms;
@@ -69,11 +70,25 @@ function normalizeRunAppDefaults(raw, filePath, appKey) {
         normalized.env = raw.env.trim();
     if (typeof raw.vitePort === 'number' && Number.isFinite(raw.vitePort))
         normalized.vitePort = raw.vitePort;
+    normalizeSharedDefaults(raw, normalized);
     const platforms = normalizePlatformDefaults(raw.platforms, `${filePath} apps.${appKey}`);
     if (platforms)
         normalized.platforms = platforms;
     return normalized;
 }
+function normalizeSharedDefaults(raw, normalized) {
+    if (typeof raw.profile === 'string' && raw.profile.trim())
+        normalized.profile = raw.profile.trim();
+    if (typeof raw.appConfig === 'string' && raw.appConfig.trim())
+        normalized.appConfig = raw.appConfig.trim();
+    if (Array.isArray(raw.passthroughArgs)) {
+        const passthroughArgs = raw.passthroughArgs
+            .filter((item) => typeof item === 'string' && item.trim().length > 0)
+            .map(item => item.trim());
+        if (passthroughArgs.length > 0)
+            normalized.passthroughArgs = passthroughArgs;
+    }
+}
 function normalizePlatformDefaults(platforms, filePath) {
     if (!platforms || typeof platforms !== 'object')
         return undefined;
@@ -96,10 +111,13 @@ function normalizePlatformDefaults(platforms, filePath) {
             normalized.model = record.model.trim();
         if (typeof record.vitePort === 'number' && Number.isFinite(record.vitePort))
             normalized.vitePort = record.vitePort;
+        normalizeSharedDefaults(record, normalized);
         if (typeof record.sourceRoot === 'string' && record.sourceRoot.trim())
             normalized.sourceRoot = record.sourceRoot.trim();
         if (typeof record.appPackage === 'string' && record.appPackage.trim())
             normalized.appPackage = record.appPackage.trim();
+        if (typeof record.hsconfig === 'string' && record.hsconfig.trim())
+            normalized.hsconfig = record.hsconfig.trim();
         if (typeof record.hscProject === 'string' && record.hscProject.trim())
             normalized.hscProject = record.hscProject.trim();
         if (Array.isArray(record.files)) {
@@ -112,10 +130,8 @@ function normalizePlatformDefaults(platforms, filePath) {
     return Object.keys(normalizedPlatforms).length > 0 ? normalizedPlatforms : undefined;
 }
 function normalizeConfigTarget(value) {
-    if (value === 'browser')
-        return 'web';
-    if ((0, types_js_1.isRunTargetKind)(value))
-        return value;
+    if ((0, types_js_1.isRunTargetInput)(value))
+        return (0, types_js_1.canonicalizeRunTargetKind)(value);
     return undefined;
 }
 function mergeRunConfig(base, overlay) {

package/dist/run/run-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-config.js","sourceRoot":"","sources":["../../src/run/run-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-config.js","sourceRoot":"","sources":["../../src/run/run-config.ts"],"names":[],"mappings":"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"}

package/dist/run/run-controller.js

@@ -59,17 +59,14 @@ async function runHosanna(inputOptions) {
     }
     const config = ((_a = options.loadConfig) !== null && _a !== void 0 ? _a : run_config_js_1.loadRunConfig)({ cwd: options.cwd });
     const platformDefaults = (_d = (_c = (_b = config.defaults) === null || _b === void 0 ? void 0 : _b.platforms) === null || _c === void 0 ? void 0 : _c[options.platform]) !== null && _d !== void 0 ? _d : {};
-    const target = normalizeRunTarget(options.platform, resolveTargetKind(options.platform, (_e = options.target) !== null && _e !== void 0 ? _e : platformDefaults.target));
+    const target = resolveTargetKind(options.platform, (_e = options.target) !== null && _e !== void 0 ? _e : platformDefaults.target);
     const appName = (_h = (_f = options.appName) !== null && _f !== void 0 ? _f : (_g = config.defaults) === null || _g === void 0 ? void 0 : _g.appName) !== null && _h !== void 0 ? _h : inferAppName(options.cwd);
     const device = (_k = (_j = options.device) !== null && _j !== void 0 ? _j : envString(options.env, 'HS_TARGET')) !== null && _k !== void 0 ? _k : platformDefaults.device;
     if (target === 'web') {
         return runWebTarget(options, options.platform, appName, options.device, (_p = (_m = (_l = options.vitePort) !== null && _l !== void 0 ? _l : platformDefaults.vitePort) !== null && _m !== void 0 ? _m : (_o = config.defaults) === null || _o === void 0 ? void 0 : _o.vitePort) !== null && _p !== void 0 ? _p : 5173);
     }
     if (options.platform === 'ios') {
-        if (target === 'emulator') {
-            throw new Error('iOS uses --target simulator for Apple simulators, or --target device for a physical iPhone. The emulator target is for Android platforms.');
-        }
-        if (target === 'simulator') {
+        if (target === 'sim') {
             await prepareNativeRunProject(options, 'ios', target);
             return runIosSimulator(options, appName, device);
         }
@@ -80,10 +77,7 @@ async function runHosanna(inputOptions) {
         throw new Error(`hst run --platform ios --target ${target} is not implemented in this phase.`);
     }
     if (options.platform === 'apple-tv') {
-        if (target === 'emulator') {
-            throw new Error('Apple TV uses --target simulator for tvOS simulators, or --target device for a physical Apple TV. The emulator target is for Android platforms.');
-        }
-        if (target === 'simulator') {
+        if (target === 'sim') {
             await prepareNativeRunProject(options, 'apple-tv', target);
             return runAppleTvSimulator(options, appName, device);
         }
@@ -94,10 +88,7 @@ async function runHosanna(inputOptions) {
         throw new Error(`hst run --platform apple-tv --target ${target} is not implemented in this phase.`);
     }
     if (options.platform === 'android') {
-        if (target === 'simulator') {
-            throw new Error('Android uses --target emulator. The simulator target is for Apple platforms.');
-        }
-        if (target === 'emulator') {
+        if (target === 'sim') {
             await prepareNativeRunProject(options, 'android', target);
             return runAndroidEmulator(options, appName, device);
         }
@@ -108,10 +99,7 @@ async function runHosanna(inputOptions) {
         throw new Error(`hst run --platform android --target ${target} is not implemented in this phase.`);
     }
     if (options.platform === 'android-tv') {
-        if (target === 'simulator') {
-            throw new Error('Android TV uses --target emulator. The simulator target is for Apple platforms.');
-        }
-        if (target === 'emulator') {
+        if (target === 'sim') {
             await prepareNativeRunProject(options, 'android-tv', target);
             return runAndroidTvEmulator(options, appName, device);
         }
@@ -373,15 +361,7 @@ function resolveTargetKind(platform, target) {
         return (0, types_js_1.canonicalizeRunTargetKind)(target);
     if (platform === 'web' || platform === 'roku')
         return 'web';
-    if (platform === 'ios' || platform === 'apple-tv')
-        return 'simulator';
-    return 'emulator';
-}
-function normalizeRunTarget(platform, target) {
-    if (platform === 'roku' && (target === 'simulator' || target === 'emulator')) {
-        return 'web';
-    }
-    return target;
+    return 'sim';
 }
 async function prepareNativeRunProject(options, platform, target) {
     var _a;
@@ -395,19 +375,19 @@ async function prepareNativeRunProject(options, platform, target) {
     });
 }
 function hasInjectedNativeDriver(options, platform, target) {
-    if (platform === 'ios' && target === 'simulator')
+    if (platform === 'ios' && target === 'sim')
         return Boolean(options.iosSimulator);
     if (platform === 'ios' && target === 'device')
         return Boolean(options.iosDevice);
-    if (platform === 'apple-tv' && target === 'simulator')
+    if (platform === 'apple-tv' && target === 'sim')
         return Boolean(options.appleTvSimulator);
     if (platform === 'apple-tv' && target === 'device')
         return Boolean(options.appleTvDevice);
-    if (platform === 'android' && target === 'emulator')
+    if (platform === 'android' && target === 'sim')
         return Boolean(options.androidEmulator);
     if (platform === 'android' && target === 'device')
         return Boolean(options.androidDevice);
-    if (platform === 'android-tv' && target === 'emulator')
+    if (platform === 'android-tv' && target === 'sim')
         return Boolean(options.androidTvEmulator);
     if (platform === 'android-tv' && target === 'device')
         return Boolean(options.androidTvDevice);
@@ -441,7 +421,7 @@ async function runIosSimulator(options, appName, deviceSelector) {
         cwd: options.cwd,
         appName,
         platform: 'ios',
-        target: 'simulator',
+        target: 'sim',
         deviceId: target.id,
     });
     let shouldTerminateBeforeLaunch = Boolean(options.replace);
@@ -450,7 +430,7 @@ async function runIosSimulator(options, appName, deviceSelector) {
             return {
                 status: 'reused',
                 platform: 'ios',
-                target: 'simulator',
+                target: 'sim',
                 appName,
                 session: existingSession,
             };
@@ -460,7 +440,7 @@ async function runIosSimulator(options, appName, deviceSelector) {
             return {
                 status: 'reused',
                 platform: 'ios',
-                target: 'simulator',
+                target: 'sim',
                 appName,
                 session: existingSession,
             };
@@ -475,7 +455,7 @@ async function runIosSimulator(options, appName, deviceSelector) {
     }
     await driver.buildApp(target, commandOptions);
     if (options.buildOnly) {
-        return buildOnlyRunResult('ios', 'simulator', appName);
+        return buildOnlyRunResult('ios', 'sim', appName);
     }
     const launchMode = appleLaunchMode(options);
     if (launchMode.hotReload) {
@@ -494,7 +474,7 @@ async function runIosSimulator(options, appName, deviceSelector) {
         cwd: options.cwd,
         appName,
         platform: 'ios',
-        target: 'simulator',
+        target: 'sim',
         pid: process.pid,
         liveness: 'device',
         deviceId: target.id,
@@ -509,7 +489,7 @@ async function runIosSimulator(options, appName, deviceSelector) {
     return {
         status: 'started',
         platform: 'ios',
-        target: 'simulator',
+        target: 'sim',
         appName,
         session: recorded,
     };
@@ -600,7 +580,7 @@ async function runAppleTvSimulator(options, appName, deviceSelector) {
         cwd: options.cwd,
         appName,
         platform: 'apple-tv',
-        target: 'simulator',
+        target: 'sim',
         deviceId: target.id,
     });
     let shouldTerminateBeforeLaunch = Boolean(options.replace);
@@ -609,7 +589,7 @@ async function runAppleTvSimulator(options, appName, deviceSelector) {
             return {
                 status: 'reused',
                 platform: 'apple-tv',
-                target: 'simulator',
+                target: 'sim',
                 appName,
                 session: existingSession,
             };
@@ -619,7 +599,7 @@ async function runAppleTvSimulator(options, appName, deviceSelector) {
             return {
                 status: 'reused',
                 platform: 'apple-tv',
-                target: 'simulator',
+                target: 'sim',
                 appName,
                 session: existingSession,
             };
@@ -634,7 +614,7 @@ async function runAppleTvSimulator(options, appName, deviceSelector) {
     }
     await driver.buildApp(target, commandOptions);
     if (options.buildOnly) {
-        return buildOnlyRunResult('apple-tv', 'simulator', appName);
+        return buildOnlyRunResult('apple-tv', 'sim', appName);
     }
     const launchMode = appleLaunchMode(options);
     if (launchMode.hotReload) {
@@ -653,7 +633,7 @@ async function runAppleTvSimulator(options, appName, deviceSelector) {
         cwd: options.cwd,
         appName,
         platform: 'apple-tv',
-        target: 'simulator',
+        target: 'sim',
         pid: process.pid,
         liveness: 'device',
         deviceId: target.id,
@@ -668,7 +648,7 @@ async function runAppleTvSimulator(options, appName, deviceSelector) {
     return {
         status: 'started',
         platform: 'apple-tv',
-        target: 'simulator',
+        target: 'sim',
         appName,
         session: recorded,
     };
@@ -755,7 +735,7 @@ async function runAndroidEmulator(options, appName, deviceSelector) {
     const launchMode = androidLaunchMode(options, 'android');
     return runAndroidNative(options, appName, deviceSelector, {
         platform: 'android',
-        target: 'emulator',
+        target: 'sim',
         label: 'Android emulator',
         driver: (_a = options.androidEmulator) !== null && _a !== void 0 ? _a : (0, android_emulator_js_1.createDefaultAndroidEmulatorDriver)(),
         launchOptions: (0, android_emulator_js_1.androidPhoneLaunchOptions)(options.env, { bundledMode: launchMode.bundled, cwd: options.cwd }),
@@ -781,7 +761,7 @@ async function runAndroidTvEmulator(options, appName, deviceSelector) {
     const launchMode = androidLaunchMode(options, 'android-tv');
     return runAndroidNative(options, appName, deviceSelector, {
         platform: 'android-tv',
-        target: 'emulator',
+        target: 'sim',
         label: 'Android TV emulator',
         driver: (_a = options.androidTvEmulator) !== null && _a !== void 0 ? _a : (0, android_emulator_js_1.createDefaultAndroidTvEmulatorDriver)(),
         launchOptions: (0, android_emulator_js_1.androidTvLaunchOptions)(options.env, { bundledMode: launchMode.bundled, cwd: options.cwd }),
@@ -804,6 +784,10 @@ async function runAndroidTvDevice(options, appName, deviceSelector) {
 }
 async function runAndroidNative(options, appName, deviceSelector, profile) {
     var _a, _b, _c;
+    if (options.buildOnly) {
+        await profile.driver.buildApp(androidBuildOnlyTarget(profile, deviceSelector), androidCommandOptions(options));
+        return buildOnlyRunResult(profile.platform, profile.target, appName);
+    }
     const selectedTarget = await resolveAndroidNativeTarget(profile.driver, options, deviceSelector, profile);
     let target = selectedTarget;
     if (profile.target === 'device') {
@@ -850,9 +834,6 @@ async function runAndroidNative(options, appName, deviceSelector, profile) {
         await profile.driver.terminateApp(target, commandOptions);
     }
     await profile.driver.buildApp(target, commandOptions);
-    if (options.buildOnly) {
-        return buildOnlyRunResult(profile.platform, profile.target, appName);
-    }
     if (profile.launchMode.hotReload) {
         await ensureNativeService(options, androidNativeServiceOptions(options));
     }
@@ -883,6 +864,19 @@ async function runAndroidNative(options, appName, deviceSelector, profile) {
         session: recorded,
     };
 }
+function androidBuildOnlyTarget(profile, deviceSelector) {
+    const id = (deviceSelector === null || deviceSelector === void 0 ? void 0 : deviceSelector.trim()) || `${profile.platform}-${profile.target}-build`;
+    return {
+        platform: profile.platform,
+        target: profile.target,
+        id,
+        name: id,
+        formFactor: profile.platform === 'android-tv' ? 'tv' : 'mobile',
+        source: 'builtin',
+        online: false,
+        state: 'build-only',
+    };
+}
 async function resolveIosSimulatorTarget(driver, options, selector) {
     const targets = await driver.listTargets({ cwd: options.cwd, env: options.env });
     if (selector === null || selector === void 0 ? void 0 : selector.trim()) {
@@ -892,7 +886,7 @@ async function resolveIosSimulatorTarget(driver, options, selector) {
         throw new Error(`No iOS simulator matched "${selector}".\n${formatRunTargetChoices(targets)}`);
     }
     if (options.nonInteractive || !process.stdin.isTTY) {
-        throw new Error('hst run --platform ios --target simulator requires --device <simulator name|UDID> or defaults.platforms.ios.device in .hosanna-tools/run.json for non-interactive runs. Use hst target:list --platform ios --target simulator --json to choose a simulator.');
+        throw new Error('hst run --platform ios --target sim requires --device <simulator name|UDID> or defaults.platforms.ios.device in .hosanna-tools/run.json for non-interactive runs. Use hst target:list --platform ios --target sim --json to choose a simulator.');
     }
     return promptForRunTarget('iOS simulator', targets);
 }
@@ -921,7 +915,7 @@ async function resolveAppleTvSimulatorTarget(driver, options, selector) {
         throw new Error(`No Apple TV simulator matched "${selector}".\n${formatRunTargetChoices(targets)}`);
     }
     if (options.nonInteractive || !process.stdin.isTTY) {
-        throw new Error('hst run --platform apple-tv --target simulator requires --device <simulator name|UDID> or defaults.platforms.apple-tv.device in .hosanna-tools/run.json for non-interactive runs. Use hst target:list --platform apple-tv --target simulator --json to choose a simulator.');
+        throw new Error('hst run --platform apple-tv --target sim requires --device <simulator name|UDID> or defaults.platforms.apple-tv.device in .hosanna-tools/run.json for non-interactive runs. Use hst target:list --platform apple-tv --target sim --json to choose a simulator.');
     }
     return promptForRunTarget('Apple TV simulator', targets);
 }
@@ -953,7 +947,7 @@ async function resolveAndroidNativeTarget(driver, options, selector, profile) {
     if (defaultTarget)
         return defaultTarget;
     if (options.nonInteractive || !process.stdin.isTTY) {
-        const targetSelector = profile.target === 'emulator' ? 'AVD name|adb serial' : 'device name|adb serial';
+        const targetSelector = profile.target === 'sim' ? 'AVD name|adb serial' : 'device name|adb serial';
         throw new Error(`hst run --platform ${profile.platform} --target ${profile.target} requires --device <${targetSelector}> or defaults.platforms.${profile.platform}.device in .hosanna-tools/run.json for non-interactive runs. Use hst target:list --platform ${profile.platform} --target ${profile.target} --json to choose a target.`);
     }
     return promptForRunTarget(profile.label, targets);