chore: upgrade deps (#168)

decentraland · Apr 10, 2023 · a3c1149 · a3c1149
1 parent 9a51ad0
commit a3c1149
Show file tree

Hide file tree

Showing 8 changed files with 1,149 additions and 1,889 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,15 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
+{
+	"name": "docker",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/typescript-node:0-18",
+	"features": {},
+
+	"postCreateCommand": "make install",
+
+  "containerEnv": {
+    "DCL_DISABLE_ANALYTICS": "true",
+    "SHELL": "/usr/bin/zsh"
+  }
+}
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,5 @@ test/codegen/*_pb.*
 src/protocol/index.ts
 test/codegen/client.ts
 test/benchmarks/compiled
-perf
+perf
+*.zip
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-PROTOBUF_VERSION = 3.19.1
+PROTOBUF_VERSION = 22.2
 PROTOC ?= protoc
 UNAME := $(shell uname)
 PROTO_FILES := $(wildcard src/*.proto)

diff --git a/example/api.ts b/example/api.ts
@@ -37,25 +37,38 @@ export const Book = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Book {
-    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseBook();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
+          if (tag != 8) {
+            break;
+          }
+
           message.isbn = longToNumber(reader.int64() as Long);
-          break;
+          continue;
         case 2:
+          if (tag != 18) {
+            break;
+          }
+
           message.title = reader.string();
-          break;
+          continue;
         case 3:
+          if (tag != 26) {
+            break;
+          }
+
           message.author = reader.string();
-          break;
-        default:
-          reader.skipType(tag & 7);
-          break;
+          continue;
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
       }
+      reader.skipType(tag & 7);
     }
     return message;
   },
@@ -76,6 +89,10 @@ export const Book = {
     return obj;
   },
 
+  create<I extends Exact<DeepPartial<Book>, I>>(base?: I): Book {
+    return Book.fromPartial(base ?? {});
+  },
+
   fromPartial<I extends Exact<DeepPartial<Book>, I>>(object: I): Book {
     const message = createBaseBook();
     message.isbn = object.isbn ?? 0;
@@ -98,19 +115,24 @@ export const GetBookRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): GetBookRequest {
-    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseGetBookRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
+          if (tag != 8) {
+            break;
+          }
+
           message.isbn = longToNumber(reader.int64() as Long);
-          break;
-        default:
-          reader.skipType(tag & 7);
-          break;
+          continue;
       }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
     }
     return message;
   },
@@ -125,6 +147,10 @@ export const GetBookRequest = {
     return obj;
   },
 
+  create<I extends Exact<DeepPartial<GetBookRequest>, I>>(base?: I): GetBookRequest {
+    return GetBookRequest.fromPartial(base ?? {});
+  },
+
   fromPartial<I extends Exact<DeepPartial<GetBookRequest>, I>>(object: I): GetBookRequest {
     const message = createBaseGetBookRequest();
     message.isbn = object.isbn ?? 0;
@@ -145,19 +171,24 @@ export const QueryBooksRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryBooksRequest {
-    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseQueryBooksRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
+          if (tag != 10) {
+            break;
+          }
+
           message.authorPrefix = reader.string();
-          break;
-        default:
-          reader.skipType(tag & 7);
-          break;
+          continue;
       }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
     }
     return message;
   },
@@ -172,6 +203,10 @@ export const QueryBooksRequest = {
     return obj;
   },
 
+  create<I extends Exact<DeepPartial<QueryBooksRequest>, I>>(base?: I): QueryBooksRequest {
+    return QueryBooksRequest.fromPartial(base ?? {});
+  },
+
   fromPartial<I extends Exact<DeepPartial<QueryBooksRequest>, I>>(object: I): QueryBooksRequest {
     const message = createBaseQueryBooksRequest();
     message.authorPrefix = object.authorPrefix ?? "";
@@ -222,7 +257,7 @@ export const BookServiceDefinition = {
 declare var self: any | undefined;
 declare var window: any | undefined;
 declare var global: any | undefined;
-var globalThis: any = (() => {
+var tsProtoGlobalThis: any = (() => {
   if (typeof globalThis !== "undefined") {
     return globalThis;
   }
@@ -251,7 +286,7 @@ export type Exact<P, I extends P> = P extends Builtin ? P
 
 function longToNumber(long: Long): number {
   if (long.gt(Number.MAX_SAFE_INTEGER)) {
-    throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
+    throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
   return long.toNumber();
 }

diff --git a/jest.config.js b/jest.config.js
@@ -1,12 +1,9 @@
 module.exports = {
-  globals: {
-    "ts-jest": {
-      tsconfig: "test/tsconfig.json",
-    },
-  },
   moduleFileExtensions: ["ts", "js"],
   transform: {
-    "^.+\\.(ts|tsx)$": "ts-jest",
+    "^.+\\.(ts|tsx)$": ["ts-jest", {
+      tsconfig: "test/tsconfig.json",
+    }],
   },
   coveragePathIgnorePatterns: [
     "/node_modules/",