Prefix stdlib modules with "qjs:"

Fixes: #616

Author: saghul

qjs.c

@@ -164,9 +164,9 @@ static JSContext *JS_NewCustomContext(JSRuntime *rt)
     if (!ctx)
         return NULL;
     /* system modules */
-    js_init_module_std(ctx, "std");
-    js_init_module_os(ctx, "os");
-    js_init_module_bjson(ctx, "bjson");
+    js_init_module_std(ctx, "qjs:std");
+    js_init_module_os(ctx, "qjs:os");
+    js_init_module_bjson(ctx, "qjs:bjson");
 
     JSValue global = JS_GetGlobalObject(ctx);
     JS_SetPropertyFunctionList(ctx, global, global_obj, countof(global_obj));

quickjs.c

@@ -26267,6 +26267,29 @@ static char *js_default_module_normalize_name(JSContext *ctx,
     int len;
 
     if (name[0] != '.') {
+        /* Backwards compatibility for stdlib rename. */
+        static char *prefix = "qjs:";
+        static char *names[] = {
+            "bjson",
+            "std",
+            "os",
+            NULL
+        };
+        int i;
+        for (i = 0; names[i]; i++) {
+            if (!strcmp(name, names[i])) {
+#ifndef NDEBUG
+                printf("WARN: Standard library modules should be prefixed with `qjs:`. Example: qjs:%s\n", name);
+#endif
+                len = strlen(prefix) + strlen(name) + 1;
+                filename = js_mallocz(ctx, len);
+                if (!filename)
+                    return NULL;
+                pstrcat(filename, len, prefix);
+                pstrcat(filename, len, name);
+                return filename;
+            }
+        }
         /* if no initial dot, the module name is not modified */
         return js_strdup(ctx, name);
     }

run-test262.c

@@ -1695,9 +1695,9 @@ JSContext *JS_NewCustomContext(JSRuntime *rt)
 
     ctx = JS_NewContext(rt);
     if (ctx && local) {
-        js_init_module_std(ctx, "std");
-        js_init_module_os(ctx, "os");
-        js_init_module_bjson(ctx, "bjson");
+        js_init_module_std(ctx, "qjs:std");
+        js_init_module_os(ctx, "qjs:os");
+        js_init_module_bjson(ctx, "qjs:bjson");
     }
     return ctx;
 }