@wasm-fmt/dart_fmt 0.0.3 → 0.1.1

package/README.md

@@ -2,13 +2,13 @@
 
 # Install
 
-[![npm](https://img.shields.io/npm/v/@wasm-fmt/dart_fmt)](https://www.npmjs.com/package/@wasm-fmt/dart_fmt)
+[![npm](https://img.shields.io/npm/v/@wasm-fmt/dart_fmt?color=00B4AB)](https://www.npmjs.com/package/@wasm-fmt/dart_fmt)
 
 ```bash
 npm install @wasm-fmt/dart_fmt
 ```
 
-[![jsr.io](https://jsr.io/badges/@fmt/dart-fmt)](https://jsr.io/@fmt/dart-fmt)
+[![jsr.io](https://jsr.io/badges/@fmt/dart-fmt?color=00B4AB)](https://jsr.io/@fmt/dart-fmt)
 
 ```bash
 npx jsr add @fmt/dart-fmt

package/dart_fmt.d.ts

@@ -9,16 +9,16 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 
 export type InitOutput = unknown;
 
-export type SyncInitInput = BufferSource | WebAssembly.Module;
-/**
-* Instantiates the given `module`, which can either be bytes or
-* a precompiled `WebAssembly.Module`.
-*
-* @param {SyncInitInput} module
-*
-* @returns {InitOutput}
-*/
-export function initSync(module: SyncInitInput): InitOutput;
+// export type SyncInitInput = BufferSource | WebAssembly.Module;
+// /**
+// * Instantiates the given `module`, which can either be bytes or
+// * a precompiled `WebAssembly.Module`.
+// *
+// * @param {SyncInitInput} module
+// *
+// * @returns {InitOutput}
+// */
+// export function initSync(module: SyncInitInput): InitOutput;
 
 /**
 * If `module_or_path` is {RequestInfo} or {URL}, makes a request and

package/dart_fmt.js

@@ -5,17 +5,17 @@ let wasm;
 function get_imports() {}
 function init_memory() {}
 
-export function initSync(module) {
-	if (wasm !== undefined) return wasm;
+// export function initSync(module) {
+// 	if (wasm !== undefined) return wasm;
 
-	const imports = get_imports();
+// 	const imports = get_imports();
 
-	init_memory(imports);
+// 	init_memory(imports);
 
-	module = normalize(module);
+// 	module = normalize(module);
 
-	return (wasm = instantiate(module));
-}
+// 	return (wasm = instantiate(module));
+// }
 
 function normalize(module) {
 	if (!(module instanceof WebAssembly.Module)) {

package/dart_fmt.mjs

@@ -1,4 +1,4 @@
-  let buildArgsList;
+let buildArgsList;
 
 // `modulePromise` is a promise to the `WebAssembly.module` object to be
 //   instantiated.
@@ -10,7 +10,7 @@
 export const instantiate = async (modulePromise, importObjectPromise) => {
     let dartInstance;
 
-      function stringFromDartString(string) {
+    function stringFromDartString(string) {
         const totalLength = dartInstance.exports.$stringLength(string);
         let result = '';
         let index = 0;
@@ -46,7 +46,25 @@ export const instantiate = async (modulePromise, importObjectPromise) => {
         }
     }
 
-      // Converts a Dart List to a JS array. Any Dart objects will be converted, but
+    // Prints to the console
+    function printToConsole(value) {
+      if (typeof dartPrint == "function") {
+        dartPrint(value);
+        return;
+      }
+      if (typeof console == "object" && typeof console.log != "undefined") {
+        console.log(value);
+        return;
+      }
+      if (typeof print == "function") {
+        print(value);
+        return;
+      }
+
+      throw "Unable to print message: " + js;
+    }
+
+    // Converts a Dart List to a JS array. Any Dart objects will be converted, but
     // this will be cheap for JSValues.
     function arrayFromDartList(constructor, list) {
         const length = dartInstance.exports.$listLength(list);
@@ -74,160 +92,18 @@ export const instantiate = async (modulePromise, importObjectPromise) => {
         return wrapped;
     }
 
-    if (WebAssembly.String === undefined) {
-        console.log("WebAssembly.String is undefined, adding polyfill");
-        WebAssembly.String = {
-            "charCodeAt": (s, i) => s.charCodeAt(i),
-            "compare": (s1, s2) => {
-                if (s1 < s2) return -1;
-                if (s1 > s2) return 1;
-                return 0;
-            },
-            "concat": (s1, s2) => s1 + s2,
-            "equals": (s1, s2) => s1 === s2,
-            "fromCharCode": (i) => String.fromCharCode(i),
-            "length": (s) => s.length,
-            "substring": (s, a, b) => s.substring(a, b),
-        };
-    }
-
     // Imports
     const dart2wasm = {
 
-  _69: s => stringToDartString(JSON.stringify(stringFromDartString(s))),
-_70: s => console.log(stringFromDartString(s)),
-_173: o => o === undefined,
-_174: o => typeof o === 'boolean',
-_175: o => typeof o === 'number',
-_177: o => typeof o === 'string',
-_180: o => o instanceof Int8Array,
-_181: o => o instanceof Uint8Array,
-_182: o => o instanceof Uint8ClampedArray,
-_183: o => o instanceof Int16Array,
-_184: o => o instanceof Uint16Array,
-_185: o => o instanceof Int32Array,
-_186: o => o instanceof Uint32Array,
-_187: o => o instanceof Float32Array,
-_188: o => o instanceof Float64Array,
-_189: o => o instanceof ArrayBuffer,
-_190: o => o instanceof DataView,
-_191: o => o instanceof Array,
-_192: o => typeof o === 'function' && o[jsWrappedDartFunctionSymbol] === true,
-_195: o => o instanceof RegExp,
-_196: (l, r) => l === r,
-_197: o => o,
-_198: o => o,
-_199: o => o,
-_200: b => !!b,
-_201: o => o.length,
-_204: (o, i) => o[i],
-_205: f => f.dartFunction,
-_206: l => arrayFromDartList(Int8Array, l),
-_207: l => arrayFromDartList(Uint8Array, l),
-_208: l => arrayFromDartList(Uint8ClampedArray, l),
-_209: l => arrayFromDartList(Int16Array, l),
-_210: l => arrayFromDartList(Uint16Array, l),
-_211: l => arrayFromDartList(Int32Array, l),
-_212: l => arrayFromDartList(Uint32Array, l),
-_213: l => arrayFromDartList(Float32Array, l),
-_214: l => arrayFromDartList(Float64Array, l),
-_215: (data, length) => {
-          const view = new DataView(new ArrayBuffer(length));
-          for (let i = 0; i < length; i++) {
-              view.setUint8(i, dartInstance.exports.$byteDataGetUint8(data, i));
-          }
-          return view;
-        },
-_216: l => arrayFromDartList(Array, l),
-_217: stringFromDartString,
-_218: stringToDartString,
-_225: (o, p) => o[p],
-_162: (s, m) => {
-          try {
-            return new RegExp(s, m);
-          } catch (e) {
-            return String(e);
-          }
-        },
-_163: (x0,x1) => x0.exec(x1),
-_164: (x0,x1) => x0.test(x1),
-_165: (x0,x1) => x0.exec(x1),
-_166: (x0,x1) => x0.exec(x1),
-_167: x0 => x0.pop(),
-_221: l => new Array(l),
-_229: o => String(o),
-_234: x0 => x0.index,
-_236: x0 => x0.length,
-_238: (x0,x1) => x0[x1],
-_240: (x0,x1) => x0.exec(x1),
-_242: x0 => x0.flags,
-_243: x0 => x0.multiline,
-_244: x0 => x0.ignoreCase,
-_245: x0 => x0.unicode,
-_246: x0 => x0.dotAll,
-_247: (x0,x1) => x0.lastIndex = x1,
-_122: Object.is,
-_124: WebAssembly.String.concat,
-_132: (o) => new DataView(o.buffer, o.byteOffset, o.byteLength),
-_82: (a, i) => a.push(i),
-_92: (a, b) => a == b ? 0 : (a > b ? 1 : -1),
-_93: a => a.length,
-_95: (a, i) => a[i],
-_96: (a, i, v) => a[i] = v,
-_98: a => a.join(''),
-_101: (s, t) => s.split(t),
-_102: s => s.toLowerCase(),
-_103: s => s.toUpperCase(),
-_104: s => s.trim(),
-_106: s => s.trimRight(),
-_108: (s, p, i) => s.indexOf(p, i),
-_109: (s, p, i) => s.lastIndexOf(p, i),
-_111: (o, start, length) => new Uint8Array(o.buffer, o.byteOffset + start, length),
-_112: (o, start, length) => new Int8Array(o.buffer, o.byteOffset + start, length),
-_113: (o, start, length) => new Uint8ClampedArray(o.buffer, o.byteOffset + start, length),
-_114: (o, start, length) => new Uint16Array(o.buffer, o.byteOffset + start, length),
-_115: (o, start, length) => new Int16Array(o.buffer, o.byteOffset + start, length),
-_116: (o, start, length) => new Uint32Array(o.buffer, o.byteOffset + start, length),
-_117: (o, start, length) => new Int32Array(o.buffer, o.byteOffset + start, length),
-_120: (o, start, length) => new Float32Array(o.buffer, o.byteOffset + start, length),
-_121: (o, start, length) => new Float64Array(o.buffer, o.byteOffset + start, length),
-_123: WebAssembly.String.charCodeAt,
-_125: WebAssembly.String.substring,
-_126: WebAssembly.String.length,
-_127: WebAssembly.String.equals,
-_128: WebAssembly.String.compare,
-_129: WebAssembly.String.fromCharCode,
-_136: Function.prototype.call.bind(Object.getOwnPropertyDescriptor(DataView.prototype, 'byteLength').get),
-_137: (b, o) => new DataView(b, o),
-_139: Function.prototype.call.bind(DataView.prototype.getUint8),
-_140: Function.prototype.call.bind(DataView.prototype.setUint8),
-_141: Function.prototype.call.bind(DataView.prototype.getInt8),
-_142: Function.prototype.call.bind(DataView.prototype.setInt8),
-_143: Function.prototype.call.bind(DataView.prototype.getUint16),
-_144: Function.prototype.call.bind(DataView.prototype.setUint16),
-_145: Function.prototype.call.bind(DataView.prototype.getInt16),
-_146: Function.prototype.call.bind(DataView.prototype.setInt16),
-_147: Function.prototype.call.bind(DataView.prototype.getUint32),
-_148: Function.prototype.call.bind(DataView.prototype.setUint32),
-_149: Function.prototype.call.bind(DataView.prototype.getInt32),
-_150: Function.prototype.call.bind(DataView.prototype.setInt32),
-_155: Function.prototype.call.bind(DataView.prototype.getFloat32),
-_156: Function.prototype.call.bind(DataView.prototype.setFloat32),
-_157: Function.prototype.call.bind(DataView.prototype.getFloat64),
-_158: Function.prototype.call.bind(DataView.prototype.setFloat64),
-_80: (c) =>
-              queueMicrotask(() => dartInstance.exports.$invokeCallback(c)),
-_159: s => stringToDartString(stringFromDartString(s).toUpperCase()),
-_160: s => stringToDartString(stringFromDartString(s).toLowerCase()),
-_45: v => stringToDartString(v.toString()),
-_59: s => {
+_48: v => stringToDartString(v.toString()),
+_62: s => {
       const jsSource = stringFromDartString(s);
       if (!/^\s*[+-]?(?:Infinity|NaN|(?:\.\d+|\d+(?:\.\d*)?)(?:[eE][+-]?\d+)?)\s*$/.test(jsSource)) {
         return NaN;
       }
       return parseFloat(jsSource);
     },
-_60: () => {
+_63: () => {
           let stackString = new Error().stack.toString();
           let frames = stackString.split('\n');
           let drop = 2;
@@ -236,33 +112,167 @@ _60: () => {
           }
           return frames.slice(drop).join('\n');
         },
-_64: () => {
+_67: () => {
       // On browsers return `globalThis.location.href`
       if (globalThis.location != null) {
         return stringToDartString(globalThis.location.href);
       }
       return null;
     },
-_65: () => {
+_68: () => {
         return typeof process != undefined &&
                Object.prototype.toString.call(process) == "[object process]" &&
                process.platform == "win32"
-      }
-      };
+      },
+_72: s => stringToDartString(JSON.stringify(stringFromDartString(s))),
+_73: s => printToConsole(stringFromDartString(s)),
+_91: (c) =>
+              queueMicrotask(() => dartInstance.exports.$invokeCallback(c)),
+_93: (a, i) => a.push(i),
+_103: (a, b) => a == b ? 0 : (a > b ? 1 : -1),
+_104: a => a.length,
+_106: (a, i) => a[i],
+_107: (a, i, v) => a[i] = v,
+_109: a => a.join(''),
+_112: (s, t) => s.split(t),
+_113: s => s.toLowerCase(),
+_114: s => s.toUpperCase(),
+_115: s => s.trim(),
+_117: s => s.trimRight(),
+_119: (s, p, i) => s.indexOf(p, i),
+_120: (s, p, i) => s.lastIndexOf(p, i),
+_122: (o, start, length) => new Uint8Array(o.buffer, o.byteOffset + start, length),
+_123: (o, start, length) => new Int8Array(o.buffer, o.byteOffset + start, length),
+_124: (o, start, length) => new Uint8ClampedArray(o.buffer, o.byteOffset + start, length),
+_125: (o, start, length) => new Uint16Array(o.buffer, o.byteOffset + start, length),
+_126: (o, start, length) => new Int16Array(o.buffer, o.byteOffset + start, length),
+_127: (o, start, length) => new Uint32Array(o.buffer, o.byteOffset + start, length),
+_128: (o, start, length) => new Int32Array(o.buffer, o.byteOffset + start, length),
+_131: (o, start, length) => new Float32Array(o.buffer, o.byteOffset + start, length),
+_132: (o, start, length) => new Float64Array(o.buffer, o.byteOffset + start, length),
+_133: Object.is,
+_136: (o) => new DataView(o.buffer, o.byteOffset, o.byteLength),
+_140: Function.prototype.call.bind(Object.getOwnPropertyDescriptor(DataView.prototype, 'byteLength').get),
+_141: (b, o) => new DataView(b, o),
+_143: Function.prototype.call.bind(DataView.prototype.getUint8),
+_144: Function.prototype.call.bind(DataView.prototype.setUint8),
+_145: Function.prototype.call.bind(DataView.prototype.getInt8),
+_146: Function.prototype.call.bind(DataView.prototype.setInt8),
+_147: Function.prototype.call.bind(DataView.prototype.getUint16),
+_148: Function.prototype.call.bind(DataView.prototype.setUint16),
+_149: Function.prototype.call.bind(DataView.prototype.getInt16),
+_150: Function.prototype.call.bind(DataView.prototype.setInt16),
+_151: Function.prototype.call.bind(DataView.prototype.getUint32),
+_152: Function.prototype.call.bind(DataView.prototype.setUint32),
+_153: Function.prototype.call.bind(DataView.prototype.getInt32),
+_154: Function.prototype.call.bind(DataView.prototype.setInt32),
+_159: Function.prototype.call.bind(DataView.prototype.getFloat32),
+_160: Function.prototype.call.bind(DataView.prototype.setFloat32),
+_161: Function.prototype.call.bind(DataView.prototype.getFloat64),
+_162: Function.prototype.call.bind(DataView.prototype.setFloat64),
+_168: s => stringToDartString(stringFromDartString(s).toUpperCase()),
+_169: s => stringToDartString(stringFromDartString(s).toLowerCase()),
+_171: (s, m) => {
+          try {
+            return new RegExp(s, m);
+          } catch (e) {
+            return String(e);
+          }
+        },
+_172: (x0,x1) => x0.exec(x1),
+_173: (x0,x1) => x0.test(x1),
+_174: (x0,x1) => x0.exec(x1),
+_175: (x0,x1) => x0.exec(x1),
+_176: x0 => x0.pop(),
+_182: o => o === undefined,
+_183: o => typeof o === 'boolean',
+_184: o => typeof o === 'number',
+_186: o => typeof o === 'string',
+_189: o => o instanceof Int8Array,
+_190: o => o instanceof Uint8Array,
+_191: o => o instanceof Uint8ClampedArray,
+_192: o => o instanceof Int16Array,
+_193: o => o instanceof Uint16Array,
+_194: o => o instanceof Int32Array,
+_195: o => o instanceof Uint32Array,
+_196: o => o instanceof Float32Array,
+_197: o => o instanceof Float64Array,
+_198: o => o instanceof ArrayBuffer,
+_199: o => o instanceof DataView,
+_200: o => o instanceof Array,
+_201: o => typeof o === 'function' && o[jsWrappedDartFunctionSymbol] === true,
+_204: o => o instanceof RegExp,
+_205: (l, r) => l === r,
+_206: o => o,
+_207: o => o,
+_208: o => o,
+_209: b => !!b,
+_210: o => o.length,
+_213: (o, i) => o[i],
+_214: f => f.dartFunction,
+_215: l => arrayFromDartList(Int8Array, l),
+_216: l => arrayFromDartList(Uint8Array, l),
+_217: l => arrayFromDartList(Uint8ClampedArray, l),
+_218: l => arrayFromDartList(Int16Array, l),
+_219: l => arrayFromDartList(Uint16Array, l),
+_220: l => arrayFromDartList(Int32Array, l),
+_221: l => arrayFromDartList(Uint32Array, l),
+_222: l => arrayFromDartList(Float32Array, l),
+_223: l => arrayFromDartList(Float64Array, l),
+_224: (data, length) => {
+          const view = new DataView(new ArrayBuffer(length));
+          for (let i = 0; i < length; i++) {
+              view.setUint8(i, dartInstance.exports.$byteDataGetUint8(data, i));
+          }
+          return view;
+        },
+_225: l => arrayFromDartList(Array, l),
+_226: stringFromDartString,
+_227: stringToDartString,
+_230: l => new Array(l),
+_234: (o, p) => o[p],
+_238: o => String(o),
+_243: x0 => x0.index,
+_245: x0 => x0.length,
+_247: (x0,x1) => x0[x1],
+_249: (x0,x1) => x0.exec(x1),
+_251: x0 => x0.flags,
+_252: x0 => x0.multiline,
+_253: x0 => x0.ignoreCase,
+_254: x0 => x0.unicode,
+_255: x0 => x0.dotAll,
+_256: (x0,x1) => x0.lastIndex = x1
+    };
 
     const baseImports = {
         dart2wasm: dart2wasm,
 
-  
-          Math: Math,
+
+        Math: Math,
         Date: Date,
         Object: Object,
         Array: Array,
         Reflect: Reflect,
     };
+
+    const jsStringPolyfill = {
+        "charCodeAt": (s, i) => s.charCodeAt(i),
+        "compare": (s1, s2) => {
+            if (s1 < s2) return -1;
+            if (s1 > s2) return 1;
+            return 0;
+        },
+        "concat": (s1, s2) => s1 + s2,
+        "equals": (s1, s2) => s1 === s2,
+        "fromCharCode": (i) => String.fromCharCode(i),
+        "length": (s) => s.length,
+        "substring": (s, a, b) => s.substring(a, b),
+    };
+
     dartInstance = await WebAssembly.instantiate(await modulePromise, {
         ...baseImports,
         ...(await importObjectPromise),
+        "wasm:js-string": jsStringPolyfill,
     });
 
     return dartInstance;

package/package.json

@@ -2,7 +2,7 @@
     "name": "@wasm-fmt/dart_fmt",
     "description": "Dart Formatter powered by WASM ported from dart_style",
     "author": "magic-akari <akari.ccino@gmail.com>",
-    "version": "0.0.3",
+    "version": "0.1.1",
     "license": "MIT",
     "repository": {
         "type": "git",