work in node

d2js/js/build.js

@@ -93,6 +93,7 @@ async function buildAndCopy(buildType) {
       resolve(ROOT_DIR, "wasm/wasm_exec.js"),
       join(config.outdir, "wasm_exec.js")
     );
+    await copyFile(resolve(ROOT_DIR, "src/elk.js"), join(config.outdir, "elk.js"));
   }
 }
 

d2js/js/src/elk.js

@@ -105803,5 +105803,3 @@
     [3]
   )(3);
 });
-
-export default globalThis.ELK;

d2js/js/src/index.js

@@ -42,6 +42,7 @@ export class D2 {
   async init() {
     this.worker = await createWorker();
 
+    const elkContent = await loadFile("./elk.js");
     const wasmExecContent = await loadFile("./wasm_exec.js");
     const wasmBinary = await loadFile("./d2.wasm");
 
@@ -63,6 +64,7 @@ export class D2 {
       data: {
         wasm: wasmBinary,
         wasmExecContent: isNode ? wasmExecContent.toString() : null,
+        elkContent: isNode ? elkContent.toString() : null,
         wasmExecUrl: isNode
           ? null
           : URL.createObjectURL(

d2js/js/src/platform.browser.js

@@ -2,14 +2,16 @@ import { wasmBinary, wasmExecJs } from "./wasm-loader.browser.js";
 import workerScript from "./worker.js" with { type: "text" };
 import elkScript from "./elk.js" with { type: "text" };
 
+// For the browser version, we build the wasm files into a file (wasm-loader.browser.js)
+// and loading a file just reads the text, so there's no external dependency calls
 export async function loadFile(path) {
   if (path === "./d2.wasm") {
     return wasmBinary.buffer;
   }
   if (path === "./wasm_exec.js") {
     return new TextEncoder().encode(wasmExecJs).buffer;
   }
-  throw new Error(`Unexpected file request: ${path}`);
+  return null;
 }
 
 export async function createWorker() {

d2js/js/src/worker.node.js

@@ -2,6 +2,7 @@ import { parentPort } from "node:worker_threads";
 
 let currentPort;
 let d2;
+let elk;
 
 export function setupMessageHandler(isNode, port, initWasm) {
   currentPort = port;
@@ -14,8 +15,10 @@ export function setupMessageHandler(isNode, port, initWasm) {
         try {
           if (isNode) {
             eval(data.wasmExecContent);
+            eval(data.elkContent);
           }
           d2 = await initWasm(data.wasm);
+          elk = new ELK();
           currentPort.postMessage({ type: "ready" });
         } catch (err) {
           currentPort.postMessage({ type: "error", error: err.message });
@@ -24,6 +27,12 @@ export function setupMessageHandler(isNode, port, initWasm) {
 
       case "compile":
         try {
+          if (data.options.layout === "elk") {
+            const elkGraph = await d2.getELKGraph(JSON.stringify(data));
+            const elkGraph2 = JSON.parse(elkGraph).data;
+            const layout = await elk.layout(elkGraph2);
+            globalThis.elkResult = layout;
+          }
           const result = await d2.compile(JSON.stringify(data));
           const response = JSON.parse(result);
           if (response.error) throw new Error(response.error.message);

d2js/js/test/unit/basic.test.js

@@ -9,6 +9,13 @@ describe("D2 Unit Tests", () => {
     await d2.worker.terminate();
   }, 20000);
 
+  test("elk layout works", async () => {
+    const d2 = new D2();
+    const result = await d2.compile("x -> y", { layout: "elk" });
+    expect(result.diagram).toBeDefined();
+    await d2.worker.terminate();
+  }, 20000);
+
   test("render works", async () => {
     const d2 = new D2();
     const result = await d2.compile("x -> y");

d2layouts/d2elklayout/elk.js

@@ -105666,10 +105666,7 @@
               // --------------    RUN GWT INITIALIZATION CODE    --------------
               gwtOnLoad(null, "elk", null);
             }.call(this));
-          }.call(
-            this,
-            {}
-          ));
+          }.call(this, {}));
         },
         {},
       ],