Update tests, remove entitiesByUUIDState

packages/ecs/src/UUIDComponent.test.tsx

@@ -27,6 +27,7 @@ import { act, render } from '@testing-library/react'
 import assert from 'assert'
 import React, { useEffect } from 'react'
 
+import { ReactorRoot, startReactor } from '@etherealengine/hyperflux'
 import {
   ComponentMap,
   getComponent,
@@ -38,7 +39,7 @@ import {
 } from './ComponentFunctions'
 import { createEngine, destroyEngine } from './Engine'
 import { Entity, EntityUUID, UndefinedEntity } from './Entity'
-import { createEntity, removeEntity } from './EntityFunctions'
+import { EntityContext, createEntity, removeEntity } from './EntityFunctions'
 import { UUIDComponent } from './UUIDComponent'
 
 describe('UUIDComponent', () => {
@@ -84,10 +85,16 @@ describe('UUIDComponent', () => {
     })
 
     it('Should throw an error when the UUID is already in use for another entity', () => {
+      let root = undefined as ReactorRoot | undefined
       setComponent(entity1, UUIDComponent, TestUUID)
-      assert.throws(() => {
-        setComponent(entity2, UUIDComponent, TestUUID)
-      }, Error)
+      setComponent(entity2, UUIDComponent, TestUUID)
+      const reactor = UUIDComponent.reactorMap.get(entity2)?.Reactor
+      root = startReactor(() => {
+        return React.createElement(EntityContext.Provider, { value: entity2 }, React.createElement(reactor!, {}))
+      }) as ReactorRoot
+
+      assert(root?.errors.length)
+      root?.stop()
     })
 
     it('should remove the old uuid from the entity', () => {
@@ -114,14 +121,14 @@ describe('UUIDComponent', () => {
     it('should remove the component from the entity', () => {
       setComponent(entity1, UUIDComponent, TestUUID)
       removeComponent(entity1, UUIDComponent)
-      assert.equal(UndefinedEntity, UUIDComponent.entitiesByUUIDState[TestUUID].value)
+      assert.equal(UndefinedEntity, UUIDComponent.getEntityByUUID(TestUUID))
       assert.equal(false, hasComponent(entity1, UUIDComponent))
       assert.equal(getOptionalComponent(entity1, UUIDComponent), undefined)
     })
 
     it('should do nothing if the entity does not have the component', () => {
       removeComponent(entity1, UUIDComponent)
-      assert.equal(UndefinedEntity, UUIDComponent.entitiesByUUIDState[TestUUID].value)
+      assert.equal(UndefinedEntity, UUIDComponent.getEntityByUUID(TestUUID))
       assert.equal(getOptionalComponent(entity1, UUIDComponent), undefined)
     })
   })
@@ -130,7 +137,7 @@ describe('UUIDComponent', () => {
     it('should return the correct entity', () => {
       setComponent(entity1, UUIDComponent, TestUUID)
       const testEntity = UUIDComponent.getEntityByUUID(TestUUID)
-      assert.equal(testEntity, UUIDComponent.entitiesByUUIDState[TestUUID].value)
+      assert.equal(testEntity, UUIDComponent.getEntityByUUID(TestUUID))
       assert.equal(testEntity, entity1)
     })
 
@@ -139,12 +146,12 @@ describe('UUIDComponent', () => {
       removeComponent(entity1, UUIDComponent)
       setComponent(entity1, UUIDComponent, TestUUID2)
       const testEntity = UUIDComponent.getEntityByUUID(TestUUID2)
-      assert.equal(testEntity, UUIDComponent.entitiesByUUIDState[TestUUID2].value)
+      assert.equal(testEntity, UUIDComponent.getEntityByUUID(TestUUID2))
     })
 
     it('should return UndefinedEntity when the UUID has not been added to any entity', () => {
       const testEntity = UUIDComponent.getEntityByUUID(TestUUID)
-      assert.equal(testEntity, UUIDComponent.entitiesByUUIDState[TestUUID].value)
+      assert.equal(testEntity, UUIDComponent.getEntityByUUID(TestUUID))
       assert.equal(testEntity, UndefinedEntity)
     })
   })
@@ -153,14 +160,14 @@ describe('UUIDComponent', () => {
     it('should return the correct entity when it exists', () => {
       setComponent(entity1, UUIDComponent, TestUUID)
       const testEntity = UUIDComponent.getOrCreateEntityByUUID(TestUUID)
-      assert.equal(testEntity, UUIDComponent.entitiesByUUIDState[TestUUID].value)
+      assert.equal(testEntity, UUIDComponent.getEntityByUUID(TestUUID))
       assert.equal(testEntity, entity1)
     })
 
     it("should create a new entity when the UUID hasn't been added to any entity", () => {
       setComponent(entity1, UUIDComponent, TestUUID)
       const testEntity = UUIDComponent.getOrCreateEntityByUUID(TestUUID2)
-      assert.equal(testEntity, UUIDComponent.entitiesByUUIDState[TestUUID2].value)
+      assert.equal(testEntity, UUIDComponent.getEntityByUUID(TestUUID2))
       assert.notEqual(testEntity, entity1)
     })
   })
@@ -246,7 +253,7 @@ describe('UUIDComponent Hooks', async () => {
       assert.equal(counter, 1, `The reactor has run an incorrect number of times: ${counter}`)
       assert.notEqual(result, undefined, "The result data didn't get assigned.")
       assert.equal(result, ExpectedValue, `Did not return the correct data. result = ${result}`)
-      assert.equal(testEntity, UUIDComponent.entitiesByUUIDState[TestUUID].value)
+      assert.equal(testEntity, UUIDComponent.getEntityByUUID(TestUUID))
       assert.equal(testEntity, ExpectedValue)
       unmount()
     })

packages/ecs/src/UUIDComponent.ts

@@ -25,7 +25,7 @@ Ethereal Engine. All Rights Reserved.
 
 import { MathUtils } from 'three'
 
-import { defineState, getState, State, useImmediateEffect, useMutableState } from '@etherealengine/hyperflux'
+import { defineState, getState, useImmediateEffect, useMutableState } from '@etherealengine/hyperflux'
 
 import { defineComponent, setComponent, useComponent } from './ComponentFunctions'
 import { Entity, EntityUUID, UndefinedEntity } from './Entity'
@@ -45,7 +45,6 @@ export const UUIDComponent = defineComponent({
   onSet: (entity, component, uuid: EntityUUID) => {
     if (!uuid) throw new Error('UUID cannot be empty')
     if (component.value === uuid) return
-
     component.set(uuid)
   },
 
@@ -79,8 +78,6 @@ export const UUIDComponent = defineComponent({
     return null
   },
 
-  entitiesByUUIDState: {} as Record<EntityUUID, State<Entity>>,
-
   useEntityByUUID(uuid: EntityUUID) {
     return useMutableState(UUIDState)[uuid].value || UndefinedEntity
   },

packages/engine/src/assets/loaders/gltf/extensions/EEECSImporterExtension.ts

@@ -64,7 +64,7 @@ export default class EEECSImporterExtension extends ImporterExtension implements
         if (component === UUIDComponent) {
           const uuid = ecsExtensions[jsonID]
           //check if uuid already exists
-          if (UUIDComponent.entitiesByUUIDState[uuid]?.value) {
+          if (UUIDComponent.getEntityByUUID(uuid)) {
             //regenerate uuid if it already exists
             ecsExtensions[jsonID] = generateEntityUUID()
           }