@qlover/create-app 0.4.6 → 0.6.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @qlover/create-app
 
+## 0.6.0
+
+### Minor Changes
+
+#### 🐞 Bug Fixes
+
+- **react-app:** update package dependencies and refactor UserApi and UserService ([35e58e4](https://github.com/qlover/fe-base/commit/35e58e4e618082b5dee16351d7d78bbd54ca9e83)) ([#460](https://github.com/qlover/fe-base/pull/460))
+  - Changed dependencies in package.json to use the latest versions of @qlover/corekit-bridge and @qlover/fe-corekit for improved stability.
+  - Refactored UserApi to utilize UserAuthState for better state management and type safety.
+  - Updated UserService to align with the new UserApi structure, enhancing type definitions and simplifying state handling.
+  - Removed outdated comments and streamlined the code for better readability and maintainability.
+
+  These changes aim to enhance the overall functionality and reliability of the user authentication system within the react-app template.
+
+## 0.5.0
+
+### Minor Changes
+
+#### ✨ Features
+
+- **react-app:** enhance user authentication and error handling ([ee00e24](https://github.com/qlover/fe-base/commit/ee00e24ce1c713aff91100ff30f9c84d8b523c80)) ([#458](https://github.com/qlover/fe-base/pull/458))
+  - Updated package.json to reference local corekit dependencies for improved development.
+  - Added new error identifiers in common.error.ts for better error management.
+  - Refactored UserApi to implement registration and improved login handling with token validation.
+  - Introduced common error handling in UserService and updated related components to utilize new error identifiers.
+  - Enhanced storage management by integrating new storage interfaces and updating related services.
+
+  These changes aim to streamline user authentication processes and improve error reporting across the application.
+
 ## 0.4.6
 
 ### Patch 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&&V.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&&V.default.stdin.isTTY&&this.#r&&(Je.stop(),this.#r=!1),this):this}succeed(t){return this.stopAndPersist({symbol:H.success,text:t})}fail(t){return this.stopAndPersist({symbol:H.error,text:t})}warn(t){return this.stopAndPersist({symbol:H.warning,text:t})}info(t){return this.stopAndPersist({symbol:H.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,f=this.#g(a," "),p=u+i+s+f+`
 `;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 HD=require("fs");var P=require("path"),me=require("fs"),cr=h(lr(),1),Dt=require("fs");var de=require("fs"),X=class{static ensureDir(t){(0,de.existsSync)(t)||(0,de.mkdirSync)(t,{recursive:!0})}};var{copyFile:rs,stat:us}=Dt.promises,_e=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,P.join)(t,this.ignoreFile);if(!(0,me.existsSync)(r))return;let D=(0,me.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 Dt.promises.readdir(t);await Promise.all(D.map(async o=>{let s=(0,P.join)(t,o),a=(0,P.join)(r,o);if(u&&u.ignores(o))return;if(X.ensureDir((0,P.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}){X.ensureDir(r);let i=this.getIg();return this.copyFiles(t,r,i,u)}};var L=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,L.readFileSync)(t,"utf-8")}readJSONFile(t){return JSON.parse(this.readFile(t))}writeFile(t,r){(0,L.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,L.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,HD.existsSync)(r))throw new Error("template path not exit");this.ora=rr,this.context=new UD.FeScriptContext(t),this.subPackages=["node-lib","react-app"],this.copyer=new _e((0,v.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,v.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=(s,a)=>(this.logger.debug("copyCallback",s,a),this.compose.composeConfigFile(t,s,a)),{configsRootPath:D,config:o}=this.context.options;if(!o){this.logger.debug("no copy config files");return}await this.copyer.copyPaths({sourcePath:(0,v.join)(D,u),targetPath:r,copyCallback:i})}generateTemplateDir(t){return this.copyer.copyPaths({sourcePath:(0,v.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,v.join)(D,o),a=(0,v.join)(i,r,o);this.logger.debug("copy sub package",s,a),await this.copyer.copyPaths({sourcePath:s,targetPath:a})}}};var bt={name:"@qlover/create-app",version:"0.4.6",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:{build:"tsup","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 YD.Command;return e.version(bt.version,"-v, --version","Show version").description(bt.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 Wl(){let{dryRun:e,verbose:t,...r}=Ul(),u=(0,vt.resolve)("./templates"),i=(0,vt.resolve)("./configs");(0,xt.existsSync)(u)||(console.error("Template is empty!"),process.exit(1)),(0,xt.existsSync)(i)||(console.error("Configs is empty!"),process.exit(1)),await new ye({dryRun:e,verbose:t,options:{...r,templateRootPath:u,configsRootPath:i}}).generate()}Wl().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 Dt.promises.readdir(t);await Promise.all(D.map(async o=>{let s=(0,P.join)(t,o),a=(0,P.join)(r,o);if(u&&u.ignores(o))return;if(X.ensureDir((0,P.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}){X.ensureDir(r);let i=this.getIg();return this.copyFiles(t,r,i,u)}};var L=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,L.readFileSync)(t,"utf-8")}readJSONFile(t){return JSON.parse(this.readFile(t))}writeFile(t,r){(0,L.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,L.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,HD.existsSync)(r))throw new Error("template path not exit");this.ora=rr,this.context=new UD.FeScriptContext(t),this.subPackages=["node-lib","react-app"],this.copyer=new _e((0,v.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,v.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=(s,a)=>(this.logger.debug("copyCallback",s,a),this.compose.composeConfigFile(t,s,a)),{configsRootPath:D,config:o}=this.context.options;if(!o){this.logger.debug("no copy config files");return}await this.copyer.copyPaths({sourcePath:(0,v.join)(D,u),targetPath:r,copyCallback:i})}generateTemplateDir(t){return this.copyer.copyPaths({sourcePath:(0,v.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,v.join)(D,o),a=(0,v.join)(i,r,o);this.logger.debug("copy sub package",s,a),await this.copyer.copyPaths({sourcePath:s,targetPath:a})}}};var bt={name:"@qlover/create-app",version:"0.6.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:{build:"tsup","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 YD.Command;return e.version(bt.version,"-v, --version","Show version").description(bt.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 Wl(){let{dryRun:e,verbose:t,...r}=Ul(),u=(0,vt.resolve)("./templates"),i=(0,vt.resolve)("./configs");(0,xt.existsSync)(u)||(console.error("Template is empty!"),process.exit(1)),(0,xt.existsSync)(i)||(console.error("Configs is empty!"),process.exit(1)),await new ye({dryRun:e,verbose:t,options:{...r,templateRootPath:u,configsRootPath:i}}).generate()}Wl().catch(e=>{console.error(e),process.exit(1)});

package/dist/index.js

@@ -8,4 +8,4 @@ ${t}`,cn=Object.getOwnPropertyDescriptor(Function.prototype,"toString"),fn=Objec
 `))this.#e+=Math.max(1,Math.ceil(Le(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=E[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&&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??" ",D=t.text??this.text,s=typeof D=="string"?(i?" ":"")+D:"",a=t.suffixText??this.#o,f=this.#g(a," "),p=u+i+s+f+`
 `;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:D}=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(D===void 0?void 0:typeof D=="string"?D:D(s)),s}}import{existsSync as Hl}from"fs";var Dr=ue(ir(),1);import{dirname as Jn,join as Ze}from"path";import{existsSync as Zn,readFileSync as Qn}from"fs";import{promises as nr}from"fs";import{existsSync as Kn,mkdirSync as Xn}from"fs";var H=class{static ensureDir(t){Kn(t)||Xn(t,{recursive:!0})}};var{copyFile:es,stat:ts}=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(!Zn(r))return;let D=Qn(r,"utf8").split(`
-`).map(o=>o.trim()).filter(o=>o&&!o.startsWith("#"));return(0,Dr.default)().add(D)}async copyFiles(t,r,u,i){let D=await nr.readdir(t);await Promise.all(D.map(async o=>{let s=Ze(t,o),a=Ze(r,o);if(u&&u.ignores(o))return;if(H.ensureDir(Jn(a)),(await ts(s)).isDirectory())await this.copyFiles(s,a,u,i);else{if(i&&await i(s,a))return;await es(s,a)}}))}copyPaths({sourcePath:t,targetPath:r,copyCallback:u}){H.ensureDir(r);let i=this.getIg();return this.copyFiles(t,r,i,u)}};var ID=ue(qD(),1);import{readFileSync as Ll,writeFileSync as kl,existsSync as $l}from"fs";var me=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 Ll(t,"utf-8")}readJSONFile(t){return JSON.parse(this.readFile(t))}writeFile(t,r){kl(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,ID.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 $l(D)?(this.mergeJSONFile(D,JSON.parse(i)),!0):(this.writeFile(D,i),!0)}return this.writeFile(u,i),!0}return!1}};var jD=["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(!Hl(r))throw new Error("template path not exit");this.ora=Kt,this.context=new Ul(t),this.subPackages=["node-lib","react-app"],this.copyer=new Ce(N(this.context.options.configsRootPath,"_common")),this.compose=new me}get logger(){return this.context.logger}async steps(t){try{return await Wl.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 jD.includes(t)}async getGeneratorContext(){let t=_t(this.subPackages,jD),r=await this.steps(t);if(this.isPackageTemplate(r.template)){let u=mt(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=(s,a)=>(this.logger.debug("copyCallback",s,a),this.compose.composeConfigFile(t,s,a)),{configsRootPath:D,config:o}=this.context.options;if(!o){this.logger.debug("no copy config files");return}await this.copyer.copyPaths({sourcePath:N(D,u),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:D}=this.context.options;for(let o of u){let s=N(D,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.4.6",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:{build:"tsup","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 zl(){let e=new Vl;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 Kl(){let{dryRun:e,verbose:t,...r}=zl(),u=ND("./templates"),i=ND("./configs");GD(u)||(console.error("Template is empty!"),process.exit(1)),GD(i)||(console.error("Configs is empty!"),process.exit(1)),await new Be({dryRun:e,verbose:t,options:{...r,templateRootPath:u,configsRootPath:i}}).generate()}Kl().catch(e=>{console.error(e),process.exit(1)});
+`).map(o=>o.trim()).filter(o=>o&&!o.startsWith("#"));return(0,Dr.default)().add(D)}async copyFiles(t,r,u,i){let D=await nr.readdir(t);await Promise.all(D.map(async o=>{let s=Ze(t,o),a=Ze(r,o);if(u&&u.ignores(o))return;if(H.ensureDir(Jn(a)),(await ts(s)).isDirectory())await this.copyFiles(s,a,u,i);else{if(i&&await i(s,a))return;await es(s,a)}}))}copyPaths({sourcePath:t,targetPath:r,copyCallback:u}){H.ensureDir(r);let i=this.getIg();return this.copyFiles(t,r,i,u)}};var ID=ue(qD(),1);import{readFileSync as Ll,writeFileSync as kl,existsSync as $l}from"fs";var me=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 Ll(t,"utf-8")}readJSONFile(t){return JSON.parse(this.readFile(t))}writeFile(t,r){kl(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,ID.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 $l(D)?(this.mergeJSONFile(D,JSON.parse(i)),!0):(this.writeFile(D,i),!0)}return this.writeFile(u,i),!0}return!1}};var jD=["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(!Hl(r))throw new Error("template path not exit");this.ora=Kt,this.context=new Ul(t),this.subPackages=["node-lib","react-app"],this.copyer=new Ce(N(this.context.options.configsRootPath,"_common")),this.compose=new me}get logger(){return this.context.logger}async steps(t){try{return await Wl.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 jD.includes(t)}async getGeneratorContext(){let t=_t(this.subPackages,jD),r=await this.steps(t);if(this.isPackageTemplate(r.template)){let u=mt(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=(s,a)=>(this.logger.debug("copyCallback",s,a),this.compose.composeConfigFile(t,s,a)),{configsRootPath:D,config:o}=this.context.options;if(!o){this.logger.debug("no copy config files");return}await this.copyer.copyPaths({sourcePath:N(D,u),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:D}=this.context.options;for(let o of u){let s=N(D,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.6.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:{build:"tsup","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 zl(){let e=new Vl;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 Kl(){let{dryRun:e,verbose:t,...r}=zl(),u=ND("./templates"),i=ND("./configs");GD(u)||(console.error("Template is empty!"),process.exit(1)),GD(i)||(console.error("Configs is empty!"),process.exit(1)),await new Be({dryRun:e,verbose:t,options:{...r,templateRootPath:u,configsRootPath:i}}).generate()}Kl().catch(e=>{console.error(e),process.exit(1)});

package/dist/templates/react-app/config/Identifier/index.ts

@@ -1,5 +1,5 @@
 export * from './common';
-export * from './error';
+export * from './common.error';
 export * from './page.about';
 export * from './page.executor';
 export * from './page.home';

package/dist/templates/react-app/config/feapi.mock.json

@@ -19,6 +19,12 @@
   "POST /api/login": {
     "token": "/api/login-token-adfasdfasdf"
   },
+  "POST https://feapi.example.com/api/register": {
+    "token": "asdfasdf123123asdfasdf"
+  },
+  "POST /api/register": {
+    "token": "asdfasdf123123asdfasdf"
+  },
   "POST https://api.openai.com/v1/chat/completions": {
     "id": "chatcmpl-1234567890",
     "object": "chat.completion",

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

@@ -54,8 +54,8 @@
   },
   "dependencies": {
     "@brain-toolkit/antd-theme-override": "^0.0.3",
-    "@qlover/corekit-bridge": "^1.1.2",
-    "@qlover/fe-corekit": "^1.4.1",
+    "@qlover/corekit-bridge": "latest",
+    "@qlover/fe-corekit": "latest",
     "@qlover/logger": "^0.1.1",
     "@qlover/slice-store-react": "^1.0.8",
     "@tailwindcss/postcss": "^4.1.8",

package/dist/templates/react-app/src/base/apis/userApi/UserApi.ts

@@ -12,6 +12,20 @@ import {
 import { inject, injectable } from 'inversify';
 import { UserApiAdapter } from './UserApiAdapter';
 import { UserApiConfig } from './UserApiBootstarp';
+import {
+  LoginResponseData,
+  UserAuthApiInterface,
+  UserAuthStoreInterface,
+  UserAuthState
+} from '@qlover/corekit-bridge';
+import {
+  RegisterFormData,
+  UserServiceUserInfo
+} from '@/base/services/UserService';
+import { RES_NO_TOKEN } from '@config/Identifier';
+import { AppError } from '@/base/cases/AppError';
+
+export type UserApiState = UserAuthState<UserServiceUserInfo>;
 
 /**
  * UserApi
@@ -21,7 +35,12 @@ import { UserApiConfig } from './UserApiBootstarp';
  *
  */
 @injectable()
-export class UserApi extends RequestTransaction<UserApiConfig> {
+export class UserApi
+  extends RequestTransaction<UserApiConfig>
+  implements UserAuthApiInterface<UserApiState>
+{
+  protected store: UserAuthStoreInterface<UserApiState> | null = null;
+
   constructor(
     @inject(FetchAbortPlugin) private abortPlugin: FetchAbortPlugin,
     @inject(UserApiAdapter) adapter: RequestAdapterFetch
@@ -29,6 +48,18 @@ export class UserApi extends RequestTransaction<UserApiConfig> {
     super(adapter);
   }
 
+  getStore(): UserAuthStoreInterface<UserApiState> | null {
+    return this.store;
+  }
+
+  /**
+   * @override
+   * @param store
+   */
+  setStore(store: UserAuthStoreInterface<UserApiState>): void {
+    this.store = store;
+  }
+
   stop(request: UserApiConfig): Promise<void> | void {
     this.abortPlugin.abort(request);
   }
@@ -52,13 +83,63 @@ export class UserApi extends RequestTransaction<UserApiConfig> {
     });
   }
 
-  async getUserInfo(): Promise<UserApiGetUserInfoTransaction['response']> {
-    return this.get<UserApiGetUserInfoTransaction>('/api/userinfo');
-  }
-
+  /**
+   * @override
+   * @param params
+   * @returns
+   */
   async login(
     params: UserApiLoginTransaction['data']
+  ): Promise<LoginResponseData> {
+    const response = await this.post<UserApiLoginTransaction>(
+      '/api/login',
+      params
+    );
+
+    if (response.apiCatchResult) {
+      throw response.apiCatchResult;
+    }
+
+    if (!response.data.token) {
+      throw new AppError(RES_NO_TOKEN);
+    }
+
+    return response.data;
+  }
+
+  /**
+   * @override
+   * @param params
+   * @returns
+   */
+  register(
+    params: RegisterFormData
   ): Promise<UserApiLoginTransaction['response']> {
-    return this.post<UserApiLoginTransaction>('/api/login', params);
+    return this.post<UserApiLoginTransaction>('/api/register', params);
+  }
+
+  /**
+   * @override
+   * @returns
+   */
+  logout(): Promise<void> {
+    return Promise.resolve();
+  }
+
+  /**
+   * @override
+   * @returns
+   */
+  async getUserInfo(): Promise<
+    UserApiGetUserInfoTransaction['response']['data']
+  > {
+    const response =
+      await this.get<UserApiGetUserInfoTransaction>('/api/userinfo');
+
+    if (response.apiCatchResult) {
+      throw response.apiCatchResult;
+    }
+
+    return response.data;
   }
 }

package/dist/templates/react-app/src/base/apis/userApi/UserApiType.ts

@@ -50,3 +50,14 @@ export type UserApiLoginTransaction = UserApiTransaction<
 >;
 
 export type UserApiTestApiCatchResultTransaction = UserApiGetRandomUser;
+
+export type UserApiRegisterTransaction = UserApiTransaction<
+  {
+    username: string;
+    email: string;
+    password: string;
+    confirmPassword: string;
+    agreeToTerms: boolean;
+  },
+  UserApiTransaction['response']['data']
+>;

package/dist/templates/react-app/src/base/cases/AppConfig.ts

@@ -55,6 +55,12 @@ export class AppConfig implements EnvConfigInterface {
    */
   readonly userTokenStorageKey = '__fe_user_token__';
 
+  /**
+   * Storage key for user information
+   * @description Injected from VITE_USER_INFO_STORAGE_KEY environment variable
+   */
+  readonly userInfoStorageKey = '__fe_user_info__';
+
   /**
    * Available OpenAI model configurations
    * @description List of supported OpenAI models for the application
@@ -102,4 +108,9 @@ export class AppConfig implements EnvConfigInterface {
 
   /** Flag indicating if AI service token is required */
   readonly aiApiRequireToken = true;
+
+  /**
+   * Project startup href, usually from window.location.href
+   */
+  readonly bootHref = '';
 }

package/dist/templates/react-app/src/base/services/UserService.ts

@@ -1,19 +1,23 @@
-import type { ExecutorPlugin } from '@qlover/fe-corekit';
+import { ExecutorPlugin, type SyncStorageInterface } from '@qlover/fe-corekit';
 import type {
   UserApiGetUserInfoTransaction,
   UserApiLoginTransaction
 } from '@/base/apis/userApi/UserApiType';
 import { RouteService } from './RouteService';
 import {
-  StoreInterface,
-  StoreStateInterface,
-  type StorageTokenInterface
+  LoginResponseData,
+  type UserAuthApiInterface,
+  UserAuthService,
+  UserAuthState,
+  UserAuthStore
 } from '@qlover/corekit-bridge';
 import { inject, injectable } from 'inversify';
-import { IOCIdentifier } from '@/core/IOC';
 import { UserApi } from '@/base/apis/userApi/UserApi';
 import { AppError } from '@/base/cases/AppError';
-import * as errKeys from '@config/Identifier/error';
+import * as errKeys from '@config/Identifier/common.error';
+import { IOCIdentifier } from '@/core/IOC';
+import { AppConfig } from '../cases/AppConfig';
+import { UserApiState } from '../apis/userApi/UserApi';
 
 export type UserServiceUserInfo =
   UserApiGetUserInfoTransaction['response']['data'];
@@ -26,34 +30,43 @@ export interface RegisterFormData {
   agreeToTerms: boolean;
 }
 
-class UserServiceState implements StoreStateInterface {
-  success: boolean = false;
-  userInfo: UserServiceUserInfo = {
-    name: '',
-    email: '',
-    picture: ''
-  };
-}
-
 @injectable()
 export class UserService
-  extends StoreInterface<UserServiceState>
+  extends UserAuthService<UserServiceUserInfo>
   implements ExecutorPlugin
 {
   readonly pluginName = 'UserService';
 
   constructor(
-    @inject(UserApi) private userApi: UserApi,
-    @inject(RouteService) private routerService: RouteService,
-    @inject(IOCIdentifier.FeApiToken)
-    private userToken: StorageTokenInterface<string>
+    @inject(RouteService) protected routerService: RouteService,
+    @inject(UserApi)
+    userApi: UserAuthApiInterface<UserAuthState<UserServiceUserInfo>>,
+    @inject(IOCIdentifier.AppConfig) appConfig: AppConfig,
+    @inject(IOCIdentifier.LocalStorageEncrypt)
+    storage: SyncStorageInterface<string, string>
   ) {
-    super(() => new UserServiceState());
+    super(userApi, {
+      userStorage: {
+        key: appConfig.userInfoStorageKey,
+        storage: storage
+      },
+      credentialStorage: {
+        key: appConfig.userTokenStorageKey,
+        storage: storage
+      }
+    });
+  }
+
+  /**
+   * @override
+   */
+  override get store(): UserAuthStore<UserApiState> {
+    return super.store as UserAuthStore<UserApiState>;
   }
 
-  selector = {
-    success: (state: UserServiceState) => state.success
-  };
+  getToken(): string | null {
+    return this.store.getCredential();
+  }
 
   /**
    * @override
@@ -63,84 +76,49 @@ export class UserService
       return;
     }
 
-    const userToken = this.userToken.getToken();
+    const userToken = this.getToken();
 
     if (!userToken) {
       throw new AppError(errKeys.LOCAL_NO_USER_TOKEN);
     }
 
-    const userInfo = await this.userApi.getUserInfo();
-
-    this.emit({
-      success: true,
-      userInfo: userInfo.data
-    });
-  }
-
-  onSuccess(): void | Promise<void> {
-    if (this.isAuthenticated()) {
-      this.emit({ ...this.state, success: true });
-    } else {
-      this.logout();
+    if (userToken) {
+      this.store.authSuccess();
     }
+
+    await this.userInfo();
+    this.store.authSuccess();
   }
 
   /**
    * @override
    */
-  async login(
-    params: UserApiLoginTransaction['data']
-  ): Promise<UserApiGetUserInfoTransaction['response']> {
-    const response = await this.userApi.login(params);
-
-    if (response.apiCatchResult) {
-      throw response.apiCatchResult;
-    }
-
-    if (!response.data.token) {
-      throw new AppError(errKeys.RES_NO_TOKEN);
-    }
-
-    this.userToken.setToken(response.data.token);
-
-    const userInfo = await this.userApi.getUserInfo();
-
-    this.emit({
-      success: true,
-      userInfo: userInfo.data
-    });
-
-    return userInfo;
-  }
+  onSuccess(): void {}
 
   /**
    * @override
    */
-  logout(): void {
-    this.reset();
+  override async logout(): Promise<void> {
+    await super.logout();
+
     this.routerService.reset();
     this.routerService.gotoLogin();
   }
 
-  /**
-   * @override
-   */
-  reset(): void {
-    this.userToken.removeToken();
-    super.reset();
-  }
-
-  isAuthenticated(): boolean {
-    return this.state.success;
-  }
+  async register(params: RegisterFormData): Promise<LoginResponseData> {
+    const response = (await this.api.register(
+      params
+    )) as UserApiLoginTransaction['response'];
+
+    if (response.data?.token) {
+      try {
+        await this.userInfo({ token: response.data?.token });
+        this.store.authSuccess();
+      } catch (error) {
+        this.store.authFailed(error);
+      }
+    }
 
-  /**
-   * @override
-   */
-  async register(params: RegisterFormData): Promise<unknown> {
-    return this.login({
-      username: params.username,
-      password: params.password
-    });
+    throw new AppError(errKeys.LOCAL_NO_USER_TOKEN);
   }
 }

package/dist/templates/react-app/src/core/IOC.ts

@@ -2,14 +2,15 @@
 import {
   ApiMockPlugin,
   EnvConfigInterface,
-  StorageTokenInterface,
   RequestCommonPlugin,
   ApiCatchPlugin,
   IOCContainerInterface,
   createIOCFunction,
-  ServiceIdentifier
+  ServiceIdentifier,
+  TokenStorage,
+  CookieStorage
 } from '@qlover/corekit-bridge';
-import type { JSONSerializer, JSONStorage } from '@qlover/fe-corekit';
+import type { JSONSerializer, ObjectStorage } from '@qlover/fe-corekit';
 import type { LoggerInterface } from '@qlover/logger';
 import type { AppConfig } from '@/base/cases/AppConfig';
 import { Container } from 'inversify';
@@ -69,7 +70,9 @@ export class InversifyContainer implements IOCContainerInterface {
  */
 export const IOCIdentifier = Object.freeze({
   JSON: 'JSON',
-  JSONStorage: 'JSONStorage',
+  LocalStorage: 'LocalStorage',
+  LocalStorageEncrypt: 'LocalStorageEncrypt',
+  CookieStorage: 'CookieStorage',
   Logger: 'Logger',
   FeApiToken: 'FeApiToken',
   FeApiCommonPlugin: 'FeApiCommonPlugin',
@@ -84,9 +87,11 @@ export const IOCIdentifier = Object.freeze({
  */
 export interface IOCIdentifierMap {
   [IOCIdentifier.JSON]: JSONSerializer;
-  [IOCIdentifier.JSONStorage]: JSONStorage;
+  [IOCIdentifier.LocalStorage]: ObjectStorage<string, string>;
+  [IOCIdentifier.LocalStorageEncrypt]: ObjectStorage<string, string>;
+  [IOCIdentifier.CookieStorage]: CookieStorage;
   [IOCIdentifier.Logger]: LoggerInterface;
-  [IOCIdentifier.FeApiToken]: StorageTokenInterface<string>;
+  [IOCIdentifier.FeApiToken]: TokenStorage<string>;
   [IOCIdentifier.FeApiCommonPlugin]: RequestCommonPlugin;
   [IOCIdentifier.AppConfig]: EnvConfigInterface;
   [IOCIdentifier.ApiMockPlugin]: ApiMockPlugin;

package/dist/templates/react-app/src/core/bootstrap.ts

@@ -4,7 +4,7 @@ import { IOC } from './IOC';
 import * as globals from '@/core/globals';
 import { IocRegister } from './registers';
 import { BootstrapsRegistry } from './bootstraps';
-import { GLOBAL_NO_WINDOW } from '@config/Identifier/error';
+import { GLOBAL_NO_WINDOW } from '@config/Identifier/common.error';
 
 export default async function startup({
   root,
@@ -33,7 +33,7 @@ export default async function startup({
     },
     envOptions: {
       target: appConfig,
-      source: envSource,
+      source: { ...envSource, [envPrefix + 'BOOT_HREF']: root.location.href },
       prefix: envPrefix,
       blackList: envBlackList
     },

package/dist/templates/react-app/src/core/globals.ts

@@ -1,6 +1,17 @@
 // ! global variables, don't import any dependencies and don't have side effects
-import { JSONStorage, JSONSerializer, SyncStorage } from '@qlover/fe-corekit';
-import { ColorFormatter, ConsoleHandler, Logger } from '@qlover/corekit-bridge';
+import {
+  Base64Serializer,
+  JSONSerializer,
+  ObjectStorage,
+  SyncStorage,
+  SyncStorageInterface
+} from '@qlover/fe-corekit';
+import {
+  ColorFormatter,
+  ConsoleHandler,
+  CookieStorage,
+  Logger
+} from '@qlover/corekit-bridge';
 import { DialogHandler } from '@/base/cases/DialogHandler';
 import { loggerStyles } from '@config/common';
 import { AppConfig } from '@/base/cases/AppConfig';
@@ -26,9 +37,14 @@ export const logger = new Logger({
 export const JSON = new JSONSerializer();
 
 /**
- * Override JSONStorage to use the global local storage
+ * Override localStorage to use the global local storage
  */
-export const localJsonStorage = new JSONStorage(
-  localStorage as SyncStorage<string, string>,
-  JSON
-);
+export const localStorage = new SyncStorage(new ObjectStorage(), [
+  JSON,
+  new Base64Serializer(),
+  window.localStorage as unknown as SyncStorageInterface<string>
+]);
+
+export const localStorageEncrypt = localStorage;
+
+export const cookieStorage = new CookieStorage();

package/dist/templates/react-app/src/core/registers/RegisterApi.ts

@@ -1,4 +1,4 @@
-import { InversifyContainer, InversifyRegisterInterface } from '../IOC';
+import type { InversifyContainer, InversifyRegisterInterface } from '../IOC';
 
 export class RegisterApi implements InversifyRegisterInterface {
   register(_container: InversifyContainer): void {}

package/dist/templates/react-app/src/core/registers/RegisterCommon.ts

@@ -1,4 +1,4 @@
-import { FetchAbortPlugin, JSONStorage } from '@qlover/fe-corekit';
+import { FetchAbortPlugin } from '@qlover/fe-corekit';
 import { Logger } from '@qlover/logger';
 import {
   InversifyContainer,
@@ -7,20 +7,21 @@ import {
   IocRegisterOptions
 } from '@/core/IOC';
 import {
-  UserToken,
   RequestCommonPlugin,
   ApiMockPlugin,
   ApiCatchPlugin,
   ThemeService,
-  IOCManagerInterface
+  IOCManagerInterface,
+  TokenStorage
 } from '@qlover/corekit-bridge';
 import mockDataJson from '@config/feapi.mock.json';
 import { RequestStatusCatcher } from '@/base/cases/RequestStatusCatcher';
 import { themeConfig } from '@config/theme';
-import { localJsonStorage, logger } from '../globals';
+import { localStorage, logger } from '../globals';
 import { I18nService } from '@/base/services/I18nService';
 import { RouteService } from '@/base/services/RouteService';
 import { baseRoutes } from '@config/app.router';
+import { UserService } from '@/base/services/UserService';
 
 export class RegisterCommon implements InversifyRegisterInterface {
   register(
@@ -30,21 +31,19 @@ export class RegisterCommon implements InversifyRegisterInterface {
   ): void {
     const AppConfig = container.get(IOCIdentifier.AppConfig);
 
-    const userToken = new UserToken({
-      storageKey: AppConfig.userTokenStorageKey,
-      storage: container.get(JSONStorage)
+    const feApiToken = new TokenStorage(AppConfig.userTokenStorageKey, {
+      storage: container.get(IOCIdentifier.LocalStorageEncrypt)
     });
     const feApiAbort = new FetchAbortPlugin();
     const feApiRequestCommonPlugin = new RequestCommonPlugin({
       tokenPrefix: AppConfig.openAiTokenPrefix,
       requiredToken: true,
-      token: () => userToken.getToken()
+      token: () => container.get(UserService).getToken()
     });
 
     container.bind(FetchAbortPlugin, feApiAbort);
-    container.bind(UserToken, userToken);
 
-    container.bind(IOCIdentifier.FeApiToken, userToken);
+    container.bind(IOCIdentifier.FeApiToken, feApiToken);
     container.bind(IOCIdentifier.FeApiCommonPlugin, feApiRequestCommonPlugin);
     container.bind(
       IOCIdentifier.ApiMockPlugin,
@@ -62,7 +61,7 @@ export class RegisterCommon implements InversifyRegisterInterface {
       ThemeService,
       new ThemeService({
         ...themeConfig,
-        storage: localJsonStorage
+        storage: localStorage
       })
     );
 

package/dist/templates/react-app/src/core/registers/RegisterControllers.ts

@@ -1,4 +1,4 @@
-import { localJsonStorage } from '../globals';
+import { localStorage } from '../globals';
 import { JSONStorageController } from '@/uikit/controllers/JSONStorageController';
 import { ProcesserExecutor } from '@/base/services/ProcesserExecutor';
 import { UserService } from '@/base/services/UserService';
@@ -8,7 +8,7 @@ import { I18nKeyErrorPlugin } from '@/base/cases/I18nKeyErrorPlugin';
 
 export class RegisterControllers implements InversifyRegisterInterface {
   register(container: InversifyContainer): void {
-    const jsonStorageController = new JSONStorageController(localJsonStorage);
+    const jsonStorageController = new JSONStorageController(localStorage);
 
     container.bind(JSONStorageController, jsonStorageController);
 

package/dist/templates/react-app/src/core/registers/RegisterGlobals.ts

@@ -1,6 +1,13 @@
-import { JSONSerializer, JSONStorage } from '@qlover/fe-corekit';
+import { JSONSerializer } from '@qlover/fe-corekit';
 import type { IOCManagerInterface } from '@qlover/corekit-bridge';
-import { dialogHandler, JSON, localJsonStorage, logger } from '../globals';
+import {
+  cookieStorage,
+  dialogHandler,
+  JSON,
+  localStorage,
+  localStorageEncrypt,
+  logger
+} from '../globals';
 import {
   type InversifyContainer,
   type InversifyRegisterInterface,
@@ -25,7 +32,8 @@ export class RegisterGlobals implements InversifyRegisterInterface {
     container.bind(Logger, logger);
     container.bind(IOCIdentifier.Logger, logger);
 
-    container.bind(JSONStorage, localJsonStorage);
-    container.bind(IOCIdentifier.JSONStorage, localJsonStorage);
+    container.bind(IOCIdentifier.LocalStorage, localStorage);
+    container.bind(IOCIdentifier.LocalStorageEncrypt, localStorageEncrypt);
+    container.bind(IOCIdentifier.CookieStorage, cookieStorage);
   }
 }

package/dist/templates/react-app/src/pages/404.tsx

@@ -1,6 +1,6 @@
 import { useBaseRoutePage } from '@/uikit/contexts/BaseRouteContext';
 import { PAGE_404_TITLE } from '@config/Identifier/common';
-import { NOT_FOUND_COMPONENT } from '@config/Identifier/error';
+import { NOT_FOUND_COMPONENT } from '@config/Identifier/common.error';
 
 export default function NotFound({ route }: { route?: string }) {
   const { t } = useBaseRoutePage();

package/dist/templates/react-app/src/pages/auth/Layout.tsx

@@ -6,7 +6,7 @@ import BaseHeader from '../../uikit/components/BaseHeader';
 
 export default function Layout() {
   const userService = IOC(UserService);
-  useStore(userService, (state) => state.success);
+  useStore(userService.store);
 
   // If user is authenticated, redirect to home page
   if (userService.isAuthenticated()) {

package/dist/templates/react-app/src/pages/auth/LoginPage.tsx

@@ -5,7 +5,6 @@ import { IOC } from '@/core/IOC';
 import { useBaseRoutePage } from '@/uikit/contexts/BaseRouteContext';
 import { RouteService } from '@/base/services/RouteService';
 import { UserService } from '@/base/services/UserService';
-import { useStore } from '@/uikit/hooks/useStore';
 import * as i18nKeys from '@config/Identifier/page.login';
 import LocaleLink from '@/uikit/components/LocaleLink';
 
@@ -18,7 +17,6 @@ export default function LoginPage() {
   const { t } = useBaseRoutePage();
   const userService = IOC(UserService);
   const AppConfig = IOC('AppConfig');
-  useStore(userService);
   const [loading, setLoading] = useState(false);
 
   const handleLogin = async (values: LoginFormData) => {

package/dist/templates/react-app/src/pages/auth/RegisterPage.tsx

@@ -5,14 +5,12 @@ import { IOC } from '@/core/IOC';
 import { useBaseRoutePage } from '@/uikit/contexts/BaseRouteContext';
 import { RouteService } from '@/base/services/RouteService';
 import { RegisterFormData, UserService } from '@/base/services/UserService';
-import { useStore } from '@/uikit/hooks/useStore';
 import * as i18nKeys from '@config/Identifier/page.register';
 
 export default function RegisterPage() {
   const { t } = useBaseRoutePage();
   const userService = IOC(UserService);
   const AppConfig = IOC('AppConfig');
-  useStore(userService);
   const [loading, setLoading] = useState(false);
   const [form] = Form.useForm();
 

package/dist/templates/react-app/src/pages/base/ErrorIdentifierPage.tsx

@@ -1,6 +1,6 @@
 import { Button } from 'antd';
 import { useBaseRoutePage } from '@/uikit/contexts/BaseRouteContext';
-import * as ErrorIdentifierList from '@config/Identifier/error';
+import * as ErrorIdentifierList from '@config/Identifier/common.error';
 import * as i18nKeys from '@config/Identifier/page.identifiter';
 
 export default function ErrorIdentifierPage() {

package/dist/templates/react-app/src/pages/base/JSONStoragePage.tsx

@@ -46,7 +46,7 @@ export default function JSONStoragePage() {
                     {t(i18nKeys.PAGE_JSONSTORAGE_CURRENT_VALUE)}:{' '}
                   </span>
                   <span className="font-semibold text-text">
-                    {controllerState.testKey1}
+                    {JSON.stringify(controllerState.testKey1)}
                   </span>
                 </div>
               </div>

package/dist/templates/react-app/src/uikit/contexts/BaseRouteContext.ts

@@ -5,7 +5,7 @@ import { RouteMeta } from '@/base/types/Page';
 import { createContext } from 'react';
 import merge from 'lodash/merge';
 import i18nConfig from '@config/i18n';
-import { WITHIN_PAGE_PROVIDER } from '@config/Identifier/error';
+import { WITHIN_PAGE_PROVIDER } from '@config/Identifier/common.error';
 
 const { defaultNS } = i18nConfig;
 

package/dist/templates/react-app/src/uikit/controllers/JSONStorageController.ts

@@ -1,9 +1,9 @@
-import { JSONStorage } from '@qlover/fe-corekit';
 import {
   StoreInterface,
   type StoreStateInterface
 } from '@qlover/corekit-bridge';
-import { random } from 'lodash';
+import { SyncStorageInterface } from '@qlover/fe-corekit';
+import random from 'lodash/random';
 
 interface JSONStoragePageState extends StoreStateInterface {
   testKey1?: number;
@@ -17,7 +17,7 @@ export class JSONStorageController extends StoreInterface<JSONStoragePageState>
     requestTimeout: (state: JSONStoragePageState) => state.requestTimeout
   };
 
-  constructor(private storage: JSONStorage) {
+  constructor(private storage: SyncStorageInterface<string, number>) {
     super(() => ({
       testKey1: storage.getItem('testKey1') ?? 0,
       testKey2: storage.getItem('testKey2') ?? 0,

package/dist/templates/react-app/src/uikit/providers/UserAuthProvider.tsx

@@ -6,7 +6,7 @@ import { useStore } from '../hooks/useStore';
 export function UserAuthProvider({ children }: { children: React.ReactNode }) {
   const userService = IOC(UserService);
 
-  useStore(userService);
+  useStore(userService.store);
 
   if (!userService.isAuthenticated()) {
     return <Loading fullscreen />;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qlover/create-app",
-  "version": "0.4.6",
+  "version": "0.6.0",
   "description": "Create a new app with a single command",
   "private": false,
   "type": "module",