sandbox: switch to .js mode when filename does not have ext.

fibjs · Jun 30, 2017 · 91c3424 · 91c3424
1 parent aa16d9b
commit 91c3424
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 21 deletions.
diff --git a/fibjs/include/SandBox.h b/fibjs/include/SandBox.h
@@ -162,7 +162,8 @@ class SandBox : public SandBox_base {
             }
         }
 
-        return CHECK_ERROR(Runtime::setError("SandBox: Invalid file format."));
+        retVal = m_loaders[0];
+        return 0;
     }
 
 public:

diff --git a/fibjs/src/sandbox/SandBox_resolve.cpp b/fibjs/src/sandbox/SandBox_resolve.cpp
@@ -54,30 +54,17 @@ result_t SandBox::resolveFile(v8::Local<v8::Object> mods, exlib::string& fname,
     size_t cnt = m_loaders.size();
     result_t hr;
     exlib::string fname1;
-    bool bFound = false;
 
-    for (size_t i = 0; i < cnt; i++) {
-        obj_ptr<ExtLoader>& l = m_loaders[i];
-
-        if ((fname.length() > l->m_ext.length())
-            && !qstrcmp(fname.c_str() + fname.length() - l->m_ext.length(), l->m_ext.c_str())) {
-            bFound = true;
-            break;
-        }
-    }
-
-    if (bFound) {
-        if (retVal) {
-            *retVal = mods->Get(isolate->NewFromUtf8(fname));
-            if (!IsEmpty(*retVal))
-                return 0;
-        }
-
-        hr = loadFile(fname, data);
-        if (hr >= 0)
+    if (retVal) {
+        *retVal = mods->Get(isolate->NewFromUtf8(fname));
+        if (!IsEmpty(*retVal))
             return 0;
     }
 
+    hr = loadFile(fname, data);
+    if (hr >= 0)
+        return 0;
+
     for (size_t i = 0; i < cnt; i++) {
         obj_ptr<ExtLoader>& l = m_loaders[i];
         fname1 = fname + l->m_ext;

diff --git a/test/module/d1 b/test/module/d1
@@ -0,0 +1 @@
+exports.d = 100;
diff --git a/test/module_test.js b/test/module_test.js
@@ -18,6 +18,8 @@ describe("module", () => {
         assert.equal(require.resolve('node_mod1'),
             path.join(__dirname, './node_modules/node_mod1.js'));
 
+        assert.equal(require.resolve('./module/d1'),
+            path.join(__dirname, './module/d1'));
     });
 
     it("circular dependency", () => {
@@ -68,6 +70,12 @@ describe("module", () => {
         });
     });
 
+    it("require no-ext file", () => {
+        assert.deepEqual(require('./module/d1'), {
+            "d": 100
+        });
+    });
+
     describe("package.json", () => {
         it("main", () => {
             var a = require('./module/p1');