Enable strict mode

Author: MattIPv4

src/routes/library.spec.ts

@@ -348,7 +348,7 @@ describe('/libraries/:library', () => {
                 describe('Assets array', () => {
                     it('has \'version\', \'files\', \'rawFiles\' and \'sri\' properties for each entry', async () => {
                         const body = await response.json<LibraryResponse>();
-                        for (const result of body.assets) {
+                        for (const result of body.assets!) {
                             expect(result).to.have.property('version').that.is.a('string');
                             expect(result).to.have.property('files').that.is.an('array');
                             expect(result).to.have.property('rawFiles').that.is.an('array');

src/routes/library.ts

@@ -17,7 +17,7 @@ const extensions = Object.keys(files);
  *
  * @param file Filename to check.
  */
-const whitelisted = (file: string) => extensions.includes(file.split('.').slice(-1)[0]);
+const whitelisted = (file: string) => extensions.includes(file.split('.').slice(-1)[0] || '');
 
 /**
  * Handle GET /libraries/:library/:version requests.
@@ -81,15 +81,16 @@ const handleGetLibrary = async (ctx: Context) => {
 
     // Generate the initial filtered response (without SRI, versions or assets data)
     const requestedFields = queryCheck(ctx.req.queries('fields'));
+    const { name, ...rest } = lib;
     const response: LibraryResponse = filter(
         {
             // Ensure name is first prop
-            name: lib.name,
+            name,
             // Custom latest prop (and SRI value)
             latest: lib.filename && lib.version ? 'https://cdnjs.cloudflare.com/ajax/libs/' + lib.name + '/' + lib.version + '/' + lib.filename : null,
             sri: null,
             // All other lib props
-            ...lib,
+            ...rest,
         },
         requestedFields,
     );
@@ -122,7 +123,7 @@ const handleGetLibrary = async (ctx: Context) => {
     if (requestedFields('sri')) {
         if (lib.filename && lib.version) {
             // Handle if we've already fetched SRI
-            if ('assets' in response) {
+            if (response.assets) {
                 const latestVersion = response.assets.find(entry => entry.version === lib.version);
                 if (latestVersion) {
                     if (lib.filename in latestVersion.sri) {

src/routes/whitelist.spec.ts

@@ -33,22 +33,22 @@ describe('/whitelist', () => {
         describe('Extensions array', () => {
             it('only has string elements', async () => {
                 const body = await response.json<WhitelistResponse>();
-                for (const result of body.extensions) {
+                for (const result of body.extensions!) {
                     expect(result).to.be.a('string');
                 }
             });
         });
         describe('Categories object', () => {
             it('has a key for each value in \'extensions\'', async () => {
                 const body = await response.json<WhitelistResponse>();
-                const keys = Object.keys(body.categories);
-                for (const result of body.extensions) {
+                const keys = Object.keys(body.categories!);
+                for (const result of body.extensions!) {
                     expect(keys).to.include(result);
                 }
             });
             it('has a string value for each key', async () => {
                 const body = await response.json<WhitelistResponse>();
-                for (const result of Object.values(body.categories)) {
+                for (const result of Object.values(body.categories!)) {
                     expect(result).to.be.a('string');
                 }
             });

src/utils/fetchJson.ts

@@ -27,22 +27,21 @@ class FetchError extends Error {
  */
 export default async (url: RequestInfo, options: RequestInit = {}, timeout: number = 30) => {
     // Create the timeout
-    const hasTimeout = typeof timeout === 'number' && timeout > 0;
-    const controller = hasTimeout && new AbortController();
-    const timer = hasTimeout && setTimeout(() => controller.abort(), timeout * 1000);
+    const controller = typeof timeout === 'number' && timeout > 0 && new AbortController();
+    const timer = controller && setTimeout(() => controller.abort(), timeout * 1000);
 
     // Run the request
     let resp: Response;
     try {
         resp = await fetch(url, {
             ...options,
-            ...(hasTimeout
+            ...(controller
                 ? { signal: controller.signal }
                 : {}),
         });
     } catch (error) {
         // If the request was aborted, throw a nice error
-        if (error.name === 'AbortError') {
+        if (error instanceof Error && error.name === 'AbortError') {
             throw new FetchError(`Timed out after ${timeout}s`, {
                 method: options?.method || 'GET',
                 url,
@@ -54,7 +53,7 @@ export default async (url: RequestInfo, options: RequestInit = {}, timeout: numb
         throw error;
     } finally {
         // Clear the timeout
-        if (hasTimeout) clearTimeout(timer);
+        if (timer) clearTimeout(timer);
     }
 
     // Handle failures

src/utils/sort.spec.ts

@@ -48,7 +48,7 @@ describe('utils/sort', () => {
     });
 
     it('handles empty arrays', () => {
-        const versions = [];
+        const versions: string[] = [];
         const sorted = sortVersions([ ...versions ]);
         expect(sorted).toEqual([]);
     });

src/utils/sriForVersion.ts

@@ -15,7 +15,7 @@ export default (library: string, version: string, files: string[], sriData: Reco
         const fullFile = `${library}/${version}/${file}`;
 
         // If we have an SRI entry for this, add it
-        if (sriData && fullFile in sriData) {
+        if (sriData && sriData[fullFile]) {
             sri[file] = sriData[fullFile];
             continue;
         }

tsconfig.json

@@ -10,7 +10,7 @@
         "verbatimModuleSyntax": true,
         "esModuleInterop": true,
         "noEmit": true,
-        "strict": false,
+        "strict": true,
         "skipLibCheck": true,
         "types": ["@cloudflare/vitest-pool-workers"],
     },

vitest.config.ts

@@ -6,7 +6,7 @@ export default defineWorkersConfig({
         reporters: [
             'verbose',
             process.env.GITHUB_ACTIONS && 'github-actions',
-        ].filter(Boolean),
+        ].filter((x): x is string => !!x),
         poolOptions: {
             workers: {
                 wrangler: { configPath: './wrangler.toml' },