@awsless/awsless 0.0.5 → 0.0.6

package/dist/bin.cjs

@@ -67,8 +67,6 @@ var debugError = (error) => {
   queue.push({
     date: /* @__PURE__ */ new Date(),
     type: style.error.dim("error"),
-    // color: 'red',
-    // type: 'error',
     message: typeof error === "string" ? error : error instanceof Error ? style.error(error.message || "") : JSON.stringify(error)
   });
 };
@@ -76,8 +74,6 @@ var debug = (...parts) => {
   queue.push({
     date: /* @__PURE__ */ new Date(),
     type: style.warning.dim("debug"),
-    // color: 'yellow',
-    // type: 'debug',
     message: parts.map((part) => typeof part === "string" ? part : JSON.stringify(part)).join(" ")
   });
 };
@@ -1156,36 +1152,39 @@ var hr = () => {
 };
 
 // src/cli/ui/layout/logs.ts
+var import_wrap_ansi = __toESM(require("wrap-ansi"), 1);
 var previous = /* @__PURE__ */ new Date();
 var logs = () => {
   if (!process.env.VERBOSE) {
     return [];
   }
   const logs2 = flushDebug();
-  return [
-    hr(),
-    br(),
-    " ".repeat(3),
-    style.label("Debug Logs:"),
-    br(),
-    br(),
-    logs2.map((log) => {
-      const diff = log.date.getTime() - previous.getTime();
-      const time = `+${diff}`.padStart(7);
-      previous = log.date;
-      return [
-        style.attr(`${time}${style.attr.dim("ms")}`),
-        " [ ",
-        log.type,
-        " ] ",
-        log.message,
-        br(),
-        log.type === "error" ? br() : ""
-      ];
-    }),
-    br(),
-    hr()
-  ];
+  return (term) => {
+    term.out.write([
+      hr(),
+      br(),
+      " ".repeat(3),
+      style.label("Debug Logs:"),
+      br(),
+      br(),
+      logs2.map((log) => {
+        const diff = log.date.getTime() - previous.getTime();
+        const time = `+${diff}`.padStart(8);
+        previous = log.date;
+        return (0, import_wrap_ansi.default)([
+          style.attr(`${time}${style.attr.dim("ms")}`),
+          " [ ",
+          log.type,
+          " ] ",
+          log.message,
+          br(),
+          log.type === "error" ? br() : ""
+        ].join(""), term.out.width(), { hard: true, trim: false });
+      }),
+      br(),
+      hr()
+    ]);
+  };
 };
 
 // src/cli/ui/layout/footer.ts
