refactor: apply strict typescript checks + fixes

unjs · Oct 4, 2023 · 9704865 · 9704865
1 parent fcf68ad
commit 9704865
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 20 deletions.
diff --git a/src/_utils.ts b/src/_utils.ts
@@ -13,7 +13,7 @@ import type { GitInfo } from "./types";
 export async function download(
   url: string,
   filePath: string,
-  options: { headers?: Record<string, string> } = {},
+  options: { headers?: Record<string, string | undefined> } = {},
 ) {
   const infoPath = filePath + ".json";
   const info: { etag?: string } = JSON.parse(
@@ -29,7 +29,9 @@ export async function download(
     // Already downloaded
     return;
   }
-  info.etag = etag;
+  if (typeof etag === "string") {
+    info.etag = etag;
+  }
 
   const response = await sendFetch(url, { headers: options.headers });
   if (response.status >= 400) {
@@ -48,23 +50,23 @@ const inputRegex =
   /^(?<repo>[\w.-]+\/[\w.-]+)(?<subdir>[^#]+)?(?<ref>#[\w.-]+)?/;
 
 export function parseGitURI(input: string): GitInfo {
-  const m = input.match(inputRegex)?.groups;
+  const m = input.match(inputRegex)?.groups || {};
   return <GitInfo>{
     repo: m.repo,
     subdir: m.subdir || "/",
     ref: m.ref ? m.ref.slice(1) : "main",
   };
 }
 
-export function debug(...arguments_) {
+export function debug(...args: unknown[]) {
   if (process.env.DEBUG) {
-    console.debug("[giget]", ...arguments_);
+    console.debug("[giget]", ...args);
   }
 }
 
 // eslint-disable-next-line no-undef
-interface InternalFetchOptions extends Exclude<RequestInit, "headers"> {
-  headers?: Record<string, string>;
+interface InternalFetchOptions extends Omit<RequestInit, "headers"> {
+  headers?: Record<string, string | undefined>;
   agent?: Agent;
 }
 
@@ -83,11 +85,10 @@ export async function sendFetch(
     }
   }
 
-  if (options?.headers) {
-    options.headers = normalizeHeaders(options.headers);
-  }
-
-  return await fetch(url, options);
+  return await fetch(url, {
+    ...options,
+    headers: normalizeHeaders(options.headers),
+  });
 }
 
 export function cacheDirectory() {
@@ -96,7 +97,9 @@ export function cacheDirectory() {
     : resolve(homedir(), ".cache/giget");
 }
 
-export function normalizeHeaders(headers: Record<string, string> = {}) {
+export function normalizeHeaders(
+  headers: Record<string, string | undefined> = {},
+) {
   const normalized: Record<string, string> = {};
   for (const [key, value] of Object.entries(headers)) {
     if (!value) {

diff --git a/src/giget.ts b/src/giget.ts
@@ -45,7 +45,7 @@ export async function downloadTemplate(
       ? undefined
       : registryProvider(options.registry, { auth: options.auth });
   let providerName: string =
-    options.provider || (registryProvider ? "registry" : "github");
+    options.provider || (registry ? "registry" : "github");
   let source: string = input;
   const sourceProvierMatch = input.match(sourceProtoRe);
   if (sourceProvierMatch) {
@@ -66,6 +66,10 @@ export async function downloadTemplate(
       );
     });
 
+  if (!template) {
+    throw new Error(`Failed to resolve template from ${providerName}`);
+  }
+
   // Sanitize name and defaultDir
   template.name = (template.name || "template").replace(/[^\da-z-]/gi, "-");
   template.defaultDir = (template.defaultDir || template.name).replace(
@@ -89,7 +93,7 @@ export async function downloadTemplate(
 
   const temporaryDirectory = resolve(
     cacheDirectory(),
-    options.provider,
+    providerName,
     template.name,
   );
   const tarPath = resolve(
@@ -105,7 +109,7 @@ export async function downloadTemplate(
     const s = Date.now();
     await download(template.tar, tarPath, {
       headers: {
-        authorization: options.auth ? `Bearer ${options.auth}` : undefined,
+        Authorization: options.auth ? `Bearer ${options.auth}` : undefined,
         ...normalizeHeaders(template.headers),
       },
     }).catch((error) => {

diff --git a/src/registry.ts b/src/registry.ts
@@ -7,9 +7,8 @@ const DEFAULT_REGISTRY =
 
 export const registryProvider = (
   registryEndpoint: string = DEFAULT_REGISTRY,
-  options?: { auth?: string },
+  options: { auth?: string } = {},
 ) => {
-  options = options || {};
   return <TemplateProvider>(async (input) => {
     const start = Date.now();
     const registryURL = `${registryEndpoint}/${input}.json`;

diff --git a/src/types.ts b/src/types.ts
@@ -12,7 +12,7 @@ export interface TemplateInfo {
   subdir?: string;
   url?: string;
   defaultDir?: string;
-  headers?: Record<string, string>;
+  headers?: Record<string, string | undefined>;
 
   // Added by giget
   source?: never;

diff --git a/tsconfig.json b/tsconfig.json
@@ -3,7 +3,8 @@
     "target": "ESNext",
     "module": "ESNext",
     "moduleResolution": "Node",
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "strict": true
   },
   "include": ["src"]
 }