feat: upgrade to typescript 3.7 (#988)

Enjoy the benefits of optional chaining, a null-coalescing operator, and other fun new features and enhancements TypeScript brought in 3.7. For more information about the TypeScript features, refer to the [TypeScript release notes]. [TypeScript release notes]: https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html
aws · Nov 26, 2019 · 6e0a7e6 · 6e0a7e6
1 parent c2c9912
commit 6e0a7e6
Show file tree

Hide file tree

Showing 78 changed files with 374 additions and 390 deletions.
diff --git a/package.json b/package.json
@@ -14,8 +14,7 @@
     "@typescript-eslint/eslint-plugin": "^2.9.0",
     "@typescript-eslint/parser": "^2.9.0",
     "eslint": "^6.7.1",
-    "lerna": "^3.19.0",
-    "typescript": "~3.6.4"
+    "lerna": "^3.19.0"
   },
   "repository": {
     "type": "git",

diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json
@@ -42,7 +42,7 @@
     "@typescript-eslint/parser": "^2.9.0",
     "eslint": "^6.7.1",
     "jest": "^24.9.0",
-    "typescript": "~3.6.4"
+    "typescript": "~3.7.2"
   },
   "jest": {
     "collectCoverage": true,

diff --git a/packages/jsii-calc/lib/calculator.ts b/packages/jsii-calc/lib/calculator.ts
@@ -266,7 +266,7 @@ export class Calculator extends composition.CompositeOperation {
     constructor(props?: CalculatorProps) {
         super();
 
-        props = props || { };
+        props = props ?? { };
 
         const initialValue = props.initialValue ? props.initialValue : 0;
         this.curr = new Number(initialValue);

diff --git a/packages/jsii-calc/lib/compliance.ts b/packages/jsii-calc/lib/compliance.ts
@@ -1948,7 +1948,7 @@ export class SupportsNiceJavaBuilder extends SupportsNiceJavaBuilderWithRequired
      * @param rest       a variadic continuation
      */
     public constructor(public readonly id: number, defaultBar = 1337, props?: SupportsNiceJavaBuilderProps, ...rest: string[]) {
-        super(id, props || { bar: defaultBar });
+        super(id, props ?? { bar: defaultBar });
         this.rest = rest;
     }
 }

diff --git a/packages/jsii-calc/lib/documented.ts b/packages/jsii-calc/lib/documented.ts
@@ -20,7 +20,7 @@ export class DocumentedClass {
    * @returns A number that everyone knows very well
    */
   public greet(greetee: Greetee = {}) {
-    process.stdout.write(`Hello, ${greetee.name || 'world'}\n`);
+    process.stdout.write(`Hello, ${greetee.name ?? 'world'}\n`);
     return 42;
   }
 
@@ -58,4 +58,4 @@ export class Old {
   public doAThing() {
     // Nothing to do
   }
-}
+}
diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json
@@ -27,7 +27,7 @@
     "eslint": "^6.7.1",
     "jest": "^24.9.0",
     "jest-expect-message": "^1.0.2",
-    "typescript": "~3.6.4"
+    "typescript": "~3.7.2"
   },
   "dependencies": {
     "inquirer": "^7.0.0",

diff --git a/packages/jsii-diff/lib/type-analysis.ts b/packages/jsii-diff/lib/type-analysis.ts
@@ -211,7 +211,7 @@ class TypePairs {
     if (!a.fqn || !b.fqn) { return false; } // Only for user-defined types
 
     const image = this.pairs.get(a.fqn);
-    return !!image && image.has(b.fqn);
+    return !!image?.has(b.fqn);
   }
 }
 

diff --git a/packages/jsii-diff/lib/types.ts b/packages/jsii-diff/lib/types.ts
@@ -46,7 +46,7 @@ export class Mismatches {
     this.mismatches.push({
       violationKey: key,
       message: `${describeApiElement(options.violator)} ${fqn}: ${options.message}`,
-      stability: options.violator.docs.stability || this.defaultStability
+      stability: options.violator.docs.stability ?? this.defaultStability
     });
   }
 

diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json
@@ -35,7 +35,7 @@
     "jsii-reflect": "^0.20.8",
     "jsii-spec": "^0.20.8",
     "log4js": "^6.1.0",
-    "typescript": "~3.6.4",
+    "typescript": "~3.7.2",
     "yargs": "^15.0.2"
   },
   "devDependencies": {

diff --git a/packages/jsii-dotnet-jsonmodel/package.json b/packages/jsii-dotnet-jsonmodel/package.json
@@ -32,6 +32,6 @@
   },
   "devDependencies": {
     "jsii-build-tools": "^0.20.8",
-    "typescript": "~3.6.4"
+    "typescript": "~3.7.2"
   }
 }