@@ -1305,11 +1304,11 @@ var importFile = async (path) => {
     const path2 = (0, import_path7.dirname)(file);
     const dir = resolveDir(file);
     code2 = code2.replaceAll("__dirname", `"${dir}"`);
-    const matches = code2.match(/import\s*{\s*[a-z0-9_]+\s*}\s*from\s*('|")(\.[\/a-z0-9_]+)('|");?/ig);
+    const matches = code2.match(/import\s*{\s*[a-z0-9\_]+\s*}\s*from\s*('|")(\.[\/a-z0-9\_\-]+)('|");?/ig);
     if (!matches)
       return code2;
     await Promise.all(matches?.map(async (match) => {
-      const parts = /('|")(\.[\/a-z0-9_]+)('|")/ig.exec(match);
+      const parts = /('|")(\.[\/a-z0-9\_\-]+)('|")/ig.exec(match);
       const from = parts[2];
       const file2 = await resolveFileNameExtension((0, import_path7.join)(path2, from));
       const result = await load(file2);
@@ -1387,6 +1386,17 @@ var header = (config2) => {
   ];
 };
 
+// src/util/timer.ts
+var import_pretty_hrtime = __toESM(require("pretty-hrtime"), 1);
+var createTimer = () => {
+  const start = process.hrtime();
+  return () => {
+    const end = process.hrtime(start);
+    const [time, unit] = (0, import_pretty_hrtime.default)(end).split(" ");
+    return style.attr(time) + style.attr.dim(unit);
+  };
+};
+
 // src/cli/lib/signal.ts
 var Signal = class {
   constructor(value) {
@@ -1440,16 +1450,16 @@ var createSpinner = () => {
 };
 
 // src/cli/ui/layout/dialog.ts
-var import_wrap_ansi = __toESM(require("wrap-ansi"), 1);
+var import_wrap_ansi2 = __toESM(require("wrap-ansi"), 1);
 var dialog = (type, lines) => {
   const padding = 3;
   const icon = style[type](symbol[type].padEnd(padding));
   return (term) => {
     term.out.write(lines.map((line, i) => {
       if (i === 0) {
-        return icon + (0, import_wrap_ansi.default)(line, term.out.width(), { hard: true });
+        return icon + (0, import_wrap_ansi2.default)(line, term.out.width(), { hard: true });
       }
-      return (0, import_wrap_ansi.default)(" ".repeat(padding) + line, term.out.width(), { hard: true });
+      return (0, import_wrap_ansi2.default)(" ".repeat(padding) + line, term.out.width(), { hard: true });
     }).join(br()) + br());
   };
 };
@@ -1457,7 +1467,7 @@ var loadingDialog = (message) => {
   const [icon, stop] = createSpinner();
   const description = new Signal(message);
   const time = new Signal("");
-  const start = /* @__PURE__ */ new Date();
+  const timer = createTimer();
   return (term) => {
     term.out.write([
       icon,
@@ -1468,10 +1478,8 @@ var loadingDialog = (message) => {
       br()
     ]);
     return (message2) => {
-      const end = /* @__PURE__ */ new Date();
-      const diff = end.getTime() - start.getTime();
       description.set(message2);
-      time.set(style.attr(diff) + style.attr.dim("ms"));
+      time.set(timer());
       stop();
       icon.set(style.success(symbol.success));
     };
@@ -1545,9 +1553,6 @@ var Interface = class {
       const action = parseAction(key);
       if (typeof action === "undefined") {
         this.bell();
-      } else if (action === "abort") {
-        this.showCursor();
-        process.exit(1);
       } else {
         const cb = actions[action];
         if (typeof cb === "function") {
@@ -1684,6 +1689,12 @@ var layout = async (cb) => {
   const term = createTerminal();
   term.out.clear();
   term.out.write(logo());
+  term.in.captureInput({
+    abort: () => {
+      term.in.showCursor();
+      process.exit(1);
+    }
+  });
   try {
     const options = program.optsWithGlobals();
     const config2 = await importConfig(options);
@@ -1740,7 +1751,6 @@ var assetBuilder = (assets) => {
       groups.update((groups2) => [...groups2, group]);
       await Promise.all(assets2.map(async (asset) => {
         const [icon, stop] = createSpinner();
-        const start = /* @__PURE__ */ new Date();
         const details = new Signal({});
         const line = flexLine(term, [
           icon,
@@ -1760,17 +1770,17 @@ var assetBuilder = (assets) => {
           " ",
           derive([details], (details2) => {
             return Object.entries(details2).map(([key, value]) => {
-              return `${style.label(key)}: ${value}`;
+              return `${style.label(key)} ${value}`;
             }).join(" / ");
           }),
           br()
         ]);
         group.update((group2) => [...group2, line]);
+        const timer = createTimer();
         const data = await asset.build?.();
-        const time = (/* @__PURE__ */ new Date()).getTime() - start.getTime();
         details.set({
           ...data,
-          time: style.attr(time) + style.attr.dim("ms")
+          time: timer()
         });
         icon.set(style.success(symbol.success));
         stop();
@@ -2107,10 +2117,8 @@ var stackTree = (nodes, statuses) => {
           style.info(id),
           " "
         ], [
-          // style.placeholder(' [ '),
           " ",
           status2,
-          // style.placeholder(' ] '),
           br()
         ]);
         term.out.write(line);
@@ -2121,65 +2129,6 @@ var stackTree = (nodes, statuses) => {
   };
 };
 
-// src/cli/ui/__components/basic.ts
-var br2 = () => {
-  return "\n";
-};
-
-// src/cli/ui/__components/spinner.ts
-var frames2 = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
-var length2 = frames2.length;
-var createSpinner2 = () => {
-  const index = new Signal(0);
-  const frame = derive([index], (index2) => style.info(frames2[index2 % length2]));
-  const interval = setInterval(() => {
-    index.update((i) => i + 1);
-  }, 80);
-  return [
-    frame,
-    () => {
-      clearInterval(interval);
-    }
-  ];
-};
-
-// src/cli/ui/__components/dialog.ts
-var dialog2 = (type, lines) => {
-  const padding = 3;
-  const icon = style[type](symbol[type].padEnd(padding));
-  return lines.map((line, i) => {
-    if (i === 0) {
-      return icon + line;
-    } else {
-      return " ".repeat(padding) + line;
-    }
-  }).join(br2()) + br2();
-};
-var loadingDialog2 = (message) => {
-  const [icon, stop] = createSpinner2();
-  const description = new Signal(message);
-  const time = new Signal("");
-  const start = /* @__PURE__ */ new Date();
-  return (term) => {
-    term.out.write([
-      icon,
-      "  ",
-      description,
-      " ",
-      time,
-      br2()
-    ]);
-    return (message2) => {
-      const end = /* @__PURE__ */ new Date();
-      const diff = end.getTime() - start.getTime();
-      description.set(message2);
-      time.set(style.attr(diff) + style.attr.dim("ms"));
-      stop();
-      icon.set(style.success(symbol.success));
-    };
-  };
-};
-
 // src/cli/command/status.ts
 var status = (program2) => {
   program2.command("status").argument("[stacks...]", "Optionally filter stacks to lookup status").description("View the application status").action(async (filters) => {
@@ -2187,18 +2136,18 @@ var status = (program2) => {
       const { app, assets, dependencyTree } = await toApp(config2, filters);
       await cleanUp();
       await write(assetBuilder(assets));
-      write(br2());
+      write(br());
       const assembly = app.synth();
-      const doneLoading = write(loadingDialog2("Loading stack information..."));
+      const doneLoading = write(loadingDialog("Loading stack information..."));
       const client = new StackClient(config2);
       const statuses = [];
       const stackStatuses = {};
       assembly.stacks.forEach((stack) => {
         stackStatuses[stack.id] = new Signal(style.info("Loading..."));
       });
-      write(br2());
+      write(br());
       write(stackTree(dependencyTree, stackStatuses));
-      write(br2());
+      write(br());
       debug("Load metadata for all deployed stacks on AWS");
       await Promise.all(assembly.stacks.map(async (stack, i) => {
         const info = await client.get(stack.stackName);
@@ -2219,9 +2168,9 @@ var status = (program2) => {
       doneLoading("Done loading stack information");
       debug("Done loading data for all deployed stacks on AWS");
       if (statuses.includes("non-existent") || statuses.includes("out-of-date")) {
-        write(dialog2("warning", ["Your app has undeployed changes !!!"]));
+        write(dialog("warning", ["Your app has undeployed changes !!!"]));
       } else {
-        write(dialog2("success", ["Your app has not been changed"]));
+        write(dialog("success", ["Your app has not been changed"]));
       }
     });
   });

package/dist/bin.js

@@ -48,8 +48,6 @@ var debugError = (error) => {
   queue.push({
     date: /* @__PURE__ */ new Date(),
     type: style.error.dim("error"),
-    // color: 'red',
-    // type: 'error',
     message: typeof error === "string" ? error : error instanceof Error ? style.error(error.message || "") : JSON.stringify(error)
   });
 };
@@ -57,8 +55,6 @@ var debug = (...parts) => {
   queue.push({
     date: /* @__PURE__ */ new Date(),
     type: style.warning.dim("debug"),
-    // color: 'yellow',
-    // type: 'debug',
     message: parts.map((part) => typeof part === "string" ? part : JSON.stringify(part)).join(" ")
   });
 };
@@ -1134,36 +1130,39 @@ var hr = () => {
 };
 
 // src/cli/ui/layout/logs.ts
+import wrapAnsi from "wrap-ansi";
 var previous = /* @__PURE__ */ new Date();
 var logs = () => {
   if (!process.env.VERBOSE) {
     return [];
   }
   const logs2 = flushDebug();
-  return [
-    hr(),
-    br(),
-    " ".repeat(3),
-    style.label("Debug Logs:"),
-    br(),
-    br(),
-    logs2.map((log) => {
-      const diff = log.date.getTime() - previous.getTime();
-      const time = `+${diff}`.padStart(7);
-      previous = log.date;
-      return [
-        style.attr(`${time}${style.attr.dim("ms")}`),
-        " [ ",
-        log.type,
-        " ] ",
-        log.message,
-        br(),
-        log.type === "error" ? br() : ""
-      ];
-    }),
-    br(),
-    hr()
-  ];
+  return (term) => {
+    term.out.write([
+      hr(),
+      br(),
+      " ".repeat(3),
+      style.label("Debug Logs:"),
+      br(),
+      br(),
+      logs2.map((log) => {
+        const diff = log.date.getTime() - previous.getTime();
+        const time = `+${diff}`.padStart(8);
+        previous = log.date;
+        return wrapAnsi([
+          style.attr(`${time}${style.attr.dim("ms")}`),
+          " [ ",
+          log.type,
+          " ] ",
+          log.message,
+          br(),
+          log.type === "error" ? br() : ""
+        ].join(""), term.out.width(), { hard: true, trim: false });
+      }),
+      br(),
+      hr()
+    ]);
+  };
 };
 
 // src/cli/ui/layout/footer.ts
@@ -1283,11 +1282,11 @@ var importFile = async (path) => {
     const path2 = dirname(file);
     const dir = resolveDir(file);
     code2 = code2.replaceAll("__dirname", `"${dir}"`);
-    const matches = code2.match(/import\s*{\s*[a-z0-9_]+\s*}\s*from\s*('|")(\.[\/a-z0-9_]+)('|");?/ig);
+    const matches = code2.match(/import\s*{\s*[a-z0-9\_]+\s*}\s*from\s*('|")(\.[\/a-z0-9\_\-]+)('|");?/ig);
     if (!matches)
       return code2;
     await Promise.all(matches?.map(async (match) => {
-      const parts = /('|")(\.[\/a-z0-9_]+)('|")/ig.exec(match);
+      const parts = /('|")(\.[\/a-z0-9\_\-]+)('|")/ig.exec(match);
       const from = parts[2];
       const file2 = await resolveFileNameExtension(join4(path2, from));
       const result = await load(file2);
@@ -1365,6 +1364,17 @@ var header = (config2) => {
   ];
 };
 
+// src/util/timer.ts
+import hrtime from "pretty-hrtime";
+var createTimer = () => {
+  const start = process.hrtime();
+  return () => {
+    const end = process.hrtime(start);
+    const [time, unit] = hrtime(end).split(" ");
+    return style.attr(time) + style.attr.dim(unit);
+  };
+};
+
 // src/cli/lib/signal.ts
 var Signal = class {
   constructor(value) {
@@ -1418,16 +1428,16 @@ var createSpinner = () => {
 };
 
 // src/cli/ui/layout/dialog.ts
-import wrapAnsi from "wrap-ansi";
+import wrapAnsi2 from "wrap-ansi";
 var dialog = (type, lines) => {
   const padding = 3;
   const icon = style[type](symbol[type].padEnd(padding));
   return (term) => {
     term.out.write(lines.map((line, i) => {
       if (i === 0) {
-        return icon + wrapAnsi(line, term.out.width(), { hard: true });
+        return icon + wrapAnsi2(line, term.out.width(), { hard: true });
       }
-      return wrapAnsi(" ".repeat(padding) + line, term.out.width(), { hard: true });
+      return wrapAnsi2(" ".repeat(padding) + line, term.out.width(), { hard: true });
     }).join(br()) + br());
   };
 };
@@ -1435,7 +1445,7 @@ var loadingDialog = (message) => {
   const [icon, stop] = createSpinner();
   const description = new Signal(message);
   const time = new Signal("");
-  const start = /* @__PURE__ */ new Date();
+  const timer = createTimer();
   return (term) => {
     term.out.write([
       icon,
@@ -1446,10 +1456,8 @@ var loadingDialog = (message) => {
       br()
     ]);
     return (message2) => {
-      const end = /* @__PURE__ */ new Date();
-      const diff = end.getTime() - start.getTime();
       description.set(message2);
-      time.set(style.attr(diff) + style.attr.dim("ms"));
+      time.set(timer());
       stop();
       icon.set(style.success(symbol.success));
     };
@@ -1523,9 +1531,6 @@ var Interface = class {
       const action = parseAction(key);
       if (typeof action === "undefined") {
         this.bell();
-      } else if (action === "abort") {
-        this.showCursor();
-        process.exit(1);
       } else {
         const cb = actions[action];
         if (typeof cb === "function") {
@@ -1662,6 +1667,12 @@ var layout = async (cb) => {
   const term = createTerminal();
   term.out.clear();
   term.out.write(logo());
+  term.in.captureInput({
+    abort: () => {
+      term.in.showCursor();
+      process.exit(1);
+    }
+  });
   try {
     const options = program.optsWithGlobals();
     const config2 = await importConfig(options);
@@ -1718,7 +1729,6 @@ var assetBuilder = (assets) => {
       groups.update((groups2) => [...groups2, group]);
       await Promise.all(assets2.map(async (asset) => {
         const [icon, stop] = createSpinner();
-        const start = /* @__PURE__ */ new Date();
         const details = new Signal({});
         const line = flexLine(term, [
           icon,
@@ -1738,17 +1748,17 @@ var assetBuilder = (assets) => {
           " ",
           derive([details], (details2) => {
             return Object.entries(details2).map(([key, value]) => {
-              return `${style.label(key)}: ${value}`;
+              return `${style.label(key)} ${value}`;
             }).join(" / ");
           }),
           br()
         ]);
         group.update((group2) => [...group2, line]);
+        const timer = createTimer();
         const data = await asset.build?.();
-        const time = (/* @__PURE__ */ new Date()).getTime() - start.getTime();
         details.set({
           ...data,
-          time: style.attr(time) + style.attr.dim("ms")
+          time: timer()
         });
         icon.set(style.success(symbol.success));
         stop();
@@ -2085,10 +2095,8 @@ var stackTree = (nodes, statuses) => {
           style.info(id),
           " "
         ], [
-          // style.placeholder(' [ '),
           " ",
           status2,
-          // style.placeholder(' ] '),
           br()
         ]);
         term.out.write(line);
@@ -2099,65 +2107,6 @@ var stackTree = (nodes, statuses) => {
   };
 };
 
-// src/cli/ui/__components/basic.ts
-var br2 = () => {
-  return "\n";
-};
-
-// src/cli/ui/__components/spinner.ts
-var frames2 = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
-var length2 = frames2.length;
-var createSpinner2 = () => {
-  const index = new Signal(0);
-  const frame = derive([index], (index2) => style.info(frames2[index2 % length2]));
-  const interval = setInterval(() => {
-    index.update((i) => i + 1);
-  }, 80);
-  return [
-    frame,
-    () => {
-      clearInterval(interval);
-    }
-  ];
-};
-
-// src/cli/ui/__components/dialog.ts
-var dialog2 = (type, lines) => {
-  const padding = 3;
-  const icon = style[type](symbol[type].padEnd(padding));
-  return lines.map((line, i) => {
-    if (i === 0) {
-      return icon + line;
-    } else {
-      return " ".repeat(padding) + line;
-    }
-  }).join(br2()) + br2();
-};
-var loadingDialog2 = (message) => {
-  const [icon, stop] = createSpinner2();
-  const description = new Signal(message);
-  const time = new Signal("");
-  const start = /* @__PURE__ */ new Date();
-  return (term) => {
-    term.out.write([
-      icon,
-      "  ",
-      description,
-      " ",
-      time,
-      br2()
-    ]);
-    return (message2) => {
-      const end = /* @__PURE__ */ new Date();
-      const diff = end.getTime() - start.getTime();
-      description.set(message2);
-      time.set(style.attr(diff) + style.attr.dim("ms"));
-      stop();
-      icon.set(style.success(symbol.success));
-    };
-  };
-};
-
 // src/cli/command/status.ts
 var status = (program2) => {
   program2.command("status").argument("[stacks...]", "Optionally filter stacks to lookup status").description("View the application status").action(async (filters) => {
@@ -2165,18 +2114,18 @@ var status = (program2) => {
       const { app, assets, dependencyTree } = await toApp(config2, filters);
       await cleanUp();
       await write(assetBuilder(assets));
-      write(br2());
+      write(br());
       const assembly = app.synth();
-      const doneLoading = write(loadingDialog2("Loading stack information..."));
+      const doneLoading = write(loadingDialog("Loading stack information..."));
       const client = new StackClient(config2);
       const statuses = [];
       const stackStatuses = {};
       assembly.stacks.forEach((stack) => {
         stackStatuses[stack.id] = new Signal(style.info("Loading..."));
       });
-      write(br2());
+      write(br());
       write(stackTree(dependencyTree, stackStatuses));
-      write(br2());
+      write(br());
       debug("Load metadata for all deployed stacks on AWS");
       await Promise.all(assembly.stacks.map(async (stack, i) => {
         const info = await client.get(stack.stackName);
@@ -2197,9 +2146,9 @@ var status = (program2) => {
       doneLoading("Done loading stack information");
       debug("Done loading data for all deployed stacks on AWS");
       if (statuses.includes("non-existent") || statuses.includes("out-of-date")) {
-        write(dialog2("warning", ["Your app has undeployed changes !!!"]));
+        write(dialog("warning", ["Your app has undeployed changes !!!"]));
       } else {
-        write(dialog2("success", ["Your app has not been changed"]));
+        write(dialog("success", ["Your app has not been changed"]));
       }
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -31,6 +31,7 @@
     "@aws-sdk/client-sts": "^3.369.0",
     "@aws-sdk/credential-providers": "^3.369.0",
     "@swc/core": "^1.3.70",
+    "@types/pretty-hrtime": "^1.0.1",
     "aws-cdk-lib": "^2.87.0",
     "aws-cron-expression-validator": "^1.0.5",
     "chalk": "^5.3.0",
@@ -38,6 +39,7 @@
     "commander": "^9.4.1",
     "filesize": "^10.0.7",
     "jszip": "^3.10.1",
+    "pretty-hrtime": "^1.0.3",
     "wrap-ansi": "^8.1.0",
     "zod": "^3.21.4",
     "@awsless/code": "^0.0.10"