@wasm-fmt/dart_fmt 0.1.1 → 0.1.2

package/README.md

@@ -29,8 +29,26 @@ console.log(formatted);
 
 For Vite users:
 
+Add `"@wasm-fmt/dart_fmt"` to `optimizeDeps.exclude` in your vite config:
+
+```JSON
+{
+    "optimizeDeps": {
+        "exclude": ["@wasm-fmt/dart_fmt"]
+    }
+}
+```
+
+<details>
+<summary>
+If you cannot change the vite config, you can use another import entry
+
+</summary>
+
 ```JavaScript
 import init, { format } from "@wasm-fmt/dart_fmt/vite";
 
 // ...
 ```
+
+</details>

package/dart_fmt.js

@@ -1,22 +1,10 @@
-import { instantiate } from "./dart_fmt.mjs";
+import { format as dart_fmt, instantiate, invoke } from "./dart_fmt.mjs";
 
 let wasm;
 
 function get_imports() {}
 function init_memory() {}
 
-// export function initSync(module) {
-// 	if (wasm !== undefined) return wasm;
-
-// 	const imports = get_imports();
-
-// 	init_memory(imports);
-
-// 	module = normalize(module);
-
-// 	return (wasm = instantiate(module));
-// }
-
 function normalize(module) {
 	if (!(module instanceof WebAssembly.Module)) {
 		return new WebAssembly.Module(module);
@@ -42,9 +30,13 @@ export default async function (input) {
 
 	init_memory(imports);
 
-	return (wasm = await load(await input)
+	wasm = await load(await input)
 		.then(normalize)
-		.then(instantiate));
+		.then(instantiate);
+
+	invoke(wasm);
+
+	return wasm;
 }
 
 async function load(module) {
@@ -70,43 +62,7 @@ async function load(module) {
 	return module;
 }
 
-function stringFromDartString(string) {
-	const totalLength = wasm.exports.$stringLength(string);
-	let result = "";
-	let index = 0;
-	while (index < totalLength) {
-		let chunkLength = Math.min(totalLength - index, 0xffff);
-		const array = new Array(chunkLength);
-		for (let i = 0; i < chunkLength; i++) {
-			array[i] = wasm.exports.$stringRead(string, index++);
-		}
-		result += String.fromCharCode(...array);
-	}
-	return result;
-}
-
-function stringToDartString(string) {
-	const length = string.length;
-	let range = 0;
-	for (let i = 0; i < length; i++) {
-		range |= string.codePointAt(i);
-	}
-	if (range < 256) {
-		const dartString = wasm.exports.$stringAllocate1(length);
-		for (let i = 0; i < length; i++) {
-			wasm.exports.$stringWrite1(dartString, i, string.codePointAt(i));
-		}
-		return dartString;
-	} else {
-		const dartString = wasm.exports.$stringAllocate2(length);
-		for (let i = 0; i < length; i++) {
-			wasm.exports.$stringWrite2(dartString, i, string.charCodeAt(i));
-		}
-		return dartString;
-	}
-}
-
-export function format(source, filename, config = {}) {
+export function format(source, filename = "stdin.dart", config = {}) {
 	const options = { lineEnding: "\n" };
 	if (config.line_width) {
 		options.pageWidth = config.line_width;
@@ -115,13 +71,11 @@ export function format(source, filename, config = {}) {
 		options.lineEnding = "\r\n";
 	}
 
-	const sourceString = stringToDartString(source);
-	const filenameString = stringToDartString(filename);
-	const configString = stringToDartString(JSON.stringify(options));
-	const result = wasm.exports.format(
-		sourceString,
-		filenameString,
-		configString,
-	);
-	return stringFromDartString(result);
+	const result = dart_fmt(source, filename, JSON.stringify(options));
+	const err = result[0] === "x";
+	const output = result.slice(1);
+	if (err) {
+		throw new Error(output);
+	}
+	return output;
 }

package/dart_fmt.mjs

@@ -1,4 +1,3 @@
-let buildArgsList;
 
 // `modulePromise` is a promise to the `WebAssembly.module` object to be
 //   instantiated.
@@ -10,42 +9,6 @@ let buildArgsList;
 export const instantiate = async (modulePromise, importObjectPromise) => {
     let dartInstance;
 
-    function stringFromDartString(string) {
-        const totalLength = dartInstance.exports.$stringLength(string);
-        let result = '';
-        let index = 0;
-        while (index < totalLength) {
-          let chunkLength = Math.min(totalLength - index, 0xFFFF);
-          const array = new Array(chunkLength);
-          for (let i = 0; i < chunkLength; i++) {
-              array[i] = dartInstance.exports.$stringRead(string, index++);
-          }
-          result += String.fromCharCode(...array);
-        }
-        return result;
-    }
-
-    function stringToDartString(string) {
-        const length = string.length;
-        let range = 0;
-        for (let i = 0; i < length; i++) {
-            range |= string.codePointAt(i);
-        }
-        if (range < 256) {
-            const dartString = dartInstance.exports.$stringAllocate1(length);
-            for (let i = 0; i < length; i++) {
-                dartInstance.exports.$stringWrite1(dartString, i, string.codePointAt(i));
-            }
-            return dartString;
-        } else {
-            const dartString = dartInstance.exports.$stringAllocate2(length);
-            for (let i = 0; i < length; i++) {
-                dartInstance.exports.$stringWrite2(dartString, i, string.charCodeAt(i));
-            }
-            return dartString;
-        }
-    }
-
     // Prints to the console
     function printToConsole(value) {
       if (typeof dartPrint == "function") {
@@ -67,43 +30,36 @@ export const instantiate = async (modulePromise, importObjectPromise) => {
     // 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);
-        const array = new constructor(length);
-        for (let i = 0; i < length; i++) {
-            array[i] = dartInstance.exports.$listRead(list, i);
-        }
-        return array;
-    }
-
-    buildArgsList = function(list) {
-        const dartList = dartInstance.exports.$makeStringList();
-        for (let i = 0; i < list.length; i++) {
-            dartInstance.exports.$listAdd(dartList, stringToDartString(list[i]));
-        }
-        return dartList;
+      const exports = dartInstance.exports;
+      const read = exports.$listRead;
+      const length = exports.$listLength(list);
+      const array = new constructor(length);
+      for (let i = 0; i < length; i++) {
+        array[i] = read(list, i);
+      }
+      return array;
     }
 
     // A special symbol attached to functions that wrap Dart functions.
     const jsWrappedDartFunctionSymbol = Symbol("JSWrappedDartFunction");
 
     function finalizeWrapper(dartFunction, wrapped) {
-        wrapped.dartFunction = dartFunction;
-        wrapped[jsWrappedDartFunctionSymbol] = true;
-        return wrapped;
+      wrapped.dartFunction = dartFunction;
+      wrapped[jsWrappedDartFunctionSymbol] = true;
+      return wrapped;
     }
 
     // Imports
     const dart2wasm = {
 
-_48: v => stringToDartString(v.toString()),
-_62: s => {
-      const jsSource = stringFromDartString(s);
-      if (!/^\s*[+-]?(?:Infinity|NaN|(?:\.\d+|\d+(?:\.\d*)?)(?:[eE][+-]?\d+)?)\s*$/.test(jsSource)) {
+_49: v => v.toString(),
+_64: s => {
+      if (!/^\s*[+-]?(?:Infinity|NaN|(?:\.\d+|\d+(?:\.\d*)?)(?:[eE][+-]?\d+)?)\s*$/.test(s)) {
         return NaN;
       }
-      return parseFloat(jsSource);
+      return parseFloat(s);
     },
-_63: () => {
+_65: () => {
           let stackString = new Error().stack.toString();
           let frames = stackString.split('\n');
           let drop = 2;
@@ -112,136 +68,242 @@ _63: () => {
           }
           return frames.slice(drop).join('\n');
         },
-_67: () => {
+_69: () => {
       // On browsers return `globalThis.location.href`
       if (globalThis.location != null) {
-        return stringToDartString(globalThis.location.href);
+        return globalThis.location.href;
       }
       return null;
     },
-_68: () => {
-        return typeof process != undefined &&
+_70: () => {
+        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) =>
+_85: s => JSON.stringify(s),
+_86: s => printToConsole(s),
+_87: a => a.join(''),
+_90: (s, t) => s.split(t),
+_91: s => s.toLowerCase(),
+_92: s => s.toUpperCase(),
+_93: s => s.trim(),
+_95: s => s.trimRight(),
+_97: (s, p, i) => s.indexOf(p, i),
+_98: (s, p, i) => s.lastIndexOf(p, i),
+_100: Object.is,
+_101: s => s.toUpperCase(),
+_102: s => s.toLowerCase(),
+_103: (a, i) => a.push(i),
+_113: (a, b) => a == b ? 0 : (a > b ? 1 : -1),
+_114: a => a.length,
+_116: (a, i) => a[i],
+_117: (a, i, v) => a[i] = v,
+_120: (o, start, length) => new Uint8Array(o.buffer, o.byteOffset + start, length),
+_121: (o, start, length) => new Int8Array(o.buffer, o.byteOffset + start, length),
+_122: (o, start, length) => new Uint8ClampedArray(o.buffer, o.byteOffset + start, length),
+_123: (o, start, length) => new Uint16Array(o.buffer, o.byteOffset + start, length),
+_124: (o, start, length) => new Int16Array(o.buffer, o.byteOffset + start, length),
+_125: (o, start, length) => new Uint32Array(o.buffer, o.byteOffset + start, length),
+_126: (o, start, length) => new Int32Array(o.buffer, o.byteOffset + start, length),
+_129: (o, start, length) => new Float32Array(o.buffer, o.byteOffset + start, length),
+_130: (o, start, length) => new Float64Array(o.buffer, o.byteOffset + start, length),
+_133: (o) => new DataView(o.buffer, o.byteOffset, o.byteLength),
+_137: Function.prototype.call.bind(Object.getOwnPropertyDescriptor(DataView.prototype, 'byteLength').get),
+_138: (b, o) => new DataView(b, o),
+_140: Function.prototype.call.bind(DataView.prototype.getUint8),
+_141: Function.prototype.call.bind(DataView.prototype.setUint8),
+_142: Function.prototype.call.bind(DataView.prototype.getInt8),
+_143: Function.prototype.call.bind(DataView.prototype.setInt8),
+_144: Function.prototype.call.bind(DataView.prototype.getUint16),
+_145: Function.prototype.call.bind(DataView.prototype.setUint16),
+_146: Function.prototype.call.bind(DataView.prototype.getInt16),
+_147: Function.prototype.call.bind(DataView.prototype.setInt16),
+_148: Function.prototype.call.bind(DataView.prototype.getUint32),
+_149: Function.prototype.call.bind(DataView.prototype.setUint32),
+_150: Function.prototype.call.bind(DataView.prototype.getInt32),
+_151: Function.prototype.call.bind(DataView.prototype.setInt32),
+_156: Function.prototype.call.bind(DataView.prototype.getFloat32),
+_157: Function.prototype.call.bind(DataView.prototype.setFloat32),
+_158: Function.prototype.call.bind(DataView.prototype.getFloat64),
+_159: Function.prototype.call.bind(DataView.prototype.setFloat64),
+_165: x0 => format = x0,
+_166: f => finalizeWrapper(f, function(x0,x1,x2) { return dartInstance.exports._166(f,arguments.length,x0,x1,x2) }),
+_184: (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) => {
+_187: (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) => {
+_188: (x0,x1) => x0.exec(x1),
+_189: (x0,x1) => x0.test(x1),
+_190: (x0,x1) => x0.exec(x1),
+_191: (x0,x1) => x0.exec(x1),
+_192: x0 => x0.pop(),
+_198: o => o === undefined,
+_199: o => typeof o === 'boolean',
+_200: o => typeof o === 'number',
+_202: o => typeof o === 'string',
+_205: o => o instanceof Int8Array,
+_206: o => o instanceof Uint8Array,
+_207: o => o instanceof Uint8ClampedArray,
+_208: o => o instanceof Int16Array,
+_209: o => o instanceof Uint16Array,
+_210: o => o instanceof Int32Array,
+_211: o => o instanceof Uint32Array,
+_212: o => o instanceof Float32Array,
+_213: o => o instanceof Float64Array,
+_214: o => o instanceof ArrayBuffer,
+_215: o => o instanceof DataView,
+_216: o => o instanceof Array,
+_217: o => typeof o === 'function' && o[jsWrappedDartFunctionSymbol] === true,
+_220: o => o instanceof RegExp,
+_221: (l, r) => l === r,
+_222: o => o,
+_223: o => o,
+_224: o => o,
+_225: b => !!b,
+_226: o => o.length,
+_229: (o, i) => o[i],
+_230: f => f.dartFunction,
+_231: l => arrayFromDartList(Int8Array, l),
+_232: (data, length) => {
+          const jsBytes = new Uint8Array(length);
+          const getByte = dartInstance.exports.$uint8ListGet;
+          for (let i = 0; i < length; i++) {
+            jsBytes[i] = getByte(data, i);
+          }
+          return jsBytes;
+        },
+_233: l => arrayFromDartList(Uint8ClampedArray, l),
+_234: l => arrayFromDartList(Int16Array, l),
+_235: l => arrayFromDartList(Uint16Array, l),
+_236: l => arrayFromDartList(Int32Array, l),
+_237: l => arrayFromDartList(Uint32Array, l),
+_238: l => arrayFromDartList(Float32Array, l),
+_239: l => arrayFromDartList(Float64Array, l),
+_240: (data, length) => {
+          const read = dartInstance.exports.$byteDataGetUint8;
           const view = new DataView(new ArrayBuffer(length));
           for (let i = 0; i < length; i++) {
-              view.setUint8(i, dartInstance.exports.$byteDataGetUint8(data, i));
+              view.setUint8(i, read(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
+_241: l => arrayFromDartList(Array, l),
+_242:       (s, length) => {
+        if (length == 0) return '';
+
+        const read = dartInstance.exports.$stringRead1;
+        let result = '';
+        let index = 0;
+        const chunkLength = Math.min(length - index, 500);
+        let array = new Array(chunkLength);
+        while (index < length) {
+          const newChunkLength = Math.min(length - index, 500);
+          for (let i = 0; i < newChunkLength; i++) {
+            array[i] = read(s, index++);
+          }
+          if (newChunkLength < chunkLength) {
+            array = array.slice(0, newChunkLength);
+          }
+          result += String.fromCharCode(...array);
+        }
+        return result;
+      }
+      ,
+_243:     (s, length) => {
+      if (length == 0) return '';
+
+      const read = dartInstance.exports.$stringRead2;
+      let result = '';
+      let index = 0;
+      const chunkLength = Math.min(length - index, 500);
+      let array = new Array(chunkLength);
+      while (index < length) {
+        const newChunkLength = Math.min(length - index, 500);
+        for (let i = 0; i < newChunkLength; i++) {
+          array[i] = read(s, index++);
+        }
+        if (newChunkLength < chunkLength) {
+          array = array.slice(0, newChunkLength);
+        }
+        result += String.fromCharCode(...array);
+      }
+      return result;
+    }
+    ,
+_244:     (s) => {
+      let length = s.length;
+      let range = 0;
+      for (let i = 0; i < length; i++) {
+        range |= s.codePointAt(i);
+      }
+      const exports = dartInstance.exports;
+      if (range < 256) {
+        if (length <= 10) {
+          if (length == 1) {
+            return exports.$stringAllocate1_1(s.codePointAt(0));
+          }
+          if (length == 2) {
+            return exports.$stringAllocate1_2(s.codePointAt(0), s.codePointAt(1));
+          }
+          if (length == 3) {
+            return exports.$stringAllocate1_3(s.codePointAt(0), s.codePointAt(1), s.codePointAt(2));
+          }
+          if (length == 4) {
+            return exports.$stringAllocate1_4(s.codePointAt(0), s.codePointAt(1), s.codePointAt(2), s.codePointAt(3));
+          }
+          if (length == 5) {
+            return exports.$stringAllocate1_5(s.codePointAt(0), s.codePointAt(1), s.codePointAt(2), s.codePointAt(3), s.codePointAt(4));
+          }
+          if (length == 6) {
+            return exports.$stringAllocate1_6(s.codePointAt(0), s.codePointAt(1), s.codePointAt(2), s.codePointAt(3), s.codePointAt(4), s.codePointAt(5));
+          }
+          if (length == 7) {
+            return exports.$stringAllocate1_7(s.codePointAt(0), s.codePointAt(1), s.codePointAt(2), s.codePointAt(3), s.codePointAt(4), s.codePointAt(5), s.codePointAt(6));
+          }
+          if (length == 8) {
+            return exports.$stringAllocate1_8(s.codePointAt(0), s.codePointAt(1), s.codePointAt(2), s.codePointAt(3), s.codePointAt(4), s.codePointAt(5), s.codePointAt(6), s.codePointAt(7));
+          }
+          if (length == 9) {
+            return exports.$stringAllocate1_9(s.codePointAt(0), s.codePointAt(1), s.codePointAt(2), s.codePointAt(3), s.codePointAt(4), s.codePointAt(5), s.codePointAt(6), s.codePointAt(7), s.codePointAt(8));
+          }
+          if (length == 10) {
+            return exports.$stringAllocate1_10(s.codePointAt(0), s.codePointAt(1), s.codePointAt(2), s.codePointAt(3), s.codePointAt(4), s.codePointAt(5), s.codePointAt(6), s.codePointAt(7), s.codePointAt(8), s.codePointAt(9));
+          }
+        }
+        const dartString = exports.$stringAllocate1(length);
+        const write = exports.$stringWrite1;
+        for (let i = 0; i < length; i++) {
+          write(dartString, i, s.codePointAt(i));
+        }
+        return dartString;
+      } else {
+        const dartString = exports.$stringAllocate2(length);
+        const write = exports.$stringWrite2;
+        for (let i = 0; i < length; i++) {
+          write(dartString, i, s.charCodeAt(i));
+        }
+        return dartString;
+      }
+    }
+    ,
+_247: l => new Array(l),
+_251: (o, p) => o[p],
+_255: o => String(o),
+_260: x0 => x0.index,
+_262: x0 => x0.length,
+_264: (x0,x1) => x0[x1],
+_265: (x0,x1) => x0.exec(x1),
+_267: x0 => x0.flags,
+_268: x0 => x0.multiline,
+_269: x0 => x0.ignoreCase,
+_270: x0 => x0.unicode,
+_271: x0 => x0.dotAll,
+_272: (x0,x1) => x0.lastIndex = x1
     };
 
     const baseImports = {
@@ -265,7 +327,7 @@ _256: (x0,x1) => x0.lastIndex = x1
         "concat": (s1, s2) => s1 + s2,
         "equals": (s1, s2) => s1 === s2,
         "fromCharCode": (i) => String.fromCharCode(i),
-        "length": (s) => s.length,
+        "length": (s) => s?.length||0,
         "substring": (s, a, b) => s.substring(a, b),
     };
 
@@ -282,8 +344,8 @@ _256: (x0,x1) => x0.lastIndex = x1
 // `moduleInstance` is the instantiated dart2wasm module
 // `args` are any arguments that should be passed into the main function.
 export const invoke = (moduleInstance, ...args) => {
-    const dartMain = moduleInstance.exports.$getMain();
-    const dartArgs = buildArgsList(args);
-    moduleInstance.exports.$invokeMain(dartMain, dartArgs);
+  moduleInstance.exports.$invokeMain(args);
 }
 
+
+export let format;