@reteps/dockerfmt 0.2.1 → 0.2.4

package/README.md

@@ -1,6 +1,6 @@
 # `@reteps/dockerfmt`
 
-Bindings around the Golang `dockerfmt` tooling.
+Bindings around the Golang `dockerfmt` tooling. It uses [tinygo](https://github.com/tinygo-org/tinygo) to compile the Go code to WebAssembly, which is then used in the JS bindings.
 
 
 ```js

package/dist/format.d.ts

@@ -1,8 +1,8 @@
-import './wasm_exec.cjs';
+import './wasm_exec.js';
 interface FormatOptions {
     indent: number;
     trailingNewline: boolean;
 }
 declare const formatDockerfile: (fileName: string, options: FormatOptions) => Promise<string>;
-declare const formatDockerfileContents: (fileContents: string, options: FormatOptions) => Promise<string>;
-export { formatDockerfile, formatDockerfileContents };
+declare const formatDockerfileContents: (fileContents: string, options: FormatOptions, getWasm?: () => Promise<Buffer>) => Promise<string>;
+export { formatDockerfile, formatDockerfileContents, FormatOptions };

package/dist/format.js

@@ -1,18 +1,31 @@
-import fs from 'node:fs/promises';
-import './wasm_exec.cjs';
-import path from 'node:path';
-import { fileURLToPath } from 'url';
+import './wasm_exec.js';
+const isNode = typeof process !== "undefined" && process.versions != null && process.versions.node != null;
 const formatDockerfile = async (fileName, options) => {
+    if (!isNode) {
+        throw new Error('formatDockerfile is only supported in Node.js');
+    }
+    const fs = require('node:fs/promises');
+    // This would only work in Node.js, so we don't add a wasmDownload function
     const fileBuffer = await fs.readFile(fileName);
     const fileContents = fileBuffer.toString();
     return formatDockerfileContents(fileContents, options);
 };
-const formatDockerfileContents = async (fileContents, options) => {
+const getWasmModule = () => {
+    if (isNode) {
+        const path = require('node:path');
+        const url = require('node:url');
+        const fs = require('node:fs/promises');
+        return fs.readFile(path.resolve(path.dirname(url.fileURLToPath(import.meta.url)), 'format.wasm'));
+    }
+    // In the browser, we need to fetch the wasm module
+    throw new Error('WASM module not found. Please provide a function to fetch the WASM module.');
+};
+const formatDockerfileContents = async (fileContents, options, getWasm = getWasmModule) => {
     const go = new Go(); // Defined in wasm_exec.js
     const encoder = new TextEncoder();
     const decoder = new TextDecoder();
     // get current working directory
-    const wasmBuffer = await fs.readFile(path.resolve(path.dirname(fileURLToPath(import.meta.url)), 'format.wasm'));
+    const wasmBuffer = await getWasm();
     const wasm = await WebAssembly.instantiate(wasmBuffer, go.importObject);
     /**
      * Do not await this promise, because it only resolves once the go main()

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@reteps/dockerfmt",
-  "version": "0.2.1",
+  "version": "0.2.4",
   "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "//": "Requires tinygo 0.38.0 or later",
     "build-go": "tinygo build -o format.wasm -target wasm --no-debug",
-    "build-js": "tsc && cp format.wasm wasm_exec.cjs dist",
+    "build-js": "tsc && cp format.wasm wasm_exec.js dist",
     "build": "npm run build-go && npm run build-js"
   },
   "files": [