@awsless/awsless 0.0.109 → 0.0.110

package/dist/bin.js

@@ -995,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)) {
@@ -1055,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
@@ -8308,8 +8308,8 @@ 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";
@@ -8344,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
@@ -8396,8 +8398,10 @@ 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) => {
     const length2 = logs2.length;
@@ -8408,14 +8412,14 @@ var singleTester = (stack, dir) => {
     const lineSize = (width - 2) / 2 - header2.length / 2;
     return [
       "  ",
-      style.placeholder(symbol.line.repeat(lineSize)),
-      style.label.inverse.bold(header2),
-      style.placeholder(symbol.line.repeat(lineSize + (header2.length % 2 ? 0 : 1))),
+      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.placeholder(`${symbol.dot} `), log].join(""), width, {
+          textWrap([style.info(`${symbol.dot} `), log].join(""), width, {
             skipFirstLine: true,
             indent: 2
           }),
@@ -8441,11 +8445,14 @@ var singleTester = (stack, dir) => {
       ...errors.map((error, i) => {
         const [message, ...comment] = error.message.split("//");
         const errorMessage = [
-          style.error(`${style.error.bold(error.type)}: ${message}`),
+          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} `),
@@ -8454,10 +8461,7 @@ var singleTester = (stack, dir) => {
           style.placeholder(symbol.pointerSmall),
           " ",
           formatFileName(error.file),
-          " ",
-          style.placeholder(symbol.pointerSmall),
-          " ",
-          error.test,
+          ...name,
           br(),
           br(),
           textWrap(errorMessage, width, { indent: 2 }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.109",
+  "version": "0.0.110",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -27,9 +27,9 @@
     "@awsless/lambda": "^0.0.13",
     "@awsless/redis": "^0.0.8",
     "@awsless/sns": "^0.0.7",
-    "@awsless/validate": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
-    "@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",