@zcomponent/core 1.24.0 → 1.25.0-beta.2

package/lib/animation/animation.d.ts

@@ -8,6 +8,7 @@ import { Track } from './tracks/track';
 import { Bezier } from './bezier';
 /** @internal */
 export declare enum AnimationEvents {
+    onLayerClipNotActive = "onLayerClipNotActive",
     onLayerClipActive = "onLayerClipActive",
     onLayerClipState = "onLayerClipState"
 }
@@ -39,6 +40,7 @@ export declare class Animation {
         [id: string]: Bezier;
     };
     onTick: Event<[]>;
+    onLayerClipNotActive: Event<[layerClip: LayerClip]>;
     onLayerClipActive: Event<[layerClip: LayerClip]>;
     onLayerClipState: Event<[layerClip: LayerClip]>;
     /**

package/lib/animation/animation.js

@@ -1,8 +1,10 @@
 import { Observable } from '../observable';
 import { Event } from '../event';
+import { LayerClip } from './layerclip';
 /** @internal */
 export var AnimationEvents;
 (function (AnimationEvents) {
+    AnimationEvents["onLayerClipNotActive"] = "onLayerClipNotActive";
     AnimationEvents["onLayerClipActive"] = "onLayerClipActive";
     AnimationEvents["onLayerClipState"] = "onLayerClipState";
 })(AnimationEvents || (AnimationEvents = {}));
