sptc 0.0.33 → 0.0.35

package/README.md

@@ -1,39 +1,40 @@
 # Simple Pretreat Toolkit CLI
 
-This project is developing..
-
 ---
 
 ### sptc
 
 ```
-Usage: sptc [options]
+Usage: sptc [options] <filename>
 
 sptc
 
 Options:
-  -V, --version            output the version number
-  -f, --filename <string>  Sptc filename.
-  -d, --defines <string>   Macro definition switches. If you want to use multiple switches, separate them with ",".
-                           (default: "")
-  -h, --help               display help for command
+  -V, --version           output the version number
+  -d, --defines <string>  Macro definition switches. Separate multiple switches with a comma. (default: "")
+  -h, --help              display help for command
 ```
 
 ### sptcd
 ```
 Usage: sptc http server [options]
 
-A simple http server
+A simple HTTP server
 
 Options:
   -V, --version           output the version number
-  -p, --port <number>     Serve port. (default: 9090)
+  -p, --port <number>     The port to serve on. (default: 9090)
   -l, --locally           Only accepts local connections.
-  -w, --workdir <string>  Specify the working directory. (default: ".")
-  -r, --router <string>   Specify a file as the router entry. If specified, all requests will pass to this file.
-  -e, --exts <string>     Specify the valid extensions of executable sptc files. (default: ".sjs,.shtml")
-  -n, --workers <number>  Workers count. (default: 1)
-  -s, --slient            Slient mode.
+  -w, --workdir <string>  Specifies the working directory. (default: ".")
+  -r, --router <string>   Specifies a file to use as a router entry. If specified, all requests will be routed to
+                          this file.
+  -e, --exts <string>     Specifies the valid extensions for executable SPTC files. (default: ".s, .sjs, .sptc")
+  -n, --workers <number>  The number of worker processes. (default: 1)
+  -s, --silent            Enables silent mode.
+  -t, --traverse          If the pathname is a directory, executes the index file under the pathname directory if
+                          one exists. If no index file is found, traverses the directory. This option is ignored
+                          if a router file is specified.
+  -d, --debug             Enables debug mode.
   -h, --help              display help for command
 ```
 

package/bin/sptc.js

@@ -1,25 +1,15 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
-const {executeSptcFile}=require('../engine')
+const {NodeCGI}=require('../dist/httpServer')
 const {Command}=require('commander')
 const version=require('../package.json').version
 const program=new Command()
   .name(`sptc`)
   .description(`sptc`)
   .version(version)
