@0xobelisk/ecs 1.2.0-pre.98 → 2.0.0

package/dist/query.d.ts

@@ -72,6 +72,11 @@ export declare class ECSQuery {
      * Validate if component type is ECS-compliant
      */
     private isECSComponent;
+    /**
+     * Resolve a componentType string to the canonical key stored in componentPrimaryKeys
+     * (handles snake_case ↔ camelCase mismatches)
+     */
+    private resolveComponentType;
     /**
      * Build entity query condition (using cached primary key field name)
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xobelisk/ecs",
-  "version": "1.2.0-pre.98",
+  "version": "2.0.0",
   "description": "Tookit for interacting with dubhe ecs client",
   "keywords": [
     "sui",
@@ -31,27 +31,7 @@
     "dist",
     "src"
   ],
-  "scripts": {
-    "build": "npm run build:types && npm run build:tsup",
-    "build:tsup": "tsup ./src/index.ts --format esm,cjs --sourcemap",
-    "build:types": "tsc --build",
-    "clean": "rm -rf tsconfig.tsbuildinfo ./dist",
-    "commit": "commit",
-    "doc": "typedoc --out docs src/index.ts",
-    "format": "prettier --write .",
-    "format:check": "prettier --check .",
-    "format:fix": "prettier --write '**/*.{ts,json,md}'",
-    "lint": "eslint . --ext .ts",
-    "test": "pnpm test:typecheck && pnpm test:unit",
-    "test:typecheck": "tsc -p ./test",
-    "type-check": "tsc --noEmit",
-    "validate": "pnpm format:check && pnpm type-check",
-    "watch": "pnpm run clean & pnpm run watch:types & pnpm run watch:tsup",
-    "watch:tsup": "tsup ./src/index.ts --format esm,cjs --clean --splitting --watch",
-    "watch:types": "tsc --watch"
-  },
   "dependencies": {
-    "@0xobelisk/graphql-client": "workspace:*",
     "@apollo/client": "^3.13.8",
     "@graphql-typed-document-node/core": "^3.2.0",
     "@types/pluralize": "^0.0.33",
@@ -64,7 +44,8 @@
     "tmp": "^0.2.1",
     "tweetnacl": "^1.0.3",
     "valibot": "^1.2.0",
-    "ws": "^8.18.0"
+    "ws": "^8.18.0",
+    "@0xobelisk/graphql-client": "2.0.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^18.0.0",
@@ -95,5 +76,24 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "build": "npm run build:types && npm run build:tsup",
+    "build:tsup": "tsup ./src/index.ts --format esm,cjs --sourcemap",
+    "build:types": "tsc --build",
+    "clean": "rm -rf tsconfig.tsbuildinfo ./dist",
+    "commit": "commit",
+    "doc": "typedoc --out docs src/index.ts",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
+    "format:fix": "prettier --write '**/*.{ts,json,md}'",
+    "lint": "eslint . --ext .ts",
+    "test": "pnpm test:typecheck && pnpm test:unit",
+    "test:typecheck": "tsc -p ./test",
+    "type-check": "tsc --noEmit",
+    "validate": "pnpm format:check && pnpm type-check",
+    "watch": "pnpm run clean & pnpm run watch:types & pnpm run watch:tsup",
+    "watch:tsup": "tsup ./src/index.ts --format esm,cjs --clean --splitting --watch",
+    "watch:types": "tsc --watch"
   }
-}
+}

package/src/query.ts

