fix: use indents from http

Author: northword

packages/scaffold/src/core/tester/create-proxy-plugin/mocha-setup.ts

@@ -37,18 +37,19 @@ window.debug = function (data) {
   send({ type: "debug", data });
 };
 
+let indents = 0,
+  passed = 0,
+  failed = 0,
+  aborted = false;
+
 // Inherit the default test settings from Zotero
 function Reporter(runner) {
-  var indents = 0,
-    passed = 0,
-    failed = 0,
-    aborted = false;
-
   function indent() {
     return "  ".repeat(indents);
   }
 
   function dump(str) {
+    // console.log(str)
     // const p = document.createElement("p")
     // p.textContent = str
     // document.querySelector("#mocha").append(p)
@@ -57,30 +58,30 @@ function Reporter(runner) {
 
   runner.on("start", async function () {
     console.log("start")
-    await send({ type: "start" });
+    await send({ type: "start", data: { indents } });
   });
 
   runner.on("suite", async function (suite) {
     console.log("suite", suite)
     indents++;
     const str = indent() + suite.title + "\\n";
     dump(str);
-    await send({ type: "suite", data: { title: suite.title, root: suite.root } });
+    await send({ type: "suite", data: { title: suite.title, root: suite.root, indents } });
   });
 
   runner.on("suite end", async function (suite) {
     console.log("suite end", suite)
     indents--;
     const str = indents === 1 ? "\\n" : "";
     dump(str);
-    await send({ type: "suite end", data: { title: suite.title, root: suite.root } });
+    await send({ type: "suite end", data: { title: suite.title, root: suite.root, indents } });
   });
 
   runner.on("pending", async function (test) {
     console.log("pending", test)
     const str = indent() + "pending  -" + test.title + "\\n";
     dump(str);
-    await send({ type: "pending", data: { title: test.title, fulltest: test.fullTitle(), duration: test.duration } });
+    await send({ type: "pending", data: { title: test.title, fulltest: test.fullTitle(), duration: test.duration, indents: indents + 1 } });
   });
 
   runner.on("pass", async function (test) {
@@ -92,7 +93,7 @@ function Reporter(runner) {
     }
     str += "\\n";
     dump(str);
-    await send({ type: "pass", data: { title: test.title, fulltest: test.fullTitle(), duration: test.duration } });
+    await send({ type: "pass", data: { title: test.title, fulltest: test.fullTitle(), duration: test.duration, indents: indents + 1 } });
 
   });
 
@@ -121,7 +122,7 @@ function Reporter(runner) {
       "\\n\\n";
     dump(str);
 
-    await send({ type: "fail", data: { title: test.title, fulltest: test.fullTitle(), duration: test.duration, error } });
+    await send({ type: "fail", data: { title: test.title, fulltest: test.fullTitle(), duration: test.duration, error, indents: indents + 1 } });
 
   });
 
@@ -138,7 +139,7 @@ function Reporter(runner) {
 
     await send({
       type: "end",
-      data: { passed: passed, failed: failed, aborted: aborted, str },
+      data: { passed: passed, failed: failed, aborted: aborted, str, indents },
     });
 
     // Must exit on Zotero side, otherwise the exit code will not be 0 and CI will fail

packages/scaffold/src/core/tester/reporter.ts

@@ -3,33 +3,34 @@ import styleText from "node-style-text";
 import { logger } from "../../utils/logger.js";
 import { findFreeTcpPort } from "../../utils/zotero/remote-zotero.js";
 
+interface ResultDataBase {
+  title: string;
+  indents: number;
+}
+
 interface ResultS {
   type: "start" | "pending" | "end" | "debug";
-  data?: any;
+  data?: ResultDataBase | any;
 }
 
 interface ResultSuite {
   type: "suite" | "suite end";
-  data: {
-    title: string;
+  data: ResultDataBase & {
     root: boolean;
   };
 }
 
-interface ResultTestData {
-  title: string;
-  fullTitle: string;
-  duration: number;
-}
-
 interface ResultTestPass {
   type: "pass";
-  data: ResultTestData;
+  data: ResultDataBase & {
+    fullTitle: string;
+    duration: number;
+  };
 }
 
 interface ResultTestFail {
   type: "fail";
-  data: ResultTestData & {
+  data: ResultTestPass["data"] & {
     error: {
       message: string;
       actual: unknown;
@@ -45,7 +46,6 @@ type Result = ResultS | ResultSuite | ResultTestPass | ResultTestFail;
 export class HttpReporter {
   private _server?: http.Server;
   private _port?: number;
-  private indent: number = 0;
 
   constructor(
     private onFailed?: () => void,
@@ -110,6 +110,7 @@ export class HttpReporter {
 
   async onData(body: Result) {
     const { type, data } = body;
+    const logger_option = { space: data.indents - 1 };
 
     switch (type) {
       case "debug":
@@ -120,22 +121,20 @@ export class HttpReporter {
         break;
       case "suite":
         if (data.title)
-          logger.tip(data.title, { space: this.indent });
-        this.indent++;
+          logger.tip(data.title, logger_option);
         break;
       case "pass":
-        logger.success(`${data.title} ${styleText.gray(`${data.duration}ms`)}`, { space: this.indent });
+        logger.success(`${data.title} ${styleText.gray(`${data.duration}ms`)}`, logger_option);
         break;
       case "fail":
-        logger.fail(styleText.red(`${data.title}, ${body.data?.error?.message}`), { space: this.indent });
+        logger.fail(styleText.red(`${data.title}, ${body.data?.error?.message}`), logger_option);
         // if (this.onFailed)
         //   this.onFailed();
         break;
       case "pending":
-        logger.info(`${data.title} pending`, { space: this.indent });
+        logger.info(`${data.title} pending`, logger_option);
         break;
       case "suite end":
-        this.indent--;
         break;
       case "end":
         logger.newLine();