sptc 0.0.10 → 0.0.12

package/engine/index.js

@@ -28,14 +28,21 @@ function executeSptcFile(filename, payload, option={}) {
 
 function executeSptcFileEx(...x) {
 	const e=new Promise((resolve, reject)=>{
-  	const {end, onError, readAsBinary}=(x[2]=x[2] || {})
+  	const {end, onError}=(x[2]=x[2] || {})
   	const buf=[]
   	x[2].write=(...x)=>{
   		buf.push(...x)
   	}
   	x[2].end=_=>{
   		end && end()
-  		resolve(readAsBinary? Buffer.concat(buf): buf.join(''))
+  		const xbuf=[]
+  		const is_str=typeof buf[0]==='string'
+  		for(let x of buf) {
+  			if(is_str && typeof x!=='string') x=x.toString('utf8')
+  		  if(!is_str && typeof x==='string') x=Buffer.concat(x)
+  		  xbuf.push(x)
+  		}
+  		resolve(xbuf)
   	}
   	x[2].onError=e=>{
   		onError && onError(e)

package/engine/interpreter.js

@@ -132,7 +132,6 @@ function buildContext(ctx0, option) {
     end=NOOP,
     onError=NOOP,
     masterPriv=null,
-    readAsBinary=false,
     isEntry=false,
   }=option
 
@@ -174,7 +173,7 @@ function buildContext(ctx0, option) {
   ctx.flush=_=>{
     if(priv.isEnd) return;
     const {echos}=priv
-    echos.splice(0).map(x=>write(toWritable(x, readAsBinary)))
+    echos.splice(0).map(x=>write(toWritable(x)))
   }
 
   ctx.var_dump=(...x)=>{
@@ -235,11 +234,21 @@ function buildContext(ctx0, option) {
       write: option.write,
       onError: option.onError,
       masterPriv: priv,
-      readAsBinary,
       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 +268,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]
           }
         }
       }
@@ -271,21 +279,18 @@ function buildContext(ctx0, option) {
   return [pctx, priv]
 }
 
-function toWritable(x, asBinary=false) {
+function toWritable(x) {
   if(x && [Uint8Array, Buffer].includes(x.constructor)) {
-    return asBinary? x: Buffer.from(x).toString('utf8')
+    return x
   }
-  const str=(_=>{
-    if(typeof x==='string') return x
-    if(typeof x==='undefined') return 'undefined'
-    if(typeof x==='number') {
-      if(isNaN(x))return 'NaN'
-      if(x===Infinity) return 'Infinity'
-      if(x===-Infinity) return '-Infinity'
-    }
-    return JSON.stringify(x)+''
-  })()
-  return asBinary? Buffer.from(str): str
+  if(typeof x==='string') return x
+  if(typeof x==='undefined') return 'undefined'
+  if(typeof x==='number') {
+    if(isNaN(x))return 'NaN'
+    if(x===Infinity) return 'Infinity'
+    if(x===-Infinity) return '-Infinity'
+  }
+  return JSON.stringify(x)+''
 }
 
 function executeVm(vm, ctx, priv) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sptc",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "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())
 
 /*

package/tests/www/stream.s

@@ -0,0 +1,4 @@
+<?js
+
+echo(Buffer.from([1, 65]))
+echo('bbbbb')