rescript-lang · cknitt · Aug 4, 2024 · Aug 4, 2024
diff --git a/README.md b/README.md
@@ -1,3 +1,11 @@
 # Experiment: Monorepo for ReScript standard libraries
 
 See https://github.com/rescript-lang/rescript-compiler/issues/6826.
+
+This repo contains an npm workspace with the ReScript 12 standard libraries:
+
+- runtime: runtime modules (where the .cm\* files + JS output files need to be shipped with the compiler)
+- primitives: primitives (where only the JS output files need to be shipped with the compiler)
+- core: the ReScript Core standard library
+- belt: Belt library (immutable collections etc.)
+- js: legacy Js modules
diff --git a/belt/rescript.json b/belt/rescript.json
@@ -4,7 +4,7 @@
     "dir": "src",
     "subdirs": true
   },
-  "bs-dependencies": ["stdlib-mini"],
+  "bs-dependencies": ["runtime"],
   "bsc-flags": [
     "-nostdlib",
     "-nopervasives",

diff --git a/core/rescript.json b/core/rescript.json
@@ -4,7 +4,7 @@
     "dir": "src",
     "subdirs": true
   },
-  "bs-dependencies": ["stdlib-mini", "runtime"],
+  "bs-dependencies": ["runtime"],
   "bsc-flags": [
     "-nostdlib",
     "-nopervasives",

diff --git a/js/rescript.json b/js/rescript.json
@@ -4,7 +4,7 @@
     "dir": "src",
     "subdirs": true
   },
