@serverless-devs/s 2.0.93-beta.7 → 2.0.95-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/docs/zh/package_dev.md +2 -2
- package/docs/zh/yaml.md +1 -1
- package/lib/clean/index.js +2 -2
- package/lib/cli/index.js +2 -2
- package/lib/component/index.js +80 -80
- package/lib/config/add/index.js +2 -2
- package/lib/config/delete/index.js +2 -2
- package/lib/config/get/index.js +2 -2
- package/lib/config/index.js +2 -2
- package/lib/error/index.js +10 -3
- package/lib/index.js +120 -100
- package/lib/init/index.js +97 -82
- package/lib/set/analysis/index.js +2 -2
- package/lib/set/index.js +2 -2
- package/lib/set/locale/index.js +2 -2
- package/lib/set/registry/index.js +22 -22
- package/lib/set/workspace/index.js +5 -5
- package/lib/update-notifier/index.js +20 -20
- package/package.json +2 -2
- package/spec/zh/0.0.1/readme.md +1 -1
- package/spec/zh/0.0.1/{serverless_pacakge_model → serverless_package_model}/1.purpose_and_goals.md +0 -0
- package/spec/zh/0.0.1/{serverless_pacakge_model → serverless_package_model}/2.overview_and_terminology.md +0 -0
- package/spec/zh/0.0.1/{serverless_pacakge_model → serverless_package_model}/3.package_model.md +0 -0
- package/spec/zh/0.0.1/{serverless_pacakge_model → serverless_package_model}/4.application_scopes.md +0 -0
- package/spec/zh/0.0.1/{serverless_pacakge_model → serverless_package_model}/5.design_principles.md +0 -0
- package/spec/zh/0.0.1/{serverless_pacakge_model → serverless_package_model}/readme.md +0 -0
- package/spec/zh/0.0.1/serverless_registry_model/2.overview_and_terminology.md +1 -1
- package/spec/zh/0.0.1/serverless_registry_model/3.registry_model.md +2 -2
- package/spec/zh/0.0.1/serverless_registry_model/5.design_principles.md +1 -1
- package/test/ci.sh +33 -0
- package/test/start-fc-http-nodejs12/code/index.js +47 -0
- package/test/start-fc-http-nodejs12/s.yaml +38 -0
package/lib/config/get/index.js
CHANGED
|
@@ -37,12 +37,12 @@ function print() { __p += __j.call(arguments, '') }
|
|
|
37
37
|
`)}return i.prototype.report=function(r){return Vy(this,void 0,void 0,function(){var s;return Yy(this,function(o){switch(o.label){case 0:return s=r.error,[4,jc.default.report({type:"jsError",content:this.errorMessage+"||"+s.stack})];case 1:return o.sent(),[2]}})})},i}();ct.HumanError=ky});var Vc=$(Dn=>{"use strict";var Qy=Dn&&Dn.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Dn,"__esModule",{value:!0});Dn.HumanWarning=void 0;var ew=Qy(lt()),zc=ew.default.colors,tw=function(){function i(r){var s=r.warningMessage,o=r.tips;console.log(`
|
|
38
38
|
`+zc.hex("#000").bgYellow("WARNING:")),console.log(s+`
|
|
39
39
|
`),o&&console.log(zc.gray(o)+`
|
|
40
|
-
`)}return i}();Dn.HumanWarning=tw});var bu=$(te=>{"use strict";var nw=te&&te.__awaiter||function(i,r,s,o){function f(a){return a instanceof s?a:new s(function(_){_(a)})}return new(s||(s=Promise))(function(a,_){function E(x){try{p(o.next(x))}catch(I){_(I)}}function y(x){try{p(o.throw(x))}catch(I){_(I)}}function p(x){x.done?a(x.value):f(x.value).then(E,y)}p((o=o.apply(i,r||[])).next())})},rw=te&&te.__generator||function(i,r){var s={label:0,sent:function(){if(a[0]&1)throw a[1];return a[1]},trys:[],ops:[]},o,f,a,_;return _={next:E(0),throw:E(1),return:E(2)},typeof Symbol=="function"&&(_[Symbol.iterator]=function(){return this}),_;function E(p){return function(x){return y([p,x])}}function y(p){if(o)throw new TypeError("Generator is already executing.");for(;s;)try{if(o=1,f&&(a=p[0]&2?f.return:p[0]?f.throw||((a=f.return)&&a.call(f),0):f.next)&&!(a=a.call(f,p[1])).done)return a;switch(f=0,a&&(p=[p[0]&2,a.value]),p[0]){case 0:case 1:a=p;break;case 4:return s.label++,{value:p[1],done:!1};case 5:s.label++,f=p[1],p=[0];continue;case 7:p=s.ops.pop(),s.trys.pop();continue;default:if(a=s.trys,!(a=a.length>0&&a[a.length-1])&&(p[0]===6||p[0]===2)){s=0;continue}if(p[0]===3&&(!a||p[1]>a[0]&&p[1]<a[3])){s.label=p[1];break}if(p[0]===6&&s.label<a[1]){s.label=a[1],a=p;break}if(a&&s.label<a[2]){s.label=a[2],s.ops.push(p);break}a[2]&&s.ops.pop(),s.trys.pop();continue}p=r.call(i,s)}catch(x){p=[6,x],f=0}finally{o=a=0}if(p[0]&5)throw p[1];return{value:p[0]?p[1]:void 0,done:!0}}},iw=te&&te.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(te,"__esModule",{value:!0});te.HandleError=te.HumanWarning=te.HumanError=te.ServerlessError=te.InitError=te.ConfigGetError=te.ConfigError=te.ConfigDeleteError=te.CommandError=void 0;var Su=$i(),sw=Mc(),Ru=iw(lt()),on=Ru.default.colors,uw=Ru.default.report,ow=Ru.default.getMAC,aw=Hc();Object.defineProperty(te,"CommandError",{enumerable:!0,get:function(){return aw.CommandError}});var lw=Gc();Object.defineProperty(te,"ConfigDeleteError",{enumerable:!0,get:function(){return lw.ConfigDeleteError}});var fw=Uc();Object.defineProperty(te,"ConfigError",{enumerable:!0,get:function(){return fw.ConfigError}});var cw=Wc();Object.defineProperty(te,"ConfigGetError",{enumerable:!0,get:function(){return cw.ConfigGetError}});var hw=Bc();Object.defineProperty(te,"InitError",{enumerable:!0,get:function(){return hw.InitError}});var pw=un();Object.defineProperty(te,"ServerlessError",{enumerable:!0,get:function(){return pw.ServerlessError}});var gw=Xc();Object.defineProperty(te,"HumanError",{enumerable:!0,get:function(){return gw.HumanError}});var dw=Vc();Object.defineProperty(te,"HumanWarning",{enumerable:!0,get:function(){return dw.HumanWarning}});
|
|
40
|
+
`)}return i}();Dn.HumanWarning=tw});var bu=$(te=>{"use strict";var nw=te&&te.__awaiter||function(i,r,s,o){function f(a){return a instanceof s?a:new s(function(_){_(a)})}return new(s||(s=Promise))(function(a,_){function E(x){try{p(o.next(x))}catch(I){_(I)}}function y(x){try{p(o.throw(x))}catch(I){_(I)}}function p(x){x.done?a(x.value):f(x.value).then(E,y)}p((o=o.apply(i,r||[])).next())})},rw=te&&te.__generator||function(i,r){var s={label:0,sent:function(){if(a[0]&1)throw a[1];return a[1]},trys:[],ops:[]},o,f,a,_;return _={next:E(0),throw:E(1),return:E(2)},typeof Symbol=="function"&&(_[Symbol.iterator]=function(){return this}),_;function E(p){return function(x){return y([p,x])}}function y(p){if(o)throw new TypeError("Generator is already executing.");for(;s;)try{if(o=1,f&&(a=p[0]&2?f.return:p[0]?f.throw||((a=f.return)&&a.call(f),0):f.next)&&!(a=a.call(f,p[1])).done)return a;switch(f=0,a&&(p=[p[0]&2,a.value]),p[0]){case 0:case 1:a=p;break;case 4:return s.label++,{value:p[1],done:!1};case 5:s.label++,f=p[1],p=[0];continue;case 7:p=s.ops.pop(),s.trys.pop();continue;default:if(a=s.trys,!(a=a.length>0&&a[a.length-1])&&(p[0]===6||p[0]===2)){s=0;continue}if(p[0]===3&&(!a||p[1]>a[0]&&p[1]<a[3])){s.label=p[1];break}if(p[0]===6&&s.label<a[1]){s.label=a[1],a=p;break}if(a&&s.label<a[2]){s.label=a[2],s.ops.push(p);break}a[2]&&s.ops.pop(),s.trys.pop();continue}p=r.call(i,s)}catch(x){p=[6,x],f=0}finally{o=a=0}if(p[0]&5)throw p[1];return{value:p[0]?p[1]:void 0,done:!0}}},iw=te&&te.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(te,"__esModule",{value:!0});te.HandleError=te.HumanWarning=te.HumanError=te.ServerlessError=te.InitError=te.ConfigGetError=te.ConfigError=te.ConfigDeleteError=te.CommandError=void 0;var Su=$i(),sw=Mc(),Ru=iw(lt()),on=Ru.default.colors,uw=Ru.default.report,ow=Ru.default.getMAC,aw=Hc();Object.defineProperty(te,"CommandError",{enumerable:!0,get:function(){return aw.CommandError}});var lw=Gc();Object.defineProperty(te,"ConfigDeleteError",{enumerable:!0,get:function(){return lw.ConfigDeleteError}});var fw=Uc();Object.defineProperty(te,"ConfigError",{enumerable:!0,get:function(){return fw.ConfigError}});var cw=Wc();Object.defineProperty(te,"ConfigGetError",{enumerable:!0,get:function(){return cw.ConfigGetError}});var hw=Bc();Object.defineProperty(te,"InitError",{enumerable:!0,get:function(){return hw.InitError}});var pw=un();Object.defineProperty(te,"ServerlessError",{enumerable:!0,get:function(){return pw.ServerlessError}});var gw=Xc();Object.defineProperty(te,"HumanError",{enumerable:!0,get:function(){return gw.HumanError}});var dw=Vc();Object.defineProperty(te,"HumanWarning",{enumerable:!0,get:function(){return dw.HumanWarning}});function _w(){try{return ow().replace(/:/g,"")}catch{return"unknown"}}function Iu(i,r){return""+on.gray(i)+on.gray.underline(r)}var vw=function(){function i(r){var s=r.error,o=r.prefix,f=o===void 0?"Message:":o;this.traceId=""+_w()+Date.now(),console.log((0,Su.red)("\u2716 "+f+`
|
|
41
41
|
`));var a=(0,sw.getConfig)("analysis");a!=="disable"&&console.log(on.gray("TraceId: "+this.traceId)),console.log(on.gray("Environment: "+(0,Su.getVersion)())),console.log(Iu("Documents: ","https://www.serverless-devs.com")),console.log(Iu("Discussions: ","https://github.com/Serverless-Devs/Serverless-Devs/discussions")),console.log(Iu("Issues: ",`https://github.com/Serverless-Devs/Serverless-Devs/issues
|
|
42
42
|
`)),console.log((0,Su.bgRed)("ERROR:")+`
|
|
43
43
|
`+s+`
|
|
44
44
|
`),a!=="disable"&&console.log(on.gray("Please copy traceId: "+this.traceId+" and join Dingding group: 33947367 for consultation.")),console.log(on.gray("You can run 's clean --cache' to prune Serverless devs.")),console.log(on.gray(`And run again with the '--debug' option or 's -h' to get more logs.
|
|
45
|
-
`))}return i.prototype.report=function(r){return nw(this,void 0,void 0,function(){return rw(this,function(s){return uw({type:"jsError",content:r.message+"||"+r.stack,traceId:this.traceId}),[2]})})},i}();te.HandleError=vw});var Yc=$((Ux,mw)=>{mw.exports={name:"@serverless-devs/s",version:"2.0.93-beta.7",description:"Serverless devs tool, serverless developer tool, supports Alibaba cloud, AWS, azure, baidu cloud, Huawei cloud, Google cloud and Tencent cloud.",homepage:"https://www.serverless-devs.com",keywords:["serverless","alibaba","tencent","azure","baidu","huawei","google","function","faas","serverless-devs"],publishConfig:{access:"public",registry:"https://registry.npmjs.org"},license:"MIT",repository:{type:"git",url:"https://github.com/Serverless-Devs/Serverless-Devs"},bugs:{url:"https://github.com/Serverless-Devs/Serverless-Devs/issues"},scripts:{prewatch:"rm -rf lib/* && cp -r ./src/daemon ./lib",watch:"tsc -w",test:"npx jest",prebuild:"rm -rf lib",build:"tsc && cp -r ./src/daemon ./lib",postbuild:"./shell/postbuild.sh","test:cov":"jest --coverage",lint:"npm run typecheck && f2elint scan -i src",fix:"f2elint fix",typecheck:"npx tsc -p tsconfig.json --noEmit",update:"rm -rf yarn.lock && rm -rf package-lock.json && rm -rf node_modules && yarn",beta:"npm publish --tag=beta"},main:"./lib/index.js",bin:{s:"bin/s"},devDependencies:{"@types/jest":"^27.0.1","@types/lodash":"^4.14.168","@types/node":"^14.0.23","@typescript-eslint/eslint-plugin":"^4.14.1","@typescript-eslint/parser":"^4.14.1","babel-eslint":"^10.1.0",boxen:"^5.0.0",commander:"^6.0.0",dotenv:"^10.0.0",esbuild:"^0.13.6",eslint:"^7.7.0","eslint-config-prettier":"^7.2.0","eslint-plugin-import":"^2.20.1","eslint-plugin-prettier":"^3.1.2",husky:"^4.2.3",inquirer:"^8.2.0","inquirer-autocomplete-prompt":"^1.3.0",jest:"^27.1.0","latest-version":"^5.1.0","lint-staged":"^10.0.8",lodash:"^4.17.20","os-locale":"5.0.0",prettier:"^2.2.1",semver:"^7.3.5","semver-diff":"^3.1.1","ts-jest":"^27.0.1","ts-node":"^9.1.1","tty-table":"^4.1.5",typescript:"^4.1.3"},"lint-staged":{"**/*.{js,jsx,ts}":"f2elint exec eslint"},jest:{coverageDirectory:"coverage",testEnvironment:"node",coverageProvider:"v8",preset:"ts-jest",testMatch:["**/test/**/*test.[jt]s"],setupFilesAfterEnv:["./jest.setup.ts"]},dependencies:{"@serverless-devs/core":"^0.1.13-beta.6"}}});var $i=$(U=>{"use strict";var Ew=U&&U.__createBinding||(Object.create?function(i,r,s,o){o===void 0&&(o=s),Object.defineProperty(i,o,{enumerable:!0,get:function(){return r[s]}})}:function(i,r,s,o){o===void 0&&(o=s),i[o]=r[s]}),yw=U&&U.__setModuleDefault||(Object.create?function(i,r){Object.defineProperty(i,"default",{enumerable:!0,value:r})}:function(i,r){i.default=r}),ww=U&&U.__importStar||function(i){if(i&&i.__esModule)return i;var r={};if(i!=null)for(var s in i)s!=="default"&&Object.prototype.hasOwnProperty.call(i,s)&&Ew(r,i,s);return yw(r,i),r},Kc=U&&U.__awaiter||function(i,r,s,o){function f(a){return a instanceof s?a:new s(function(_){_(a)})}return new(s||(s=Promise))(function(a,_){function E(x){try{p(o.next(x))}catch(I){_(I)}}function y(x){try{p(o.throw(x))}catch(I){_(I)}}function p(x){x.done?a(x.value):f(x.value).then(E,y)}p((o=o.apply(i,r||[])).next())})},Zc=U&&U.__generator||function(i,r){var s={label:0,sent:function(){if(a[0]&1)throw a[1];return a[1]},trys:[],ops:[]},o,f,a,_;return _={next:E(0),throw:E(1),return:E(2)},typeof Symbol=="function"&&(_[Symbol.iterator]=function(){return this}),_;function E(p){return function(x){return y([p,x])}}function y(p){if(o)throw new TypeError("Generator is already executing.");for(;s;)try{if(o=1,f&&(a=p[0]&2?f.return:p[0]?f.throw||((a=f.return)&&a.call(f),0):f.next)&&!(a=a.call(f,p[1])).done)return a;switch(f=0,a&&(p=[p[0]&2,a.value]),p[0]){case 0:case 1:a=p;break;case 4:return s.label++,{value:p[1],done:!1};case 5:s.label++,f=p[1],p=[0];continue;case 7:p=s.ops.pop(),s.trys.pop();continue;default:if(a=s.trys,!(a=a.length>0&&a[a.length-1])&&(p[0]===6||p[0]===2)){s=0;continue}if(p[0]===3&&(!a||p[1]>a[0]&&p[1]<a[3])){s.label=p[1];break}if(p[0]===6&&s.label<a[1]){s.label=a[1],a=p;break}if(a&&s.label<a[2]){s.label=a[2],s.ops.push(p);break}a[2]&&s.ops.pop(),s.trys.pop();continue}p=r.call(i,s)}catch(x){p=[6,x],f=0}finally{o=a=0}if(p[0]&5)throw p[1];return{value:p[0]?p[1]:void 0,done:!0}}},Ni=U&&U.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(U,"__esModule",{value:!0});U.emoji=U.mark=U.replaceTemplate=U.getTemplatekey=U.replaceFun=U.getLang=U.printn=U.checkTemplateFile=U.checkAndReturnTemplateFile=U.yamlLoad=U.getFolderSize=U.getVersion=U.bgRed=U.red=void 0;var de=Ni(require("path")),Fe=Ni(require("fs")),Cu=Ni(Rc()),xw=Ni(require("os")),Aw=bu(),Pi=ww(lt()),Tu=Pi.default.colors,Ow=Pi.default.jsyaml,Di=Yc();U.red=Tu.hex("#fd5750");U.bgRed=Tu.hex("#000").bgHex("#fd5750");function Sw(){return(0,Pi.getCoreVersion)()?Di.name+": "+Di.version+", @serverless-devs/core: "+(0,Pi.getCoreVersion)()+", "+process.platform+"-"+process.arch+", node-"+process.version:Di.name+": "+Di.version+", "+process.platform+"-"+process.arch+", node-"+process.version}U.getVersion=Sw;function Rw(i){return Kc(this,void 0,void 0,function(){function r(f){return Kc(this,void 0,void 0,function(){var a,_;return Zc(this,function(E){switch(E.label){case 0:return a=Fe.default.lstatSync(f),typeof a!="object"?[2]:(s.set(a.ino,a.size),a.isDirectory()?(_=Fe.default.readdirSync(f),typeof _!="object"?[2]:[4,Promise.all(_.map(function(y){return r(de.default.join(f,y))}))]):[3,2]);case 1:E.sent(),E.label=2;case 2:return[2]}})})}var s,o;return Zc(this,function(f){switch(f.label){case 0:return s=new Map,[4,r(i)];case 1:return f.sent(),o=Array.from(s.values()).reduce(function(a,_){return a+_},0),[2,o]}})})}U.getFolderSize=Rw;function Jc(i){var r=Fe.default.readFileSync(i,"utf8");try{return Ow.load(r)}catch{if(["-h","--help"].includes(process.argv[2]))return;var s=de.default.basename(i);new Aw.HumanError({errorMessage:s+" format is incorrect",tips:"Please check the configuration of "+s+", Serverless Devs' Yaml specification document can refer to\uFF1A"+Tu.underline("https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/yaml.md")}),process.exit(1)}}U.yamlLoad=Jc;function wr(i,r){r===void 0&&(r=!1);var s=Fe.default.readFileSync(i,"utf8"),o=r?JSON.parse(s):Jc(i);if(!o)return!1;for(var f in o)if(o[f].Component&&o[f].Provider&&o[f].Properties)return!0;return o.hasOwnProperty("edition")}function kc(){if(process.env.serverless_devs_temp_template)return process.env.serverless_devs_temp_template;var i=process.cwd(),r=process.argv.includes("-t")?"-t":process.argv.includes("--template")?"--template":null,s=r?process.argv.indexOf(r):-1;if(s!==-1){var o=s+1,f=process.argv[o];if(f&&(f.endsWith(".yaml")||f.endsWith(".yml")||f.endsWith(".json"))){var a=!!f.endsWith(".json");if(Fe.default.existsSync(de.default.join(i,f))&&wr(de.default.join(i,f),a)){process.argv.splice(s,2);var _=JSON.parse(process.env.serverless_devs_temp_argv);return _.splice(_.indexOf(r),2),process.env.serverless_devs_temp_argv=JSON.stringify(_),process.env.serverless_devs_temp_template=de.default.join(i,f),de.default.join(i,f)}else if(Fe.default.existsSync(f)&&wr(f,a)){process.argv.splice(s,2);var _=JSON.parse(process.env.serverless_devs_temp_argv);return _.splice(_.indexOf(r),2),process.env.serverless_devs_temp_argv=JSON.stringify(_),process.env.serverless_devs_temp_template=f,f}}}return Fe.default.existsSync(de.default.join(i,"s.yaml"))&&wr(de.default.join(i,"s.yaml"))?(process.env.serverless_devs_temp_template=de.default.join(i,"s.yaml"),de.default.join(i,"s.yaml")):Fe.default.existsSync(de.default.join(i,"s.yml"))&&wr(de.default.join(i,"s.yml"))?(process.env.serverless_devs_temp_template=de.default.join(i,"s.yml"),de.default.join(i,"s.yml")):Fe.default.existsSync(de.default.join(i,"s.json"))&&wr(de.default.join(i,"s.json"),!0)?(process.env.serverless_devs_temp_template=de.default.join(i,"s.json"),de.default.join(i,"s.json")):null}U.checkAndReturnTemplateFile=kc;function Qc(i){return Fe.default.existsSync(i)?i:null}U.checkTemplateFile=Qc;function eh(i,r){r===void 0&&(r=" ");for(var s="",o=0;o<i;o++)s=s+r;return s}U.printn=eh;function th(){return"en"}U.getLang=th;function Lu(i,r){var s=/\{\{(.*?)\}\}/g,o=i.match(s);if(o)for(var f=0;f<o.length;f++){var a=o[f].replace(/{{|}}/g,""),_=Cu.default.trim(a.split("|")[0]);r[_]&&(i=i.replace(o[f],r[_]))}return i}U.replaceFun=Lu;function nh(i){var r=/\{\{(.*?)\}\}/g,s=i.match(r);return s?s.filter(function(o){return o}).map(function(o){var f=o.replace(/{{|}}/g,""),a=f.split("|");return{name:Cu.default.trim(a[0]),desc:Cu.default.trim(a[1])}}):[]}U.getTemplatekey=nh;function rh(i,r){i.forEach(function(s){if(Fe.default.existsSync(s)){var o=Fe.default.readFileSync(s,"utf-8"),f=Lu(o,r);Fe.default.writeFileSync(s,f,"utf-8")}})}U.replaceTemplate=rh;function ih(i){if(!i)return i;var r=i.slice(-4);return"***********"+r}U.mark=ih;function Iw(i){return xw.default.platform()==="win32"?"":i}U.emoji=Iw;U.default={checkAndReturnTemplateFile:kc,checkTemplateFile:Qc,printn:eh,mark:ih,getLang:th,replaceTemplate:rh,replaceFun:Lu,getTemplatekey:nh}});"use strict";var sh=exports&&exports.__awaiter||function(i,r,s,o){function f(a){return a instanceof s?a:new s(function(_){_(a)})}return new(s||(s=Promise))(function(a,_){function E(x){try{p(o.next(x))}catch(I){_(I)}}function y(x){try{p(o.throw(x))}catch(I){_(I)}}function p(x){x.done?a(x.value):f(x.value).then(E,y)}p((o=o.apply(i,r||[])).next())})},uh=exports&&exports.__generator||function(i,r){var s={label:0,sent:function(){if(a[0]&1)throw a[1];return a[1]},trys:[],ops:[]},o,f,a,_;return _={next:E(0),throw:E(1),return:E(2)},typeof Symbol=="function"&&(_[Symbol.iterator]=function(){return this}),_;function E(p){return function(x){return y([p,x])}}function y(p){if(o)throw new TypeError("Generator is already executing.");for(;s;)try{if(o=1,f&&(a=p[0]&2?f.return:p[0]?f.throw||((a=f.return)&&a.call(f),0):f.next)&&!(a=a.call(f,p[1])).done)return a;switch(f=0,a&&(p=[p[0]&2,a.value]),p[0]){case 0:case 1:a=p;break;case 4:return s.label++,{value:p[1],done:!1};case 5:s.label++,f=p[1],p=[0];continue;case 7:p=s.ops.pop(),s.trys.pop();continue;default:if(a=s.trys,!(a=a.length>0&&a[a.length-1])&&(p[0]===6||p[0]===2)){s=0;continue}if(p[0]===3&&(!a||p[1]>a[0]&&p[1]<a[3])){s.label=p[1];break}if(p[0]===6&&s.label<a[1]){s.label=a[1],a=p;break}if(a&&s.label<a[2]){s.label=a[2],s.ops.push(p);break}a[2]&&s.ops.pop(),s.trys.pop();continue}p=r.call(i,s)}catch(x){p=[6,x],f=0}finally{o=a=0}if(p[0]&5)throw p[1];return{value:p[0]?p[1]:void 0,done:!0}}},xr=exports&&exports.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(exports,"__esModule",{value:!0});var bw=xr(require("path")),oh=xr(require("fs")),$u=xr(yl()),qi=xr(Sc()),Mt=$i(),Cw=bu(),Fi=xr(lt()),Tw=Fi.default.getCredential,Nu=Fi.default.colors,Lw=Fi.default.jsyaml,$w=Fi.default.getRootHome,Nw=`You can get accounts.
|
|
45
|
+
`))}return i.prototype.report=function(r){return nw(this,void 0,void 0,function(){return rw(this,function(s){return uw({type:"jsError",content:r.message+"||"+r.stack,traceId:this.traceId}),[2]})})},i}();te.HandleError=vw});var Yc=$((Ux,mw)=>{mw.exports={name:"@serverless-devs/s",version:"2.0.95-beta.1",description:"Serverless devs tool, serverless developer tool, supports Alibaba cloud, AWS, azure, baidu cloud, Huawei cloud, Google cloud and Tencent cloud.",homepage:"https://www.serverless-devs.com",keywords:["serverless","alibaba","tencent","azure","baidu","huawei","google","function","faas","serverless-devs"],publishConfig:{access:"public",registry:"https://registry.npmjs.org"},license:"MIT",repository:{type:"git",url:"https://github.com/Serverless-Devs/Serverless-Devs"},bugs:{url:"https://github.com/Serverless-Devs/Serverless-Devs/issues"},scripts:{prewatch:"rm -rf lib/* && cp -r ./src/daemon ./lib",watch:"tsc -w",test:"npx jest",prebuild:"rm -rf lib",build:"tsc && cp -r ./src/daemon ./lib",postbuild:"./shell/postbuild.sh","test:cov":"jest --coverage",lint:"npm run typecheck && f2elint scan -i src",fix:"f2elint fix",typecheck:"npx tsc -p tsconfig.json --noEmit",update:"rm -rf yarn.lock && rm -rf package-lock.json && rm -rf node_modules && yarn",beta:"npm publish --tag=beta"},main:"./lib/index.js",bin:{s:"bin/s"},devDependencies:{"@types/jest":"^27.0.1","@types/lodash":"^4.14.168","@types/node":"^14.0.23","@typescript-eslint/eslint-plugin":"^4.14.1","@typescript-eslint/parser":"^4.14.1","babel-eslint":"^10.1.0",boxen:"^5.0.0",commander:"^6.0.0",dotenv:"^10.0.0",esbuild:"^0.13.6",eslint:"^7.7.0","eslint-config-prettier":"^7.2.0","eslint-plugin-import":"^2.20.1","eslint-plugin-prettier":"^3.1.2",husky:"^4.2.3",inquirer:"^8.2.0","inquirer-autocomplete-prompt":"^1.3.0",jest:"^27.1.0","latest-version":"^5.1.0","lint-staged":"^10.0.8",lodash:"^4.17.20","os-locale":"5.0.0",prettier:"^2.2.1",semver:"^7.3.5","semver-diff":"^3.1.1","ts-jest":"^27.0.1","ts-node":"^9.1.1","tty-table":"^4.1.5",typescript:"^4.1.3"},"lint-staged":{"**/*.{js,jsx,ts}":"f2elint exec eslint"},jest:{coverageDirectory:"coverage",testEnvironment:"node",coverageProvider:"v8",preset:"ts-jest",testMatch:["**/test/**/*test.[jt]s"],setupFilesAfterEnv:["./jest.setup.ts"]},dependencies:{"@serverless-devs/core":"^0.1.15-beta.2"}}});var $i=$(U=>{"use strict";var Ew=U&&U.__createBinding||(Object.create?function(i,r,s,o){o===void 0&&(o=s),Object.defineProperty(i,o,{enumerable:!0,get:function(){return r[s]}})}:function(i,r,s,o){o===void 0&&(o=s),i[o]=r[s]}),yw=U&&U.__setModuleDefault||(Object.create?function(i,r){Object.defineProperty(i,"default",{enumerable:!0,value:r})}:function(i,r){i.default=r}),ww=U&&U.__importStar||function(i){if(i&&i.__esModule)return i;var r={};if(i!=null)for(var s in i)s!=="default"&&Object.prototype.hasOwnProperty.call(i,s)&&Ew(r,i,s);return yw(r,i),r},Kc=U&&U.__awaiter||function(i,r,s,o){function f(a){return a instanceof s?a:new s(function(_){_(a)})}return new(s||(s=Promise))(function(a,_){function E(x){try{p(o.next(x))}catch(I){_(I)}}function y(x){try{p(o.throw(x))}catch(I){_(I)}}function p(x){x.done?a(x.value):f(x.value).then(E,y)}p((o=o.apply(i,r||[])).next())})},Zc=U&&U.__generator||function(i,r){var s={label:0,sent:function(){if(a[0]&1)throw a[1];return a[1]},trys:[],ops:[]},o,f,a,_;return _={next:E(0),throw:E(1),return:E(2)},typeof Symbol=="function"&&(_[Symbol.iterator]=function(){return this}),_;function E(p){return function(x){return y([p,x])}}function y(p){if(o)throw new TypeError("Generator is already executing.");for(;s;)try{if(o=1,f&&(a=p[0]&2?f.return:p[0]?f.throw||((a=f.return)&&a.call(f),0):f.next)&&!(a=a.call(f,p[1])).done)return a;switch(f=0,a&&(p=[p[0]&2,a.value]),p[0]){case 0:case 1:a=p;break;case 4:return s.label++,{value:p[1],done:!1};case 5:s.label++,f=p[1],p=[0];continue;case 7:p=s.ops.pop(),s.trys.pop();continue;default:if(a=s.trys,!(a=a.length>0&&a[a.length-1])&&(p[0]===6||p[0]===2)){s=0;continue}if(p[0]===3&&(!a||p[1]>a[0]&&p[1]<a[3])){s.label=p[1];break}if(p[0]===6&&s.label<a[1]){s.label=a[1],a=p;break}if(a&&s.label<a[2]){s.label=a[2],s.ops.push(p);break}a[2]&&s.ops.pop(),s.trys.pop();continue}p=r.call(i,s)}catch(x){p=[6,x],f=0}finally{o=a=0}if(p[0]&5)throw p[1];return{value:p[0]?p[1]:void 0,done:!0}}},Ni=U&&U.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(U,"__esModule",{value:!0});U.emoji=U.mark=U.replaceTemplate=U.getTemplatekey=U.replaceFun=U.getLang=U.printn=U.checkTemplateFile=U.checkAndReturnTemplateFile=U.yamlLoad=U.getFolderSize=U.getVersion=U.bgRed=U.red=void 0;var de=Ni(require("path")),Fe=Ni(require("fs")),Cu=Ni(Rc()),xw=Ni(require("os")),Aw=bu(),Pi=ww(lt()),Tu=Pi.default.colors,Ow=Pi.default.jsyaml,Di=Yc();U.red=Tu.hex("#fd5750");U.bgRed=Tu.hex("#000").bgHex("#fd5750");function Sw(){return(0,Pi.getCoreVersion)()?Di.name+": "+Di.version+", @serverless-devs/core: "+(0,Pi.getCoreVersion)()+", "+process.platform+"-"+process.arch+", node-"+process.version:Di.name+": "+Di.version+", "+process.platform+"-"+process.arch+", node-"+process.version}U.getVersion=Sw;function Rw(i){return Kc(this,void 0,void 0,function(){function r(f){return Kc(this,void 0,void 0,function(){var a,_;return Zc(this,function(E){switch(E.label){case 0:return a=Fe.default.lstatSync(f),typeof a!="object"?[2]:(s.set(a.ino,a.size),a.isDirectory()?(_=Fe.default.readdirSync(f),typeof _!="object"?[2]:[4,Promise.all(_.map(function(y){return r(de.default.join(f,y))}))]):[3,2]);case 1:E.sent(),E.label=2;case 2:return[2]}})})}var s,o;return Zc(this,function(f){switch(f.label){case 0:return s=new Map,[4,r(i)];case 1:return f.sent(),o=Array.from(s.values()).reduce(function(a,_){return a+_},0),[2,o]}})})}U.getFolderSize=Rw;function Jc(i){var r=Fe.default.readFileSync(i,"utf8");try{return Ow.load(r)}catch{if(["-h","--help"].includes(process.argv[2]))return;var s=de.default.basename(i);new Aw.HumanError({errorMessage:s+" format is incorrect",tips:"Please check the configuration of "+s+", Serverless Devs' Yaml specification document can refer to\uFF1A"+Tu.underline("https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/yaml.md")}),process.exit(1)}}U.yamlLoad=Jc;function wr(i,r){r===void 0&&(r=!1);var s=Fe.default.readFileSync(i,"utf8"),o=r?JSON.parse(s):Jc(i);if(!o)return!1;for(var f in o)if(o[f].Component&&o[f].Provider&&o[f].Properties)return!0;return o.hasOwnProperty("edition")}function kc(){if(process.env.serverless_devs_temp_template)return process.env.serverless_devs_temp_template;var i=process.cwd(),r=process.argv.includes("-t")?"-t":process.argv.includes("--template")?"--template":null,s=r?process.argv.indexOf(r):-1;if(s!==-1){var o=s+1,f=process.argv[o];if(f&&(f.endsWith(".yaml")||f.endsWith(".yml")||f.endsWith(".json"))){var a=!!f.endsWith(".json");if(Fe.default.existsSync(de.default.join(i,f))&&wr(de.default.join(i,f),a)){process.argv.splice(s,2);var _=JSON.parse(process.env.serverless_devs_temp_argv);return _.splice(_.indexOf(r),2),process.env.serverless_devs_temp_argv=JSON.stringify(_),process.env.serverless_devs_temp_template=de.default.join(i,f),de.default.join(i,f)}else if(Fe.default.existsSync(f)&&wr(f,a)){process.argv.splice(s,2);var _=JSON.parse(process.env.serverless_devs_temp_argv);return _.splice(_.indexOf(r),2),process.env.serverless_devs_temp_argv=JSON.stringify(_),process.env.serverless_devs_temp_template=f,f}}}return Fe.default.existsSync(de.default.join(i,"s.yaml"))&&wr(de.default.join(i,"s.yaml"))?(process.env.serverless_devs_temp_template=de.default.join(i,"s.yaml"),de.default.join(i,"s.yaml")):Fe.default.existsSync(de.default.join(i,"s.yml"))&&wr(de.default.join(i,"s.yml"))?(process.env.serverless_devs_temp_template=de.default.join(i,"s.yml"),de.default.join(i,"s.yml")):Fe.default.existsSync(de.default.join(i,"s.json"))&&wr(de.default.join(i,"s.json"),!0)?(process.env.serverless_devs_temp_template=de.default.join(i,"s.json"),de.default.join(i,"s.json")):null}U.checkAndReturnTemplateFile=kc;function Qc(i){return Fe.default.existsSync(i)?i:null}U.checkTemplateFile=Qc;function eh(i,r){r===void 0&&(r=" ");for(var s="",o=0;o<i;o++)s=s+r;return s}U.printn=eh;function th(){return"en"}U.getLang=th;function Lu(i,r){var s=/\{\{(.*?)\}\}/g,o=i.match(s);if(o)for(var f=0;f<o.length;f++){var a=o[f].replace(/{{|}}/g,""),_=Cu.default.trim(a.split("|")[0]);r[_]&&(i=i.replace(o[f],r[_]))}return i}U.replaceFun=Lu;function nh(i){var r=/\{\{(.*?)\}\}/g,s=i.match(r);return s?s.filter(function(o){return o}).map(function(o){var f=o.replace(/{{|}}/g,""),a=f.split("|");return{name:Cu.default.trim(a[0]),desc:Cu.default.trim(a[1])}}):[]}U.getTemplatekey=nh;function rh(i,r){i.forEach(function(s){if(Fe.default.existsSync(s)){var o=Fe.default.readFileSync(s,"utf-8"),f=Lu(o,r);Fe.default.writeFileSync(s,f,"utf-8")}})}U.replaceTemplate=rh;function ih(i){if(!i)return i;var r=i.slice(-4);return"***********"+r}U.mark=ih;function Iw(i){return xw.default.platform()==="win32"?"":i}U.emoji=Iw;U.default={checkAndReturnTemplateFile:kc,checkTemplateFile:Qc,printn:eh,mark:ih,getLang:th,replaceTemplate:rh,replaceFun:Lu,getTemplatekey:nh}});"use strict";var sh=exports&&exports.__awaiter||function(i,r,s,o){function f(a){return a instanceof s?a:new s(function(_){_(a)})}return new(s||(s=Promise))(function(a,_){function E(x){try{p(o.next(x))}catch(I){_(I)}}function y(x){try{p(o.throw(x))}catch(I){_(I)}}function p(x){x.done?a(x.value):f(x.value).then(E,y)}p((o=o.apply(i,r||[])).next())})},uh=exports&&exports.__generator||function(i,r){var s={label:0,sent:function(){if(a[0]&1)throw a[1];return a[1]},trys:[],ops:[]},o,f,a,_;return _={next:E(0),throw:E(1),return:E(2)},typeof Symbol=="function"&&(_[Symbol.iterator]=function(){return this}),_;function E(p){return function(x){return y([p,x])}}function y(p){if(o)throw new TypeError("Generator is already executing.");for(;s;)try{if(o=1,f&&(a=p[0]&2?f.return:p[0]?f.throw||((a=f.return)&&a.call(f),0):f.next)&&!(a=a.call(f,p[1])).done)return a;switch(f=0,a&&(p=[p[0]&2,a.value]),p[0]){case 0:case 1:a=p;break;case 4:return s.label++,{value:p[1],done:!1};case 5:s.label++,f=p[1],p=[0];continue;case 7:p=s.ops.pop(),s.trys.pop();continue;default:if(a=s.trys,!(a=a.length>0&&a[a.length-1])&&(p[0]===6||p[0]===2)){s=0;continue}if(p[0]===3&&(!a||p[1]>a[0]&&p[1]<a[3])){s.label=p[1];break}if(p[0]===6&&s.label<a[1]){s.label=a[1],a=p;break}if(a&&s.label<a[2]){s.label=a[2],s.ops.push(p);break}a[2]&&s.ops.pop(),s.trys.pop();continue}p=r.call(i,s)}catch(x){p=[6,x],f=0}finally{o=a=0}if(p[0]&5)throw p[1];return{value:p[0]?p[1]:void 0,done:!0}}},xr=exports&&exports.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(exports,"__esModule",{value:!0});var bw=xr(require("path")),oh=xr(require("fs")),$u=xr(yl()),qi=xr(Sc()),Mt=$i(),Cw=bu(),Fi=xr(lt()),Tw=Fi.default.getCredential,Nu=Fi.default.colors,Lw=Fi.default.jsyaml,$w=Fi.default.getRootHome,Nw=`You can get accounts.
|
|
46
46
|
|
|
47
47
|
Example:
|
|
48
48
|
$ s config get
|
package/lib/config/index.js
CHANGED
|
@@ -37,12 +37,12 @@ function print() { __p += __j.call(arguments, '') }
|
|
|
37
37
|
`)}return i.prototype.report=function(r){return Ly(this,void 0,void 0,function(){var s;return $y(this,function(o){switch(o.label){case 0:return s=r.error,[4,Pc.default.report({type:"jsError",content:this.errorMessage+"||"+s.stack})];case 1:return o.sent(),[2]}})})},i}();lt.HumanError=qy});var Fc=T($n=>{"use strict";var Fy=$n&&$n.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty($n,"__esModule",{value:!0});$n.HumanWarning=void 0;var My=Fy(At()),qc=My.default.colors,Hy=function(){function i(r){var s=r.warningMessage,o=r.tips;console.log(`
|
|
38
38
|
`+qc.hex("#000").bgYellow("WARNING:")),console.log(s+`
|
|
39
39
|
`),o&&console.log(qc.gray(o)+`
|
|
40
|
-
`)}return i}();$n.HumanWarning=Hy});var Mc=T(te=>{"use strict";var Gy=te&&te.__awaiter||function(i,r,s,o){function l(f){return f instanceof s?f:new s(function(_){_(f)})}return new(s||(s=Promise))(function(f,_){function E(S){try{g(o.next(S))}catch(C){_(C)}}function w(S){try{g(o.throw(S))}catch(C){_(C)}}function g(S){S.done?f(S.value):l(S.value).then(E,w)}g((o=o.apply(i,r||[])).next())})},Wy=te&&te.__generator||function(i,r){var s={label:0,sent:function(){if(f[0]&1)throw f[1];return f[1]},trys:[],ops:[]},o,l,f,_;return _={next:E(0),throw:E(1),return:E(2)},typeof Symbol=="function"&&(_[Symbol.iterator]=function(){return this}),_;function E(g){return function(S){return w([g,S])}}function w(g){if(o)throw new TypeError("Generator is already executing.");for(;s;)try{if(o=1,l&&(f=g[0]&2?l.return:g[0]?l.throw||((f=l.return)&&f.call(l),0):l.next)&&!(f=f.call(l,g[1])).done)return f;switch(l=0,f&&(g=[g[0]&2,f.value]),g[0]){case 0:case 1:f=g;break;case 4:return s.label++,{value:g[1],done:!1};case 5:s.label++,l=g[1],g=[0];continue;case 7:g=s.ops.pop(),s.trys.pop();continue;default:if(f=s.trys,!(f=f.length>0&&f[f.length-1])&&(g[0]===6||g[0]===2)){s=0;continue}if(g[0]===3&&(!f||g[1]>f[0]&&g[1]<f[3])){s.label=g[1];break}if(g[0]===6&&s.label<f[1]){s.label=f[1],f=g;break}if(f&&s.label<f[2]){s.label=f[2],s.ops.push(g);break}f[2]&&s.ops.pop(),s.trys.pop();continue}g=r.call(i,s)}catch(S){g=[6,S],l=0}finally{o=f=0}if(g[0]&5)throw g[1];return{value:g[0]?g[1]:void 0,done:!0}}},Uy=te&&te.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(te,"__esModule",{value:!0});te.HandleError=te.HumanWarning=te.HumanError=te.ServerlessError=te.InitError=te.ConfigGetError=te.ConfigError=te.ConfigDeleteError=te.CommandError=void 0;var Eu=Ii(),By=Cc(),yu=Uy(At()),rn=yu.default.colors,Xy=yu.default.report,jy=yu.default.getMAC,zy=bc();Object.defineProperty(te,"CommandError",{enumerable:!0,get:function(){return zy.CommandError}});var Vy=Tc();Object.defineProperty(te,"ConfigDeleteError",{enumerable:!0,get:function(){return Vy.ConfigDeleteError}});var Yy=Lc();Object.defineProperty(te,"ConfigError",{enumerable:!0,get:function(){return Yy.ConfigError}});var Ky=$c();Object.defineProperty(te,"ConfigGetError",{enumerable:!0,get:function(){return Ky.ConfigGetError}});var Zy=Nc();Object.defineProperty(te,"InitError",{enumerable:!0,get:function(){return Zy.InitError}});var Jy=nn();Object.defineProperty(te,"ServerlessError",{enumerable:!0,get:function(){return Jy.ServerlessError}});var ky=Dc();Object.defineProperty(te,"HumanError",{enumerable:!0,get:function(){return ky.HumanError}});var Qy=Fc();Object.defineProperty(te,"HumanWarning",{enumerable:!0,get:function(){return Qy.HumanWarning}});
|
|
40
|
+
`)}return i}();$n.HumanWarning=Hy});var Mc=T(te=>{"use strict";var Gy=te&&te.__awaiter||function(i,r,s,o){function l(f){return f instanceof s?f:new s(function(_){_(f)})}return new(s||(s=Promise))(function(f,_){function E(S){try{g(o.next(S))}catch(C){_(C)}}function w(S){try{g(o.throw(S))}catch(C){_(C)}}function g(S){S.done?f(S.value):l(S.value).then(E,w)}g((o=o.apply(i,r||[])).next())})},Wy=te&&te.__generator||function(i,r){var s={label:0,sent:function(){if(f[0]&1)throw f[1];return f[1]},trys:[],ops:[]},o,l,f,_;return _={next:E(0),throw:E(1),return:E(2)},typeof Symbol=="function"&&(_[Symbol.iterator]=function(){return this}),_;function E(g){return function(S){return w([g,S])}}function w(g){if(o)throw new TypeError("Generator is already executing.");for(;s;)try{if(o=1,l&&(f=g[0]&2?l.return:g[0]?l.throw||((f=l.return)&&f.call(l),0):l.next)&&!(f=f.call(l,g[1])).done)return f;switch(l=0,f&&(g=[g[0]&2,f.value]),g[0]){case 0:case 1:f=g;break;case 4:return s.label++,{value:g[1],done:!1};case 5:s.label++,l=g[1],g=[0];continue;case 7:g=s.ops.pop(),s.trys.pop();continue;default:if(f=s.trys,!(f=f.length>0&&f[f.length-1])&&(g[0]===6||g[0]===2)){s=0;continue}if(g[0]===3&&(!f||g[1]>f[0]&&g[1]<f[3])){s.label=g[1];break}if(g[0]===6&&s.label<f[1]){s.label=f[1],f=g;break}if(f&&s.label<f[2]){s.label=f[2],s.ops.push(g);break}f[2]&&s.ops.pop(),s.trys.pop();continue}g=r.call(i,s)}catch(S){g=[6,S],l=0}finally{o=f=0}if(g[0]&5)throw g[1];return{value:g[0]?g[1]:void 0,done:!0}}},Uy=te&&te.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(te,"__esModule",{value:!0});te.HandleError=te.HumanWarning=te.HumanError=te.ServerlessError=te.InitError=te.ConfigGetError=te.ConfigError=te.ConfigDeleteError=te.CommandError=void 0;var Eu=Ii(),By=Cc(),yu=Uy(At()),rn=yu.default.colors,Xy=yu.default.report,jy=yu.default.getMAC,zy=bc();Object.defineProperty(te,"CommandError",{enumerable:!0,get:function(){return zy.CommandError}});var Vy=Tc();Object.defineProperty(te,"ConfigDeleteError",{enumerable:!0,get:function(){return Vy.ConfigDeleteError}});var Yy=Lc();Object.defineProperty(te,"ConfigError",{enumerable:!0,get:function(){return Yy.ConfigError}});var Ky=$c();Object.defineProperty(te,"ConfigGetError",{enumerable:!0,get:function(){return Ky.ConfigGetError}});var Zy=Nc();Object.defineProperty(te,"InitError",{enumerable:!0,get:function(){return Zy.InitError}});var Jy=nn();Object.defineProperty(te,"ServerlessError",{enumerable:!0,get:function(){return Jy.ServerlessError}});var ky=Dc();Object.defineProperty(te,"HumanError",{enumerable:!0,get:function(){return ky.HumanError}});var Qy=Fc();Object.defineProperty(te,"HumanWarning",{enumerable:!0,get:function(){return Qy.HumanWarning}});function ew(){try{return jy().replace(/:/g,"")}catch{return"unknown"}}function wu(i,r){return""+rn.gray(i)+rn.gray.underline(r)}var tw=function(){function i(r){var s=r.error,o=r.prefix,l=o===void 0?"Message:":o;this.traceId=""+ew()+Date.now(),console.log((0,Eu.red)("\u2716 "+l+`
|
|
41
41
|
`));var f=(0,By.getConfig)("analysis");f!=="disable"&&console.log(rn.gray("TraceId: "+this.traceId)),console.log(rn.gray("Environment: "+(0,Eu.getVersion)())),console.log(wu("Documents: ","https://www.serverless-devs.com")),console.log(wu("Discussions: ","https://github.com/Serverless-Devs/Serverless-Devs/discussions")),console.log(wu("Issues: ",`https://github.com/Serverless-Devs/Serverless-Devs/issues
|
|
42
42
|
`)),console.log((0,Eu.bgRed)("ERROR:")+`
|
|
43
43
|
`+s+`
|
|
44
44
|
`),f!=="disable"&&console.log(rn.gray("Please copy traceId: "+this.traceId+" and join Dingding group: 33947367 for consultation.")),console.log(rn.gray("You can run 's clean --cache' to prune Serverless devs.")),console.log(rn.gray(`And run again with the '--debug' option or 's -h' to get more logs.
|
|
45
|
-
`))}return i.prototype.report=function(r){return Gy(this,void 0,void 0,function(){return Wy(this,function(s){return Xy({type:"jsError",content:r.message+"||"+r.stack,traceId:this.traceId}),[2]})})},i}();te.HandleError=tw});var Hc=T((wx,nw)=>{nw.exports={name:"@serverless-devs/s",version:"2.0.
|
|
45
|
+
`))}return i.prototype.report=function(r){return Gy(this,void 0,void 0,function(){return Wy(this,function(s){return Xy({type:"jsError",content:r.message+"||"+r.stack,traceId:this.traceId}),[2]})})},i}();te.HandleError=tw});var Hc=T((wx,nw)=>{nw.exports={name:"@serverless-devs/s",version:"2.0.95-beta.1",description:"Serverless devs tool, serverless developer tool, supports Alibaba cloud, AWS, azure, baidu cloud, Huawei cloud, Google cloud and Tencent cloud.",homepage:"https://www.serverless-devs.com",keywords:["serverless","alibaba","tencent","azure","baidu","huawei","google","function","faas","serverless-devs"],publishConfig:{access:"public",registry:"https://registry.npmjs.org"},license:"MIT",repository:{type:"git",url:"https://github.com/Serverless-Devs/Serverless-Devs"},bugs:{url:"https://github.com/Serverless-Devs/Serverless-Devs/issues"},scripts:{prewatch:"rm -rf lib/* && cp -r ./src/daemon ./lib",watch:"tsc -w",test:"npx jest",prebuild:"rm -rf lib",build:"tsc && cp -r ./src/daemon ./lib",postbuild:"./shell/postbuild.sh","test:cov":"jest --coverage",lint:"npm run typecheck && f2elint scan -i src",fix:"f2elint fix",typecheck:"npx tsc -p tsconfig.json --noEmit",update:"rm -rf yarn.lock && rm -rf package-lock.json && rm -rf node_modules && yarn",beta:"npm publish --tag=beta"},main:"./lib/index.js",bin:{s:"bin/s"},devDependencies:{"@types/jest":"^27.0.1","@types/lodash":"^4.14.168","@types/node":"^14.0.23","@typescript-eslint/eslint-plugin":"^4.14.1","@typescript-eslint/parser":"^4.14.1","babel-eslint":"^10.1.0",boxen:"^5.0.0",commander:"^6.0.0",dotenv:"^10.0.0",esbuild:"^0.13.6",eslint:"^7.7.0","eslint-config-prettier":"^7.2.0","eslint-plugin-import":"^2.20.1","eslint-plugin-prettier":"^3.1.2",husky:"^4.2.3",inquirer:"^8.2.0","inquirer-autocomplete-prompt":"^1.3.0",jest:"^27.1.0","latest-version":"^5.1.0","lint-staged":"^10.0.8",lodash:"^4.17.20","os-locale":"5.0.0",prettier:"^2.2.1",semver:"^7.3.5","semver-diff":"^3.1.1","ts-jest":"^27.0.1","ts-node":"^9.1.1","tty-table":"^4.1.5",typescript:"^4.1.3"},"lint-staged":{"**/*.{js,jsx,ts}":"f2elint exec eslint"},jest:{coverageDirectory:"coverage",testEnvironment:"node",coverageProvider:"v8",preset:"ts-jest",testMatch:["**/test/**/*test.[jt]s"],setupFilesAfterEnv:["./jest.setup.ts"]},dependencies:{"@serverless-devs/core":"^0.1.15-beta.2"}}});var Ii=T(W=>{"use strict";var rw=W&&W.__createBinding||(Object.create?function(i,r,s,o){o===void 0&&(o=s),Object.defineProperty(i,o,{enumerable:!0,get:function(){return r[s]}})}:function(i,r,s,o){o===void 0&&(o=s),i[o]=r[s]}),iw=W&&W.__setModuleDefault||(Object.create?function(i,r){Object.defineProperty(i,"default",{enumerable:!0,value:r})}:function(i,r){i.default=r}),sw=W&&W.__importStar||function(i){if(i&&i.__esModule)return i;var r={};if(i!=null)for(var s in i)s!=="default"&&Object.prototype.hasOwnProperty.call(i,s)&&rw(r,i,s);return iw(r,i),r},Gc=W&&W.__awaiter||function(i,r,s,o){function l(f){return f instanceof s?f:new s(function(_){_(f)})}return new(s||(s=Promise))(function(f,_){function E(S){try{g(o.next(S))}catch(C){_(C)}}function w(S){try{g(o.throw(S))}catch(C){_(C)}}function g(S){S.done?f(S.value):l(S.value).then(E,w)}g((o=o.apply(i,r||[])).next())})},Wc=W&&W.__generator||function(i,r){var s={label:0,sent:function(){if(f[0]&1)throw f[1];return f[1]},trys:[],ops:[]},o,l,f,_;return _={next:E(0),throw:E(1),return:E(2)},typeof Symbol=="function"&&(_[Symbol.iterator]=function(){return this}),_;function E(g){return function(S){return w([g,S])}}function w(g){if(o)throw new TypeError("Generator is already executing.");for(;s;)try{if(o=1,l&&(f=g[0]&2?l.return:g[0]?l.throw||((f=l.return)&&f.call(l),0):l.next)&&!(f=f.call(l,g[1])).done)return f;switch(l=0,f&&(g=[g[0]&2,f.value]),g[0]){case 0:case 1:f=g;break;case 4:return s.label++,{value:g[1],done:!1};case 5:s.label++,l=g[1],g=[0];continue;case 7:g=s.ops.pop(),s.trys.pop();continue;default:if(f=s.trys,!(f=f.length>0&&f[f.length-1])&&(g[0]===6||g[0]===2)){s=0;continue}if(g[0]===3&&(!f||g[1]>f[0]&&g[1]<f[3])){s.label=g[1];break}if(g[0]===6&&s.label<f[1]){s.label=f[1],f=g;break}if(f&&s.label<f[2]){s.label=f[2],s.ops.push(g);break}f[2]&&s.ops.pop(),s.trys.pop();continue}g=r.call(i,s)}catch(S){g=[6,S],l=0}finally{o=f=0}if(g[0]&5)throw g[1];return{value:g[0]?g[1]:void 0,done:!0}}},Ci=W&&W.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(W,"__esModule",{value:!0});W.emoji=W.mark=W.replaceTemplate=W.getTemplatekey=W.replaceFun=W.getLang=W.printn=W.checkTemplateFile=W.checkAndReturnTemplateFile=W.yamlLoad=W.getFolderSize=W.getVersion=W.bgRed=W.red=void 0;var ge=Ci(require("path")),Fe=Ci(require("fs")),xu=Ci(pl()),uw=Ci(require("os")),ow=Mc(),bi=sw(At()),Au=bi.default.colors,aw=bi.default.jsyaml,Ti=Hc();W.red=Au.hex("#fd5750");W.bgRed=Au.hex("#000").bgHex("#fd5750");function lw(){return(0,bi.getCoreVersion)()?Ti.name+": "+Ti.version+", @serverless-devs/core: "+(0,bi.getCoreVersion)()+", "+process.platform+"-"+process.arch+", node-"+process.version:Ti.name+": "+Ti.version+", "+process.platform+"-"+process.arch+", node-"+process.version}W.getVersion=lw;function fw(i){return Gc(this,void 0,void 0,function(){function r(l){return Gc(this,void 0,void 0,function(){var f,_;return Wc(this,function(E){switch(E.label){case 0:return f=Fe.default.lstatSync(l),typeof f!="object"?[2]:(s.set(f.ino,f.size),f.isDirectory()?(_=Fe.default.readdirSync(l),typeof _!="object"?[2]:[4,Promise.all(_.map(function(w){return r(ge.default.join(l,w))}))]):[3,2]);case 1:E.sent(),E.label=2;case 2:return[2]}})})}var s,o;return Wc(this,function(l){switch(l.label){case 0:return s=new Map,[4,r(i)];case 1:return l.sent(),o=Array.from(s.values()).reduce(function(f,_){return f+_},0),[2,o]}})})}W.getFolderSize=fw;function Uc(i){var r=Fe.default.readFileSync(i,"utf8");try{return aw.load(r)}catch{if(["-h","--help"].includes(process.argv[2]))return;var s=ge.default.basename(i);new ow.HumanError({errorMessage:s+" format is incorrect",tips:"Please check the configuration of "+s+", Serverless Devs' Yaml specification document can refer to\uFF1A"+Au.underline("https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/yaml.md")}),process.exit(1)}}W.yamlLoad=Uc;function mr(i,r){r===void 0&&(r=!1);var s=Fe.default.readFileSync(i,"utf8"),o=r?JSON.parse(s):Uc(i);if(!o)return!1;for(var l in o)if(o[l].Component&&o[l].Provider&&o[l].Properties)return!0;return o.hasOwnProperty("edition")}function Bc(){if(process.env.serverless_devs_temp_template)return process.env.serverless_devs_temp_template;var i=process.cwd(),r=process.argv.includes("-t")?"-t":process.argv.includes("--template")?"--template":null,s=r?process.argv.indexOf(r):-1;if(s!==-1){var o=s+1,l=process.argv[o];if(l&&(l.endsWith(".yaml")||l.endsWith(".yml")||l.endsWith(".json"))){var f=!!l.endsWith(".json");if(Fe.default.existsSync(ge.default.join(i,l))&&mr(ge.default.join(i,l),f)){process.argv.splice(s,2);var _=JSON.parse(process.env.serverless_devs_temp_argv);return _.splice(_.indexOf(r),2),process.env.serverless_devs_temp_argv=JSON.stringify(_),process.env.serverless_devs_temp_template=ge.default.join(i,l),ge.default.join(i,l)}else if(Fe.default.existsSync(l)&&mr(l,f)){process.argv.splice(s,2);var _=JSON.parse(process.env.serverless_devs_temp_argv);return _.splice(_.indexOf(r),2),process.env.serverless_devs_temp_argv=JSON.stringify(_),process.env.serverless_devs_temp_template=l,l}}}return Fe.default.existsSync(ge.default.join(i,"s.yaml"))&&mr(ge.default.join(i,"s.yaml"))?(process.env.serverless_devs_temp_template=ge.default.join(i,"s.yaml"),ge.default.join(i,"s.yaml")):Fe.default.existsSync(ge.default.join(i,"s.yml"))&&mr(ge.default.join(i,"s.yml"))?(process.env.serverless_devs_temp_template=ge.default.join(i,"s.yml"),ge.default.join(i,"s.yml")):Fe.default.existsSync(ge.default.join(i,"s.json"))&&mr(ge.default.join(i,"s.json"),!0)?(process.env.serverless_devs_temp_template=ge.default.join(i,"s.json"),ge.default.join(i,"s.json")):null}W.checkAndReturnTemplateFile=Bc;function Xc(i){return Fe.default.existsSync(i)?i:null}W.checkTemplateFile=Xc;function jc(i,r){r===void 0&&(r=" ");for(var s="",o=0;o<i;o++)s=s+r;return s}W.printn=jc;function zc(){return"en"}W.getLang=zc;function Ou(i,r){var s=/\{\{(.*?)\}\}/g,o=i.match(s);if(o)for(var l=0;l<o.length;l++){var f=o[l].replace(/{{|}}/g,""),_=xu.default.trim(f.split("|")[0]);r[_]&&(i=i.replace(o[l],r[_]))}return i}W.replaceFun=Ou;function Vc(i){var r=/\{\{(.*?)\}\}/g,s=i.match(r);return s?s.filter(function(o){return o}).map(function(o){var l=o.replace(/{{|}}/g,""),f=l.split("|");return{name:xu.default.trim(f[0]),desc:xu.default.trim(f[1])}}):[]}W.getTemplatekey=Vc;function Yc(i,r){i.forEach(function(s){if(Fe.default.existsSync(s)){var o=Fe.default.readFileSync(s,"utf-8"),l=Ou(o,r);Fe.default.writeFileSync(s,l,"utf-8")}})}W.replaceTemplate=Yc;function Kc(i){if(!i)return i;var r=i.slice(-4);return"***********"+r}W.mark=Kc;function cw(i){return uw.default.platform()==="win32"?"":i}W.emoji=cw;W.default={checkAndReturnTemplateFile:Bc,checkTemplateFile:Xc,printn:jc,mark:Kc,getLang:zc,replaceTemplate:Yc,replaceFun:Ou,getTemplatekey:Vc}});"use strict";var Zc=exports&&exports.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(exports,"__esModule",{value:!0});var hw=Zc(hl()),Li=Ii(),pw=Zc(At()),gw=pw.default.colors,dw=`Configure venders account, including Alibaba Cloud, Baidu Cloud, Huawei Cloud, Tencent Cloud, etc.
|
|
46
46
|
|
|
47
47
|
`+(0,Li.emoji)("\u{1F4D6}")+" Document: "+gw.underline("https://github.com/Serverless-Devs/Serverless-Devs/tree/master/docs/zh/command/config.md");hw.default.name("s config").usage("[commands] [options]").helpOption("-h, --help","Display help for command").command("add",(0,Li.emoji)("\u2795")+" Add an account").command("get",(0,Li.emoji)("\u2714\uFE0F")+" Get accounts").command("delete",(0,Li.emoji)("\u2716\uFE0F")+" Delete an account").description(dw).addHelpCommand(!1).parse(process.argv);
|
|
48
48
|
/**
|
package/lib/error/index.js
CHANGED
|
@@ -61,14 +61,21 @@ var human_error_1 = require("./human-error");
|
|
|
61
61
|
Object.defineProperty(exports, "HumanError", { enumerable: true, get: function () { return human_error_1.HumanError; } });
|
|
62
62
|
var human_warning_1 = require("./human-warning");
|
|
63
63
|
Object.defineProperty(exports, "HumanWarning", { enumerable: true, get: function () { return human_warning_1.HumanWarning; } });
|
|
64
|
-
|
|
64
|
+
function getPid() {
|
|
65
|
+
try {
|
|
66
|
+
return getMAC().replace(/:/g, '');
|
|
67
|
+
}
|
|
68
|
+
catch (error) {
|
|
69
|
+
return 'unknown';
|
|
70
|
+
}
|
|
71
|
+
}
|
|
65
72
|
function underline(prefix, link) {
|
|
66
73
|
return "" + colors.gray(prefix) + colors.gray.underline(link);
|
|
67
74
|
}
|
|
68
75
|
var HandleError = /** @class */ (function () {
|
|
69
76
|
function HandleError(configs) {
|
|
70
77
|
var error = configs.error, _a = configs.prefix, prefix = _a === void 0 ? 'Message:' : _a;
|
|
71
|
-
this.traceId = "" +
|
|
78
|
+
this.traceId = "" + getPid() + Date.now();
|
|
72
79
|
console.log((0, common_1.red)("\u2716 " + prefix + "\n"));
|
|
73
80
|
var analysis = (0, handler_set_config_1.getConfig)('analysis');
|
|
74
81
|
if (analysis !== 'disable') {
|
|
@@ -100,4 +107,4 @@ var HandleError = /** @class */ (function () {
|
|
|
100
107
|
return HandleError;
|
|
101
108
|
}());
|
|
102
109
|
exports.HandleError = HandleError;
|
|
103
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZXJyb3IvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsY0FBYztBQUNkLDBDQUF5RDtBQUN6RCxrRUFBd0Q7QUFDeEQsdURBQWlDO0FBQ3pCLElBQUEsTUFBTSxHQUFxQixjQUFJLE9BQXpCLEVBQUUsTUFBTSxHQUFhLGNBQUksT0FBakIsRUFBRSxNQUFNLEdBQUssY0FBSSxPQUFULENBQVU7QUFDeEMsaURBQStDO0FBQXRDLDZHQUFBLFlBQVksT0FBQTtBQUNyQiw2REFBMEQ7QUFBakQsd0hBQUEsaUJBQWlCLE9BQUE7QUFDMUIsK0NBQTZDO0FBQXBDLDJHQUFBLFdBQVcsT0FBQTtBQUNwQix1REFBb0Q7QUFBM0Msa0hBQUEsY0FBYyxPQUFBO0FBQ3ZCLDJDQUF5QztBQUFoQyx1R0FBQSxTQUFTLE9BQUE7QUFDbEIsdURBQXFEO0FBQTVDLG1IQUFBLGVBQWUsT0FBQTtBQUN4Qiw2Q0FBMkM7QUFBbEMseUdBQUEsVUFBVSxPQUFBO0FBQ25CLGlEQUErQztBQUF0Qyw2R0FBQSxZQUFZLE9BQUE7QUFFckIsU0FBUyxNQUFNO0lBQ2IsSUFBSTtRQUNGLE9BQU8sTUFBTSxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQztLQUNuQztJQUFDLE9BQU8sS0FBSyxFQUFFO1FBQ2QsT0FBTyxTQUFTLENBQUM7S0FDbEI7QUFDSCxDQUFDO0FBRUQsU0FBUyxTQUFTLENBQUMsTUFBYyxFQUFFLElBQVk7SUFDN0MsT0FBTyxLQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFHLENBQUM7QUFDaEUsQ0FBQztBQUtEO0lBRUUscUJBQVksT0FBaUI7UUFDbkIsSUFBQSxLQUFLLEdBQTBCLE9BQU8sTUFBakMsRUFBRSxLQUF3QixPQUFPLE9BQVosRUFBbkIsTUFBTSxtQkFBRyxVQUFVLEtBQUEsQ0FBYTtRQUMvQyxJQUFJLENBQUMsT0FBTyxHQUFHLEtBQUcsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBSSxDQUFDO1FBQzFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBQSxZQUFHLEVBQUMsWUFBSyxNQUFNLE9BQUksQ0FBQyxDQUFDLENBQUM7UUFDbEMsSUFBTSxRQUFRLEdBQUcsSUFBQSw4QkFBUyxFQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3ZDLElBQUksUUFBUSxLQUFLLFNBQVMsRUFBRTtZQUMxQixPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0JBQWdCLElBQUksQ0FBQyxPQUFTLENBQUMsQ0FBQyxDQUFDO1NBQzFEO1FBQ0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGtCQUFnQixJQUFBLG1CQUFVLEdBQUksQ0FBQyxDQUFDLENBQUM7UUFDekQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsZUFBZSxFQUFFLGlDQUFpQyxDQUFDLENBQUMsQ0FBQztRQUMzRSxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxlQUFlLEVBQUUsZ0VBQWdFLENBQUMsQ0FBQyxDQUFDO1FBQzFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLGVBQWUsRUFBRSw2REFBNkQsQ0FBQyxDQUFDLENBQUM7UUFDdkcsT0FBTyxDQUFDLEdBQUcsQ0FBSSxJQUFBLGNBQUssRUFBQyxRQUFRLENBQUMsVUFBSyxLQUFLLE9BQUksQ0FBQyxDQUFDO1FBQzlDLElBQUksUUFBUSxLQUFLLFNBQVMsRUFBRTtZQUMxQixPQUFPLENBQUMsR0FBRyxDQUNULE1BQU0sQ0FBQyxJQUFJLENBQUMsMEJBQXdCLElBQUksQ0FBQyxPQUFPLHlEQUFzRCxDQUFDLENBQ3hHLENBQUM7U0FDSDtRQUNELE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyx5REFBeUQsQ0FBQyxDQUFDLENBQUM7UUFDcEYsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHVFQUF1RSxDQUFDLENBQUMsQ0FBQztJQUNwRyxDQUFDO0lBQ0ssNEJBQU0sR0FBWixVQUFhLEtBQVk7OztnQkFDdkIsTUFBTSxDQUFDO29CQUNMLElBQUksRUFBRSxTQUFTO29CQUNmLE9BQU8sRUFBSyxLQUFLLENBQUMsT0FBTyxVQUFLLEtBQUssQ0FBQyxLQUFPO29CQUMzQyxPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87aUJBQ3RCLENBQUMsQ0FBQzs7OztLQUNKO0lBQ0gsa0JBQUM7QUFBRCxDQUFDLEFBOUJELElBOEJDO0FBOUJZLGtDQUFXIn0=
|