@woosh/meep-engine 2.56.1 → 2.58.0

package/src/engine/ecs/{EntityBuilder.js → Entity.js}

@@ -2,22 +2,22 @@ import Signal from "../../core/events/signal/Signal.js";
 import { assert } from "../../core/assert.js";
 import { EventType } from "./EntityManager.js";
 import { isDefined } from "../../core/process/matcher/Matchers.js";
-import { EntityBuilderFlags } from "./EntityBuilderFlags.js";
+import { EntityFlags } from "./EntityFlags.js";
 
 /**
  * Set of default flags
  * @type {number}
  */
 const DEFAULT_FLAGS =
-    EntityBuilderFlags.RegisterComponents
-    | EntityBuilderFlags.WatchDestruction
+    EntityFlags.RegisterComponents
+    | EntityFlags.WatchDestruction
 ;
 
 /**
  * Representation of an entity, helps build entities and keep track of them without having to access {@link EntityComponentDataset} directly
  * @class
  */
-class EntityBuilder {
+class Entity {
 
     /**
      * @type {number}
@@ -51,7 +51,7 @@ class EntityBuilder {
 
     /**
      *
-     * @type {EntityBuilderFlags|number}
+     * @type {EntityFlags|number}
      */
     flags = DEFAULT_FLAGS;
 
@@ -73,12 +73,12 @@ class EntityBuilder {
      * @private
      */
     __handleEntityDestroyed() {
-        this.clearFlag(EntityBuilderFlags.Built);
+        this.clearFlag(EntityFlags.Built);
     }
 
     /**
      *
-     * @param {number|EntityBuilderFlags} value
+     * @param {number|EntityFlags} value
      */
     setFlag(value) {
         this.flags |= value;
@@ -86,7 +86,7 @@ class EntityBuilder {
 
     /**
      *
-     * @param {number|EntityBuilderFlags} flag
+     * @param {number|EntityFlags} flag
      * @returns {boolean}
      */
     getFlag(flag) {
@@ -97,7 +97,7 @@ class EntityBuilder {
 
     /**
      *
-     * @param {number|EntityBuilderFlags} flag
+     * @param {number|EntityFlags} flag
      */
     clearFlag(flag) {
         this.flags &= ~flag;
@@ -108,7 +108,7 @@ class EntityBuilder {
      * @returns {boolean}
      */
     get isBuilt() {
-        return this.getFlag(EntityBuilderFlags.Built);
+        return this.getFlag(EntityFlags.Built);
     }
 
     /**
@@ -135,7 +135,7 @@ class EntityBuilder {
     /**
      * @template T
      * @param {T} componentInstance
-     * @returns {EntityBuilder}
+     * @returns {Entity}
      */
     add(componentInstance) {
         if (componentInstance === undefined) {
@@ -146,7 +146,7 @@ class EntityBuilder {
 
         this.element.push(componentInstance);
 
-        if (this.getFlag(EntityBuilderFlags.Built)) {
+        if (this.getFlag(EntityFlags.Built)) {
             //already built, add component to entity
             this.dataset.addComponentToEntity(this.entity, componentInstance);
         }
@@ -213,7 +213,7 @@ class EntityBuilder {
                 elements.splice(i, 1);
 
                 //see if entity is built
-                if (this.getFlag(EntityBuilderFlags.Built)) {
+                if (this.getFlag(EntityFlags.Built)) {
 
                     this.dataset.removeComponentFromEntity(this.entity, klass);
 
@@ -232,7 +232,7 @@ class EntityBuilder {
      * @param {*} [event]
      */
     sendEvent(eventName, event) {
-        if (this.getFlag(EntityBuilderFlags.Built)) {
+        if (this.getFlag(EntityFlags.Built)) {
             this.dataset.sendEvent(this.entity, eventName, event);
         } else {
             console.warn("Entity doesn't exist. Event " + eventName + ":" + event + " was not sent.")
@@ -265,10 +265,10 @@ class EntityBuilder {
      * @param {string} eventName
      * @param {function} listener
      * @param {*} [context]
-     * @returns {EntityBuilder}
+     * @returns {Entity}
      */
     addEventListener(eventName, listener, context) {
-        if (this.getFlag(EntityBuilderFlags.Built)) {
+        if (this.getFlag(EntityFlags.Built)) {
             this.dataset.addEntityEventListener(this.entity, eventName, listener, context);
         } else {
             this.deferredListeners.push({
@@ -285,10 +285,10 @@ class EntityBuilder {
      * @param {string} eventName
      * @param {function} listener
      * @param {*} [context]
-     * @returns {EntityBuilder}
+     * @returns {Entity}
      */
     removeEventListener(eventName, listener, context) {
-        if (this.getFlag(EntityBuilderFlags.Built)) {
+        if (this.getFlag(EntityFlags.Built)) {
             this.dataset.removeEntityEventListener(this.entity, eventName, listener, context);
         } else {
             const listeners = this.deferredListeners;
@@ -317,7 +317,7 @@ class EntityBuilder {
      * @returns {boolean}
      */
     destroy() {
-        if (this.getFlag(EntityBuilderFlags.Built)) {
+        if (this.getFlag(EntityFlags.Built)) {
 
             const dataset = this.dataset;
             const entity = this.entity;
@@ -331,7 +331,7 @@ class EntityBuilder {
 
             this.entity = void 0;
 
-            this.clearFlag(EntityBuilderFlags.Built);
+            this.clearFlag(EntityFlags.Built);
 
             return true;
         } else {
@@ -349,7 +349,7 @@ class EntityBuilder {
         assert.notNull(dataset, "dataset");
 
         if (
-            this.getFlag(EntityBuilderFlags.Built)
+            this.getFlag(EntityFlags.Built)
             && checkExistingComponents(this.entity, this.element, dataset)
         ) {
             //already built
@@ -374,7 +374,7 @@ class EntityBuilder {
         const element = this.element;
         const element_count = element.length;
 
-        if (this.getFlag(EntityBuilderFlags.RegisterComponents)) {
+        if (this.getFlag(EntityFlags.RegisterComponents)) {
             for (i = 0; i < element_count; i++) {
                 const component = element[i];
 
@@ -388,9 +388,9 @@ class EntityBuilder {
             dataset.addComponentToEntity(entity, component);
         }
 
-        this.setFlag(EntityBuilderFlags.Built);
+        this.setFlag(EntityFlags.Built);
 
-        if (this.getFlag(EntityBuilderFlags.WatchDestruction)) {
+        if (this.getFlag(EntityFlags.WatchDestruction)) {
             dataset.addEntityEventListener(entity, EventType.EntityRemoved, this.__handleEntityDestroyed, this);
         }
 
@@ -402,16 +402,16 @@ class EntityBuilder {
      *
      * @param {number} entity
      * @param {EntityComponentDataset} dataset
-     * @returns {EntityBuilder}
+     * @returns {Entity}
      */
     static readFromDataset(entity, dataset) {
-        const r = new EntityBuilder();
+        const r = new Entity();
 
         dataset.getAllComponents(entity)
             .filter(isDefined)
             .forEach(r.add, r);
 
-        r.setFlag(EntityBuilderFlags.Built);
+        r.setFlag(EntityFlags.Built);
         r.entity = entity;
         r.dataset = dataset;
 
@@ -423,7 +423,7 @@ class EntityBuilder {
  * @readonly
  * @type {boolean}
  */
-EntityBuilder.prototype.isEntityBuilder = true;
+Entity.prototype.isEntityBuilder = true;
 
 
 /**
@@ -452,4 +452,4 @@ function checkExistingComponents(entity, components, dataset) {
     return true;
 }
 
-export default EntityBuilder;
+export default Entity;

package/src/engine/ecs/{EntityBuilder.spec.js → Entity.spec.js}

@@ -1,6 +1,6 @@
-import EntityBuilder from "./EntityBuilder.js";
+import Entity from "./Entity.js";
 import { EntityComponentDataset } from "./EntityComponentDataset.js";
-import { EntityBuilderFlags } from "./EntityBuilderFlags.js";
+import { EntityFlags } from "./EntityFlags.js";
 
 
 class DummyComponent {
@@ -19,13 +19,13 @@ function sampleDataset() {
 }
 
 test("constructor doesn't throw", () => {
-    new EntityBuilder();
+    new Entity();
 });
 
 test("entity exists in dataset after build", () => {
     const dataset = new EntityComponentDataset();
 
-    const builder = new EntityBuilder();
+    const builder = new Entity();
 
     const entity = builder.build(dataset);
 
@@ -37,7 +37,7 @@ test("component exist in dataset after build", () => {
 
     dataset.setComponentTypeMap([DummyComponent]);
 
-    const builder = new EntityBuilder();
+    const builder = new Entity();
 
     const component = new DummyComponent();
 
@@ -53,30 +53,30 @@ test("component exist in dataset after build", () => {
 test("'Built' flag is reset when entity is removed without invoking 'destroy' method", () => {
     const dataset = sampleDataset();
 
-    const b = new EntityBuilder();
+    const b = new Entity();
 
-    expect(b.getFlag(EntityBuilderFlags.Built)).toBe(false);
+    expect(b.getFlag(EntityFlags.Built)).toBe(false);
     expect(b.isBuilt).toBe(false);
 
     b.build(dataset);
 
-    expect(b.getFlag(EntityBuilderFlags.Built)).toBe(true);
+    expect(b.getFlag(EntityFlags.Built)).toBe(true);
     expect(b.isBuilt).toBe(true);
 
     dataset.removeEntity(b.entity);
 
-    expect(b.getFlag(EntityBuilderFlags.Built)).toBe(false);
+    expect(b.getFlag(EntityFlags.Built)).toBe(false);
     expect(b.isBuilt).toBe(false);
 });
 
 test("removeAllComponents from empty", () => {
-    const entity = new EntityBuilder();
+    const entity = new Entity();
 
     expect(() => entity.removeAllComponents()).not.toThrow()
 });
 
 test("removeAllComponents with 1 entity", () => {
-    const entity = new EntityBuilder();
+    const entity = new Entity();
 
     entity.add(new DummyComponent());
 
@@ -88,13 +88,13 @@ test("removeAllComponents with 1 entity", () => {
 });
 
 test("removeComponent when component is not preset", () => {
-    const entity = new EntityBuilder();
+    const entity = new Entity();
 
     expect(entity.removeComponent(DummyComponent)).toBe(null);
 });
 
 test("removeComponent when component is preset", () => {
-    const entity = new EntityBuilder();
+    const entity = new Entity();
 
     const component = new DummyComponent();
 
@@ -107,14 +107,14 @@ test("removeComponent when component is preset", () => {
 
 test("getComponentSafe throws when component is missing", () => {
 
-    const entity = new EntityBuilder();
+    const entity = new Entity();
 
     expect(() => entity.getComponentSafe(DummyComponent)).toThrow();
 
 });
 test("getComponentSafe throws when component is present", () => {
 
-    const entity = new EntityBuilder();
+    const entity = new Entity();
 
     const component = new DummyComponent();
     entity.add(component);
@@ -126,7 +126,7 @@ test("getComponentSafe throws when component is present", () => {
 
 test("adding component to live entity results in component being added to the dataset", () => {
 
-    const entity = new EntityBuilder();
+    const entity = new Entity();
 
     const ecd = sampleDataset();
 
@@ -141,7 +141,7 @@ test("adding component to live entity results in component being added to the da
 
 test("promiseEvent", async () => {
 
-    const entity = new EntityBuilder();
+    const entity = new Entity();
 
     const ecd = sampleDataset();
 

package/src/engine/ecs/EntityBlueprint.d.ts

@@ -1,4 +1,4 @@
-import EntityBuilder from "./EntityBuilder";
+import Entity from "./Entity";
 
 interface Type<T> extends Function {
     new(...args: any[]): T;
@@ -13,5 +13,5 @@ export class EntityBlueprint {
 
     clear(): void
 
-    build(seed?: object): EntityBuilder
+    build(seed?: object): Entity
 }

package/src/engine/ecs/EntityBlueprint.js

@@ -1,4 +1,4 @@
-import EntityBuilder from "./EntityBuilder.js";
+import Entity from "./Entity.js";
 
 /**
  *
@@ -141,10 +141,10 @@ export class EntityBlueprint {
 
     /**
      * @param {object} [templateSeed]
-     * @return {EntityBuilder}
+     * @return {Entity}
      */
     build(templateSeed) {
-        const eb = new EntityBuilder();
+        const eb = new Entity();
 
         this.#components.forEach((template, ComponentClass) => {
             const component = new ComponentClass();

package/src/engine/ecs/EntityBlueprint.spec.js

@@ -1,5 +1,5 @@
 import { EntityBlueprint } from "./EntityBlueprint.js";
-import EntityBuilder from "./EntityBuilder.js";
+import Entity from "./Entity.js";
 
 test("constructor does not throw", () => {
 
@@ -13,7 +13,7 @@ test("build empty", () => {
     const entity = blueprint.build();
 
     expect(entity).toBeDefined();
-    expect(entity).toBeInstanceOf(EntityBuilder);
+    expect(entity).toBeInstanceOf(Entity);
     expect(entity.count).toEqual(0);
 });
 

package/src/engine/ecs/{EntityBuilderFlags.js → EntityFlags.js}

@@ -2,7 +2,7 @@
  *
  * @enum
  */
-export const EntityBuilderFlags = {
+export const EntityFlags = {
     /**
      * Whether the entity is built, set internally
      */

package/src/engine/ecs/EntityObserver.spec.js

@@ -1,7 +1,7 @@
 import { EntityObserver } from "./EntityObserver.js";
 import { Transform } from "./transform/Transform.js";
 import GridPosition from "../grid/position/GridPosition.js";
-import EntityBuilder from "./EntityBuilder.js";
+import Entity from "./Entity.js";
 import { EntityComponentDataset } from "./EntityComponentDataset.js";
 import { noop } from "../../core/function/Functions.js";
 import { jest } from '@jest/globals';
@@ -42,13 +42,13 @@ test("existing entities that match are supplied via callback when attaching", ()
 
     const t0 = new Transform();
     const g0 = new GridPosition();
-    const entity0 = new EntityBuilder().add(t0).add(g0).build(dataset);
+    const entity0 = new Entity().add(t0).add(g0).build(dataset);
 
     const t1 = new Transform();
     const g1 = new GridPosition();
-    const entity1 = new EntityBuilder().add(t1).add(g1).build(dataset);
+    const entity1 = new Entity().add(t1).add(g1).build(dataset);
 
-    new EntityBuilder().add(new Transform()).build(dataset);
+    new Entity().add(new Transform()).build(dataset);
 
     const observer = new EntityObserver([Transform, GridPosition], completed, broken);
 
@@ -69,7 +69,7 @@ test("completed matches are observed when they happen after attachment", () => {
 
     const t0 = new Transform();
     const g0 = new GridPosition();
-    const entity0 = new EntityBuilder().add(t0).build(dataset);
+    const entity0 = new Entity().add(t0).build(dataset);
 
     const observer = new EntityObserver([Transform, GridPosition], completed, broken);
 
@@ -93,7 +93,7 @@ test("broken matches are observed", () => {
     const dataset = makeDataset();
     const t0 = new Transform();
     const g0 = new GridPosition();
-    const entityBuilder = new EntityBuilder().add(t0).add(g0);
+    const entityBuilder = new Entity().add(t0).add(g0);
     const entity0 = entityBuilder.build(dataset);
 
     const observer = new EntityObserver([Transform, GridPosition], completed, broken);
@@ -115,7 +115,7 @@ test("matching entities added after connect are observed", () => {
     const dataset = makeDataset();
     const t0 = new Transform();
     const g0 = new GridPosition();
-    const entityBuilder = new EntityBuilder().add(t0).add(g0);
+    const entityBuilder = new Entity().add(t0).add(g0);
 
     const observer = new EntityObserver([Transform, GridPosition], completed, broken);
 
@@ -135,7 +135,7 @@ test("match after connect and break", () => {
     const dataset = makeDataset();
     const t0 = new Transform();
     const g0 = new GridPosition();
-    const entityBuilder = new EntityBuilder().add(t0).add(g0);
+    const entityBuilder = new Entity().add(t0).add(g0);
 
     const observer = new EntityObserver([Transform, GridPosition], completed, broken);
 

package/src/engine/ecs/dynamic_actions/DynamicActorSystem.js

@@ -5,7 +5,7 @@ import { DataScope } from "../../../../../model/game/unit/actions/data/DataScope
 import { Blackboard } from "../../intelligence/blackboard/Blackboard.js";
 import { returnTrue } from "../../../core/function/Functions.js";
 import { EntityProxyScope } from "../binding/EntityProxyScope.js";
-import EntityBuilder from "../EntityBuilder.js";
+import Entity from "../Entity.js";
 import { BehaviorComponent } from "../../intelligence/behavior/ecs/BehaviorComponent.js";
 import { SequenceBehavior } from "../../intelligence/behavior/composite/SequenceBehavior.js";
 import { DieBehavior } from "../../intelligence/behavior/ecs/DieBehavior.js";
@@ -22,7 +22,7 @@ import { randomFloatBetween } from "../../../core/math/random/randomFloatBetween
 import { randomMultipleFromArray } from "../../../core/collection/array/randomMultipleFromArray.js";
 import { ResourceAccessSpecification } from "../../../core/model/ResourceAccessSpecification.js";
 import { ResourceAccessKind } from "../../../core/model/ResourceAccessKind.js";
-import { EntityBuilderFlags } from "../EntityBuilderFlags.js";
+import { EntityFlags } from "../EntityFlags.js";
 import { number_compare_descending } from "../../../core/primitives/numbers/number_compare_descending.js";
 
 /**
@@ -196,7 +196,7 @@ export class DynamicActorSystem extends AbstractContextSystem {
 
         const execution = ctx.execution;
 
-        if (execution.executor !== null && execution.executor.getFlag(EntityBuilderFlags.Built)) {
+        if (execution.executor !== null && execution.executor.getFlag(EntityFlags.Built)) {
             // there is an active rule being executed, see if this one has the right to interrupt
 
             if (rule.priority <= execution.rule.priority) {
@@ -223,7 +223,7 @@ export class DynamicActorSystem extends AbstractContextSystem {
 
         const execution = ctx.execution;
 
-        if (execution.executor !== null && execution.executor.getFlag(EntityBuilderFlags.Built)) {
+        if (execution.executor !== null && execution.executor.getFlag(EntityFlags.Built)) {
             execution.executor.destroy();
         }
     }
@@ -269,7 +269,7 @@ export class DynamicActorSystem extends AbstractContextSystem {
         const ecd = this.entityManager.dataset;
         const behavior = rule.action.execute(entity, ecd, context, this);
 
-        const entity_builder = new EntityBuilder()
+        const entity_builder = new Entity()
             .add(BehaviorComponent.fromOne(SequenceBehavior.from([
                 OverrideContextBehavior.from(
                     {

package/src/engine/ecs/foliage/ecs/InstancedMeshUtils.js

@@ -1,4 +1,4 @@
-import EntityBuilder from "../../EntityBuilder.js";
+import Entity from "../../Entity.js";
 import { loadFoliageLayer } from "./Foliage2System.js";
 import Mesh, { MeshFlags } from "../../../graphics/ecs/mesh/Mesh.js";
 import { Transform } from "../../transform/Transform.js";
@@ -51,7 +51,7 @@ export function convertInstancedMeshComponents2Entities(dataset, assetManager) {
 
                         //TODO Consider moving BVH info here also, to make this process faster
 
-                        const entityBuilder = new EntityBuilder();
+                        const entityBuilder = new Entity();
 
                         entityBuilder.add(transform).add(mesh).build(dataset);
                     }
@@ -145,7 +145,7 @@ export function optimizeIndividualMeshesEntitiesToInstances(dataset, threshold =
     const tBuild = new Task({
         name: "Build Meshes",
         cycleFunction: function () {
-            const entityBuilder = new EntityBuilder();
+            const entityBuilder = new Entity();
 
             entityBuilder.add(foliage2);
 

package/src/engine/ecs/gui/menu/radial/RadialContextMenu.d.ts

@@ -1,4 +1,4 @@
-import EntityBuilder from "../../../EntityBuilder";
+import Entity from "../../../Entity";
 import {EntityComponentDataset} from "../../../EntityComponentDataset";
 import Vector2 from "../../../../../core/geom/Vector2";
 import {RadialMenuElementDefinition} from "../../../../../view/elements/radial/RadialMenuElementDefinition";
@@ -19,4 +19,4 @@ interface RadialMenuOptions {
     selectionDistance?: number
 }
 
-export function makeMenu(options: RadialMenuOptions): EntityBuilder;
+export function makeMenu(options: RadialMenuOptions): Entity;

package/src/engine/ecs/gui/menu/radial/RadialContextMenu.js

@@ -3,7 +3,7 @@
  */
 import { SerializationMetadata } from "../../../components/SerializationMetadata.js";
 
-import EntityBuilder from "../../../EntityBuilder.js";
+import Entity from "../../../Entity.js";
 import GUIElement from "../../GUIElement.js";
 import { MouseEvents } from "../../../../input/devices/events/MouseEvents.js";
 import { TouchEvents } from "../../../../input/devices/events/TouchEvents.js";
@@ -12,7 +12,7 @@ import RadialMenuView from "../../../../../view/elements/radial/RadialMenu.js";
 import { animateAppearance } from "./AnimateAppearance.js";
 import { animateDisappearance } from "./AnimateDisappearance.js";
 import { RadialMenuSettings } from "./RadialMenuSettings.js";
-import { EntityBuilderFlags } from "../../../EntityBuilderFlags.js";
+import { EntityFlags } from "../../../EntityFlags.js";
 
 /**
  *
@@ -32,7 +32,7 @@ import { EntityBuilderFlags } from "../../../EntityBuilderFlags.js";
  * @param {string[]} [classList]
  * @param {Vector2} [pointerPosition] Used to set initial selection, same as position is not set
  * @param {number} [selectionDistance] minimum distance in pixels at which selection registers
- * @returns {EntityBuilder}
+ * @returns {Entity}
  */
 export function makeMenu({
                              ecd,
@@ -99,7 +99,7 @@ export function makeMenu({
     //play appearance animation
     const appearanceAnimationFinished = animateAppearance(mainView, ecd);
 
-    const builder = new EntityBuilder();
+    const builder = new Entity();
 
     //prevent menu serialization
     builder.add(SerializationMetadata.Transient);
@@ -234,7 +234,7 @@ export function makeMenu({
     window.addEventListener(TouchEvents.End, performSelection);
 
     // to simplify usage of this class, we turn on component registration on the builder
-    builder.setFlag(EntityBuilderFlags.RegisterComponents);
+    builder.setFlag(EntityFlags.RegisterComponents);
 
     // actually build the menu
     builder.build(ecd);

package/src/engine/ecs/ik/OneBoneSurfaceAlignmentSolver.js

@@ -6,8 +6,8 @@ import Quaternion from "../../../core/geom/Quaternion.js";
 import Vector3 from "../../../core/geom/Vector3.js";
 import { SurfacePoint3 } from "../../../core/geom/3d/SurfacePoint3.js";
 import { v3_computeOffsetVector } from "./IKMath.js";
-import { v3_dot } from "../../../core/geom/v3_dot.js";
-import { v3_length } from "../../../core/geom/v3_length.js";
+import { v3_dot } from "../../../core/geom/vec3/v3_dot.js";
+import { v3_length } from "../../../core/geom/vec3/v3_length.js";
 import { clamp01 } from "../../../core/math/clamp01.js";
 
 const boneWorldPosition = new Vector3();

package/src/engine/ecs/ik/TwoBoneInverseKinematicsSolver.js

@@ -7,8 +7,8 @@ import { findSkeletonBoneByType } from "../../graphics/ecs/mesh/SkeletonUtils.js
 import { SurfacePoint3 } from "../../../core/geom/3d/SurfacePoint3.js";
 import { IKSolver } from "./IKSolver.js";
 import { v3_computeOffsetVector } from "./IKMath.js";
-import { v3_dot } from "../../../core/geom/v3_dot.js";
-import { v3_length } from "../../../core/geom/v3_length.js";
+import { v3_dot } from "../../../core/geom/vec3/v3_dot.js";
+import { v3_length } from "../../../core/geom/vec3/v3_length.js";
 import { clamp01 } from "../../../core/math/clamp01.js";
 
 const boneWorldPositionC = new Vector3();

package/src/engine/ecs/parent/EntityNode.d.ts

@@ -1,12 +1,12 @@
-import EntityBuilder from "../EntityBuilder";
+import Entity from "../Entity";
 import {EntityComponentDataset} from "../EntityComponentDataset";
 import {Transform} from "../transform/Transform";
 
 export class EntityNode {
-    constructor(entity?: EntityBuilder)
+    constructor(entity?: Entity)
 
     readonly parent: EntityNode | null
-    readonly entity: EntityBuilder
+    readonly entity: Entity
 
     readonly transform: Transform
 

package/src/engine/ecs/parent/EntityNode.js

@@ -1,5 +1,5 @@
 import { ParentEntity } from "./ParentEntity.js";
-import EntityBuilder from "../EntityBuilder.js";
+import Entity from "../Entity.js";
 import { array_remove_first } from "../../../core/collection/array/array_remove_first.js";
 import { assert } from "../../../core/assert.js";
 import { array_push_if_unique } from "../../../core/collection/array/array_push_if_unique.js";
@@ -13,9 +13,9 @@ const DEFAULT_FLAGS = EntityNodeFlags.LiveManagement;
 export class EntityNode {
     /**
      *
-     * @param {EntityBuilder} [entity] optional entity to be wrapped
+     * @param {Entity} [entity] optional entity to be wrapped
      */
-    constructor(entity = new EntityBuilder()) {
+    constructor(entity = new Entity()) {
         /**
          *
          * @type {EntityNode|null}
@@ -25,7 +25,7 @@ export class EntityNode {
 
         /**
          *
-         * @type {EntityBuilder}
+         * @type {Entity}
          * @private
          */
         this.__entity = entity;
@@ -254,7 +254,7 @@ export class EntityNode {
 
     /**
      *
-     * @return {EntityBuilder}
+     * @return {Entity}
      */
     get entity() {
         return this.__entity;