@osmo.inc/cli-linux-arm64 0.1.23 → 0.1.24

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.23",
+  "version": "0.1.24",
   "type": "module",
   "files": [
     "dist",

package/release.json

@@ -1,37 +1,37 @@
 {
-  "version": "0.1.23",
+  "version": "0.1.24",
   "package": "@osmo.inc/cli-linux-arm64",
   "platform": "linux-arm64",
   "channel": "latest",
-  "sourceCommit": "e865c900aafb496ce6520ab1308f911087337ccf",
+  "sourceCommit": "b56598df0b36200ac57715d4282924ec5bf931cd",
   "sourceDirty": false,
   "signing": "unsigned",
   "licenseFileIncluded": false,
-  "dependencyCount": 298,
+  "dependencyCount": 308,
   "nativeDefaultFeatures": false,
   "contents": {
-    "totalBytes": 62403892,
-    "fileCount": 1929,
+    "totalBytes": 63522234,
+    "fileCount": 1978,
     "groups": {
-      "studio": 19627240,
-      "vendor": 18626061,
+      "studio": 20080257,
+      "vendor": 18779297,
       "node_modules/typescript": 9913238,
       "node_modules/zod": 6140311,
-      "third-party": 4941579,
-      "src": 2622428,
-      "dist": 373939,
-      "runtime": 157161,
+      "third-party": 5144253,
+      "src": 2622446,
+      "dist": 486515,
+      "runtime": 353982,
       "THIRD_PARTY_NOTICES.md": 1090,
       "package.json": 845
     },
     "largestFiles": [
       {
         "path": "vendor/osmo-lite",
-        "bytes": 18585288
+        "bytes": 18708168
       },
       {
         "path": "studio/src/engine_bg.wasm",
-        "bytes": 12109447
+        "bytes": 12156529
       },
       {
         "path": "node_modules/typescript/lib/typescript.js",
@@ -39,7 +39,7 @@
       },
       {
         "path": "studio/src/app.js",
-        "bytes": 5351881
+        "bytes": 5469526
       },
       {
         "path": "node_modules/typescript/lib/lib.dom.d.ts",
@@ -57,6 +57,10 @@
         "path": "src/starter/animations/osmo/shape8-62.tsx",
         "bytes": 505710
       },
+      {
+        "path": "dist/studio.js",
+        "bytes": 486515
+      },
       {
         "path": "src/starter/animations/osmo/shape26-0.tsx",
         "bytes": 421037
@@ -77,10 +81,6 @@
         "path": "studio/src/InterDisplay-Regular-H4SUAKN5.ttf",
         "bytes": 408972
       },
-      {
-        "path": "dist/studio.js",
-        "bytes": 373939
-      },
       {
         "path": "src/resource-examples/example-video/ambient.mp4",
         "bytes": 370430
@@ -89,35 +89,35 @@
         "path": "third-party/rust-standard-library/COPYRIGHT-library.html",
         "bytes": 279302
       },
+      {
+        "path": "studio/src/preview-worker.js",
+        "bytes": 273134
+      },
       {
         "path": "node_modules/typescript/lib/lib.es5.d.ts",
         "bytes": 218439
       },
       {
         "path": "studio/src/app.css",
-        "bytes": 189824
+        "bytes": 204980
       },
       {
         "path": "node_modules/zod/src/v4/core/schemas.ts",
         "bytes": 175664
-      },
-      {
-        "path": "node_modules/zod/src/v3/types.ts",
-        "bytes": 160442
       }
     ]
   },
   "hashes": {
-    "dist/studio.js": "9c24c83ef1f45ad93d7703131eabded7a2e2fec329147c4055893d319f02a18e",
-    "vendor/osmo-lite": "1c4782a76f56f96039e3f28651865a0edae9346b551046c6ecaf01d43215d57c",
-    "studio/src/engine_bg.wasm": "fadf7cc6517dc6b4e78b0e1df6d0f58b3eee19174bf0fc7348d30bd55524e0af",
-    "studio/src/app.js": "491851481315cd1a62574087029a6b5ced76c07de7fd614c5a44e79f86b2070e",
-    "studio/src/app.css": "eb7e78d4c5855cf897a95be0f224de7489a6489f5221735ac3b3c461cd063864",
-    "third-party/inventory.json": "49062ad067631946356ecb120f0b461beb5fd75e16c660cec42b19de31f62502"
+    "dist/studio.js": "d1f6235523b4ab90f6c9b31700049709ebc5b024d5a34344dec76c63363e279a",
+    "vendor/osmo-lite": "8320c18e2152c0d573751799b1380851ced26ceb2d5d8fb1ffcf218ce426fb66",
+    "studio/src/engine_bg.wasm": "a4e257f97e0d15c2847151aae0e88f46e9eb886ef0ab7e06b240aaf78e0c8c75",
+    "studio/src/app.js": "ccb3024ef41c9e28dd3e188fc3dd76cf025c9cbd7228d15d45c1bb5e8abc3e19",
+    "studio/src/app.css": "78a3715ee6200db6b0c23aff27bb7b10201350fce7a6629f616f0117878965a1",
+    "third-party/inventory.json": "27e4179ecd43b63625f1e61e29c3b5ed87f6ceb48b1cd932688975b950bbe1d0"
   },
   "lockfiles": {
-    "package-lock.json": "2d0f9f1a32d5196c97f3a6cc4116390870c667686cf562ba17f5addb83ed6a01",
-    "apps/native/Cargo.lock": "cf31d67cf167c5f32438abfeb42159eb50da61d36e4e482bae50ed3d71241373",
-    "packages/render-engine/Cargo.lock": "a1a68051e1eea30ef0fa46bf17cd0685bb2c6a327defed0405e0d63dd61017a7"
+    "package-lock.json": "38d15ffdc2dc9321ff5e21109c392069da8e9693f9eb2f6c71d0cb8f952c6aa8",
+    "apps/native/Cargo.lock": "109e3160fc6f68a71b18c9098af6ac3e7d13a9f2457354d0dc4585ada1ad1bf2",
+    "packages/render-engine/Cargo.lock": "582dea5c95112000f6e1f10f2805a22943e584a3a4c6e02ad23ae992053e151a"
   }
 }

package/runtime/apps/native/tools/compile.mjs

@@ -1,3 +1,5 @@
+import { collectFilmKeys } from "../../../packages/render-protocol/src/film-resources.mjs";
+import { createFilmStore } from "../../../packages/render-protocol/src/film-store.node.mjs";
 import { build } from "esbuild";
 import ts from "typescript";
 import { open, readFile, stat } from "node:fs/promises";
@@ -25,7 +27,7 @@ const api = path.join(repo, "packages/scene/src/index.ts");
 const runtime = path.join(repo, "packages/scene/src/jsx-runtime.ts");
 const result = await build({
 	stdin: {
-		contents: `import scene from ${JSON.stringify(source)}; export {scene}; export {EFFECT_INPUT} from ${JSON.stringify(path.join(repo, "packages/scene/src/effects.ts"))}; export {Scene, Group, evaluateFrame} from ${JSON.stringify(api)}; export {prepareShader} from ${JSON.stringify(path.join(repo, "packages/scene/src/shader.ts"))};`,
+		contents: `import scene from ${JSON.stringify(source)}; export {scene}; export {EFFECT_INPUT} from ${JSON.stringify(path.join(repo, "packages/scene/src/effects.ts"))}; export {Scene, Group, evaluateMotionFrame as evaluateFrame} from ${JSON.stringify(api)}; export {prepareShader} from ${JSON.stringify(path.join(repo, "packages/scene/src/shader.ts"))};`,
 		resolveDir: path.dirname(source),
 	},
 	plugins: [{ name: "effect-source", setup(build) {
@@ -106,6 +108,7 @@ if (first.width > 8192 || first.height > 8192 || first.totalFrames > 18000) {
 }
 if (!Number.isInteger(first.width) || !Number.isInteger(first.height))
 	throw new Error("Native composition dimensions must be whole pixels");
+const filmKeys = new Set();
 const fonts = new Map();
 const dependencies = new Set([
 	source,
@@ -116,6 +119,7 @@ const dependencies = new Set([
 const shaders = new Map();
 async function collectEffects(target) {
 	for (const effect of target.effects ?? []) {
+        if (effect.film) continue;
 		let key = "effect:" + effect.code;
 		if (effect.src) {
 			effect.src = path.resolve(path.dirname(path.resolve(repo, effect.sourceFile ?? source)), effect.src);
@@ -139,7 +143,14 @@ async function collectFonts(nodes) {
         if(node.type === "composition") { await collectEffects(node.scene); await collectFonts(node.scene.children); }
 		if (["group","model","surface"].includes(node.type)) await collectFonts(node.children);
 		if (["image", "video", "audio", "model"].includes(node.type)) {
-			node.src = path.resolve(
+			if (node.type === "video" && node.originalSrc && process.env.OSMO_MEDIA_SOURCE === "original") {
+                const original = path.resolve(path.dirname(path.resolve(repo, node.originalSourceFile ?? node.sourceFile ?? source)), node.originalSrc);
+                if (!(await stat(original).catch(() => null))?.isFile()) throw new Error(`Original video is unavailable: ${original}`);
+                node.src = original;
+            }
+            delete node.originalSrc;
+            delete node.originalSourceFile;
+            node.src = path.resolve(
 				path.dirname(path.resolve(repo, node.sourceFile ?? source)),
 				node.src,
 			);
@@ -202,8 +213,12 @@ try {
 	});
 	for (let frame = 0; frame < first.totalFrames; frame++) {
 		const evaluated = frame === 0 ? first : evaluateFrame(scene, frame);
+		for (const sample of evaluated.motionSamples ?? []) {
+			await collectEffects(sample); await collectFonts(sample.children);
+		}
 		await collectEffects(evaluated);
 		await collectFonts(evaluated.children);
+		collectFilmKeys(evaluated, filmKeys);
 		await line(evaluated);
 	}
 	const assets = [];
@@ -216,6 +231,9 @@ try {
 			bytes: (await readFile(font)).toString("base64"),
 		});
 	}
+	// Installed CLI sets OSMO_FILM_TABLES to the shared resource directory.
+	// Direct desktop/check-out renderers retain their existing asset location.
+	await createFilmStore({directory: process.env.OSMO_FILM_TABLES ?? path.join(repo, "packages/render-engine/assets/film")}).ensureAll(filmKeys);
 	await line({ assets, dependencies: [...dependencies] });
 } finally {
 	await file.close();