lecodes-cli 0.8.0 → 0.8.1

package/dist/index.js

@@ -2007,7 +2007,7 @@ var require_main = __commonJS((exports, module) => {
 // package.json
 var package_default = {
   name: "lecodes-cli",
-  version: "0.8.0",
+  version: "0.8.1",
   description: "Clone, edit and push LeCodes projects from your machine.",
   type: "module",
   license: "MIT",
@@ -3484,8 +3484,9 @@ var runtimePackageTemplate = (sdkVersion, variant, plugins) => {
   return `// swift-tools-version:5.9
 //
 // GENERATED by lecodes — regenerated by \`lecodes app sync\`; do not edit.
-// Owns the app's native dependency graph: the LeCodesSDK variant (app.json ios.variant)
-// and one vendored target per installed plugin (see plugins.lock.json).
+// Owns the app's native dependency graph: the LeCodesSDK variant (auto-picked from what
+// the compiled bundle uses, or forced via app.json ios.variant) and one vendored target
+// per installed plugin (see plugins.lock.json).
 
 import PackageDescription
 
@@ -3570,6 +3571,14 @@ CLI-owned — regenerated on every sync, hand edits are overwritten:
 - the version values inside \`App.xcodeproj/project.pbxproj\` (from app.json)
 - this README
 
+## SDK variant
+
+Sync links the smallest SDK product that covers what the compiled bundle actually uses:
+\`core\` (UI only), \`2d\` (+ 2D engine with physics), \`3d\` (+ 3D/AR engine with physics,
+~17 MB heavier), or \`full\` (everything). Adding your first 3D scene or 2D game to the
+project switches it automatically on the next sync; set \`ios.variant\` in \`../app.json\`
+to pin one instead.
+
 ## Config
 
 Identity lives in \`../app.json\` (name, version, plugins, ios.bundleId / teamId / variant /
@@ -3578,7 +3587,8 @@ buildNumber) — edit it there, then re-run \`lecodes app sync\`. Plugins are ma
 `;
 
 // src/commands/app.ts
-var SDK_PACKAGE_VERSION = "1.0.4";
+var SDK_PACKAGE_VERSION = "1.1.0";
+var SDK_VARIANTS = ["core", "2d", "3d", "full"];
 var FIRST_PARTY_PLUGINS = {
   camera: "letary/lecodes-plugins",
   "qr-scanner": "letary/lecodes-plugins"
@@ -3679,7 +3689,7 @@ var slugify = (s) => s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+
 var appInit = async (args) => {
   const platform = args._[1];
   if (platform !== "ios") {
-    throw new CliError(platform ? `Unsupported platform "${platform}" — only "ios" for now.` : "Usage: lecodes app init ios [--name <display name>] [--bundle-id <id>] [--team <team id>] [--variant core|full]");
+    throw new CliError(platform ? `Unsupported platform "${platform}" — only "ios" for now.` : "Usage: lecodes app init ios [--name <display name>] [--bundle-id <id>] [--team <team id>] [--variant auto|core|2d|3d|full]");
   }
   const root = projectRoot();
   const iosDir = join11(root, "ios");
@@ -3687,9 +3697,10 @@ var appInit = async (args) => {
     throw new CliError("ios/ already exists — run `lecodes app sync` to update it.");
   }
   const existing = readJson(join11(root, "app.json")) ?? {};
-  const variant = flagStr(args, "variant") ?? existing.ios?.variant ?? "core";
-  if (variant !== "core" && variant !== "full")
-    throw new CliError(`--variant must be "core" or "full" (got "${variant}")`);
+  const variant = flagStr(args, "variant") ?? existing.ios?.variant ?? "auto";
+  if (variant !== "auto" && !SDK_VARIANTS.includes(variant)) {
+    throw new CliError(`--variant must be auto, ${SDK_VARIANTS.join(", ")} (got "${variant}")`);
+  }
   const name = flagStr(args, "name") ?? existing.name ?? basename4(root);
   const config = {
     ...existing,
@@ -3739,7 +3750,7 @@ ios/
   write("App/Assets.xcassets/Contents.json", ASSETS_ROOT_JSON);
   write("App/Assets.xcassets/AccentColor.colorset/Contents.json", ACCENT_COLOR_JSON);
   write("App/Assets.xcassets/AppIcon.appiconset/Contents.json", APP_ICON_JSON);
-  write("LeCodesRuntime/Package.swift", runtimePackageTemplate(SDK_PACKAGE_VERSION, variant, []));
+  write("LeCodesRuntime/Package.swift", runtimePackageTemplate(SDK_PACKAGE_VERSION, variant === "auto" ? "core" : variant, []));
   write("LeCodesRuntime/Sources/LeCodesRuntime/LeCodesRuntime.swift", runtimeSwiftTemplate([]));
   log("");
   success(`iOS shell for ${c.bold(name)} ready.`);
@@ -3747,6 +3758,57 @@ ios/
   log(`  ${c.bold("open ios/App.xcodeproj")}    then run on your device from Xcode`);
   log(`  App icon: drop a 1024×1024 PNG into ios/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 () => {
+  const override = process.env.LECODES_SDK_RESOURCES;
+  if (override) {
+    note(`Using local resources bundle ${override} (LECODES_SDK_RESOURCES)`);
+    return resolve2(override);
+  }
+  const dir = join11(homedir2(), ".lecodes", "sdk-resources", SDK_PACKAGE_VERSION);
+  const bundle = join11(dir, "LeCodesSDKResources.bundle");
+  if (existsSync8(bundle))
+    return bundle;
+  const url = `https://github.com/letary/lecodes-ios-sdk/releases/download/${SDK_PACKAGE_VERSION}/LeCodesSDKResources.bundle.zip`;
+  note(`Downloading LeCodesSDKResources.bundle (SDK ${SDK_PACKAGE_VERSION})…`);
+  const res = await fetch(url);
+  if (!res.ok)
+    throw new CliError(`Resources bundle download failed (HTTP ${res.status}) — ${url}`);
+  mkdirSync5(dir, { recursive: true });
+  const zip = join11(dir, "LeCodesSDKResources.bundle.zip");
+  writeFileSync7(zip, new Uint8Array(await res.arrayBuffer()));
+  execFileSync("ditto", ["-x", "-k", zip, dir]);
+  rmSync(zip);
+  if (!existsSync8(bundle))
+    throw new CliError(`No LeCodesSDKResources.bundle inside the release asset ${url}`);
+  return bundle;
+};
 var appSync = async (_args) => {
   const root = projectRoot();
   const config = readJson(join11(root, "app.json"));
@@ -3754,7 +3816,10 @@ var appSync = async (_args) => {
   if (!config?.ios || !existsSync8(iosDir)) {
     throw new CliError("No iOS shell here — run `lecodes app init ios` first.");
   }
-  const variant = config.ios.variant === "full" ? "full" : "core";
+  const requestedVariant = config.ios.variant ?? "auto";
+  if (requestedVariant !== "auto" && !SDK_VARIANTS.includes(requestedVariant)) {
+    throw new CliError(`app.json ios.variant must be "auto" or one of ${SDK_VARIANTS.join(", ")} (got "${requestedVariant}").`);
+  }
   const lockPath = join11(root, "plugins.lock.json");
   const oldLock = readJson(lockPath)?.plugins ?? {};
   const pluginSpecs = Object.entries(config.plugins ?? {});
@@ -3789,18 +3854,6 @@ var appSync = async (_args) => {
       log(`${c.yellow("removed")}   ios/LeCodesRuntime/Sources/${entry}  (plugin uninstalled)`);
     }
   }
-  writeFileSync7(join11(iosDir, "README.md"), IOS_README);
-  writeFileSync7(join11(iosDir, "LeCodesRuntime", "Package.swift"), runtimePackageTemplate(SDK_PACKAGE_VERSION, variant, runtimePlugins));
-  writeFileSync7(join11(sourcesDir, "LeCodesRuntime", "LeCodesRuntime.swift"), runtimeSwiftTemplate(runtimePlugins));
-  const mergedKeys = {};
-  for (const [key, values] of Object.entries(infoValues))
-    mergedKeys[key] = [...new Set(values)].join(" ");
-  writeFileSync7(join11(iosDir, "App", "Info.plist"), infoPlistTemplate(mergedKeys));
-  if (pluginSpecs.length > 0 || existsSync8(lockPath))
-    writeJson(lockPath, { plugins: newLock });
-  const pbxPath = join11(iosDir, "App.xcodeproj", "project.pbxproj");
-  const pbx = readFileSync10(pbxPath, "utf8").replace(/MARKETING_VERSION = [^;]+;/g, `MARKETING_VERSION = ${config.version ?? "1.0.0"};`).replace(/CURRENT_PROJECT_VERSION = [^;]+;/g, `CURRENT_PROJECT_VERSION = ${config.ios.buildNumber ?? 1};`);
-  writeFileSync7(pbxPath, pbx);
   const remotePatterns = config.resources?.remote ?? [];
   if (!Array.isArray(remotePatterns) || remotePatterns.some((p) => typeof p !== "string")) {
     throw new CliError('app.json "resources.remote" must be an array of glob strings (e.g. ["videos/**"]).');
@@ -3810,6 +3863,23 @@ var appSync = async (_args) => {
   mkdirSync5(resourcesDir, { recursive: true });
   const resources = await compileShell({ _: [], flags: { o: join11(resourcesDir, "app.js") } }, { remotePatterns });
   const bundleJs = readFileSync10(join11(resourcesDir, "app.js"), "utf8");
+  const { variant, detected } = resolveVariant(requestedVariant, bundleJs);
+  const WHY = {
+    core: "UI only",
+    "2d": "uses the 2D engine",
+    "3d": "uses the 3D engine",
+    full: "uses the 3D + 2D engines"
+  };
+  log(`${c.green("variant")}   ${variant}${requestedVariant === "auto" ? ` (auto: ${WHY[detected]})` : " (forced by ios.variant)"}`);
+  const sdkProvided = new Set;
+  if (variant === "3d" || variant === "full") {
+    const sdkResources = await ensureSdkResourcesBundle();
+    cpSync(sdkResources, join11(resourcesDir, "LeCodesSDKResources.bundle"), { recursive: true });
+    for (const f2 of readdirSync4(sdkResources))
+      if (f2 !== "Info.plist")
+        sdkProvided.add(f2);
+    log(`${c.green("resources")} LeCodesSDKResources.bundle (filament) → ios/App/Resources/`);
+  }
   const preload = /^\/\/ preload: (.*)$/m.exec(bundleJs)?.[1].split(";").map((s) => s.trim()).filter(Boolean) ?? [];
   const IMPLICIT_PRELOADS = new Set(["uberarchive", "capture"]);
   const byName = new Map;
@@ -3826,7 +3896,8 @@ var appSync = async (_args) => {
       continue;
     const candidates = byName.get(name) ?? [];
     if (candidates.length === 0) {
-      warn(`bundle needs local asset "${name}" but no project file provides it — it won't load on device`);
+      if (!sdkProvided.has(name))
+        warn(`bundle needs local asset "${name}" but no project file provides it — it won't load on device`);
       continue;
     }
     if (candidates.length > 1)
@@ -3839,6 +3910,18 @@ var appSync = async (_args) => {
   const streamed = resources.filter((r) => r.remote);
   if (streamed.length > 0)
     log(`${c.green("remote")}    ${streamed.length} resource(s) stay on the server (resources.remote): ${streamed.map((r) => r.path).join(", ")}`);
+  writeFileSync7(join11(iosDir, "README.md"), IOS_README);
+  writeFileSync7(join11(iosDir, "LeCodesRuntime", "Package.swift"), runtimePackageTemplate(SDK_PACKAGE_VERSION, variant, runtimePlugins));
+  writeFileSync7(join11(sourcesDir, "LeCodesRuntime", "LeCodesRuntime.swift"), runtimeSwiftTemplate(runtimePlugins));
+  const mergedKeys = {};
+  for (const [key, values] of Object.entries(infoValues))
+    mergedKeys[key] = [...new Set(values)].join(" ");
+  writeFileSync7(join11(iosDir, "App", "Info.plist"), infoPlistTemplate(mergedKeys));
+  if (pluginSpecs.length > 0 || existsSync8(lockPath))
+    writeJson(lockPath, { plugins: newLock });
+  const pbxPath = join11(iosDir, "App.xcodeproj", "project.pbxproj");
+  const pbx = readFileSync10(pbxPath, "utf8").replace(/MARKETING_VERSION = [^;]+;/g, `MARKETING_VERSION = ${config.version ?? "1.0.0"};`).replace(/CURRENT_PROJECT_VERSION = [^;]+;/g, `CURRENT_PROJECT_VERSION = ${config.ios.buildNumber ?? 1};`);
+  writeFileSync7(pbxPath, pbx);
   log("");
   success(`Shell synced: app.js + ${runtimePlugins.length} plugin(s), variant ${variant}, v${config.version ?? "1.0.0"} (${config.ios.buildNumber ?? 1}).`);
   note("Build & run from Xcode (open ios/App.xcodeproj) — user files in ios/App/*.swift were not touched.");
@@ -3949,6 +4032,16 @@ var appDoctor = async (_args) => {
   check(hasIcon, "App icon present", "drop a 1024×1024 PNG into ios/App/Assets.xcassets/AppIcon.appiconset/ (App Store requires it)", false);
   const bundle = join11(root, "ios", "App", "Resources", "app.js");
   check(existsSync8(bundle), "Bundled app.js", "run `lecodes app sync`");
+  const requestedVariant = config.ios.variant ?? "auto";
+  const validVariant = requestedVariant === "auto" || SDK_VARIANTS.includes(requestedVariant);
+  check(validVariant, `ios.variant "${requestedVariant}"`, `use "auto" or one of ${SDK_VARIANTS.join(", ")}`);
+  if (existsSync8(bundle) && validVariant) {
+    const { variant } = resolveVariant(requestedVariant, readFileSync10(bundle, "utf8"));
+    const pkg = readFileSync10(join11(root, "ios", "LeCodesRuntime", "Package.swift"), "utf8");
+    const needsResources = variant === "3d" || variant === "full";
+    const hasResources = existsSync8(join11(root, "ios", "App", "Resources", "LeCodesSDKResources.bundle"));
+    check(pkg.includes(`"LeCodesSDK-${variant}"`) && (!needsResources || hasResources), `SDK variant ${variant}${needsResources ? " (+ filament resources)" : ""}`, "run `lecodes app sync`");
+  }
   const lock = readJson(join11(root, "plugins.lock.json"))?.plugins ?? {};
   const wanted = Object.keys(config.plugins ?? {});
   const inSync = wanted.every((id) => lock[id]) && Object.keys(lock).every((id) => wanted.includes(id));
@@ -7211,11 +7304,14 @@ ${c.bold("Commands:")}
                                   --name <s>         display name (default: app.json / folder name)
                                   --bundle-id <id>   iOS bundle identifier
                                   --team <id>        Apple development team id
-                                  --variant <v>      SDK variant: core (default) or full (3D/AR)
+                                  --variant <v>      SDK variant: auto (default — sync picks the
+                                                     smallest of core/2d/3d/full covering what
+                                                     the bundle uses), or one of those to pin
   app sync                      Make the shell match the project: compile the bundle + embed
                                   its assets into ios/App/Resources/ (offline by default, also
                                   for server projects; app.json "resources": {"remote": [globs]}
-                                  keeps heavy assets streaming from the server), vendor app.json
+                                  keeps heavy assets streaming from the server), pick the SDK
+                                  variant from the bundle's engine use, vendor app.json
                                   plugins (pinned in plugins.lock.json), regenerate the
                                   CLI-owned shell files
   app plugin <list|add|remove>  Manage native plugins in app.json (then run 'lecodes app sync')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lecodes-cli",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Clone, edit and push LeCodes projects from your machine.",
   "type": "module",
   "license": "MIT",