@qlover/create-app 0.12.0 → 1.0.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @qlover/create-app
 
+## 1.0.0
+
+### Major Changes
+
 ## 0.12.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -8,4 +8,4 @@ ${t}`,dn=Object.getOwnPropertyDescriptor(Function.prototype,"toString"),_n=Objec
 `))this.#e+=Math.max(1,Math.ceil(Ye(D,{countAnsiEscapeCodes:!0})/t))}get isEnabled(){return this.#a&&!this.#F}set isEnabled(t){if(typeof t!="boolean")throw new TypeError("The `isEnabled` option must be a boolean");this.#a=t}get isSilent(){return this.#F}set isSilent(t){if(typeof t!="boolean")throw new TypeError("The `isSilent` option must be a boolean");this.#F=t}frame(){let t=Date.now();(this.#i===-1||t-this.#c>=this.interval)&&(this.#i=++this.#i%this.#D.frames.length,this.#c=t);let{frames:r}=this.#D,u=r[this.#i];this.color&&(u=d[this.color](u));let i=typeof this.#s=="string"&&this.#s!==""?this.#s+" ":"",D=typeof this.text=="string"?" "+this.text:"",o=typeof this.#o=="string"&&this.#o!==""?" "+this.#o:"";return i+u+D+o}clear(){if(!this.#a||!this.#u.isTTY)return this;this.#u.cursorTo(0);for(let t=0;t<this.#n;t++)t>0&&this.#u.moveCursor(0,-1),this.#u.clearLine(1);return(this.#l||this.lastIndent!==this.#l)&&this.#u.cursorTo(this.#l),this.lastIndent=this.#l,this.#n=0,this}render(){return this.#F?this:(this.clear(),this.#u.write(this.frame()),this.#n=this.#e,this)}start(t){return t&&(this.text=t),this.#F?this:this.#a?this.isSpinning?this:(this.#t.hideCursor&&$e.hide(this.#u),this.#t.discardStdin&&z.default.stdin.isTTY&&(this.#r=!0,Je.start()),this.render(),this.#f=setInterval(this.render.bind(this),this.interval),this):(this.text&&this.#u.write(`- ${this.text}
 `),this)}stop(){return this.#a?(clearInterval(this.#f),this.#f=void 0,this.#i=0,this.clear(),this.#t.hideCursor&&$e.show(this.#u),this.#t.discardStdin&&z.default.stdin.isTTY&&this.#r&&(Je.stop(),this.#r=!1),this):this}succeed(t){return this.stopAndPersist({symbol:Y.success,text:t})}fail(t){return this.stopAndPersist({symbol:Y.error,text:t})}warn(t){return this.stopAndPersist({symbol:Y.warning,text:t})}info(t){return this.stopAndPersist({symbol:Y.info,text:t})}stopAndPersist(t={}){if(this.#F)return this;let r=t.prefixText??this.#s,u=this.#E(r," "),i=t.symbol??" ",D=t.text??this.text,s=typeof D=="string"?(i?" ":"")+D:"",a=t.suffixText??this.#o,l=this.#g(a," "),p=u+i+s+l+`
 `;return this.stop(),this.#u.write(p),this}};function tr(e){return new Ze(e)}async function rr(e,t){let r=typeof e=="function",u=typeof e.then=="function";if(!r&&!u)throw new TypeError("Parameter `action` must be a Function or a Promise");let{successText:i,failText:D}=typeof t=="object"?t:{successText:void 0,failText:void 0},o=tr(t).start();try{let a=await(r?e(o):e);return o.succeed(i===void 0?void 0:typeof i=="string"?i:i(a)),a}catch(s){throw o.fail(D===void 0?void 0:typeof D=="string"?D:D(s)),s}}var bt=require("fs");var S=require("path"),A=require("fs"),cr=h(lr(),1);var _e=require("fs"),J=class{static ensureDir(t){(0,_e.existsSync)(t)||(0,_e.mkdirSync)(t,{recursive:!0})}};var{copyFile:rs,stat:us}=A.promises,me=class e{constructor(t,r=e.IGNORE_FILE){this.ignoreTargetPath=t;this.ignoreFile=r}static IGNORE_FILE=".gitignore.template";getIg(t=this.ignoreTargetPath){let r=(0,S.join)(t,this.ignoreFile);if(!(0,A.existsSync)(r))return;let D=(0,A.readFileSync)(r,"utf8").split(`
