@das-fed/cli 6.4.0-test.3.2 → 6.4.0-test.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/cli",
-  "version": "6.4.0-test.3.2",
+  "version": "6.4.0-test.5.1",
   "description": "",
   "type": "module",
   "main": "src/index.js",

package/src/commands/build/index.js

@@ -1 +1 @@
-import{initPublicConfig}from"../dev-helper/init-public-config.js";import{initWatchers}from"../dev-helper/watchers/index.js";import{extra}from"../extra/index.js";import{execSync}from"child_process";import{resolve,relative,dirname}from"path";import{fileURLToPath}from"url";import minimist from"minimist";import fs from"fs-extra";import{getWindowConfig}from"../../utils/get-window-config/index.js";import{getCliConfig}from"../../utils/get-cli-config/index.js";let __filename=fileURLToPath(import.meta.url),__dirname=dirname(__filename);export default{handle:async i=>{var[,...e]=i,i=minimist(i),t=process.cwd(),o={cwd:t,isDev:!1,isBuild:!0,...await getCliConfig(),...i};if(!(o.isLib??!1)){await initPublicConfig(o),await initWatchers(o);let i=await getWindowConfig(resolve(t,"public/config.js"));try{var r,a=resolve(t,"config.js");await fs.exists(a)&&(r=(await import(relative(resolve(__dirname),a))).default,""===i.microAppName&&delete i.microAppName,i={...r,...i})}catch(i){console.log("get rootConfig error",i)}try{await extra()}catch(i){console.log("提取i18n、theme、auth数据时发生错误",i)}}(e||[]).join(" ");let n="";i.c&&(n+="-c "+i.c),execSync("npx vite build "+n,{cwd:t,stdio:"inherit"})}};
+import{initPublicConfig}from"../dev-helper/init-public-config.js";import{initWatchers}from"../dev-helper/watchers/index.js";import{execSync}from"child_process";import{resolve,relative,dirname}from"path";import{fileURLToPath}from"url";import minimist from"minimist";import fs from"fs-extra";import{getWindowConfig}from"../../utils/get-window-config/index.js";import{getCliConfig}from"../../utils/get-cli-config/index.js";let __filename=fileURLToPath(import.meta.url),__dirname=dirname(__filename);export default{handle:async i=>{var[,...e]=i,i=minimist(i),t=process.cwd(),o={cwd:t,isDev:!1,isBuild:!0,...await getCliConfig(),...i};if(!(o.isLib??!1)){await initPublicConfig(o),await initWatchers(o);let i=await getWindowConfig(resolve(t,"public/config.js"));try{var r,n=resolve(t,"config.js");await fs.exists(n)&&(r=(await import(relative(resolve(__dirname),n))).default,""===i.microAppName&&delete i.microAppName,i={...r,...i})}catch(i){console.log("get rootConfig error",i)}}(e||[]).join(" ");let a="";i.c&&(a+="-c "+i.c),execSync("npx vite build "+a,{cwd:t,stdio:"inherit"})}};

package/src/commands/dev-helper/watchers/i18n/index.js