@@ -56,7 +56,20 @@ export class ECSQuery {
    * Get component's primary key field name (quickly retrieve from cache)
    */
   getComponentPrimaryKeyField(componentType: ComponentType): string {
-    return this.componentPrimaryKeys.get(componentType) || 'entityId';
+    if (this.componentPrimaryKeys.has(componentType)) {
+      return this.componentPrimaryKeys.get(componentType)!;
+    }
+    // Fallback: try camelCase → snake_case
+    const snake = componentType.replace(/([A-Z])/g, '_$1').toLowerCase();
+    if (snake !== componentType && this.componentPrimaryKeys.has(snake)) {
+      return this.componentPrimaryKeys.get(snake)!;
+    }
+    // Fallback: try snake_case → camelCase
+    const camel = componentType.replace(/_([a-z])/g, (_, l) => l.toUpperCase());
+    if (camel !== componentType && this.componentPrimaryKeys.has(camel)) {
+      return this.componentPrimaryKeys.get(camel)!;
+    }
+    return 'entityId';
   }
 
   /**
@@ -281,6 +294,9 @@ export class ECSQuery {
     try {
       const condition = this.buildEntityCondition(componentType, entityId);
       const component = await this.graphqlClient.getTableByCondition(componentType, condition);
+      // Soft-delete: the indexer marks deleted records with isDeleted=true but keeps the row.
+      // Treat any deleted record as if it doesn't exist.
+      if (component && (component as any).isDeleted === true) return null;
       return component as T;
     } catch (_error) {
       return null;
@@ -317,7 +333,27 @@ export class ECSQuery {
    * Validate if component type is ECS-compliant
    */
   private isECSComponent(componentType: ComponentType): boolean {
-    return this.availableComponents.includes(componentType);
+    if (this.availableComponents.includes(componentType)) return true;
+    // Fallback: try snake_case → camelCase conversion
+    const camel = componentType.replace(/_([a-z])/g, (_, l) => l.toUpperCase());
+    if (camel !== componentType && this.availableComponents.includes(camel)) return true;
+    // Fallback: try camelCase → snake_case conversion
+    const snake = componentType.replace(/([A-Z])/g, '_$1').toLowerCase();
+    if (snake !== componentType && this.availableComponents.includes(snake)) return true;
+    return false;
+  }
+
+  /**
+   * Resolve a componentType string to the canonical key stored in componentPrimaryKeys
+   * (handles snake_case ↔ camelCase mismatches)
+   */
+  private resolveComponentType(componentType: ComponentType): ComponentType {
+    if (this.componentPrimaryKeys.has(componentType)) return componentType;
+    const snake = componentType.replace(/([A-Z])/g, '_$1').toLowerCase();
+    if (snake !== componentType && this.componentPrimaryKeys.has(snake)) return snake;
+    const camel = componentType.replace(/_([a-z])/g, (_, l) => l.toUpperCase());
+    if (camel !== componentType && this.componentPrimaryKeys.has(camel)) return camel;
+    return componentType;
   }
 
   /**
@@ -327,8 +363,8 @@ export class ECSQuery {
     componentType: ComponentType,
     entityId: EntityId
   ): Record<string, any> {
-    // Get primary key field name from cache
-    const primaryKeyField = this.componentPrimaryKeys.get(componentType);
+    const resolved = this.resolveComponentType(componentType);
+    const primaryKeyField = this.componentPrimaryKeys.get(resolved);
     if (primaryKeyField) {
       return { [primaryKeyField]: entityId };
     } else {

package/src/subscription.ts

@@ -79,7 +79,20 @@ export class ECSSubscription {
    * Get component's primary key field name (quickly retrieve from cache, consistent with query.ts)
    */
   getComponentPrimaryKeyField(componentType: ComponentType): string {
-    return this.componentPrimaryKeys.get(componentType) || 'entityId';
+    if (this.componentPrimaryKeys.has(componentType)) {
+      return this.componentPrimaryKeys.get(componentType)!;
+    }
+    // Fallback: try camelCase → snake_case
+    const snake = componentType.replace(/([A-Z])/g, '_$1').toLowerCase();
+    if (snake !== componentType && this.componentPrimaryKeys.has(snake)) {
+      return this.componentPrimaryKeys.get(snake)!;
+    }
+    // Fallback: try snake_case → camelCase
+    const camel = componentType.replace(/_([a-z])/g, (_, l) => l.toUpperCase());
+    if (camel !== componentType && this.componentPrimaryKeys.has(camel)) {
+      return this.componentPrimaryKeys.get(camel)!;
+    }
+    return 'entityId';
   }
 
   /**
@@ -93,7 +106,14 @@ export class ECSSubscription {
    * Validate if component type is ECS-compliant
    */
   private isECSComponent(componentType: ComponentType): boolean {
-    return this.availableComponents.includes(componentType);
+    if (this.availableComponents.includes(componentType)) return true;
+    // Fallback: try snake_case → camelCase conversion
+    const camel = componentType.replace(/_([a-z])/g, (_, l) => l.toUpperCase());
+    if (camel !== componentType && this.availableComponents.includes(camel)) return true;
+    // Fallback: try camelCase → snake_case conversion
+    const snake = componentType.replace(/([A-Z])/g, '_$1').toLowerCase();
+    if (snake !== componentType && this.availableComponents.includes(snake)) return true;
+    return false;
   }
 
   /**

package/src/world.ts

@@ -195,7 +195,22 @@ export class ComponentDiscoverer {
   }
 
   getComponentMetadata(componentType: ComponentType): ComponentMetadata | null {
-    return this.componentMetadataMap.get(componentType) || null;
+    // Try exact match first
+    const direct = this.componentMetadataMap.get(componentType);
+    if (direct) return direct;
+    // Fallback: try camelCase → snake_case
+    const snake = componentType.replace(/([A-Z])/g, '_$1').toLowerCase();
+    if (snake !== componentType) {
+      const bySnake = this.componentMetadataMap.get(snake);
+      if (bySnake) return bySnake;
+    }
+    // Fallback: try snake_case → camelCase
+    const camel = componentType.replace(/_([a-z])/g, (_, l) => l.toUpperCase());
+    if (camel !== componentType) {
+      const byCamel = this.componentMetadataMap.get(camel);
+      if (byCamel) return byCamel;
+    }
+    return null;
   }
 
   private snakeToCamel(str: string): string {
@@ -388,7 +403,23 @@ export class ResourceDiscoverer {
   }
 
   getResourceMetadata(resourceType: string): ResourceMetadata | null {
-    return this.resourceMetadataMap.get(resourceType) || null;
+    // Try exact match first (original snake_case key from dubhe.config.json)
+    const direct = this.resourceMetadataMap.get(resourceType);
+    if (direct) return direct;
+
+    // Fallback: try camelCase version so callers can use 'farmPlot' instead of 'farm_plot'
+    const camel = this.snakeToCamel(resourceType);
+    if (camel !== resourceType) {
+      return this.resourceMetadataMap.get(camel) || null;
+    }
+
+    // Fallback: try converting camelCase → snake_case for reverse lookup
+    const snake = resourceType.replace(/([A-Z])/g, '_$1').toLowerCase();
+    if (snake !== resourceType) {
+      return this.resourceMetadataMap.get(snake) || null;
+    }
+
+    return null;
   }
 
   private snakeToCamel(str: string): string {
@@ -1164,8 +1195,10 @@ export class DubheECSWorld {
         };
       }
 
-      // Build where condition
-      const whereConditions: Record<string, any> = {};
+      // Build where condition — always exclude soft-deleted rows
+      const whereConditions: Record<string, any> = {
+        isDeleted: { equalTo: false }
+      };
       if (options?.filters) {
         for (const [key, value] of Object.entries(options.filters)) {
           if (typeof value === 'object' && value !== null) {