lecodes-cli 0.15.0 → 0.16.1

package/dist/index.js

@@ -45212,7 +45212,7 @@ var require_main = __commonJS((exports, module) => {
 // package.json
 var package_default = {
   name: "lecodes-cli",
-  version: "0.15.0",
+  version: "0.16.1",
   dependencies: {
     "@letary/chisel": "^0.6.0",
     jimp: "^1.6.1"
@@ -45226,8 +45226,8 @@ var package_default = {
   },
   peerDependencies: {
     "lecodes-design": "^0.8.0",
-    "lecodes-renderer": "^0.8.2",
-    "lecodes-3d-editor": "^0.2.0"
+    "lecodes-renderer": "^0.8.3",
+    "lecodes-3d-editor": "^0.3.0"
   },
   bin: {
     lecodes: "dist/index.js"
@@ -46324,6 +46324,23 @@ NEXT launch. Offline it's a silent no-op — the app always launches from a loca
 An App Store update always beats a cached OTA bundle. JS only: adding/removing native
 plugins still needs a store release.
 
+Shipping an update is just \`lecodes push --publish\` — no rebuild, no store review:
+running apps download the new code on their next launch and run it on the launch after.
+
+Shells generated before OTA support have a \`ViewController.swift\` that reads app.js from
+\`Bundle.main\` directly, so downloaded updates would never run — and since \`App/*.swift\`
+is yours, sync won't rewrite it (\`lecodes app doctor\` flags this). Replace the
+\`Bundle.main\` load with:
+
+\`\`\`swift
+LeCodesUpdater.checkForUpdate()
+guard let code = LeCodesUpdater.activeBundle() else {
+    print("LeCodes: bundled app.js is missing — run \`lecodes app sync\`")
+    return
+}
+engine.run(code)
+\`\`\`
+
 ## Config
 
 Identity lives in \`../app.json\` (name, version, plugins, ios.bundleId / teamId / variant /
@@ -46401,6 +46418,34 @@ var ensureShellIgnored = (root, dir) => {
 `);
   log(`${c.green("updated")}   .lecodesignore  (+ ${dir}/)`);
 };
+var SDK_VARIANTS = ["core", "2d", "3d", "full"];
+var detectEngines = (bundleJs) => {
+  const lines = [];
+  for (const line of bundleJs.split(`
+`)) {
+    if (!line.startsWith("//"))
+      break;
+    lines.push(line);
+  }
+  const header = lines.join(`
+`);
+  return { gl: !/^\/\/ gl: disable$/m.test(header), g2: /^\/\/ 2d: enable$/m.test(header) };
+};
+var resolveVariant = (requested, bundleJs, configKey = "ios.variant") => {
+  const uses = detectEngines(bundleJs);
+  const detected = uses.gl && uses.g2 ? "full" : uses.gl ? "3d" : uses.g2 ? "2d" : "core";
+  if (requested === "auto")
+    return { variant: detected, detected };
+  const variant = requested;
+  const missing = [
+    uses.gl && variant !== "3d" && variant !== "full" ? "3D" : null,
+    uses.g2 && variant !== "2d" && variant !== "full" ? "2D" : null
+  ].filter(Boolean);
+  if (missing.length > 0) {
+    warn(`project uses the ${missing.join(" + ")} engine but ${configKey} forces "${variant}" — those scenes won't run on device; remove ${configKey} to auto-select "${detected}".`);
+  }
+  return { variant, detected };
+};
 var VERSION_RE = /^\d+\.\d+\.\d+$/;
 var cmpVersion = (a, b) => {
   const pa = a.split(".").map(Number);
@@ -46748,7 +46793,7 @@ validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 `;
-var runtimeBuildGradleTemplate = (sdkVersion, pluginModules) => {
+var runtimeBuildGradleTemplate = (sdkVersion, pluginModules, sdkArtifact = "lecodes-sdk") => {
   const deps = SDK_RUNTIME_DEPS.map((d) => `
     api("${d}")`).join("");
   const plugins = pluginModules.map((m) => `
@@ -46780,8 +46825,10 @@ kotlin {
 }
 
 dependencies {
-    // Exact pin — the release asset URL is derived from this version (see settings.gradle.kts).
-    api("io.letary:lecodes-sdk:${sdkVersion}@aar")
+    // Exact pin — the release asset URL is derived from this artifact + version (see
+    // settings.gradle.kts). The artifact is the SDK variant sync picked (lecodes-sdk = full,
+    // -3d / -2d / -core = smaller engine builds); every variant vends the same Kotlin API.
+    api("io.letary:${sdkArtifact}:${sdkVersion}@aar")
     // The fat AAR carries no POM, so its own dependencies ride here explicitly.${deps}${plugins}
 }
 `;
@@ -46831,7 +46878,7 @@ ${push ? `        ${pushNs}.PushPlugin.setForeground(foreground)
 }
 `;
 };
-var pluginBuildGradleTemplate = (id, module, namespace, sdkVersion, dependencies, aarNames, hasConsumerRules) => {
+var pluginBuildGradleTemplate = (id, module, namespace, sdkVersion, dependencies, aarNames, hasConsumerRules, sdkArtifact = "lecodes-sdk") => {
   const consumer = hasConsumerRules ? `
         consumerProguardFiles("consumer-rules.pro")` : "";
   const aars = aarNames.map((n2) => `
@@ -46866,7 +46913,9 @@ kotlin {
 }
 
 dependencies {
-    implementation("io.letary:lecodes-sdk:${sdkVersion}@aar")${sdkDeps}${aars}${manifestDeps}
+    // Same artifact (SDK variant) as lecodes-runtime — two different variant coordinates in one
+    // shell would put two copies of the SDK classes on the runtime classpath.
+    implementation("io.letary:${sdkArtifact}:${sdkVersion}@aar")${sdkDeps}${aars}${manifestDeps}
 }
 `;
 };
@@ -46898,6 +46947,14 @@ in \`settings.gradle.kts\`. \`lecodes app update\` moves the pin (or set \`app.j
 \`android.sdk\`). The SDK AAR ships no POM, so its own dependencies are declared explicitly in
 the generated runtime build file.
 
+## SDK variant
+
+Sync links the smallest SDK artifact covering the engines the compiled bundle actually uses —
+\`lecodes-sdk\` (full: 3D+2D), \`lecodes-sdk-3d\`, \`lecodes-sdk-2d\` or \`lecodes-sdk-core\`
+(UI only) — so an app without 3D scenes doesn't ship Filament. If the project starts using an
+engine, sync switches automatically on the next run; set \`android.variant\` in \`../app.json\`
+to force one (needs lecodes-android-sdk >= 1.3.0; older releases ship only the full AAR).
+
 ## App-local native code
 
 Drop Kotlin files into \`app/src/main/java/\` and register them in \`MainActivity\` after the
@@ -47561,6 +47618,8 @@ if "%OS%"=="Windows_NT" endlocal
 // src/commands/appAndroid.ts
 var ANDROID_SDK_REPO = "letary/lecodes-android-sdk";
 var ANDROID_SDK_MIN_VERSION = "1.2.0";
+var ANDROID_SDK_VARIANTS_MIN = "1.3.0";
+var variantArtifact = (variant) => variant === "full" ? "lecodes-sdk" : `lecodes-sdk-${variant}`;
 var ANDROID_SDK_URL_DEFAULT = `https://github.com/${ANDROID_SDK_REPO}/releases/download`;
 var sdkRepoUrl = () => process.env.LECODES_ANDROID_SDK_URL ?? ANDROID_SDK_URL_DEFAULT;
 var ANDROID_SDK_OPTS = { repo: ANDROID_SDK_REPO, minVersion: ANDROID_SDK_MIN_VERSION, configKey: "android.sdk" };
@@ -47568,7 +47627,7 @@ var shellSdkVersionAndroid = (androidDir) => {
   const path2 = join14(androidDir, "lecodes-runtime", "build.gradle.kts");
   if (!existsSync13(path2))
     return null;
-  const m = /io\.letary:lecodes-sdk:(\d+\.\d+\.\d+)@aar/.exec(readFileSync13(path2, "utf8"));
+  const m = /io\.letary:lecodes-sdk(?:-(?:core|2d|3d))?:(\d+\.\d+\.\d+)@aar/.exec(readFileSync13(path2, "utf8"));
   return m ? m[1] : null;
 };
 var GRADLE_WRAPPER_JAR_URL = "https://raw.githubusercontent.com/gradle/gradle/v8.13.0/gradle/wrapper/gradle-wrapper.jar";
@@ -47601,6 +47660,10 @@ var initAndroid = async (args) => {
     throw new CliError("android/ already exists — run `lecodes app sync` to update it.");
   }
   const existing = readJson(join14(root, "app.json")) ?? {};
+  const variant = flagStr(args, "variant") ?? existing.android?.variant ?? "auto";
+  if (variant !== "auto" && !SDK_VARIANTS.includes(variant)) {
+    throw new CliError(`--variant must be auto, ${SDK_VARIANTS.join(", ")} (got "${variant}")`);
+  }
   const sdkFlag = flagStr(args, "sdk") ?? existing.android?.sdk;
   const sdkVersion = await resolveSdkVersion(process.env.LECODES_ANDROID_SDK ?? sdkFlag ?? "latest", null, ANDROID_SDK_OPTS);
   const sdk = sdkFlag === "latest" ? "latest" : sdkVersion;
@@ -47615,6 +47678,7 @@ var initAndroid = async (args) => {
       applicationId: flagStr(args, "app-id") ?? existing.android?.applicationId ?? defaultAppId,
       versionCode: existing.android?.versionCode ?? 1,
       sdk,
+      variant,
       ...existing.android?.signing ? { signing: existing.android.signing } : {}
     }
   };
@@ -47656,7 +47720,9 @@ var initAndroid = async (args) => {
   write("app/src/main/res/values/colors.xml", COLORS_XML);
   write("app/src/main/res/values/strings.xml", stringsXmlTemplate(name));
   write("app/src/main/res/drawable/ic_launcher.xml", IC_LAUNCHER_XML);
-  write("lecodes-runtime/build.gradle.kts", runtimeBuildGradleTemplate(sdkVersion, []));
+  const initVariant = variant === "auto" ? "core" : variant;
+  const initArtifact = cmpVersion(sdkVersion, ANDROID_SDK_VARIANTS_MIN) >= 0 ? variantArtifact(initVariant) : "lecodes-sdk";
+  write("lecodes-runtime/build.gradle.kts", runtimeBuildGradleTemplate(sdkVersion, [], initArtifact));
   write("lecodes-runtime/src/main/kotlin/io/letary/lecodes/runtime/LeCodesRuntime.kt", runtimeKotlinTemplate([]));
   log("");
   log(`${c.green("sdk")}       lecodes-android-sdk ${sdkVersion}${sdk === "latest" ? c.dim("  (android.sdk: latest — re-resolved on every sync)") : c.dim("  (pinned in app.json android.sdk — `lecodes app update` moves it)")}`);
@@ -47681,6 +47747,40 @@ var syncAndroid = async (root, config, prior) => {
   const linkedSdk = shellSdkVersionAndroid(androidDir);
   const sdkPin = process.env.LECODES_ANDROID_SDK ?? config.android?.sdk ?? linkedSdk ?? "latest";
   const sdkVersion = await resolveSdkVersion(sdkPin, linkedSdk, ANDROID_SDK_OPTS);
+  const remotePatterns = config.resources?.remote ?? [];
+  if (!Array.isArray(remotePatterns) || remotePatterns.some((p2) => typeof p2 !== "string")) {
+    throw new CliError('app.json "resources.remote" must be an array of glob strings (e.g. ["videos/**"]).');
+  }
+  const assetsDir = join14(androidDir, "app", "src", "main", "assets");
+  rmrf(assetsDir);
+  mkdirSync8(assetsDir, { recursive: true });
+  let bundleJs;
+  let resources;
+  if (prior) {
+    writeFileSync10(join14(assetsDir, "app.js"), prior.bundleJs);
+    bundleJs = prior.bundleJs;
+    resources = prior.resources;
+  } else {
+    resources = await compileShell({ _: [], flags: { o: join14(assetsDir, "app.js") } }, { remotePatterns });
+    bundleJs = readFileSync13(join14(assetsDir, "app.js"), "utf8");
+  }
+  const requestedVariant = config.android?.variant ?? "auto";
+  if (requestedVariant !== "auto" && !SDK_VARIANTS.includes(requestedVariant)) {
+    throw new CliError(`app.json android.variant must be "auto" or one of ${SDK_VARIANTS.join(", ")} (got "${requestedVariant}").`);
+  }
+  const { variant, detected } = resolveVariant(requestedVariant, bundleJs, "android.variant");
+  let sdkArtifact = variantArtifact(variant);
+  if (sdkArtifact !== "lecodes-sdk" && cmpVersion(sdkVersion, ANDROID_SDK_VARIANTS_MIN) < 0) {
+    warn(`lecodes-android-sdk ${sdkVersion} predates the variant matrix (${ANDROID_SDK_VARIANTS_MIN}) — linking the full lecodes-sdk AAR; run \`lecodes app update\` to pick up variant builds.`);
+    sdkArtifact = "lecodes-sdk";
+  }
+  const WHY = {
+    full: "3D + 2D engines in use",
+    "3d": "3D in use, no 2D",
+    "2d": "2D in use, no 3D",
+    core: "no 3D/2D engine use detected"
+  };
+  log(`${c.green("variant")}   ${variant} → ${sdkArtifact}${requestedVariant === "auto" ? c.dim(`  (auto: ${WHY[detected]})`) : c.dim("  (forced by android.variant)")}`);
   const lockPath = join14(root, "plugins.lock.json");
   const oldLock = readJson(lockPath)?.plugins ?? {};
   const pluginSpecs = Object.entries(config.plugins ?? {});
@@ -47721,7 +47821,7 @@ var syncAndroid = async (root, config, prior) => {
       aarWrapperPaths.push(`:plugins:${module}:libs:${base}`);
     }
     const hasConsumerRules = existsSync13(join14(dest, "consumer-rules.pro"));
-    writeFileSync10(join14(dest, "build.gradle.kts"), pluginBuildGradleTemplate(id, module, namespace, sdkVersion, android.dependencies ?? [], aarNames, hasConsumerRules));
+    writeFileSync10(join14(dest, "build.gradle.kts"), pluginBuildGradleTemplate(id, module, namespace, sdkVersion, android.dependencies ?? [], aarNames, hasConsumerRules, sdkArtifact));
     runtimePlugins.push({ id, module, register });
     newLock[id] = plugin.lock;
     log(`${c.green("plugin")}    ${id}@${plugin.lock.version} (${plugin.lock.tag} → plugins/${module})`);
@@ -47733,23 +47833,6 @@ var syncAndroid = async (root, config, prior) => {
       log(`${c.yellow("removed")}   android/plugins/${entry}  (plugin uninstalled)`);
     }
   }
-  const remotePatterns = config.resources?.remote ?? [];
-  if (!Array.isArray(remotePatterns) || remotePatterns.some((p2) => typeof p2 !== "string")) {
-    throw new CliError('app.json "resources.remote" must be an array of glob strings (e.g. ["videos/**"]).');
-  }
-  const assetsDir = join14(androidDir, "app", "src", "main", "assets");
-  rmrf(assetsDir);
-  mkdirSync8(assetsDir, { recursive: true });
-  let bundleJs;
-  let resources;
-  if (prior) {
-    writeFileSync10(join14(assetsDir, "app.js"), prior.bundleJs);
-    bundleJs = prior.bundleJs;
-    resources = prior.resources;
-  } else {
-    resources = await compileShell({ _: [], flags: { o: join14(assetsDir, "app.js") } }, { remotePatterns });
-    bundleJs = readFileSync13(join14(assetsDir, "app.js"), "utf8");
-  }
   const sdkWhy = sdkPin === "latest" ? "latest" : config.android?.sdk ? "pinned by android.sdk" : "from the shell — set android.sdk or run `lecodes app update`";
   log(`${c.green("sdk")}       lecodes-android-sdk ${sdkVersion}${c.dim(`  (${sdkWhy})`)}`);
   const preload = /^\/\/ preload: (.*)$/m.exec(bundleJs)?.[1].split(";").map((s2) => s2.trim()).filter(Boolean) ?? [];
@@ -47792,7 +47875,7 @@ var syncAndroid = async (root, config, prior) => {
   writeFileSync10(join14(androidDir, "settings.gradle.kts"), settingsGradleTemplate(slugify(config.name ?? basename4(root)), modules, aarWrapperPaths, sdkRepoUrl()));
   writeFileSync10(join14(androidDir, "build.gradle.kts"), rootBuildGradleTemplate([...gradlePlugins].map(([id, version]) => ({ id, version }))));
   writeFileSync10(join14(androidDir, "gradle.properties"), GRADLE_PROPERTIES);
-  writeFileSync10(join14(androidDir, "lecodes-runtime", "build.gradle.kts"), runtimeBuildGradleTemplate(sdkVersion, modules));
+  writeFileSync10(join14(androidDir, "lecodes-runtime", "build.gradle.kts"), runtimeBuildGradleTemplate(sdkVersion, modules, sdkArtifact));
   const runtimeKt = join14(androidDir, "lecodes-runtime", "src", "main", "kotlin", "io", "letary", "lecodes", "runtime", "LeCodesRuntime.kt");
   mkdirSync8(dirname10(runtimeKt), { recursive: true });
   writeFileSync10(runtimeKt, runtimeKotlinTemplate(runtimePlugins, shellUuid));
@@ -47963,6 +48046,9 @@ var doctorAndroidChecks = async (root, config, check) => {
   check(javaMajor >= 17, `JDK ${javaMajor || "not found"}`, "install JDK 17+ (Android Studio ships one)");
   const hasSdkHome = !!(process.env.ANDROID_HOME ?? process.env.ANDROID_SDK_ROOT) || existsSync13(join14(androidDir, "local.properties"));
   check(hasSdkHome, "Android SDK location", "set ANDROID_HOME or create android/local.properties");
+  const requestedVariant = config.android?.variant ?? "auto";
+  const validVariant = requestedVariant === "auto" || SDK_VARIANTS.includes(requestedVariant);
+  check(validVariant, `android.variant "${requestedVariant}"`, `use "auto" or one of ${SDK_VARIANTS.join(", ")}`);
   const wrapperJar = join14(androidDir, "gradle", "wrapper", "gradle-wrapper.jar");
   check(existsSync13(wrapperJar) && statSync2(wrapperJar).size > 0, "Gradle wrapper jar", `run \`gradle wrapper --gradle-version ${GRADLE_VERSION}\` in android/ (or let Android Studio repair it)`);
   check(existsSync13(join14(androidDir, "app", "src", "main", "assets", "app.js")), "Bundled app.js", "run `lecodes app sync`");
@@ -48464,7 +48550,6 @@ Built with LeCodes Desktop ${version}.
 // src/commands/app.ts
 var SDK_REPO = "letary/lecodes-ios-sdk";
 var SDK_MIN_VERSION = "1.2.0";
-var SDK_VARIANTS = ["core", "2d", "3d", "full"];
 var SDK_IDENTITY_VERSION = "1.6.0";
 var shellSdkVersion = (iosDir) => {
   const path2 = join17(iosDir, "LeCodesRuntime", "Package.swift");
@@ -48547,33 +48632,6 @@ var appInit = async (args) => {
   log(`  ${c.bold("open ios/App.xcodeproj")}    then run on your device from Xcode`);
   log(`  App icon: set app.json "icon" to a square ≥1024px image — sync renders every size (or drop a PNG into App/Assets.xcassets/AppIcon.appiconset/)`);
 };
-var detectEngines = (bundleJs) => {
-  const lines = [];
-  for (const line of bundleJs.split(`
-`)) {
-    if (!line.startsWith("//"))
-      break;
-    lines.push(line);
-  }
-  const header = lines.join(`
-`);
-  return { gl: !/^\/\/ gl: disable$/m.test(header), g2: /^\/\/ 2d: enable$/m.test(header) };
-};
-var resolveVariant = (requested, bundleJs) => {
-  const uses = detectEngines(bundleJs);
-  const detected = uses.gl && uses.g2 ? "full" : uses.gl ? "3d" : uses.g2 ? "2d" : "core";
-  if (requested === "auto")
-    return { variant: detected, detected };
-  const variant = requested;
-  const missing = [
-    uses.gl && variant !== "3d" && variant !== "full" ? "3D" : null,
-    uses.g2 && variant !== "2d" && variant !== "full" ? "2D" : null
-  ].filter(Boolean);
-  if (missing.length > 0) {
-    warn(`project uses the ${missing.join(" + ")} engine but ios.variant forces "${variant}" — those scenes won't run on device; remove ios.variant to auto-select "${detected}".`);
-  }
-  return { variant, detected };
-};
 var ensureSdkResourcesBundle = async (sdkVersion) => {
   const override = process.env.LECODES_SDK_RESOURCES;
   if (override) {
@@ -48771,6 +48829,14 @@ var syncIos = async (root, config) => {
   writeFileSync13(join17(iosDir, "App", "Info.plist"), infoPlistTemplate(mergedKeys, updateUrl));
   if (updateUrl)
     log(`${c.green("update")}    OTA source ${updateUrl} — checked natively at launch, new code applies next launch`);
+  else if (!config.update) {
+    let manifest = null;
+    try {
+      manifest = readManifest(root);
+    } catch {}
+    if (manifest)
+      note(`tip: add "update": true to app.json for over-the-air JS updates — ship with \`lecodes push --publish\`, no store release`);
+  }
   if (pluginSpecs.length > 0 || existsSync16(lockPath))
     writeJson(lockPath, { plugins: newLock });
   const pbxPath = join17(iosDir, "App.xcodeproj", "project.pbxproj");
@@ -49086,6 +49152,9 @@ var doctorIosChecks = async (root, config, check) => {
   if (config.update) {
     const plist = readFileSync15(join17(root, "ios", "App", "Info.plist"), "utf8");
     check(plist.includes("<key>LeCodesUpdateURL</key>"), "OTA update URL in Info.plist", "run `lecodes app sync`", false);
+    const appDir = join17(root, "ios", "App");
+    const callsUpdater = readdirSync7(appDir).some((f3) => f3.endsWith(".swift") && readFileSync15(join17(appDir, f3), "utf8").includes("LeCodesUpdater.activeBundle"));
+    check(callsUpdater, "App code launches via LeCodesUpdater", `no App/*.swift calls LeCodesUpdater.activeBundle() — downloaded updates would never run; see "Over-the-air updates" in ios/README.md for the ViewController snippet`, false);
   }
   const asc = readJson(join17(homedir6(), ".lecodes", "asc.json"));
   check(!!asc?.keyPath, "App Store Connect API key configured", "pass --key-path/--key-id/--issuer-id to `lecodes app upload` once to store it", false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lecodes-cli",
-  "version": "0.15.0",
+  "version": "0.16.1",
   "dependencies": {
     "@letary/chisel": "^0.6.0",
     "jimp": "^1.6.1"
@@ -14,8 +14,8 @@
   },
   "peerDependencies": {
     "lecodes-design": "^0.8.0",
-    "lecodes-renderer": "^0.8.2",
-    "lecodes-3d-editor": "^0.2.0"
+    "lecodes-renderer": "^0.8.3",
+    "lecodes-3d-editor": "^0.3.0"
   },
   "bin": {
     "lecodes": "dist/index.js"