@codehz/ecs 0.2.1 → 0.2.3

package/entity.d.ts

@@ -95,9 +95,13 @@ export declare function getDetailedIdType(id: EntityId<any>): {
     componentId?: never;
     targetId?: never;
 } | {
-    type: "entity-relation" | "component-relation" | "wildcard-relation";
+    type: "entity-relation" | "wildcard-relation";
     componentId: ComponentId<any>;
     targetId: EntityId<any>;
+} | {
+    type: "component-relation";
+    componentId: ComponentId<any>;
+    targetId: ComponentId<any>;
 };
 /**
  * Inspect an EntityId and return a human-readable string representation

package/index.js

@@ -601,7 +601,12 @@ function matchesComponentTypes(archetype, componentTypes) {
   return componentTypes.every((type) => {
     const detailedType = getDetailedIdType(type);
     if (detailedType.type === "wildcard-relation") {
-      return archetype.componentTypes.includes(detailedType.componentId);
+      return archetype.componentTypes.some((archetypeType) => {
+        if (!isRelationId(archetypeType))
+          return false;
+        const decoded = decodeRelationId(archetypeType);
+        return decoded.componentId === detailedType.componentId;
+      });
     } else {
       return archetype.componentTypes.includes(type);
     }
@@ -814,12 +819,20 @@ class World {
                 throw new Error(`Unknown component name in snapshot: ${componentTypeRaw}`);
               }
               componentType = compId;
-            } else if (typeof componentTypeRaw === "object" && componentTypeRaw !== null && typeof componentTypeRaw.component === "string" && typeof componentTypeRaw.target === "number") {
+            } else if (typeof componentTypeRaw === "object" && componentTypeRaw !== null && typeof componentTypeRaw.component === "string") {
               const compId = getComponentIdByName(componentTypeRaw.component);
               if (compId === undefined) {
                 throw new Error(`Unknown component name in snapshot: ${componentTypeRaw.component}`);
               }
-              componentType = relation(compId, componentTypeRaw.target);
+              if (typeof componentTypeRaw.target === "string") {
+                const targetCompId = getComponentIdByName(componentTypeRaw.target);
+                if (targetCompId === undefined) {
+                  throw new Error(`Unknown target component name in snapshot: ${componentTypeRaw.target}`);
+                }
+                componentType = relation(compId, targetCompId);
+              } else {
+                componentType = relation(compId, componentTypeRaw.target);
+              }
             } else {
               throw new Error(`Invalid component type in snapshot: ${JSON.stringify(componentTypeRaw)}`);
             }
@@ -1272,12 +1285,20 @@ class World {
                 type = getComponentNameById(rawType) || rawType;
                 break;
               case "entity-relation":
-              case "component-relation":
                 componentName = getComponentNameById(detailedType.componentId);
                 if (componentName) {
                   type = { component: componentName, target: detailedType.targetId };
                 }
                 break;
+              case "component-relation":
+                componentName = getComponentNameById(detailedType.componentId);
+                if (componentName) {
+                  type = {
+                    component: componentName,
+                    target: getComponentNameById(detailedType.targetId) || detailedType.targetId
+                  };
+                }
+                break;
             }
             return { type, value: value === MISSING_COMPONENT ? undefined : value };
           })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codehz/ecs",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "type": "module",
   "main": "./index.js",
   "types": "./index.d.ts",

package/world.d.ts

@@ -207,7 +207,7 @@ export type SerializedEntity = {
 export type SerializedComponent = {
     type: number | string | {
         component: string;
-        target: number;
+        target: number | string;
     };
     value: any;
 };