@sentio/sdk 2.39.3 → 2.39.4-rc.10

package/src/store/store.ts

@@ -1,40 +1,68 @@
-import { Entity, EntityClass } from './entity.js'
 import { StoreContext } from './context.js'
 import { DatabaseSchema } from '../core/index.js'
 import { BigDecimal } from '@sentio/bigdecimal'
+import { Bytes, Float, ID, Int, Timestamp } from './types.js'
+import type { Entity as EntityStruct, RichValue } from '@sentio/protos'
+import { DBRequest_DBOperator, DBResponse } from '@sentio/protos'
+import { toBigInteger } from './convert.js'
+import { PluginManager } from '@sentio/runtime'
+
+type Value = ID | string | Int | Float | boolean | Timestamp | Bytes | BigDecimal | bigint
+
+interface Entity {
+  id: ID
+}
+
+export interface EntityClass<T> {
+  new (data: Partial<T>): T
+}
 
 export class Store {
   constructor(private readonly context: StoreContext) {}
 
-  async get<T extends Entity>(entity: EntityClass<T> | string, id: string): Promise<T | undefined> {
+  async get<T extends Entity>(entity: EntityClass<T> | string, id: ID): Promise<T | undefined> {
     const promise = this.context.sendRequest({
       get: {
         entity: typeof entity == 'string' ? entity : entity.prototype.entityName,
-        id
+        id: id.toString()
       }
     })
 
-    const data = (await promise) as any
-    if (data?.['id'] != null) {
-      return this.newEntity(entity, data)
+    const data = (await promise) as DBResponse
+    if (data.entityList?.entities[0]) {
+      const entityData = data.entityList?.entities[0]
+      return this.newEntity(entity, entityData)
     }
+
     return undefined
   }
 
-  async delete(entity: EntityClass<any>, id: string | string[]): Promise<void> {
-    const toBeDeleted = []
-    if (Array.isArray(id)) {
-      for (const i of id) {
-        toBeDeleted.push({ entity: entity.prototype.entityName, id: i })
+  async delete<T extends Entity>(entity: EntityClass<T> | T | T[], id?: string | string[]): Promise<void> {
+    const request = {
+      entity: [] as string[],
+      id: [] as string[]
+    }
+    if (id) {
+      if (Array.isArray(id)) {
+        for (const i of id) {
+          const items = (entity as any).prototype.entityName
+          request.entity.push(items)
+          request.id.push(i.toString())
+        }
+      } else {
+        request.entity.push((entity as any).prototype.entityName)
+        request.id.push(id)
       }
     } else {
-      toBeDeleted.push({ entity: entity.prototype.entityName, id })
+      const entities = Array.isArray(entity) ? entity : [entity]
+      for (const e of entities) {
+        request.entity.push(e.constructor.prototype.entityName)
+        request.id.push((e as Entity).id.toString())
+      }
     }
+
     await this.context.sendRequest({
-      delete: {
-        entity: toBeDeleted.map((e) => e.entity) as string[],
-        id: toBeDeleted.map((e) => e.id) as string[]
-      }
+      delete: request
     })
   }
 
@@ -43,65 +71,138 @@ export class Store {
     const promise = this.context.sendRequest({
       upsert: {
         entity: entities.map((e) => e.constructor.prototype.entityName),
-        data: entities.map((e) => serialize(e.data)),
-        id: entities.map((e) => e.id)
+        // data: entities.map((e) => serialize(e.data)),
+        id: entities.map((e) => e.id.toString()),
+        entityData: entities.map((e: any) => e._data)
       }
     })
 
     await promise
   }
 
-  async list<T extends Entity>(entity: EntityClass<T>, limit?: number, offset?: number): Promise<T[]> {
-    const promise = this.context.sendRequest({
-      list: {
-        entity: entity.prototype.entityName,
-        limit,
-        offset
-      }
-    })
+  async *list<T extends Entity>(entity: EntityClass<T>, filters?: ListFilter<T>[]) {
+    let cursor: string | undefined = undefined
 
-    const list = (await promise) as any[]
-    return list.map((data) => {
-      return this.newEntity(entity, data)
-    })
+    while (true) {
+      const promise = this.context.sendRequest({
+        list: {
+          entity: entity.prototype.entityName,
+          cursor,
+          filters:
+            filters?.map((f) => ({
+              field: f.field as string,
+              op: ops[f.op],
+              value: { values: Array.isArray(f.value) ? f.value.map((v) => serialize(v)) : [serialize(f.value)] }
+            })) || []
+        }
+      })
+      const response = (await promise) as DBResponse
+      for (const data of response.entityList?.entities || []) {
+        yield this.newEntity(entity, data)
+      }
+      if (!response.nextCursor) {
+        break
+      }
+      cursor = response.nextCursor
+    }
   }
 
-  private newEntity<T extends Entity>(entity: EntityClass<T> | string, data: any) {
+  private newEntity<T extends Entity>(entity: EntityClass<T> | string, data: EntityStruct) {
     if (typeof entity == 'string') {
-      const en = DatabaseSchema.findEntity(entity)
+      let en = DatabaseSchema.findEntity(entity)
       if (!en) {
         // it is an interface
-        return new Entity(data) as T
+        en = DatabaseSchema.findEntity(data.entity)
+        if (!en) {
+          throw new Error(`Entity ${entity} not found`)
+        }
       }
       entity = en
     }
 
-    return new (entity as EntityClass<T>)(data)
+    const res = new (entity as EntityClass<T>)({}) as T
+    ;(res as any)._data = data.data
+    return res
   }
 }
 
-function serialize(data: Record<string, any>) {
-  const ret: Record<string, any> = {}
-  for (const [k, v] of Object.entries(data)) {
-    if (v instanceof Entity) {
-      ret[k] = v.id
-    } else if (Array.isArray(v) && v[0] instanceof Entity) {
-      ret[k] = v.map((e) => e.id)
-    } else if (typeof v === 'bigint') {
-      ret[k] = v.toString()
-    } else if (typeof v === 'object') {
-      if (v instanceof Date) {
-        ret[k] = v.toISOString()
-      } else if (v instanceof Uint8Array) {
-        ret[k] = Buffer.from(v).toString('hex')
-      } else if (v instanceof BigDecimal) {
-        ret[k] = v.toString()
-      } else {
-        ret[k] = serialize(v)
-      }
-    } else {
-      ret[k] = v
+export type Operators = '=' | '!=' | '<' | '<=' | '>' | '>=' | 'in' | 'not in'
+
+export interface ListFilter<T extends Entity> {
+  field: keyof T
+  op: Operators
+  value: Value | Value[] | null
+}
+
+export interface ListOptions<T extends Entity> {
+  cursor: string
+}
+
+const ops: Record<Operators, DBRequest_DBOperator> = {
+  '=': DBRequest_DBOperator.EQ,
+  '!=': DBRequest_DBOperator.NE,
+  '<': DBRequest_DBOperator.LT,
+  '<=': DBRequest_DBOperator.LE,
+  '>': DBRequest_DBOperator.GT,
+  '>=': DBRequest_DBOperator.GE,
+  in: DBRequest_DBOperator.IN,
+  'not in': DBRequest_DBOperator.NOT_IN
+}
+
+function serialize(v: any): RichValue {
+  if (v == null) {
+    return { nullValue: 0 }
+  }
+  if (typeof v == 'boolean') {
+    return { boolValue: v }
+  }
+  if (typeof v == 'string') {
+    return { stringValue: v }
+  }
+
+  if (typeof v == 'number') {
+    return { floatValue: v }
+  }
+  if (typeof v == 'bigint') {
+    return {
+      bigintValue: toBigInteger(v)
+    }
+  }
+
+  if (v instanceof BigDecimal) {
+    return serializeBigDecimal(v)
+  }
+
+  if (v instanceof Date) {
+    return {
+      timestampValue: v
     }
   }
-  return ret
+
+  if (v instanceof Uint8Array) {
+    return { bytesValue: v }
+  }
+
+  if (Array.isArray(v)) {
+    return {
+      listValue: { values: v.map((v) => serialize(v)) }
+    }
+  }
+  return {
+    nullValue: 0
+  }
+}
+
+function serializeBigDecimal(v: BigDecimal): RichValue {
+  return {
+    bigdecimalValue: undefined
+  }
+}
+
+export function getStore() {
+  const dbContext = PluginManager.INSTANCE.dbContextLocalStorage.getStore()
+  if (dbContext) {
+    return new Store(dbContext)
+  }
+  return undefined
 }

package/src/store/types.ts

@@ -1,10 +1,29 @@
-export type { BigDecimal } from '@sentio/bigdecimal'
-
-export type ID = string
+export type ID = (string | Uint8Array) & { __id__?: void }
 export type String = string
-export type Int = number
+export type Int = number & { __int__?: void }
 export type Float = number
 export type Boolean = boolean
-export type DateTime = Date
-export type Json = any
+export type Timestamp = Date
 export type Bytes = Uint8Array
+export type BigInt = bigint
+
+export class Struct<T = unknown, S = unknown> {
+  readonly TYPE!: T
+  constructor(readonly schema: S) {}
+}
+export type Infer<T extends Struct<any>> = T['TYPE']
+export type ObjectSchema = Record<string, Struct<any, any>>
+
+export function object<S extends ObjectSchema>(schema: S): Struct<ObjectType<S>, S> {
+  return new Struct(schema ?? null)
+}
+
+export type Simplify<T> = T extends any[] | Date ? T : { [K in keyof T]: T[K] } & NonNullable<unknown>
+
+export type ObjectType<S extends ObjectSchema> = Simplify<{ [K in keyof S]: Infer<S[K]> }>
+
+const StringStruct = new Struct<string, null>(null)
+
+const UU = object({
+  test: StringStruct
+})

package/lib/store/entity.d.ts

@@ -1,17 +0,0 @@
-import { ID } from './types.js';
-export interface EntityClass<T extends Entity> {
-    new (data: any): T;
-}
-export declare class Entity {
-    get id(): ID;
-    data: Record<string, any>;
-    constructor(data: any);
-    private getIdFromEntity;
-    private getStore;
-    get<T>(field: string): T;
-    set<T>(field: string, value: T | T[] | ID | ID[]): void;
-    protected getFieldObject<T extends Entity>(entity: EntityClass<T> | string, field: string): Promise<T | undefined>;
-    protected getFieldObjectArray<T extends Entity>(entity: EntityClass<T>, field: string): Promise<T[]>;
-    toString(): string;
-}
-//# sourceMappingURL=entity.d.ts.map

package/lib/store/entity.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/store/entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,YAAY,CAAA;AAI/B,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,MAAM;IAC3C,KAAK,IAAI,EAAE,GAAG,GAAG,CAAC,CAAA;CACnB;AAED,qBAAa,MAAM;IACjB,IAAI,EAAE,IAAI,EAAE,CAEX;IAED,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAK;gBAClB,IAAI,EAAE,GAAG;IAUrB,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,QAAQ;IAQhB,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC;IAIxB,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,GAAG,IAAI;IASvD,SAAS,CAAC,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKlH,SAAS,CAAC,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAMpG,QAAQ,IAAI,MAAM;CAKnB"}

package/lib/store/entity.js

@@ -1,61 +0,0 @@
-import { PluginManager } from '@sentio/runtime';
-import { Store } from './store.js';
-export class Entity {
-    get id() {
-        return this.get('id');
-    }
-    data = {};
-    constructor(data) {
-        Object.entries(data).forEach(([key, value]) => {
-            if (Array.isArray(value)) {
-                this.data[key] = value.map((v) => this.getIdFromEntity(v));
-            }
-            else {
-                this.data[key] = this.getIdFromEntity(value);
-            }
-        });
-    }
-    getIdFromEntity(entity) {
-        if (entity instanceof Entity) {
-            return entity.id;
-        }
-        else if (typeof entity === 'object' && entity.id) {
-            return entity.id;
-        }
-        return entity;
-    }
-    getStore() {
-        const dbContext = PluginManager.INSTANCE.dbContextLocalStorage.getStore();
-        if (dbContext) {
-            return new Store(dbContext);
-        }
-        return undefined;
-    }
-    get(field) {
-        return this.data[field];
-    }
-    set(field, value) {
-        if (Array.isArray(value) && value instanceof Entity) {
-            this.data[field] = value.map((v) => v.id);
-        }
-        else if (value instanceof Entity) {
-            this.data[field] = value.id;
-        }
-        this.data[field] = value;
-    }
-    getFieldObject(entity, field) {
-        const id = this.data[field];
-        return id ? this.getStore()?.get(entity, id) : Promise.resolve(undefined);
-    }
-    getFieldObjectArray(entity, field) {
-        const ids = this.data[field];
-        const promises = ids.map((id) => this.getStore()?.get(entity, id));
-        return Promise.all(promises);
-    }
-    toString() {
-        const entityName = this.constructor.prototype.entityName;
-        const id = this.id;
-        return `${entityName}#${id} ${JSON.stringify(this.data)}`;
-    }
-}
-//# sourceMappingURL=entity.js.map

package/lib/store/entity.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../src/store/entity.ts"],"names":[],"mappings":"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"}

package/src/store/entity.ts

@@ -1,71 +0,0 @@
-import { ID } from './types.js'
-import { PluginManager } from '@sentio/runtime'
-import { Store } from './store.js'
-
-export interface EntityClass<T extends Entity> {
-  new (data: any): T
-}
-
-export class Entity {
-  get id(): ID {
-    return this.get('id')
-  }
-
-  data: Record<string, any> = {}
-  constructor(data: any) {
-    Object.entries(data).forEach(([key, value]) => {
-      if (Array.isArray(value)) {
-        this.data[key] = value.map((v) => this.getIdFromEntity(v))
-      } else {
-        this.data[key] = this.getIdFromEntity(value)
-      }
-    })
-  }
-
-  private getIdFromEntity(entity: any): any {
-    if (entity instanceof Entity) {
-      return entity.id
-    } else if (typeof entity === 'object' && entity.id) {
-      return entity.id
-    }
-    return entity
-  }
-
-  private getStore() {
-    const dbContext = PluginManager.INSTANCE.dbContextLocalStorage.getStore()
-    if (dbContext) {
-      return new Store(dbContext)
-    }
-    return undefined
-  }
-
-  get<T>(field: string): T {
-    return this.data[field]
-  }
-
-  set<T>(field: string, value: T | T[] | ID | ID[]): void {
-    if (Array.isArray(value) && value instanceof Entity) {
-      this.data[field] = value.map((v) => (v as Entity).id)
-    } else if (value instanceof Entity) {
-      this.data[field] = (value as Entity).id
-    }
-    this.data[field] = value
-  }
-
-  protected getFieldObject<T extends Entity>(entity: EntityClass<T> | string, field: string): Promise<T | undefined> {
-    const id = this.data[field]
-    return id ? (this.getStore()?.get(entity, id) as Promise<T>) : Promise.resolve(undefined)
-  }
-
-  protected getFieldObjectArray<T extends Entity>(entity: EntityClass<T>, field: string): Promise<T[]> {
-    const ids = this.data[field]
-    const promises = ids.map((id: string) => this.getStore()?.get(entity, id))
-    return Promise.all(promises) as Promise<T[]>
-  }
-
-  toString(): string {
-    const entityName = this.constructor.prototype.entityName
-    const id = this.id
-    return `${entityName}#${id} ${JSON.stringify(this.data)}`
-  }
-}