-`).map(o=>o.trim()).filter(o=>o&&!o.startsWith("#"));return(0,cr.default)().add(D)}async copyFiles(t,r,u,i){let D=await A.promises.readdir(t);await Promise.all(D.map(async o=>{let s=(0,S.join)(t,o),a=(0,S.join)(r,o);if(u&&u.ignores(o))return;if(J.ensureDir((0,S.dirname)(a)),(await us(s)).isDirectory())await this.copyFiles(s,a,u,i);else{if(i&&await i(s,a))return;await rs(s,a)}}))}copyPaths({sourcePath:t,targetPath:r,copyCallback:u}){J.ensureDir(r);let i=this.getIg();return this.copyFiles(t,r,i,u)}};var k=require("fs"),kD=h(LD(),1),xe=class{constructor(){}isJSONFilePath(t){return t.endsWith(".json")||t.endsWith(".json.template")}isTemplateFilePath(t){return t.endsWith(".template")}getRealTemplateFilePath(t){return t.replace(".template","")}readFile(t){return(0,k.readFileSync)(t,"utf-8")}readJSONFile(t){return JSON.parse(this.readFile(t))}writeFile(t,r){(0,k.writeFileSync)(this.getRealTemplateFilePath(t),r,{encoding:"utf-8"})}replaceFile(t,r){let u=this.readFile(t);return Object.keys(r).forEach(i=>{let D=r[i];u=u.replace(new RegExp(`\\[TPL:${i}\\]`,"g"),typeof D=="string"?D:JSON.stringify(D))}),u}mergeJSONFile(t,r){let u=this.readJSONFile(t),i=(0,kD.default)(r,u);this.writeFile(t,JSON.stringify(i,null,2))}composeConfigFile(t,r,u){if(this.isTemplateFilePath(r)){let i=this.replaceFile(r,t);if(this.isJSONFilePath(r)&&this.isJSONFilePath(u)){let D=this.getRealTemplateFilePath(u);return(0,k.existsSync)(D)?(this.mergeJSONFile(D,JSON.parse(i)),!0):(this.writeFile(D,i),!0)}return this.writeFile(u,i),!0}return!1}};var $D=["pack-app"],ye=class{ora;context;subPackages;copyer;compose;constructor(t){let r=t.options?.templateRootPath;if(!r)throw new Error("template path not exit");if(!(0,bt.existsSync)(r))throw new Error("template path not exit");this.ora=rr,this.context=new UD.ScriptContext("create-app",t),this.subPackages=["node-lib","react-app","next-app"],this.copyer=new me((0,x.join)(this.context.options.configsRootPath,"_common")),this.compose=new xe}get logger(){return this.context.logger}async steps(t){try{return await WD.default.prompt(t)}catch(r){throw r.isTtyError,this.logger.error(r),r}}async action({label:t,task:r}){let u=r();u instanceof Promise||(u=Promise.resolve(u));let i=t;return this.ora(u,i),u}isPackageTemplate(t){return $D.includes(t)}async getGeneratorContext(){let t=Ot(this.subPackages,$D),r=await this.steps(t);if(this.isPackageTemplate(r.template)){let u=wt(this.subPackages),i=await this.steps(u);Object.assign(r,i)}return r.targetPath=(0,x.join)(process.cwd(),r.projectName),r.releasePath=r.releasePath||"src",r}async generate(){let t=await this.getGeneratorContext();if(this.logger.debug("context is:",t,this.context.options.templateRootPath),t.subPackages){await this.action({label:"Generate Directories(subPackages)",task:async()=>{await this.generateTemplateDir(t),await this.generateSubPackages(t),await this.generateConfigs(t,t.targetPath,"_common")}});return}await this.action({label:"Generate Directory",task:async()=>{await this.generateTemplateDir(t),await this.generateConfigs(t,t.targetPath,"_common"),await this.generateConfigs(t,t.targetPath,t.template)}})}async generateConfigs(t,r,u){let i=(a,l)=>(this.logger.debug("copyCallback",a,l),this.compose.composeConfigFile(t,a,l)),{configsRootPath:D,config:o}=this.context.options;if(!o){this.logger.debug("no copy config files");return}let s=(0,x.join)(D,u);if(!(0,bt.existsSync)(s)){this.logger.debug(`Config path not found: ${s}`);return}await this.copyer.copyPaths({sourcePath:s,targetPath:r,copyCallback:i})}generateTemplateDir(t){return this.copyer.copyPaths({sourcePath:(0,x.join)(this.context.options.templateRootPath,t.template),targetPath:t.targetPath})}async generateSubPackages(t){let{packagesNames:r="packages",subPackages:u=[],targetPath:i=""}=t,{templateRootPath:D}=this.context.options;for(let o of u){let s=(0,x.join)(D,o),a=(0,x.join)(i,r,o);this.logger.debug("copy sub package",s,a),await this.copyer.copyPaths({sourcePath:s,targetPath:a})}}};var At={name:"@qlover/create-app",version:"0.12.0",description:"Create a new app with a single command",private:!1,type:"module",files:["dist","package.json","README.md","CHANGELOG.md"],bin:{"create-app":"dist/index.js"},scripts:{lint:"eslint src --fix",build:"tsup","type-check":"tsc --noEmit","create:app":"node ./dist/index.js"},repository:{type:"git",url:"git+https://github.com/qlover/fe-base.git",directory:"packages/create-app"},homepage:"https://github.com/qlover/fe-base#readme",keywords:["create-app","fe-scripts","scripts"],author:"qlover",license:"ISC",publishConfig:{access:"public"},devDependencies:{"@qlover/logger":"workspace:*",ignore:"^7.0.3",lodash:"^4.17.21",ora:"^8.1.1"},dependencies:{"@qlover/scripts-context":"workspace:*",commander:"^13.1.0",inquirer:"^12.3.2"}};function Ul(){let e=new HD.Command;return e.version(At.version,"-v, --version","Show version").description(At.description).option("-d, --dry-run","Do not touch or write anything, but show the commands").option("-V, --verbose","Show more information").option("--config","Copy config files (default: true)",!0).option("--no-config","Do not copy config files"),e.parse(),e.opts()}async function YD(e=process.cwd()){let{dryRun:t,verbose:r,...u}=Ul(),i=(0,vt.resolve)(e,"./templates"),D=(0,vt.resolve)(e,"./configs");(0,xt.existsSync)(i)||(console.error("Template is empty!"),process.exit(1)),(0,xt.existsSync)(D)||(console.error("Configs is empty!"),process.exit(1)),await new ye({dryRun:t,verbose:r,options:{...u,templateRootPath:i,configsRootPath:D}}).generate()}YD(__dirname).catch(e=>{console.error(e),process.exit(1)});
+`).map(o=>o.trim()).filter(o=>o&&!o.startsWith("#"));return(0,cr.default)().add(D)}async copyFiles(t,r,u,i){let D=await A.promises.readdir(t);await Promise.all(D.map(async o=>{let s=(0,S.join)(t,o),a=(0,S.join)(r,o);if(u&&u.ignores(o))return;if(J.ensureDir((0,S.dirname)(a)),(await us(s)).isDirectory())await this.copyFiles(s,a,u,i);else{if(i&&await i(s,a))return;await rs(s,a)}}))}copyPaths({sourcePath:t,targetPath:r,copyCallback:u}){J.ensureDir(r);let i=this.getIg();return this.copyFiles(t,r,i,u)}};var k=require("fs"),kD=h(LD(),1),xe=class{constructor(){}isJSONFilePath(t){return t.endsWith(".json")||t.endsWith(".json.template")}isTemplateFilePath(t){return t.endsWith(".template")}getRealTemplateFilePath(t){return t.replace(".template","")}readFile(t){return(0,k.readFileSync)(t,"utf-8")}readJSONFile(t){return JSON.parse(this.readFile(t))}writeFile(t,r){(0,k.writeFileSync)(this.getRealTemplateFilePath(t),r,{encoding:"utf-8"})}replaceFile(t,r){let u=this.readFile(t);return Object.keys(r).forEach(i=>{let D=r[i];u=u.replace(new RegExp(`\\[TPL:${i}\\]`,"g"),typeof D=="string"?D:JSON.stringify(D))}),u}mergeJSONFile(t,r){let u=this.readJSONFile(t),i=(0,kD.default)(r,u);this.writeFile(t,JSON.stringify(i,null,2))}composeConfigFile(t,r,u){if(this.isTemplateFilePath(r)){let i=this.replaceFile(r,t);if(this.isJSONFilePath(r)&&this.isJSONFilePath(u)){let D=this.getRealTemplateFilePath(u);return(0,k.existsSync)(D)?(this.mergeJSONFile(D,JSON.parse(i)),!0):(this.writeFile(D,i),!0)}return this.writeFile(u,i),!0}return!1}};var $D=["pack-app"],ye=class{ora;context;subPackages;copyer;compose;constructor(t){let r=t.options?.templateRootPath;if(!r)throw new Error("template path not exit");if(!(0,bt.existsSync)(r))throw new Error("template path not exit");this.ora=rr,this.context=new UD.ScriptContext("create-app",t),this.subPackages=["node-lib","react-app","next-app"],this.copyer=new me((0,x.join)(this.context.options.configsRootPath,"_common")),this.compose=new xe}get logger(){return this.context.logger}async steps(t){try{return await WD.default.prompt(t)}catch(r){throw r.isTtyError,this.logger.error(r),r}}async action({label:t,task:r}){let u=r();u instanceof Promise||(u=Promise.resolve(u));let i=t;return this.ora(u,i),u}isPackageTemplate(t){return $D.includes(t)}async getGeneratorContext(){let t=Ot(this.subPackages,$D),r=await this.steps(t);if(this.isPackageTemplate(r.template)){let u=wt(this.subPackages),i=await this.steps(u);Object.assign(r,i)}return r.targetPath=(0,x.join)(process.cwd(),r.projectName),r.releasePath=r.releasePath||"src",r}async generate(){let t=await this.getGeneratorContext();if(this.logger.debug("context is:",t,this.context.options.templateRootPath),t.subPackages){await this.action({label:"Generate Directories(subPackages)",task:async()=>{await this.generateTemplateDir(t),await this.generateSubPackages(t),await this.generateConfigs(t,t.targetPath,"_common")}});return}await this.action({label:"Generate Directory",task:async()=>{await this.generateTemplateDir(t),await this.generateConfigs(t,t.targetPath,"_common"),await this.generateConfigs(t,t.targetPath,t.template)}})}async generateConfigs(t,r,u){let i=(a,l)=>(this.logger.debug("copyCallback",a,l),this.compose.composeConfigFile(t,a,l)),{configsRootPath:D,config:o}=this.context.options;if(!o){this.logger.debug("no copy config files");return}let s=(0,x.join)(D,u);if(!(0,bt.existsSync)(s)){this.logger.debug(`Config path not found: ${s}`);return}await this.copyer.copyPaths({sourcePath:s,targetPath:r,copyCallback:i})}generateTemplateDir(t){return this.copyer.copyPaths({sourcePath:(0,x.join)(this.context.options.templateRootPath,t.template),targetPath:t.targetPath})}async generateSubPackages(t){let{packagesNames:r="packages",subPackages:u=[],targetPath:i=""}=t,{templateRootPath:D}=this.context.options;for(let o of u){let s=(0,x.join)(D,o),a=(0,x.join)(i,r,o);this.logger.debug("copy sub package",s,a),await this.copyer.copyPaths({sourcePath:s,targetPath:a})}}};var At={name:"@qlover/create-app",version:"1.0.0",description:"Create a new app with a single command",private:!1,type:"module",files:["dist","package.json","README.md","CHANGELOG.md"],bin:{"create-app":"dist/index.js"},scripts:{lint:"eslint src --fix",build:"tsup","type-check":"tsc --noEmit","create:app":"node ./dist/index.js"},repository:{type:"git",url:"git+https://github.com/qlover/fe-base.git",directory:"packages/create-app"},homepage:"https://github.com/qlover/fe-base#readme",keywords:["create-app","fe-scripts","scripts"],author:"qlover",license:"ISC",publishConfig:{access:"public"},devDependencies:{"@qlover/logger":"workspace:*",ignore:"^7.0.3",lodash:"^4.17.21",ora:"^8.1.1"},dependencies:{"@qlover/scripts-context":"workspace:*",commander:"^13.1.0",inquirer:"^12.3.2"}};function Ul(){let e=new HD.Command;return e.version(At.version,"-v, --version","Show version").description(At.description).option("-d, --dry-run","Do not touch or write anything, but show the commands").option("-V, --verbose","Show more information").option("--config","Copy config files (default: true)",!0).option("--no-config","Do not copy config files"),e.parse(),e.opts()}async function YD(e=process.cwd()){let{dryRun:t,verbose:r,...u}=Ul(),i=(0,vt.resolve)(e,"./templates"),D=(0,vt.resolve)(e,"./configs");(0,xt.existsSync)(i)||(console.error("Template is empty!"),process.exit(1)),(0,xt.existsSync)(D)||(console.error("Configs is empty!"),process.exit(1)),await new ye({dryRun:t,verbose:r,options:{...u,templateRootPath:i,configsRootPath:D}}).generate()}YD(__dirname).catch(e=>{console.error(e),process.exit(1)});

