@awsless/awsless 0.0.103 → 0.0.105

package/dist/bin.js

@@ -992,26 +992,38 @@ import { join as join2 } from "path";
 
 // src/util/fingerprint.ts
 import { createHash as createHash2 } from "crypto";
-import { readFile, stat as stat2 } from "fs/promises";
-import { basename, dirname as dirname2, join } from "path";
+import { readFile, readdir, stat as stat2 } from "fs/promises";
+import { basename, dirname as dirname2, extname, join } from "path";
 import parseImports from "parse-imports";
-var generateFingerprint = async (file) => {
-  const hashes = /* @__PURE__ */ new Map();
-  const generate = async (file2) => {
-    if (hashes.has(file2)) {
-      return;
+var extensions = ["js", "mjs", "jsx", "ts", "mts", "tsx"];
+var generateFileHashes = async (file, hashes) => {
+  if (hashes.has(file)) {
+    return;
+  }
+  const code = await readModuleFile(file);
+  const deps = await findDependencies(file, code);
+  const hash = createHash2("sha1").update(code).digest();
+  hashes.set(file, hash);
+  for (const dep of deps) {
+    if (dep.startsWith("/")) {
+      await generateFileHashes(dep, hashes);
     }
-    const code = await readModuleFile(file2);
-    const deps = await findDependencies(file2, code);
-    const hash = createHash2("sha1").update(code).digest();
-    hashes.set(file2, hash);
-    for (const dep of deps) {
-      if (dep.startsWith("/")) {
-        await generate(dep);
-      }
+  }
+};
+var fingerprintFromFile = async (file) => {
+  const hashes = /* @__PURE__ */ new Map();
+  await generateFileHashes(file, hashes);
+  const merge = Buffer.concat(Array.from(hashes.values()).sort());
+  return createHash2("sha1").update(merge).digest("hex");
+};
+var fingerprintFromDirectory = async (dir) => {
+  const hashes = /* @__PURE__ */ new Map();
+  const files = await readdir(dir, { recursive: true });
+  for (const file of files) {
+    if (extensions.includes(extname(file).substring(1))) {
+      await generateFileHashes(join(dir, file), hashes);
     }
-  };
-  await generate(file);
+  }
   const merge = Buffer.concat(Array.from(hashes.values()).sort());
   return createHash2("sha1").update(merge).digest("hex");
 };
@@ -1020,7 +1032,6 @@ var readModuleFile = (file) => {
     return readFiles([file, file.substring(0, file.length - 3) + ".ts"]);
   }
   if (!basename(file).includes(".")) {
-    const extensions = ["js", "mjs", "jsx", "ts", "mts", "tsx"];
     return readFiles([
       file,
       ...extensions.map((exp) => `${file}.${exp}`),
@@ -1091,7 +1102,7 @@ var InlineFileCode = class extends Asset {
   code;
   handler;
   async build({ read, write }) {
-    const fingerprint = await generateFingerprint(this.file);
+    const fingerprint = await fingerprintFromFile(this.file);
     await write(fingerprint, async (write2) => {
       const bundler = this.bundler ?? rollupBundle();
       const {
@@ -1135,7 +1146,7 @@ var FileCode = class extends Asset {
   // private bundle?: Buffer
   s3;
   async build({ write, read }) {
-    this.fingerprint = await generateFingerprint(this.file);
+    this.fingerprint = await fingerprintFromFile(this.file);
     await write(this.fingerprint, async (write2) => {
       const bundler = this.bundler ?? rollupBundle();
       const { hash, files, handler } = await bundler(this.file);
@@ -1286,6 +1297,9 @@ var directories = {
   },
   get template() {
     return join3(this.output, "template");
+  },
+  get test() {
+    return join3(this.output, "test");
   }
 };
 var setRoot = (path = root) => {
@@ -3137,7 +3151,7 @@ var FileCode2 = class extends Asset {
   }
   code;
   async build({ read, write }) {
-    const fingerprint = await generateFingerprint(this.file);
+    const fingerprint = await fingerprintFromFile(this.file);
     await write(fingerprint, async (write2) => {
       const builder = rollupResolver({ minify: false });
       const code2 = await builder(this.file);
@@ -8292,149 +8306,63 @@ import { configDefaults } from "vitest/config";
 import { startVitest } from "vitest/node";
 import commonjs3 from "@rollup/plugin-commonjs";
 import nodeResolve3 from "@rollup/plugin-node-resolve";
-import json3 from "@rollup/plugin-json";
 import { swc as swc4 } from "rollup-plugin-swc3";
 import { getTests } from "@vitest/runner/utils";
-import { basename as basename3, extname, join as join11, relative as relative4 } from "path";
+import { basename as basename3, 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, ...rest } = {}) => {
+var textWrap = (text, width, { indent = 0, skipFirstLine = false, ...rest } = {}) => {
   const space = " ".repeat(indent);
-  return wrapAnsi3(text, width - indent, rest).split(br()).map((line2) => `${space}${line2}`).join(br());
+  return wrapAnsi3(text, width - indent, { hard: true, ...rest }).split(br()).map((line2, i) => i === 0 && skipFirstLine ? line2 : `${space}${line2}`).join(br());
 };
 
 // src/cli/ui/complex/tester.ts
+import { mkdir as mkdir6, readFile as readFile6, writeFile as writeFile5 } from "fs/promises";
+import json3 from "@rollup/plugin-json";
 var CustomReporter = class {
-  constructor(stack, out) {
-    this.stack = stack;
-    this.out = out;
-  }
-  started = false;
   interval;
-  timer;
   tasks;
   ctx;
-  line = new Signal([]);
-  icon;
   logs = [];
-  stopSpinner;
+  events = {};
+  on(event, cb) {
+    this.events[event] = cb;
+  }
   onInit(ctx) {
     this.ctx = ctx;
   }
   onCollected() {
     this.tasks = this.ctx?.state.getFiles();
-    if (!this.started) {
-      this.start();
-      this.started = true;
+    if (!this.interval) {
+      this.interval = setInterval(this.update.bind(this), 33);
+      this.update();
+      this.events.start?.();
     }
   }
   onFinished() {
-    this.stop();
-  }
-  start() {
-    const [icon, stop] = createSpinner();
-    this.icon = icon;
-    this.stopSpinner = stop;
-    this.interval = setInterval(this.update.bind(this), 33);
-    this.timer = createTimer();
-    this.update();
-    this.out.write(this.line);
-    this.out.gap();
-  }
-  stop() {
     clearInterval(this.interval);
     this.interval = void 0;
-    this.stopSpinner?.();
     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 icon = failed > 0 ? style.error(symbol.error) : style.success(symbol.success);
-    const values = [icon, " ", style.label(this.stack)];
-    if (passed > 0) {
-      values.push(" ", style.placeholder(symbol.pointerSmall), style.success(` ${passed} passed`));
-    }
-    if (failed > 0) {
-      values.push(" ", style.placeholder(symbol.pointerSmall), style.error(` ${failed} failed`));
-    }
-    this.line.set([
-      ...values,
-      " ",
-      style.placeholder(symbol.pointerSmall),
-      " ",
-      this.timer?.(),
-      br(),
-      this.formatLogs(),
-      this.formatErrors()
-    ]);
-  }
-  update() {
-    const tasks = this.runningTasks(this.tasks);
-    this.line.set([
-      this.icon,
-      " ",
-      style.label(this.stack),
-      // ' ',
-      // style.placeholder(`(${tests.length})`),
-      ...tasks.map((task, i) => [
-        " ",
-        style.placeholder(symbol.pointerSmall),
-        " ",
-        i === 0 ? this.formatFileName(task.name) : style.placeholder(task.name)
-      ]),
-      // style.placeholder(tests.length),
-      // ' ',
-      // style.placeholder(symbol.pointerSmall),
-      // ' ',
-      " ",
-      style.placeholder(symbol.pointerSmall),
-      " ",
-      this.timer?.(),
-      br(),
-      this.formatLogs()
-      // this.formatErrors(),
-      // ...this.renderTask(this.tasks!),
-    ]);
-  }
-  formatLogs() {
-    return this.logs.map((log) => {
-      return [style.placeholder(`${symbol.dot} LOG `), log];
-    });
-  }
-  formatErrors() {
-    const tests = getTests(this.tasks);
-    return tests.map((test2) => {
+    const errors = tests.map((test2) => {
       if (!test2.result?.errors || test2.result.errors.length === 0) {
         return [];
       }
-      return [
-        br(),
-        style.error(`${symbol.dot} `),
-        style.error.inverse(` FAIL `),
-        " ",
-        style.placeholder(symbol.pointerSmall),
-        " ",
-        this.formatFileName(test2.file?.name),
-        " ",
-        style.placeholder(symbol.pointerSmall),
-        " ",
-        test2.name,
-        br(),
-        test2.result.errors.map((error) => {
-          const [message, ...comment] = error.message.split("//");
-          const errorMessage = [
-            style.error(`${style.error.bold(error.name)}: ${message}`),
-            comment.length > 0 ? style.placeholder(`//${comment}`) : "",
-            br()
-          ].join("");
-          const values = [textWrap(errorMessage, this.out.width(), { indent: 2, hard: true })];
-          if (error.showDiff && error.diff) {
-            values.push(br(), error.diff, br());
-          }
-          return values;
-        })
-      ];
-    });
+      return test2.result.errors.map((error) => ({
+        file: test2.file?.name,
+        test: test2.name,
+        diff: error.showDiff && error.diff ? error.diff : void 0,
+        type: error.name,
+        message: error.message
+      }));
+    }).flat();
+    this.events.finished?.({ errors, passed, failed, logs: this.logs });
+  }
+  update() {
+    const tasks = this.runningTasks(this.tasks);
+    this.events.update?.({ tasks });
   }
   onUserConsoleLog(log) {
     if (log.taskId) {
@@ -8443,17 +8371,7 @@ var CustomReporter = class {
         test2.name;
       }
     }
-    this.logs.push(log.content);
-  }
-  formatFileName(path) {
-    if (!path) {
-      return "";
-    }
-    path = join11(process.cwd(), path);
-    path = relative4(this.ctx.config.dir, path);
-    const ext = extname(path);
-    const bas = basename3(path, ext);
-    return `${bas}${style.placeholder(ext)}`;
+    this.logs.push(log.content.trimEnd());
   }
   runningTask(tasks) {
     return tasks.find((t) => t.result?.state === "run");
@@ -8470,8 +8388,119 @@ var CustomReporter = class {
   }
 };
 var singleTester = (stack, dir) => {
+  const formatFileName = (path) => {
+    if (!path) {
+      return "";
+    }
+    path = join11(process.cwd(), path);
+    path = relative4(dir, path);
+    const ext = extname2(path);
+    const bas = basename3(path, ext);
+    return `${bas}${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 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 formatOutput = ({ passed, failed, width, logs: logs2, errors, duration }) => {
+    const icon = failed > 0 ? style.error(symbol.error) : style.success(symbol.success);
+    const values = [icon, " ", style.label(stack)];
+    if (passed > 0) {
+      values.push(" ", style.placeholder(symbol.pointerSmall), style.success(` ${passed} passed`));
+    }
+    if (failed > 0) {
+      values.push(" ", style.placeholder(symbol.pointerSmall), style.error(` ${failed} failed`));
+    }
+    return [
+      ...values,
+      " ",
+      style.placeholder(symbol.pointerSmall),
+      " ",
+      duration,
+      br(),
+      ...formatLogs(logs2, width),
+      ...formatErrors(errors, width)
+    ];
+  };
   return async (term) => {
-    await startVitest(
+    await mkdir6(directories.test, { recursive: true });
+    const fingerprint = await fingerprintFromDirectory(dir);
+    const file = join11(directories.test, `${stack}.json`);
+    const exists = await fileExist(file);
+    const line2 = new Signal([]);
+    term.out.write(line2);
+    if (exists) {
+      const raw = await readFile6(file, { encoding: "utf8" });
+      const data2 = JSON.parse(raw);
+      if (data2.fingerprint === fingerprint) {
+        line2.set(formatOutput({ ...data2, width: term.out.width() }));
+        return data2.failed === 0;
+      }
+    }
+    const [icon, stop] = createSpinner();
+    const timer = createTimer();
+    const reporter = new CustomReporter();
+    line2.set([icon, " ", style.label(stack)]);
+    reporter.on("update", ({ tasks }) => {
+      line2.set([
+        icon,
+        " ",
+        style.label(stack),
+        ...tasks.map((task, i) => [
+          " ",
+          style.placeholder(symbol.pointerSmall),
+          " ",
+          i === 0 ? formatFileName(task.name) : style.placeholder(task.name)
+        ]).flat(),
+        " ",
+        style.placeholder(symbol.pointerSmall),
+        " ",
+        timer(),
+        br()
+      ]);
+    });
+    let data;
+    reporter.on("finished", ({ errors, passed, failed, logs: logs2 }) => {
+      stop();
+      const duration = timer();
+      const width = term.out.width();
+      data = { fingerprint, errors, passed, failed, logs: logs2, duration };
+      line2.set(formatOutput({ ...data, width }));
+    });
+    const result = await startVitest(
       "test",
       [],
       {
@@ -8483,7 +8512,7 @@ var singleTester = (stack, dir) => {
         include: ["**/*.{js,jsx,ts,tsx}"],
         exclude: ["**/_*", "**/_*/**", ...configDefaults.exclude],
         globals: true,
-        reporters: new CustomReporter(stack, term.out)
+        reporters: reporter
         // outputFile: {
         // 	json: './.awsless/test/output.json',
         // },
@@ -8506,15 +8535,21 @@ var singleTester = (stack, dir) => {
         ]
       }
     );
+    await writeFile5(file, JSON.stringify(data));
+    return result?.state.getCountOfFailedTests() === 0;
   };
 };
 var runTester = (tests) => {
   return async (term) => {
     for (const [name, paths] of tests.entries()) {
       for (const path of paths) {
-        await term.out.write(singleTester(name, path));
+        const result = await term.out.write(singleTester(name, path));
+        if (!result) {
+          return false;
+        }
       }
     }
+    return true;
   };
 };
 
@@ -8541,7 +8576,10 @@ var deploy = (program2) => {
       }
       await cleanUp();
       await write(typesGenerator(config2));
-      await write(runTester(tests));
+      const passed = await write(runTester(tests));
+      if (!passed) {
+        throw new Cancelled();
+      }
       await write(assetBuilder(app));
       await write(assetPublisher(config2, app));
       await write(templateBuilder(app));

package/dist/index.js

@@ -320,7 +320,7 @@ var mockQueue = (cb) => {
   const mock = createProxy((stack) => {
     return createProxy((name) => {
       return (handle) => {
-        list[getQueueName(stack, name)] = handle ?? (() => {
+        list[getQueueName(name, stack)] = handle ?? (() => {
         });
       };
     });
@@ -329,7 +329,7 @@ var mockQueue = (cb) => {
   const result = mockSQS(list);
   return createProxy((stack) => {
     return createProxy((name) => {
-      return result[getQueueName(stack, name)];
+      return result[getQueueName(name, stack)];
     });
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.103",
+  "version": "0.0.105",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -25,10 +25,10 @@
   },
   "peerDependencies": {
     "@awsless/lambda": "^0.0.13",
-    "@awsless/sqs": "^0.0.7",
     "@awsless/redis": "^0.0.8",
-    "@awsless/ssm": "^0.0.7",
     "@awsless/sns": "^0.0.7",
+    "@awsless/sqs": "^0.0.7",
+    "@awsless/ssm": "^0.0.7",
     "@awsless/validate": "^0.0.6"
   },
   "dependencies": {