From 4f7ff96e502e8d347be6d6e790a5e0c284483bfa Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Thu, 4 Feb 2021 14:16:15 -0800 Subject: [PATCH] fix(service-worker): update type castings for JSON.parse usage (#40710) Update usages of JSON.parse to be cast as specific types. PR Close #40710 --- packages/service-worker/cli/main.ts | 5 +++-- packages/service-worker/worker/test/happy_spec.ts | 2 +- packages/service-worker/worker/testing/fetch.ts | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/service-worker/cli/main.ts b/packages/service-worker/cli/main.ts index 184940e8ed..05bc2a57af 100644 --- a/packages/service-worker/cli/main.ts +++ b/packages/service-worker/cli/main.ts @@ -6,10 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -const {Generator, NgswConfig} = require('@angular/service-worker/config'); +const {Generator} = require('@angular/service-worker/config'); const fs = require('fs'); const path = require('path'); import {NodeFilesystem} from './filesystem'; +import {Config} from '../config/src/in'; const cwd = process.cwd(); @@ -18,7 +19,7 @@ const distDir = path.join(cwd, process.argv[2]); const config = path.join(cwd, process.argv[3]); const baseHref = process.argv[4] || '/'; -const configParsed = JSON.parse(fs.readFileSync(config).toString()); +const configParsed = JSON.parse(fs.readFileSync(config).toString()) as Config; const filesystem = new NodeFilesystem(distDir); const gen = new Generator(filesystem, baseHref); diff --git a/packages/service-worker/worker/test/happy_spec.ts b/packages/service-worker/worker/test/happy_spec.ts index 31c72b607a..fcaf4bd27d 100644 --- a/packages/service-worker/worker/test/happy_spec.ts +++ b/packages/service-worker/worker/test/happy_spec.ts @@ -994,7 +994,7 @@ describe('Driver', () => { const getClientAssignments = async (sw: SwTestHarness, baseHref: string) => { const cache = await sw.caches.open(`ngsw:${baseHref}:db:control`) as unknown as MockCache; const dehydrated = cache.dehydrate(); - return JSON.parse(dehydrated['/assignments'].body!); + return JSON.parse(dehydrated['/assignments'].body!) as any; }; const initializeSwFor = async (baseHref: string, initialCacheState = '{}') => { diff --git a/packages/service-worker/worker/testing/fetch.ts b/packages/service-worker/worker/testing/fetch.ts index 9806fc8527..43ed7e33d8 100644 --- a/packages/service-worker/worker/testing/fetch.ts +++ b/packages/service-worker/worker/testing/fetch.ts @@ -29,7 +29,7 @@ export class MockBody implements Body { } async json(): Promise { - return JSON.parse(this.getBody()); + return JSON.parse(this.getBody()) as any; } async text(): Promise {