@reventlessdev/reventless-gwt 1.0.0-alpha.75 → 1.0.0-alpha.77

package/src/Cli.res.mjs

@@ -1,11 +1,17 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Nodepath from "node:path";
+import * as Nodecrypto from "node:crypto";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.js";
+import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as Watch$ReventlessGwt from "./Watch.res.mjs";
+import * as Nodeworker_threads from "node:worker_threads";
 import * as Loader$ReventlessGwt from "./Loader.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Worker$ReventlessGwt from "./Worker.res.mjs";
 import * as Outcome$ReventlessGwt from "./Outcome.res.mjs";
 import * as Collector$ReventlessGwt from "./Collector.res.mjs";
 import * as Discovery$ReventlessGwt from "./Discovery.res.mjs";
@@ -30,6 +36,14 @@ import * as Platform_ComponentDefinitionsApi$ReventlessCore from "@reventlessdev
 
 let toolVersion = "0.1.0";
 
+function sha256(s) {
+  return Nodecrypto.createHash("sha256").update(s).digest("hex");
+}
+
+let lastDomainHash = {
+  contents: undefined
+};
+
 let dateNowIso = (() => new Date().toISOString());
 
 function parseFormat(s) {
@@ -291,7 +305,8 @@ Exit code is 1 if any test failed, 0 otherwise.
         backend: backend,
         uiPorts: uiPorts,
         listPlatforms: listPlatforms,
-        toolVersion: toolVersion
+        toolVersion: toolVersion,
+        paths: undefined
       }
     };
   }
@@ -317,6 +332,29 @@ let exnMessage = (function(e) {
   return "unknown error"
 });
 