package/dist/index.js

@@ -8,4 +8,4 @@ ${t}`,pD=Object.getOwnPropertyDescriptor(Function.prototype,"toString"),hD=Objec
 `))this.#e+=Math.max(1,Math.ceil(Le(n,{countAnsiEscapeCodes:!0})/t))}get isEnabled(){return this.#a&&!this.#F}set isEnabled(t){if(typeof t!="boolean")throw new TypeError("The `isEnabled` option must be a boolean");this.#a=t}get isSilent(){return this.#F}set isSilent(t){if(typeof t!="boolean")throw new TypeError("The `isSilent` option must be a boolean");this.#F=t}frame(){let t=Date.now();(this.#i===-1||t-this.#c>=this.interval)&&(this.#i=++this.#i%this.#n.frames.length,this.#c=t);let{frames:r}=this.#n,u=r[this.#i];this.color&&(u=E[this.color](u));let i=typeof this.#s=="string"&&this.#s!==""?this.#s+" ":"",n=typeof this.text=="string"?" "+this.text:"",o=typeof this.#o=="string"&&this.#o!==""?" "+this.#o:"";return i+u+n+o}clear(){if(!this.#a||!this.#u.isTTY)return this;this.#u.cursorTo(0);for(let t=0;t<this.#D;t++)t>0&&this.#u.moveCursor(0,-1),this.#u.clearLine(1);return(this.#l||this.lastIndent!==this.#l)&&this.#u.cursorTo(this.#l),this.lastIndent=this.#l,this.#D=0,this}render(){return this.#F?this:(this.clear(),this.#u.write(this.frame()),this.#D=this.#e,this)}start(t){return t&&(this.text=t),this.#F?this:this.#a?this.isSpinning?this:(this.#t.hideCursor&&je.hide(this.#u),this.#t.discardStdin&&ce.stdin.isTTY&&(this.#r=!0,We.start()),this.render(),this.#f=setInterval(this.render.bind(this),this.interval),this):(this.text&&this.#u.write(`- ${this.text}
 `),this)}stop(){return this.#a?(clearInterval(this.#f),this.#f=void 0,this.#i=0,this.clear(),this.#t.hideCursor&&je.show(this.#u),this.#t.discardStdin&&ce.stdin.isTTY&&this.#r&&(We.stop(),this.#r=!1),this):this}succeed(t){return this.stopAndPersist({symbol:k.success,text:t})}fail(t){return this.stopAndPersist({symbol:k.error,text:t})}warn(t){return this.stopAndPersist({symbol:k.warning,text:t})}info(t){return this.stopAndPersist({symbol:k.info,text:t})}stopAndPersist(t={}){if(this.#F)return this;let r=t.prefixText??this.#s,u=this.#E(r," "),i=t.symbol??" ",n=t.text??this.text,s=typeof n=="string"?(i?" ":"")+n:"",a=t.suffixText??this.#o,l=this.#g(a," "),p=u+i+s+l+`
 `;return this.stop(),this.#u.write(p),this}};function zt(e){return new He(e)}async function Kt(e,t){let r=typeof e=="function",u=typeof e.then=="function";if(!r&&!u)throw new TypeError("Parameter `action` must be a Function or a Promise");let{successText:i,failText:n}=typeof t=="object"?t:{successText:void 0,failText:void 0},o=zt(t).start();try{let a=await(r?e(o):e);return o.succeed(i===void 0?void 0:typeof i=="string"?i:i(a)),a}catch(s){throw o.fail(n===void 0?void 0:typeof n=="string"?n:n(s)),s}}import{existsSync as Nn}from"fs";var Dr=ue(ir(),1);import{dirname as QD,join as Ze}from"path";import{existsSync as es,readFileSync as ts,promises as nr}from"fs";import{existsSync as JD,mkdirSync as ZD}from"fs";var H=class{static ensureDir(t){JD(t)||ZD(t,{recursive:!0})}};var{copyFile:rs,stat:us}=nr,Ce=class e{constructor(t,r=e.IGNORE_FILE){this.ignoreTargetPath=t;this.ignoreFile=r}static IGNORE_FILE=".gitignore.template";getIg(t=this.ignoreTargetPath){let r=Ze(t,this.ignoreFile);if(!es(r))return;let n=ts(r,"utf8").split(`