@@ -1 +1 @@
-import glob from"fast-glob";import fs from"fs-extra";import json5 from"json5";import{resolve}from"path";import{getExportDefaultsByAst}from"../../../../utils/ts-morph/index.js";import{json2type}from"../../../../utils/json2type/index.js";import{getCliConfig}from"../../../../utils/get-cli-config/index.js";let watchGlob=["src/**/i18n/*.ts"],handle=async(t={})=>{var e=t.cwd,a=(await getCliConfig()).i18n?.watchGlob||[],a=getExportDefaultsByAst([...watchGlob,...a],t);let o={};a.map((t,e)=>{t=t.defaultText;Object.assign(o,json5.parse(t))});var s,r=[];for(s of await glob(["src/**/*.vue","src/**/*.tsx"]))for(var i=(await fs.readFile(s)).toString(),l=/i18n\(\s*(.+)\s*\)/g;null!==(n=l.exec(i));){var[,n]=n;r.push(n)}r.forEach(t=>{for(var e=/['"](.*?)['"]/g;null!==(a=e.exec(t));){var[,a]=a;o[a]||(o[a]={})}});let f={"zh-CN":""};Object.values(o).filter(t=>!!t["zh-CN"]).map(t=>Object.assign(f,t)),0===Object.keys(o).length&&(o.any="");t=resolve(e,"src/das-fe-local-runtime/i18n-runtime/type.d.ts");await json2type({data:[{title:"I18NName",type:"string",enum:Object.keys(f)},{title:"I18NKey",type:"string",enum:Object.keys(o)}],outputFilePath:t})};export default{name:"das-i18n",glob:watchGlob,ignoreGlob:[],load:handle,change:handle};
+import glob from"fast-glob";import fs from"fs-extra";import{resolve}from"path";import vm from"vm";import{json2type}from"../../../../utils/json2type/index.js";import{getCliConfig}from"../../../../utils/get-cli-config/index.js";let watchGlob=["src/**/**/i18n/*.ts","!src/**/**/i18n/useI18.ts"];function getExportedDefault(t){var e={data:{}},t=new vm.Script("data = "+t.replace("export default","")),a=vm.createContext(e);return t.runInContext(a),e.data}let handle=async(t={})=>{var{isDev:t,cwd:a}=t;if(t){var o,t=(await getCliConfig()).i18n?.watchGlob||[],r={};for(o of await glob([...watchGlob,...t],{cwd:a,absolute:!0,onlyFiles:!0}))try{var i=getExportedDefault((await fs.readFile(o)).toString());Object.assign(r,i)}catch(t){console.log("i18n文件解析错误",o),console.error(t)}let e={"zh-CN":""};Object.values(r).filter(t=>!!t["zh-CN"]).map(t=>Object.assign(e,t)),0===Object.keys(r).length&&(r.any="");t=resolve(a,"src/das-fe-local-runtime/i18n-runtime/type.d.ts");await json2type({data:[{title:"I18NName",type:"string",enum:Object.keys(e)},{title:"I18NKey",type:"string",enum:Object.keys(r)}],outputFilePath:t})}};export default{name:"das-i18n",glob:watchGlob,ignoreGlob:[],load:handle,change:handle};

package/src/commands/extra/i18n/index.js

@@ -1,2 +1,2 @@
-import{resolve,relative,dirname}from"path";import{fileURLToPath}from"url";import fs from"fs-extra";import{build}from"vite";import prettier from"prettier";import glob from"fast-glob";let __filename=fileURLToPath(import.meta.url),__dirname=dirname(__filename),extractWrappedChinese=e=>{var i,e=(i=e.replace(/<!--[\s\S]*?-->/g,"").replace(/\/\/.*$/gm,"").replace(/\/\*[\s\S]*?\*\//g,"").replace(/^\s*console\..*$/gm,"")).replace(/(\bi18n\b|\bt\b)\s*\(([^)]*)$/gm,(e,t,a,r)=>{var s=i.indexOf(")",r);return-1!==s?e+i.slice(r+e.length,s+1).replace(/\n\s*/g,""):e});let s=/[\u4e00-\u9fa5]+/g,o=/(?:i18n|t)\s*\(\s*(['"`])/,p=[];return e.split("\n").forEach(e=>{for(;null!==(a=s.exec(e));){var[t]=a,a=a.index,r=a+t.length,a=e.slice(0,a).trim(),r=e.slice(r).trim();o.test(a)&&r.includes(")")&&p.push(t)}}),p},extraI18n=async e=>{var{cwd:t=process.cwd(),type:e="app"}=e||{},a=resolve(t,"i18n-colletion.local.ts"),r=(!await fs.exists(a)&&(await fs.ensureFile(a),r={app:"export default import.meta.glob(['./src/**/**/i18n/*.ts','!./src/**/**/i18n/useI18n.ts'], { eager: true, import: 'default' })",dasui:"export default import.meta.glob(['./packages/business-components/**/**/i18n/*.ts','./packages/components/**/**/i18n/*.ts',], { eager: true, import: 'default' })",dasweb:"export default import.meta.glob(['./packages/main-app-framework/**/**/i18n/*.ts'], { eager: true, import: 'default' })",dasutils:"export default import.meta.glob(['./api-services/**/**/i18n/*.ts','./create-api-service/**/**/i18n/*.ts'], { eager: true, import: 'default' })",daswebcomponents:"export default import.meta.glob(['./components/**/**/i18n/*.ts'], { eager: true, import: 'default' })"}[e])&&await fs.writeFile(a,r),resolve(__dirname,"./.temp"));await fs.ensureDir(r);let s=`index.${(new Date).getTime()}.cjs`;await build({configFile:resolve(__dirname,"./vite.config.ts"),build:{emptyOutDir:!0,outDir:r,lib:{entry:a,fileName:()=>s,formats:["cjs"]}}});var i,o=(await import("./.temp/"+s)).default;let p={};for(i in o)Object.assign(p,o[i]);var n;for(n of await glob({app:["src/**/**/*.vue","src/**/**/*.ts","!src/**/**/i18n/*.ts"],dasui:["packages/business-components/**/**/*.vue","packages/business-components/**/**/*.ts","packages/components/**/**/*.vue","packages/components/**/**/*.ts","!packages/**/**/i18n/*.ts"],dasweb:["packages/main-app-framework/**/**/*.vue","packages/main-app-framework/**/**/*.ts","!packages/**/**/i18n/*.ts"],dasutils:["api-services/**/**/*.ts","create-api-service/**/**/*.ts","!api-services/**/**/i18n/*.ts","!create-api-service/**/**/i18n/*.ts"],daswebcomponents:["components/**/**/*.vue","components/**/**/*.ts","!components/**/**/i18n/*.ts"]}[e],{cwd:t,onlyFiles:!0})){var l=resolve(t,n),l=(await fs.readFile(l)).toString(),l=extractWrappedChinese(l);0<l.length&&l.map(e=>p[e]="")}var c=resolve(t,"app"===e?"public/i18n-collection":"dist/i18n-collection");await fs.ensureDir(c),await fs.emptyDir(c);for(let s of["zh-CN","en"]){let r="export default {";Object.keys(p).map(e=>{var t=p[e];let a=t[s]||"";"zh-CN"===s&&(a=t[s]||t["zh-cn"]||t||e),r+=`'${e}': "${a}",\r
-`}),r+="}";var m=resolve(c,s+".js");await fs.ensureFile(m),await fs.writeFile(m,await prettier.format(r,{parser:"typescript"}))}};export{extraI18n};
+import{resolve,relative,dirname}from"path";import{fileURLToPath}from"url";import fs from"fs-extra";import{build}from"vite";import prettier from"prettier";import glob from"fast-glob";let __filename=fileURLToPath(import.meta.url),__dirname=dirname(__filename),extractWrappedChinese=e=>{var i,e=(i=e.replace(/<!--[\s\S]*?-->/g,"").replace(/\/\/.*$/gm,"").replace(/\/\*[\s\S]*?\*\//g,"").replace(/^\s*console\..*$/gm,"")).replace(/(\bi18n\b|\bt\b)\s*\(([^)]*)$/gm,(e,t,a,r)=>{var s=i.indexOf(")",r);return-1!==s?e+i.slice(r+e.length,s+1).replace(/\n\s*/g,""):e});let s=/[\u4e00-\u9fa5]+/g,o=/(?:i18n|t)\s*\(\s*(['"`])/,p=[];return e.split("\n").forEach(e=>{for(;null!==(a=s.exec(e));){var[t]=a,a=a.index,r=a+t.length,a=e.slice(0,a).trim(),r=e.slice(r).trim();o.test(a)&&r.includes(")")&&p.push(t)}}),p},extraI18n=async e=>{var{cwd:t=process.cwd(),type:e="app"}=e||{},a=resolve(t,"i18n-colletion.local.ts"),r=(!await fs.exists(a)&&(await fs.ensureFile(a),r={app:"export default import.meta.glob(['./src/**/**/i18n/*.ts','!./src/**/**/i18n/useI18n.ts'], { eager: true, import: 'default' })",dasui:"export default import.meta.glob(['./packages/business-components/**/**/i18n/*.ts','./packages/components/**/**/i18n/*.ts',], { eager: true, import: 'default' })",dasweb:"export default import.meta.glob(['./packages/main-app-framework/**/**/i18n/*.ts'], { eager: true, import: 'default' })",dasutils:"export default import.meta.glob(['./api-services/**/**/i18n/*.ts','./create-api-service/**/**/i18n/*.ts'], { eager: true, import: 'default' })",daswebcomponents:"export default import.meta.glob(['./components/**/**/i18n/*.ts'], { eager: true, import: 'default' })"}[e])&&await fs.writeFile(a,r),resolve(__dirname,"./.temp"));await fs.ensureDir(r);let s=`index.${(new Date).getTime()}.cjs`;await build({configFile:resolve(__dirname,"./vite.config.ts"),build:{emptyOutDir:!0,outDir:r,lib:{entry:a,fileName:()=>s,formats:["cjs"]}}});var i,o=(await import("./.temp/"+s)).default;let p={};for(i in o)Object.assign(p,o[i]);var n;for(n of await glob({app:["src/**/**/*.vue","src/**/**/*.ts","!src/**/**/i18n/*.ts"],dasui:["packages/business-components/**/**/*.vue","packages/business-components/**/**/*.ts","packages/components/**/**/*.vue","packages/components/**/**/*.ts","!packages/**/**/i18n/*.ts"],dasweb:["packages/main-app-framework/**/**/*.vue","packages/main-app-framework/**/**/*.ts","!packages/**/**/i18n/*.ts"],dasutils:["api-services/**/**/*.ts","create-api-service/**/**/*.ts","!api-services/**/**/i18n/*.ts","!create-api-service/**/**/i18n/*.ts"],daswebcomponents:["components/**/**/*.vue","components/**/**/*.ts","!components/**/**/i18n/*.ts"]}[e],{cwd:t,onlyFiles:!0})){var l=resolve(t,n),l=(await fs.readFile(l)).toString(),l=extractWrappedChinese(l);0<l.length&&l.map(e=>p[e]="")}var m=resolve(t,"dist/i18n-collection");await fs.ensureDir(m),await fs.emptyDir(m);for(let s of["zh-CN","en"]){let r="export default {";Object.keys(p).map(e=>{var t=p[e];let a=t[s]||"";"zh-CN"===s&&(a=t[s]||t["zh-cn"]||t||e),r+=`'${e}': "${a}",\r
+`}),r+="}";var c=resolve(m,s+".js");await fs.ensureFile(c),await fs.writeFile(c,await prettier.format(r,{parser:"typescript"}))}};export{extraI18n};