Fix: maps, sets and vector types (#203)

* fix: update typescript for vector, sets and maps * fix: prettier * fix: code cleaning * Delete yarn.lock * fix: return yarn.lock from develop * fix: fixing typo * fix: include deserializer in get params * fix: code cleaning * fix: removing logs * fix: code cleaning * fix: build lib
near · Sep 16, 2022 · e8d1288 · e8d1288
1 parent 0719fed
commit e8d1288
Show file tree

Hide file tree

Showing 18 changed files with 131 additions and 112 deletions.
diff --git a/examples/src/parking-lot.ts b/examples/src/parking-lot.ts
@@ -32,9 +32,9 @@ class Engine {
 
 @NearBindgen({})
 class ParkingLot {
-    cars: LookupMap;
+    cars: LookupMap<CarSpecs>;
     constructor() {
-        this.cars = new LookupMap('a');
+        this.cars = new LookupMap<CarSpecs>('a');
     }
 
     @call({})

diff --git a/lib/collections/lookup-map.d.ts b/lib/collections/lookup-map.d.ts
diff --git a/lib/collections/lookup-map.js b/lib/collections/lookup-map.js
diff --git a/lib/collections/unordered-map.d.ts b/lib/collections/unordered-map.d.ts
diff --git a/lib/collections/unordered-map.js b/lib/collections/unordered-map.js
diff --git a/lib/collections/unordered-set.d.ts b/lib/collections/unordered-set.d.ts
diff --git a/lib/collections/vector.d.ts b/lib/collections/vector.d.ts
diff --git a/lib/collections/vector.js b/lib/collections/vector.js
diff --git a/lib/types/collections.d.ts b/lib/types/collections.d.ts
diff --git a/lib/types/collections.js b/lib/types/collections.js
diff --git a/src/collections/lookup-map.ts b/src/collections/lookup-map.ts
@@ -1,7 +1,8 @@
 import * as near from '../api'
+import { GetOptions } from '../types/collections';
 import { Bytes } from '../utils';
 
-export class LookupMap {
+export class LookupMap<DataType> {
     readonly keyPrefix: Bytes;
 
     constructor(keyPrefix: Bytes) {
@@ -13,24 +14,25 @@ export class LookupMap {
         return near.storageHasKey(storageKey)
     }
 
-    get(key: Bytes): unknown | null {
+    get(key: Bytes, options?: GetOptions<DataType>): DataType | null {
         let storageKey = this.keyPrefix + JSON.stringify(key)
         let raw = near.storageRead(storageKey)
         if (raw !== null) {
-            return JSON.parse(raw)
+            const value = JSON.parse(raw)
+            return !!options?.reconstructor ? options.reconstructor(value) : value as DataType
         }
         return null
     }
 
-    remove(key: Bytes): unknown | null {
+    remove(key: Bytes): DataType | null {
         let storageKey = this.keyPrefix + JSON.stringify(key)
         if (near.storageRemove(storageKey)) {
             return JSON.parse(near.storageGetEvicted())
         }
         return null
     }
 
-    set(key: Bytes, value: unknown): unknown | null {
+    set(key: Bytes, value: DataType): DataType | null {
         let storageKey = this.keyPrefix + JSON.stringify(key)
         let storageValue = JSON.stringify(value)
         if (near.storageWrite(storageKey, storageValue)) {
@@ -39,7 +41,7 @@ export class LookupMap {
         return null
     }
 
-    extend(objects: [Bytes, unknown][]) {
+    extend(objects: [Bytes, DataType][]) {
         for (let kv of objects) {
             this.set(kv[0], kv[1])
         }
@@ -50,7 +52,7 @@ export class LookupMap {
     }
 
     // converting plain object to class object
-    static reconstruct(data: LookupMap): LookupMap {
+    static reconstruct<DataType>(data: LookupMap<DataType>): LookupMap<DataType> {
         return new LookupMap(data.keyPrefix)
     }
 }
diff --git a/src/collections/lookup-set.ts b/src/collections/lookup-set.ts
@@ -1,3 +1,5 @@
+
+
 import * as near from '../api'
 import { Bytes } from '../utils';
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,5 @@


		import * as near from '../api'
		import { Bytes } from '../utils';

Expand Down