diff --git a/packages/jsii-dotnet-runtime-test/package.json b/packages/jsii-dotnet-runtime-test/package.json
@@ -33,6 +33,6 @@
     "jsii-calc": "^0.20.8",
     "jsii-dotnet-runtime": "^0.20.8",
     "jsii-pacmak": "^0.20.8",
-    "typescript": "~3.6.4"
+    "typescript": "~3.7.2"
   }
 }
diff --git a/packages/jsii-dotnet-runtime/package.json b/packages/jsii-dotnet-runtime/package.json
@@ -35,6 +35,6 @@
     "jsii-dotnet-jsonmodel": "^0.20.8",
     "jsii-runtime": "^0.20.8",
     "semver": "^6.3.0",
-    "typescript": "~3.6.4"
+    "typescript": "~3.7.2"
   }
 }
diff --git a/packages/jsii-java-runtime/package.json b/packages/jsii-java-runtime/package.json
@@ -33,6 +33,6 @@
   "devDependencies": {
     "jsii-build-tools": "^0.20.8",
     "jsii-runtime": "^0.20.8",
-    "typescript": "~3.6.4"
+    "typescript": "~3.7.2"
   }
 }
diff --git a/packages/jsii-kernel/lib/kernel.ts b/packages/jsii-kernel/lib/kernel.ts
@@ -96,7 +96,7 @@ export class Kernel {
 
       return {
         assembly: assm.metadata.name,
-        types: Object.keys(assm.metadata.types || {}).length,
+        types: Object.keys(assm.metadata.types ?? {}).length,
       };
     }
     // untar the archive to a staging directory, read the jsii spec from it