-  .requiredOption('-f, --filename <string>', 'Sptc filename.')
-  .option('-d, --defines <string>', 'Macro definition switches. If you want to use multiple switches, separate them with ",".', '')
-  .action(({
-    filename,
-    defines,
-  })=>{
-    executeSptcFile(filename, {}, {
-    	write: x=>process.stdout.write(x),
-    	onError: e=>console.log(e),
-      __DEV__: true,
-      macroOption: {
-        defs: defines.split(',').map(x=>x.trim()).filter(x=>x),
-      },
-    })
+  .arguments('<filename>', 'Sptc filename.')
+  .option('-d, --defines <string>', 'Macro definition switches. Separate multiple switches with a comma.', '')
+  .action((filename, {defines})=>{
+    NodeCGI(filename, defines)
   })
   .parse()

package/bin/sptcd.js

@@ -1,21 +1,21 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 const {FastCGI, FastCGI_FPM}=require('../dist/httpServer')
 const {Command}=require('commander')
 const version=require('../package.json').version
 const program=new Command()
   .name(`sptc http server`)
-  .description(`A simple http server`)
+  .description(`A simple HTTP server`)
   .version(version)
-  .requiredOption('-p, --port <number>', 'Serve port.', 9090)
+  .requiredOption('-p, --port <number>', 'The port to serve on.', 9090)
   .option('-l, --locally', 'Only accepts local connections.')
-  .option('-w, --workdir <string>', 'Specify the working directory.', '.')
-  .option('-r, --router <string>', 'Specify a file as the router entry. If specified, all requests will pass to this file.')
-  .option('-e, --exts <string>', 'Specify the valid extensions of executable sptc files.', '.s,.sjs,.sptc')
-  .option('-n, --workers <number>', 'Workers count.', 1)
-  .option('-s, --slient', 'Slient mode.')
-  .option('-t, --traverse', 'If pathname is a directory, execute the index file under the pathname directory if any index file exists. If no index file is found, traverse the directory. If a router file is specified, this option will be ignored.')
-  .option('-d, --debug', 'Debug mode.')
+  .option('-w, --workdir <string>', 'Specifies the working directory.', '.')
+  .option('-r, --router <string>', 'Specifies a file to use as a router entry. If specified, all requests will be routed to this file.')
+  .option('-e, --exts <string>', 'Specifies the valid extensions for executable SPTC files.', '.s, .sjs, .sptc')
+  .option('-n, --workers <number>', 'The number of worker processes.', 1)
+  .option('-s, --silent', 'Enables silent mode.')
+  .option('-t, --traverse', 'If the pathname is a directory, executes the index file under the pathname directory if one exists. If no index file is found, traverses the directory. This option is ignored if a router file is specified.')
+  .option('-d, --debug', 'Enables debug mode.')
   .action(({
     port,
     locally,

package/dist/httpServer.js

@@ -92,6 +92,28 @@ function CGI(req, res, option) {
 
 }
 
+function NodeCGI(filename, defines) {
+	const [reqCtx]=buildRequestContext({
+		url: filename,
+		headers: {},
+	}, null, {
+		srvDir: __dirname,
+		debug: true,
+		env: {
+			RUNTIME: 'NodeCGI',
+		},
+		isRouterMode: true,
+	})
+	executeSptcFile(reqCtx.$_REQUEST_FILE.pathname, reqCtx, {
+		write: x=>process.stdout.write(x),
+		onError: e=>console.log(e),
+		__DEV__: true,
+		macroOption: {
+			defs: defines.split(',').map(x=>x.trim()).filter(x=>x),
+		},
+	})
+}
+
 function buildRequestContext(req, res, {srvDir, debug, env, isRouterMode}) {
 	const {fullname, pathname, query}=getRequestFile(req, srvDir)
 	const reqCtx={
@@ -246,4 +268,5 @@ function traverseDirectory(ref, dir, exts, debug) {
 module.exports={
 	FastCGI,
 	FastCGI_FPM,
+	NodeCGI,
 }

package/engine/interpreter-macro.js

@@ -29,13 +29,59 @@ function buildMacroContext({filename, ...inherits}) {
   return ctx
 }
 
+function evalExpression(exp, defs) {
+  let ret={
+    value: true,
+    symbol: 'and',
+  }
+  const stack=[]
+  for(let i=0; i<exp.length; i++) {
+    const c=exp[i]
+    if(c==='(') {
+      stack.push({...ret})
+      ret.value=true
+      ret.symbol='and'
+    }else if(c===')') {
+      const val=stack.pop()
+      if(val.symbol==='and') {
+        ret.value=val.value && ret.value
+      }else if(val.symbol==='or') {
+        ret.value=val.value || ret.value
+      }
+      ret.symbol=val.symbol
+    }else if(c===' ') {
+      while(exp[i+1]===' ') ++i;
+    }else{
+      let r=c
+      for(;;) {
+        const a=exp[i+1]
+        if(a && '() '.indexOf(a)===-1) {
+          r+=exp[++i]
+        }else{
+          break
+        }
+      }
+      if(r==='and' || r==='or') {
+        ret.symbol=r
+      }else{
+        if(ret.symbol==='and') {
+          ret.value=ret.value && defs.has(r)
+        }else if(ret.symbol==='or') {
+          ret.value=ret.value || defs.has(r)
+        }
+      }
+    }
+  }
+  return ret.value
+}
+
 function execute(ctx, ast) {
   let ret=''
   for(let i=0; i<ast.length; i++) {
     const p=ast[i]
     if(p.type===O_IFDEF) {
       const {match, consequent, alternate}=p
-      const sub_tree=ctx.defs.has(match)? consequent: alternate
+      const sub_tree=evalExpression(match, ctx.defs)? consequent: alternate
       ret+=execute(ctx, sub_tree)
     }else if(p.type===O_STR) {
       ret+=p.str

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sptc",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "description": "Simple Pretreat Toolkit CLI",
   "main": "engine/index.js",
   "engines": {

package/tests/test1/exp.s

@@ -0,0 +1,11 @@
+#ifdef AA and BB
+AA and BB
+#endif
+
+#ifdef CC
+CC
+#endif
+
+#ifdef DD or (BB and CC)
+DD or (BB and CC)
+#endif