lecodes-cli 2.2.6 → 2.2.8

package/dist/index.js

@@ -52,7 +52,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "lecodes-cli",
-    version: "2.2.6",
+    version: "2.2.8",
     dependencies: {
       "@letary/chisel": "^0.14.0",
       jimp: "^1.6.1",
@@ -76,7 +76,7 @@ var init_package = __esm(() => {
     },
     peerDependencies: {
       "lecodes-design": "^0.11.0",
-      "lecodes-headless": "^2.2.6",
+      "lecodes-headless": "^2.2.8",
       "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.2.6", sdkMajor = (version) => {
+var SDK_VERSION = "2.2.8", 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);
@@ -1703,7 +1703,9 @@ var init_chisel = __esm(() => {
         "NativeView",
         "CameraView",
         "MapView",
-        "QRScanner"
+        "QRScanner",
+        "WebView",
+        "RTCVideoView"
       ],
       containers: ["UIColumn", "UIRow", "UIBox", "UIButton", "UIScrollable", "UIScreen", "UIWidget"],
       text: "UIText",
@@ -217963,7 +217965,19 @@ var FIRST_PARTY_PLUGINS = {
   "qr-scanner": "letary/lecodes-plugins",
   map: "letary/lecodes-plugins",
   geolocation: "letary/lecodes-plugins",
-  push: "letary/lecodes-plugins"
+  push: "letary/lecodes-plugins",
+  browser: "letary/lecodes-plugins"
+};
+var urlSchemeOf = (config) => {
+  const scheme = config?.urlScheme;
+  if (scheme === undefined)
+    return;
+  if (typeof scheme !== "string" || !/^[a-z][a-z0-9+.-]*$/.test(scheme)) {
+    throw new CliError(`app.json "urlScheme" must be lowercase letters, digits, "+", "-" or ".", starting with a letter — got ${JSON.stringify(scheme)}.`);
+  }
+  if (scheme === "http" || scheme === "https")
+    throw new CliError(`app.json "urlScheme" is the app's OWN scheme ("myshop" → myshop://…), not ${scheme}.`);
+  return scheme;
 };
 var readAppConfigAt = (root) => readJson2(join18(root, "app.json"));
 var DESKTOP_DEFAULT_WINDOW = { width: 1280, height: 720 };
@@ -218887,11 +218901,30 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             LeCodesAppHooks.coldStartNotification(response)
         }
 
+        let controller = ViewController()
+        // Cold-started by a link (app.json "urlScheme", or a universal link): the engine reads it as
+        // app.launchUrl — set BEFORE the view loads, which boots the JS world.
+        if let url = connectionOptions.urlContexts.first?.url
+            ?? connectionOptions.userActivities.first(where: { $0.activityType == NSUserActivityTypeBrowsingWeb })?.webpageURL {
+            controller.engine.setLaunchUrl(url.absoluteString)
+        }
         let window = UIWindow(windowScene: windowScene)
-        window.rootViewController = ViewController()
+        window.rootViewController = controller
         self.window = window
         window.makeKeyAndVisible()
     }
+
+    // A link while the app runs: the "url" app event (an OAuth redirect back into the app, a
+    // checkout's return — what Browser.open(url, { returnUrl }) resolves on).
+    func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
+        guard let url = URLContexts.first?.url else { return }
+        (window?.rootViewController as? ViewController)?.engine.emitUrl(url.absoluteString)
+    }
+
+    func scene(_ scene: UIScene, continue userActivity: NSUserActivity) {
+        guard userActivity.activityType == NSUserActivityTypeBrowsingWeb, let url = userActivity.webpageURL else { return }
+        (window?.rootViewController as? ViewController)?.engine.emitUrl(url.absoluteString)
+    }
 }
 `;
 var VIEW_CONTROLLER = `//
@@ -218952,9 +218985,22 @@ ${body}</dict>
 </plist>
 `;
 };
-var infoPlistTemplate = (pluginKeys, updateUrl) => {
+var infoPlistTemplate = (pluginKeys, updateUrl, urlScheme) => {
   const xml = (s) => s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
   const keys = Object.keys(pluginKeys).sort();
+  const schemeBlock = !urlScheme ? "" : `
+	<!-- lecodes:urlScheme — app.json "urlScheme": links the app opens on (the "url" app event) -->
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>${xml(urlScheme)}</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>${xml(urlScheme)}</string>
+			</array>
+		</dict>
+	</array>`;
   const pluginBlock = keys.length === 0 ? "" : `
 	<!-- lecodes:plugins — merged from installed plugin manifests by \`lecodes app sync\` -->
 ${keys.map((k) => `	<key>${k}</key>
