@awsless/awsless 0.0.108 → 0.0.110

package/dist/bin.js

@@ -10,14 +10,14 @@ import { Command } from "commander";
 import chalk from "chalk";
 var symbol = {
   info: "\u2139",
-  success: "\u2714",
+  success: "\u2713",
   warning: "\u26A0",
   question: "?",
-  error: "\u2716",
+  error: "\xD7",
   dot: "\xB7",
+  line: "\u2500",
   ellipsis: "\u2026",
   pointerSmall: "\u203A",
-  // line: '─',
   pointer: "\u276F"
 };
 var style = {
@@ -912,6 +912,7 @@ var rollupBundle = ({
         debugError(error.message);
       },
       treeshake: {
+        preset: "smallest",
         moduleSideEffects: (id) => input === id
       },
       plugins: [
@@ -994,7 +995,7 @@ import { join as join2 } from "path";
 import { createHash as createHash2 } from "crypto";
 import { readFile, readdir, stat as stat2 } from "fs/promises";
 import { basename, dirname as dirname2, extname, join } from "path";
-import parseImports from "parse-imports";
+import parseStaticImports from "parse-static-imports";
 var extensions = ["js", "mjs", "jsx", "ts", "mts", "tsx"];
 var generateFileHashes = async (file, hashes) => {
   if (hashes.has(file)) {
@@ -1054,8 +1055,8 @@ var readFiles = async (files) => {
   throw new Error(`No such file: ${files.join(", ")}`);
 };
 var findDependencies = async (file, code) => {
-  const imports = Array.from(await parseImports(code));
-  return imports.map((entry) => entry.moduleSpecifier.value).filter(Boolean).map((value) => value?.startsWith(".") ? join(dirname2(file), value) : value);
+  const imports = await parseStaticImports(code);
+  return imports.map((entry) => entry.moduleName).filter(Boolean).map((value) => value?.startsWith(".") ? join(dirname2(file), value) : value);
 };
 
 // src/formation/resource/lambda/code.ts
@@ -8307,14 +8308,14 @@ import { startVitest } from "vitest/node";
 import commonjs3 from "@rollup/plugin-commonjs";
 import nodeResolve3 from "@rollup/plugin-node-resolve";
 import { swc as swc4 } from "rollup-plugin-swc3";
-import { getTests } from "@vitest/runner/utils";
-import { basename as basename3, extname as extname2, join as join11, relative as relative4 } from "path";
+import { getSuites, getTests } from "@vitest/runner/utils";
+import { basename as basename3, dirname as dirname6, extname as extname2, join as join11, relative as relative4 } from "path";
 
 // src/cli/ui/layout/text-box.ts
 import wrapAnsi3 from "wrap-ansi";
 var textWrap = (text, width, { indent = 0, skipFirstLine = false, ...rest } = {}) => {
   const space = " ".repeat(indent);
-  return wrapAnsi3(text, width - indent, { hard: true, ...rest }).split(br()).map((line2, i) => i === 0 && skipFirstLine ? line2 : `${space}${line2}`).join(br());
+  return wrapAnsi3(text, width - indent, { hard: true, trim: false, ...rest }).split(br()).map((line2, i) => i === 0 && skipFirstLine ? line2 : `${space}${line2}`).join(br());
 };
 
 // src/cli/ui/complex/tester.ts
@@ -8343,16 +8344,18 @@ var CustomReporter = class {
   onFinished() {
     clearInterval(this.interval);
     this.interval = void 0;
+    const suites = getSuites(this.tasks);
     const tests = getTests(this.tasks);
-    const passed = tests.filter((t) => t.result?.state === "pass").length;
-    const failed = tests.filter((t) => t.result?.state === "fail").length;
-    const errors = tests.map((test2) => {
+    const tasks = [...suites, ...tests];
+    const passed = tasks.filter((t) => t.result?.state === "pass").length;
+    const failed = tasks.filter((t) => t.result?.state === "fail").length;
+    const errors = [...suites, ...tests].map((test2) => {
       if (!test2.result?.errors || test2.result.errors.length === 0) {
         return [];
       }
       return test2.result.errors.map((error) => ({
-        file: test2.file?.name,
-        test: test2.name,
+        file: test2.type === "suite" ? test2.name : test2.file?.name,
+        test: test2.type === "test" ? test2.name : void 0,
         diff: error.showDiff && error.diff ? error.diff : void 0,
         type: error.name,
         message: error.message
@@ -8395,45 +8398,81 @@ var singleTester = (stack, dir) => {
     path = join11(process.cwd(), path);
     path = relative4(dir, path);
     const ext = extname2(path);
-    const bas = basename3(path, ext);
-    return `${bas}${style.placeholder(ext)}`;
+    const name = basename3(path, ext);
+    const base = dirname6(path);
+    const start = base === "." ? "" : style.placeholder(base + "/");
+    return `${start}${name}${style.placeholder(ext)}`;
   };
   const formatLogs = (logs2, width) => {
-    return logs2.map((log) => {
-      return [
-        textWrap([style.placeholder(`${symbol.dot} LOG `), log].join(""), width, {
-          skipFirstLine: true,
-          indent: 2
-        }),
-        br()
-      ];
-    }).flat();
+    const length2 = logs2.length;
+    if (length2 === 0) {
+      return [];
+    }
+    const header2 = ` Logs ${length2} `;
+    const lineSize = (width - 2) / 2 - header2.length / 2;
+    return [
+      "  ",
+      style.info(symbol.line.repeat(lineSize)),
+      style.info.inverse.bold(header2),
+      style.info(symbol.line.repeat(lineSize + (header2.length % 2 ? 0 : 1))),
+      br(),
+      br(),
+      ...logs2.map((log) => {
+        return [
+          textWrap([style.info(`${symbol.dot} `), log].join(""), width, {
+            skipFirstLine: true,
+            indent: 2
+          }),
+          br(),
+          br()
+        ];
+      }).flat()
+    ];
   };
   const formatErrors = (errors, width) => {
-    return errors.map((error) => {
-      const [message, ...comment] = error.message.split("//");
-      const errorMessage = [
-        style.error(`${style.error.bold(error.type)}: ${message}`),
-        comment.length > 0 ? style.placeholder(`//${comment}`) : "",
-        br()
-      ].join("");
-      return [
-        br(),
-        style.error(`${symbol.dot} `),
-        style.error.inverse(` FAIL `),
-        " ",
-        style.placeholder(symbol.pointerSmall),
-        " ",
-        formatFileName(error.file),
-        " ",
-        style.placeholder(symbol.pointerSmall),
-        " ",
-        error.test,
-        br(),
-        textWrap(errorMessage, width, { indent: 2 }),
-        ...error.diff ? [br(), error.diff, br()] : []
-      ];
-    }).flat();
+    const length2 = errors.length;
+    if (length2 === 0) {
+      return [];
+    }
+    const header2 = ` Failed Tests ${length2} `;
+    const lineSize = (width - 2) / 2 - header2.length / 2;
+    return [
+      "  ",
+      style.error(symbol.line.repeat(lineSize)),
+      style.error.inverse.bold(header2),
+      style.error(symbol.line.repeat(lineSize + (header2.length % 2 ? 0 : 1))),
+      br(),
+      ...errors.map((error, i) => {
+        const [message, ...comment] = error.message.split("//");
+        const errorMessage = [
+          style.error.bold(error.type + ":"),
+          " ",
+          message,
+          comment.length > 0 ? style.placeholder(`//${comment}`) : "",
+          br()
+        ].join("");
+        const pagination = `[${i + 1}/${length2}]${symbol.line}`;
+        const name = error.test ? [" ", style.placeholder(symbol.pointerSmall), " ", error.test] : [];
+        return [
+          br(),
+          style.error(`${symbol.error} `),
+          style.error.inverse.bold(` FAIL `),
+          " ",
+          style.placeholder(symbol.pointerSmall),
+          " ",
+          formatFileName(error.file),
+          ...name,
+          br(),
+          br(),
+          textWrap(errorMessage, width, { indent: 2 }),
+          ...error.diff ? [br(), error.diff, br()] : [],
+          br(),
+          "  ",
+          style.error.dim(symbol.line.repeat(width - 2 - pagination.length) + pagination),
+          br()
+        ];
+      }).flat()
+    ];
   };
   const formatOutput = ({
     passed,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.108",
+  "version": "0.0.110",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -25,11 +25,11 @@
   },
   "peerDependencies": {
     "@awsless/lambda": "^0.0.13",
-    "@awsless/sns": "^0.0.7",
     "@awsless/redis": "^0.0.8",
+    "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
-    "@awsless/validate": "^0.0.6",
-    "@awsless/ssm": "^0.0.7"
+    "@awsless/ssm": "^0.0.7",
+    "@awsless/validate": "^0.0.7"
   },
   "dependencies": {
     "@aws-appsync/utils": "^1.5.0",
@@ -67,6 +67,7 @@
     "jszip": "^3.10.1",
     "mime-types": "^2.1.35",
     "parse-imports": "^1.1.2",
+    "parse-static-imports": "^1.1.0",
     "pretty-hrtime": "^1.0.3",
     "rollup": "^4.0.2",
     "rollup-plugin-replace": "^2.2.0",