xhs-mp-compiler-cli 2.1.6-beta.5 → 2.1.6

package/dist/compiler.js

@@ -1 +1 @@
-var __awaiter=this&&this.__awaiter||function(thisArg,_arguments,P,generator){return new(P||(P=Promise))((function(resolve,reject){function fulfilled(value){try{step(generator.next(value))}catch(e){reject(e)}}function rejected(value){try{step(generator.throw(value))}catch(e){reject(e)}}function step(result){result.done?resolve(result.value):function adopt(value){return value instanceof P?value:new P((function(resolve){resolve(value)}))}(result.value).then(fulfilled,rejected)}step((generator=generator.apply(thisArg,_arguments||[])).next())}))},__importDefault=this&&this.__importDefault||function(mod){return mod&&mod.__esModule?mod:{default:mod}};!function(factory){if("object"==typeof module&&"object"==typeof module.exports){var v=factory(require,exports);void 0!==v&&(module.exports=v)}else{"function"==typeof define&&define.amd&&define(["require","exports","stream","fs-extra","path","./config/constant.config","xhs-mp-workerpool"],factory)}}((function(require,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.prepareDevPool=exports.BuildCompiler=exports.WebPackDevCompiler=exports.MPPackDevCompiler=exports.AbstractCompiler=void 0,exports.getProjectCompilerClass=function getProjectCompilerClass(compilerType){return compilerType===constant_config_1.COMPILER_TYPE.legacy_dev?WebPackDevCompiler:compilerType===constant_config_1.COMPILER_TYPE.dev?MPPackDevCompiler:BuildCompiler};const stream_1=require("stream"),fs_extra_1=__importDefault(require("fs-extra")),path_1=__importDefault(require("path")),constant_config_1=require("./config/constant.config"),xhs_mp_workerpool_1=__importDefault(require("xhs-mp-workerpool"));let preparedDevPool=null;class AbstractCompiler extends stream_1.EventEmitter{constructor(opts,args){super(),this.workerType="process",this.call=(method,data,options)=>(data=Object.assign(Object.assign({},this.compilerOpts||{}),data),this.pool.exec(method,[data],options)),this.compilerOpts=opts,this.logger=args.logger||console,this.workerType=args.workerType||"process"}get pool(){return this._pool||this.makePoolReady(),this._pool}set pool(val){this._pool=val}static prepareDevPool(){preparedDevPool=AbstractCompiler.createPool("web",{minWorkers:1,maxWorkers:1})}static createPool(workerType,poolOpts={},processArgs={}){let forkOpts={};"process"===workerType&&(forkOpts=AbstractCompiler.createProcessOps(processArgs));const scriptPath=path_1.default.join(__dirname,"compilerImpl.js").replace("app.asar","app.asar.unpacked"),pool=xhs_mp_workerpool_1.default.pool(scriptPath,Object.assign({workerType:workerType,workerThreadOpts:{},forkOpts:forkOpts,workerOpts:{}},poolOpts));let messageBuffers=[];const handlerWorker=workerIns=>{workerIns.worker.on("message",(payload=>{if(null==payload?void 0:payload.customMessage){if(!pool.emitWorkerMessage){return void messageBuffers.push(payload)}messageBuffers.length&&(messageBuffers.forEach((payload=>{null==pool||pool.emitWorkerMessage(payload.event,payload.data)})),messageBuffers=[]),null==pool||pool.emitWorkerMessage(payload.event,payload.data)}})),workerIns.worker.on("error",(err=>{null==pool||pool.emitWorkerMessage("uncaughtException",err)}))};pool.workers.forEach((workerIns=>{handlerWorker(workerIns)}));const push=pool.workers.push.bind(pool.workers);return pool.workers.push=workerIns=>{handlerWorker(workerIns),push(workerIns)},pool}close(){this.pool&&this.pool.exec("close")}kill(){this.pool&&(this.pool.terminate(!0),this.pool=null)}}exports.AbstractCompiler=AbstractCompiler,AbstractCompiler.createProcessOps=processArgs=>{const{type:type="keepalive",inspectPort:inspectPort,nodeJsPath:nodeJsPath}=processArgs,execArgv=["--expose-gc"],customNodeJs=nodeJsPath&&fs_extra_1.default.existsSync(nodeJsPath);if(process.env.DEV_IDE_SP&&execArgv.push(`--inspect=${inspectPort}`),customNodeJs){try{fs_extra_1.default.chmodSync(nodeJsPath,755)}catch(error){}}const options={stdio:"pipe",execArgv:execArgv,windowsHide:!0};return customNodeJs&&(options.execPath=nodeJsPath),options};class MPPackDevCompiler extends AbstractCompiler{constructor(props,args){super(props,args),this.pending=!1,this.pendingPkgs={},this.readyPkgs=[],this.watching=!1,this.workerType=(null==args?void 0:args.workerType)||"web",this.inspectPort=9227,this.makePoolReady()}makePoolReady(){this._pool=preparedDevPool||AbstractCompiler.createPool(this.workerType,{minWorkers:1,maxWorkers:1}),this._pool.emitWorkerMessage=this.emit.bind(this)}reset(){this.pendingPkgs={},this.readyPkgs=[],this.watching=!1,this.pending=!1}doCompilePkgs(opts){return new Promise(((resolve,reject)=>__awaiter(this,void 0,void 0,(function*(){const{compilePkgs:compilePkgs=[constant_config_1.MAIN_PKG_ROOT]}=opts,todoPkgs=[];let allReady=!0;if(compilePkgs.forEach((pkg=>{var _a,_b;if(!this.readyPkgs.includes(pkg)){if(allReady=!1,this.pendingPkgs[pkg]){return null===(_a=this.pendingPkgs[pkg].resolve)||void 0===_a||_a.push(resolve),void(null===(_b=this.pendingPkgs[pkg].reject)||void 0===_b||_b.push(reject))}this.pendingPkgs[pkg]={resolve:[resolve],reject:[reject]},todoPkgs.push(pkg)}})),allReady){return resolve(null)}if(todoPkgs.length){try{this.pending||this.watching?yield this.addPkgsToWatch(Object.assign({compilePkgs:compilePkgs},opts)):yield this.compilePkgsAndWatch(Object.assign({compilePkgs:todoPkgs},opts)),todoPkgs.forEach((pkg=>{var _a,_b;null===(_b=null===(_a=this.pendingPkgs[pkg].resolve)||void 0===_a?void 0:_a.forEach)||void 0===_b||_b.call(_a,(fn=>fn())),delete this.pendingPkgs[pkg],this.readyPkgs.push(pkg)}))}catch(error){todoPkgs.forEach((pkg=>{var _a,_b,_c;null===(_c=null===(_b=null===(_a=this.pendingPkgs[pkg])||void 0===_a?void 0:_a.reject)||void 0===_b?void 0:_b.forEach)||void 0===_c||_c.call(_b,(fn=>fn(error))),delete this.pendingPkgs[pkg]}))}}}))))}compilePkgsAndWatch(opts){return __awaiter(this,void 0,void 0,(function*(){try{this.pending=!0,this.emit("buildStart"),yield this.call("runTask",Object.assign({action:"dev"},opts)),this.watching=!0,this.emit("buildEnd")}catch(error){throw this.watching=!1,error}finally{this.pending=!1}}))}addPkgsToWatch(opts){return __awaiter(this,void 0,void 0,(function*(){const{compilePkgs:compilePkgs=[]}=opts;try{this.pending=!0,this.emit("buildStart"),yield this.call("activatePkgs",{compilePkgs:compilePkgs}),this.emit("buildEnd")}catch(error){throw error}finally{this.pending=!1}}))}changeCompileOptions(options){this.call("changeCompileOptions",options)}makePkgsReady(opts){return __awaiter(this,void 0,void 0,(function*(){yield this.doCompilePkgs(opts)}))}reCompilePkgs(options){return __awaiter(this,void 0,void 0,(function*(){this.readyPkgs=[],this.pendingPkgs={},this.pending=!1,this.watching=!1,this.close(),yield this.doCompilePkgs(options)}))}}exports.MPPackDevCompiler=MPPackDevCompiler;class WebPackDevCompiler extends AbstractCompiler{constructor(props,args){super(props,args),this.watching=!1,this.workerType=(null==args?void 0:args.workerType)||"web",this.inspectPort=9230,this.makePoolReady(args)}makePoolReady(args){this.pool=preparedDevPool||AbstractCompiler.createPool(this.workerType,{minWorkers:1,maxWorkers:1},args),this.pool.emitWorkerMessage=this.emit.bind(this)}doCompilePkgs(opts){return new Promise(((resolve,reject)=>__awaiter(this,void 0,void 0,(function*(){var _a,_b,_c,_d,_e,_f,_g,_h;if(this.watching){return resolve(null)}if(this.pendingTask){return null===(_b=null===(_a=this.pendingTask)||void 0===_a?void 0:_a.resolve)||void 0===_b||_b.push(resolve),void(null===(_d=null===(_c=this.pendingTask)||void 0===_c?void 0:_c.reject)||void 0===_d||_d.push(reject))}this.pendingTask={resolve:[resolve],reject:[reject]};try{this.emit("buildStart"),yield this.call("runTask",Object.assign({action:"dev"},opts)),this.watching=!0,null===(_f=null===(_e=this.pendingTask)||void 0===_e?void 0:_e.resolve)||void 0===_f||_f.forEach((fn=>fn())),this.emit("buildEnd")}catch(error){this.watching=!1,null===(_h=null===(_g=this.pendingTask)||void 0===_g?void 0:_g.reject)||void 0===_h||_h.forEach((fn=>fn(error)))}finally{this.pendingTask=void 0}}))))}makePkgsReady(opts){return __awaiter(this,void 0,void 0,(function*(){yield this.doCompilePkgs(opts)}))}reCompilePkgs(opts){return __awaiter(this,void 0,void 0,(function*(){this.pendingTask=void 0,this.watching=!1,this.close(),yield this.doCompilePkgs(opts)}))}}exports.WebPackDevCompiler=WebPackDevCompiler;class BuildCompiler extends AbstractCompiler{constructor(props,args){super(props,args),this.cps=[],this.workerType=(null==args?void 0:args.workerType)||"process",this.inspectPort=9228,this.makePoolReady(args)}makePoolReady(args){this.pool=AbstractCompiler.createPool(this.workerType,{minWorkers:1},args),this.pool.emitWorkerMessage=this.emit.bind(this)}build(option){return __awaiter(this,void 0,void 0,(function*(){try{return yield this.call("runTask",Object.assign({action:"build"},option))}finally{}}))}}exports.BuildCompiler=BuildCompiler,exports.prepareDevPool=AbstractCompiler.prepareDevPool}));
+var __awaiter=this&&this.__awaiter||function(thisArg,_arguments,P,generator){return new(P||(P=Promise))((function(resolve,reject){function fulfilled(value){try{step(generator.next(value))}catch(e){reject(e)}}function rejected(value){try{step(generator.throw(value))}catch(e){reject(e)}}function step(result){result.done?resolve(result.value):function adopt(value){return value instanceof P?value:new P((function(resolve){resolve(value)}))}(result.value).then(fulfilled,rejected)}step((generator=generator.apply(thisArg,_arguments||[])).next())}))},__importDefault=this&&this.__importDefault||function(mod){return mod&&mod.__esModule?mod:{default:mod}};!function(factory){if("object"==typeof module&&"object"==typeof module.exports){var v=factory(require,exports);void 0!==v&&(module.exports=v)}else{"function"==typeof define&&define.amd&&define(["require","exports","stream","fs-extra","path","xhs-mp-shared","./config/constant.config","xhs-mp-workerpool"],factory)}}((function(require,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.prepareDevPool=exports.BuildCompiler=exports.WebPackDevCompiler=exports.MPPackDevCompiler=exports.AbstractCompiler=void 0,exports.getProjectCompilerClass=function getProjectCompilerClass(compilerType){return compilerType===constant_config_1.COMPILER_TYPE.legacy_dev?WebPackDevCompiler:compilerType===constant_config_1.COMPILER_TYPE.dev?MPPackDevCompiler:BuildCompiler};const stream_1=require("stream"),fs_extra_1=__importDefault(require("fs-extra")),path_1=__importDefault(require("path")),xhs_mp_shared_1=require("xhs-mp-shared"),constant_config_1=require("./config/constant.config"),xhs_mp_workerpool_1=__importDefault(require("xhs-mp-workerpool"));let preparedDevPool=null;class AbstractCompiler extends stream_1.EventEmitter{constructor(opts,args){super(),this.workerType="process",this.call=(method,data,options)=>(data=Object.assign(Object.assign({},this.compilerOpts||{}),data),this.pool.exec(method,[data],options)),this.compilerOpts=opts,this.logger=args.logger||console,this.workerType=args.workerType||"process"}get pool(){return this._pool||this.makePoolReady(),this._pool}set pool(val){this._pool=val}static prepareDevPool(){preparedDevPool=AbstractCompiler.createPool("web",{minWorkers:1,maxWorkers:1})}static createPool(workerType,poolOpts={},processArgs={}){let forkOpts={};"process"===workerType&&(forkOpts=AbstractCompiler.createProcessOps(processArgs));const scriptPath=(0,xhs_mp_shared_1.replaceAsarPath)(path_1.default.join(__dirname,"compilerImpl.js")),pool=xhs_mp_workerpool_1.default.pool(scriptPath,Object.assign({workerType:workerType,workerThreadOpts:{},forkOpts:forkOpts,workerOpts:{}},poolOpts));let messageBuffers=[];const handlerWorker=workerIns=>{workerIns.worker.on("message",(payload=>{if(null==payload?void 0:payload.customMessage){if(!pool.emitWorkerMessage){return void messageBuffers.push(payload)}messageBuffers.length&&(messageBuffers.forEach((payload=>{null==pool||pool.emitWorkerMessage(payload.event,payload.data)})),messageBuffers=[]),null==pool||pool.emitWorkerMessage(payload.event,payload.data)}})),workerIns.worker.on("error",(err=>{null==pool||pool.emitWorkerMessage("uncaughtException",err)}))};pool.workers.forEach((workerIns=>{handlerWorker(workerIns)}));const push=pool.workers.push.bind(pool.workers);return pool.workers.push=workerIns=>{handlerWorker(workerIns),push(workerIns)},pool}close(){this.pool&&this.pool.exec("close")}kill(){this.pool&&(this.pool.terminate(!0),this.pool=null)}}exports.AbstractCompiler=AbstractCompiler,AbstractCompiler.createProcessOps=processArgs=>{const{type:type="keepalive",inspectPort:inspectPort,nodeJsPath:nodeJsPath}=processArgs,execArgv=["--expose-gc"],customNodeJs=nodeJsPath&&fs_extra_1.default.existsSync(nodeJsPath);if(process.env.DEV_IDE_SP&&execArgv.push(`--inspect=${inspectPort}`),customNodeJs){try{fs_extra_1.default.chmodSync(nodeJsPath,755)}catch(error){}}const options={stdio:"pipe",execArgv:execArgv,windowsHide:!0};return customNodeJs&&(options.execPath=nodeJsPath),options};class MPPackDevCompiler extends AbstractCompiler{constructor(props,args){super(props,args),this.pending=!1,this.pendingPkgs={},this.readyPkgs=[],this.watching=!1,this.workerType=(null==args?void 0:args.workerType)||"web",this.inspectPort=9227,this.makePoolReady()}makePoolReady(){this._pool=preparedDevPool||AbstractCompiler.createPool(this.workerType,{minWorkers:1,maxWorkers:1}),this._pool.emitWorkerMessage=this.emit.bind(this)}reset(){this.pendingPkgs={},this.readyPkgs=[],this.watching=!1,this.pending=!1}doCompilePkgs(opts){return new Promise(((resolve,reject)=>__awaiter(this,void 0,void 0,(function*(){const{compilePkgs:compilePkgs=[constant_config_1.MAIN_PKG_ROOT]}=opts,todoPkgs=[];let allReady=!0;if(compilePkgs.forEach((pkg=>{var _a,_b;if(!this.readyPkgs.includes(pkg)){if(allReady=!1,this.pendingPkgs[pkg]){return null===(_a=this.pendingPkgs[pkg].resolve)||void 0===_a||_a.push(resolve),void(null===(_b=this.pendingPkgs[pkg].reject)||void 0===_b||_b.push(reject))}this.pendingPkgs[pkg]={resolve:[resolve],reject:[reject]},todoPkgs.push(pkg)}})),allReady){return resolve(null)}if(todoPkgs.length){try{this.pending||this.watching?yield this.addPkgsToWatch(Object.assign({compilePkgs:compilePkgs},opts)):yield this.compilePkgsAndWatch(Object.assign({compilePkgs:todoPkgs},opts)),todoPkgs.forEach((pkg=>{var _a,_b;null===(_b=null===(_a=this.pendingPkgs[pkg].resolve)||void 0===_a?void 0:_a.forEach)||void 0===_b||_b.call(_a,(fn=>fn())),delete this.pendingPkgs[pkg],this.readyPkgs.push(pkg)}))}catch(error){todoPkgs.forEach((pkg=>{var _a,_b,_c;null===(_c=null===(_b=null===(_a=this.pendingPkgs[pkg])||void 0===_a?void 0:_a.reject)||void 0===_b?void 0:_b.forEach)||void 0===_c||_c.call(_b,(fn=>fn(error))),delete this.pendingPkgs[pkg]}))}}}))))}compilePkgsAndWatch(opts){return __awaiter(this,void 0,void 0,(function*(){try{this.pending=!0,this.emit("buildStart"),yield this.call("runTask",Object.assign({action:"dev"},opts)),this.watching=!0,this.emit("buildEnd")}catch(error){throw this.watching=!1,error}finally{this.pending=!1}}))}addPkgsToWatch(opts){return __awaiter(this,void 0,void 0,(function*(){const{compilePkgs:compilePkgs=[]}=opts;try{this.pending=!0,this.emit("buildStart"),yield this.call("activatePkgs",{compilePkgs:compilePkgs}),this.emit("buildEnd")}catch(error){throw error}finally{this.pending=!1}}))}changeCompileOptions(options){this.call("changeCompileOptions",options)}makePkgsReady(opts){return __awaiter(this,void 0,void 0,(function*(){yield this.doCompilePkgs(opts)}))}reCompilePkgs(options){return __awaiter(this,void 0,void 0,(function*(){this.readyPkgs=[],this.pendingPkgs={},this.pending=!1,this.watching=!1,this.close(),yield this.doCompilePkgs(options)}))}}exports.MPPackDevCompiler=MPPackDevCompiler;class WebPackDevCompiler extends AbstractCompiler{constructor(props,args){super(props,args),this.watching=!1,this.workerType=(null==args?void 0:args.workerType)||"web",this.inspectPort=9230,this.makePoolReady(args)}makePoolReady(args){this.pool=preparedDevPool||AbstractCompiler.createPool(this.workerType,{minWorkers:1,maxWorkers:1},args),this.pool.emitWorkerMessage=this.emit.bind(this)}doCompilePkgs(opts){return new Promise(((resolve,reject)=>__awaiter(this,void 0,void 0,(function*(){var _a,_b,_c,_d,_e,_f,_g,_h;if(this.watching){return resolve(null)}if(this.pendingTask){return null===(_b=null===(_a=this.pendingTask)||void 0===_a?void 0:_a.resolve)||void 0===_b||_b.push(resolve),void(null===(_d=null===(_c=this.pendingTask)||void 0===_c?void 0:_c.reject)||void 0===_d||_d.push(reject))}this.pendingTask={resolve:[resolve],reject:[reject]};try{this.emit("buildStart"),yield this.call("runTask",Object.assign({action:"dev"},opts)),this.watching=!0,null===(_f=null===(_e=this.pendingTask)||void 0===_e?void 0:_e.resolve)||void 0===_f||_f.forEach((fn=>fn())),this.emit("buildEnd")}catch(error){this.watching=!1,null===(_h=null===(_g=this.pendingTask)||void 0===_g?void 0:_g.reject)||void 0===_h||_h.forEach((fn=>fn(error)))}finally{this.pendingTask=void 0}}))))}makePkgsReady(opts){return __awaiter(this,void 0,void 0,(function*(){yield this.doCompilePkgs(opts)}))}reCompilePkgs(opts){return __awaiter(this,void 0,void 0,(function*(){this.pendingTask=void 0,this.watching=!1,this.close(),yield this.doCompilePkgs(opts)}))}}exports.WebPackDevCompiler=WebPackDevCompiler;class BuildCompiler extends AbstractCompiler{constructor(props,args){super(props,args),this.cps=[],this.workerType=(null==args?void 0:args.workerType)||"process",this.inspectPort=9228,this.makePoolReady(args)}makePoolReady(args){this.pool=AbstractCompiler.createPool(this.workerType,{minWorkers:1},args),this.pool.emitWorkerMessage=this.emit.bind(this)}build(option){return __awaiter(this,void 0,void 0,(function*(){try{return yield this.call("runTask",Object.assign({action:"build"},option))}finally{}}))}}exports.BuildCompiler=BuildCompiler,exports.prepareDevPool=AbstractCompiler.prepareDevPool}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "2.1.6-beta.5",
+  "version": "2.1.6",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
@@ -89,18 +89,18 @@
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.2",
     "xhs-mp-workerpool": "^9.2.0",
-    "xhs-mp-ml-loader": "2.1.6-beta.5",
-    "xhs-mp-compiler-utils": "2.1.6-beta.5",
-    "xhs-mp-pack": "2.1.6-beta.5",
-    "xhs-mp-project": "2.1.6-beta.5",
-    "xhs-mp-shared": "2.1.6-beta.5",
-    "xhs-mp-shared-fs": "2.1.6-beta.5",
-    "xhs-mp-sjs-loader": "2.1.6-beta.5",
-    "xhs-mp-sketch-loader": "2.1.6-beta.5",
+    "xhs-mp-ml-loader": "2.1.6",
+    "xhs-mp-compiler-utils": "2.1.6",
+    "xhs-mp-pack": "2.1.6",
+    "xhs-mp-project": "2.1.6",
+    "xhs-mp-shared": "2.1.6",
+    "xhs-mp-shared-fs": "2.1.6",
+    "xhs-mp-sjs-loader": "2.1.6",
+    "xhs-mp-sketch-loader": "2.1.6",
     "yauzl": "^2.10.0"
   },
   "peerDependencies": {
-    "xhs-mp-ml-parser": "2.1.6-beta.5"
+    "xhs-mp-ml-parser": "2.1.6"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.3",
@@ -123,7 +123,7 @@
     "@types/node": "14",
     "typescript": "5.1.6",
     "webpack-dev-server": "4.0.0-beta.3",
-    "xhs-mp-ml-parser": "2.1.6-beta.5"
+    "xhs-mp-ml-parser": "2.1.6"
   },
   "scripts": {
     "version": "formula changelog && git add .",