sptc 0.0.24 → 0.0.26

package/engine/index.js

@@ -24,6 +24,7 @@ function executeSptcFile(filename, payload, option={}) {
 	const [ctx0, vm]=Compiler.compileSptcFile(filename, _option)
   const [ctx, priv]=Interpreter.buildContext({...payload, ...ctx0}, option)
   Interpreter.executeVm(vm, ctx, priv)
+  return ctx
 }
 
 function executeSptcFileEx(...x) {
@@ -53,6 +54,14 @@ function executeSptcMacroFile(filename, config, mockContent) {
 	return InterpreterMacro.executeMacroContext(ctx, ast)
 }
 
+function includeJsFile(filename, payload) {
+  return Interpreter.buildContext({}, {})[0].include_js(filename, payload)
+}
+
+function includeSptcFile(filename, payload) {
+	return executeSptcFile(filename, payload)
+}
+
 module.exports={
 	...Compiler,
 	...Interpreter,
@@ -61,5 +70,7 @@ module.exports={
 	executeSptcFile,
 	executeSptcFileEx,
 	executeSptcMacroFile,
+	includeSptcFile,
+	includeJsFile,
 	version: require('../package.json').version
 }

package/engine/interpreter-macro.js

@@ -1,4 +1,5 @@
 const {compileSptcMacroFile, MACRO_TYPES}=require('./compiler-macro')
+const path=require('path')
 
 const {
   O_IFDEF,
@@ -58,7 +59,7 @@ function execute(ctx, ast) {
     }else if(p.type===O_INCLUDE) {
       const filename=path.resolve(ctx.filename+'/..', p.include)
       const nctx=Object.assign({}, ctx, {filename})
-      ret+=executeContext(nctx)
+      ret+=executeMacroContext(nctx)
     }else{
       throw new Error('unsupported node: '+JSON.stringify(p))
     }

package/engine/interpreter.js

@@ -277,6 +277,18 @@ function buildContext(ctx0, option) {
     })
   }
 
+  ctx.include_js=(inc_filename, inc_payload={})=>{
+    const inc=path.resolve(ctx0.__dirname, inc_filename)
+    const jsvm=Utils.compileFile(inc, {
+      compileFunc: code=>new vm.Script(code+'; Symbol()[0]=_=>0', inc)
+    })
+    const jsctx={
+      ...inc_payload,
+    }
+    jsvm.runInNewContext(jsctx)
+    return jsctx
+  }
+
   ctx.__autoload=fn=>{
     priv.__autoload_func=fn
   }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "sptc",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "Simple Pretreat Toolkit CLI",
-  "main": "",
+  "main": "engine/index.js",
   "engines": {
     "node": ">=12"
   },

package/tests/ctx/1.js

@@ -0,0 +1,6 @@
+const sptc=require('../..')
+const {sub}=sptc.includeSptcFile(__dirname+'/a.s', {w: 100})
+const {add}=sptc.includeJsFile(__dirname+'/a.js', {w: 500})
+
+console.log('add', add(3, 4))
+console.log('sub', sub(10, 7))

package/tests/ctx/a.js

@@ -0,0 +1,3 @@
+function add(x, y) {
+	return w+x+y
+}

package/tests/ctx/a.s

@@ -0,0 +1,4 @@
+<?js
+function sub(x, y) {
+	return w+x-y
+}

package/tests/inc_js/1.s

@@ -0,0 +1,3 @@
+<?js
+const mod=include_js(__dirname+'/a.js', {c: 100})
+console.log(mod.add(3,4))

package/tests/inc_js/a.js

@@ -0,0 +1,3 @@
+function add(x, y) {
+	return c+x+y
+}

package/utils/compileFile.js

@@ -1,7 +1,7 @@
 const {mtime, readTextFile}=require('./base')
 
 const _caches={}
-function compileFile(filename, option) {
+function compileFile(filename, option={}) {
   const {
     contentWrapper=x=>x,
     mockFileContent=null,