-`).map(o=>o.trim()).filter(o=>o&&!o.startsWith("#"));return(0,Dr.default)().add(n)}async copyFiles(t,r,u,i){let n=await nr.readdir(t);await Promise.all(n.map(async o=>{let s=Ze(t,o),a=Ze(r,o);if(u&&u.ignores(o))return;if(H.ensureDir(QD(a)),(await us(s)).isDirectory())await this.copyFiles(s,a,u,i);else{if(i&&await i(s,a))return;await rs(s,a)}}))}copyPaths({sourcePath:t,targetPath:r,copyCallback:u}){H.ensureDir(r);let i=this.getIg();return this.copyFiles(t,r,i,u)}};var jn=ue(In(),1);import{readFileSync as $l,writeFileSync as Ul,existsSync as Wl}from"fs";var _e=class{constructor(){}isJSONFilePath(t){return t.endsWith(".json")||t.endsWith(".json.template")}isTemplateFilePath(t){return t.endsWith(".template")}getRealTemplateFilePath(t){return t.replace(".template","")}readFile(t){return $l(t,"utf-8")}readJSONFile(t){return JSON.parse(this.readFile(t))}writeFile(t,r){Ul(this.getRealTemplateFilePath(t),r,{encoding:"utf-8"})}replaceFile(t,r){let u=this.readFile(t);return Object.keys(r).forEach(i=>{let n=r[i];u=u.replace(new RegExp(`\\[TPL:${i}\\]`,"g"),typeof n=="string"?n:JSON.stringify(n))}),u}mergeJSONFile(t,r){let u=this.readJSONFile(t),i=(0,jn.default)(r,u);this.writeFile(t,JSON.stringify(i,null,2))}composeConfigFile(t,r,u){if(this.isTemplateFilePath(r)){let i=this.replaceFile(r,t);if(this.isJSONFilePath(r)&&this.isJSONFilePath(u)){let n=this.getRealTemplateFilePath(u);return Wl(n)?(this.mergeJSONFile(n,JSON.parse(i)),!0):(this.writeFile(n,i),!0)}return this.writeFile(u,i),!0}return!1}};var Gn=["pack-app"],Be=class{ora;context;subPackages;copyer;compose;constructor(t){let r=t.options?.templateRootPath;if(!r)throw new Error("template path not exit");if(!Nn(r))throw new Error("template path not exit");this.ora=Kt,this.context=new Hl("create-app",t),this.subPackages=["node-lib","react-app","next-app"],this.copyer=new Ce(N(this.context.options.configsRootPath,"_common")),this.compose=new _e}get logger(){return this.context.logger}async steps(t){try{return await Yl.prompt(t)}catch(r){throw r.isTtyError,this.logger.error(r),r}}async action({label:t,task:r}){let u=r();u instanceof Promise||(u=Promise.resolve(u));let i=t;return this.ora(u,i),u}isPackageTemplate(t){return Gn.includes(t)}async getGeneratorContext(){let t=mt(this.subPackages,Gn),r=await this.steps(t);if(this.isPackageTemplate(r.template)){let u=_t(this.subPackages),i=await this.steps(u);Object.assign(r,i)}return r.targetPath=N(process.cwd(),r.projectName),r.releasePath=r.releasePath||"src",r}async generate(){let t=await this.getGeneratorContext();if(this.logger.debug("context is:",t,this.context.options.templateRootPath),t.subPackages){await this.action({label:"Generate Directories(subPackages)",task:async()=>{await this.generateTemplateDir(t),await this.generateSubPackages(t),await this.generateConfigs(t,t.targetPath,"_common")}});return}await this.action({label:"Generate Directory",task:async()=>{await this.generateTemplateDir(t),await this.generateConfigs(t,t.targetPath,"_common"),await this.generateConfigs(t,t.targetPath,t.template)}})}async generateConfigs(t,r,u){let i=(a,l)=>(this.logger.debug("copyCallback",a,l),this.compose.composeConfigFile(t,a,l)),{configsRootPath:n,config:o}=this.context.options;if(!o){this.logger.debug("no copy config files");return}let s=N(n,u);if(!Nn(s)){this.logger.debug(`Config path not found: ${s}`);return}await this.copyer.copyPaths({sourcePath:s,targetPath:r,copyCallback:i})}generateTemplateDir(t){return this.copyer.copyPaths({sourcePath:N(this.context.options.templateRootPath,t.template),targetPath:t.targetPath})}async generateSubPackages(t){let{packagesNames:r="packages",subPackages:u=[],targetPath:i=""}=t,{templateRootPath:n}=this.context.options;for(let o of u){let s=N(n,o),a=N(i,r,o);this.logger.debug("copy sub package",s,a),await this.copyer.copyPaths({sourcePath:s,targetPath:a})}}};var Et={name:"@qlover/create-app",version:"0.12.0",description:"Create a new app with a single command",private:!1,type:"module",files:["dist","package.json","README.md","CHANGELOG.md"],bin:{"create-app":"dist/index.js"},scripts:{lint:"eslint src --fix",build:"tsup","type-check":"tsc --noEmit","create:app":"node ./dist/index.js"},repository:{type:"git",url:"git+https://github.com/qlover/fe-base.git",directory:"packages/create-app"},homepage:"https://github.com/qlover/fe-base#readme",keywords:["create-app","fe-scripts","scripts"],author:"qlover",license:"ISC",publishConfig:{access:"public"},devDependencies:{"@qlover/logger":"workspace:*",ignore:"^7.0.3",lodash:"^4.17.21",ora:"^8.1.1"},dependencies:{"@qlover/scripts-context":"workspace:*",commander:"^13.1.0",inquirer:"^12.3.2"}};function Kl(){let e=new zl;return e.version(Et.version,"-v, --version","Show version").description(Et.description).option("-d, --dry-run","Do not touch or write anything, but show the commands").option("-V, --verbose","Show more information").option("--config","Copy config files (default: true)",!0).option("--no-config","Do not copy config files"),e.parse(),e.opts()}async function kn(e=process.cwd()){let{dryRun:t,verbose:r,...u}=Kl(),i=Mn(e,"./templates"),n=Mn(e,"./configs");Ln(i)||(console.error("Template is empty!"),process.exit(1)),Ln(n)||(console.error("Configs is empty!"),process.exit(1)),await new Be({dryRun:t,verbose:r,options:{...u,templateRootPath:i,configsRootPath:n}}).generate()}import{fileURLToPath as Xl}from"url";import{dirname as Jl}from"path";var Zl=Xl(import.meta.url),Ql=Jl(Zl);kn(Ql).catch(e=>{console.error(e),process.exit(1)});
+`).map(o=>o.trim()).filter(o=>o&&!o.startsWith("#"));return(0,Dr.default)().add(n)}async copyFiles(t,r,u,i){let n=await nr.readdir(t);await Promise.all(n.map(async o=>{let s=Ze(t,o),a=Ze(r,o);if(u&&u.ignores(o))return;if(H.ensureDir(QD(a)),(await us(s)).isDirectory())await this.copyFiles(s,a,u,i);else{if(i&&await i(s,a))return;await rs(s,a)}}))}copyPaths({sourcePath:t,targetPath:r,copyCallback:u}){H.ensureDir(r);let i=this.getIg();return this.copyFiles(t,r,i,u)}};var jn=ue(In(),1);import{readFileSync as $l,writeFileSync as Ul,existsSync as Wl}from"fs";var _e=class{constructor(){}isJSONFilePath(t){return t.endsWith(".json")||t.endsWith(".json.template")}isTemplateFilePath(t){return t.endsWith(".template")}getRealTemplateFilePath(t){return t.replace(".template","")}readFile(t){return $l(t,"utf-8")}readJSONFile(t){return JSON.parse(this.readFile(t))}writeFile(t,r){Ul(this.getRealTemplateFilePath(t),r,{encoding:"utf-8"})}replaceFile(t,r){let u=this.readFile(t);return Object.keys(r).forEach(i=>{let n=r[i];u=u.replace(new RegExp(`\\[TPL:${i}\\]`,"g"),typeof n=="string"?n:JSON.stringify(n))}),u}mergeJSONFile(t,r){let u=this.readJSONFile(t),i=(0,jn.default)(r,u);this.writeFile(t,JSON.stringify(i,null,2))}composeConfigFile(t,r,u){if(this.isTemplateFilePath(r)){let i=this.replaceFile(r,t);if(this.isJSONFilePath(r)&&this.isJSONFilePath(u)){let n=this.getRealTemplateFilePath(u);return Wl(n)?(this.mergeJSONFile(n,JSON.parse(i)),!0):(this.writeFile(n,i),!0)}return this.writeFile(u,i),!0}return!1}};var Gn=["pack-app"],Be=class{ora;context;subPackages;copyer;compose;constructor(t){let r=t.options?.templateRootPath;if(!r)throw new Error("template path not exit");if(!Nn(r))throw new Error("template path not exit");this.ora=Kt,this.context=new Hl("create-app",t),this.subPackages=["node-lib","react-app","next-app"],this.copyer=new Ce(N(this.context.options.configsRootPath,"_common")),this.compose=new _e}get logger(){return this.context.logger}async steps(t){try{return await Yl.prompt(t)}catch(r){throw r.isTtyError,this.logger.error(r),r}}async action({label:t,task:r}){let u=r();u instanceof Promise||(u=Promise.resolve(u));let i=t;return this.ora(u,i),u}isPackageTemplate(t){return Gn.includes(t)}async getGeneratorContext(){let t=mt(this.subPackages,Gn),r=await this.steps(t);if(this.isPackageTemplate(r.template)){let u=_t(this.subPackages),i=await this.steps(u);Object.assign(r,i)}return r.targetPath=N(process.cwd(),r.projectName),r.releasePath=r.releasePath||"src",r}async generate(){let t=await this.getGeneratorContext();if(this.logger.debug("context is:",t,this.context.options.templateRootPath),t.subPackages){await this.action({label:"Generate Directories(subPackages)",task:async()=>{await this.generateTemplateDir(t),await this.generateSubPackages(t),await this.generateConfigs(t,t.targetPath,"_common")}});return}await this.action({label:"Generate Directory",task:async()=>{await this.generateTemplateDir(t),await this.generateConfigs(t,t.targetPath,"_common"),await this.generateConfigs(t,t.targetPath,t.template)}})}async generateConfigs(t,r,u){let i=(a,l)=>(this.logger.debug("copyCallback",a,l),this.compose.composeConfigFile(t,a,l)),{configsRootPath:n,config:o}=this.context.options;if(!o){this.logger.debug("no copy config files");return}let s=N(n,u);if(!Nn(s)){this.logger.debug(`Config path not found: ${s}`);return}await this.copyer.copyPaths({sourcePath:s,targetPath:r,copyCallback:i})}generateTemplateDir(t){return this.copyer.copyPaths({sourcePath:N(this.context.options.templateRootPath,t.template),targetPath:t.targetPath})}async generateSubPackages(t){let{packagesNames:r="packages",subPackages:u=[],targetPath:i=""}=t,{templateRootPath:n}=this.context.options;for(let o of u){let s=N(n,o),a=N(i,r,o);this.logger.debug("copy sub package",s,a),await this.copyer.copyPaths({sourcePath:s,targetPath:a})}}};var Et={name:"@qlover/create-app",version:"1.0.0",description:"Create a new app with a single command",private:!1,type:"module",files:["dist","package.json","README.md","CHANGELOG.md"],bin:{"create-app":"dist/index.js"},scripts:{lint:"eslint src --fix",build:"tsup","type-check":"tsc --noEmit","create:app":"node ./dist/index.js"},repository:{type:"git",url:"git+https://github.com/qlover/fe-base.git",directory:"packages/create-app"},homepage:"https://github.com/qlover/fe-base#readme",keywords:["create-app","fe-scripts","scripts"],author:"qlover",license:"ISC",publishConfig:{access:"public"},devDependencies:{"@qlover/logger":"workspace:*",ignore:"^7.0.3",lodash:"^4.17.21",ora:"^8.1.1"},dependencies:{"@qlover/scripts-context":"workspace:*",commander:"^13.1.0",inquirer:"^12.3.2"}};function Kl(){let e=new zl;return e.version(Et.version,"-v, --version","Show version").description(Et.description).option("-d, --dry-run","Do not touch or write anything, but show the commands").option("-V, --verbose","Show more information").option("--config","Copy config files (default: true)",!0).option("--no-config","Do not copy config files"),e.parse(),e.opts()}async function kn(e=process.cwd()){let{dryRun:t,verbose:r,...u}=Kl(),i=Mn(e,"./templates"),n=Mn(e,"./configs");Ln(i)||(console.error("Template is empty!"),process.exit(1)),Ln(n)||(console.error("Configs is empty!"),process.exit(1)),await new Be({dryRun:t,verbose:r,options:{...u,templateRootPath:i,configsRootPath:n}}).generate()}import{fileURLToPath as Xl}from"url";import{dirname as Jl}from"path";var Zl=Xl(import.meta.url),Ql=Jl(Zl);kn(Ql).catch(e=>{console.error(e),process.exit(1)});

