sptc 0.0.14 → 0.0.16

package/dist/router.s

@@ -0,0 +1,46 @@
+<?js
+
+const {$error, $alias, $index_action}=include(__SETTING__)
+
+function resolve(pathname) {
+  let _pathname=pathname
+  for(let a in $alias) {
+    if(a.indexOf('*')>-1) {
+      if(pathname.indexOf(a.substr(0, a.indexOf('*')))===0) {
+        _pathname=$alias[a]
+        break
+      }
+    }else if(a===pathname) {
+      _pathname=$alias[a]
+      break
+    }
+  }
+  return _pathname
+}
+
+function _call(x, ...e) {
+  if(!x) return;
+  const $c=x.substr(1, x.indexOf('/', 1)-1) || x.substr(1)
+  const c_len=2+$c.length
+  const $a=x.substr(c_len, (x+'/').indexOf('/', c_len)-c_len) || $index_action
+  const c=include(__APP__+'/controllers/'+$c+'.s')[$c+'Controller']
+  if(isDebug()) {
+    console.log('==>', {
+      pathname: $_REQUEST_FILE['pathname'],
+      Controller: $c,
+      Action: $a+'Action',
+    })
+  }
+  const _c=new c(...e)
+  return _c[$a+'Action']()
+}
+
+async function execute(pathname, ...argv) {
+  const unlock=Sync.Lock()
+  try{
+    await _call(pathname, ...argv)
+  }catch(e) {
+    await _call($error, e)
+  }
+  unlock()
+}

package/engine/index.js

@@ -3,7 +3,7 @@ const Interpreter=require('./interpreter')
 const CompilerMacro=require('./compiler-macro')
 const InterpreterMacro=require('./interpreter-macro')
 
-const {md5}=require('../utils')
+const {md5, formatOutput}=require('../utils')
 
 function executeSptcFile(filename, payload, option={}) {
 	const {__DEV__, macroOption, mockFileContent}=option
@@ -35,14 +35,7 @@ function executeSptcFileEx(...x) {
   	}
   	x[2].end=_=>{
   		end && end()
-  		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(is_str? xbuf.join(''): Buffer.concat(xbuf))
+  		resolve(formatOutput(buf))
   	}
   	x[2].onError=e=>{
   		onError && onError(e)

package/engine/interpreter.js

@@ -2,7 +2,8 @@ const _module=require('module')
 const vm=require('vm')
 const path=require('path')
 const Compiler=require('./compiler')
-const {generate_uuid, PromiseWithResolvers}=require('../utils')
+const Utils=require('../utils')
+const {generate_uuid, PromiseWithResolvers, formatOutput}=Utils
 
 /*
   const tt={x: 2, b: [2, 5], c: _=>2, d: /xx/ig}
@@ -125,6 +126,7 @@ function securityPatch() {
 }
 
 const NOOP=_=>null
+const Application={}
 function buildContext(ctx0, option) {
 
   const {
@@ -155,6 +157,10 @@ function buildContext(ctx0, option) {
     isMaster: !masterPriv,
   })
 
+  ctx.Application=Application
+
+  ctx.Utils=Utils
+
   // Dynamically set the cache configuration.
   ctx.configSptcFileCache=(cacheVersion, cacheSeconds)=>{
     if(!isEntry) {
@@ -170,6 +176,13 @@ function buildContext(ctx0, option) {
     priv.echos.push(...x)
   }
 
+  ctx.readEchoed=as_str=>{
+    const {echos}=priv
+    const buf=[]
+    echos.splice(0).map(x=>buf.push(toWritable(x)))
+    return formatOutput(buf, as_str)
+  }
+
   ctx.flush=_=>{
     if(priv.isEnd) return;
     const {echos}=priv

package/package.json

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

package/tests/www/eee.s

@@ -0,0 +1,4 @@
+<?js
+echo('444')
+console.log(readEchoed(false))
+echo(1)

package/utils/base.js

@@ -7,6 +7,10 @@ function readTextFile(filename) {
   return fs.readFileSync(filename, 'utf8')
 }
 
+function sleep(t) {
+  return new Promise(r=>setTimeout(r, t))
+}
+
 function mtime(filename) {
   return fs.statSync(filename).mtime.getTime()
 }
@@ -64,6 +68,7 @@ function PromiseWithResolvers() {
 
 module.exports={
   readTextFile,
+  sleep,
   mtime,
   md5,
   safe_path,

package/utils/format.js

@@ -0,0 +1,17 @@
+
+function formatOutput(buf, as_str=undefined) {
+  const xbuf=[]
+  const is_str=as_str===undefined?
+    typeof buf[0]==='string':
+    as_str
+  for(let x of buf) {
+    if(is_str && typeof x!=='string') x=x.toString('utf8')
+    if(!is_str && typeof x==='string') x=Buffer.from(x)
+    xbuf.push(x)
+  }
+  return is_str? xbuf.join(''): Buffer.concat(xbuf)
+}
+
+module.exports={
+  formatOutput,
+}

package/utils/index.js

@@ -4,4 +4,5 @@ module.exports={
   ...require('./base'),
   ...require('./fpm'),
   ...require('./dir'),
+  ...require('./format'),
 }