fix init command

Author: tsirysndr

README.md

@@ -110,7 +110,7 @@ fluentci studio
 fluentci --help
 
 Usage:   fluentci [pipeline] [jobs...]
-Version: 0.16.6                      
+Version: 0.16.7                      
 
 Description:
 

deno.lock

@@ -14,7 +14,7 @@ export {
   yellow,
 } from "jsr:@std/fmt@0.224.0/colors";
 export { z } from "npm:zod@3.22.2";
-export { decompress } from "https://deno.land/x/zip@v1.2.5/mod.ts";
+export { decompress } from "https://cdn.jsdelivr.net/gh/tsirysndr/deno-zip@7f47a98/mod.ts";
 export { existsSync } from "jsr:@std/fs@0.224.0/exists";
 export { load } from "jsr:@std/dotenv@0.224.0";
 export { Secret } from "jsr:@cliffy/prompt@1.0.0-rc.7/secret";
@@ -53,9 +53,9 @@ export { Buffer };
 export { mergeReadableStreams } from "jsr:@std/streams@0.224.0";
 export { Cell, Table } from "jsr:@cliffy/table@1.0.0-rc.7";
 export {
-  TerminalSpinner,
   SpinnerTypes,
-} from "https://deno.land/x/spinners@v1.1.2/mod.ts";
+  TerminalSpinner,
+} from "https://cdn.jsdelivr.net/gh/tsirysndr/spinners@master/mod.ts";
 export { readAllSync } from "jsr:@std/io@0.224.0";
 export { serve } from "jsr:@std/http@0.224.0/server";
 export { createYoga } from "npm:graphql-yoga@5.1.1";
@@ -76,7 +76,7 @@ export {
 } from "jsr:@tsirysndr/fluent-circleci@0.3.1";
 export { AzurePipeline } from "jsr:@tsirysndr/fluent-az-pipelines@0.3.1";
 export { BuildSpec } from "jsr:@tsirysndr/fluent-codepipeline@0.3";
-export { ClientError, GraphQLClient, gql } from "npm:graphql-request@6.1.0";
+export { ClientError, gql, GraphQLClient } from "npm:graphql-request@6.1.0";
 import * as toml from "jsr:@std/toml";
 export { toml };
 export { assertEquals, assertObjectMatch } from "jsr:@std/assert";

deps.ts

@@ -1,13 +1,13 @@
 import {
-  decompress,
-  prompt,
-  Input,
+  _,
   brightGreen,
   Confirm,
-  TerminalSpinner,
-  SpinnerTypes,
+  decompress,
   green,
-  _,
+  Input,
+  prompt,
+  SpinnerTypes,
+  TerminalSpinner,
   toml,
 } from "../../deps.ts";
 import { directoryExists } from "../utils.ts";
@@ -30,7 +30,7 @@ async function init(
     standalone,
     wasm,
   }: { template?: string; standalone?: boolean; wasm?: boolean } = {},
