@wix/himalaya-cli 0.1346.0 → 0.1347.0

package/dist/cli.mjs

@@ -7706,7 +7706,6 @@ function resolveTranslation(value, catalog3, sourceCatalog) {
 var BINDING_SIGILS, BINDING_SIGIL_RE, TRANSLATION_PREFIX, TRANSLATION_KEY_RE;
 var init_bindings = __esm({
   "../../core/ts/src/bindings.ts"() {
-    "use strict";
     BINDING_SIGILS = ["service", "flag", "item", "t"];
     BINDING_SIGIL_RE = new RegExp(
       `^\\$(?:${BINDING_SIGILS.filter((s2) => s2 !== "t").join("|")})\\b|^\\$t:`
@@ -22951,6 +22950,7 @@ __export(gen_native_config_exports, {
   LABEL_MODULES_ANDROID_INCLUDE: () => LABEL_MODULES_ANDROID_INCLUDE,
   LABEL_MODULES_ANDROID_INSTALLERS: () => LABEL_MODULES_ANDROID_INSTALLERS,
   LABEL_MODULES_ANDROID_LINK: () => LABEL_MODULES_ANDROID_LINK,
+  LABEL_MODULES_IOS_FLAGS: () => LABEL_MODULES_IOS_FLAGS,
   LABEL_MODULES_IOS_LINK: () => LABEL_MODULES_IOS_LINK,
   LABEL_MODULES_IOS_PACKAGE: () => LABEL_MODULES_IOS_PACKAGE,
   LABEL_MODULES_SWIFT_IMPORT: () => LABEL_MODULES_SWIFT_IMPORT,
@@ -22963,7 +22963,9 @@ __export(gen_native_config_exports, {
   androidPlanFor: () => androidPlanFor,
   androidSettingsGradle: () => androidSettingsGradle,
   androidTvLeanbackPlan: () => androidTvLeanbackPlan,
+  applyModuleFlags: () => applyModuleFlags,
   applyToFile: () => applyToFile,
+  assertModuleFlagsMarkers: () => assertModuleFlagsMarkers,
   assertSingleMarkerPair: () => assertSingleMarkerPair,
   assertSingleModuleInstall: () => assertSingleModuleInstall,
   automotiveAppDescPath: () => automotiveAppDescPath,
@@ -22983,6 +22985,7 @@ __export(gen_native_config_exports, {
   iosPlanFor: () => iosPlanFor,
   kotlinBootSourcesUnder: () => kotlinBootSourcesUnder,
   kotlinFilesWithModuleInstall: () => kotlinFilesWithModuleInstall,
+  linkedFlag: () => linkedFlag,
   loadOverrides: () => loadOverrides,
   macosPlanFor: () => macosPlanFor,
   moduleLinkRenderers: () => moduleLinkRenderers,
@@ -23001,6 +23004,7 @@ __export(gen_native_config_exports, {
   renderModulesAndroidInstallers: () => renderModulesAndroidInstallers,
   renderModulesAndroidLink: () => renderModulesAndroidLink,
   renderModulesAndroidLinkBinary: () => renderModulesAndroidLinkBinary,
+  renderModulesIosFlags: () => renderModulesIosFlags,
   renderModulesIosLink: () => renderModulesIosLink,
   renderModulesIosLinkBinary: () => renderModulesIosLinkBinary,
   renderModulesIosPackage: () => renderModulesIosPackage,
@@ -23226,13 +23230,16 @@ function renderModulesAndroidLinkBinary(projects, coreVersion, indent) {
 function moduleLinkRenderers(modules, binary) {
   if (!binary) {
     return {
+      iosLinked: () => modules.spm,
       iosPackage: (i2) => renderModulesIosPackage(modules.spm, i2),
       iosLink: (i2) => renderModulesIosLink(modules.spm, i2),
       androidInclude: (i2) => renderModulesAndroidInclude(modules.gradle, i2),
       androidLink: (i2) => renderModulesAndroidLink(modules.gradle, i2)
     };
   }
+  const iosLinked = () => modules.spm.length && coreVersionHasModules(binary.coreVersion()) ? modules.spm : [];
   return {
+    iosLinked,
     iosPackage: (i2) => modules.spm.length && coreVersionHasModules(binary.coreVersion()) ? renderModulesIosPackageBinary(modules.spm, binary.corePackagePath?.(), i2) : [],
     // Same version rule as Android: a pre-split core carries the capabilities and has no products.
     iosLink: (i2) => modules.spm.length && coreVersionHasModules(binary.coreVersion()) ? renderModulesIosLinkBinary(modules.spm, i2) : [],
@@ -23246,14 +23253,17 @@ function moduleLinkRenderers(modules, binary) {
     }
   };
 }
+function renderModulesIosFlags(products, indent) {
+  return [`${indent}OTHER_SWIFT_FLAGS: "${["$(inherited)", ...products.map((p2) => `-D${linkedFlag(p2)}`)].join(" ")}"`];
+}
 function renderModulesSwiftImport(indent) {
   return NATIVE_MODULES.flatMap(
-    (m2) => m2.ios ? [`${indent}#if canImport(${m2.ios.product})`, `${indent}import ${m2.ios.product}`, `${indent}#endif`] : []
+    (m2) => m2.ios ? [`${indent}#if canImport(${m2.ios.product}) && ${linkedFlag(m2.ios.product)}`, `${indent}import ${m2.ios.product}`, `${indent}#endif`] : []
   );
 }
 function renderModulesSwiftInstall(indent) {
   return NATIVE_MODULES.flatMap(
-    (m2) => m2.ios ? [`${indent}#if canImport(${m2.ios.product})`, `${indent}${m2.ios.product}.install()`, `${indent}#endif`] : []
+    (m2) => m2.ios ? [`${indent}#if canImport(${m2.ios.product}) && ${linkedFlag(m2.ios.product)}`, `${indent}${m2.ios.product}.install()`, `${indent}#endif`] : []
   );
 }
 function renderModulesAndroidInstallers(indent) {
@@ -23433,6 +23443,19 @@ function applyToFile(path2, kind, label2, render, check) {
   writeFileSync13(path2, after);
   return { path: path2, outcome: "written" };
 }
+function assertModuleFlagsMarkers(paths) {
+  for (const path2 of paths) {
+    if (!existsSync34(path2)) continue;
+    const text9 = readFileSync33(path2, "utf8");
+    if (hasMarkers(text9, "yaml", LABEL_MODULES_IOS_LINK) && !hasMarkers(text9, "yaml", LABEL_MODULES_IOS_FLAGS)) {
+      throw new Error(`${path2} links modules (${LABEL_MODULES_IOS_LINK}) but has no ${LABEL_MODULES_IOS_FLAGS} block under its project-level settings:, so no module would install. Add the markers (see apps/_template).`);
+    }
+  }
+}
+function applyModuleFlags(path2, products, check) {
+  assertModuleFlagsMarkers([path2]);
+  return applyToFile(path2, "yaml", LABEL_MODULES_IOS_FLAGS, (i2) => renderModulesIosFlags(products, i2), check);
+}
 function applyWholeFile(path2, content, check) {
   const current = existsSync34(path2) ? readFileSync33(path2, "utf8") : null;
   if (current === content) return { path: path2, outcome: "unchanged" };
@@ -23485,6 +23508,7 @@ function genNativeConfig(app, opts = {}) {
   const check = opts.check ?? false;
   assertSingleModuleInstall(app, swiftFilesWithModuleMarkers(app));
   assertSingleModuleInstall(app, kotlinFilesWithModuleInstall(app));
+  assertModuleFlagsMarkers([iosProjectYml(app), macosProjectYml(app)]);
   const configPath = appConfigTs(app);
   const configTs = existsSync34(configPath) ? readFileSync33(configPath, "utf8") : "";
   const capabilities = parseStringArray(configTs, "capabilities");
@@ -23589,9 +23613,11 @@ function genNativeConfig(app, opts = {}) {
     // published AARs (#4055): no source package, no settings include.
     applyToFile(iosProjectYml(app), "yaml", LABEL_MODULES_IOS_PACKAGE, moduleLinks.iosPackage, check),
     applyToFile(iosProjectYml(app), "yaml", LABEL_MODULES_IOS_LINK, moduleLinks.iosLink, check),
+    applyModuleFlags(iosProjectYml(app), moduleLinks.iosLinked(), check),
     // macOS (RFC 0046) reuses the iOS boot, so it links the same macOS-capable modules.
     applyToFile(macosProjectYml(app), "yaml", LABEL_MODULES_IOS_PACKAGE, (i2) => renderModulesIosPackage(modules.macos, i2), check),
     applyToFile(macosProjectYml(app), "yaml", LABEL_MODULES_IOS_LINK, (i2) => renderModulesIosLink(modules.macos, i2), check),
+    applyModuleFlags(macosProjectYml(app), modules.macos, check),
     applyToFile(androidSettingsGradle(app), "slash", LABEL_MODULES_ANDROID_INCLUDE, moduleLinks.androidInclude, check),
     applyToFile(androidAppGradle(app), "slash", LABEL_MODULES_ANDROID_LINK, moduleLinks.androidLink, check),
     // watchOS (RFC 0047): the watch runtime mode/serve, declared once in config.ts. A watch
@@ -23685,7 +23711,7 @@ function genNativeConfig(app, opts = {}) {
   );
   return { app, buildSet: ids, files, drift: files.some((f2) => f2.outcome === "drift") };
 }
-var LABEL_IOS_INFO, LABEL_IOS_ENTITLEMENTS, LABEL_ANDROID, LABEL_ANDROID_SERVICES, LABEL_MODULES_IOS_PACKAGE, LABEL_MODULES_IOS_LINK, LABEL_MODULES_ANDROID_INCLUDE, LABEL_MODULES_ANDROID_LINK, LABEL_MODULES_SWIFT_IMPORT, LABEL_MODULES_SWIFT_INSTALL, LABEL_MODULES_ANDROID_INSTALLERS, LABEL_WATCH, LABEL_TV, LABEL_ANDROID_TV, LABEL_ORIENTATION, LABEL_CAR, IOS_ORIENTATION, ALL_ORIENTATIONS, HEALTH_PERMISSION_COPY_META, FROM_APP_PLATFORM_DIR, CORE_ANDROID_CAPABILITY_MODULES, ANDROID_MAX_DEPTH, BOOT_SOURCE_MAX_BYTES, IOS_BUILD_CAPABILITIES_KEY, IOS_DIST_CAPABILITIES_KEY, ANDROID_BUILD_CAPABILITIES_META, ANDROID_DIST_CAPABILITIES_META;
+var LABEL_IOS_INFO, LABEL_IOS_ENTITLEMENTS, LABEL_ANDROID, LABEL_ANDROID_SERVICES, LABEL_MODULES_IOS_PACKAGE, LABEL_MODULES_IOS_LINK, LABEL_MODULES_ANDROID_INCLUDE, LABEL_MODULES_ANDROID_LINK, LABEL_MODULES_IOS_FLAGS, LABEL_MODULES_SWIFT_IMPORT, LABEL_MODULES_SWIFT_INSTALL, LABEL_MODULES_ANDROID_INSTALLERS, LABEL_WATCH, LABEL_TV, LABEL_ANDROID_TV, LABEL_ORIENTATION, LABEL_CAR, IOS_ORIENTATION, ALL_ORIENTATIONS, HEALTH_PERMISSION_COPY_META, FROM_APP_PLATFORM_DIR, linkedFlag, CORE_ANDROID_CAPABILITY_MODULES, ANDROID_MAX_DEPTH, BOOT_SOURCE_MAX_BYTES, IOS_BUILD_CAPABILITIES_KEY, IOS_DIST_CAPABILITIES_KEY, ANDROID_BUILD_CAPABILITIES_META, ANDROID_DIST_CAPABILITIES_META;
 var init_gen_native_config = __esm({
   "../native-config/gen-native-config.ts"() {
     init_src2();
@@ -23708,6 +23734,7 @@ var init_gen_native_config = __esm({
     LABEL_MODULES_IOS_LINK = "himalaya:modules:link";
     LABEL_MODULES_ANDROID_INCLUDE = "himalaya:modules:include";
     LABEL_MODULES_ANDROID_LINK = "himalaya:modules:dep";
+    LABEL_MODULES_IOS_FLAGS = "himalaya:modules:flags";
     LABEL_MODULES_SWIFT_IMPORT = "himalaya:modules:import";
     LABEL_MODULES_SWIFT_INSTALL = "himalaya:modules:install";
     LABEL_MODULES_ANDROID_INSTALLERS = "himalaya:modules:installers";
@@ -23725,6 +23752,7 @@ var init_gen_native_config = __esm({
     ALL_ORIENTATIONS = ["portrait", "portraitUpsideDown", "landscapeLeft", "landscapeRight"];
     HEALTH_PERMISSION_COPY_META = "io.himalaya.health.permissionCopy";
     FROM_APP_PLATFORM_DIR = "../../../";
+    linkedFlag = (product) => `HIMALAYA_LINKED_${product}`;
     CORE_ANDROID_CAPABILITY_MODULES = join34(
       dirname21(fileURLToPath14(import.meta.url)),
       "../../core/runtime/android/io/himalaya/core/src/main/kotlin/io/himalaya/core/CapabilityModules.kt"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1346.0",
+  "version": "0.1347.0",
   "type": "module",
   "description": "himi — the Himalaya authoring CLI. Build a Tier-5 content package on your own machine, push it to the production serve as a draft, preview it on web + Himi Player, and read worker logs back — the remote dev loop. Wraps @himalaya/serve-cli for transport.",
   "keywords": [
@@ -71,5 +71,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "d5621e3868f8ab4e19fa7e96c23ab61fd87096ddaa12ed3f7a1f8f31"
+  "falconPackageHash": "a29fe2ff4d1eed4ea6abb0ca8021240c929c0149b7bf90cda23b45cf"
 }