fix: update function signatures for $ and unindent to support TemplateStringsArray

Author: GoodbyeNJN

src/common/process.ts

@@ -4,14 +4,18 @@ import { ResultAsync } from "@/result";
 import { errorToMessage } from "./error";
 import { PromiseWithResolvers } from "./promise";
 
-export const $ = (cmd: TemplateStringsArray | string) => {
-    const command = isString(cmd) ? cmd : cmd[0]!;
+export function $(cmd: string): ResultAsync<{ stdout: string; stderr: string }, string>;
+export function $(
+    cmd: TemplateStringsArray,
+    ...values: any[]
+): ResultAsync<{ stdout: string; stderr: string }, string>;
+export function $(cmd: string | TemplateStringsArray, ...values: any[]) {
+    const command = isString(cmd)
+        ? cmd
+        : cmd.reduce((acc, part, index) => acc + part + (values[index] ?? ""), "");
 
     const promise = import("node:child_process").then(({ exec }) => {
-        const { promise, reject, resolve } = PromiseWithResolvers<{
-            stdout: string;
-            stderr: string;
-        }>();
+        const { promise, reject, resolve } = PromiseWithResolvers();
 
         exec(command, (error, stdout, stderr) => {
             if (error) {
@@ -25,4 +29,4 @@ export const $ = (cmd: TemplateStringsArray | string) => {
     });
 
     return ResultAsync.fromPromise(promise, errorToMessage(`Failed to execute command: ${cmd}`));
-};
+}

src/common/string.ts

@@ -1,4 +1,4 @@
-import { isFunction, isPlainObject } from "@/remeda";
+import { isFunction, isPlainObject, isString } from "@/remeda";
 
 const REGEXP_WHITESPACE = /^\s*$/;
 
@@ -78,8 +78,13 @@ export const splitWithSlash = (path: string) => split("/", path);
  * `
  * ```
  */
-export const unindent = (str: TemplateStringsArray | string) => {
-    const lines = (typeof str === "string" ? str : str[0]!).split("\n");
+export function unindent(template: string): string;
+export function unindent(template: TemplateStringsArray, ...values: any[]): string;
+export function unindent(template: string | TemplateStringsArray, ...values: any[]) {
+    const string = isString(template)
+        ? template
+        : template.reduce((acc, part, index) => acc + part + (values[index] ?? ""), "");
+    const lines = string.split("\n");
     const whitespaceLines = lines.map(line => REGEXP_WHITESPACE.test(line));
 
     const commonIndent = lines.reduce((min, line, idx) => {
@@ -102,7 +107,7 @@ export const unindent = (str: TemplateStringsArray | string) => {
         .slice(emptyLinesHead, lines.length - emptyLinesTail)
         .map(line => line.slice(commonIndent))
         .join("\n");
-};
+}
 
 /**
  * @example