@draug/engine 1.0.19 → 1.0.21

package/dist/index.cjs

@@ -51,9 +51,9 @@ __export(index_exports, {
   PluginBase: () => PluginBase,
   PluginError: () => PluginError,
   PluginsManager: () => PluginsManager,
+  Resource: () => Resource,
   ResourcesManager: () => ResourcesManager,
   Runtime: () => Runtime,
-  SingletonStorage: () => SingletonStorage,
   System: () => System,
   SystemBase: () => SystemBase,
   SystemError: () => SystemError,
@@ -65,6 +65,7 @@ __export(index_exports, {
   createEventKey: () => createEventKey,
   entry: () => entry,
   getPluginMetadata: () => getPluginMetadata,
+  getResourceMetadata: () => getResourceMetadata,
   getSystemMetadata: () => getSystemMetadata,
   isPlugin: () => isPlugin,
   isSystem: () => isSystem,
@@ -149,7 +150,8 @@ function System(props) {
     const requiredComponents = new Set(props.requiredComponents);
     const computeAfter = new Set(props.computeAfter);
     const phase = props.phase ?? 1 /* MAIN */;
-    const metadata = { query, requiredComponents, computeAfter, phase };
+    const name = props.name ?? target.name;
+    const metadata = { query, requiredComponents, computeAfter, phase, name };
     systemTarget[SystemMetadataSymbol] = metadata;
   };
 }
@@ -195,7 +197,8 @@ var SystemsManager = class {
       this.requiredComponents_.add(c);
     for (const c of requiredComponents)
       this.requiredComponents_.add(c);
-    this.logger.debug(() => `[Systems]: "${ctor.name}" was registered`);
+    const meta = getSystemMetadata(ctor);
+    this.logger.debug(() => `[Systems]: system "${meta.name}" was registered`);
   }
   build() {
     this.buildSystemsArray();
@@ -487,55 +490,41 @@ var ComponentStorage = class {
   }
 };
 
-// src/ecs/components/singleton-storage.ts
-var SingletonStorage = class {
-  constructor(factory) {
-    this.factory = factory;
-  }
-  factory;
-  value = null;
-  entityId = null;
-  bitmap() {
-    throw new Error("Singletone component cannot has a bitmap!");
-  }
-  add(id2, initFn) {
-    if (this.value !== null)
-      throw new Error("Singleton already initiated");
-    this.entityId = id2;
-    this.value = this.factory();
-    initFn?.(this.value);
-    return this.value;
-  }
-  remove(id2) {
-    if (!this.validateId(id2))
-      return;
-    this.value = null;
-    this.entityId = null;
-  }
-  get(id2) {
-    if (!this.validateId(id2))
-      return null;
-    return this.value;
-  }
-  tryGet(id2) {
-    if (!this.validateId(id2))
-      throw new Error("[SingletoneStorage]: ID missmatch.");
-    return this.value;
-  }
-  has(id2) {
-    return this.validateId(id2);
-  }
-  size() {
-    return this.value !== null ? 1 : 0;
-  }
-  forEach(cb) {
-    if (this.entityId !== null)
-      cb(this.entityId);
+// src/ecs/components/utils.ts
+var registry = /* @__PURE__ */ new Map();
+var id = 0;
+var ComponentMetadataSymbol = /* @__PURE__ */ Symbol("component");
+function Component(options) {
+  return (target) => {
+    const metadata = {
+      name: options.name,
+      id: ++id
+    };
+    registry.set(target, metadata.id);
+    target[ComponentMetadataSymbol] = metadata;
+  };
+}
+function getComponentId(ctor) {
+  const id2 = registry.get(ctor);
+  if (id2 === void 0) {
+    throw new Error(`Component not registered: ${ctor.name}`);
   }
-  validateId(id2) {
-    return this.entityId !== null && id2 === this.entityId;
+  return id2;
+}
+var ErrNotComponent = class extends Error {
+  constructor(ctor) {
+    super(`Class ${ctor.name} is not a Component. Use @Component decorator to define components.`);
   }
 };
+function getComponentMetadata(component) {
+  if (isComponent(component)) {
+    return component[ComponentMetadataSymbol];
+  }
+  throw new ErrNotComponent(component);
+}
+function isComponent(ctor) {
+  return ComponentMetadataSymbol in ctor;
+}
 
 // src/ecs/components/manager.ts
 var ComponentAlreadyRegisteredError = class extends Error {
@@ -544,9 +533,11 @@ var ComponentAlreadyRegisteredError = class extends Error {
   }
 };
 var ComponentsManager = class {
-  constructor(maxEntityCount = ECS_DEFAULTS.MAX_ENTITY_COUNT) {
+  constructor(logger, maxEntityCount = ECS_DEFAULTS.MAX_ENTITY_COUNT) {
+    this.logger = logger;
     this.maxEntityCount = maxEntityCount;
   }
+  logger;
   maxEntityCount;
   storages_ = /* @__PURE__ */ new Map();
   currId_ = 0;
@@ -556,19 +547,10 @@ var ComponentsManager = class {
   register(component, opts) {
     if (this.storages_.has(component))
       return this.storages_.get(component);
-    let store;
-    switch (opts?.storageType) {
-      case 2 /* SINGLETON_STORAGE */:
-        store = this.createSingletonStore(opts);
-        break;
-      case 1 /* COMPONENT_STORAGE */:
-        store = this.createComponentStore(component, opts);
-        break;
-      default:
-        store = this.createComponentStore(component, opts);
-        break;
-    }
+    const store = this.createComponentStore(component, opts);
     this.storages_.set(component, store);
+    const meta = getComponentMetadata(component);
+    this.logger.debug(() => `[Components]: Registered component "${meta.name}"`);
     return store;
   }
   createComponentStore(component, opts) {
@@ -577,12 +559,6 @@ var ComponentsManager = class {
     store._internalSetId(this.nextId());
     return store;
   }
-  createSingletonStore(opts) {
-    if (!opts?.factory) {
-      throw new Error("For singletone storage provide factory is required!");
-    }
-    return new SingletonStorage(opts.factory);
-  }
   getStorage(component) {
     const store = this.storages_.get(component);
     if (store === void 0)
@@ -594,24 +570,30 @@ var ComponentsManager = class {
   }
 };
 
-// src/ecs/components/utils.ts
-var registry = /* @__PURE__ */ new Map();
-var id = 0;
-function Component() {
+// src/ecs/resources/resources.ts
+var ResourceMetadataSymbol = /* @__PURE__ */ Symbol("resource");
+function Resource(params) {
   return (target) => {
-    if (registry.has(target)) return;
-    registry.set(target, ++id);
+    const metadata = {
+      name: params.name
+    };
+    target[ResourceMetadataSymbol] = metadata;
   };
 }
-function getComponentId(ctor) {
-  const id2 = registry.get(ctor);
-  if (id2 === void 0) {
-    throw new Error(`Component not registered: ${ctor.name}`);
+var ErrNotResource = class extends Error {
+  constructor(ctor) {
+    super(`Class ${ctor.name} is not a Resource. Use @Resource decorator to define resources.`);
   }
-  return id2;
+};
+function getResourceMetadata(resource) {
+  if (isResource(resource)) {
+    return resource[ResourceMetadataSymbol];
+  }
+  throw new ErrNotResource(resource);
+}
+function isResource(ctor) {
+  return ResourceMetadataSymbol in ctor;
 }
-
-// src/ecs/resources/resources.ts
 var ResourcesManager = class {
   constructor(logger) {
     this.logger = logger;
@@ -620,13 +602,15 @@ var ResourcesManager = class {
   items_ = /* @__PURE__ */ new Map();
   insert(type, value) {
     this.items_.set(type, value);
-    this.logger.debug(() => `[Resources]: Inserted new Resource "${type.name}"`);
+    const metadata = getResourceMetadata(type);
+    this.logger.debug(() => `[Resources]: Inserted new Resource "${metadata.name}"`);
     return value;
   }
   get(type) {
     const value = this.items_.get(type);
+    const meta = getResourceMetadata(type);
     if (!value)
-      throw new Error(`Resource of class ${type.name} does not exist!`);
+      throw new Error(`Resource of class ${meta.name} does not exist!`);
     return value;
   }
   getOrInsert(type, factory) {
@@ -638,7 +622,8 @@ var ResourcesManager = class {
     return value;
   }
   remove(type) {
-    this.logger.debug(() => `[Resources]: Removed resource "${type.name}"`);
+    const meta = getResourceMetadata(type);
+    this.logger.debug(() => `[Resources]: Removed resource "${meta.name}"`);
     this.items_.delete(type);
   }
 };
@@ -672,7 +657,10 @@ var Commands = class {
       }
     };
     this.add(cmd);
-    this.logger.debug(() => `[Commands.createEntity]: Created new entity with ID ${id2}. Linked components: [${entries.map((x) => x[0].name).join(", ")}]`);
+    this.logger.debug(() => {
+      const components = entries.map((x) => getComponentMetadata(x[0]).name).join(", ");
+      return `[Commands.createEntity]: Created new entity with ID ${id2}. Linked components: [${components}]`;
+    });
     return id2;
   }
 };
@@ -872,14 +860,14 @@ var PluginsManager = class {
     if (!isPlugin(plugin))
       throw new ErrMissingPluginMetadata(plugin);
     const metadata = getPluginMetadata(plugin);
-    if (this.plugins_.has(metadata.id))
+    if (this.plugins_.has(plugin))
       return;
     const entry2 = {
       ctor: plugin,
       ctorParams: constructorProps,
       metadata
     };
-    this.plugins_.set(metadata.id, entry2);
+    this.plugins_.set(plugin, entry2);
     this.logger.debug(() => `[Plugins]: Installed plugin ${metadata.name} (${metadata.version})`);
   }
   build() {
@@ -890,15 +878,15 @@ var PluginsManager = class {
     for (const id2 of this.plugins_.keys()) {
       nodes.set(id2, new DAGNode(id2));
     }
-    for (const [id2, entry2] of this.plugins_) {
-      const node = nodes.get(id2);
+    for (const [plugin, entry2] of this.plugins_) {
+      const node = nodes.get(plugin);
       const depPlugins = entry2.metadata.dependencies?.plugins ?? [];
       for (const dep of depPlugins) {
-        const depNode = nodes.get(dep.id);
+        const depNode = nodes.get(dep.plugin);
         if (!depNode) {
-          throw new ErrMissingPluginDependency(id2, dep.id);
+          throw new ErrMissingPluginDependency(plugin, dep.plugin);
         }
-        node.vertices.push(depNode);
+        depNode.vertices.push(node);
       }
     }
     let sortedNodes;
@@ -928,31 +916,20 @@ var PluginsManager = class {
       p.instance?.onAfterWorldInit?.(world);
     }
   }
-  getPluginMetadata(pluginOrId) {
-    const id2 = this.resolveId(pluginOrId);
-    const entry2 = this.plugins_.get(id2);
-    if (!entry2) throw new ErrUnknownPlugin(id2);
+  getPluginMetadata(plugin) {
+    const entry2 = this.plugins_.get(plugin);
+    if (!entry2) throw new ErrUnknownPlugin(plugin);
     return entry2.metadata;
   }
-  getPluginInstance(pluginOrId) {
+  getPluginInstance(plugin) {
+    const entry2 = this.plugins_.get(plugin);
+    if (!entry2) throw new ErrUnknownPlugin(plugin);
+    if (!entry2.instance) throw new ErrPluginNotInit(plugin);
     if (!this.isInitiated_) {
-      throw new Error("Plugin instance is not initiated yet. Use PluginManager.build() before use plugins.");
+      throw new ErrPluginNotInit(plugin);
     }
-    const id2 = this.resolveId(pluginOrId);
-    const entry2 = this.plugins_.get(id2);
-    if (!entry2) throw new ErrUnknownPlugin(id2);
-    if (!entry2.instance) throw new ErrPluginNotInit(id2);
     return entry2.instance;
   }
-  resolveId(pluginOrId) {
-    if (typeof pluginOrId === "string") {
-      return pluginOrId;
-    }
-    if (!isPlugin(pluginOrId)) {
-      throw new ErrMissingPluginMetadata(pluginOrId);
-    }
-    return getPluginMetadata(pluginOrId).id;
-  }
 };
 
 // src/ecs/world.ts
@@ -967,9 +944,13 @@ var World3 = class {
   plugins;
   logger;
   entityRefs_ = /* @__PURE__ */ new Map();
+  updatesCount_ = 0;
+  get updatesCount() {
+    return this.updatesCount_;
+  }
   constructor(params) {
     this.entities = new EntitiesManager(params.logger);
-    this.components = new ComponentsManager(params.maxEntityCount ?? ECS_DEFAULTS.MAX_ENTITY_COUNT);
+    this.components = new ComponentsManager(params.logger, params.maxEntityCount ?? ECS_DEFAULTS.MAX_ENTITY_COUNT);
     this.systems = new SystemsManager(this, params.logger);
     this.events = new EventBus();
     this.resources = new ResourcesManager(params.logger);
@@ -1015,6 +996,7 @@ var World3 = class {
   update(clock) {
     this.systems.update(clock.getTime());
     this.commands.flush(this);
+    this.updatesCount_++;
   }
   build() {
     this.plugins.build();
@@ -1310,9 +1292,9 @@ var Engine = class {
   PluginBase,
   PluginError,
   PluginsManager,
+  Resource,
   ResourcesManager,
   Runtime,
-  SingletonStorage,
   System,
   SystemBase,
   SystemError,
@@ -1324,6 +1306,7 @@ var Engine = class {
   createEventKey,
   entry,
   getPluginMetadata,
+  getResourceMetadata,
   getSystemMetadata,
   isPlugin,
   isSystem,