sptc 0.0.21 → 0.0.22

package/README.md

@@ -73,9 +73,3 @@ module.exports={
 
 
 ```
-
-
-### sptcd-create-project
-```
-Run this command `sptcd-create-project` to create a sample web project that supports react server-side rendering. The sample project already contains commonly used codes, such as reading and writing databases, multi-page data interaction, routing, etc., so it is very suitable for full-stack projects that need to get started quickly.
-```

package/dist/httpServer.js

@@ -4,6 +4,7 @@ const {
 	fileExists,
 	getExtension,
 	listdir,
+	assert,
 }=require('../utils')
 const {executeSptcFile}=require('../engine')
 
@@ -137,6 +138,7 @@ function buildRequestContext(req, res, {srvDir, debug, env, isRouterMode}) {
 		state.is_debug=x
 	}
 	reqCtx.isDebug=_=>state.is_debug
+	reqCtx.withCache=createWithCacheStore()
 
 	const handler={
 		write: x=>{
@@ -165,6 +167,21 @@ function getRequestFile(req, srvDir) {
 		pathname,
 	}
 }
+const cacheStore={}
+function createWithCacheStore() {
+	const withCache=(fn, k, v)=>{
+		assert(k)
+		assert(v)
+		assert(typeof fn==='function')
+	  const o=cacheStore
+		if(!o.hasOwnProperty(k) || o[k].v!==v) {
+			o[k]={v, x: fn()}
+		}
+		return o[k].x
+	}
+	return withCache
+}
+
 
 function traverseDirectory(ref, dir, exts) {
   let ret=`

package/engine/compiler.js

@@ -78,4 +78,4 @@ function compileSptcFile(filename, option) {
 
 module.exports={
   compileSptcFile,
-}
+}

package/engine/interpreter.js

@@ -165,6 +165,7 @@ function buildContext(ctx0, option) {
   ctx.__SPTC_VERSION__=Utils.__SPTC_VERSION__
   ctx.__SPTC_INSTALL_PATH__=Utils.__SPTC_INSTALL_PATH__
 
+  ctx.assert=Utils.assert
 
   // Dynamically set the cache configuration.
   ctx.configSptcFileCache=(cacheVersion, cacheSeconds)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sptc",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "Simple Pretreat Toolkit CLI",
   "main": "",
   "engines": {
@@ -8,8 +8,7 @@
   },
   "bin": {
     "sptc": "./bin/sptc.js",
-    "sptcd": "./bin/sptcd.js",
-    "sptcd-create-project": "./bin/sptcd-web.js"
+    "sptcd": "./bin/sptcd.js"
   },
   "dependencies": {
     "commander": "10.0.1",

package/utils/base.js

@@ -71,6 +71,10 @@ function PromiseWithResolvers() {
   return {promise, resolve: _resolve, reject: _reject}
 }
 
+function assert(x) {
+  if(!x) throw new Error('Uncaught AssertionError [ERR_ASSERTION]: '+x+' == true')
+}
+
 module.exports={
   readTextFile,
   sleep,
@@ -82,4 +86,5 @@ module.exports={
   getExtension,
   getLocalIpv4Addresses,
   PromiseWithResolvers,
+  assert,
 }

package/utils/compileFile.js

@@ -41,4 +41,4 @@ function compileFile(filename, option) {
 
 module.exports={
   compileFile,
-}
+}

package/bin/sptcd-web.js

@@ -1,27 +0,0 @@
-#!/usr/bin/env node
-
-const {Command}=require('commander')
-const version=require('../package.json').version
-const program=new Command()
-  .name(`create web project`)
-  .description(`create web project`)
-  .version(version)
-  .requiredOption('-d, --dir <string>', 'Specify the project directory.', './sptc-web-demo')
-  .action(({
-    dir,
-  })=>{
-    const fs=require('fs-extra')
-    try{
-      fs.copySync(__dirname+'/../dist/sptc-web-demo', dir)
-      console.log()
-      console.log('New project created in `'+dir+'` !')
-      console.log('The following steps are necessary for developing:')
-      console.log('1. enter the project directory ', dir)
-      console.log('2. run `npm i` to install the requirements')
-      console.log('3. run `npm run dev` to start the demo')
-      console.log()
-    }catch(e) {
-      console.error(e)
-    }
-  })
-  .parse()

package/dist/router.s

@@ -1,58 +0,0 @@
-<?js
-
-const {$error, $alias, $index_action, $max_redirect=3}=include(__ROUTER_SETTING__)
-
-function resolve(pathname, maxRedirect=$max_redirect) {
-  if(maxRedirect<=0) throw new Error('redirect max exceeded')
-  let _pathname=pathname
-  for(let a in $alias) {
-    let p=a.replace(/\*/g, '(.*?)')
-    const sub=pathname.match(new RegExp('^'+p+'$'))
-    if(sub) {
-      _pathname=$alias[a]
-      if(_pathname.indexOf('$')>-1) {
-        const r1=_pathname.replace(/\$(\d+)/g, (_, n)=>sub[+n] || _)
-        if(isDebug()) {
-          console.log('Redirect:', {
-            from: pathname,
-            to: r1,
-          })
-        }
-        return resolve(r1, maxRedirect-1)
-      }
-      $_REQUEST_FILE['subRoute']=sub
-      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('Request:', {
-      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/dist/sptc-web-demo/build/index.js

@@ -1,24 +0,0 @@
-const {getRuntimeArgv, checkEnv, run}=require(__dirname+'/lib')
-checkEnv()
-const {IS_DEV, IS_BUILD, IS_SERVE, NPM_ARGV_ORIGINAL}=getRuntimeArgv()
-
-process.env.NODE_ENV=IS_DEV? 'development': 'production'
-const {webpackDev, webpackBuild}=require(__dirname+'/webpack.lib')
-
-const nk='NODE_OPTIONS', nv='--openssl-legacy-provider'
-if(+process.version.match(/^v(\d+)/)[1]>16 && process.env[nk]!==nv) {
-  run('cross-env', [nk+'='+nv, 'npm', ...NPM_ARGV_ORIGINAL])
-}else{
-  const open=require('open')
-  if(IS_DEV) {
-    run('cross-env', 'sptcd_environ=dev sptcd -rindex.s -wserver'.split(' '))
-    webpackDev()
-    open('http://127.0.0.1:3000')
-  }else if(IS_BUILD) {
-    webpackBuild()
-  }else if(IS_SERVE) {
-    run('cross-env', 'sptcd_environ=beta sptcd -rindex.s -wserver -n2 -s'.split(' '))
-    console.log('-- The HTTP service is started with the address 127.0.0.1:9090 --')
-    open('http://127.0.0.1:9090')
-  }
-}

package/dist/sptc-web-demo/build/lib.js

@@ -1,116 +0,0 @@
-const APP_PATH=__dirname+'/..'
-const pkg=require(APP_PATH+'/package.json')
-const chalk=require('chalk')
-const fs=require('fs')
-
-const RUNTIME_RND_STR=Date.now().toString(36)
-function getRuntimeArgv() {
-  const p=process.argv[2]
-  const IS_DEV=p==='dev'
-  const IS_BUILD=p==='build'
-  const IS_SERVE=p==='serve'
-  const t=JSON.parse(process.env.npm_config_argv).original
-  let e={}
-  for(let s of t) {
-    s.replace(/^--(.+?)=(.+)/, (_, k, v)=>{
-      e[k]=v
-    })
-  }
-  return {
-    NPM_ARGV: e,
-    NPM_ARGV_ORIGINAL: t,
-    IS_DEV,
-    IS_BUILD,
-    IS_SERVE,
-    RND: RUNTIME_RND_STR,
-  }
-}
-
-function satisfiesVersion(target_v, custom_v) {
-  function _cmp(v1, v2, g=3) {
-    v1=v1.split('.').slice(0, g)
-    v2=v2.split('.').slice(0, g)
-    for(;v1.length<3;) v1.push(0)
-    for(;v2.length<3;) v2.push(0)
-    for(let i=0; i<3; i++) {
-      const _v1=parseInt(v1[i]) || 0, _v2=parseInt(v2[i]) || 0
-      if(_v1>_v2) return 1
-      if(_v1<_v2) return -1
-    }
-    return 0
-  }
-  if(target_v==='*' || target_v===custom_v) return true
-  let s=false
-  target_v.replace(/^(>=|>|\^|~)\s*(\S+)/, (_, x, t_ver)=>{
-    if(x==='>=') {
-      s=_cmp(custom_v, t_ver)>=0
-    }else if(x==='>') {
-      s=_cmp(custom_v, t_ver)>0
-    }else if(x==='<=') {
-      s=_cmp(custom_v, t_ver)<=0
-    }else if(x==='<') {
-      s=_cmp(custom_v, t_ver)<0
-    }else if(x==='^' || x==='~') {
-      s=_cmp(custom_v, t_ver)>=0
-      if(x==='^') {
-        s=s && _cmp(custom_v, t_ver.replace(/^\d+/, _=>+_+1), 1)<=0
-      }else{
-        s=s && _cmp(custom_v, t_ver.replace(/(^.+?\.)(\d+)/, (_, a, b)=>a+(+b+1)), 2)<=0
-      }
-    }
-  })
-  return s
-}
-
-function checkEnv() {
-  if(!satisfiesVersion(pkg.engines.node, process.version.replace(/^v/, ''))) {
-    console.log([
-      chalk.red('Node version not met :('),
-      chalk.yellow(`You are using Node ${process.version}. Node ${pkg.engines.node} is required.`),
-    ].join('\n'))
-    process.exit(1)
-  }
-
-  const unmatched=[]
-  const t=Object.assign({}, pkg.dependencies, pkg.devDependencies)
-  for(let n in t) {
-    let custom_v=''
-    try{
-      custom_v=require(APP_PATH+'/node_modules/'+n+'/package.json').version
-    }catch(e) {}
-    if(satisfiesVersion(t[n], custom_v)<=0) {
-      unmatched.push([n, t[n], custom_v])
-    }
-  }
-  if(unmatched.length) {
-    console.log(chalk.red(`The following packages should be installed:`))
-    for(let [name, tv, cv] of unmatched) {
-      console.log(`${name} required: ${tv} | current: ${cv || 'uninstalled'}`)
-    }
-    process.exit()
-  }
-}
-
-function getPostCssPlugins() {
-  return require("postcss-load-config").sync({}, __dirname+'/postcss.config.js')
-}
-
-function requireNodeModuleFile(fn) {
-  return require(APP_PATH+'/node_modules/'+fn)
-}
-
-function run(exe, argv) {
-  const p=require('child_process').spawn(
-    require('os').platform()==='win32'? exe+'.cmd': exe, argv)
-  p.stdout.on('data', b=>process.stdout.write(b))
-  p.stderr.on('data', b=>process.stderr.write(b))
-}
-
-module.exports={
-  APP_PATH,
-  getRuntimeArgv,
-  checkEnv,
-  getPostCssPlugins,
-  requireNodeModuleFile,
-  run,
-}

package/dist/sptc-web-demo/build/postcss.config.js

@@ -1,31 +0,0 @@
-var autoprefixer = require('autoprefixer')
-
-module.exports = {
-  plugins: [
-    autoprefixer({
-      overrideBrowserslist: [
-        'Android >= 4.0',
-        'iOS >= 6',
-        'last 5 QQAndroid versions',
-        'last 5 UCAndroid versions'
-      ],
-      cascade: true
-    }),
-    require("postcss-px-to-viewport")({
-      unitToConvert: 'px',
-      viewportWidth: 1875,
-      unitPrecision: 5,
-      propList: ['*'],
-      viewportUnit: 'rem',
-      fontViewportUnit: 'rem',
-      selectorBlackList: [],
-      minPixelValue: 1,
-      mediaQuery: false,
-      replace: true,
-      include: 'src/**',
-      landscape: false,
-      landscapeUnit: 'rem',
-      landscapeWidth: 568
-    })
-  ]
-};

package/dist/sptc-web-demo/build/sptc.inject.js

@@ -1,73 +0,0 @@
-const argv=require('./lib').getRuntimeArgv()
-
-function is_server(ctx) {
-  return (ctx.webpackLoaderThis.target + '').indexOf('node') > -1;
-}
-
-const A={
-  EXTENDS: (ctx) => ({
-    ...argv,
-    IS_NODE_TARGET: is_server(ctx),
-  }),
-  TPLS: [
-    /\.jsx?$/, ctx=>{
-      let {str, fn}=ctx
-      let appends={}
-      if (str.match(/<&[*=]/)) {
-        str=str.replace(/<(\/)?&([*=&])([^\s>]+)/g, (_, b, a, p) => {
-          appends[`import UseComponent from '@/components/UseComponent'`]=1
-          if(a==='*') {
-            if(b) return `</UseComponent`
-            return `<UseComponent key={"pathto_component_${p}"} UseComponentGetter={_=>import("${p}")}`
-          }else if(a==='=') {
-            appends[`import UseComponent from '@/components/UseComponent'`]=1
-            if(b) return `</UseComponent`
-            return `<UseComponent key={"pathto_component_${p}"} UseComponentSync={true} UseComponentGetter={_=>require("${p}")}`
-          } else if(a==='&') {
-            const name = `Comp_pathto_component_${p.replace(/[^a-z\d_]+/g, '_')}`
-            appends[`import ${name} from '${p}'`]=1
-            if(b) return `</${name}`
-            return `<${name}`
-          }
-        })
-        str=Object.keys(appends).join('\n')+'\n'+str
-      }
-      return str;
-    },
-
-    /\.jsx?$/, ctx=>{
-      let adds={}
-      let str=ctx.str.replace(/\*IMG\((['"])(.+?)\1\)/g, (_, a, pth)=>{
-        let e='IMG_'+pth.replace(/[^a-z\d_]+/g, '_')
-        adds[e]=pth
-        return e
-      })
-      for(let e in adds) {
-        str=`import ${e} from '${adds[e]}'\n`+str
-      }
-      return str
-    },
-
-    /\.jsx?/, ctx=>{
-      const {str, fn}=ctx
-      if(fn.match(/ssrInit.js/)) return str
-      if(!is_server(ctx)) return str
-      return `
-      import e from '@/ssrInit'
-      const {window, document, navigator,location}=e
-      `+str
-    },
-
-    /\.(scss|jsx?)/, ctx=>{
-      const {str, fn}=ctx
-      const path=require('path')
-      const src=path.resolve(__dirname+'/src')
-      const ffn=path.resolve(fn).substr(src.length).replace(/\.[a-z\d]+$/, '')
-      let t=ffn.replace(/[\/\\]+([^/\\]+)\.[^/\\]+$/, '').replace(/[^a-z\d_-]/ig, '_')
-      return str.replace(/\b__view_scope\b/g, 'V_'+argv.RND+'_'+t)
-    },
-
-  ],
-};
-
-module.exports=A

package/dist/sptc-web-demo/build/webpack.lib.js

@@ -1,242 +0,0 @@
-const {
-  APP_PATH,
-  getRuntimeArgv,
-  getPostCssPlugins,
-  requireNodeModuleFile,
-}=require(__dirname+'/lib')
-const craco=require('@craco/craco')
-const webpack=require('webpack')
-const Webpackbar=require('webpackbar')
-const chalk=require('chalk')
-const fs=require('fs')
-const MiniCssExtractPlugin=require('mini-css-extract-plugin')
-const fs_extra=require('fs-extra')
-const {NPM_ARGV}=getRuntimeArgv()
-const path=require('path')
-const createWebpackBase=requireNodeModuleFile('react-scripts/config/webpack.config')
-function createWebpackConfig({isServer=false, env='development'}) {
-  const IS_DEV=env==='development'
-  const webpackConfig={
-    target: !isServer? 'web': 'node',
-    name: !isServer? 'client': 'server',
-    mode: IS_DEV? 'development': 'production',
-    optimization: {
-      runtimeChunk: false,
-      splitChunks: false,
-    },
-  }
-  const base=createWebpackBase(env)
-  base.plugins.push(
-    new Webpackbar({
-      name: webpackConfig.name,
-      basic: false,
-    }),
-  )
-
-  craco.removePlugins(base, x=>[
-    'HtmlWebpackPlugin',
-    'ManifestPlugin',
-    'ESLintWebpackPlugin',
-  ].includes(x.constructor.name))
-
-  craco.removeLoaders(base, craco.loaderByName('style-loader'))
-  craco.getLoaders(base, craco.loaderByName('postcss-loader')).matches.map(e=>{
-    const _fn=e.loader.options.plugins
-    e.loader.options.plugins=_=>[..._fn(), ...getPostCssPlugins().plugins]
-  })
-  craco.getLoaders(base, craco.loaderByName('babel-loader')).matches.map(e=>{
-    e.loader.options.plugins=[]
-  })
-  base.module.rules.push({
-    test: /\.([tj]sx?|scss)/,
-    exclude: /node_modules/,
-    options: {
-      file: __dirname+'/sptc.inject.js',
-    },
-    loader: 'sptc/dist/webpack.loader.js',
-  })
-
-  if(isServer) {
-    craco.removePlugins(base, x=>[
-      'MiniCssExtractPlugin',
-      'InterpolateHtmlPlugin',
-      'InlineChunkHtmlPlugin',
-      'WebpackManifestPlugin',
-      'ReactRefreshPlugin',
-      'ForkTsCheckerWebpackPlugin',
-      'WatchMissingNodeModulesPlugin',
-      'ModuleNotFoundPlugin',
-      'ModuleScopePlugin',
-    ].includes(x.constructor.name))
-
-    craco.removeLoaders(base, craco.loaderByName('mini-css-extract-plugin'))
-    base.module.rules[1].oneOf.map(x=>{
-      if(x.test && ('.css'.match(x.test) || '.scss'.match(x.test))) {
-        x.use='null-loader'
-      }
-    })
-
-    base.resolve.plugins=[]
-    base.output.filename='server/index.js'
-    base.entry=APP_PATH+'/src/index.jsx';
-    base.output.chunkFilename='server/chunk.[contenthash].js';
-    base.output.libraryTarget='commonjs2';
-  }else{
-    if(IS_DEV) {
-      craco.removePlugins(base, craco.pluginByName('HotModuleReplacementPlugin'))
-      base.plugins.push(
-        new webpack.DefinePlugin('process', '{}'),
-        new webpack.HotModuleReplacementPlugin(),
-        new MiniCssExtractPlugin({
-          filename: 'static/css/[name].css',
-          chunkFilename: 'static/css/[name].chunk.css',
-        }),
-      )
-      base.module.rules[1].oneOf.map(rule=>{
-        if(!rule.use) return;
-        if(rule.use.find(x=>x.loader.indexOf('postcss-loader'))) {
-          rule.use.unshift({
-            loader: MiniCssExtractPlugin.loader,
-            options: {},
-          })
-        }
-      })
-    }
-    const newEntry=APP_PATH+'/src/index.jsx'
-    if(typeof base.entry==='string') {
-      base.entry=newEntry
-    }else if(Array.isArray(base.entry)) {
-      base.entry[base.entry.length-1]=newEntry
-    }
-  }
-
-  if(!IS_DEV) {
-    webpackConfig.externals=isServer? {
-      react: 'react',
-      'react-dom': 'react-dom',
-    }: {
-      react: 'React',
-      'react-dom': 'ReactDom',
-    }
-  }
-
-  base.resolve.alias=Object.assign(base.resolve.alias, {
-     '@': APP_PATH+'/src',
-     src: APP_PATH+'/src',
-  })
-  base.output.chunkCallbackName='webpackChunk_'+Date.now().toString(36)
-  base.output.jsonpFunction='webpackJsonp_'+Date.now().toString(36)
-  if(!IS_DEV) {
-    base.output.path=APP_PATH+'/dist'
-    base.output.publicPath='/assets/app/'
-  }
-  const conf=Object.assign(Object.assign({}, base), webpackConfig)
-  conf.devtool='none'
-  return conf
-}
-
-function webpackDev(port=3000) {
-  fs_extra.emptyDirSync(APP_PATH+'/dist')
-  const createDevBase=requireNodeModuleFile('react-scripts/config/webpackDevServer.config')
-  const devConfig=Object.assign({}, createDevBase(), {
-    writeToDisk: fn=>fn.indexOf('server')>0,
-    injectClient: true,
-    disableHostCheck: true,
-    index: '',
-    proxy: {
-      context: ['/'],
-      target: 'http://127.0.0.1:9090/',
-    },
-  })
-
-  const clientConfig=createWebpackConfig({isServer: false})
-  const serverConfig=createWebpackConfig({isServer: true})
-  const config=[clientConfig, serverConfig]
-  const multiCompiler=webpack(config)
-
-  multiCompiler.hooks.done.tap('done', stats=>{
-    const [clientStats, serverStats] = stats.toJson({
-      all: false,
-      warnings: true,
-      errors: true,
-      modules: false,
-      entrypoints: true,
-      publicPath: false,
-    }).children
-    const errors=[...clientStats.errors, ...serverStats.errors]
-    const warnings=[...clientStats.warnings, ...serverStats.warnings]
-
-    if(errors.length) {
-      console.log(chalk.red('Failed to compile.\n'))
-      console.log(errors[0])
-    }else if(warnings.length) {
-      console.log(chalk.yellow('Compiled with warnings.\n'))
-      console.log(warnings.join('\n\n'))
-    }else{
-      const hot=clientStats.entrypoints.main.assets.find(x=>x.endsWith('.hot-update.js'))
-      const ret={
-        srv: '/server/index.js',
-        js: '/static/js/bundle.js',
-        css: '/static/css/main.css',
-        hot: hot? '/'+hot: '',
-      }
-      fs.writeFileSync(APP_PATH+'/dist/assets.json', JSON.stringify(ret))
-
-      console.log(chalk.green('Compiled successfully!'))
-    }
-  })
-
-  const WebpackDevServer=require('webpack-dev-server')
-  const devServer=new WebpackDevServer(multiCompiler, devConfig)
-  devServer.listen(port, '0.0.0.0', e=>{
-    if(e) throw e
-    devServer.middleware.waitUntilValid(_=>{
-      console.log(`> Ready on http://0.0.0.0:${port}`)
-    })
-  })
-}
-
-function webpackBuild() {
-  fs_extra.emptyDirSync(APP_PATH+'/dist')
-  const clientConfig=createWebpackConfig({isServer: false, env: 'production'})
-  const serverConfig=createWebpackConfig({isServer: true, env: 'production'})
-  const config=[clientConfig, serverConfig]
-  const multiCompiler=webpack(config)
-
-  multiCompiler.run((err, multiStats)=>{
-    if(err) {
-      throw err
-    }
-    if(multiStats.hasErrors()) {
-      const message = multiStats.toJson({ all: false, errors: true }).errors.join('\n')
-      throw new Error(message)
-    }
-
-    const [clientStats]=multiStats.toJson({
-      all: false,
-      warnings: false,
-      errors: false,
-      modules: false,
-      entrypoints: true,
-      publicPath: false,
-    }).children
-    const _f=re=>clientStats.entrypoints.main.assets.find(x=>x.match(re))
-    const ret={
-      srv: 'server/index.js',
-      js: _f(/main\..+?\.js$/),
-      css: _f(/main\..+?\.css$/),
-    }
-    fs.writeFileSync(APP_PATH+'/dist/assets.json', JSON.stringify(ret))
-    const srv_dist=path.resolve(APP_PATH+'/server/public/app')
-    fs_extra.emptyDirSync(srv_dist)
-    fs_extra.moveSync(APP_PATH+'/dist', srv_dist, {overwrite: true})
-
-    console.info(multiStats.toString({ colors: true }))
-  })
-
-}
-
-module.exports={
-  webpackDev,
-  webpackBuild,
-}