Merge pull request #206 from typed-ember/upgrade-typescript

Author: dfreeman

package.json

@@ -24,7 +24,7 @@
     "release-it": "^14.4.1",
     "release-it-lerna-changelog": "^3.1.0",
     "release-it-yarn-workspaces": "^2.0.0",
-    "typescript": "^4.1.5"
+    "typescript": "^4.3.5"
   },
   "version": "0.5.1"
 }

packages/config/src/config.ts

@@ -67,21 +67,21 @@ export function normalizePath(fileName: string): string {
 
 function validateConfigInput(input: Record<string, unknown>): asserts input is GlintConfigInput {
   assert(
-    typeof input.environment === 'string',
+    typeof input['environment'] === 'string',
     'Glint config must specify an `environment` string'
   );
 
   assert(
-    Array.isArray(input.include)
-      ? input.include.every((item) => typeof item === 'string')
-      : !input.include || typeof input.include === 'string',
+    Array.isArray(input['include'])
+      ? input['include'].every((item) => typeof item === 'string')
+      : !input['include'] || typeof input['include'] === 'string',
     'If defined, `include` must be a string or array of strings'
   );
 
   assert(
-    Array.isArray(input.exclude)
-      ? input.exclude.every((item) => typeof item === 'string')
-      : !input.exclude || typeof input.exclude === 'string',
+    Array.isArray(input['exclude'])
+      ? input['exclude'].every((item) => typeof item === 'string')
+      : !input['exclude'] || typeof input['exclude'] === 'string',
     'If defined, `exclude` must be a string or array of strings'
   );
 }

packages/core/__tests__/cli/declaration.test.ts

@@ -117,7 +117,7 @@ describe('CLI: emitting declarations', () => {
       }
       export default class ClassComponent extends Component<ClassComponentSignature> {
           private startupTime;
-          protected static '~template': unknown;
+          protected static '~template:ClassComponent': unknown;
       }
       "
     `);

packages/core/src/common/transform-manager.ts

@@ -227,9 +227,10 @@ export default class TransformManager {
     });
   }
 
-  private rewriteDiagnostic(
-    diagnostic: Diagnostic
-  ): { rewrittenDiagnostic?: ts.Diagnostic; appliedDirective?: Directive } {
+  private rewriteDiagnostic(diagnostic: Diagnostic): {
+    rewrittenDiagnostic?: ts.Diagnostic;
+    appliedDirective?: Directive;
+  } {
     if (!diagnostic.file) return {};
 
     // Transform diagnostics are already targeted at the original source and so

packages/environment-ember-loose/__tests__/type-tests/helper.test.ts

@@ -55,7 +55,7 @@ expectTypeOf(Helper.extend).toEqualTypeOf(UpstreamEmberHelper.extend);
 {
   type RepeatArgs<T> = { value: T; count?: number };
   class RepeatHelper<T> extends Helper<{ NamedArgs: RepeatArgs<T>; Return: Array<T> }> {
-    compute(_: [], { value, count }: RepeatArgs<T>): Array<T> {
+    override compute(_: [], { value, count }: RepeatArgs<T>): Array<T> {
       return Array.from({ length: count ?? 2 }, () => value);
     }
   }
@@ -93,7 +93,7 @@ expectTypeOf(Helper.extend).toEqualTypeOf(UpstreamEmberHelper.extend);
 {
   type RepeatArgs<T> = [value: T, count?: number | undefined];
   class RepeatHelper<T> extends Helper<{ PositionalArgs: RepeatArgs<T>; Return: Array<T> }> {
-    compute([value, count]: RepeatArgs<T>): Array<T> {
+    override compute([value, count]: RepeatArgs<T>): Array<T> {
       return Array.from({ length: count ?? 2 }, () => value);
     }
   }
@@ -128,7 +128,7 @@ expectTypeOf(Helper.extend).toEqualTypeOf(UpstreamEmberHelper.extend);
 // Class-based helpers can return undefined
 {
   class MaybeStringHelper extends Helper<{ Return: string | undefined }> {
-    compute(): string | undefined {
+    override compute(): string | undefined {
       if (Math.random() > 0.5) {
         return 'ok';
       }

packages/environment-ember-loose/__tests__/type-tests/integration-declarations.test.ts

@@ -5,7 +5,7 @@ import { EmptyObject } from '@glint/template/-private/integration';
 import { ResolveContext } from '../../-private/dsl';
 
 class TestRoute extends Route {
-  async model(): Promise<{ message: string }> {
+  override async model(): Promise<{ message: string }> {
     return { message: 'hello' };
   }
 }

packages/environment-ember-loose/__tests__/type-tests/modifier.test.ts

@@ -26,15 +26,15 @@ import { BoundModifier } from '@glint/template/-private/integration';
       return this.args.named.multiplier;
     }
 
-    didReceiveArguments(): void {
+    override didReceiveArguments(): void {
       expectTypeOf(this.element).toEqualTypeOf<HTMLImageElement>();
 
       this.interval = window.setInterval(() => {
         alert('this is a typesafe modifier!');
       }, this.multiplier * this.lengthOfInput);
     }
 
-    willDestroy(): void {
+    override willDestroy(): void {
       window.clearInterval(this.interval);
     }
   }

packages/environment-ember-loose/ember-component/helper.ts

@@ -16,7 +16,7 @@ type HelperFactory = <Positional extends unknown[] = [], Named = EmptyObject, Re
   fn: (params: Positional, hash: Named) => Return
 ) => new () => Invokable<(named: Named, ...positional: Positional) => Return>;
 
-export const helper = (emberHelper as unknown) as HelperFactory;
+export const helper = emberHelper as unknown as HelperFactory;
 
 export interface HelperSignature {
   NamedArgs?: object;

packages/environment-glimmerx/helper/index.ts

@@ -38,5 +38,5 @@ type FnHelper = DirectInvokable<{
   ): (...rest: Args) => Ret;
 }>;
 
-export const fn = (glimmerxHelper.fn as unknown) as FnHelper;
-export const helper = (glimmerxHelper.helper as unknown) as HelperFactory;
+export const fn = glimmerxHelper.fn as unknown as FnHelper;
+export const helper = glimmerxHelper.helper as unknown as HelperFactory;

packages/environment-glimmerx/modifier/index.ts

@@ -16,4 +16,4 @@ type OnModifier = DirectInvokable<
   ) => BoundModifier<HTMLElement>
 >;
 
-export const on = (glimmerxModifier.on as unknown) as OnModifier;
+export const on = glimmerxModifier.on as unknown as OnModifier;