@makano/rew 1.2.69 → 1.2.70

package/lib/rew/modules/context.js

@@ -9,6 +9,7 @@ const path = require("path");
 const execLib = require("../functions/exec");
 const { findAppInfo } = require("../misc/findAppInfo");
 const { USING_DEFAULT, Usage, Namespace } = require("../const/usage");
+const runtime = require("./runtime");
 
 let mainFile = "";
 const isMainFile = (filepath) => filepath == mainFile;
@@ -114,9 +115,8 @@ module.exports.prepareContext = function (
       const childContext = {...context, ...name.namespace, trigger};
       childContext.currentNamespace = name.namespace;
       childContext.parentNamespace = context;
-      with(childContext){
-        eval(`(${trigger.toString()})()`);
-      }
+      const code = `(${trigger.toString()})()`;
+      runtime.exec(code, childContext, code, context.module.filepath);
     } else if(name instanceof Usage) {
       const v = name.trigger(...params) || true;
       if(name.save !== false) context.__using__[name.name] = v;

package/lib/rew/modules/runtime.js

@@ -7,9 +7,9 @@ const path = require('path');
 
 const preScript = readFileSync(path.join(__dirname, '../const/pre-exec.js'), { encoding: 'utf-8' });
 
-const exec = (module.exports.exec = function (code, context, original = '') {
+const exec = (module.exports.exec = function (code, context, original = '', filepath) {
 	return vm.runInNewContext(code, context.do ? null : vm.createContext(context), {
-		filename: context.module.filepath,
+		filename: filepath || context.module.filepath,
 		lineOffset: (original.split('\n').length + preScript.split('\n').length) - code.split('\n').length,
 		displayErrors: true,
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.2.69",
+  "version": "1.2.70",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {