@zcomponent/core 1.25.0-beta.1 → 1.25.0-beta.2

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/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.25.0-beta.1",
+  "version": "1.25.0-beta.2",
   "description": "The core component model and built-in functionality for Mattercraft.",
   "author": "Zappar Limited",
   "license": "Proprietary",