@@ -122,7 +122,7 @@ export class Kernel {
 
       return {
         assembly: assmSpec.name,
-        types: Object.keys(assmSpec.types || {}).length,
+        types: Object.keys(assmSpec.types ?? {}).length,
       };
     } finally {
       this._debug('removing staging directory:', staging);
@@ -231,7 +231,7 @@ export class Kernel {
 
   public invoke(req: api.InvokeRequest): api.InvokeResponse {
     const { objref, method } = req;
-    const args = req.args || [];
+    const args = req.args ?? [];
 
     this._debug('invoke', objref, method, args);
     const { ti, obj, fn } = this._findInvokeTarget(objref, method, args);
@@ -245,15 +245,15 @@ export class Kernel {
       return this._wrapSandboxCode(() => fn.apply(obj, this._toSandboxValues(args, ti.parameters)));
     });
 
-    const result = this._fromSandbox(ret, ti.returns || 'void');
+    const result = this._fromSandbox(ret, ti.returns ?? 'void');
     this._debug('invoke result', result);
 
     return { result };
   }
 
   public sinvoke(req: api.StaticInvokeRequest): api.InvokeResponse {
     const { fqn, method } = req;
-    const args = req.args || [];
+    const args = req.args ?? [];
 
     this._debug('sinvoke', fqn, method, args);
 
@@ -276,12 +276,12 @@ export class Kernel {
     });
 
     this._debug('method returned:', ret);
-    return { result: this._fromSandbox(ret, ti.returns || 'void') };
+    return { result: this._fromSandbox(ret, ti.returns ?? 'void') };
   }
 
   public begin(req: api.BeginRequest): api.BeginResponse {
     const { objref, method } = req;
-    const args = req.args || [];
+    const args = req.args ?? [];
 
     this._debug('begin', objref, method, args);
 
@@ -331,7 +331,7 @@ export class Kernel {
       throw mapSource(e, this.sourceMaps);
     }
 
-    return { result: this._fromSandbox(result, method.returns || 'void') };
+    return { result: this._fromSandbox(result, method.returns ?? 'void') };
   }
 
   public callbacks(_req?: api.CallbacksRequest): api.CallbacksResponse {
@@ -370,7 +370,7 @@ export class Kernel {
       this._debug('completed with error:', err);
       cb.fail(new Error(err));
     } else {
-      const sandoxResult = this._toSandbox(result, cb.expectedReturnType || 'void');
+      const sandoxResult = this._toSandbox(result, cb.expectedReturnType ?? 'void');
       this._debug('completed with result:', sandoxResult);
       cb.succeed(sandoxResult);
     }
@@ -409,7 +409,7 @@ export class Kernel {
 
     // add the __jsii__.fqn property on every constructor. this allows
     // traversing between the javascript and jsii worlds given any object.
-    for (const fqn of Object.keys(assm.metadata.types || {})) {
+    for (const fqn of Object.keys(assm.metadata.types ?? {})) {
       const typedef = assm.metadata.types![fqn];
       switch (typedef.kind) {
         case spec.TypeKind.Interface:
@@ -450,12 +450,12 @@ export class Kernel {
     this._debug('create', req);
     const { fqn, interfaces, overrides } = req;
 
-    const requestArgs = req.args || [];
+    const requestArgs = req.args ?? [];
 
     const ctorResult = this._findCtor(fqn, requestArgs);
     const ctor = ctorResult.ctor;
     const obj = this._wrapSandboxCode(() => new ctor(...this._toSandboxValues(requestArgs, ctorResult.parameters)));
-    const objref = this.objects.registerObject(obj, fqn, req.interfaces || []);
+    const objref = this.objects.registerObject(obj, fqn, req.interfaces ?? []);
 
     // overrides: for each one of the override method names, installs a
     // method on the newly created object which represents the remote "reverse proxy".
@@ -529,7 +529,7 @@ export class Kernel {
 
     // save the old property under $jsii$super$<prop>$ so that property overrides
     // can still access it via `super.<prop>`.
-    const prev = Object.getOwnPropertyDescriptor(obj, propertyName) || {
+    const prev = Object.getOwnPropertyDescriptor(obj, propertyName) ?? {
       value: undefined,
       writable: true,
       enumerable: true,
@@ -620,7 +620,7 @@ export class Kernel {
               objref,
               override,
               args,
-              expectedReturnType: methodInfo.returns || 'void',
+              expectedReturnType: methodInfo.returns ?? 'void',
               succeed,
               fail
             };
@@ -648,7 +648,7 @@ export class Kernel {
             }
           });
           this._debug('Result', result);
-          return this._toSandbox(result, methodInfo.returns || 'void');
+          return this._toSandbox(result, methodInfo.returns ?? 'void');
         }
       });
     }
@@ -677,7 +677,7 @@ export class Kernel {
   }
 
   private _validateMethodArguments(method: spec.Callable | undefined, args: any[]) {
-    const params: spec.Parameter[] = method && method.parameters || [];
+    const params: spec.Parameter[] = method?.parameters ?? [];
 
     // error if args > params
     if (args.length > params.length && !(method && method.variadic)) {
@@ -737,7 +737,7 @@ export class Kernel {
       throw new Error(`Module '${moduleName}' not found`);
     }
 
-    const types = assembly.metadata.types || {};
+    const types = assembly.metadata.types ?? {};
     const fqnInfo = types[fqn];
     if (!fqnInfo) {
       throw new Error(`Type '${fqn}' not found`);
@@ -762,7 +762,7 @@ export class Kernel {
       if (fqn === 'Object') { continue; }
       const typeinfo = this._typeInfoForFqn(fqn);
 
-      const methods = (typeinfo as (spec.ClassType | spec.InterfaceType)).methods || [];
+      const methods = (typeinfo as (spec.ClassType | spec.InterfaceType)).methods ?? [];
 
       for (const m of methods) {
         if (m.name === methodName) {
@@ -771,7 +771,7 @@ export class Kernel {
       }
 
       // recursion to parent type (if exists)
-      const bases = [(typeinfo as spec.ClassType).base, ...(typeinfo as spec.InterfaceType).interfaces || []];
+      const bases = [(typeinfo as spec.ClassType).base, ...(typeinfo as spec.InterfaceType).interfaces ?? []];
       for (const base of bases) {
         if (!base) { continue; }
 
@@ -800,12 +800,12 @@ export class Kernel {
       } else if (spec.isInterfaceType(typeInfo)) {
         const interfaceTypeInfo = typeInfo as spec.InterfaceType;
         properties = interfaceTypeInfo.properties;
-        bases = interfaceTypeInfo.interfaces || [];
+        bases = interfaceTypeInfo.interfaces ?? [];
       } else {
         throw new Error(`Type of kind ${typeInfo.kind} does not have properties`);
       }
 
-      for (const p of properties || []) {
+      for (const p of properties ?? []) {
         if (p.name === property) {
           return p;
         }
@@ -895,7 +895,7 @@ export class Kernel {
   }
 
   private _boxUnboxParameters(xs: any[], parameters: spec.Parameter[] | undefined, boxUnbox: (x: any, t: wire.OptionalValueOrVoid) => any) {
-    parameters = [...parameters || []];
+    parameters = [...parameters ?? []];
     const variadic = parameters.length > 0 && !!parameters[parameters.length - 1].variadic;
     // Repeat the last (variadic) type to match the number of actual arguments
     while (variadic && parameters.length < xs.length) {

diff --git a/packages/jsii-kernel/lib/objects.ts b/packages/jsii-kernel/lib/objects.ts
@@ -27,7 +27,7 @@ const JSII_SYMBOL = Symbol.for('__jsii__');
  */
 export function jsiiTypeFqn(obj: any): string | undefined {
   const jsii = obj.constructor[JSII_SYMBOL];
-  return jsii && jsii.fqn;
+  return jsii?.fqn;
 }
 
 /**
@@ -96,7 +96,7 @@ export class ObjectTable {
     if (existingRef) {
       if (interfaces) {
         const allIfaces = new Set(interfaces);
-        for (const iface of existingRef[api.TOKEN_INTERFACES] || []) {
+        for (const iface of existingRef[api.TOKEN_INTERFACES] ?? []) {
           allIfaces.add(iface);
         }
         this.objects[existingRef[api.TOKEN_REF]].interfaces =

diff --git a/packages/jsii-kernel/lib/serialization.ts b/packages/jsii-kernel/lib/serialization.ts
@@ -321,7 +321,7 @@ export const SERIALIZERS: {[k: string]: Serializer} = {
       return host.objects.registerObject(value, 'Object', [(optionalValue.type as spec.NamedTypeReference).fqn]);
     },
     deserialize(value, optionalValue, host) {
-      if (typeof value === 'object' && Object.keys(value || {}).length === 0) {
+      if (typeof value === 'object' && Object.keys(value ?? {}).length === 0) {
         // Treat empty structs as `undefined` (see https://github.com/aws/jsii/issues/411)
         value = undefined;
       }
@@ -674,7 +674,7 @@ function propertiesOf(t: spec.Type, lookup: TypeLookup): {[name: string]: spec.P
     ret = { ...ret, ...propertiesOf(lookup(t.base), lookup) };
   }
 
-  for (const prop of t.properties || []) {
+  for (const prop of t.properties ?? []) {
     ret[prop.name] = prop;
   }
 

diff --git a/packages/jsii-kernel/package.json b/packages/jsii-kernel/package.json
@@ -50,7 +50,7 @@
     "jest-expect-message": "^1.0.2",
     "jsii-build-tools": "^0.20.8",
     "jsii-calc": "^0.20.8",
-    "typescript": "~3.6.4"
+    "typescript": "~3.7.2"
   },
   "jest": {
     "collectCoverage": true,