V2: Avoid Array.flatMap

packages/bundle-size/README.md

@@ -16,11 +16,11 @@ usually do. We repeat this for an increasing number of files.
 <!--- TABLE-START -->
 | code generator  | files    | bundle size             | minified               | compressed         |
 |-----------------|----------|------------------------:|-----------------------:|-------------------:|
-| protobuf-es | 1 | 125,833 b | 65,603 b | 15,257 b |
-| protobuf-es | 4 | 128,022 b | 67,111 b | 15,948 b |
-| protobuf-es | 8 | 130,784 b | 68,882 b | 16,433 b |
-| protobuf-es | 16 | 141,234 b | 76,863 b | 18,756 b |
-| protobuf-es | 32 | 169,025 b | 98,881 b | 24,210 b |
+| protobuf-es | 1 | 125,817 b | 65,597 b | 15,272 b |
+| protobuf-es | 4 | 128,006 b | 67,105 b | 15,919 b |
+| protobuf-es | 8 | 130,768 b | 68,876 b | 16,418 b |
+| protobuf-es | 16 | 141,218 b | 76,857 b | 18,753 b |
+| protobuf-es | 32 | 169,009 b | 98,875 b | 24,198 b |
 | protobuf-javascript | 1 | 339,613 b | 255,820 b | 42,481 b |
 | protobuf-javascript | 4 | 366,281 b | 271,092 b | 43,912 b |
 | protobuf-javascript | 8 | 388,324 b | 283,409 b | 45,038 b |

packages/protobuf-conformance/tsconfig.json

@@ -2,10 +2,9 @@
   "include": ["src/**/*.ts"],
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "lib": [
-      "ES2016",
-      // ES2020.BigInt for the bigint representation of 64-bit integers
-      "ES2020.BigInt"
+    "types": [
+      // The conformance testee uses Node.js APIs
+      "node"
     ]
   }
 }

packages/protobuf-example/tsconfig.json

@@ -1,8 +1,9 @@
 {
   "files": ["src/add-person.ts", "src/list-people.ts"],
   "compilerOptions": {
-    "target": "es2016",
+    "target": "es2017",
+    "moduleResolution": "Node10",
     "strict": true,
-    "moduleResolution": "Node"
+    "forceConsistentCasingInFileNames": true
   }
 }

packages/protobuf/src/proto-int64.ts

@@ -118,6 +118,12 @@ interface Int64Support {
   uDec(lo: number, hi: number): bigint;
 }
 
+// The environment variable BUF_BIGINT_DISABLE=1 disables bigint support for
+// testing.
+declare const process: {
+  env: Record<string, string>;
+};
+
 function makeInt64Support(): Int64Support {
   const dv = new DataView(new ArrayBuffer(8));
   // note that Safari 14 implements BigInt, but not the DataView methods

packages/protobuf/src/registry.ts

@@ -248,7 +248,7 @@ export function createFileRegistry(
           deps.push(dep);
         }
       }
-      return [...deps, ...deps.flatMap((dep) => recurseDeps(dep))];
+      return deps.concat(...deps.map(recurseDeps));
     }
     for (const file of [input, ...recurseDeps(input)].reverse()) {
       addFile(file, registry);

packages/protobuf/src/wire/text-encoding.ts

@@ -44,8 +44,12 @@ export function configureTextEncoding(textEncoding: TextEncoding): void {
 
 export function getTextEncoding() {
   if ((globalThis as GlobalWithTextEncoding)[symbol] == undefined) {
-    const te = new globalThis.TextEncoder();
-    const td = new globalThis.TextDecoder();
+    const te = new (
+      globalThis as unknown as GlobalWithTextEncoderDecoder
+    ).TextEncoder();
+    const td = new (
+      globalThis as unknown as GlobalWithTextEncoderDecoder
+    ).TextDecoder();
     (globalThis as GlobalWithTextEncoding)[symbol] = {
       encodeUtf8(text: string): Uint8Array {
         return te.encode(text);
@@ -69,3 +73,16 @@ export function getTextEncoding() {
 type GlobalWithTextEncoding = {
   [symbol]?: TextEncoding;
 };
+
+type GlobalWithTextEncoderDecoder = {
+  TextEncoder: {
+    new (): {
+      encode(text: string): Uint8Array;
+    };
+  };
+  TextDecoder: {
+    new (): {
+      decode(data: Uint8Array): string;
+    };
+  };
+};

packages/protobuf/tsconfig.json

@@ -6,14 +6,5 @@
     "src/wkt/index.ts",
     "src/wire/index.ts"
   ],
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "lib": [
-      "ES2017",
-      // ES2020.BigInt for the bigint representation of 64-bit integers
-      // Note that these are only required for using bigint literals
-      // or the BigInt constructor function.
-      "ES2020.BigInt"
-    ]
-  }
+  "extends": "../../tsconfig.base.json"
 }

packages/protoplugin-example/tsconfig.json

@@ -3,10 +3,8 @@
   "compilerOptions": {
     "target": "es2017",
     "moduleResolution": "Node10",
-    "esModuleInterop": false,
     "resolveJsonModule": true,
     "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "verbatimModuleSyntax": true
+    "forceConsistentCasingInFileNames": true
   }
 }

packages/protoplugin/tsconfig.json

@@ -3,6 +3,14 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+    "types": [
+      // src/run-node.ts uses Node.js APIs
+      "node"
+    ],
+    "lib": [
+      // @typescript/vfs references the LocalStorage type
+      "dom"
+    ]
   }
 }

tsconfig.base.json

@@ -1,9 +1,24 @@
 {
   "compilerOptions": {
+    // We target ES2017, but require the Text Encoding API, and optionally
+    // BigInt and AsyncIterable, see below.
     "target": "es2017",
+    "lib": [
+      "ES2017",
+      // ES2020.BigInt for the bigint representation of 64-bit integers
+      // Note that these are only required for using bigint literals
+      // or the BigInt constructor function.
+      "ES2020.BigInt",
+      // AsyncIterable is required only for src/wire/size-delimited.ts.
+      "ES2018.AsyncIterable"
+    ],
+    // Prevent tsc from picking up @types/node and others
+    "types": [],
+    // We don't have dependencies that require interop
     "esModuleInterop": false,
-    "forceConsistentCasingInFileNames": true,
+    // As strict as possible
     "strict": true,
+    "forceConsistentCasingInFileNames": true,
     "noImplicitAny": true,
     "strictNullChecks": true,
     "strictFunctionTypes": true,
@@ -15,7 +30,7 @@
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
     "noImplicitOverride": true,
-    // We need node's module resolution, so we do not have to skip lib checks
+    // We're building with Node16 module resolution
     "moduleResolution": "Node16",
     "module": "Node16",
     "verbatimModuleSyntax": true,