refactor(entity): replace decodeRelationId with specific getters

Author: codehz

src/archetype.ts

@@ -1,8 +1,9 @@
 import type { EntityId, RelationId, WildcardRelationId } from "./entity";
 import {
-  decodeRelationId,
+  getComponentIdFromRelationId,
   getDetailedIdType,
   getIdType,
+  getTargetIdFromRelationId,
   isDontFragmentComponent,
   isWildcardRelationId,
 } from "./entity";
@@ -278,8 +279,7 @@ export class Archetype {
     }
 
     if (isWildcardRelationId(componentType)) {
-      const decoded = decodeRelationId(componentType);
-      const componentId = decoded.componentId;
+      const componentId = getComponentIdFromRelationId(componentType);
       const relations: [EntityId<unknown>, any][] = [];
 
       // Check regular archetype components
@@ -507,14 +507,13 @@ export class Archetype {
     for (const relType of matchingRelations) {
       const dataArray = this.getComponentData(relType);
       const data = dataArray[entityIndex];
-      const decodedRel = decodeRelationId(relType as RelationId<any>);
-      relations.push([decodedRel.targetId, data === MISSING_COMPONENT ? undefined : data]);
+      const targetId = getTargetIdFromRelationId(relType)!;
+      relations.push([targetId, data === MISSING_COMPONENT ? undefined : data]);
     }
 
     // Add dontFragment relations for this entity
     // Get the component ID from the wildcard relation type
-    const wildcardDecoded = decodeRelationId(wildcardRelationType);
-    const targetComponentId = wildcardDecoded.componentId;
+    const targetComponentId = getComponentIdFromRelationId(wildcardRelationType);
 
     const dontFragmentData = this.dontFragmentRelations.get(entityId);
     if (dontFragmentData) {
@@ -533,9 +532,9 @@ export class Archetype {
     // If no relations found and not optional, this entity doesn't match
     if (relations.length === 0) {
       if (!optional) {
-        const wildcardDecoded = decodeRelationId(wildcardRelationType);
+        const componentId = getComponentIdFromRelationId(wildcardRelationType);
         throw new Error(
-          `No matching relations found for mandatory wildcard relation component ${wildcardDecoded.componentId} on entity ${entityId}`,
+          `No matching relations found for mandatory wildcard relation component ${componentId} on entity ${entityId}`,
         );
       }
       // For optional, return undefined when there are no relations

src/index.ts

@@ -18,7 +18,6 @@ export {
   isEntityId,
   isRelationId,
   isWildcardRelationId,
-  decodeRelationId,
   getComponentIdByName,
   getComponentNameById,
 } from "./entity";

src/query-filter.ts

@@ -1,6 +1,6 @@
 import { Archetype } from "./archetype";
 import type { EntityId } from "./entity";
-import { decodeRelationId, getDetailedIdType, isRelationId } from "./entity";
+import { getComponentIdFromRelationId, getDetailedIdType, isRelationId } from "./entity";
 
 /**
  * Filter options for queries
@@ -29,8 +29,8 @@ export function matchesComponentTypes(archetype: Archetype, componentTypes: Enti
       // For wildcard relations, check if archetype contains the component relation
       return archetype.componentTypes.some((archetypeType) => {
         if (!isRelationId(archetypeType)) return false;
-        const decoded = decodeRelationId(archetypeType);
-        return decoded.componentId === detailedType.componentId;
+        const componentId = getComponentIdFromRelationId(archetypeType);
+        return componentId === detailedType.componentId;
       });
     } else {
       // For regular components, check direct inclusion
@@ -50,8 +50,8 @@ export function matchesFilter(archetype: Archetype, filter: QueryFilter): boolea
       // For wildcard relations in negative filter, exclude archetypes that contain ANY relation with the same component
       return !archetype.componentTypes.some((archetypeType) => {
         if (!isRelationId(archetypeType)) return false;
-        const decoded = decodeRelationId(archetypeType);
-        return decoded.componentId === detailedType.componentId;
+        const componentId = getComponentIdFromRelationId(archetypeType);
+        return componentId === detailedType.componentId;
       });
     } else {
       // For regular components, check direct exclusion