package/dist/templates/next-app/next.config.ts

@@ -11,9 +11,10 @@ generateLocales().catch((error) => {
 
 const nextConfig: NextConfig = {
   // reactStrictMode: false,
-  turbopack: {
-    root: __dirname // 明确指定根目录
-  },
+  // turbopack 在接下本地 file: 依赖时支持还不够好
+  // turbopack: {
+  //   root: __dirname // 明确指定根目录
+  // },
   transpilePackages: ['@qlover/corekit-bridge', '@qlover/fe-corekit'],
   env: {
     APP_ENV: process.env.APP_ENV

package/dist/templates/next-app/package.json

@@ -3,18 +3,20 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "cross-env APP_ENV=localhost next dev --turbopack --port 3100",
-    "dev:staging": "cross-env APP_ENV=staging next dev --turbopack --port 3100",
-    "dev:prod": "cross-env APP_ENV=production next dev --turbopack --port 3100",
-    "build": "cross-env APP_ENV=localhost next build --turbopack",
-    "build:staging": "cross-env APP_ENV=staging next build --turbopack",
-    "build:prod": "cross-env APP_ENV=production next build --turbopack",
+    "dev": "cross-env APP_ENV=localhost next dev --port 3100",
+    "dev:staging": "cross-env APP_ENV=staging next dev --port 3100",
+    "dev:prod": "cross-env APP_ENV=production next dev --port 3100",
+    "dev:turbo": "cross-env APP_ENV=localhost next dev --turbopack --port 3100",
+    "build": "cross-env APP_ENV=localhost next build",
+    "build:staging": "cross-env APP_ENV=staging next build",
+    "build:prod": "cross-env APP_ENV=production next build",
     "start": "next start --port 3101",
-    "lint": "tsc --noEmit && eslint ./src ./config ./make ./migrations",
-    "lint:fix": "tsc --noEmit && eslint ./src ./config ./make ./migrations --ext .ts,.tsx --fix",
+    "lint": "npm run type-check && eslint ./src ./config ./make ./migrations",
+    "lint:fix": "npm run type-check && eslint ./src ./config ./make ./migrations --ext .ts,.tsx --fix",
     "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
     "format:check": "prettier --check \"**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
-    "fix": "npm run lint:fix && npm run format"
+    "fix": "npm run lint:fix && npm run format",
+    "type-check": "tsc --build --force"
   },
   "dependencies": {
     "@ant-design/icons": "^6.0.0",
@@ -24,8 +26,9 @@
     "@brain-toolkit/antd-theme-override": "^0.0.3",
     "@brain-toolkit/bridge": "^0.0.1",
     "@brain-toolkit/react-kit": "^0.1.0",
-    "@qlover/corekit-bridge": "latest",
-    "@qlover/fe-corekit": "latest",
+    "@qlover/corekit-bridge": "../../../corekit-bridge",
+    "@qlover/fe-corekit": "../../../fe-corekit",
+    "@qlover/logger": "../../../logger",
     "@qlover/slice-store-react": "^1.4.1",
     "@supabase/postgrest-js": "^2.87.1",
     "@supabase/ssr": "^0.7.0",

package/dist/templates/next-app/src/app/[locale]/login/LoginForm.tsx

@@ -19,7 +19,6 @@ export function LoginForm(props: { tt: LoginI18nInterface }) {
   const { tt } = props;
   const t = useWarnTranslations();
   const userService = useIOC(I.UserServiceInterface);
-  const logger = useIOC(I.Logger);
   const appConfig = useIOC(I.AppConfig);
   const routerService = useIOC(I.RouterServiceInterface);
   const [loading, setLoading] = useState(false);
@@ -29,8 +28,8 @@ export function LoginForm(props: { tt: LoginI18nInterface }) {
       setLoading(true);
       await userService.login(values);
       routerService.replaceHome();
-    } catch (error) {
-      logger.error(error);
+    } catch {
+      // do nothing
     } finally {
       setLoading(false);
     }

package/dist/templates/next-app/src/base/cases/DialogErrorPlugin.ts

@@ -1,7 +1,7 @@
 import {
+  ExecutorContextInterface,
   ExecutorError,
-  type ExecutorContext,
-  type ExecutorPlugin
+  LifecyclePluginInterface
 } from '@qlover/fe-corekit';
 import { inject, injectable } from 'inversify';
 import { i18nKeySchema } from '@config/i18n/i18nKeyScheam';
@@ -13,7 +13,9 @@ import type { I18nServiceInterface } from '../port/I18nServiceInterface';
 import type { UIDialogInterface } from '@qlover/corekit-bridge';
 
 @injectable()
-export class DialogErrorPlugin implements ExecutorPlugin {
+export class DialogErrorPlugin
+  implements LifecyclePluginInterface<ExecutorContextInterface<unknown>>
+{
   public readonly pluginName = 'DialogErrorPlugin';
 
   constructor(
@@ -27,7 +29,7 @@ export class DialogErrorPlugin implements ExecutorPlugin {
   /**
    * @override
    */
-  public onError(context: ExecutorContext<unknown>): void | Promise<void> {
+  public onError(context: ExecutorContextInterface<unknown>): void {
     const { error, hooksRuntimes } = context;
     const runtimesError = hooksRuntimes.returnValue;
 

package/dist/templates/next-app/src/base/cases/RequestEncryptPlugin.ts

@@ -1,14 +1,13 @@
 import { clone, isObject } from 'lodash';
 import type {
-  Encryptor,
-  ExecutorContext,
-  ExecutorPlugin,
-  RequestAdapterConfig
+  ExecutorContextInterface,
+  LifecyclePluginInterface,
+  RequestAdapterConfig,
+  EncryptorInterface
 } from '@qlover/fe-corekit';
 
-export interface RequestEncryptPluginProps<
-  Request = unknown
-> extends RequestAdapterConfig<Request> {
+export interface RequestEncryptPluginProps<Request = unknown>
+  extends RequestAdapterConfig<Request> {
   /**
    * 加密密码在 HTTP 请求中
    *
@@ -19,16 +18,21 @@ export interface RequestEncryptPluginProps<
   encryptProps?: string[] | string;
 }
 
-export class RequestEncryptPlugin implements ExecutorPlugin<RequestEncryptPluginProps> {
+export class RequestEncryptPlugin
+  implements
+    LifecyclePluginInterface<
+      ExecutorContextInterface<RequestEncryptPluginProps>
+    >
+{
   public readonly pluginName = 'RequestEncryptPlugin';
 
-  constructor(protected encryptor: Encryptor<string, string>) {}
+  constructor(protected encryptor: EncryptorInterface<string, string>) {}
 
   /**
    * @override
    */
   public onBefore(
-    context: ExecutorContext<RequestEncryptPluginProps>
+    context: ExecutorContextInterface<RequestEncryptPluginProps>
   ): void | Promise<void> {
     const { responseType, encryptProps } = context.parameters;
 

package/dist/templates/next-app/src/base/cases/StringEncryptor.ts

@@ -1,10 +1,10 @@
-import { Base64Serializer, type Encryptor } from '@qlover/fe-corekit';
+import { Base64Serializer, type EncryptorInterface } from '@qlover/fe-corekit';
 import { inject, injectable } from 'inversify';
 import { I } from '@config/IOCIdentifier';
 import type { AppConfig } from './AppConfig';
 
 @injectable()
-export class StringEncryptor implements Encryptor<string, string> {
+export class StringEncryptor implements EncryptorInterface<string, string> {
   private readonly key;
 
   constructor(

package/dist/templates/next-app/src/base/port/I18nServiceInterface.ts

@@ -13,10 +13,7 @@ export class I18nServiceState implements StoreStateInterface {
   public loading: boolean = false;
   constructor(public language: I18nServiceLocale) {}
 }
-export abstract class I18nServiceInterface
-  extends StoreInterface<I18nServiceState>
-  implements I18nServiceInterface
-{
+export abstract class I18nServiceInterface extends StoreInterface<I18nServiceState> {
   /**
    * @override
    */

package/dist/templates/next-app/src/base/services/I18nService.ts

@@ -5,10 +5,14 @@ import {
 } from '../port/I18nServiceInterface';
 import type { I18nServiceLocale } from '../port/I18nServiceInterface';
 import type { useTranslations } from 'next-intl';
+import { BootstrapExecutorPlugin } from '@qlover/corekit-bridge';
 
 type TranslationFunction = ReturnType<typeof useTranslations>;
 
-export class I18nService extends I18nServiceInterface {
+export class I18nService
+  extends I18nServiceInterface
+  implements BootstrapExecutorPlugin
+{
   public readonly pluginName = 'I18nService';
   protected pathname: string = '';
   protected translator: TranslationFunction | null = null;
@@ -34,7 +38,7 @@ export class I18nService extends I18nServiceInterface {
   /**
    * @override
    */
-  public async onBefore(): Promise<void> {}
+  public onBefore(): void {}
 
   public override async changeLanguage(
     language: I18nServiceLocale

package/dist/templates/next-app/src/base/services/adminApi/AdminApiRequester.ts

@@ -1,16 +1,20 @@
 import {
-  FetchAbortPlugin,
+  ExecutorContextInterface,
   RequestAdapterFetch,
-  RequestTransaction
+  RequestExecutor
 } from '@qlover/fe-corekit';
-import { inject, injectable } from 'inversify';
+import { injectable } from 'inversify';
 import type { AppApiConfig } from '../appApi/AppApiRequester';
 
+export interface AdminApiRequesterContext
+  extends ExecutorContextInterface<AppApiConfig> {}
+
 @injectable()
-export class AdminApiRequester extends RequestTransaction<AppApiConfig> {
-  constructor(
-    @inject(FetchAbortPlugin) protected abortPlugin: FetchAbortPlugin
-  ) {
+export class AdminApiRequester extends RequestExecutor<
+  AppApiConfig,
+  AdminApiRequesterContext
+> {
+  constructor() {
     super(
       new RequestAdapterFetch({
         baseURL: '/api/admin',

package/dist/templates/next-app/src/base/services/adminApi/AdminLocalesApi.ts

@@ -8,7 +8,8 @@ import {
   type AppApiTransaction
 } from '../appApi/AppApiRequester';
 import type { ResourceInterface, ResourceQuery } from '@qlover/corekit-bridge';
-import type { RequestTransaction } from '@qlover/fe-corekit';
+import { RequestExecutor } from '@qlover/fe-corekit';
+import { AdminApiRequesterContext } from './AdminApiRequester';
 
 export type AdminLocalesListTransaction = AppApiTransaction<
   ResourceQuery,
@@ -24,17 +25,17 @@ export type AdminLocalesUpdateTransaction = AppApiTransaction<
 export class AdminLocalesApi implements ResourceInterface<LocalesSchema> {
   constructor(
     @inject(AppApiRequester)
-    protected client: RequestTransaction<AppApiConfig>
+    protected client: RequestExecutor<AppApiConfig, AdminApiRequesterContext>
   ) {}
 
   /**
    * @override
    */
   public create(data: LocalesSchema): Promise<unknown> {
-    return this.client.request<AdminLocalesListTransaction>({
+    return this.client.request({
       url: '/admin/locales/create',
       method: 'POST',
-      data: data as unknown as Record<string, unknown>
+      data: data
     });
   }
 
@@ -42,10 +43,10 @@ export class AdminLocalesApi implements ResourceInterface<LocalesSchema> {
    * @override
    */
   public remove(data: Partial<LocalesSchema>): Promise<unknown> {
-    return this.client.request<AdminLocalesListTransaction>({
+    return this.client.request({
       url: '/admin/locales',
       method: 'DELETE',
-      data: data as unknown as Record<string, unknown>
+      data
     });
   }
 
@@ -55,7 +56,7 @@ export class AdminLocalesApi implements ResourceInterface<LocalesSchema> {
   public search(
     params: ResourceQuery
   ): Promise<AdminLocalesListTransaction['response']> {
-    return this.client.request<AdminLocalesListTransaction>({
+    return this.client.request({
       url: '/admin/locales',
       method: 'GET',
       params: params as unknown as Record<string, unknown>
@@ -66,10 +67,10 @@ export class AdminLocalesApi implements ResourceInterface<LocalesSchema> {
    * @override
    */
   public export(data: LocalesSchema): Promise<unknown> {
-    return this.client.request<AdminLocalesListTransaction>({
+    return this.client.request({
       url: '/admin/locales',
       method: 'GET',
-      data: data as unknown as Record<string, unknown>
+      data
     });
   }
 
@@ -79,7 +80,7 @@ export class AdminLocalesApi implements ResourceInterface<LocalesSchema> {
   public update(
     data: Partial<LocalesSchema>
   ): Promise<AdminLocalesUpdateTransaction['response']> {
-    return this.client.request<AdminLocalesUpdateTransaction>({
+    return this.client.request({
       url: `/admin/locales/update`,
       method: 'POST',
       data

package/dist/templates/next-app/src/base/services/adminApi/AdminUserApi.ts

@@ -7,7 +7,8 @@ import {
   type AppApiTransaction
 } from '../appApi/AppApiRequester';
 import type { ResourceInterface, ResourceQuery } from '@qlover/corekit-bridge';
-import type { RequestTransaction } from '@qlover/fe-corekit';
+import { RequestExecutor } from '@qlover/fe-corekit';
+import { AdminApiRequesterContext } from './AdminApiRequester';
 
 export type AdminUserListTransaction = AppApiTransaction<
   ResourceQuery,
@@ -18,7 +19,7 @@ export type AdminUserListTransaction = AppApiTransaction<
 export class AdminUserApi implements ResourceInterface<UserSchema> {
   constructor(
     @inject(AppApiRequester)
-    protected client: RequestTransaction<AppApiConfig>
+    protected client: RequestExecutor<AppApiConfig, AdminApiRequesterContext>
   ) {}
 
   /**
@@ -27,10 +28,13 @@ export class AdminUserApi implements ResourceInterface<UserSchema> {
   public async search(
     params: AdminUserListTransaction['request']
   ): Promise<AdminUserListTransaction['response']> {
-    const response = await this.client.request<AdminUserListTransaction>({
+    const response = await this.client.request<
+      AdminUserListTransaction['response'],
+      AdminUserListTransaction['request']
+    >({
       url: '/admin/users',
       method: 'GET',
-      params: params as unknown as Record<string, unknown>
+      params
     });
 
     return response;
@@ -40,10 +44,10 @@ export class AdminUserApi implements ResourceInterface<UserSchema> {
    * @override
    */
   public create(data: UserSchema): Promise<unknown> {
-    return this.client.request<AdminUserListTransaction>({
+    return this.client.request({
       url: '/admin/users',
       method: 'POST',
-      data: data as unknown as Record<string, unknown>
+      data
     });
   }
 
@@ -51,10 +55,10 @@ export class AdminUserApi implements ResourceInterface<UserSchema> {
    * @override
    */
   public remove(data: UserSchema): Promise<unknown> {
-    return this.client.request<AdminUserListTransaction>({
+    return this.client.request({
       url: '/admin/users',
       method: 'DELETE',
-      data: data as unknown as Record<string, unknown>
+      data
     });
   }
 
@@ -62,10 +66,10 @@ export class AdminUserApi implements ResourceInterface<UserSchema> {
    * @override
    */
   public update(data: UserSchema): Promise<unknown> {
-    return this.client.request<AdminUserListTransaction>({
+    return this.client.request({
       url: '/admin/users',
       method: 'PUT',
-      data: data as unknown as Record<string, unknown>
+      data
     });
   }
 
@@ -73,10 +77,10 @@ export class AdminUserApi implements ResourceInterface<UserSchema> {
    * @override
    */
   public export(data: UserSchema): Promise<unknown> {
-    return this.client.request<AdminUserListTransaction>({
+    return this.client.request({
       url: '/admin/users',
       method: 'GET',
-      data: data as unknown as Record<string, unknown>
+      data
     });
   }
 }

package/dist/templates/next-app/src/base/services/appApi/AppApiPlugin.ts

@@ -1,14 +1,16 @@
 import {
+  ExecutorContextInterface,
   ExecutorError,
-  RequestError,
-  type ExecutorContext,
-  type ExecutorPlugin
+  isRequestAdapterResponse,
+  LifecyclePluginInterface
 } from '@qlover/fe-corekit';
 import type { AppApiErrorInterface } from '@/base/port/AppApiInterface';
 import type { AppApiConfig } from './AppApiRequester';
 import type { LoggerInterface } from '@qlover/logger';
 
-export class AppApiPlugin implements ExecutorPlugin {
+export class AppApiPlugin implements LifecyclePluginInterface<
+  ExecutorContextInterface<AppApiConfig>
+> {
   public readonly pluginName = 'AppApiPlugin';
 
   constructor(protected logger: LoggerInterface) {}
@@ -30,48 +32,46 @@ export class AppApiPlugin implements ExecutorPlugin {
   /**
    * @override
    */
-  public onSuccess(
-    context: ExecutorContext<AppApiConfig>
-  ): void | Promise<void> {
+  public onSuccess(context: ExecutorContextInterface<AppApiConfig>): void {
     const response = context.returnValue;
     const { parameters } = context;
 
+    // Important: 当响应数据失败则抛出错误
+    if (isRequestAdapterResponse(response)) {
+      if (this.isAppApiErrorInterface(response.data)) {
+        throw new ExecutorError(response.data.message || response.data.id, response);
+      }
+    }
+
     this.logger.info(
       `%c[AppApi ${parameters.method} ${parameters.url}]%c - ${new Date().toLocaleString()}`,
       'color: #0f0;',
       'color: inherit;',
       response
     );
-
-    if (this.isAppApiErrorInterface(response)) {
-      throw new Error(response.message || response.id);
-    }
   }
 
   /**
    * @override
    */
   public async onError(
-    context: ExecutorContext<AppApiConfig>
+    context: ExecutorContextInterface<AppApiConfig>
   ): Promise<ExecutorError | void> {
     const { error, parameters } = context;
 
     this.loggerError(parameters, error);
 
-    if (error instanceof RequestError && parameters.responseType === 'json') {
-      // @ts-expect-error response is not defined in Error
-      let response = error?.response;
+    if (error instanceof Error && parameters.responseType === 'json') {
+      let response = error?.cause;
 
       if (response instanceof Response) {
         // clone the response to avoid mutating the original response
         response = response.clone();
 
-        const json = await this.getResponseJson(response);
+        const json = await this.getResponseJson(response as Response);
 
         if (this.isAppApiErrorInterface(json)) {
-          const newError = new ExecutorError(json.id, json.message);
-          // context.error = newError;
-          return newError;
+          return new ExecutorError(json.id, json);
         }
       }
     }

package/dist/templates/next-app/src/base/services/appApi/AppApiRequester.ts

@@ -1,19 +1,24 @@
-import {
-  FetchAbortPlugin,
-  RequestAdapterFetch,
-  RequestTransaction
-} from '@qlover/fe-corekit';
-import { inject, injectable } from 'inversify';
+import { LifecycleExecutor, RequestAdapterFetch, RequestExecutor } from '@qlover/fe-corekit';
+import { injectable } from 'inversify';
 import type { RequestEncryptPluginProps } from '@/base/cases/RequestEncryptPlugin';
 import type { AppApiResult } from '@/base/port/AppApiInterface';
 import type {
+  ExecutorContextInterface,
   RequestAdapterConfig,
-  RequestAdapterResponse,
-  RequestTransactionInterface
+  RequestAdapterResponse
 } from '@qlover/fe-corekit';
 
+export interface RequestTransactionInterface<Request, Response> {
+  request: Request;
+  response: Response;
+}
+
 export interface AppApiConfig<Request = unknown>
-  extends RequestAdapterConfig<Request>, RequestEncryptPluginProps<Request> {}
+  extends RequestAdapterConfig<Request>,
+    RequestEncryptPluginProps<Request> {}
+
+export interface AppApiRequesterContext
+  extends ExecutorContextInterface<AppApiConfig> {}
 
 /**
  * UserApiResponse
@@ -32,26 +37,26 @@ export type AppApiResponse<
 /**
  * UserApi common transaction
  */
-export interface AppApiTransaction<
-  Request = unknown,
-  Response = unknown
-> extends RequestTransactionInterface<
-  AppApiConfig<Request>,
-  AppApiResponse<Request, Response>
-> {
+export interface AppApiTransaction<Request = unknown, Response = unknown>
+  extends RequestTransactionInterface<
+    AppApiConfig<Request>,
+    AppApiResponse<Request, Response>
+  > {
   data: AppApiConfig<Request>['data'];
 }
 
 @injectable()
-export class AppApiRequester extends RequestTransaction<AppApiConfig> {
-  constructor(
-    @inject(FetchAbortPlugin) protected abortPlugin: FetchAbortPlugin
-  ) {
+export class AppApiRequester extends RequestExecutor<
+  AppApiConfig,
+  AppApiRequesterContext
+> {
+  constructor() {
     super(
       new RequestAdapterFetch({
         baseURL: '/api',
         responseType: 'json'
-      })
+      }),
+      new LifecycleExecutor()
     );
   }
 }