Fix js require and promises

Author: ceifa

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "demoon",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Lua + Node",
   "main": "src/index.js",
   "bin": {

package.json

@@ -19,11 +19,15 @@ const start = async (entryFile) => {
     engine.global.set('global', global)
     engine.global.set('mountFile', factory.mountFileSync.bind(factory))
     engine.global.set('jsRequire', (modulename, metaDirectory) => {
-        if (modulename.startsWith('.')) {
-            modulename = path.resolve(metaDirectory, '..', modulename)
+        if (metaDirectory) {
+            if (modulename.startsWith('.')) {
+                modulename = path.resolve(metaDirectory, '..', modulename)
+            }
+
+            modulename = require.resolve(modulename, { paths: [fullEntryFile] })
         }
 
-        return module.require(modulename);
+        return module.require(modulename)
     })
 
     try {

src/index.js

@@ -8,22 +8,26 @@ function async(callback)
         local safe, result = coroutine.resume(co, ...)
 
         return Promise.create(function(resolve, reject)
-            local function step()
+            local checkresult
+            local step = function()
                 if coroutine.status(co) == "dead" then
                     local send = safe and resolve or reject
                     return send(result)
                 end
 
                 safe, result = coroutine.resume(co)
+                checkresult()
+            end
 
+            checkresult = function()
                 if safe and result == Promise.resolve(result) then
                     result:finally(step)
                 else
                     step()
                 end
             end
 
-            result:finally(step)
+            checkresult()
         end)
     end
 end