-  "bs-dependencies": ["stdlib-mini"],
+  "bs-dependencies": ["runtime"],
   "bsc-flags": [
     "-nostdlib",
     "-nopervasives",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,9 +4,9 @@
   "private": true,
   "packageManager": "[email protected]",
   "workspaces": [
-    "stdlib-mini",
     "core",
     "belt",
+    "primitives",
     "runtime",
     "js"
   ],

diff --git a/stdlib-mini/package.json → primitives/package.json b/stdlib-mini/package.json → primitives/package.json
@@ -1,4 +1,4 @@
 {
-  "name": "stdlib-mini",
+  "name": "primitives",
   "version": "0.0.0"
 }
diff --git a/primitives/rescript.json b/primitives/rescript.json
@@ -0,0 +1,14 @@
+{
+  "name": "primitives",
+  "sources": {
+    "dir": "src",
+    "subdirs": true
+  },
+  "bs-dependencies": ["runtime"],
+  "bsc-flags": [
+    "-nostdlib",
+    "-nopervasives",
+    "-bs-no-version-header",
+    "-open Stdlib_mini"
+  ]
+}
diff --git a/runtime/src/caml.js → primitives/src/caml.js b/runtime/src/caml.js → primitives/src/caml.js
diff --git a/runtime/src/caml.res → primitives/src/caml.res b/runtime/src/caml.res → primitives/src/caml.res
diff --git a/runtime/src/caml.resi → primitives/src/caml.resi b/runtime/src/caml.resi → primitives/src/caml.resi
diff --git a/runtime/src/caml_array.js → primitives/src/caml_array.js b/runtime/src/caml_array.js → primitives/src/caml_array.js
diff --git a/runtime/src/caml_array.res → primitives/src/caml_array.res b/runtime/src/caml_array.res → primitives/src/caml_array.res
diff --git a/runtime/src/caml_array.resi → primitives/src/caml_array.resi b/runtime/src/caml_array.resi → primitives/src/caml_array.resi
diff --git a/runtime/src/caml_array_extern.js → primitives/src/caml_array_extern.js b/runtime/src/caml_array_extern.js → primitives/src/caml_array_extern.js
diff --git a/runtime/src/caml_array_extern.res → primitives/src/caml_array_extern.res b/runtime/src/caml_array_extern.res → primitives/src/caml_array_extern.res
diff --git a/runtime/src/caml_bigint.js → primitives/src/caml_bigint.js b/runtime/src/caml_bigint.js → primitives/src/caml_bigint.js
diff --git a/runtime/src/caml_bigint.res → primitives/src/caml_bigint.res b/runtime/src/caml_bigint.res → primitives/src/caml_bigint.res
diff --git a/runtime/src/caml_bigint.resi → primitives/src/caml_bigint.resi b/runtime/src/caml_bigint.resi → primitives/src/caml_bigint.resi
diff --git a/runtime/src/caml_bigint_extern.js → primitives/src/caml_bigint_extern.js b/runtime/src/caml_bigint_extern.js → primitives/src/caml_bigint_extern.js
diff --git a/runtime/src/caml_bigint_extern.res → primitives/src/caml_bigint_extern.res b/runtime/src/caml_bigint_extern.res → primitives/src/caml_bigint_extern.res
diff --git a/runtime/src/caml_bytes.js → primitives/src/caml_bytes.js b/runtime/src/caml_bytes.js → primitives/src/caml_bytes.js
diff --git a/runtime/src/caml_bytes.res → primitives/src/caml_bytes.res b/runtime/src/caml_bytes.res → primitives/src/caml_bytes.res
diff --git a/runtime/src/caml_bytes.resi → primitives/src/caml_bytes.resi b/runtime/src/caml_bytes.resi → primitives/src/caml_bytes.resi
diff --git a/runtime/src/caml_exceptions.js → primitives/src/caml_exceptions.js b/runtime/src/caml_exceptions.js → primitives/src/caml_exceptions.js
diff --git a/runtime/src/caml_exceptions.res → primitives/src/caml_exceptions.res b/runtime/src/caml_exceptions.res → primitives/src/caml_exceptions.res
diff --git a/runtime/src/caml_exceptions.resi → primitives/src/caml_exceptions.resi b/runtime/src/caml_exceptions.resi → primitives/src/caml_exceptions.resi
diff --git a/runtime/src/caml_external_polyfill.js → primitives/src/caml_external_polyfill.js b/runtime/src/caml_external_polyfill.js → primitives/src/caml_external_polyfill.js
diff --git a/runtime/src/caml_external_polyfill.res → primitives/src/caml_external_polyfill.res b/runtime/src/caml_external_polyfill.res → primitives/src/caml_external_polyfill.res
diff --git a/runtime/src/caml_float.js → primitives/src/caml_float.js b/runtime/src/caml_float.js → primitives/src/caml_float.js
diff --git a/runtime/src/caml_float.res → primitives/src/caml_float.res b/runtime/src/caml_float.res → primitives/src/caml_float.res
diff --git a/runtime/src/caml_float.resi → primitives/src/caml_float.resi b/runtime/src/caml_float.resi → primitives/src/caml_float.resi
diff --git a/runtime/src/caml_float_extern.js → primitives/src/caml_float_extern.js b/runtime/src/caml_float_extern.js → primitives/src/caml_float_extern.js
diff --git a/runtime/src/caml_float_extern.res → primitives/src/caml_float_extern.res b/runtime/src/caml_float_extern.res → primitives/src/caml_float_extern.res
diff --git a/runtime/src/caml_format.js → primitives/src/caml_format.js b/runtime/src/caml_format.js → primitives/src/caml_format.js
diff --git a/runtime/src/caml_format.res → primitives/src/caml_format.res b/runtime/src/caml_format.res → primitives/src/caml_format.res
diff --git a/runtime/src/caml_format.resi → primitives/src/caml_format.resi b/runtime/src/caml_format.resi → primitives/src/caml_format.resi
diff --git a/runtime/src/caml_hash.js → primitives/src/caml_hash.js b/runtime/src/caml_hash.js → primitives/src/caml_hash.js
diff --git a/runtime/src/caml_hash.res → primitives/src/caml_hash.res b/runtime/src/caml_hash.res → primitives/src/caml_hash.res
diff --git a/runtime/src/caml_hash.resi → primitives/src/caml_hash.resi b/runtime/src/caml_hash.resi → primitives/src/caml_hash.resi
diff --git a/runtime/src/caml_hash_primitive.js → primitives/src/caml_hash_primitive.js b/runtime/src/caml_hash_primitive.js → primitives/src/caml_hash_primitive.js
diff --git a/runtime/src/caml_hash_primitive.res → primitives/src/caml_hash_primitive.res b/runtime/src/caml_hash_primitive.res → primitives/src/caml_hash_primitive.res
diff --git a/runtime/src/caml_hash_primitive.resi → primitives/src/caml_hash_primitive.resi b/runtime/src/caml_hash_primitive.resi → primitives/src/caml_hash_primitive.resi
diff --git a/runtime/src/caml_int32.js → primitives/src/caml_int32.js b/runtime/src/caml_int32.js → primitives/src/caml_int32.js
diff --git a/runtime/src/caml_int32.res → primitives/src/caml_int32.res b/runtime/src/caml_int32.res → primitives/src/caml_int32.res
diff --git a/runtime/src/caml_int32.resi → primitives/src/caml_int32.resi b/runtime/src/caml_int32.resi → primitives/src/caml_int32.resi
diff --git a/runtime/src/caml_int64.js → primitives/src/caml_int64.js b/runtime/src/caml_int64.js → primitives/src/caml_int64.js
diff --git a/runtime/src/caml_int64.res → primitives/src/caml_int64.res b/runtime/src/caml_int64.res → primitives/src/caml_int64.res
diff --git a/runtime/src/caml_int64.resi → primitives/src/caml_int64.resi b/runtime/src/caml_int64.resi → primitives/src/caml_int64.resi
diff --git a/runtime/src/caml_int64_extern.js → primitives/src/caml_int64_extern.js b/runtime/src/caml_int64_extern.js → primitives/src/caml_int64_extern.js
diff --git a/runtime/src/caml_int64_extern.res → primitives/src/caml_int64_extern.res b/runtime/src/caml_int64_extern.res → primitives/src/caml_int64_extern.res
diff --git a/runtime/src/caml_js_exceptions.js → primitives/src/caml_js_exceptions.js b/runtime/src/caml_js_exceptions.js → primitives/src/caml_js_exceptions.js
diff --git a/runtime/src/caml_js_exceptions.res → primitives/src/caml_js_exceptions.res b/runtime/src/caml_js_exceptions.res → primitives/src/caml_js_exceptions.res
diff --git a/runtime/src/caml_lexer.js → primitives/src/caml_lexer.js b/runtime/src/caml_lexer.js → primitives/src/caml_lexer.js
diff --git a/runtime/src/caml_lexer.res → primitives/src/caml_lexer.res b/runtime/src/caml_lexer.res → primitives/src/caml_lexer.res
diff --git a/runtime/src/caml_lexer.resi → primitives/src/caml_lexer.resi b/runtime/src/caml_lexer.resi → primitives/src/caml_lexer.resi
diff --git a/runtime/src/caml_md5.js → primitives/src/caml_md5.js b/runtime/src/caml_md5.js → primitives/src/caml_md5.js
diff --git a/runtime/src/caml_md5.res → primitives/src/caml_md5.res b/runtime/src/caml_md5.res → primitives/src/caml_md5.res
diff --git a/runtime/src/caml_md5.resi → primitives/src/caml_md5.resi b/runtime/src/caml_md5.resi → primitives/src/caml_md5.resi
diff --git a/runtime/src/caml_module.js → primitives/src/caml_module.js b/runtime/src/caml_module.js → primitives/src/caml_module.js
diff --git a/runtime/src/caml_module.res → primitives/src/caml_module.res b/runtime/src/caml_module.res → primitives/src/caml_module.res
diff --git a/runtime/src/caml_module.resi → primitives/src/caml_module.resi b/runtime/src/caml_module.resi → primitives/src/caml_module.resi
diff --git a/runtime/src/caml_nativeint_extern.js → primitives/src/caml_nativeint_extern.js b/runtime/src/caml_nativeint_extern.js → primitives/src/caml_nativeint_extern.js
diff --git a/runtime/src/caml_nativeint_extern.res → primitives/src/caml_nativeint_extern.res b/runtime/src/caml_nativeint_extern.res → primitives/src/caml_nativeint_extern.res
diff --git a/runtime/src/caml_obj.js → primitives/src/caml_obj.js b/runtime/src/caml_obj.js → primitives/src/caml_obj.js
diff --git a/runtime/src/caml_obj.res → primitives/src/caml_obj.res b/runtime/src/caml_obj.res → primitives/src/caml_obj.res
diff --git a/runtime/src/caml_obj.resi → primitives/src/caml_obj.resi b/runtime/src/caml_obj.resi → primitives/src/caml_obj.resi
diff --git a/runtime/src/caml_option.js → primitives/src/caml_option.js b/runtime/src/caml_option.js → primitives/src/caml_option.js
diff --git a/runtime/src/caml_option.res → primitives/src/caml_option.res b/runtime/src/caml_option.res → primitives/src/caml_option.res
diff --git a/runtime/src/caml_option.resi → primitives/src/caml_option.resi b/runtime/src/caml_option.resi → primitives/src/caml_option.resi
diff --git a/runtime/src/caml_parser.js → primitives/src/caml_parser.js b/runtime/src/caml_parser.js → primitives/src/caml_parser.js
diff --git a/runtime/src/caml_parser.res → primitives/src/caml_parser.res b/runtime/src/caml_parser.res → primitives/src/caml_parser.res
diff --git a/runtime/src/caml_parser.resi → primitives/src/caml_parser.resi b/runtime/src/caml_parser.resi → primitives/src/caml_parser.resi
diff --git a/runtime/src/caml_splice_call.js → primitives/src/caml_splice_call.js b/runtime/src/caml_splice_call.js → primitives/src/caml_splice_call.js
diff --git a/runtime/src/caml_splice_call.res → primitives/src/caml_splice_call.res b/runtime/src/caml_splice_call.res → primitives/src/caml_splice_call.res
diff --git a/runtime/src/caml_splice_call.resi → primitives/src/caml_splice_call.resi b/runtime/src/caml_splice_call.resi → primitives/src/caml_splice_call.resi
diff --git a/runtime/src/caml_string.js → primitives/src/caml_string.js b/runtime/src/caml_string.js → primitives/src/caml_string.js
diff --git a/runtime/src/caml_string.res → primitives/src/caml_string.res b/runtime/src/caml_string.res → primitives/src/caml_string.res
diff --git a/runtime/src/caml_string.resi → primitives/src/caml_string.resi b/runtime/src/caml_string.resi → primitives/src/caml_string.resi
diff --git a/runtime/src/caml_string_extern.js → primitives/src/caml_string_extern.js b/runtime/src/caml_string_extern.js → primitives/src/caml_string_extern.js
diff --git a/runtime/src/caml_string_extern.res → primitives/src/caml_string_extern.res b/runtime/src/caml_string_extern.res → primitives/src/caml_string_extern.res
diff --git a/runtime/src/caml_sys.js → primitives/src/caml_sys.js b/runtime/src/caml_sys.js → primitives/src/caml_sys.js
diff --git a/runtime/src/caml_sys.res → primitives/src/caml_sys.res b/runtime/src/caml_sys.res → primitives/src/caml_sys.res
diff --git a/runtime/src/caml_sys.resi → primitives/src/caml_sys.resi b/runtime/src/caml_sys.resi → primitives/src/caml_sys.resi
diff --git a/runtime/src/caml_undefined_extern.js → primitives/src/caml_undefined_extern.js b/runtime/src/caml_undefined_extern.js → primitives/src/caml_undefined_extern.js
diff --git a/runtime/src/caml_undefined_extern.res → primitives/src/caml_undefined_extern.res b/runtime/src/caml_undefined_extern.res → primitives/src/caml_undefined_extern.res
diff --git a/runtime/src/curry.js → primitives/src/curry.js b/runtime/src/curry.js → primitives/src/curry.js
diff --git a/runtime/src/curry.res → primitives/src/curry.res b/runtime/src/curry.res → primitives/src/curry.res
diff --git a/rescript.json b/rescript.json
@@ -6,6 +6,6 @@
     "in-source": true
   },
   "suffix": ".js",