-  name?: string
+  name?: string,
 ) {
   const infos = await promptPackageDetails(standalone, name);
   let version = extractVersion(template || "base_pipeline");
@@ -40,8 +40,9 @@ async function init(
   const data = await result.json();
 
   if (data.version) {
-    version =
-      version === "latest" ? data.version || data.default_branch : version;
+    version = version === "latest"
+      ? data.version || data.default_branch
+      : version;
     if (
       await downloadTemplateFromRegistry(template, version, standalone, wasm)
     ) {
@@ -57,8 +58,9 @@ async function init(
   }
 
   if (data.github_url) {
-    version =
-      version === "latest" ? data.version || data.default_branch : version;
+    version = version === "latest"
+      ? data.version || data.default_branch
+      : version;
     await downloadTemplateFromGithub(data, template, version, standalone, wasm);
     await overrideFluentciToml(infos, standalone ? "." : ".fluentci");
     if (wasm) {
@@ -71,9 +73,11 @@ async function init(
   }
 
   console.log(
-    `Pipeline template ${green('"')}${green(template)}${green(
-      '"'
-    )} not found in Fluent CI registry`
+    `Pipeline template ${green('"')}${green(template)}${
+      green(
+        '"',
+      )
+    } not found in Fluent CI registry`,
   );
   Deno.exit(1);
 }
@@ -119,9 +123,9 @@ async function download(url: string, template: string) {
 
   terminalSpinner.succeed("Downloaded template");
 
-  Deno.writeFile(tempFilePath, new Uint8Array(value));
+  await Deno.writeFile(tempFilePath, new Uint8Array(value));
 
-  await decompress(tempFilePath, ".");
+  const io = await decompress(tempFilePath, ".", { overwrite: true });
 
   // Cleanup the temp file
   await Deno.remove(tempFilePath);
@@ -158,18 +162,21 @@ async function downloadTemplateFromGithub(
   template: string,
   version: string,
   standalone?: boolean,
-  wasm?: boolean
+  wasm?: boolean,
 ) {
-  const archiveUrl =
-    data.version && data.version.startsWith("v")
-      ? `${data.github_url.replace(
-          "https://github.com",
-          "https://codeload.github.com"
-        )}/zip/refs/tags/${version}`
-      : `${data.github_url.replace(
-          "https://github.com",
-          "https://api.github.com/repos"
-        )}/zipball/${version}`;
+  const archiveUrl = data.version && data.version.startsWith("v")
+    ? `${
+      data.github_url.replace(
+        "https://github.com",
+        "https://codeload.github.com",
+      )
+    }/zip/refs/tags/${version}`
+    : `${
+      data.github_url.replace(
+        "https://github.com",
+        "https://api.github.com/repos",
+      )
+    }/zipball/${version}`;
 
   await download(archiveUrl, template);
 
@@ -209,10 +216,10 @@ async function downloadTemplateFromRegistry(
   template: string,
   version: string,
   standalone?: boolean,
-  wasm?: boolean
+  wasm?: boolean,
 ) {
   const status = await fetch(
-    `https://pkg.fluentci.io/${template}@${version}`
+    `https://pkg.fluentci.io/${template}@${version}`,
   ).then((res) => res.status);
   if (status === 200) {
     await download(`https://pkg.fluentci.io/${template}@${version}`, template);
@@ -257,14 +264,18 @@ async function promptPackageDetails(standalone?: boolean, name?: string) {
   console.log(`👋 Welcome to ${brightGreen("Fluent CI")}!\n`);
   console.log(`This utility will walk you through creating a new pipeline.`);
   console.log(
-    `It only covers the most common items, and tries to guess sensible defaults.\n`
+    `It only covers the most common items, and tries to guess sensible defaults.\n`,
   );
   console.log(
-    `Use ${brightGreen(
-      "`fluentci run <pkg>`"
-    )} to run a published pipeline, or ${brightGreen(
-      "`fluentci publish`"
-    )} to publish one.\n`
+    `Use ${
+      brightGreen(
+        "`fluentci run <pkg>`",
+      )
+    } to run a published pipeline, or ${
+      brightGreen(
+        "`fluentci publish`",
+      )
+    } to publish one.\n`,
   );
   console.log(`See ${brightGreen("`fluentci help`")} for more information.\n`);
   console.log(`Press ${brightGreen("CTRL+C")} at any time to quit.\n`);
@@ -305,9 +316,9 @@ async function promptPackageDetails(standalone?: boolean, name?: string) {
   ]);
 
   console.log(
-    `\n✨ About to create a new${
-      standalone ? " reusable " : " "
-    }pipeline in ${brightGreen(Deno.cwd())}\n`
+    `\n✨ About to create a new${standalone ? " reusable " : " "}pipeline in ${
+      brightGreen(Deno.cwd())
+    }\n`,
   );
 
   console.log("📦 Package details:\n");
@@ -341,14 +352,14 @@ async function overrideDaggerJson(infos: Record<string, unknown>, path = ".") {
     const dagger = await Deno.readFile(`${path}/dagger.json`);
     // deno-lint-ignore no-explicit-any
     const daggerJson: Record<string, any> = JSON.parse(
-      new TextDecoder().decode(dagger)
+      new TextDecoder().decode(dagger),
     );
     for (const key of Object.keys(infos)) {
       daggerJson[key] = _.get(infos, key);
     }
     await Deno.writeFile(
       `${path}/dagger.json`,
-      new TextEncoder().encode(JSON.stringify(daggerJson, null, 2))
+      new TextEncoder().encode(JSON.stringify(daggerJson, null, 2)),
     );
 
     if (_.isEqual(path, ".fluentci")) {
@@ -372,13 +383,13 @@ async function overrideCargoToml(infos: Record<string, unknown>, path = ".") {
 
   await Deno.writeFile(
     `${path}/Cargo.toml`,
-    new TextEncoder().encode(toml.stringify(config))
+    new TextEncoder().encode(toml.stringify(config)),
   );
 }
 
 async function overrideFluentciToml(
   infos: Record<string, unknown>,
-  path = "."
+  path = ".",
 ) {
   let config = {};
   try {
@@ -399,7 +410,7 @@ async function overrideFluentciToml(
 
   await Deno.writeFile(
     `${path}/fluentci.toml`,
-    new TextEncoder().encode(toml.stringify(config))
+    new TextEncoder().encode(toml.stringify(config)),
   );
 }
 

src/cmd/init.ts

@@ -1,15 +1,14 @@
 import { dir } from "../deps.ts";
-export const VERSION = "0.16.6";
+export const VERSION = "0.16.7";
 
 export const BASE_URL = "https://api.fluentci.io/v1";
 
 const FLUENTCI_HOST = Deno.env.get("FLUENTCI_HOST") || "vm.fluentci.io";
 
-const scheme =
-  FLUENTCI_HOST.startsWith("localhost") ||
-  FLUENTCI_HOST.split(":")[0].match(/(?:[0-9]{1,3}\.){3}[0-9]{1,3}/)
-    ? "http"
-    : "https";
+const scheme = FLUENTCI_HOST.startsWith("localhost") ||
+    FLUENTCI_HOST.split(":")[0].match(/(?:[0-9]{1,3}\.){3}[0-9]{1,3}/)
+  ? "http"
+  : "https";
 
 export const FLUENTCI_API_URL = `${scheme}://${FLUENTCI_HOST}`;
 export const FLUENTCI_WS_URL = "wss://events.fluentci.io";