@@ -218972,7 +219018,7 @@ ${keys.map((k) => `	<key>${k}</key>
 	     so App Store Connect skips the "Missing Compliance" prompt on every build.
 	     Flip to <true/> only if the app adds its own non-exempt cryptography. -->
 	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
+	<false/>${schemeBlock}
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
@@ -220359,7 +220405,16 @@ var APP_PROGUARD_RULES = `# R8 rules for app-local code (yours — \`lecodes app
 # reflection, e.g.
 #   -keep class com.example.myapp.MyBridge { *; }
 `;
-var appManifestTemplate = () => `<?xml version="1.0" encoding="utf-8"?>
+var urlSchemeFilter = (urlScheme) => !urlScheme ? "" : `
+            <!-- lecodes:urlScheme — app.json "urlScheme": links the app opens on (the "url" app event) -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="${urlScheme}" />
+            </intent-filter>
+            <!-- /lecodes:urlScheme -->`;
+var appManifestTemplate = (urlScheme) => `<?xml version="1.0" encoding="utf-8"?>
 <!-- Generated by \`lecodes app init\` — yours to edit. Sync leaves it alone, except that with
      app.json "icon" set it restamps the android:icon VALUE to the generated @mipmap set.
      Plugin permissions/services arrive through the plugin modules' own manifests via the AGP
@@ -220384,7 +220439,7 @@ var appManifestTemplate = () => `<?xml version="1.0" encoding="utf-8"?>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+            </intent-filter>${urlSchemeFilter(urlScheme)}
         </activity>
     </application>
 
@@ -221010,7 +221065,7 @@ var initAndroid = async (opts) => {
     write("gradle/wrapper/gradle-wrapper.jar", wrapperJar);
   write("app/build.gradle.kts", appBuildGradleTemplate(identity, config.android.minify ?? true));
   write("app/proguard-rules.pro", APP_PROGUARD_RULES);
-  write("app/src/main/AndroidManifest.xml", appManifestTemplate());
+  write("app/src/main/AndroidManifest.xml", appManifestTemplate(urlSchemeOf(config)));
   write(`app/src/main/java/${pkgPath}/MainActivity.kt`, mainActivityTemplate(identity.applicationId));
   write(`app/src/main/java/${pkgPath}/AppViewModel.kt`, appViewModelTemplate(identity.applicationId));
   write("app/src/main/res/values/themes.xml", themesXmlTemplate());
@@ -221188,10 +221243,36 @@ var syncAndroid = async (root, config, prior) => {
     await writeAndroidIcons(androidDir, await loadIconMaster(root, config));
     restampManifestIcon(androidDir);
   }
+  restampManifestUrlScheme(androidDir, urlSchemeOf(config));
   log("");
   success(`Android shell synced: app.js + ${runtimePlugins.length} plugin(s), SDK ${sdkVersion}, v${config.version ?? "1.0.0"} (${config.android?.versionCode ?? 1}).`);
   note("Build & run from Android Studio (`lecodes app open android`) — user files in android/app/ were not touched.");
 };
+var restampManifestUrlScheme = (androidDir, urlScheme) => {
+  const path2 = join21(androidDir, "app", "src", "main", "AndroidManifest.xml");
+  if (!existsSync19(path2))
+    return;
+  const content = readFileSync18(path2, "utf8");
+  const tagged = /\n[ \t]*<!-- lecodes:urlScheme[\s\S]*?<!-- \/lecodes:urlScheme -->/;
+  const block = urlSchemeFilter(urlScheme);
+  let next;
+  if (tagged.test(content))
+    next = content.replace(tagged, block);
+  else if (!urlScheme)
+    return;
+  else {
+    const launcher = /(<category android:name="android\.intent\.category\.LAUNCHER" \/>\s*<\/intent-filter>)/;
+    if (!launcher.test(content)) {
+      warn(`couldn't find the launcher activity in app/src/main/AndroidManifest.xml — add an intent-filter for the "${urlScheme}" scheme yourself.`);
+      return;
+    }
+    next = content.replace(launcher, `$1${block}`);
+  }
+  if (next === content)
+    return;
+  writeFileSync14(path2, next);
+  log(`${c.green("updated")}   android/app/src/main/AndroidManifest.xml: urlScheme ${urlScheme ? `→ ${urlScheme}://` : "removed"}`);
+};
 var restampAppBuildGradle = (androidDir, config, gradlePlugins) => {
   const path2 = join21(androidDir, "app", "build.gradle.kts");
   if (!existsSync19(path2)) {
@@ -222692,7 +222773,7 @@ var buildDesktop = async (flags) => {
     localShaders: true,
     desktopRenderer: renderer
   });
-  const wanted = new Set([...js.matchAll(/fetchLocal\("([^"]+)"\)/g)].map((m) => m[1]));
+  const wanted = new Set([...js.matchAll(/(?:fetchLocal|_creatorFetch\.local)\("([^"]+)"\)/g)].map((m) => m[1]));
   const shipped = resources.filter((r2) => !r2.remote && (r2.shader || wanted.has(r2.name)));
   const byName = new Map;
   for (const r2 of resources) {
@@ -222991,7 +223072,7 @@ var initIos = async (opts) => {
   write("App/AppDelegate.swift", APP_DELEGATE);
   write("App/SceneDelegate.swift", SCENE_DELEGATE);
   write("App/ViewController.swift", VIEW_CONTROLLER);
-  write("App/Info.plist", infoPlistTemplate({}));
+  write("App/Info.plist", infoPlistTemplate({}, undefined, urlSchemeOf(config)));
   write("App/App.entitlements", entitlementsTemplate({}));
   write("App/Base.lproj/LaunchScreen.storyboard", LAUNCH_STORYBOARD);
   write("App/Assets.xcassets/Contents.json", ASSETS_ROOT_JSON);
@@ -223178,7 +223259,7 @@ var syncIos = async (root, config) => {
   for (const [key, values] of Object.entries(infoValues))
     mergedKeys[key] = [...new Set(values)].join(" ");
   const updateUrl = resolveUpdateUrl(config.update, root, sdkVersion);
-  writeFileSync18(join25(iosDir, "App", "Info.plist"), infoPlistTemplate(mergedKeys, updateUrl));
+  writeFileSync18(join25(iosDir, "App", "Info.plist"), infoPlistTemplate(mergedKeys, updateUrl, urlSchemeOf(config)));
   if (updateUrl)
     log(`${c.green("update")}    OTA source ${updateUrl} — checked natively at launch, new code applies next launch${config.update === undefined ? c.dim('  ("update": false in app.json turns it off)') : ""}`);
   else if (config.update === false)
@@ -223240,7 +223321,7 @@ var sync2 = defineCommand({
   usage: "[ios|android]",
   description: `Compiles the bundle and embeds the assets it references (ios/App/Resources/ resp. the android assets/; offline by default, also for server projects — app.json "resources": {"remote": [globs]} keeps heavy assets streaming), picks the SDK variant from the bundle's engine use, vendors the app.json plugins (pinned in plugins.lock.json) and regenerates the CLI-owned shell files. User files (ios/App/*.swift, android/app/) are never touched.
 
-Native OTA JS updates at launch (both shells; the current launch runs the newest LOCAL bundle, a download applies on the next): on by default for a pushed project (its bundle on the platform, the launcher's own URL), app.json "update": {"url": …} for custom hosting, "update": false turns it off. A download runs only when it is of the shell's SDK major and not older than the bundle running. app.json "icon" (a square ≥1024px image) renders the app icons every sync ("iconBackground": the adaptive / flatten backdrop). No platform = every shell that exists; a dual-shell project compiles once.`,
+Native OTA JS updates at launch (both shells; the current launch runs the newest LOCAL bundle, a download applies on the next): on by default for a pushed project (its bundle on the platform, the launcher's own URL), app.json "update": {"url": …} for custom hosting, "update": false turns it off. A download runs only when it is of the shell's SDK major and not older than the bundle running. app.json "icon" (a square ≥1024px image) renders the app icons every sync ("iconBackground": the adaptive / flatten backdrop). app.json "urlScheme" ("myshop") is the scheme the shells open on: iOS CFBundleURLTypes, Android a BROWSABLE intent-filter — a link arrives as app.launchUrl / the "url" event (the return of Browser.open with a returnUrl). No platform = every shell that exists; a dual-shell project compiles once.`,
   examples: ["lecodes app sync", "lecodes app sync android"],
   run: ({ args }) => runSync(args[0])
 });

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "lecodes-cli",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "dependencies": {
     "@letary/chisel": "^0.14.0",
     "jimp": "^1.6.1",
-    "lecodes-sdk": "2.2.6"
+    "lecodes-sdk": "2.2.8"
   },
   "devDependencies": {
     "lecodes-design": "https://storage.yandexcloud.net/le-codes/releases/packages/lecodes-design/lecodes-design-0.11.0.tgz",
-    "lecodes-headless": "2.2.6",
+    "lecodes-headless": "2.2.8",
     "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.2.6",
-    "lecodes-web-frame": "2.2.6",
-    "lecodes-web-player": "2.2.6",
-    "lecodes-web-shared": "2.2.6",
+    "lecodes-gl-lite": "2.2.8",
+    "lecodes-web-frame": "2.2.8",
+    "lecodes-web-player": "2.2.8",
+    "lecodes-web-shared": "2.2.8",
     "lecodes-web-lite": "2.0.2",
     "heic-decode": "^2.1.0",
     "marcidb-embedded": "^0.15.0",
@@ -24,7 +24,7 @@
   },
   "peerDependencies": {
     "lecodes-design": "^0.11.0",
-    "lecodes-headless": "^2.2.6",
+    "lecodes-headless": "^2.2.8",
     "lecodes-3d-editor": "^0.9.0",
     "lecodes-assets": "^0.2.1",
     "heic-decode": "^2.1.0",