-  "bs-dependencies": ["stdlib-mini", "core", "belt", "runtime", "js"],
+  "bs-dependencies": ["core", "belt", "primitives", "runtime", "js"],
   "bsc-flags": ["-nostdlib", "-nopervasives", "-bs-no-version-header"]
 }
diff --git a/runtime/rescript.json b/runtime/rescript.json
@@ -4,11 +4,5 @@
     "dir": "src",
     "subdirs": true
   },
-  "bs-dependencies": ["stdlib-mini"],
-  "bsc-flags": [
-    "-nostdlib",
-    "-nopervasives",
-    "-bs-no-version-header",
-    "-open Stdlib_mini"
-  ]
+  "bsc-flags": ["-nostdlib", "-nopervasives", "-bs-no-version-header"]
 }
diff --git a/runtime/src/runtime_deriving.res b/runtime/src/runtime_deriving.res
@@ -22,6 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
+open Stdlib_mini
+
 let raiseWhenNotFound = x =>
   if Js.testAny(x) {
     raise(Not_found)

diff --git a/stdlib-mini/src/runtime_types.js → runtime/src/runtime_types.js b/stdlib-mini/src/runtime_types.js → runtime/src/runtime_types.js
diff --git a/stdlib-mini/src/runtime_types.res → runtime/src/runtime_types.res b/stdlib-mini/src/runtime_types.res → runtime/src/runtime_types.res
diff --git a/stdlib-mini/src/stdlib_mini.js → runtime/src/stdlib_mini.js b/stdlib-mini/src/stdlib_mini.js → runtime/src/stdlib_mini.js
diff --git a/stdlib-mini/src/stdlib_mini.res → runtime/src/stdlib_mini.res b/stdlib-mini/src/stdlib_mini.res → runtime/src/stdlib_mini.res
diff --git a/stdlib-mini/rescript.json b/stdlib-mini/rescript.json