feat: improve zip

src/commands/app/commit.ts

@@ -1,5 +1,4 @@
 import { type RESTPutApiAppCommitResult, Routes } from "@discloudapp/api-types/v2";
-import { resolveFile } from "@discloudapp/util";
 import { type ICommand } from "../../interfaces/command";
 
 interface CommandArgs {
@@ -30,9 +29,9 @@ export default <ICommand<CommandArgs>>{
   async run(core, args) {
     const spinner = core.print.spin("Zipping files...");
 
-    const buffer = await core.fs.zip(args.glob, core.workspaceFolder);
+    const arrayBuffer = await core.fs.zip(args.glob, core.workspaceFolder);
 
-    const file = await resolveFile(buffer, "file.zip");
+    const file = new File(arrayBuffer, "file.zip");
 
     spinner.start("Commiting...");
 

src/commands/app/upload.ts

@@ -1,5 +1,5 @@
 import { type RESTPostApiUploadResult, Routes } from "@discloudapp/api-types/v2";
-import { DiscloudConfig, resolveFile } from "@discloudapp/util";
+import { DiscloudConfig } from "@discloudapp/util";
 import { join } from "path";
 import { type ICommand } from "../../interfaces/command";
 import { CONFIG_FILENAME } from "../../services/discloud/constants";
@@ -34,9 +34,9 @@ export default <ICommand<CommandArgs>>{
 
     const spinner = core.print.spin("Zipping files...");
 
-    const buffer = await core.fs.zip(args.glob, core.workspaceFolder);
+    const arrayBuffer = await core.fs.zip(args.glob, core.workspaceFolder);
 
-    const file = await resolveFile(buffer, "file.zip");
+    const file = new File(arrayBuffer, "file.zip");
 
     spinner.start("Uploading...");
 

src/commands/team/commit.ts

@@ -1,5 +1,4 @@
 import { type RESTPutApiAppCommitResult, Routes } from "@discloudapp/api-types/v2";
-import { resolveFile } from "@discloudapp/util";
 import { type ICommand } from "../../interfaces/command";
 
 interface CommandArgs {
@@ -30,9 +29,9 @@ export default <ICommand<CommandArgs>>{
   async run(core, args) {
     const spinner = core.print.spin("Zipping files...");
 
-    const buffer = await core.fs.zip(args.glob, core.workspaceFolder);
+    const arrayBuffer = await core.fs.zip(args.glob, core.workspaceFolder);
 
-    const file = await resolveFile(buffer, "file.zip");
+    const file = new File(arrayBuffer, "file.zip");
 
     spinner.start("Commiting...");
 

src/interfaces/filesystem.ts

@@ -44,7 +44,7 @@ export interface IFileSystem {
   /**
    * @param cwd default `process.cwd()`
    */
-  zip(glob: string | string[], cwd?: string): Promise<Buffer>
+  zip(glob: string | string[], cwd?: string): Promise<Buffer[]>
 
   /**
    * @param cwd default `process.cwd()`

src/structures/filesystem/fs.ts

@@ -74,17 +74,14 @@ export default class FileSystem implements IFileSystem {
   }
 
   async zip(glob: string | string[], cwd: string = this.core.workspaceFolder) {
-    return Buffer.concat(await asyncGeneratorToArray(this.zipIterate(glob, cwd)));
+    return await asyncGeneratorToArray(this.zipIterate(glob, cwd));
   }
 
   zipIterate(glob: string | string[], cwd?: string): AsyncGenerator<Buffer>
   async* zipIterate(glob: string | string[], cwd: string = this.core.workspaceFolder) {
     if (Array.isArray(glob)) glob = glob.join(" ");
 
-    const encoding = "buffer";
-    const zipCommand = "discloud zip";
-
-    const child = spawn(zipCommand, ["-e", encoding, "-g", glob], {
+    const child = spawn("discloud", ["zip", "-e", "buffer", "-g", glob], {
       cwd,
       shell: true,
       timeout: MINUTE_IN_MILLISECONDS,

test/commands/zip.test.mjs

@@ -87,7 +87,7 @@ suite("Testing zip command", async () => {
    * @param {OptionsWithEncoding} options
    * @returns {Promise<Buffer>}
    * @typedef OptionsWithEncoding
-   * @prop {BufferEncoding} encoding
+   * @prop {BufferEncoding | "buffer"} encoding
    * @prop {number} [maxBuffer]
    * 
    * @overload