fixup! Ensure strict(er) TS compliance for the generated code

stephenh · Jul 10, 2023 · c3d25f6 · c3d25f6
1 parent 4bf6399
commit c3d25f6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 33 deletions.
diff --git a/integration/batching-with-context-esModuleInterop/batching.ts b/integration/batching-with-context-esModuleInterop/batching.ts
@@ -705,7 +705,7 @@ export class EntityServiceClientImpl<Context extends DataLoaders> implements Ent
  return new DataLoader<string, Entity>((ids) => {
  const request = { ids };
  return this.BatchMapQuery(ctx, request).then((res) => {
- return ids.map((key) => unwrap(res.entities[key]));
+ return ids.map((key) => res.entities[key] ?? fail());
  });
  }, { cacheKeyFn: hash, ...ctx.rpcDataLoaderOptions });
  });
@@ -771,9 +771,6 @@ function isSet(value: any): boolean {
  return value !== null && value !== undefined;
 }
 
-function unwrap<T>(value: T | undefined | null): T {
- if (value === undefined || value === null) {
- throw new Error("Expected value to be defined");
- }
- return value;
+function fail(message?: string): never {
+ throw new Error(message ?? "Failed");
 }
diff --git a/integration/batching-with-context/batching.ts b/integration/batching-with-context/batching.ts
@@ -705,7 +705,7 @@ export class EntityServiceClientImpl<Context extends DataLoaders> implements Ent
  return new DataLoader<string, Entity>((ids) => {
  const request = { ids };
  return this.BatchMapQuery(ctx, request).then((res) => {
- return ids.map((key) => unwrap(res.entities[key]));
+ return ids.map((key) => res.entities[key] ?? fail());
  });
  }, { cacheKeyFn: hash, ...ctx.rpcDataLoaderOptions });
  });
@@ -771,9 +771,6 @@ function isSet(value: any): boolean {
  return value !== null && value !== undefined;
 }
 
-function unwrap<T>(value: T | undefined | null): T {
- if (value === undefined || value === null) {
- throw new Error("Expected value to be defined");
- }
- return value;
+function fail(message?: string): never {
+ throw new Error(message ?? "Failed");
 }
diff --git a/integration/extensions/test.ts b/integration/extensions/test.ts
@@ -485,7 +485,7 @@ export const bytes: Extension<Uint8Array> = {
  return encoded;
  },
  decode: (tag: number, input: Uint8Array[]): Uint8Array => {
- const reader = _m0.Reader.create(unwrap(input[input.length - 1]));
+ const reader = _m0.Reader.create(input[input.length - 1] ?? fail());
  return reader.bytes();
  },
 };
@@ -505,7 +505,7 @@ export const string: Extension<string> = {
  return encoded;
  },
  decode: (tag: number, input: Uint8Array[]): string => {
- const reader = _m0.Reader.create(unwrap(input[input.length - 1]));
+ const reader = _m0.Reader.create(input[input.length - 1] ?? fail());
  return reader.string();
  },
 };
@@ -525,7 +525,7 @@ export const long: Extension<Long> = {
  return encoded;
  },
  decode: (tag: number, input: Uint8Array[]): Long => {
- const reader = _m0.Reader.create(unwrap(input[input.length - 1]));
+ const reader = _m0.Reader.create(input[input.length - 1] ?? fail());
  return reader.int64() as Long;
  },
 };
@@ -545,7 +545,7 @@ export const fixed: Extension<Long> = {
  return encoded;
  },
  decode: (tag: number, input: Uint8Array[]): Long => {
- const reader = _m0.Reader.create(unwrap(input[input.length - 1]));
+ const reader = _m0.Reader.create(input[input.length - 1] ?? fail());
  return reader.fixed64() as Long;
  },
 };
@@ -565,7 +565,7 @@ export const enumField: Extension<Enum> = {
  return encoded;
  },
  decode: (tag: number, input: Uint8Array[]): Enum => {
- const reader = _m0.Reader.create(unwrap(input[input.length - 1]));
+ const reader = _m0.Reader.create(input[input.length - 1] ?? fail());
  return reader.int32() as any;
  },
 };
@@ -583,7 +583,7 @@ export const group: Extension<Group> = {
  return encoded;
  },
  decode: (tag: number, input: Uint8Array[]): Group => {
- const reader = _m0.Reader.create(unwrap(input[input.length - 1]));
+ const reader = _m0.Reader.create(input[input.length - 1] ?? fail());
  return Group.decode(reader);
  },
 };
@@ -621,9 +621,6 @@ export interface Extension<T> {
  packed: boolean;
 }
 
-function unwrap<T>(value: T | undefined | null): T {
- if (value === undefined || value === null) {
- throw new Error("Expected value to be defined");
- }
- return value;
+function fail(message?: string): never {
+ throw new Error(message ?? "Failed");
 }
diff --git a/src/generate-services.ts b/src/generate-services.ts
@@ -259,7 +259,7 @@ function generateBatchingRpcMethod(ctx: Context, batchMethod: BatchMethod): Code
  // If the return type is a map, lookup each key in the result
  lambda.push(code`
  return this.${methodDesc.formattedName}(ctx, request).then(res => {
- return ${inputFieldName}.map(key => ${ctx.utils.unwrap}(res.${outputFieldName}[key]))
+ return ${inputFieldName}.map(key => res.${outputFieldName}[key] ?? ${ctx.utils.fail}())
  });
  `);
  } else {

diff --git a/src/main.ts b/src/main.ts
@@ -837,19 +837,16 @@ function makeExtensionClass(options: Options) {
 }
 
 function makeAssertionUtils() {
- const unwrap = conditionalOutput(
- "unwrap",
+ const fail = conditionalOutput(
+ "fail",
  code`
- function unwrap<T>(value: T | undefined | null): T {
- if (value === undefined || value === null) {
- throw new Error('Expected value to be defined');
+ function fail(message?: string): never {
+ throw new Error(message ?? "Failed");
  }
- return value;
- }
  `
  );
 
- return { unwrap };
+ return { fail };
 }
 
 // Create the interface with properties
@@ -1689,7 +1686,7 @@ function generateExtension(ctx: Context, message: DescriptorProto | undefined, e
  } else {
  // pick the last entry, since it overrides all previous entries if not repeated
  chunks.push(code`
- const reader = ${Reader}.create(${ctx.utils.unwrap}(input[input.length -1]));
+ const reader = ${Reader}.create(input[input.length -1] ?? ${ctx.utils.fail}());
  return ${readSnippet};
  },
  `);