@mikrojs/native 0.14.0-pr-229.gbbf898a → 0.14.0

package/CMakeLists.txt

@@ -157,6 +157,7 @@ if(BUILD_TESTING)
         test/runtime_test.cpp
         test/modules_test.cpp
         test/virtual_modules_test.cpp
+        test/ext_builtin_test.cpp
         test/text_encoding_test.cpp
         test/cbor_test.cpp
         test/abort_test.cpp

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikrojs/native",
-  "version": "0.14.0-pr-229.gbbf898a",
+  "version": "0.14.0",
   "description": "Mikro.js C++ runtime library and Node.js native addon",
   "keywords": [
     "esp32",
@@ -83,7 +83,7 @@
     "cmake-js": "^8.0.0",
     "node-addon-api": "^8.7.0",
     "node-gyp-build": "^4.8.4",
-    "@mikrojs/quickjs": "0.14.0-pr-229.gbbf898a"
+    "@mikrojs/quickjs": "0.14.0"
   },
   "devDependencies": {
     "@swc/core": "^1.15.30",

package/src/modules.cpp

@@ -262,6 +262,12 @@ static JSModuleDef* mik_module_loader_inner(JSContext* ctx, const char* module_n
     {
         JSModuleDef* ext_m = mik__load_builtin(ctx, module_name);
         if (ext_m) return ext_m;
+        /* NULL with an exception pending means the builtin was found but
+         * failed to load (deserialization or import resolution). Don't fall
+         * through to filesystem resolution — it would replace the real error
+         * with a generic "failed to resolve" one. Same probe as the mikro/
+         * branch above (JS_HasException, not JS_GetException + JS_IsNull). */
+        if (JS_HasException(ctx)) return NULL;
     }
 
     return mik_module_load_from_fs(ctx, module_name);
@@ -654,6 +660,18 @@ static bool mik__is_anchored_name(const char* name) {
            strncmp(name, "@mikrojs/", 9) == 0;
 }
 
+/* A name registered via MIK_REGISTER_BUILTIN() is bytecode compiled into the
+ * firmware — the same trust level as @mikrojs builtins, regardless of the
+ * package's npm scope. */
+static bool mik__is_ext_builtin_name(const char* name) {
+    for (mik_ext_builtin_t* p = mik__ext_builtin_head; p != nullptr; p = p->next) {
+        if (strcmp(p->name, name) == 0) {
+            return true;
+        }
+    }
+    return false;
+}
+
 /* Record an edge in the module dependency graph: `base` imports `target`.
  * No-ops if the MIKRuntime is absent, base is empty/non-module, or target
  * is anchored. Keyed by normalized names. */
@@ -674,10 +692,13 @@ static char* mik__module_normalizer_impl(JSContext* ctx, const char* base_name,
 
     static const char internal_prefix[] = "native:";
     if (strncmp(name, internal_prefix, strlen(internal_prefix)) == 0) {
-        // Only built-in modules (native:, mikro/, @mikrojs/) may import native: internals
+        // Only firmware-embedded modules (native:, mikro/, @mikrojs/, registered
+        // external builtins) may import native: internals
         if (strncmp(base_name, "native:", 7) != 0 && strncmp(base_name, "mikro/", 6) != 0 &&
-            strncmp(base_name, "@mikrojs/", 9) != 0) {
-            JS_ThrowTypeError(ctx, "Failed to resolve module specifier '%s'", name);
+            strncmp(base_name, "@mikrojs/", 9) != 0 && !mik__is_ext_builtin_name(base_name)) {
+            JS_ThrowTypeError(
+                ctx, "Cannot import '%s': native modules can only be imported by firmware builtins",
+                name);
             return NULL;
         }
     }
@@ -689,10 +710,8 @@ static char* mik__module_normalizer_impl(JSContext* ctx, const char* base_name,
         }
         /* Check if this bare specifier matches an external builtin (board/driver
          * package). If so, pass through unchanged to avoid filesystem resolution. */
-        for (mik_ext_builtin_t* p = mik__ext_builtin_head; p != nullptr; p = p->next) {
-            if (strcmp(p->name, name) == 0) {
-                return js_strdup(ctx, name);
-            }
+        if (mik__is_ext_builtin_name(name)) {
+            return js_strdup(ctx, name);
         }
         /* Bare specifier — try node_modules resolution.
          * Heap-allocate the dir buffer to keep the normalizer stack frame