@@ -33,6 +35,7 @@ export class Animation {
         this.clips = Object.create(null);
         this.curves = Object.create(null);
         this.onTick = new Event();
+        this.onLayerClipNotActive = new Event();
         this.onLayerClipActive = new Event();
         this.onLayerClipState = new Event();
         /**
@@ -255,6 +258,12 @@ export class Animation {
             const entry = this._pendingEvents.shift();
             if (!entry)
                 continue;
+            if (entry.evt === AnimationEvents.onLayerClipNotActive && entry.args[0] instanceof LayerClip) {
+                entry.args[0].active.value = false;
+            }
+            else if (entry.evt === AnimationEvents.onLayerClipActive && entry.args[0] instanceof LayerClip) {
+                entry.args[0].active.value = true;
+            }
             this[entry.evt].emit(...entry.args);
         }
     }

package/lib/animation/layer.js

@@ -75,6 +75,8 @@ export class Layer {
             if (entry.layerClip && entry === this._active) {
                 if (next && (entry.layerClip.state.value === StreamState.Ended || next.fadeTime >= entry.layerClip.getRemainingTimeEstimate())) {
                     next.startTime = t;
+                    if (this._active?.layerClip)
+                        this.animation._pendingEvents.push({ evt: AnimationEvents.onLayerClipNotActive, args: [this._active.layerClip] });
                     this._active = next;
                     this.animation._pendingEvents.push({ evt: AnimationEvents.onLayerClipActive, args: [this._active.layerClip] });
                     next.layerClip?.play();
@@ -158,6 +160,8 @@ export class Layer {
     _activateLayerClip(layerClip, playOptions) {
         if (layerClip === undefined) {
             this._queue = [];
+            if (this._active?.layerClip)
+                this.animation._pendingEvents.push({ evt: AnimationEvents.onLayerClipNotActive, args: [this._active.layerClip] });
             this._active = undefined;
             this.animation._pendingEvents.push({ evt: AnimationEvents.onLayerClipActive, args: [undefined] });
             return;
@@ -175,6 +179,8 @@ export class Layer {
             ...playOptions,
             fade: playOptions?.fade !== undefined ? playOptions.fade : this._active === undefined || layerClip === undefined ? { time: 0, easing: null } : undefined,
         });
+        if (this._active?.layerClip)
+            this.animation._pendingEvents.push({ evt: AnimationEvents.onLayerClipNotActive, args: [this._active.layerClip] });
         this._active = entry;
         this.animation._pendingEvents.push({ evt: AnimationEvents.onLayerClipActive, args: [this._active.layerClip] });
         this._queue[this._queue.length - 1].startTime = this.animation.timeSource?.() ?? performance.now();
@@ -240,11 +246,15 @@ export class Layer {
                 this._queue.push(mqe);
             }
         }
+        if (this._active?.layerClip)
+            this.animation._pendingEvents.push({ evt: AnimationEvents.onLayerClipNotActive, args: [this._active.layerClip] });
         if (typeof entry.active === 'number') {
             this._active = this._queue[entry.active];
         }
         else
             this._active = entry.active;
+        if (this._active?.layerClip)
+            this.animation._pendingEvents.push({ evt: AnimationEvents.onLayerClipActive, args: [this._active.layerClip] });
     }
     /**
      * Gets the set of paths influenced by the layer.

package/lib/animation/layerclip.d.ts

@@ -50,6 +50,7 @@ export declare class LayerClip implements Stream {
     state: Observable<StreamState, never>;
     playing: Observable<boolean, never>;
     stalled: Observable<boolean, never>;
+    active: Observable<boolean, never>;
     onPlaying: Event<[LayerClip]>;
     onPaused: Event<[LayerClip]>;
     onEnded: Event<[LayerClip]>;

package/lib/animation/layerclip.js

@@ -43,6 +43,7 @@ export class LayerClip {
         this.state = new Observable(this._state);
         this.playing = new Observable(false);
         this.stalled = new Observable(false);
+        this.active = new Observable(false);
         this.onPlaying = new Event();
         this.onPaused = new Event();
         this.onEnded = new Event();

package/lib/data/change.js

@@ -466,7 +466,7 @@ export function removeNodeScriptNameFromRegister(zcomp, id) {
     if (!node)
         return;
     if (node.scriptName) {
-        if (zcomp.entitiesByScriptName) {
+        if (zcomp.entitiesByScriptName?.[node.scriptName]) {
             delete zcomp.entitiesByScriptName[node.scriptName][id];
             if (Object.keys(zcomp.entitiesByScriptName[node.scriptName]).length === 0) {
                 delete zcomp.entitiesByScriptName[node.scriptName];

package/lib/selectors.js

@@ -349,10 +349,20 @@ ${Object.entries(scriptNames ?? {})
         .map(entry => {
         const values = Object.keys(entry[1]);
         if (values.length > 1) {
-            return `\t\t${entry[0]}: {${values.map(e => `${JSON.stringify(e)}: ${importMapping.get(nodes[e].type)}${getBehaviorBlockForNode(behaviors, behaviorsByNodeID[nodes[e].id] ?? [], importMapping)}`).join(', ')}},`;
+            return `\t\t${entry[0]}: {${values
+                .map(e => {
+                const node = nodes[e];
+                if (!node)
+                    return `${JSON.stringify(e)}: any,`;
+                return `${JSON.stringify(e)}: ${importMapping.get(nodes[e].type)}${getBehaviorBlockForNode(behaviors, behaviorsByNodeID[nodes[e].id] ?? [], importMapping)}`;
+            })
+                .join(', ')}},`;
         }
         else {
-            return `\t\t${entry[0]}: ${importMapping.get(nodes[values[0]].type)}${getBehaviorBlockForNode(behaviors, behaviorsByNodeID[nodes[values[0]].id] ?? [], importMapping)},`;
+            const node = nodes[values[0]];
+            if (!node)
+                return `\t\t${entry[0]}: any,`;
+            return `\t\t${entry[0]}: ${importMapping.get(node.type)}${getBehaviorBlockForNode(behaviors, behaviorsByNodeID[node.id] ?? [], importMapping)},`;
         }
     })
         .join('\n')}

package/lib/types.d.ts

@@ -180,6 +180,7 @@ export declare enum ValuesType {
     'morphTargets' = "morphTargets",
     'events' = "events",
     'parentNodes' = "parentNodes",
+    'parentMaterials' = "parentMaterials",
     'nodelabels' = "nodelabels",
     'nodeids' = "nodeids",
     'layerclipids' = "layerclipids",

package/lib/types.js

@@ -61,6 +61,7 @@ export var ValuesType;
     ValuesType["morphTargets"] = "morphTargets";
     ValuesType["events"] = "events";
     ValuesType["parentNodes"] = "parentNodes";
+    ValuesType["parentMaterials"] = "parentMaterials";
     ValuesType["nodelabels"] = "nodelabels";
     ValuesType["nodeids"] = "nodeids";
     ValuesType["layerclipids"] = "layerclipids";

package/lib/zcomponent.js

@@ -279,8 +279,13 @@ export class ZComponent extends Component {
      */
     resolveNodeID(id, type) {
         const entity = this.entityByID.get(id);
-        if (!entity)
-            return this.getZComponentInstance()?.resolveNodeID(id, type);
+        try {
+            if (!entity)
+                return this.getZComponentInstance()?.resolveNodeID(id, type);
+        }
+        catch (err) {
+            return undefined;
+        }
         if (!(entity instanceof Component))
             return undefined;
         if (!type)
@@ -295,8 +300,13 @@ export class ZComponent extends Component {
      */
     resolveBehaviorID(id, type) {
         const entity = this.entityByID.get(id);
-        if (!entity)
-            return this.getZComponentInstance()?.resolveBehaviorID(id, type);
+        try {
+            if (!entity)
+                return this.getZComponentInstance()?.resolveBehaviorID(id, type);
+        }
+        catch (err) {
+            return undefined;
+        }
         if (!(entity instanceof Behavior))
             return undefined;
         if (!type)
@@ -314,8 +324,13 @@ export class ZComponent extends Component {
      */
     resolveEntityID(id) {
         const entity = this.entityByID.get(id);
-        if (!entity)
-            return this.getZComponentInstance()?.resolveEntityID(id);
+        try {
+            if (!entity)
+                return this.getZComponentInstance()?.resolveEntityID(id);
+        }
+        catch (err) {
+            return undefined;
+        }
         if (!(entity instanceof Entity))
             return undefined;
         return entity;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zcomponent/core",
-  "version": "1.24.0",
+  "version": "1.25.0-beta.2",
   "description": "The core component model and built-in functionality for Mattercraft.",
   "author": "Zappar Limited",
   "license": "Proprietary",