sptc 0.0.10 → 0.0.11

package/engine/interpreter.js

@@ -239,7 +239,18 @@ function buildContext(ctx0, option) {
       isEntry: false,
     })
     const ret=executeVm(_vm, _ctx, priv)
-    return Object.assign({}, _ctx._exports, {__getter__: (...x)=>ret.constructor('return '+(x.length>1? '['+x.join(',')+']': x))()})
+    return new Proxy(_ctx._exports, {
+      get: (target, prop, receiver)=>{
+        if(false===prop in target) {
+          try{
+            return ret.constructor('return '+prop)()
+          }catch(e) {
+            return undefined
+          }
+        }
+        return target[prop]
+      },
+    })
   }
 
   ctx.__autoload=fn=>{
@@ -259,8 +270,7 @@ function buildContext(ctx0, option) {
         if(priv.__autoload_func) {
           let inc_fn=priv.__autoload_func(prop)
           if(inc_fn) {
-            const e=ctx.include(inc_fn)
-            return priv.__autoload_vars[prop]=e.default || e.__getter__(prop)
+            return priv.__autoload_vars[prop]=ctx.include(inc_fn)[prop]
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sptc",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "Simple Pretreat Toolkit CLI",
   "main": "index.js",
   "engines": {

package/tests/www/dd.s

@@ -0,0 +1,2 @@
+<?js
+const aaa='LLL'

package/tests/www/index.s

@@ -9,6 +9,10 @@ echo($_REQUEST_FILE)
 define('DDD', 2)
 include(__dirname+'/cc.s')
 
+
+const p=include(__dirname+'/dd.s')
+console.log('p.aaa=', p.aaa)
+
 echo('oaawecR=>'+RRR, Math.random())
 
 /*