@reteps/dockerfmt 0.2.3 → 0.2.5

package/dist/format.d.ts

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

package/dist/format.js

@@ -1,15 +1,5 @@
-import fs from 'node:fs/promises';
-import './wasm_exec.cjs';
-import path from 'node:path';
-import { fileURLToPath } from 'url';
-const formatDockerfile = async (fileName, options) => {
-    // 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 getWasmModule = () => fs.readFile(path.resolve(path.dirname(fileURLToPath(import.meta.url)), 'format.wasm'));
-const formatDockerfileContents = async (fileContents, options, getWasm = getWasmModule) => {
+import './wasm_exec.js';
+export const formatDockerfileContents = async (fileContents, options, getWasm) => {
     const go = new Go(); // Defined in wasm_exec.js
     const encoder = new TextEncoder();
     const decoder = new TextDecoder();
@@ -35,4 +25,6 @@ const formatDockerfileContents = async (fileContents, options, getWasm = getWasm
     free(filePointer);
     return result;
 };
-export { formatDockerfile, formatDockerfileContents };
+export const formatDockerfile = () => {
+    throw new Error('`formatDockerfile` is not implemented in the browser. Use `formatDockerfileContents` instead.');
+};

package/dist/node.d.ts

@@ -0,0 +1,4 @@
+import { FormatOptions } from "./format.js";
+export declare const formatDockerfileContents: (fileContents: string, options: FormatOptions) => Promise<string>;
+export declare const formatDockerfile: (fileName: string, options: FormatOptions) => Promise<string>;
+export { FormatOptions };

package/dist/node.js

@@ -0,0 +1,15 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { formatDockerfileContents as formatDockerfileContents_ } from "./format.js";
+const getWasm = () => {
+    return fs.readFile(path.resolve(path.dirname(fileURLToPath(import.meta.url)), 'format.wasm'));
+};
+export const formatDockerfileContents = async (fileContents, options) => {
+    return formatDockerfileContents_(fileContents, options, getWasm);
+};
+export const formatDockerfile = async (fileName, options) => {
+    const fileBuffer = await fs.readFile(fileName);
+    const fileContents = fileBuffer.toString();
+    return formatDockerfileContents(fileContents, options);
+};

package/dist/{wasm_exec.cjs → wasm_exec.js}

@@ -529,26 +529,4 @@
 			};
 		}
 	}
-
-	if (
-		global.require &&
-		global.require.main === module &&
-		global.process &&
-		global.process.versions &&
-		!global.process.versions.electron
-	) {
-		if (process.argv.length != 3) {
-			console.error("usage: go_js_wasm_exec [wasm binary] [arguments]");
-			process.exit(1);
-		}
-
-		const go = new Go();
-		WebAssembly.instantiate(fs.readFileSync(process.argv[2]), go.importObject).then(async (result) => {
-			let exitCode = await go.run(result.instance);
-			process.exit(exitCode);
-		}).catch((err) => {
-			console.error(err);
-			process.exit(1);
-		});
-	}
 })();

package/package.json

@@ -1,19 +1,30 @@
 {
   "name": "@reteps/dockerfmt",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "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": [
     "dist"
   ],
-  "main": "dist/format.js",
-  "types": "dist/format.d.ts",
+  "browser": "dist/format.js",
+  "main": "dist/node.js",
+  "types": "dist/node.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/node.d.ts",
+      "browser": "./dist/format.js",
+      "default": "./dist/node.js"
+    },
+    "./format.wasm": "./dist/format.wasm",
+    "./wasm_exec": "./dist/wasm_exec.js",
+    "./wasm_exec.js": "./dist/wasm_exec.js"
+  },
   "author": "Peter Stenger <pete@stenger.io>",
   "repository": "git+https://github.com/reteps/dockerfmt/tree/main/js",
   "license": "MIT",