@live-codes/ocaml 0.1.1 → 0.2.0

package/assets/compiler/worker.js

@@ -8,8 +8,42 @@
 // browser filesystem fd 1 and fd 2 are wired to console.log and console.error
 // (runtime/js/fs_fake.js). A worker has no other way in: the output never
 // reaches a file the page can read.
-self.onmessage = (event) => {
-	const { script, files, env, argv, fs = [] } = event.data;
+// Bytes to a bytestring, one character per byte, chunked so a multi-megabyte archive
+// does not overflow the argument list. Deliberately not TextDecoder: in browsers
+// "latin1" and "iso-8859-1" are both aliases for windows-1252, which remaps
+// 0x80-0x9F, and that is enough to make a .cmi or a .cma unreadable.
+const bytesToString = (bytes) => {
+	let s = '';
+	const CHUNK = 0x8000;
+	for (let i = 0; i < bytes.length; i += CHUNK) {
+		s += String.fromCharCode.apply(null, bytes.subarray(i, i + CHUNK));
+	}
+	return s;
+};
+
+// The library files this compile needs. The *page* fetches them, not this worker: a
+// worker created from a data URL has an opaque origin, so a fetch from here to the
+// server that served the page is refused. They arrive with the path each belongs at,
+// which is the same shape a filesystem artifact uses.
+const mountLibraries = (files) => {
+	const archives = [];
+	for (const { path, content } of files) {
+		globalThis.jsoo_fs_tmp.push({ name: path, content });
+		if (path.endsWith('.cma')) archives.push(path.slice(path.lastIndexOf('/') + 1));
+	}
+	// What the linker links, and the order matters: a library has to come before the
+	// archive that references it. stdlib first, because that is where a program's
+	// runtime starts, then js_of_ocaml's runtime, then the rest.
+	const rank = (name) => (name === 'stdlib.cma' ? 0 : name === 'jsoo_runtime.cma' ? 1 : 2);
+	archives.sort((a, b) => rank(a) - rank(b) || (a < b ? -1 : a > b ? 1 : 0));
+	globalThis.jsoo_fs_tmp.push({
+		name: '/stdlib/cmas.txt',
+		content: ['stdlib.cma', ...archives].join('\n') + '\n',
+	});
+};
+
+self.onmessage = async (event) => {
+	const { script, files, env, argv, fs = [], libs = [] } = event.data;
 	const out = [];
 	const err = [];
 	const realLog = console.log;
@@ -30,6 +64,8 @@ self.onmessage = (event) => {
 		// take the other branch and register the files directly, so the order is
 		// not load-bearing, but this is the cheaper one.
 		for (const url of fs) importScripts(url);
+		// Then the libraries, which have to be in place before the program starts.
+		if (libs.length > 0) mountLibraries(libs);
 		importScripts(script);
 		// The chunks go back as they arrived, not joined: the caller knows how to
 		// put them together, and joining here would lose the newlines between

package/assets/interpreter/libs/manifest.txt

@@ -1 +1,17 @@
 greet	greet.cma	greet.cmi
+jsoo_runtime	jsoo_runtime.cma	jsoo_runtime.cmi,jsoo_runtime__.cmi,jsoo_runtime__Runtime_version.cmi
+str	str.cma	str.cmi
+unix	unix.cma	unix.cmi,unixLabels.cmi
+graphics	graphics.cma	graphics.cmi,graphicsX11.cmi
+js_of_ocaml	jsoo_runtime.cma js_of_ocaml.cma	js_of_ocaml.cmi,js_of_ocaml__.cmi,js_of_ocaml__Abort.cmi,js_of_ocaml__CSS.cmi,js_of_ocaml__Console.cmi,js_of_ocaml__Dom.cmi,js_of_ocaml__Dom_events.cmi,js_of_ocaml__Dom_html.cmi,js_of_ocaml__Dom_svg.cmi,js_of_ocaml__Effect_js.cmi,js_of_ocaml__EventSource.cmi,js_of_ocaml__Fetch.cmi,js_of_ocaml__File.cmi,js_of_ocaml__Form.cmi,js_of_ocaml__Geolocation.cmi,js_of_ocaml__Import.cmi,js_of_ocaml__IntersectionObserver.cmi,js_of_ocaml__Intl.cmi,js_of_ocaml__Js.cmi,js_of_ocaml__Json.cmi,js_of_ocaml__Jstable.cmi,js_of_ocaml__Lib_version.cmi,js_of_ocaml__MutationObserver.cmi,js_of_ocaml__Performance.cmi,js_of_ocaml__PerformanceObserver.cmi,js_of_ocaml__Promise.cmi,js_of_ocaml__Regexp.cmi,js_of_ocaml__ResizeObserver.cmi,js_of_ocaml__Sys_js.cmi,js_of_ocaml__Typed_array.cmi,js_of_ocaml__Url.cmi,js_of_ocaml__WebGL.cmi,js_of_ocaml__WebSockets.cmi,js_of_ocaml__Worker.cmi,js_of_ocaml__XmlHttpRequest.cmi
+js_of_ocaml_lwt	js_of_ocaml_lwt.cma	js_of_ocaml_lwt.cmi,js_of_ocaml_lwt__.cmi,js_of_ocaml_lwt__Import.cmi,js_of_ocaml_lwt__Lwt_file.cmi,js_of_ocaml_lwt__Lwt_js.cmi,js_of_ocaml_lwt__Lwt_js_events.cmi,js_of_ocaml_lwt__Lwt_jsonp.cmi,js_of_ocaml_lwt__Lwt_promise.cmi,js_of_ocaml_lwt__Lwt_xmlHttpRequest.cmi
+lwt	lwt.cma	lwt.cmi,lwt_condition.cmi,lwt_list.cmi,lwt_mutex.cmi,lwt_mvar.cmi,lwt_pool.cmi,lwt_pqueue.cmi,lwt_result.cmi,lwt_rte.cmi,lwt_seq.cmi,lwt_sequence.cmi,lwt_stream.cmi,lwt_switch.cmi
+re	re.cma	re.cmi,re__.cmi,re__Ast.cmi,re__Automata.cmi,re__Bit_vector.cmi,re__Category.cmi,re__Color_map.cmi,re__Compile.cmi,re__Core.cmi,re__Cset.cmi,re__Dense_map.cmi,re__Dyn.cmi,re__Emacs.cmi,re__Fmt.cmi,re__Glob.cmi,re__Group.cmi,re__Hash_set.cmi,re__Import.cmi,re__Mark_infos.cmi,re__Parse_buffer.cmi,re__Pcre.cmi,re__Perl.cmi,re__Pmark.cmi,re__Posix.cmi,re__Posix_class.cmi,re__Replace.cmi,re__Search.cmi,re__Slice.cmi,re__Str.cmi,re__View.cmi
+uutf	uutf.cma	uutf.cmi
+jsonm	jsonm.cma	jsonm.cmi
+fmt	fmt.cma	fmt.cmi
+logs	logs.cma	logs.cmi
+base64	base64.cma	base64.cmi
+xmlm	xmlm.cma	xmlm.cmi
+zarith	zarith.cma	big_int_Z.cmi,q.cmi,z.cmi
+zarith_stubs_js	zarith_stubs_js.cma	zarith_stubs_js.cmi