lecodes-cli 2.1.0 → 2.1.1

package/dist/index.js

@@ -52,7 +52,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "lecodes-cli",
-    version: "2.1.0",
+    version: "2.1.1",
     dependencies: {
       "@letary/chisel": "^0.13.0",
       jimp: "^1.6.1",
@@ -76,7 +76,7 @@ var init_package = __esm(() => {
     },
     peerDependencies: {
       "lecodes-design": "^0.11.0",
-      "lecodes-headless": "^2.1.0",
+      "lecodes-headless": "^2.1.1",
       "lecodes-3d-editor": "^0.9.0",
       "lecodes-assets": "^0.2.1",
       "heic-decode": "^2.1.0",
@@ -146,7 +146,7 @@ var init_package = __esm(() => {
 });
 
 // ../../sdk/src/version.ts
-var SDK_VERSION = "2.1.0", sdkMajor = (version) => {
+var SDK_VERSION = "2.1.1", sdkMajor = (version) => {
   const m = version?.match(/^(\d+)\.\d+\.\d+/);
   return m ? Number(m[1]) : null;
 }, bundleSdkVersion = (head) => head.slice(0, 2000).match(/^\/\/ sdk: (\d+\.\d+\.\d+\S*)/m)?.[1] ?? null, bundleRunsOn = (bundleVersion, hostVersion) => sdkMajor(bundleVersion) !== null && sdkMajor(bundleVersion) === sdkMajor(hostVersion);
@@ -215995,8 +215995,10 @@ var describeField = (f5) => {
       const fields = Object.entries(m.fields).filter(([k]) => !shown[name] || shown[name].includes(k));
       const described = Object.fromEntries(fields.map(([k, f5]) => [k, describeField(f5)]));
       for (const f5 of files) {
-        if (f5.model === name)
-          described[f5.key] = { kind: "file", optional: false, unique: false, index: false, hasDefault: false, array: f5.array, isId: false };
+        if (f5.model !== name)
+          continue;
+        const declared = db.$given[name]?.fields?.[f5.key]?.def;
+        described[f5.key] = { kind: "file", optional: declared?.optional ?? false, unique: false, index: false, hasDefault: false, array: f5.array, isId: false, ...f5.image ? { image: f5.image } : {} };
       }
       models[name] = { fields: described, ...name === FILE_MODEL ? { files: true } : shown[name] ? { auth: true } : {} };
     }
@@ -217921,6 +217923,15 @@ var resolveVariant = (requested, bundleJs, configKey = "ios.variant") => {
   }
   return { variant, detected };
 };
+var ANDROID_SDK_VARIANTS = [...SDK_VARIANTS, "vulkan"];
+var ANDROID_SDK_VULKAN_MIN = "2.1.0";
+var androidSdkArtifact = (variant, sdkVersion) => {
+  if (variant === "vulkan" && sdkVersion && cmpVersion(sdkVersion, ANDROID_SDK_VULKAN_MIN) < 0) {
+    throw new CliError(`android.variant "vulkan" needs lecodes-android-sdk >= ${ANDROID_SDK_VULKAN_MIN} (pinned: ${sdkVersion}) — run \`lecodes app update\` or set android.sdk.`);
+  }
+  return variant === "full" ? "lecodes-sdk" : `lecodes-sdk-${variant}`;
+};
+var androidVariantEngines = (variant) => variant === "vulkan" ? "full" : variant;
 var VERSION_RE = /^\d+\.\d+\.\d+$/;
 var cmpVersion = (a, b) => {
   const pa = a.split(".").map(Number);
@@ -220005,6 +220016,10 @@ engines the bundle uses and cannot see those, so a project using \`Physics\`,
 \`CharacterController\`, \`NavMesh\` or networking must set \`android.variant: "full"\` in
 \`../app.json\` — otherwise those aspects silently do nothing on device.
 
+\`android.variant: "vulkan"\` links \`lecodes-sdk-vulkan\`: the full engine set with Filament on
+Vulkan (OpenGL ES where the device has no Vulkan 1.1), \`arm64-v8a\` only — for 3D games. Never
+auto-selected; needs lecodes-android-sdk >= 2.1.0.
+
 ## App-local native code
 
 Drop Kotlin files into \`app/src/main/java/\` and register them in \`MainActivity\` after the
@@ -220720,7 +220735,6 @@ if "%OS%"=="Windows_NT" endlocal
 var ANDROID_SDK_REPO = "letary/lecodes-android-sdk";
 var ANDROID_SDK_MIN_VERSION = "2.0.13";
 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" };
@@ -220762,8 +220776,8 @@ var initAndroid = async (opts) => {
   }
   const existing = readJson2(join21(root, "app.json")) ?? {};
   const variant = opts.variant ?? existing.android?.variant ?? "auto";
-  if (variant !== "auto" && !SDK_VARIANTS.includes(variant)) {
-    throw new CliError(`--variant must be auto, ${SDK_VARIANTS.join(", ")} (got "${variant}")`);
+  if (variant !== "auto" && !ANDROID_SDK_VARIANTS.includes(variant)) {
+    throw new CliError(`--variant must be auto, ${ANDROID_SDK_VARIANTS.join(", ")} (got "${variant}")`);
   }
   const sdkFlag = opts.sdk ?? existing.android?.sdk;
   const sdkVersion = await resolveSdkVersion(process.env.LECODES_ANDROID_SDK ?? sdkFlag ?? "latest", null, ANDROID_SDK_OPTS);
@@ -220824,7 +220838,7 @@ var initAndroid = async (opts) => {
   write("app/src/main/res/values/strings.xml", stringsXmlTemplate(name));
   write("app/src/main/res/drawable/ic_launcher.xml", IC_LAUNCHER_XML);
   const initVariant = variant === "auto" ? "core" : variant;
-  const initArtifact = cmpVersion(sdkVersion, ANDROID_SDK_VARIANTS_MIN) >= 0 ? variantArtifact(initVariant) : "lecodes-sdk";
+  const initArtifact = cmpVersion(sdkVersion, ANDROID_SDK_VARIANTS_MIN) >= 0 ? androidSdkArtifact(initVariant, sdkVersion) : "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("");
@@ -220868,11 +220882,12 @@ var syncAndroid = async (root, config, prior) => {
     bundleJs = readFileSync18(join21(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}").`);
+  if (requestedVariant !== "auto" && !ANDROID_SDK_VARIANTS.includes(requestedVariant)) {
+    throw new CliError(`app.json android.variant must be "auto" or one of ${ANDROID_SDK_VARIANTS.join(", ")} (got "${requestedVariant}").`);
   }
-  const { variant, detected } = resolveVariant(requestedVariant, bundleJs, "android.variant");
-  let sdkArtifact = variantArtifact(variant);
+  const { variant: covered, detected } = resolveVariant(requestedVariant === "auto" ? "auto" : androidVariantEngines(requestedVariant), bundleJs, "android.variant");
+  const variant = requestedVariant === "vulkan" ? "vulkan" : covered;
+  let sdkArtifact = androidSdkArtifact(variant, sdkVersion);
   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";
@@ -221502,8 +221517,8 @@ var doctorAndroidChecks = async (root, config, check) => {
   const hasSdkHome = !!(process.env.ANDROID_HOME ?? process.env.ANDROID_SDK_ROOT) || existsSync19(join21(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 validVariant = requestedVariant === "auto" || ANDROID_SDK_VARIANTS.includes(requestedVariant);
+  check(validVariant, `android.variant "${requestedVariant}"`, `use "auto" or one of ${ANDROID_SDK_VARIANTS.join(", ")}`);
   const wrapperJar = join21(androidDir, "gradle", "wrapper", "gradle-wrapper.jar");
   check(existsSync19(wrapperJar) && statSync5(wrapperJar).size > 0, "Gradle wrapper jar", `run \`gradle wrapper --gradle-version ${GRADLE_VERSION}\` in android/ (or let Android Studio repair it)`);
   check(existsSync19(join21(androidDir, "app", "src", "main", "assets", "app.js")), "Bundled app.js", "run `lecodes app sync`");
@@ -222821,7 +222836,7 @@ var init = defineCommand({
     "bundle-id": str("iOS bundle identifier (default com.example.<slug>)", { value: "<id>" }),
     "app-id": str("Android applicationId (default com.example.<slug>)", { value: "<id>" }),
     team: str("Apple development team id", { value: "<id>" }),
-    variant: str("SDK variant: auto (default — sync picks the smallest of core/2d/3d/full covering what the bundle uses), or one of those to pin", { value: "<v>" }),
+    variant: str("SDK variant: auto (default — sync picks the smallest of core/2d/3d/full covering what the bundle uses), or one of those to pin; Android also vulkan (full on Vulkan, arm64 only)", { value: "<v>" }),
     sdk: str("native SDK release (default: the newest one, pinned in app.json); 'latest' floats it — every sync re-resolves", { value: "<v|latest>" }),
     fullscreen: bool("(desktop) borderless fullscreen on the primary monitor — kiosks")
   },

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "lecodes-cli",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "dependencies": {
     "@letary/chisel": "^0.13.0",
     "jimp": "^1.6.1",
-    "lecodes-sdk": "2.1.0"
+    "lecodes-sdk": "2.1.1"
   },
   "devDependencies": {
     "lecodes-design": "https://storage.yandexcloud.net/le-codes/releases/packages/lecodes-design/lecodes-design-0.11.0.tgz",
-    "lecodes-headless": "2.1.0",
+    "lecodes-headless": "2.1.1",
     "qrcode-terminal": "^0.12.0",
     "lecodes-3d-editor": "https://storage.yandexcloud.net/le-codes/releases/packages/lecodes-3d-editor/lecodes-3d-editor-0.9.0.tgz",
     "lecodes-assets": "0.2.1",
     "lecodes-creator-nav": "0.19.0",
-    "lecodes-gl-lite": "2.1.0",
-    "lecodes-web-frame": "2.1.0",
-    "lecodes-web-player": "2.1.0",
-    "lecodes-web-shared": "2.1.0",
+    "lecodes-gl-lite": "2.1.1",
+    "lecodes-web-frame": "2.1.1",
+    "lecodes-web-player": "2.1.1",
+    "lecodes-web-shared": "2.1.1",
     "lecodes-web-lite": "2.0.2",
     "heic-decode": "^2.1.0",
     "marcidb-embedded": "^0.14.1",
@@ -24,7 +24,7 @@
   },
   "peerDependencies": {
     "lecodes-design": "^0.11.0",
-    "lecodes-headless": "^2.1.0",
+    "lecodes-headless": "^2.1.1",
     "lecodes-3d-editor": "^0.9.0",
     "lecodes-assets": "^0.2.1",
     "heic-decode": "^2.1.0",