bevy-ts 0.1.0-alpha.8 → 0.1.0-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bevy-ts",
-  "version": "0.1.0-alpha.8",
+  "version": "0.1.0-alpha.9",
   "description": "TypeScript for Bevy: components, systems and hot reload without recompiling Rust",
   "license": "MIT OR Apache-2.0",
   "repository": {
@@ -59,11 +59,11 @@
     "examples"
   ],
   "optionalDependencies": {
-    "@bevy-ts/darwin-arm64": "0.1.0-alpha.8",
-    "@bevy-ts/darwin-x64": "0.1.0-alpha.8",
-    "@bevy-ts/linux-arm64": "0.1.0-alpha.8",
-    "@bevy-ts/linux-x64": "0.1.0-alpha.8",
-    "@bevy-ts/win32-x64": "0.1.0-alpha.8"
+    "@bevy-ts/darwin-arm64": "0.1.0-alpha.9",
+    "@bevy-ts/darwin-x64": "0.1.0-alpha.9",
+    "@bevy-ts/linux-arm64": "0.1.0-alpha.9",
+    "@bevy-ts/linux-x64": "0.1.0-alpha.9",
+    "@bevy-ts/win32-x64": "0.1.0-alpha.9"
   },
   "devDependencies": {
     "json-schema-to-typescript": "^15.0.4",

package/protocol.d.ts

@@ -1,7 +1,7 @@
 // @generated by packages/bevy-ts/scripts/gen-protocol.mjs from protocol/bevy-ts.openrpc.json. Do not edit.
 
 /** The protocol version these types describe. */
-export const PROTOCOL_VERSION: "1.21.0";
+export const PROTOCOL_VERSION: "1.23.0";
 
 /**
  * An entity id: Entity::to_bits.
@@ -858,6 +858,10 @@ export interface TsxTreeNode {
        */
       component: string;
       reason: MissingReason;
+      /**
+       * (1.23) True when the component is the entity's own scene component, the one its row instances; absent for a patch component.
+       */
+      scene?: boolean;
     }[];
   };
   /**
@@ -2054,7 +2058,7 @@ export interface LevelNodeResult {
    */
   props?: LevelProp[];
   /**
-   * (1.12) Components the file adds that the entity's prefab does not give, named as LevelOverride.component names them.
+   * (1.12) Components the file adds that the entity's prefab does not give, named as LevelOverride.component names them. (1.23) A placeholder patch component the file writes is listed too, by the name the file writes; the entity's own scene component never is.
    */
   patches?: string[];
   /**
@@ -2107,6 +2111,10 @@ export interface MissingComponent {
    */
   component: string;
   reason: MissingReason;
+  /**
+   * (1.23) True when the component is the entity's own scene component, the one it instances; absent for a patch component.
+   */
+  scene?: boolean;
   /**
    * One line of why.
    */

package/runtime/jsx-runtime.js

@@ -376,6 +376,11 @@ class Computation extends Owner {
   }
 }
 
+/** An error as it crosses to Rust. */
+function errorRecord(e, location) {
+  return { message: e && e.message ? `${e.name || "Error"}: ${e.message}` : String(e), location: location || null, stack: e && e.stack ? String(e.stack) : null };
+}
+
 function reportError(e) {
   console.error(e && e.stack ? e.stack : String(e));
 }
@@ -702,19 +707,15 @@ export class TsxContext {
     return { $b: id, $s: site.id };
   }
 
-  /** One scene component instance, by name or `module#export`: its description, or null. */
+  /** One scene component instance, by name or `module#export`: its description, or the error it raised. */
   expand(name, props, at) {
     const C = hostSceneComponent ? hostSceneComponent(name) : null;
-    if (!C || typeof C.scene !== "function") {
-      this.error(new Error(`no scene component named ${name}`), at || null);
-      return null;
-    }
+    if (!C || typeof C.scene !== "function") return { failure: errorRecord(new Error(`no scene component named ${name}`), at) };
     try {
       const nodes = runScene(this, () => describe(create(C, props || {}, undefined, at, false), this));
-      return nodes[0] || null;
+      return { node: nodes[0] || null };
     } catch (e) {
-      this.error(e, (e && e.bevyTsLocation) || at || null);
-      return null;
+      return { failure: errorRecord(e, (e && e.bevyTsLocation) || at) };
     }
   }
 
@@ -757,7 +758,7 @@ export class TsxContext {
   }
 
   error(e, location) {
-    this.errors.push({ message: e && e.message ? `${e.name || "Error"}: ${e.message}` : String(e), location: location || null, stack: e && e.stack ? String(e.stack) : null });
+    this.errors.push(errorRecord(e, location));
   }
 
   /**
@@ -836,9 +837,13 @@ export class TsxContext {
       });
       // Scene component instances a Rust plugin (levels) asks for: described after this call's
       // computations started, so their bindings wait until the plugin has mounted them.
+      // Each failed item's own error goes beside it, not among the call's.
       const expanded = (payload.expand || []).map(([name, props, at]) => this.expand(name, props, at));
       const out = this.output();
-      if (payload.expand) out.expanded = expanded;
+      if (payload.expand) {
+        out.expanded = expanded.map((x) => x.node || null);
+        out.failures = expanded.map((x) => x.failure || null);
+      }
       return out;
     } finally {
       this.inCall = false;