+function raceWithTimeout(body, ms) {
+  let handleRef = {
+    contents: undefined
+  };
+  let timeout = new Promise((resolve, _reject) => {
+    handleRef.contents = Primitive_option.some(setTimeout(() => resolve(Outcome$ReventlessGwt.fail({
+      TAG: "Throw",
+      error: `timed out after ` + ms.toString() + `ms`,
+      stack: ""
+    })), ms));
+  });
+  return Promise.race([
+    body(),
+    timeout
+  ]).then(o => {
+    let h = handleRef.contents;
+    if (h !== undefined) {
+      clearTimeout(Primitive_option.valFromOption(h));
+    }
+    return Promise.resolve(o);
+  });
+}
+
 async function runEntry(entry) {
   let start = performance.now();
   let status = "Pass";
@@ -334,7 +372,8 @@ async function runEntry(entry) {
   }
   if (exit === 1) {
     try {
-      let outcome = await entry.body();
+      let deadline = Stdlib_Option.getOr(entry.timeout, 5000);
+      let outcome = await raceWithTimeout(entry.body, deadline);
       if (outcome.TAG === "Ok") {
         status = "Pass";
       } else {
@@ -375,7 +414,7 @@ async function loadAndCollect(path) {
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);
     let msg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(exn), Stdlib_JsExn.message), "import failed");
-    Collector$ReventlessGwt.push(undefined, undefined, `<file-load-error>`, () => Promise.resolve(Outcome$ReventlessGwt.fail({
+    Collector$ReventlessGwt.push(undefined, undefined, undefined, `<file-load-error>`, () => Promise.resolve(Outcome$ReventlessGwt.fail({
       TAG: "Throw",
       error: "Failed to load " + path + ": " + msg,
       stack: ""
@@ -469,7 +508,7 @@ function emitResult(opts, r) {
       if (opts.stream) {
         return FormatterJson$ReventlessGwt.streamRunEnd(r);
       } else {
-        return FormatterJson$ReventlessGwt.emit(r, opts.toolVersion);
+        return FormatterJson$ReventlessGwt.emit(r, opts.toolVersion, opts.schemaVersion);
       }
     case "Tap" :
       return FormatterTap$ReventlessGwt.emit(r);
@@ -480,10 +519,48 @@ function emitResult(opts, r) {
   }
 }
 
+function mergeScope(a, b) {
+  if (typeof a !== "object") {
+    return "RunAll";
+  }
+  if (typeof b !== "object") {
+    return "RunAll";
+  }
+  let seen = {};
+  let union = [];
+  a._0.concat(b._0).forEach(d => {
+    let match = seen[d];
+    if (match !== undefined) {
+      return;
+    } else {
+      seen[d] = true;
+      union.push(d);
+      return;
+    }
+  });
+  return {
+    TAG: "RunPackages",
+    _0: union
+  };
+}
+
+function pathUnderDir(path, dir) {
+  return path.startsWith(dir.endsWith("/") ? dir : dir + "/");
+}
+
+function scopeSubset(scope, allPaths) {
+  if (typeof scope !== "object") {
+    return allPaths;
+  }
+  let dirs = scope._0;
+  return allPaths.filter(p => dirs.some(d => pathUnderDir(p, d)));
+}
+
 async function runOnce(opts) {
-  let paths = await Discovery$ReventlessGwt.discover(opts.roots);
+  let p = opts.paths;
+  let paths = p !== undefined ? p : await Discovery$ReventlessGwt.discover(opts.roots);
   if (opts.format === "Json" && opts.stream) {
-    FormatterJson$ReventlessGwt.streamRunStart(opts.toolVersion, dateNowIso());
+    FormatterJson$ReventlessGwt.streamRunStart(opts.toolVersion, dateNowIso(), opts.schemaVersion);
   }
   let match = opts.format;
   let match$1 = opts.stream;
@@ -530,9 +607,16 @@ async function emitDomainAnalysis(pkgs) {
   }
   try {
     let loaded = await LocalHost$ReventlessGwt.loadGraph(platformModulePath, plugins);
-    FormatterVsCode$ReventlessGwt.deadCode(DomainDeadCode$ReventlessGwt.analyze(loaded.structures));
-    FormatterVsCode$ReventlessGwt.graph(DomainGraph$ReventlessGwt.build(loaded.structures));
-    return FormatterVsCode$ReventlessGwt.definitions(loaded.structures.map(param => Platform_ComponentDefinitionsApi$ReventlessCore.encodePluginStructureEntry(param[0], param[1])));
+    let definitions = loaded.structures.map(param => Platform_ComponentDefinitionsApi$ReventlessCore.encodePluginStructureEntry(param[0], param[1]));
+    let fingerprint = sha256(JSON.stringify(definitions));
+    if (Primitive_object.notequal(lastDomainHash.contents, fingerprint)) {
+      lastDomainHash.contents = fingerprint;
+      FormatterVsCode$ReventlessGwt.deadCode(DomainDeadCode$ReventlessGwt.analyze(loaded.structures));
+      FormatterVsCode$ReventlessGwt.graph(DomainGraph$ReventlessGwt.build(loaded.structures));
+      return FormatterVsCode$ReventlessGwt.definitions(definitions);
+    } else {
+      return;
+    }
   } catch (exn) {
     return;
   }
@@ -593,55 +677,160 @@ function startBuildWatchers(paths) {
 
 async function runWatch(opts) {
   let roots = opts.roots;
+  let discoveredPaths = {
+    contents: []
+  };
   if (opts.format === "VsCode") {
     let paths = await Discovery$ReventlessGwt.discover(roots);
+    discoveredPaths.contents = paths;
     await emitDiscovery(paths);
     startBuildWatchers(paths);
   }
+  let currentWorker = {
+    contents: undefined
+  };
+  Cancellation$ReventlessGwt.onCancel(() => {
+    let w = currentWorker.contents;
+    if (w !== undefined) {
+      Primitive_option.valFromOption(w).terminate();
+      return;
+    }
+  });
+  let runInWorker = paths => new Promise((resolve, _reject) => {
+    let w = new Nodeworker_threads.Worker(Worker$ReventlessGwt.runWorkerUrl, {
+      workerData: {
+        subcommand: opts.subcommand,
+        format: opts.format,
+        stream: opts.stream,
+        watch: opts.watch,
+        filters: opts.filters,
+        schemaVersion: opts.schemaVersion,
+        roots: opts.roots,
+        backend: opts.backend,
+        uiPorts: opts.uiPorts,
+        listPlatforms: opts.listPlatforms,
+        toolVersion: opts.toolVersion,
+        paths: paths
+      }
+    });
+    currentWorker.contents = Primitive_option.some(w);
+    let settled = {
+      contents: false
+    };
+    let settle = () => {
+      if (!settled.contents) {
+        settled.contents = true;
+        currentWorker.contents = undefined;
+        return resolve();
+      }
+    };
+    w.on("exit", _code => settle());
+    w.on("error", e => {
+      console.error("gwt run worker error:", e);
+      settle();
+    });
+  });
+  let pathsForScope = scope => {
+    if (opts.format === "VsCode") {
+      return scopeSubset(scope, discoveredPaths.contents);
+    }
+  };
   let runInProgress = {
     contents: false
   };
-  let rerunPending = {
-    contents: false
+  let pendingScope = {
+    contents: undefined
   };
-  let run = async () => {
+  let requestRun = async scope => {
     if (runInProgress.contents) {
-      rerunPending.contents = true;
+      let s = pendingScope.contents;
+      pendingScope.contents = s !== undefined ? mergeScope(s, scope) : scope;
       return;
-    } else {
-      runInProgress.contents = true;
-      await runOnce(opts);
-      runInProgress.contents = false;
-      if (rerunPending.contents) {
-        rerunPending.contents = false;
-        await runOnce(opts);
-        return;
+    }
+    runInProgress.contents = true;
+    await runInWorker(pathsForScope(scope));
+    let drain = async () => {
+      let next = pendingScope.contents;
+      if (next !== undefined) {
+        pendingScope.contents = undefined;
+        await runInWorker(pathsForScope(next));
+        return await drain();
       } else {
+        runInProgress.contents = false;
         return;
       }
+    };
+    return await drain();
+  };
+  await requestRun("RunAll");
+  let rediscoverAndRun = async () => {
+    if (opts.format === "VsCode") {
+      discoveredPaths.contents = await Discovery$ReventlessGwt.discover(roots);
+    }
+    await requestRun("RunAll");
+  };
+  let rebuilding = {};
+  let refreshDiscovery = async () => {
+    let paths = await Discovery$ReventlessGwt.discover(roots);
+    discoveredPaths.contents = paths;
+    await emitDiscovery(paths);
+    startBuildWatchers(paths);
+    await requestRun("RunAll");
+  };
+  let affectedScope = path => {
+    if (opts.format !== "VsCode") {
+      return "RunAll";
+    }
+    let abs = Nodepath.resolve(path);
+    let pkg = PackageScan$ReventlessGwt.findOwning(Nodepath.dirname(abs));
+    if (pkg !== undefined && discoveredPaths.contents.some(p => pathUnderDir(p, pkg.dir))) {
+      return {
+        TAG: "RunPackages",
+        _0: [pkg.dir]
+      };
+    } else {
+      return "RunAll";
     }
   };
-  await run();
   Watch$ReventlessGwt.start(roots, (event, path) => {
     if (opts.format === "VsCode" && Watch$ReventlessGwt.isStructuralSource(event, path)) {
       let pkg = PackageScan$ReventlessGwt.findOwning(path);
       if (pkg !== undefined) {
+        if (Stdlib_Option.getOr(rebuilding[pkg.dir], false)) {
+          return;
+        }
+        rebuilding[pkg.dir] = true;
         let t0 = Date.now();
         FormatterVsCode$ReventlessGwt.buildStart(pkg.dir);
+        let sawError = {
+          contents: false
+        };
         let feed = BuildClassifier$ReventlessGwt.make(undefined, {
           onStart: () => {},
           onOk: _ms => {},
-          onFail: msg => FormatterVsCode$ReventlessGwt.buildFail(pkg.dir, msg)
+          onFail: msg => {
+            sawError.contents = true;
+            FormatterVsCode$ReventlessGwt.buildFail(pkg.dir, msg);
+          }
         });
-        return ProcessManager$ReventlessGwt.cleanRebuild(pkg, (_dir, line) => feed(line), () => {
-          FormatterVsCode$ReventlessGwt.buildOk(pkg.dir, Date.now() - t0);
-          run();
+        return ProcessManager$ReventlessGwt.cleanRebuild(pkg, (_dir, line) => feed(line), ok => {
+          rebuilding[pkg.dir] = false;
+          if (ok) {
+            FormatterVsCode$ReventlessGwt.buildOk(pkg.dir, Date.now() - t0);
+          } else if (!sawError.contents) {
+            FormatterVsCode$ReventlessGwt.buildFail(pkg.dir, "clean rebuild failed");
+          }
+          rediscoverAndRun();
         });
       }
-      run();
+      requestRun("RunAll");
       return;
     } else {
-      run();
+      if (opts.format === "VsCode" && event === "Add" && path.endsWith(".res")) {
+        refreshDiscovery();
+      } else {
+        requestRun(affectedScope(path));
+      }
       return;
     }
   });
@@ -728,8 +917,12 @@ async function main() {
   }
 }
 
+let defaultTimeoutMs = 5000;
+
 export {
   toolVersion,
+  sha256,
+  lastDomainHash,
   dateNowIso,
   parseFormat,
   defaultRoots,
@@ -737,10 +930,15 @@ export {
   parseArgv,
   passesFilter,
   exnMessage,
+  defaultTimeoutMs,
+  raceWithTimeout,
   runEntry,
   loadAndCollect,
   runFiles,
   emitResult,
+  mergeScope,
+  pathUnderDir,
+  scopeSubset,
   runOnce,
   emitDomainAnalysis,
   emitDiscovery,
@@ -751,4 +949,4 @@ export {
   listPlatforms,
   main,
 }
-/* Stdlib_JsExn Not a pure module */
+/* node:path Not a pure module */

package/src/Collector.res

@@ -25,6 +25,10 @@ type entry = {
   body: unit => promise<Outcome.outcome>,
   status: status,
   location: option<location>,
+  // Per-test deadline in ms (from `~timeout` on `testPromise`). `None` = use the
+  // runner default. The CLI runner races the body against this; the Jest arm
+  // passes it to Jest's own timeout instead.
+  timeout: option<int>,
 }
 
 let active = ref(false)
@@ -43,6 +47,10 @@ let activate = () => {
   hasOnly := false
   skipNext := false
   onlyNext := false
+  // Reset the skip nesting depth too: a throwing `xdescribe` body in a prior
+  // file could otherwise leave it > 0, silently skipping every test in every
+  // subsequently loaded file.
+  skipDepth := 0
   currentFile := None
 }
 
@@ -73,6 +81,7 @@ let buildId = (describePath, name) => {
 let push = (
   ~slice=?,
   ~location=?,
+  ~timeout=?,
   name: string,
   body: unit => promise<Outcome.outcome>,
 ) => {
@@ -97,8 +106,9 @@ let push = (
     body,
     status,
     location,
+    timeout,
   }
-  entries := Array.concat(entries.contents, [entry])
+  entries.contents->Array.push(entry)
 }
 
 // A `todo` placeholder: a spec-less slice still ships a discoverable, compiling
@@ -115,8 +125,9 @@ let pushTodo = (name: string) => {
     body: () => Promise.resolve(Outcome.pass),
     status: Skipped,
     location: None,
+    timeout: None,
   }
-  entries := Array.concat(entries.contents, [entry])
+  entries.contents->Array.push(entry)
 }
 
 let drain = () => {

package/src/Collector.res.mjs

@@ -42,6 +42,7 @@ function activate() {
   hasOnly.contents = false;
   skipNext.contents = false;
   onlyNext.contents = false;
+  skipDepth.contents = 0;
   currentFile.contents = undefined;
 }
 
@@ -86,7 +87,7 @@ function buildId(describePath, name) {
   }
 }
 
-function push(slice, location, name, body) {
+function push(slice, location, timeout, name, body) {
   let status = skipDepth.contents > 0 ? "Skipped" : (
       skipNext.contents ? (skipNext.contents = false, "Skipped") : (
           onlyNext.contents ? (onlyNext.contents = false, "Only") : "Runnable"
@@ -101,9 +102,10 @@ function push(slice, location, name, body) {
     slice: slice,
     body: body,
     status: status,
-    location: location
+    location: location,
+    timeout: timeout
   };
-  entries.contents = entries.contents.concat([entry]);
+  entries.contents.push(entry);
 }
 
 function pushTodo(name) {
@@ -117,9 +119,10 @@ function pushTodo(name) {
     slice: undefined,
     body: entry_body,
     status: "Skipped",
-    location: undefined
+    location: undefined,
+    timeout: undefined
   };
-  entries.contents = entries.contents.concat([entry]);
+  entries.contents.push(entry);
 }
 
 function drain() {

package/src/ComponentMeta.res

@@ -5,42 +5,16 @@
 
 type component = {kind: string, name: string}
 
-// Folder names that denote a component kind. A file counts as a component when
-// its immediate parent folder is one of these.
-let kindFolders = [
-  "Aggregate",
-  "StateChangeSlice",
-  "StateViewSlice",
-  "StateViewSliceStream",
-  "ReadModel",
-  "ReadModelStream",
-  "AutomationSlice",
-  "InboundTranslationSlice",
-  "OutboundTranslationSlice",
-  "Extension",
-  "ExtensionPoint",
-  "Task",
-]
-
-let isKindFolder = (segment: string) => kindFolders->Array.includes(segment)
-
-// Body-file suffixes stripped to recover the spec stem (longest first so
-// `_ExtensionPointMapping` is removed before `_ExtensionPoint`). Spec and body
-// files in one folder collapse to the same component name.
-let bodySuffixes = [
-  "_ExtensionPointMapping",
-  "_ExtensionPoint",
-  "_Extension",
-  "_Projections",
-  "_Projection",
-  "_Mappings",
-  "_Behavior",
-  "_Automation",
-  "_Translation",
-]
+// The folder→kind vocabulary and body-file suffixes are the single source in
+// `Reventless.ComponentKind` (shared with the plugin generator). Deriving from it
+// means the gwt discovery recognises exactly the folder spellings the generator
+// classifies — including the plural / short forms this file used to miss.
+module Kind = Reventless.ComponentKind
 
+// Strip a body-file suffix (longest first) to recover the spec stem, so spec and
+// body files in one folder collapse to the same component name.
 let stripBody = (stem: string) =>
-  switch bodySuffixes->Array.find(suf => String.endsWith(stem, suf)) {
+  switch Kind.bodySuffixes->Array.find(suf => String.endsWith(stem, suf)) {
   | Some(suf) => String.slice(stem, ~start=0, ~end=String.length(stem) - String.length(suf))
   | None => stem
   }
@@ -87,18 +61,17 @@ let stem = (filename: string) =>
   }
 
 // {kind, name} for a discovered GWT test file, or None if it isn't inside a
-// recognised kind folder.
+// recognised kind folder. `kind` is the canonical folder name, so a plural
+// folder (`Aggregates/`) reports the same kind as its singular form.
 let componentOfTestFile = (path: string): option<component> =>
-  switch parentFolder(path) {
-  | Some(folder) if isKindFolder(folder) =>
-    Some({kind: folder, name: path->basename->stem->stripGwt->stripBody})
-  | _ => None
+  switch parentFolder(path)->Option.flatMap(Kind.folderToKind) {
+  | Some(kind) => Some({kind: Kind.folderName(kind), name: path->basename->stem->stripGwt->stripBody})
+  | None => None
   }
 
 // {kind, name} for a src/ component file (spec or body), or None.
 let componentOfSrcFile = (path: string): option<component> =>
-  switch parentFolder(path) {
-  | Some(folder) if isKindFolder(folder) =>
-    Some({kind: folder, name: path->basename->stem->stripBody})
-  | _ => None
+  switch parentFolder(path)->Option.flatMap(Kind.folderToKind) {
+  | Some(kind) => Some({kind: Kind.folderName(kind), name: path->basename->stem->stripBody})
+  | None => None
   }

package/src/ComponentMeta.res.mjs

@@ -1,40 +1,11 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
-
-let kindFolders = [
-  "Aggregate",
-  "StateChangeSlice",
-  "StateViewSlice",
-  "StateViewSliceStream",
-  "ReadModel",
-  "ReadModelStream",
-  "AutomationSlice",
-  "InboundTranslationSlice",
-  "OutboundTranslationSlice",
-  "Extension",
-  "ExtensionPoint",
-  "Task"
-];
-
-function isKindFolder(segment) {
-  return kindFolders.includes(segment);
-}
-
-let bodySuffixes = [
-  "_ExtensionPointMapping",
-  "_ExtensionPoint",
-  "_Extension",
-  "_Projections",
-  "_Projection",
-  "_Mappings",
-  "_Behavior",
-  "_Automation",
-  "_Translation"
-];
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as ComponentKind$Reventless from "@reventlessdev/reventless-spec/src/components/ComponentKind.res.mjs";
 
 function stripBody(stem) {
-  let suf = bodySuffixes.find(suf => stem.endsWith(suf));
+  let suf = ComponentKind$Reventless.bodySuffixes.find(suf => stem.endsWith(suf));
   if (suf !== undefined) {
     return stem.slice(0, stem.length - suf.length | 0);
   } else {
@@ -86,29 +57,29 @@ function stem(filename) {
 }
 
 function componentOfTestFile(path) {
-  let folder = parentFolder(path);
-  if (folder !== undefined && kindFolders.includes(folder)) {
+  let kind = Stdlib_Option.flatMap(parentFolder(path), ComponentKind$Reventless.folderToKind);
+  if (kind !== undefined) {
     return {
-      kind: folder,
+      kind: ComponentKind$Reventless.folderName(kind),
       name: stripBody(stripGwt(stem(basename(path))))
     };
   }
 }
 
 function componentOfSrcFile(path) {
-  let folder = parentFolder(path);
-  if (folder !== undefined && kindFolders.includes(folder)) {
+  let kind = Stdlib_Option.flatMap(parentFolder(path), ComponentKind$Reventless.folderToKind);
+  if (kind !== undefined) {
     return {
-      kind: folder,
+      kind: ComponentKind$Reventless.folderName(kind),
       name: stripBody(stem(basename(path)))
     };
   }
 }
 
+let Kind;
+
 export {
-  kindFolders,
-  isKindFolder,
-  bodySuffixes,
+  Kind,
   stripBody,
   stripGwt,
   basename,