@tsed/cli 3.18.0 → 3.19.0

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.
@@ -8,6 +8,7 @@ export interface GenerateCmdContext extends CliDefaultOptions {
8
8
  type: string;
9
9
  name: string;
10
10
  route: string;
11
+ directory: string;
11
12
  platform: string;
12
13
  templateType: string;
13
14
  symbolName: string;
@@ -59,6 +60,14 @@ export declare class GenerateCmd implements CommandProvider {
59
60
  default: (state: GenerateCmdContext) => string;
60
61
  source?: undefined;
61
62
  choices?: undefined;
63
+ } | {
64
+ type: string;
65
+ name: string;
66
+ message: string;
67
+ when(state: any): boolean;
68
+ choices: string[];
69
+ default?: undefined;
70
+ source?: undefined;
62
71
  } | {
63
72
  type: string;
64
73
  name: string;
@@ -88,4 +97,5 @@ export declare class GenerateCmd implements CommandProvider {
88
97
  skip(): boolean;
89
98
  task: () => Promise<void>;
90
99
  })[]>;
100
+ getDirectories(dir: string): string[];
91
101
  }
@@ -6,6 +6,7 @@ const tslib_1 = require("tslib");
6
6
  const cli_core_1 = require("@tsed/cli-core");
7
7
  const change_case_1 = require("change-case");
8
8
  const path_1 = require("path");
9
+ const globby_1 = tslib_1.__importDefault(require("globby"));
9
10
  const ClassNamePipe_1 = require("../../pipes/ClassNamePipe");
10
11
  const OutputFilePathPipe_1 = require("../../pipes/OutputFilePathPipe");
11
12
  const RoutePipe_1 = require("../../pipes/RoutePipe");
@@ -48,7 +49,7 @@ let GenerateCmd = GenerateCmd_1 = class GenerateCmd {
48
49
  {
49
50
  type: "autocomplete",
50
51
  name: "type",
51
- message: "Which type of provider ?",
52
+ message: "Which type of provider?",
52
53
  default: initialOptions.type,
53
54
  when: () => proposedProviders.length > 1,
54
55
  source: searchFactory(proposedProviders)
@@ -56,12 +57,12 @@ let GenerateCmd = GenerateCmd_1 = class GenerateCmd {
56
57
  {
57
58
  type: "input",
58
59
  name: "name",
59
- message: "Which name ?",
60
+ message: "Which name?",
60
61
  default: getName,
61
62
  when: !initialOptions.name
62
63
  },
63
64
  {
64
- message: "Which platform:",
65
+ message: "Which platform?",
65
66
  type: "list",
66
67
  name: "platform",
67
68
  when(state) {
@@ -83,7 +84,7 @@ let GenerateCmd = GenerateCmd_1 = class GenerateCmd {
83
84
  {
84
85
  type: "input",
85
86
  name: "route",
86
- message: "Which route ?",
87
+ message: "Which route?",
87
88
  when(state) {
88
89
  return ["controller", "server"].includes(state.type || initialOptions.type);
89
90
  },
@@ -91,6 +92,15 @@ let GenerateCmd = GenerateCmd_1 = class GenerateCmd {
91
92
  return state.type === "server" ? "/rest" : this.routePipe.transform(getName(state));
92
93
  }
93
94
  },
95
+ {
96
+ type: "list",
97
+ name: "directory",
98
+ message: "Which directory?",
99
+ when(state) {
100
+ return ["controller"].includes(state.type || initialOptions.type);
101
+ },
102
+ choices: this.getDirectories("controllers")
103
+ },
94
104
  {
95
105
  type: "autocomplete",
96
106
  name: "templateType",
@@ -131,7 +141,8 @@ let GenerateCmd = GenerateCmd_1 = class GenerateCmd {
131
141
  symbolParamName,
132
142
  symbolPath: normalizePath(this.outputFilePathPipe.transform({
133
143
  name,
134
- type
144
+ type,
145
+ subDir: ctx.directory
135
146
  })),
136
147
  symbolPathBasename: normalizePath(this.classNamePipe.transform({ name, type })),
137
148
  express: ctx.platform === "express",
@@ -177,6 +188,17 @@ let GenerateCmd = GenerateCmd_1 = class GenerateCmd {
177
188
  }
178
189
  return [];
179
190
  }
191
+ getDirectories(dir) {
192
+ const directories = globby_1.default.sync("**/*", {
193
+ cwd: path_1.join(this.srcRenderService.rootDir, dir),
194
+ ignore: ["__*"]
195
+ });
196
+ const set = new Set(directories.map((dir) => {
197
+ return path_1.dirname(dir);
198
+ }));
199
+ set.delete(".");
200
+ return [...set];
201
+ }
180
202
  };
181
203
  tslib_1.__decorate([
182
204
  cli_core_1.Inject(),
@@ -1 +1 @@
1
- {"version":3,"file":"GenerateCmd.js","sourceRoot":"","sources":["../../../src/commands/generate/GenerateCmd.ts"],"names":[],"mappings":";;;;;AAAA,6CAA2H;AAC3H,6CAAkD;AAClD,+BAA8B;AAC9B,6DAAwD;AACxD,uEAAkE;AAClE,qDAAgD;AAChD,8EAAyE;AACzE,mDAA+C;AAC/C,0EAAqE;AAErE,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAchD,MAAM,eAAe,GAAG;IACtB,EAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAC;IACzC,EAAC,IAAI,EAAE,oCAAoC,EAAE,KAAK,EAAE,YAAY,EAAC;IACjE,EAAC,IAAI,EAAE,0BAA0B,EAAE,KAAK,EAAE,UAAU,EAAC;IACrD,EAAC,IAAI,EAAE,0BAA0B,EAAE,KAAK,EAAE,MAAM,EAAC;IACjD,EAAC,IAAI,EAAE,2BAA2B,EAAE,KAAK,EAAE,OAAO,EAAC;IACnD,EAAC,IAAI,EAAE,0BAA0B,EAAE,KAAK,EAAE,QAAQ,EAAC;IACnD,EAAC,IAAI,EAAE,4BAA4B,EAAE,KAAK,EAAE,UAAU,EAAC;IACvD,EAAC,IAAI,EAAE,6BAA6B,EAAE,KAAK,EAAE,WAAW,EAAC;IACzD,EAAC,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,SAAS,EAAC;CAC9C,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,IAAS,EAAE,EAAE;IAClC,OAAO,KAAK,EAAE,KAAU,EAAE,OAAe,EAAE,EAAE;QAC3C,IAAI,OAAO,EAAE;YACX,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;SAC5F;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC,CAAC;AAiBF,IAAa,WAAW,mBAAxB,MAAa,WAAW;IAgBtB,YAAoB,aAAmC;QAAnC,kBAAa,GAAb,aAAa,CAAsB;QACrD,8BAAc,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9B,IAAI,CAAC,aAAa,CAAC,GAAG,CACpB;gBACE,GAAG,IAAI;aACR,EACD,aAAW,CACZ,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,cAA2C;QACjD,MAAM,OAAO,GAAG,CAAC,KAAU,EAAE,EAAE,CAC7B,cAAc,CAAC,IAAI,IAAI,wBAAU,CAAC,KAAK,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;QAE5G,MAAM,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAEhF,OAAO;YACL;gBACE,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,0BAA0B;gBACnC,OAAO,EAAE,cAAc,CAAC,IAAI;gBAC5B,IAAI,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC;gBACxC,MAAM,EAAE,aAAa,CAAC,iBAAiB,CAAC;aACzC;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,cAAc;gBACvB,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,CAAC,cAAc,CAAC,IAAI;aAC3B;YACD;gBACE,OAAO,EAAE,iBAAiB;gBAC1B,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,UAAU;gBAChB,IAAI,CAAC,KAAU;oBACb,OAAO,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;gBAChE,CAAC;gBACD,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,YAAY;wBAClB,OAAO,EAAE,IAAI;wBACb,KAAK,EAAE,SAAS;qBACjB;oBACD;wBACE,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,KAAK;wBACd,KAAK,EAAE,KAAK;qBACb;iBACF;aACF;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,eAAe;gBACxB,IAAI,CAAC,KAAU;oBACb,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;gBAC9E,CAAC;gBACD,OAAO,EAAE,CAAC,KAAyB,EAAE,EAAE;oBACrC,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;gBACtF,CAAC;aACF;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,iBAAiB,KAAK,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,GAAG;gBAC9E,IAAI,CAAC,KAAU;oBACb,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;gBACnE,CAAC;gBACD,MAAM,EAAE,aAAa,CAAC,eAAe,CAAC;aACvC;YACD;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,oBAAoB;gBAC1B,OAAO,EAAE,GAAG,EAAE,CAAC,kCAAkC;gBACjD,OAAO,EAAE;oBACP,EAAC,IAAI,EAAE,qBAAqB,EAAE,KAAK,EAAE,QAAQ,EAAC;oBAC9C,EAAC,IAAI,EAAE,oBAAoB,EAAE,KAAK,EAAE,OAAO,EAAC;iBAC7C;gBACD,IAAI,CAAC,KAAU;oBACb,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBAClH,CAAC;aACF;SACF,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,GAAgC;QAC1C,MAAM,EAAC,IAAI,GAAG,EAAE,EAAC,GAAG,GAAG,CAAC;QACxB,IAAI,EAAC,IAAI,GAAG,EAAE,EAAC,GAAG,GAAG,CAAC;QACtB,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAE1B,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,EAAE;YACrC,IAAI,GAAG,gBAAgB,CAAC;SACzB;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,qCAAiB,CAAC,OAAO,EAAC,CAAC,CAAC;QACjG,MAAM,eAAe,GAAG,uBAAS,CAAC,UAAU,CAAC,CAAC;QAE9C,OAAO;YACL,GAAG,GAAG;YACN,IAAI;YACJ,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;YAC3D,UAAU;YACV,eAAe;YACf,UAAU,EAAE,aAAa,CACvB,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC;gBAChC,IAAI;gBACJ,IAAI;aACL,CAAC,CACH;YACD,kBAAkB,EAAE,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC;YAC7E,OAAO,EAAE,GAAG,CAAC,QAAQ,KAAK,SAAS;YACnC,GAAG,EAAE,GAAG,CAAC,QAAQ,KAAK,KAAK;YAC3B,cAAc,EAAE,wBAAU,CAAC,YAAY,GAAG,CAAC,QAAQ,EAAE,CAAC;YACtD,mBAAmB,EACjB,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,UAAU,KAAK,qCAAiB,CAAC,OAAO;gBAC1E,CAAC,CAAC,sCAAsC;gBACxC,CAAC,CAAC,qCAAqC;SACtB,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAuB;QACjC,MAAM,EAAC,UAAU,EAAC,GAAG,GAAG,CAAC;QAEzB,IAAI,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,aAAW,CAAC,EAAE;YAC1D,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEpE,MAAM,QAAQ,GAAG,YAAY,IAAI,MAAM,CAAC;YAExC,OAAO;gBACL;oBACE,KAAK,EAAE,YAAY,GAAG,CAAC,IAAI,aAAa,UAAU,MAAM;oBACxD,IAAI,EAAE,GAAG,EAAE,CACT,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,EAAE;wBAC1C,MAAM,EAAE,GAAG,UAAU,KAAK;qBAC3B,CAAC;iBACL;gBACD;oBACE,KAAK,EAAE,kBAAkB;oBACzB,IAAI;wBACF,OAAO,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC;oBAChC,CAAC;oBACD,IAAI,EAAE,GAAG,EAAE;wBACT,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,cAAc,EAAE;4BAClD;gCACE,IAAI,EAAE,QAAQ;gCACd,OAAO,EAAE,WAAW,GAAG,CAAC,UAAU,aAAa,eAAQ,CAAC,UAAU,CAAC,IAAI;6BACxE;4BACD;gCACE,IAAI,EAAE,cAAc;gCACpB,OAAO,EAAE,cAAc;gCACvB,OAAO,EAAE,KAAK,GAAG,CAAC,UAAU,EAAE;6BAC/B;yBACF,CAAC,CAAC;oBACL,CAAC;iBACF;aACF,CAAC;SACH;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAA;AAjLC;IADC,iBAAM,EAAE;sCACM,6BAAa;kDAAC;AAG7B;IADC,iBAAM,EAAE;sCACW,uCAAkB;uDAAC;AAGvC;IADC,iBAAM,EAAE;sCACE,qBAAS;8CAAC;AAGrB;IADC,iBAAM,EAAE;sCACS,6BAAkB;qDAAC;AAGrC;IADC,iBAAM,EAAE;sCACW,6BAAkB;uDAAC;AAd5B,WAAW;IAfvB,kBAAO,CAAC;QACP,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,+BAA+B;QAC5C,IAAI,EAAE;YACJ,IAAI,EAAE;gBACJ,WAAW,EAAE,6DAA6D;gBAC1E,IAAI,EAAE,MAAM;aACb;YACD,IAAI,EAAE;gBACJ,WAAW,EAAE,mBAAmB;gBAChC,IAAI,EAAE,MAAM;aACb;SACF;KACF,CAAC;6CAiBmC,2CAAoB;GAhB5C,WAAW,CAmLvB;AAnLY,kCAAW","sourcesContent":["import {CliDefaultOptions, Command, CommandProvider, Inject, ProjectPackageJson, SrcRendererService} from \"@tsed/cli-core\";\nimport {paramCase, pascalCase} from \"change-case\";\nimport {basename} from \"path\";\nimport {ClassNamePipe} from \"../../pipes/ClassNamePipe\";\nimport {OutputFilePathPipe} from \"../../pipes/OutputFilePathPipe\";\nimport {RoutePipe} from \"../../pipes/RoutePipe\";\nimport {ProvidersInfoService} from \"../../services/ProvidersInfoService\";\nimport {PROVIDER_TYPES} from \"./ProviderTypes\";\nimport {ProjectConvention} from \"../../interfaces/ProjectConvention\";\n\nconst normalizePath = require(\"normalize-path\");\n\nexport interface GenerateCmdContext extends CliDefaultOptions {\n type: string;\n name: string;\n route: string;\n platform: string;\n templateType: string;\n symbolName: string;\n symbolPath: string;\n symbolPathBasename: string;\n convention: ProjectConvention;\n}\n\nconst DECORATOR_TYPES = [\n {name: \"Class decorator\", value: \"class\"},\n {name: \"Ts.ED middleware and its decorator\", value: \"middleware\"},\n {name: \"Ts.ED endpoint decorator\", value: \"endpoint\"},\n {name: \"Ts.ED property decorator\", value: \"prop\"},\n {name: \"Ts.ED parameter decorator\", value: \"param\"},\n {name: \"Vanilla Method decorator\", value: \"method\"},\n {name: \"Vanilla Property decorator\", value: \"property\"},\n {name: \"Vanilla Parameter decorator\", value: \"parameter\"},\n {name: \"Generic decorator\", value: \"generic\"}\n];\n\nconst searchFactory = (list: any) => {\n return async (state: any, keyword: string) => {\n if (keyword) {\n return list.filter((item: any) => item.name.toLowerCase().includes(keyword.toLowerCase()));\n }\n\n return list;\n };\n};\n\n@Command({\n name: \"generate\",\n alias: \"g\",\n description: \"Generate a new provider class\",\n args: {\n type: {\n description: \"Type of the provider (Injectable, Controller, Pipe, etc...)\",\n type: String\n },\n name: {\n description: \"Name of the class\",\n type: String\n }\n }\n})\nexport class GenerateCmd implements CommandProvider {\n @Inject()\n classNamePipe: ClassNamePipe;\n\n @Inject()\n outputFilePathPipe: OutputFilePathPipe;\n\n @Inject()\n routePipe: RoutePipe;\n\n @Inject()\n srcRenderService: SrcRendererService;\n\n @Inject()\n projectPackageJson: ProjectPackageJson;\n\n constructor(private providersList: ProvidersInfoService) {\n PROVIDER_TYPES.forEach((info) => {\n this.providersList.add(\n {\n ...info\n },\n GenerateCmd\n );\n });\n }\n\n $prompt(initialOptions: Partial<GenerateCmdContext>) {\n const getName = (state: any) =>\n initialOptions.name || pascalCase(state.name || initialOptions.name || state.type || initialOptions.type);\n\n const proposedProviders = this.providersList.findProviders(initialOptions.type);\n\n return [\n {\n type: \"autocomplete\",\n name: \"type\",\n message: \"Which type of provider ?\",\n default: initialOptions.type,\n when: () => proposedProviders.length > 1,\n source: searchFactory(proposedProviders)\n },\n {\n type: \"input\",\n name: \"name\",\n message: \"Which name ?\",\n default: getName,\n when: !initialOptions.name\n },\n {\n message: \"Which platform:\",\n type: \"list\",\n name: \"platform\",\n when(state: any) {\n return [\"server\"].includes(state.type || initialOptions.type);\n },\n choices: [\n {\n name: \"Express.js\",\n checked: true,\n value: \"express\"\n },\n {\n name: \"Koa.js\",\n checked: false,\n value: \"koa\"\n }\n ]\n },\n {\n type: \"input\",\n name: \"route\",\n message: \"Which route ?\",\n when(state: any) {\n return [\"controller\", \"server\"].includes(state.type || initialOptions.type);\n },\n default: (state: GenerateCmdContext) => {\n return state.type === \"server\" ? \"/rest\" : this.routePipe.transform(getName(state));\n }\n },\n {\n type: \"autocomplete\",\n name: \"templateType\",\n message: (state: any) => `Which type of ${state.type || initialOptions.type}?`,\n when(state: any) {\n return [\"decorator\"].includes(state.type || initialOptions.type);\n },\n source: searchFactory(DECORATOR_TYPES)\n },\n {\n type: \"list\",\n name: \"middlewarePosition\",\n message: () => `The middleware should be called:`,\n choices: [\n {name: \"Before the endpoint\", value: \"before\"},\n {name: \"After the endpoint\", value: \"after\"}\n ],\n when(state: any) {\n return [\"decorator\"].includes(state.type || initialOptions.type) && [\"middleware\"].includes(state.templateType);\n }\n }\n ];\n }\n\n $mapContext(ctx: Partial<GenerateCmdContext>): GenerateCmdContext {\n const {name = \"\"} = ctx;\n let {type = \"\"} = ctx;\n type = type.toLowerCase();\n\n if (ctx.name === \"prisma\" && ctx.name) {\n type = \"prisma.service\";\n }\n\n const symbolName = this.classNamePipe.transform({name, type, format: ProjectConvention.DEFAULT});\n const symbolParamName = paramCase(symbolName);\n\n return {\n ...ctx,\n type,\n route: ctx.route ? this.routePipe.transform(ctx.route) : \"\",\n symbolName,\n symbolParamName,\n symbolPath: normalizePath(\n this.outputFilePathPipe.transform({\n name,\n type\n })\n ),\n symbolPathBasename: normalizePath(this.classNamePipe.transform({name, type})),\n express: ctx.platform === \"express\",\n koa: ctx.platform === \"koa\",\n platformSymbol: pascalCase(`Platform ${ctx.platform}`),\n indexControllerPath:\n this.projectPackageJson.preferences.convention === ProjectConvention.ANGULAR\n ? \"./controllers/pages/index.controller\"\n : \"./controllers/pages/IndexController\"\n } as GenerateCmdContext;\n }\n\n async $exec(ctx: GenerateCmdContext) {\n const {symbolPath} = ctx;\n\n if (this.providersList.isMyProvider(ctx.type, GenerateCmd)) {\n const type = [ctx.type, ctx.templateType].filter(Boolean).join(\".\");\n\n const template = `generate/${type}.hbs`;\n\n return [\n {\n title: `Generate ${ctx.type} file to '${symbolPath}.ts'`,\n task: () =>\n this.srcRenderService.render(template, ctx, {\n output: `${symbolPath}.ts`\n })\n },\n {\n title: `Update bin/index`,\n skip() {\n return ctx.type !== \"command\";\n },\n task: () => {\n return this.srcRenderService.update(\"bin/index.ts\", [\n {\n type: \"import\",\n content: `import {${ctx.symbolName}} from \"./${basename(symbolPath)}\";`\n },\n {\n type: \"insert-after\",\n pattern: /commands: \\[/,\n content: ` ${ctx.symbolName}`\n }\n ]);\n }\n }\n ];\n }\n\n return [];\n }\n}\n"]}
1
+ {"version":3,"file":"GenerateCmd.js","sourceRoot":"","sources":["../../../src/commands/generate/GenerateCmd.ts"],"names":[],"mappings":"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","sourcesContent":["import {CliDefaultOptions, Command, CommandProvider, Inject, ProjectPackageJson, SrcRendererService} from \"@tsed/cli-core\";\nimport {paramCase, pascalCase} from \"change-case\";\nimport {basename, dirname, join} from \"path\";\nimport globby from \"globby\";\nimport {ClassNamePipe} from \"../../pipes/ClassNamePipe\";\nimport {OutputFilePathPipe} from \"../../pipes/OutputFilePathPipe\";\nimport {RoutePipe} from \"../../pipes/RoutePipe\";\nimport {ProvidersInfoService} from \"../../services/ProvidersInfoService\";\nimport {PROVIDER_TYPES} from \"./ProviderTypes\";\nimport {ProjectConvention} from \"../../interfaces/ProjectConvention\";\n\nconst normalizePath = require(\"normalize-path\");\n\nexport interface GenerateCmdContext extends CliDefaultOptions {\n type: string;\n name: string;\n route: string;\n directory: string;\n platform: string;\n templateType: string;\n symbolName: string;\n symbolPath: string;\n symbolPathBasename: string;\n convention: ProjectConvention;\n}\n\nconst DECORATOR_TYPES = [\n {name: \"Class decorator\", value: \"class\"},\n {name: \"Ts.ED middleware and its decorator\", value: \"middleware\"},\n {name: \"Ts.ED endpoint decorator\", value: \"endpoint\"},\n {name: \"Ts.ED property decorator\", value: \"prop\"},\n {name: \"Ts.ED parameter decorator\", value: \"param\"},\n {name: \"Vanilla Method decorator\", value: \"method\"},\n {name: \"Vanilla Property decorator\", value: \"property\"},\n {name: \"Vanilla Parameter decorator\", value: \"parameter\"},\n {name: \"Generic decorator\", value: \"generic\"}\n];\n\nconst searchFactory = (list: any) => {\n return async (state: any, keyword: string) => {\n if (keyword) {\n return list.filter((item: any) => item.name.toLowerCase().includes(keyword.toLowerCase()));\n }\n\n return list;\n };\n};\n\n@Command({\n name: \"generate\",\n alias: \"g\",\n description: \"Generate a new provider class\",\n args: {\n type: {\n description: \"Type of the provider (Injectable, Controller, Pipe, etc...)\",\n type: String\n },\n name: {\n description: \"Name of the class\",\n type: String\n }\n }\n})\nexport class GenerateCmd implements CommandProvider {\n @Inject()\n classNamePipe: ClassNamePipe;\n\n @Inject()\n outputFilePathPipe: OutputFilePathPipe;\n\n @Inject()\n routePipe: RoutePipe;\n\n @Inject()\n srcRenderService: SrcRendererService;\n\n @Inject()\n projectPackageJson: ProjectPackageJson;\n\n constructor(private providersList: ProvidersInfoService) {\n PROVIDER_TYPES.forEach((info) => {\n this.providersList.add(\n {\n ...info\n },\n GenerateCmd\n );\n });\n }\n\n $prompt(initialOptions: Partial<GenerateCmdContext>) {\n const getName = (state: any) =>\n initialOptions.name || pascalCase(state.name || initialOptions.name || state.type || initialOptions.type);\n\n const proposedProviders = this.providersList.findProviders(initialOptions.type);\n\n return [\n {\n type: \"autocomplete\",\n name: \"type\",\n message: \"Which type of provider?\",\n default: initialOptions.type,\n when: () => proposedProviders.length > 1,\n source: searchFactory(proposedProviders)\n },\n {\n type: \"input\",\n name: \"name\",\n message: \"Which name?\",\n default: getName,\n when: !initialOptions.name\n },\n {\n message: \"Which platform?\",\n type: \"list\",\n name: \"platform\",\n when(state: any) {\n return [\"server\"].includes(state.type || initialOptions.type);\n },\n choices: [\n {\n name: \"Express.js\",\n checked: true,\n value: \"express\"\n },\n {\n name: \"Koa.js\",\n checked: false,\n value: \"koa\"\n }\n ]\n },\n {\n type: \"input\",\n name: \"route\",\n message: \"Which route?\",\n when(state: any) {\n return [\"controller\", \"server\"].includes(state.type || initialOptions.type);\n },\n default: (state: GenerateCmdContext) => {\n return state.type === \"server\" ? \"/rest\" : this.routePipe.transform(getName(state));\n }\n },\n {\n type: \"list\",\n name: \"directory\",\n message: \"Which directory?\",\n when(state: any) {\n return [\"controller\"].includes(state.type || initialOptions.type);\n },\n choices: this.getDirectories(\"controllers\")\n },\n {\n type: \"autocomplete\",\n name: \"templateType\",\n message: (state: any) => `Which type of ${state.type || initialOptions.type}?`,\n when(state: any) {\n return [\"decorator\"].includes(state.type || initialOptions.type);\n },\n source: searchFactory(DECORATOR_TYPES)\n },\n {\n type: \"list\",\n name: \"middlewarePosition\",\n message: () => `The middleware should be called:`,\n choices: [\n {name: \"Before the endpoint\", value: \"before\"},\n {name: \"After the endpoint\", value: \"after\"}\n ],\n when(state: any) {\n return [\"decorator\"].includes(state.type || initialOptions.type) && [\"middleware\"].includes(state.templateType);\n }\n }\n ];\n }\n\n $mapContext(ctx: Partial<GenerateCmdContext>): GenerateCmdContext {\n const {name = \"\"} = ctx;\n let {type = \"\"} = ctx;\n type = type.toLowerCase();\n\n if (ctx.name === \"prisma\" && ctx.name) {\n type = \"prisma.service\";\n }\n\n const symbolName = this.classNamePipe.transform({name, type, format: ProjectConvention.DEFAULT});\n const symbolParamName = paramCase(symbolName);\n\n return {\n ...ctx,\n type,\n route: ctx.route ? this.routePipe.transform(ctx.route) : \"\",\n symbolName,\n symbolParamName,\n symbolPath: normalizePath(\n this.outputFilePathPipe.transform({\n name,\n type,\n subDir: ctx.directory\n })\n ),\n symbolPathBasename: normalizePath(this.classNamePipe.transform({name, type})),\n express: ctx.platform === \"express\",\n koa: ctx.platform === \"koa\",\n platformSymbol: pascalCase(`Platform ${ctx.platform}`),\n indexControllerPath:\n this.projectPackageJson.preferences.convention === ProjectConvention.ANGULAR\n ? \"./controllers/pages/index.controller\"\n : \"./controllers/pages/IndexController\"\n } as GenerateCmdContext;\n }\n\n async $exec(ctx: GenerateCmdContext) {\n const {symbolPath} = ctx;\n\n if (this.providersList.isMyProvider(ctx.type, GenerateCmd)) {\n const type = [ctx.type, ctx.templateType].filter(Boolean).join(\".\");\n\n const template = `generate/${type}.hbs`;\n\n return [\n {\n title: `Generate ${ctx.type} file to '${symbolPath}.ts'`,\n task: () =>\n this.srcRenderService.render(template, ctx, {\n output: `${symbolPath}.ts`\n })\n },\n {\n title: `Update bin/index`,\n skip() {\n return ctx.type !== \"command\";\n },\n task: () => {\n return this.srcRenderService.update(\"bin/index.ts\", [\n {\n type: \"import\",\n content: `import {${ctx.symbolName}} from \"./${basename(symbolPath)}\";`\n },\n {\n type: \"insert-after\",\n pattern: /commands: \\[/,\n content: ` ${ctx.symbolName}`\n }\n ]);\n }\n }\n ];\n }\n\n return [];\n }\n\n getDirectories(dir: string) {\n const directories = globby.sync(\"**/*\", {\n cwd: join(this.srcRenderService.rootDir, dir),\n ignore: [\"__*\"]\n });\n\n const set = new Set(\n directories.map((dir) => {\n return dirname(dir);\n })\n );\n\n set.delete(\".\");\n\n return [...set];\n }\n}\n"]}
@@ -1,4 +1,4 @@
1
- import { CliDefaultOptions, CliFs, CliPlugins, CliService, CommandProvider, Configuration, InstallOptions, ProjectPackageJson, QuestionOptions, RootRendererService } from "@tsed/cli-core";
1
+ import { CliDefaultOptions, CliExeca, CliFs, CliPlugins, CliService, CommandProvider, Configuration, InstallOptions, ProjectPackageJson, QuestionOptions, RootRendererService } from "@tsed/cli-core";
2
2
  import { ArchitectureConvention } from "../../interfaces/ArchitectureConvention";
3
3
  import { ProjectConvention } from "../../interfaces/ProjectConvention";
4
4
  import { OutputFilePathPipe } from "../../pipes/OutputFilePathPipe";
@@ -27,6 +27,7 @@ export declare class InitCmd implements CommandProvider {
27
27
  protected cliService: CliService;
28
28
  protected rootRenderer: RootRendererService;
29
29
  protected outputFilePathPipe: OutputFilePathPipe;
30
+ protected execa: CliExeca;
30
31
  protected fs: CliFs;
31
32
  $beforePrompt(initialOptions: Partial<InitCmdContext>): Promise<Partial<InitCmdContext>>;
32
33
  $prompt(initialOptions: Partial<InitCmdContext>): QuestionOptions;
@@ -36,6 +37,7 @@ export declare class InitCmd implements CommandProvider {
36
37
  title: string;
37
38
  task: (ctx: any, task: import("listr2").ListrTaskWrapper<any, any>) => Promise<import("listr2").Listr<any, any, any>>;
38
39
  }[]>;
40
+ $postInstall(): Promise<never[]>;
39
41
  resolveRootDir(ctx: Partial<InitCmdContext>): void;
40
42
  addScripts(ctx: InitCmdContext): void;
41
43
  addDependencies(ctx: InitCmdContext): void;
@@ -107,7 +107,8 @@ let InitCmd = class InitCmd {
107
107
  ...(await this.cliService.getTasks("generate", {
108
108
  type: "controller",
109
109
  route: "hello-world",
110
- name: "HelloWorld"
110
+ name: "HelloWorld",
111
+ directory: "rest"
111
112
  })),
112
113
  ...(ctx.commands
113
114
  ? await this.cliService.getTasks("generate", {
@@ -131,6 +132,8 @@ let InitCmd = class InitCmd {
131
132
  task: () => this.rootRenderer.renderAll([
132
133
  "/init/.dockerignore.hbs",
133
134
  "/init/.gitignore.hbs",
135
+ "/init/.barrelsby.json.hbs",
136
+ "/init/processes.config.js.hbs",
134
137
  ctx.babel && "/init/.babelrc.hbs",
135
138
  ctx.webpack && "/init/webpack.config.js.hbs",
136
139
  "/init/docker-compose.yml.hbs",
@@ -145,7 +148,7 @@ let InitCmd = class InitCmd {
145
148
  ctx.commands && "/init/src/bin/index.ts.hbs",
146
149
  ctx.swagger && "/init/views/swagger.ejs.hbs",
147
150
  ctx.swagger && {
148
- path: "/init/src/controllers/pages/IndexCtrl.ts.hbs",
151
+ path: "/init/src/controllers/pages/IndexController.ts.hbs",
149
152
  basename: indexCtrlBaseName
150
153
  }
151
154
  ].filter(Boolean), ctx, {
@@ -157,6 +160,10 @@ let InitCmd = class InitCmd {
157
160
  }
158
161
  ];
159
162
  }
163
+ async $postInstall() {
164
+ await this.packageJson.runScript("barrels");
165
+ return [];
166
+ }
160
167
  resolveRootDir(ctx) {
161
168
  const rootDirName = change_case_1.paramCase(ctx.projectName || path_1.basename(this.packageJson.dir));
162
169
  if (this.packageJson.dir.endsWith(rootDirName)) {
@@ -173,9 +180,9 @@ let InitCmd = class InitCmd {
173
180
  addScripts(ctx) {
174
181
  const runner = this.packageJson.getRunCmd();
175
182
  this.packageJson.addScripts({
176
- build: `${runner} tsc --project tsconfig.compile.json`,
177
- "build:w": "tsc --project tsconfig.compile.json -w",
178
- start: "tsnd --inspect --ignore-watch node_modules --respawn --transpile-only -r tsconfig-paths/register src/index.ts",
183
+ build: `${runner} barrels && ${runner} tsc --project tsconfig.compile.json`,
184
+ barrels: "barrelsby --config .barrelsby.json",
185
+ start: `${runner} barrels && tsnd --inspect --ignore-watch node_modules --respawn --transpile-only -r tsconfig-paths/register src/index.ts`,
179
186
  "start:prod": "cross-env NODE_ENV=production node dist/index.js"
180
187
  });
181
188
  if (ctx.babel) {
@@ -211,8 +218,11 @@ let InitCmd = class InitCmd {
211
218
  "@tsed/logger-file": "latest",
212
219
  "@tsed/engines": "latest",
213
220
  ajv: "latest",
221
+ barrelsby: "latest",
214
222
  "cross-env": "latest",
215
- dotenv: "latest"
223
+ dotenv: "latest",
224
+ "dotenv-expand": "latest",
225
+ "dotenv-flow": "latest"
216
226
  });
217
227
  }
218
228
  addDevDependencies(ctx) {
@@ -322,6 +332,10 @@ tslib_1.__decorate([
322
332
  cli_core_1.Inject(),
323
333
  tslib_1.__metadata("design:type", OutputFilePathPipe_1.OutputFilePathPipe)
324
334
  ], InitCmd.prototype, "outputFilePathPipe", void 0);
335
+ tslib_1.__decorate([
336
+ cli_core_1.Inject(),
337
+ tslib_1.__metadata("design:type", cli_core_1.CliExeca)
338
+ ], InitCmd.prototype, "execa", void 0);
325
339
  tslib_1.__decorate([
326
340
  cli_core_1.Inject(),
327
341
  tslib_1.__metadata("design:type", cli_core_1.CliFs)
@@ -1 +1 @@
1
- {"version":3,"file":"InitCmd.js","sourceRoot":"","sources":["../../../src/commands/init/InitCmd.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n CliDefaultOptions,\n CliFs,\n CliPlugins,\n CliService,\n Command,\n CommandProvider,\n Configuration,\n createSubTasks,\n createTasksRunner,\n Inject,\n InstallOptions,\n PackageManager,\n ProjectPackageJson,\n QuestionOptions,\n RootRendererService\n} from \"@tsed/cli-core\";\nimport {camelCase, paramCase, pascalCase} from \"change-case\";\nimport {basename, join, resolve} from \"path\";\nimport {DEFAULT_TSED_TAGS} from \"../../constants\";\nimport {ArchitectureConvention} from \"../../interfaces/ArchitectureConvention\";\nimport {ProjectConvention} from \"../../interfaces/ProjectConvention\";\nimport {OutputFilePathPipe} from \"../../pipes/OutputFilePathPipe\";\nimport {Features, FeatureValue, parseFeaturesFile} from \"../../services/Features\";\n\nexport interface InitCmdContext extends CliDefaultOptions, InstallOptions {\n platform: \"express\" | \"koa\";\n root: string;\n srcDir: string;\n projectName: string;\n tsedVersion: string;\n features: FeatureValue[];\n featuresTypeORM?: FeatureValue;\n babel?: boolean;\n webpack?: boolean;\n architecture?: ArchitectureConvention;\n convention?: ProjectConvention;\n commands?: boolean;\n GH_TOKEN?: string;\n\n [key: string]: any;\n}\n\n@Command({\n name: \"init\",\n description: \"Init a new Ts.ED project\",\n args: {\n root: {\n type: String,\n defaultValue: \".\",\n description: \"Root directory to initialize the Ts.ED project\"\n }\n },\n options: {\n \"-t, --tsed-version <version>\": {\n type: String,\n defaultValue: DEFAULT_TSED_TAGS,\n description: \"Use a specific version of Ts.ED (format: 5.x.x)\"\n },\n \"-f, --features-file <path>\": {\n type: String,\n description: \"Location of a file in which the features are defined.\"\n }\n }\n})\nexport class InitCmd implements CommandProvider {\n @Configuration()\n protected configuration: Configuration;\n\n @Inject()\n protected cliPlugins: CliPlugins;\n\n @Inject()\n protected packageJson: ProjectPackageJson;\n\n @Features()\n protected features: Features;\n\n @Inject()\n protected cliService: CliService;\n\n @Inject()\n protected rootRenderer: RootRendererService;\n\n @Inject()\n protected outputFilePathPipe: OutputFilePathPipe;\n\n @Inject()\n protected fs: CliFs;\n\n async $beforePrompt(initialOptions: Partial<InitCmdContext>) {\n const callPath = process.cwd();\n if (callPath && initialOptions.featuresFile) {\n const featuresFilePath = resolve(callPath, initialOptions.featuresFile);\n const featuresFromFile = await import(featuresFilePath);\n const mappedFeatures = parseFeaturesFile(featuresFromFile, \"3.8.0\"); // Inject CLI version\n initialOptions = {...initialOptions, ...mappedFeatures};\n }\n return initialOptions;\n }\n\n $prompt(initialOptions: Partial<InitCmdContext>): QuestionOptions {\n const featuresQuestions = initialOptions.features?.length ? [] : [...this.features];\n return [\n {\n type: \"input\",\n name: \"projectName\",\n message: \"What is your project name\",\n default: paramCase(initialOptions.root!),\n when: initialOptions.root !== \".\",\n transformer(input) {\n return paramCase(input);\n }\n },\n ...featuresQuestions\n ];\n }\n\n $mapContext(ctx: Partial<InitCmdContext>): InitCmdContext {\n this.resolveRootDir(ctx);\n\n const features: FeatureValue[] = [];\n\n Object.entries(ctx)\n .filter(([key]) => key.startsWith(\"features\") && key !== \"featuresFile\")\n .forEach(([key, value]: any[]) => {\n delete ctx[key];\n features.push(...[].concat(value));\n });\n\n features.forEach((feature) => {\n feature.type.split(\":\").forEach((type) => {\n ctx[camelCase(type)] = true;\n });\n });\n\n return {\n ...ctx,\n features,\n srcDir: this.configuration.project?.srcDir,\n pnpm: ctx.packageManager === PackageManager.PNPM,\n npm: ctx.packageManager === PackageManager.NPM,\n yarn: ctx.packageManager === PackageManager.YARN,\n express: ctx.platform === \"express\",\n koa: ctx.platform === \"koa\",\n platformSymbol: pascalCase(`Platform ${ctx.platform}`)\n } as InitCmdContext;\n }\n\n async $beforeExec(ctx: InitCmdContext): Promise<any> {\n this.fs.ensureDirSync(this.packageJson.dir);\n this.packageJson.name = ctx.projectName;\n\n ctx.packageManager && this.packageJson.setPreference(\"packageManager\", ctx.packageManager);\n ctx.architecture && this.packageJson.setPreference(\"architecture\", ctx.architecture);\n ctx.convention && this.packageJson.setPreference(\"convention\", ctx.convention);\n ctx.GH_TOKEN && this.packageJson.setGhToken(ctx.GH_TOKEN);\n\n this.addDependencies(ctx);\n this.addDevDependencies(ctx);\n this.addScripts(ctx);\n this.addFeatures(ctx);\n\n await createTasksRunner(\n [\n {\n title: \"Write RC files\",\n skip: () => !ctx.GH_TOKEN,\n task: () =>\n this.rootRenderer.renderAll([\"/init/.npmrc.hbs\", \"/init/.yarnrc.hbs\"], ctx, {\n baseDir: \"/init\"\n })\n },\n {\n title: \"Install plugins\",\n task: createSubTasks(() => this.packageJson.install(ctx), {...ctx, concurrent: false})\n },\n {\n title: \"Load plugins\",\n task: () => this.cliPlugins.loadPlugins()\n },\n {\n title: \"Install plugins dependencies\",\n task: createSubTasks(this.cliPlugins.addPluginsDependencies(ctx), {...ctx, concurrent: false})\n }\n ],\n ctx\n );\n }\n\n async $exec(ctx: InitCmdContext) {\n const subTasks = [\n ...(await this.cliService.getTasks(\"generate\", {\n ...ctx,\n type: \"server\",\n name: \"Server\",\n route: \"/rest\"\n })),\n ...(await this.cliService.getTasks(\"generate\", {\n type: \"controller\",\n route: \"hello-world\",\n name: \"HelloWorld\"\n })),\n ...(ctx.commands\n ? await this.cliService.getTasks(\"generate\", {\n type: \"command\",\n route: \"hello\",\n name: \"hello\"\n })\n : [])\n ];\n\n const indexCtrlBaseName = basename(\n `${this.outputFilePathPipe.transform({\n name: \"Index\",\n type: \"controller\",\n format: ctx.convention\n })}.ts`\n );\n\n return [\n {\n title: \"Generate project files\",\n task: createSubTasks(\n [\n {\n title: \"Root files\",\n task: () =>\n this.rootRenderer.renderAll(\n [\n \"/init/.dockerignore.hbs\",\n \"/init/.gitignore.hbs\",\n ctx.babel && \"/init/.babelrc.hbs\",\n ctx.webpack && \"/init/webpack.config.js.hbs\",\n \"/init/docker-compose.yml.hbs\",\n \"/init/Dockerfile.hbs\",\n \"/init/README.md.hbs\",\n \"/init/tsconfig.compile.json.hbs\",\n \"/init/tsconfig.json.hbs\",\n \"/init/src/index.ts.hbs\",\n \"/init/src/config/env/index.ts.hbs\",\n \"/init/src/config/logger/index.ts.hbs\",\n \"/init/src/config/index.ts.hbs\",\n ctx.commands && \"/init/src/bin/index.ts.hbs\",\n ctx.swagger && \"/init/views/swagger.ejs.hbs\",\n ctx.swagger && {\n path: \"/init/src/controllers/pages/IndexCtrl.ts.hbs\",\n basename: indexCtrlBaseName\n }\n ].filter(Boolean),\n ctx,\n {\n baseDir: \"/init\"\n }\n )\n },\n ...subTasks\n ],\n {...ctx, concurrent: false}\n )\n }\n ];\n }\n\n resolveRootDir(ctx: Partial<InitCmdContext>) {\n const rootDirName = paramCase(ctx.projectName || basename(this.packageJson.dir));\n\n if (this.packageJson.dir.endsWith(rootDirName)) {\n ctx.projectName = ctx.projectName || rootDirName;\n ctx.root = \".\";\n return;\n }\n\n ctx.projectName = ctx.projectName || rootDirName;\n\n if (ctx.root && ctx.root !== \".\") {\n this.packageJson.dir = join(this.packageJson.dir, rootDirName);\n ctx.root = \".\";\n }\n }\n\n addScripts(ctx: InitCmdContext): void {\n const runner = this.packageJson.getRunCmd();\n\n this.packageJson.addScripts({\n build: `${runner} tsc --project tsconfig.compile.json`,\n \"build:w\": \"tsc --project tsconfig.compile.json -w\",\n start: \"tsnd --inspect --ignore-watch node_modules --respawn --transpile-only -r tsconfig-paths/register src/index.ts\",\n \"start:prod\": \"cross-env NODE_ENV=production node dist/index.js\"\n });\n\n if (ctx.babel) {\n this.packageJson.addScripts({\n build: `${runner} tsc && babel src --out-dir dist --extensions \".ts,.tsx\" --source-maps inline`,\n start: \"babel-watch --extensions .ts src/index.ts\"\n });\n }\n\n if (ctx.webpack) {\n this.packageJson.addScripts({\n bundle: `${runner} tsc && cross-env NODE_ENV=production webpack`,\n \"start:bundle\": \"cross-env NODE_ENV=production node dist/app.bundle.js\"\n });\n }\n }\n\n addDependencies(ctx: InitCmdContext) {\n this.packageJson.addDependencies({\n \"@tsed/common\": ctx.tsedVersion,\n \"@tsed/core\": ctx.tsedVersion,\n \"@tsed/di\": ctx.tsedVersion,\n \"@tsed/ajv\": ctx.tsedVersion,\n \"@tsed/exceptions\": ctx.tsedVersion,\n \"@tsed/schema\": ctx.tsedVersion,\n \"@tsed/json-mapper\": ctx.tsedVersion,\n \"@tsed/platform-cache\": ctx.tsedVersion,\n \"@tsed/platform-exceptions\": ctx.tsedVersion,\n \"@tsed/platform-log-middleware\": ctx.tsedVersion,\n \"@tsed/platform-middlewares\": ctx.tsedVersion,\n \"@tsed/platform-params\": ctx.tsedVersion,\n \"@tsed/platform-response-filter\": ctx.tsedVersion,\n \"@tsed/platform-views\": ctx.tsedVersion,\n \"@tsed/logger\": \"latest\",\n \"@tsed/logger-file\": \"latest\",\n \"@tsed/engines\": \"latest\",\n ajv: \"latest\",\n \"cross-env\": \"latest\",\n dotenv: \"latest\"\n });\n }\n\n addDevDependencies(ctx: InitCmdContext) {\n this.packageJson.addDevDependencies(\n {\n \"@types/node\": \"latest\",\n \"@types/multer\": \"latest\",\n tslib: \"latest\",\n \"ts-node\": \"latest\",\n \"tsconfig-paths\": \"latest\",\n typescript: \"latest\"\n },\n ctx\n );\n\n if (!ctx.babel) {\n this.packageJson.addDevDependencies(\n {\n \"ts-node-dev\": \"latest\"\n },\n ctx\n );\n }\n }\n\n addFeatures(ctx: InitCmdContext) {\n ctx.features.forEach((feature) => {\n if (feature.dependencies) {\n this.packageJson.addDependencies(feature.dependencies, ctx);\n }\n\n if (feature.devDependencies) {\n this.packageJson.addDevDependencies(feature.devDependencies, ctx);\n }\n });\n\n switch (ctx.platform) {\n case \"express\":\n this.addExpressDependencies(ctx);\n break;\n case \"koa\":\n this.addKoaDependencies(ctx);\n break;\n }\n\n if (ctx.features.find(({type}) => type === \"graphql\")) {\n this.packageJson.addDependencies(\n {\n [\"apollo-server-\" + ctx.platform]: \"2.25.2\"\n },\n ctx\n );\n }\n }\n\n private addExpressDependencies(ctx: InitCmdContext) {\n this.packageJson.addDependencies(\n {\n \"@tsed/platform-express\": ctx.tsedVersion,\n \"body-parser\": \"latest\",\n cors: \"latest\",\n compression: \"latest\",\n \"cookie-parser\": \"latest\",\n express: \"latest\",\n \"method-override\": \"latest\"\n },\n ctx\n );\n\n this.packageJson.addDevDependencies(\n {\n \"@types/cors\": \"latest\",\n \"@types/express\": \"latest\",\n \"@types/compression\": \"latest\",\n \"@types/cookie-parser\": \"latest\",\n \"@types/method-override\": \"latest\"\n },\n ctx\n );\n }\n\n private addKoaDependencies(ctx: InitCmdContext) {\n this.packageJson.addDependencies(\n {\n \"@tsed/platform-koa\": ctx.tsedVersion,\n koa: \"latest\",\n \"@koa/cors\": \"latest\",\n \"@koa/router\": \"latest\",\n \"koa-qs\": \"latest\",\n \"koa-bodyparser\": \"latest\",\n \"koa-override\": \"latest\",\n \"koa-compress\": \"latest\"\n },\n ctx\n );\n\n this.packageJson.addDevDependencies(\n {\n \"@types/koa\": \"latest\",\n \"@types/koa-qs\": \"latest\",\n \"@types/koa-json\": \"latest\",\n \"@types/koa-bodyparser\": \"latest\",\n \"@types/koa__router\": \"latest\",\n \"@types/koa-compress\": \"latest\",\n \"@types/koa-send\": \"latest\",\n \"@types/koa__cors\": \"latest\"\n },\n ctx\n );\n }\n}\n"]}
1
+ {"version":3,"file":"InitCmd.js","sourceRoot":"","sources":["../../../src/commands/init/InitCmd.ts"],"names":[],"mappings":";;;;AAAA,6CAiBwB;AACxB,6CAA6D;AAC7D,+BAA6C;AAC7C,+CAAkD;AAGlD,uEAAkE;AAClE,sDAAkF;AA0ClF,IAAa,OAAO,GAApB,MAAa,OAAO;IA4BlB,KAAK,CAAC,aAAa,CAAC,cAAuC;QACzD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,QAAQ,IAAI,cAAc,CAAC,YAAY,EAAE;YAC3C,MAAM,gBAAgB,GAAG,cAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;YACxE,MAAM,gBAAgB,GAAG,gEAAa,gBAAgB,GAAC,CAAC;YACxD,MAAM,cAAc,GAAG,4BAAiB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC,qBAAqB;YAC1F,cAAc,GAAG,EAAC,GAAG,cAAc,EAAE,GAAG,cAAc,EAAC,CAAC;SACzD;QACD,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,OAAO,CAAC,cAAuC;;QAC7C,MAAM,iBAAiB,GAAG,CAAA,MAAA,cAAc,CAAC,QAAQ,0CAAE,MAAM,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpF,OAAO;YACL;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,2BAA2B;gBACpC,OAAO,EAAE,uBAAS,CAAC,cAAc,CAAC,IAAK,CAAC;gBACxC,IAAI,EAAE,cAAc,CAAC,IAAI,KAAK,GAAG;gBACjC,WAAW,CAAC,KAAK;oBACf,OAAO,uBAAS,CAAC,KAAK,CAAC,CAAC;gBAC1B,CAAC;aACF;YACD,GAAG,iBAAiB;SACrB,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,GAA4B;;QACtC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAEzB,MAAM,QAAQ,GAAmB,EAAE,CAAC;QAEpC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;aAChB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,GAAG,KAAK,cAAc,CAAC;aACvE,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAQ,EAAE,EAAE;YAC/B,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;YAChB,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEL,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACvC,GAAG,CAAC,uBAAS,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,GAAG,GAAG;YACN,QAAQ;YACR,MAAM,EAAE,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,0CAAE,MAAM;YAC1C,IAAI,EAAE,GAAG,CAAC,cAAc,KAAK,yBAAc,CAAC,IAAI;YAChD,GAAG,EAAE,GAAG,CAAC,cAAc,KAAK,yBAAc,CAAC,GAAG;YAC9C,IAAI,EAAE,GAAG,CAAC,cAAc,KAAK,yBAAc,CAAC,IAAI;YAChD,OAAO,EAAE,GAAG,CAAC,QAAQ,KAAK,SAAS;YACnC,GAAG,EAAE,GAAG,CAAC,QAAQ,KAAK,KAAK;YAC3B,cAAc,EAAE,wBAAU,CAAC,YAAY,GAAG,CAAC,QAAQ,EAAE,CAAC;SACrC,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,GAAmB;QACnC,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC;QAExC,GAAG,CAAC,cAAc,IAAI,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,gBAAgB,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;QAC3F,GAAG,CAAC,YAAY,IAAI,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,cAAc,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QACrF,GAAG,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,YAAY,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;QAC/E,GAAG,CAAC,QAAQ,IAAI,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE1D,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAEtB,MAAM,4BAAiB,CACrB;YACE;gBACE,KAAK,EAAE,gBAAgB;gBACvB,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ;gBACzB,IAAI,EAAE,GAAG,EAAE,CACT,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,EAAE,GAAG,EAAE;oBAC1E,OAAO,EAAE,OAAO;iBACjB,CAAC;aACL;YACD;gBACE,KAAK,EAAE,iBAAiB;gBACxB,IAAI,EAAE,yBAAc,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAC,GAAG,GAAG,EAAE,UAAU,EAAE,KAAK,EAAC,CAAC;aACvF;YACD;gBACE,KAAK,EAAE,cAAc;gBACrB,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE;aAC1C;YACD;gBACE,KAAK,EAAE,8BAA8B;gBACrC,IAAI,EAAE,yBAAc,CAAC,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,EAAC,GAAG,GAAG,EAAE,UAAU,EAAE,KAAK,EAAC,CAAC;aAC/F;SACF,EACD,GAAG,CACJ,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAmB;QAC7B,MAAM,QAAQ,GAAG;YACf,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,EAAE;gBAC7C,GAAG,GAAG;gBACN,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,OAAO;aACf,CAAC,CAAC;YACH,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,EAAE;gBAC7C,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,aAAa;gBACpB,IAAI,EAAE,YAAY;gBAClB,SAAS,EAAE,MAAM;aAClB,CAAC,CAAC;YACH,GAAG,CAAC,GAAG,CAAC,QAAQ;gBACd,CAAC,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,EAAE;oBACzC,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,OAAO;iBACd,CAAC;gBACJ,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;QAEF,MAAM,iBAAiB,GAAG,eAAQ,CAChC,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC;YACnC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,GAAG,CAAC,UAAU;SACvB,CAAC,KAAK,CACR,CAAC;QAEF,OAAO;YACL;gBACE,KAAK,EAAE,wBAAwB;gBAC/B,IAAI,EAAE,yBAAc,CAClB;oBACE;wBACE,KAAK,EAAE,YAAY;wBACnB,IAAI,EAAE,GAAG,EAAE,CACT,IAAI,CAAC,YAAY,CAAC,SAAS,CACzB;4BACE,yBAAyB;4BACzB,sBAAsB;4BACtB,2BAA2B;4BAC3B,+BAA+B;4BAC/B,GAAG,CAAC,KAAK,IAAI,oBAAoB;4BACjC,GAAG,CAAC,OAAO,IAAI,6BAA6B;4BAC5C,8BAA8B;4BAC9B,sBAAsB;4BACtB,qBAAqB;4BACrB,iCAAiC;4BACjC,yBAAyB;4BACzB,wBAAwB;4BACxB,mCAAmC;4BACnC,sCAAsC;4BACtC,+BAA+B;4BAC/B,GAAG,CAAC,QAAQ,IAAI,4BAA4B;4BAC5C,GAAG,CAAC,OAAO,IAAI,6BAA6B;4BAC5C,GAAG,CAAC,OAAO,IAAI;gCACb,IAAI,EAAE,oDAAoD;gCAC1D,QAAQ,EAAE,iBAAiB;6BAC5B;yBACF,CAAC,MAAM,CAAC,OAAO,CAAC,EACjB,GAAG,EACH;4BACE,OAAO,EAAE,OAAO;yBACjB,CACF;qBACJ;oBACD,GAAG,QAAQ;iBACZ,EACD,EAAC,GAAG,GAAG,EAAE,UAAU,EAAE,KAAK,EAAC,CAC5B;aACF;SACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC5C,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,cAAc,CAAC,GAA4B;QACzC,MAAM,WAAW,GAAG,uBAAS,CAAC,GAAG,CAAC,WAAW,IAAI,eAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QAEjF,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC9C,GAAG,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,IAAI,WAAW,CAAC;YACjD,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC;YACf,OAAO;SACR;QAED,GAAG,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,IAAI,WAAW,CAAC;QAEjD,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;YAChC,IAAI,CAAC,WAAW,CAAC,GAAG,GAAG,WAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAC/D,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC;SAChB;IACH,CAAC;IAED,UAAU,CAAC,GAAmB;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QAE5C,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;YAC1B,KAAK,EAAE,GAAG,MAAM,eAAe,MAAM,sCAAsC;YAC3E,OAAO,EAAE,oCAAoC;YAC7C,KAAK,EAAE,GAAG,MAAM,2HAA2H;YAC3I,YAAY,EAAE,kDAAkD;SACjE,CAAC,CAAC;QAEH,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;gBAC1B,KAAK,EAAE,GAAG,MAAM,+EAA+E;gBAC/F,KAAK,EAAE,2CAA2C;aACnD,CAAC,CAAC;SACJ;QAED,IAAI,GAAG,CAAC,OAAO,EAAE;YACf,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;gBAC1B,MAAM,EAAE,GAAG,MAAM,+CAA+C;gBAChE,cAAc,EAAE,uDAAuD;aACxE,CAAC,CAAC;SACJ;IACH,CAAC;IAED,eAAe,CAAC,GAAmB;QACjC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC;YAC/B,cAAc,EAAE,GAAG,CAAC,WAAW;YAC/B,YAAY,EAAE,GAAG,CAAC,WAAW;YAC7B,UAAU,EAAE,GAAG,CAAC,WAAW;YAC3B,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,kBAAkB,EAAE,GAAG,CAAC,WAAW;YACnC,cAAc,EAAE,GAAG,CAAC,WAAW;YAC/B,mBAAmB,EAAE,GAAG,CAAC,WAAW;YACpC,sBAAsB,EAAE,GAAG,CAAC,WAAW;YACvC,2BAA2B,EAAE,GAAG,CAAC,WAAW;YAC5C,+BAA+B,EAAE,GAAG,CAAC,WAAW;YAChD,4BAA4B,EAAE,GAAG,CAAC,WAAW;YAC7C,uBAAuB,EAAE,GAAG,CAAC,WAAW;YACxC,gCAAgC,EAAE,GAAG,CAAC,WAAW;YACjD,sBAAsB,EAAE,GAAG,CAAC,WAAW;YACvC,cAAc,EAAE,QAAQ;YACxB,mBAAmB,EAAE,QAAQ;YAC7B,eAAe,EAAE,QAAQ;YACzB,GAAG,EAAE,QAAQ;YACb,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,QAAQ;YACrB,MAAM,EAAE,QAAQ;YAChB,eAAe,EAAE,QAAQ;YACzB,aAAa,EAAE,QAAQ;SACxB,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,GAAmB;QACpC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CACjC;YACE,aAAa,EAAE,QAAQ;YACvB,eAAe,EAAE,QAAQ;YACzB,KAAK,EAAE,QAAQ;YACf,SAAS,EAAE,QAAQ;YACnB,gBAAgB,EAAE,QAAQ;YAC1B,UAAU,EAAE,QAAQ;SACrB,EACD,GAAG,CACJ,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YACd,IAAI,CAAC,WAAW,CAAC,kBAAkB,CACjC;gBACE,aAAa,EAAE,QAAQ;aACxB,EACD,GAAG,CACJ,CAAC;SACH;IACH,CAAC;IAED,WAAW,CAAC,GAAmB;QAC7B,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC/B,IAAI,OAAO,CAAC,YAAY,EAAE;gBACxB,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;aAC7D;YAED,IAAI,OAAO,CAAC,eAAe,EAAE;gBAC3B,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;aACnE;QACH,CAAC,CAAC,CAAC;QAEH,QAAQ,GAAG,CAAC,QAAQ,EAAE;YACpB,KAAK,SAAS;gBACZ,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;gBACjC,MAAM;YACR,KAAK,KAAK;gBACR,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;gBAC7B,MAAM;SACT;QAED,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,EAAE;YACrD,IAAI,CAAC,WAAW,CAAC,eAAe,CAC9B;gBACE,CAAC,gBAAgB,GAAG,GAAG,CAAC,QAAQ,CAAC,EAAE,QAAQ;aAC5C,EACD,GAAG,CACJ,CAAC;SACH;IACH,CAAC;IAEO,sBAAsB,CAAC,GAAmB;QAChD,IAAI,CAAC,WAAW,CAAC,eAAe,CAC9B;YACE,wBAAwB,EAAE,GAAG,CAAC,WAAW;YACzC,aAAa,EAAE,QAAQ;YACvB,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,QAAQ;YACrB,eAAe,EAAE,QAAQ;YACzB,OAAO,EAAE,QAAQ;YACjB,iBAAiB,EAAE,QAAQ;SAC5B,EACD,GAAG,CACJ,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,kBAAkB,CACjC;YACE,aAAa,EAAE,QAAQ;YACvB,gBAAgB,EAAE,QAAQ;YAC1B,oBAAoB,EAAE,QAAQ;YAC9B,sBAAsB,EAAE,QAAQ;YAChC,wBAAwB,EAAE,QAAQ;SACnC,EACD,GAAG,CACJ,CAAC;IACJ,CAAC;IAEO,kBAAkB,CAAC,GAAmB;QAC5C,IAAI,CAAC,WAAW,CAAC,eAAe,CAC9B;YACE,oBAAoB,EAAE,GAAG,CAAC,WAAW;YACrC,GAAG,EAAE,QAAQ;YACb,WAAW,EAAE,QAAQ;YACrB,aAAa,EAAE,QAAQ;YACvB,QAAQ,EAAE,QAAQ;YAClB,gBAAgB,EAAE,QAAQ;YAC1B,cAAc,EAAE,QAAQ;YACxB,cAAc,EAAE,QAAQ;SACzB,EACD,GAAG,CACJ,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,kBAAkB,CACjC;YACE,YAAY,EAAE,QAAQ;YACtB,eAAe,EAAE,QAAQ;YACzB,iBAAiB,EAAE,QAAQ;YAC3B,uBAAuB,EAAE,QAAQ;YACjC,oBAAoB,EAAE,QAAQ;YAC9B,qBAAqB,EAAE,QAAQ;YAC/B,iBAAiB,EAAE,QAAQ;YAC3B,kBAAkB,EAAE,QAAQ;SAC7B,EACD,GAAG,CACJ,CAAC;IACJ,CAAC;CACF,CAAA;AAlYC;IADC,wBAAa,EAAE;;8CACuB;AAGvC;IADC,iBAAM,EAAE;sCACa,qBAAU;2CAAC;AAGjC;IADC,iBAAM,EAAE;sCACc,6BAAkB;4CAAC;AAG1C;IADC,mBAAQ,EAAE;;yCACkB;AAG7B;IADC,iBAAM,EAAE;sCACa,qBAAU;2CAAC;AAGjC;IADC,iBAAM,EAAE;sCACe,8BAAmB;6CAAC;AAG5C;IADC,iBAAM,EAAE;sCACqB,uCAAkB;mDAAC;AAGjD;IADC,iBAAM,EAAE;sCACQ,mBAAQ;sCAAC;AAG1B;IADC,iBAAM,EAAE;sCACK,gBAAK;mCAAC;AA1BT,OAAO;IAtBnB,kBAAO,CAAC;QACP,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,0BAA0B;QACvC,IAAI,EAAE;YACJ,IAAI,EAAE;gBACJ,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG;gBACjB,WAAW,EAAE,gDAAgD;aAC9D;SACF;QACD,OAAO,EAAE;YACP,8BAA8B,EAAE;gBAC9B,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,6BAAiB;gBAC/B,WAAW,EAAE,iDAAiD;aAC/D;YACD,4BAA4B,EAAE;gBAC5B,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,uDAAuD;aACrE;SACF;KACF,CAAC;GACW,OAAO,CAoYnB;AApYY,0BAAO","sourcesContent":["import {\n CliDefaultOptions,\n CliExeca,\n CliFs,\n CliPlugins,\n CliService,\n Command,\n CommandProvider,\n Configuration,\n createSubTasks,\n createTasksRunner,\n Inject,\n InstallOptions,\n PackageManager,\n ProjectPackageJson,\n QuestionOptions,\n RootRendererService\n} from \"@tsed/cli-core\";\nimport {camelCase, paramCase, pascalCase} from \"change-case\";\nimport {basename, join, resolve} from \"path\";\nimport {DEFAULT_TSED_TAGS} from \"../../constants\";\nimport {ArchitectureConvention} from \"../../interfaces/ArchitectureConvention\";\nimport {ProjectConvention} from \"../../interfaces/ProjectConvention\";\nimport {OutputFilePathPipe} from \"../../pipes/OutputFilePathPipe\";\nimport {Features, FeatureValue, parseFeaturesFile} from \"../../services/Features\";\n\nexport interface InitCmdContext extends CliDefaultOptions, InstallOptions {\n platform: \"express\" | \"koa\";\n root: string;\n srcDir: string;\n projectName: string;\n tsedVersion: string;\n features: FeatureValue[];\n featuresTypeORM?: FeatureValue;\n babel?: boolean;\n webpack?: boolean;\n architecture?: ArchitectureConvention;\n convention?: ProjectConvention;\n commands?: boolean;\n GH_TOKEN?: string;\n\n [key: string]: any;\n}\n\n@Command({\n name: \"init\",\n description: \"Init a new Ts.ED project\",\n args: {\n root: {\n type: String,\n defaultValue: \".\",\n description: \"Root directory to initialize the Ts.ED project\"\n }\n },\n options: {\n \"-t, --tsed-version <version>\": {\n type: String,\n defaultValue: DEFAULT_TSED_TAGS,\n description: \"Use a specific version of Ts.ED (format: 5.x.x)\"\n },\n \"-f, --features-file <path>\": {\n type: String,\n description: \"Location of a file in which the features are defined.\"\n }\n }\n})\nexport class InitCmd implements CommandProvider {\n @Configuration()\n protected configuration: Configuration;\n\n @Inject()\n protected cliPlugins: CliPlugins;\n\n @Inject()\n protected packageJson: ProjectPackageJson;\n\n @Features()\n protected features: Features;\n\n @Inject()\n protected cliService: CliService;\n\n @Inject()\n protected rootRenderer: RootRendererService;\n\n @Inject()\n protected outputFilePathPipe: OutputFilePathPipe;\n\n @Inject()\n protected execa: CliExeca;\n\n @Inject()\n protected fs: CliFs;\n\n async $beforePrompt(initialOptions: Partial<InitCmdContext>) {\n const callPath = process.cwd();\n if (callPath && initialOptions.featuresFile) {\n const featuresFilePath = resolve(callPath, initialOptions.featuresFile);\n const featuresFromFile = await import(featuresFilePath);\n const mappedFeatures = parseFeaturesFile(featuresFromFile, \"3.8.0\"); // Inject CLI version\n initialOptions = {...initialOptions, ...mappedFeatures};\n }\n return initialOptions;\n }\n\n $prompt(initialOptions: Partial<InitCmdContext>): QuestionOptions {\n const featuresQuestions = initialOptions.features?.length ? [] : [...this.features];\n return [\n {\n type: \"input\",\n name: \"projectName\",\n message: \"What is your project name\",\n default: paramCase(initialOptions.root!),\n when: initialOptions.root !== \".\",\n transformer(input) {\n return paramCase(input);\n }\n },\n ...featuresQuestions\n ];\n }\n\n $mapContext(ctx: Partial<InitCmdContext>): InitCmdContext {\n this.resolveRootDir(ctx);\n\n const features: FeatureValue[] = [];\n\n Object.entries(ctx)\n .filter(([key]) => key.startsWith(\"features\") && key !== \"featuresFile\")\n .forEach(([key, value]: any[]) => {\n delete ctx[key];\n features.push(...[].concat(value));\n });\n\n features.forEach((feature) => {\n feature.type.split(\":\").forEach((type) => {\n ctx[camelCase(type)] = true;\n });\n });\n\n return {\n ...ctx,\n features,\n srcDir: this.configuration.project?.srcDir,\n pnpm: ctx.packageManager === PackageManager.PNPM,\n npm: ctx.packageManager === PackageManager.NPM,\n yarn: ctx.packageManager === PackageManager.YARN,\n express: ctx.platform === \"express\",\n koa: ctx.platform === \"koa\",\n platformSymbol: pascalCase(`Platform ${ctx.platform}`)\n } as InitCmdContext;\n }\n\n async $beforeExec(ctx: InitCmdContext): Promise<any> {\n this.fs.ensureDirSync(this.packageJson.dir);\n this.packageJson.name = ctx.projectName;\n\n ctx.packageManager && this.packageJson.setPreference(\"packageManager\", ctx.packageManager);\n ctx.architecture && this.packageJson.setPreference(\"architecture\", ctx.architecture);\n ctx.convention && this.packageJson.setPreference(\"convention\", ctx.convention);\n ctx.GH_TOKEN && this.packageJson.setGhToken(ctx.GH_TOKEN);\n\n this.addDependencies(ctx);\n this.addDevDependencies(ctx);\n this.addScripts(ctx);\n this.addFeatures(ctx);\n\n await createTasksRunner(\n [\n {\n title: \"Write RC files\",\n skip: () => !ctx.GH_TOKEN,\n task: () =>\n this.rootRenderer.renderAll([\"/init/.npmrc.hbs\", \"/init/.yarnrc.hbs\"], ctx, {\n baseDir: \"/init\"\n })\n },\n {\n title: \"Install plugins\",\n task: createSubTasks(() => this.packageJson.install(ctx), {...ctx, concurrent: false})\n },\n {\n title: \"Load plugins\",\n task: () => this.cliPlugins.loadPlugins()\n },\n {\n title: \"Install plugins dependencies\",\n task: createSubTasks(this.cliPlugins.addPluginsDependencies(ctx), {...ctx, concurrent: false})\n }\n ],\n ctx\n );\n }\n\n async $exec(ctx: InitCmdContext) {\n const subTasks = [\n ...(await this.cliService.getTasks(\"generate\", {\n ...ctx,\n type: \"server\",\n name: \"Server\",\n route: \"/rest\"\n })),\n ...(await this.cliService.getTasks(\"generate\", {\n type: \"controller\",\n route: \"hello-world\",\n name: \"HelloWorld\",\n directory: \"rest\"\n })),\n ...(ctx.commands\n ? await this.cliService.getTasks(\"generate\", {\n type: \"command\",\n route: \"hello\",\n name: \"hello\"\n })\n : [])\n ];\n\n const indexCtrlBaseName = basename(\n `${this.outputFilePathPipe.transform({\n name: \"Index\",\n type: \"controller\",\n format: ctx.convention\n })}.ts`\n );\n\n return [\n {\n title: \"Generate project files\",\n task: createSubTasks(\n [\n {\n title: \"Root files\",\n task: () =>\n this.rootRenderer.renderAll(\n [\n \"/init/.dockerignore.hbs\",\n \"/init/.gitignore.hbs\",\n \"/init/.barrelsby.json.hbs\",\n \"/init/processes.config.js.hbs\",\n ctx.babel && \"/init/.babelrc.hbs\",\n ctx.webpack && \"/init/webpack.config.js.hbs\",\n \"/init/docker-compose.yml.hbs\",\n \"/init/Dockerfile.hbs\",\n \"/init/README.md.hbs\",\n \"/init/tsconfig.compile.json.hbs\",\n \"/init/tsconfig.json.hbs\",\n \"/init/src/index.ts.hbs\",\n \"/init/src/config/env/index.ts.hbs\",\n \"/init/src/config/logger/index.ts.hbs\",\n \"/init/src/config/index.ts.hbs\",\n ctx.commands && \"/init/src/bin/index.ts.hbs\",\n ctx.swagger && \"/init/views/swagger.ejs.hbs\",\n ctx.swagger && {\n path: \"/init/src/controllers/pages/IndexController.ts.hbs\",\n basename: indexCtrlBaseName\n }\n ].filter(Boolean),\n ctx,\n {\n baseDir: \"/init\"\n }\n )\n },\n ...subTasks\n ],\n {...ctx, concurrent: false}\n )\n }\n ];\n }\n\n async $postInstall() {\n await this.packageJson.runScript(\"barrels\");\n return [];\n }\n\n resolveRootDir(ctx: Partial<InitCmdContext>) {\n const rootDirName = paramCase(ctx.projectName || basename(this.packageJson.dir));\n\n if (this.packageJson.dir.endsWith(rootDirName)) {\n ctx.projectName = ctx.projectName || rootDirName;\n ctx.root = \".\";\n return;\n }\n\n ctx.projectName = ctx.projectName || rootDirName;\n\n if (ctx.root && ctx.root !== \".\") {\n this.packageJson.dir = join(this.packageJson.dir, rootDirName);\n ctx.root = \".\";\n }\n }\n\n addScripts(ctx: InitCmdContext): void {\n const runner = this.packageJson.getRunCmd();\n\n this.packageJson.addScripts({\n build: `${runner} barrels && ${runner} tsc --project tsconfig.compile.json`,\n barrels: \"barrelsby --config .barrelsby.json\",\n start: `${runner} barrels && tsnd --inspect --ignore-watch node_modules --respawn --transpile-only -r tsconfig-paths/register src/index.ts`,\n \"start:prod\": \"cross-env NODE_ENV=production node dist/index.js\"\n });\n\n if (ctx.babel) {\n this.packageJson.addScripts({\n build: `${runner} tsc && babel src --out-dir dist --extensions \".ts,.tsx\" --source-maps inline`,\n start: \"babel-watch --extensions .ts src/index.ts\"\n });\n }\n\n if (ctx.webpack) {\n this.packageJson.addScripts({\n bundle: `${runner} tsc && cross-env NODE_ENV=production webpack`,\n \"start:bundle\": \"cross-env NODE_ENV=production node dist/app.bundle.js\"\n });\n }\n }\n\n addDependencies(ctx: InitCmdContext) {\n this.packageJson.addDependencies({\n \"@tsed/common\": ctx.tsedVersion,\n \"@tsed/core\": ctx.tsedVersion,\n \"@tsed/di\": ctx.tsedVersion,\n \"@tsed/ajv\": ctx.tsedVersion,\n \"@tsed/exceptions\": ctx.tsedVersion,\n \"@tsed/schema\": ctx.tsedVersion,\n \"@tsed/json-mapper\": ctx.tsedVersion,\n \"@tsed/platform-cache\": ctx.tsedVersion,\n \"@tsed/platform-exceptions\": ctx.tsedVersion,\n \"@tsed/platform-log-middleware\": ctx.tsedVersion,\n \"@tsed/platform-middlewares\": ctx.tsedVersion,\n \"@tsed/platform-params\": ctx.tsedVersion,\n \"@tsed/platform-response-filter\": ctx.tsedVersion,\n \"@tsed/platform-views\": ctx.tsedVersion,\n \"@tsed/logger\": \"latest\",\n \"@tsed/logger-file\": \"latest\",\n \"@tsed/engines\": \"latest\",\n ajv: \"latest\",\n barrelsby: \"latest\",\n \"cross-env\": \"latest\",\n dotenv: \"latest\",\n \"dotenv-expand\": \"latest\",\n \"dotenv-flow\": \"latest\"\n });\n }\n\n addDevDependencies(ctx: InitCmdContext) {\n this.packageJson.addDevDependencies(\n {\n \"@types/node\": \"latest\",\n \"@types/multer\": \"latest\",\n tslib: \"latest\",\n \"ts-node\": \"latest\",\n \"tsconfig-paths\": \"latest\",\n typescript: \"latest\"\n },\n ctx\n );\n\n if (!ctx.babel) {\n this.packageJson.addDevDependencies(\n {\n \"ts-node-dev\": \"latest\"\n },\n ctx\n );\n }\n }\n\n addFeatures(ctx: InitCmdContext) {\n ctx.features.forEach((feature) => {\n if (feature.dependencies) {\n this.packageJson.addDependencies(feature.dependencies, ctx);\n }\n\n if (feature.devDependencies) {\n this.packageJson.addDevDependencies(feature.devDependencies, ctx);\n }\n });\n\n switch (ctx.platform) {\n case \"express\":\n this.addExpressDependencies(ctx);\n break;\n case \"koa\":\n this.addKoaDependencies(ctx);\n break;\n }\n\n if (ctx.features.find(({type}) => type === \"graphql\")) {\n this.packageJson.addDependencies(\n {\n [\"apollo-server-\" + ctx.platform]: \"2.25.2\"\n },\n ctx\n );\n }\n }\n\n private addExpressDependencies(ctx: InitCmdContext) {\n this.packageJson.addDependencies(\n {\n \"@tsed/platform-express\": ctx.tsedVersion,\n \"body-parser\": \"latest\",\n cors: \"latest\",\n compression: \"latest\",\n \"cookie-parser\": \"latest\",\n express: \"latest\",\n \"method-override\": \"latest\"\n },\n ctx\n );\n\n this.packageJson.addDevDependencies(\n {\n \"@types/cors\": \"latest\",\n \"@types/express\": \"latest\",\n \"@types/compression\": \"latest\",\n \"@types/cookie-parser\": \"latest\",\n \"@types/method-override\": \"latest\"\n },\n ctx\n );\n }\n\n private addKoaDependencies(ctx: InitCmdContext) {\n this.packageJson.addDependencies(\n {\n \"@tsed/platform-koa\": ctx.tsedVersion,\n koa: \"latest\",\n \"@koa/cors\": \"latest\",\n \"@koa/router\": \"latest\",\n \"koa-qs\": \"latest\",\n \"koa-bodyparser\": \"latest\",\n \"koa-override\": \"latest\",\n \"koa-compress\": \"latest\"\n },\n ctx\n );\n\n this.packageJson.addDevDependencies(\n {\n \"@types/koa\": \"latest\",\n \"@types/koa-qs\": \"latest\",\n \"@types/koa-json\": \"latest\",\n \"@types/koa-bodyparser\": \"latest\",\n \"@types/koa__router\": \"latest\",\n \"@types/koa-compress\": \"latest\",\n \"@types/koa-send\": \"latest\",\n \"@types/koa__cors\": \"latest\"\n },\n ctx\n );\n }\n}\n"]}
@@ -10,6 +10,7 @@ export declare class OutputFilePathPipe {
10
10
  transform(options: {
11
11
  name: string;
12
12
  type: string;
13
+ subDir?: string;
13
14
  baseDir?: string;
14
15
  format?: ProjectConvention;
15
16
  }): string;
@@ -15,12 +15,12 @@ let OutputFilePathPipe = class OutputFilePathPipe {
15
15
  transform(options) {
16
16
  var _a;
17
17
  options.format = options.format || this.projectPackageJson.preferences.convention || interfaces_1.ProjectConvention.DEFAULT;
18
- const dir = path_1.dirname(options.name);
18
+ const featureDir = path_1.dirname(options.name);
19
19
  if (options.type === "server" || this.projectPackageJson.preferences.architecture === interfaces_1.ArchitectureConvention.FEATURE) {
20
- return path_1.join(dir, this.classNamePipe.transform(options));
20
+ return path_1.join(options.subDir || "", featureDir, this.classNamePipe.transform(options));
21
21
  }
22
22
  const baseDir = options.baseDir || ((_a = this.providers.get(options.type)) === null || _a === void 0 ? void 0 : _a.baseDir) || `${options.type}s`;
23
- return path_1.join(baseDir, dir, this.classNamePipe.transform(options));
23
+ return path_1.join(baseDir, options.subDir || "", featureDir, this.classNamePipe.transform(options));
24
24
  }
25
25
  };
26
26
  tslib_1.__decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"OutputFilePathPipe.js","sourceRoot":"","sources":["../../src/pipes/OutputFilePathPipe.ts"],"names":[],"mappings":";;;;AAAA,6CAA8D;AAC9D,iCAAgC;AAChC,+BAAmC;AACnC,2EAAsE;AACtE,mDAA8C;AAC9C,8CAAwE;AAGxE,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAO7B,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEpD,SAAS,CAAC,OAAmF;;QAC3F,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,UAAU,IAAI,8BAAiB,CAAC,OAAO,CAAC;QAE/G,MAAM,GAAG,GAAG,cAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAElC,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,YAAY,KAAK,mCAAsB,CAAC,OAAO,EAAE;YACpH,OAAO,WAAI,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;SACzD;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,KAAI,MAAA,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,0CAAE,OAAO,CAAA,IAAI,GAAG,OAAO,CAAC,IAAI,GAAG,CAAC;QAEnG,OAAO,WAAI,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IACnE,CAAC;CACF,CAAA;AApBC;IADC,WAAM,EAAE;sCACE,2CAAoB;qDAAC;AAGhC;IADC,WAAM,EAAE;sCACW,6BAAkB;8DAAC;AAL5B,kBAAkB;IAD9B,qBAAU,EAAE;6CAQwB,6BAAa;GAPrC,kBAAkB,CAsB9B;AAtBY,gDAAkB","sourcesContent":["import {Injectable, ProjectPackageJson} from \"@tsed/cli-core\";\nimport {Inject} from \"@tsed/di\";\nimport {dirname, join} from \"path\";\nimport {ProvidersInfoService} from \"../services/ProvidersInfoService\";\nimport {ClassNamePipe} from \"./ClassNamePipe\";\nimport {ProjectConvention, ArchitectureConvention} from \"../interfaces\";\n\n@Injectable()\nexport class OutputFilePathPipe {\n @Inject()\n providers: ProvidersInfoService;\n\n @Inject()\n projectPackageJson: ProjectPackageJson;\n\n constructor(private classNamePipe: ClassNamePipe) {}\n\n transform(options: {name: string; type: string; baseDir?: string; format?: ProjectConvention}) {\n options.format = options.format || this.projectPackageJson.preferences.convention || ProjectConvention.DEFAULT;\n\n const dir = dirname(options.name);\n\n if (options.type === \"server\" || this.projectPackageJson.preferences.architecture === ArchitectureConvention.FEATURE) {\n return join(dir, this.classNamePipe.transform(options));\n }\n\n const baseDir = options.baseDir || this.providers.get(options.type)?.baseDir || `${options.type}s`;\n\n return join(baseDir, dir, this.classNamePipe.transform(options));\n }\n}\n"]}
1
+ {"version":3,"file":"OutputFilePathPipe.js","sourceRoot":"","sources":["../../src/pipes/OutputFilePathPipe.ts"],"names":[],"mappings":";;;;AAAA,6CAA8D;AAC9D,iCAAgC;AAChC,+BAAmC;AACnC,2EAAsE;AACtE,mDAA8C;AAC9C,8CAAwE;AAGxE,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAO7B,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEpD,SAAS,CAAC,OAAoG;;QAC5G,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,UAAU,IAAI,8BAAiB,CAAC,OAAO,CAAC;QAE/G,MAAM,UAAU,GAAG,cAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEzC,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,YAAY,KAAK,mCAAsB,CAAC,OAAO,EAAE;YACpH,OAAO,WAAI,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;SACtF;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,KAAI,MAAA,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,0CAAE,OAAO,CAAA,IAAI,GAAG,OAAO,CAAC,IAAI,GAAG,CAAC;QAEnG,OAAO,WAAI,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAChG,CAAC;CACF,CAAA;AApBC;IADC,WAAM,EAAE;sCACE,2CAAoB;qDAAC;AAGhC;IADC,WAAM,EAAE;sCACW,6BAAkB;8DAAC;AAL5B,kBAAkB;IAD9B,qBAAU,EAAE;6CAQwB,6BAAa;GAPrC,kBAAkB,CAsB9B;AAtBY,gDAAkB","sourcesContent":["import {Injectable, ProjectPackageJson} from \"@tsed/cli-core\";\nimport {Inject} from \"@tsed/di\";\nimport {dirname, join} from \"path\";\nimport {ProvidersInfoService} from \"../services/ProvidersInfoService\";\nimport {ClassNamePipe} from \"./ClassNamePipe\";\nimport {ProjectConvention, ArchitectureConvention} from \"../interfaces\";\n\n@Injectable()\nexport class OutputFilePathPipe {\n @Inject()\n providers: ProvidersInfoService;\n\n @Inject()\n projectPackageJson: ProjectPackageJson;\n\n constructor(private classNamePipe: ClassNamePipe) {}\n\n transform(options: {name: string; type: string; subDir?: string; baseDir?: string; format?: ProjectConvention}) {\n options.format = options.format || this.projectPackageJson.preferences.convention || ProjectConvention.DEFAULT;\n\n const featureDir = dirname(options.name);\n\n if (options.type === \"server\" || this.projectPackageJson.preferences.architecture === ArchitectureConvention.FEATURE) {\n return join(options.subDir || \"\", featureDir, this.classNamePipe.transform(options));\n }\n\n const baseDir = options.baseDir || this.providers.get(options.type)?.baseDir || `${options.type}s`;\n\n return join(baseDir, options.subDir || \"\", featureDir, this.classNamePipe.transform(options));\n }\n}\n"]}
@@ -6,7 +6,7 @@ const cli_core_1 = require("@tsed/cli-core");
6
6
  const change_case_1 = require("change-case");
7
7
  let RoutePipe = class RoutePipe {
8
8
  transform(route) {
9
- return `/${route
9
+ const r = route
10
10
  .split("/")
11
11
  .reduce((paths, path) => {
12
12
  const word = change_case_1.paramCase(path);
@@ -15,7 +15,8 @@ let RoutePipe = class RoutePipe {
15
15
  }
16
16
  return [...paths, change_case_1.paramCase(path)];
17
17
  }, [])
18
- .join("/")}`.replace(/\/\//gi, "/");
18
+ .join("/");
19
+ return `/${r}`.replace(/\/\//gi, "/");
19
20
  }
20
21
  };
21
22
  RoutePipe = tslib_1.__decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"RoutePipe.js","sourceRoot":"","sources":["../../src/pipes/RoutePipe.ts"],"names":[],"mappings":";;;;AAAA,6CAA0C;AAC1C,6CAAsC;AAGtC,IAAa,SAAS,GAAtB,MAAa,SAAS;IACpB,SAAS,CAAC,KAAa;QACrB,OAAO,IAAI,KAAK;aACb,KAAK,CAAC,GAAG,CAAC;aACV,MAAM,CAAC,CAAC,KAAe,EAAE,IAAI,EAAE,EAAE;YAChC,MAAM,IAAI,GAAG,uBAAS,CAAC,IAAI,CAAC,CAAC;YAE7B,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACtD,OAAO,KAAK,CAAC;aACd;YAED,OAAO,CAAC,GAAG,KAAK,EAAE,uBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACrC,CAAC,EAAE,EAAE,CAAC;aACL,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC;CACF,CAAA;AAfY,SAAS;IADrB,qBAAU,EAAE;GACA,SAAS,CAerB;AAfY,8BAAS","sourcesContent":["import {Injectable} from \"@tsed/cli-core\";\nimport {paramCase} from \"change-case\";\n\n@Injectable()\nexport class RoutePipe {\n transform(route: string) {\n return `/${route\n .split(\"/\")\n .reduce((paths: string[], path) => {\n const word = paramCase(path);\n\n if (paths.includes(`${word}s`) || paths.includes(word)) {\n return paths;\n }\n\n return [...paths, paramCase(path)];\n }, [])\n .join(\"/\")}`.replace(/\\/\\//gi, \"/\");\n }\n}\n"]}
1
+ {"version":3,"file":"RoutePipe.js","sourceRoot":"","sources":["../../src/pipes/RoutePipe.ts"],"names":[],"mappings":";;;;AAAA,6CAA0C;AAC1C,6CAAsC;AAGtC,IAAa,SAAS,GAAtB,MAAa,SAAS;IACpB,SAAS,CAAC,KAAa;QACrB,MAAM,CAAC,GAAG,KAAK;aACZ,KAAK,CAAC,GAAG,CAAC;aACV,MAAM,CAAC,CAAC,KAAe,EAAE,IAAI,EAAE,EAAE;YAChC,MAAM,IAAI,GAAG,uBAAS,CAAC,IAAI,CAAC,CAAC;YAE7B,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACtD,OAAO,KAAK,CAAC;aACd;YAED,OAAO,CAAC,GAAG,KAAK,EAAE,uBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACrC,CAAC,EAAE,EAAE,CAAC;aACL,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC;CACF,CAAA;AAjBY,SAAS;IADrB,qBAAU,EAAE;GACA,SAAS,CAiBrB;AAjBY,8BAAS","sourcesContent":["import {Injectable} from \"@tsed/cli-core\";\nimport {paramCase} from \"change-case\";\n\n@Injectable()\nexport class RoutePipe {\n transform(route: string) {\n const r = route\n .split(\"/\")\n .reduce((paths: string[], path) => {\n const word = paramCase(path);\n\n if (paths.includes(`${word}s`) || paths.includes(word)) {\n return paths;\n }\n\n return [...paths, paramCase(path)];\n }, [])\n .join(\"/\");\n\n return `/${r}`.replace(/\\/\\//gi, \"/\");\n }\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tsed/cli",
3
- "version": "3.18.0",
3
+ "version": "3.19.0",
4
4
  "main": "./lib/index.js",
5
5
  "typings": "./lib/index.d.ts",
6
6
  "bin": {
@@ -24,7 +24,7 @@
24
24
  "decorators"
25
25
  ],
26
26
  "dependencies": {
27
- "@tsed/cli-core": "3.18.0",
27
+ "@tsed/cli-core": "3.19.0",
28
28
  "@tsed/core": ">=6.95.1",
29
29
  "@tsed/di": ">=6.95.1",
30
30
  "@tsed/logger": ">=6.0.0",
@@ -33,7 +33,7 @@
33
33
  "tslib": "2.3.1"
34
34
  },
35
35
  "devDependencies": {
36
- "@tsed/cli-testing": "3.18.0",
36
+ "@tsed/cli-testing": "3.19.0",
37
37
  "@types/change-case": "^2.3.1"
38
38
  },
39
39
  "scripts": {
@@ -46,6 +46,7 @@
46
46
  "start:init:run": "cross-env NODE_ENV=development cross-env CI=true ts-node -r tsconfig-paths/register src/bin/tsed.ts init -r ./.tmp/init/default",
47
47
  "start:init:run:name": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts init -r ./.tmp/init awesome --verbose",
48
48
  "start:add:run": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts add -r ./.tmp",
49
+ "start:generate": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts generate -r ./.tmp/init/default",
49
50
  "start:generate:help": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts generate -h",
50
51
  "start:generate:model": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts generate model -r ./.tmp/init/awesome",
51
52
  "start:g:model": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts g model -r ./.tmp/init/awesome",
@@ -1,3 +1,4 @@
1
+ import {join} from "path";
1
2
  import {Configuration, Inject} from "@tsed/di";
2
3
  import {PlatformApplication} from "@tsed/common";
3
4
  {{#if express}}import "@tsed/platform-express"; // /!\ keep this import
@@ -16,35 +17,51 @@ import "@tsed/swagger";{{/if}}{{#if mongoose}}
16
17
  import "@tsed/mongoose";{{/if}}{{#if typeorm}}
17
18
  import "@tsed/typeorm";{{/if}}{{#if oidc}}
18
19
  import "@tsed/oidc-provider";{{/if}}
19
- import {config, rootDir} from "./config";{{#if swagger}}
20
- import {IndexCtrl} from "{{indexControllerPath}}";{{/if}}{{#if oidc}}
21
- import {InteractionsCtrl} from "./controllers/oidc/InteractionsCtrl";{{/if}}{{#if koa}}
20
+ import {config} from "./config";
21
+ import * as rest from "./controllers/rest";{{#if swagger}}
22
+ import * as pages from "./controllers/pages";{{/if}}{{#if oidc}}
23
+ import {InteractionsController} from "./controllers/oidc/InteractionsController";{{/if}}{{#if koa}}
22
24
 
23
25
  const methodOverride = require("koa-override");{{/if}}
24
26
 
25
-
26
27
  @Configuration({
27
28
  ...config,
28
29
  acceptMimes: ["application/json"],
29
30
  httpPort: process.env.PORT || 8083,
30
31
  httpsPort: false, // CHANGE
32
+ componentsScan: false,
31
33
  mount: {
32
34
  "{{route}}": [
33
- `${rootDir}/controllers/**/*.ts`
35
+ ...Object.values(rest)
34
36
  ]{{#or swagger oidc}},
35
37
  "/": [{{#if swagger}}
36
- IndexCtrl{{/if}}{{#and swagger oidc}},{{/and}}{{#if oidc}}
37
- InteractionsCtrl{{/if}}
38
+ ...Object.values(pages){{/if}}{{#and swagger oidc}},{{/and}}{{#if oidc}}
39
+ InteractionsController{{/if}}
38
40
  ]{{/or}}
39
41
  },{{#if swagger}}
40
42
  swagger: [
41
43
  {
42
- path: "/v3/docs",
44
+ path: "/doc",
43
45
  specVersion: "3.0.1"
44
46
  }
45
47
  ],{{/if}}
48
+ middlewares: [{{#if express}}
49
+ cors(),
50
+ cookieParser(),
51
+ compress({}),
52
+ methodOverride(),
53
+ bodyParser.json(),
54
+ bodyParser.urlencoded({
55
+ extended: true
56
+ }){{/if}}{{#if koa}}
57
+ cors(),
58
+ compress({}),
59
+ methodOverride(),
60
+ bodyParser()
61
+ {{/if}}
62
+ ],
46
63
  views: {
47
- root: `${rootDir}/views`,
64
+ root: join(process.cwd(), "../views"),
48
65
  extensions: {
49
66
  ejs: "ejs"
50
67
  }
@@ -55,26 +72,8 @@ const methodOverride = require("koa-override");{{/if}}
55
72
  })
56
73
  export class {{symbolName}} {
57
74
  @Inject()
58
- app: PlatformApplication;
75
+ protected app: PlatformApplication;
59
76
 
60
77
  @Configuration()
61
- settings: Configuration;
62
-
63
- $beforeRoutesInit(): void {
64
- {{#if express}}
65
- this.app
66
- .use(cors())
67
- .use(cookieParser())
68
- .use(compress({}))
69
- .use(methodOverride())
70
- .use(bodyParser.json())
71
- .use(bodyParser.urlencoded({
72
- extended: true
73
- }));{{/if}}{{#if koa}}
74
- this.app
75
- .use(cors())
76
- .use(compress())
77
- .use(methodOverride())
78
- .use(bodyParser()){{/if}}
79
- }
78
+ protected settings: Configuration;
80
79
  }
@@ -0,0 +1,12 @@
1
+ {
2
+ "directory": [
3
+ "./src/controllers/rest",
4
+ "./src/controllers/pages"
5
+ ],
6
+ "exclude": [
7
+ "__mock__",
8
+ "__mocks__",
9
+ ".spec.ts"
10
+ ],
11
+ "delete": true
12
+ }
@@ -1 +1,4 @@
1
1
  node_modules
2
+ Dockerfile
3
+ .env.local
4
+ .env.development
@@ -51,3 +51,7 @@ test/**/*.js.map
51
51
  # Project
52
52
  /public
53
53
  /dist
54
+
55
+ #env
56
+ .env.local
57
+ .env.development
@@ -9,26 +9,41 @@
9
9
  ## ##
10
10
  ## description : Dockerfile for TsED Application ##
11
11
  ## author : TsED team ##
12
- ## date : 2021-04-14 ##
13
- ## version : 1.2 ##
12
+ ## date : 2022-03-05 ##
13
+ ## version : 2.0 ##
14
14
  ## ##
15
15
  ###############################################################################
16
16
  ###############################################################################
17
- FROM node:14-alpine
17
+ ARG NODE_VERSION=16.13.1
18
18
 
19
- RUN apk update && apk add build-base git python3
19
+ FROM node:${NODE_VERSION}-alpine as build
20
+ WORKDIR /opt
20
21
 
21
- COPY package.json .
22
- COPY yarn.lock .
22
+ COPY package.json yarn.lock tsconfig.json tsconfig.compile.json .barrelsby.json ./
23
23
 
24
- RUN yarn install --production
24
+ RUN yarn install --pure-lockfile
25
25
 
26
26
  COPY ./src ./src
27
- COPY ./dist ./dist{{#or swagger oidc}}
27
+
28
+ RUN yarn build
29
+
30
+ FROM node:${NODE_VERSION}-alpine as runtime
31
+ ENV WORKDIR /opt
32
+ WORKDIR $WORKDIR
33
+
34
+ RUN apk update && apk add build-base git curl
35
+ RUN npm install -g pm2
36
+
37
+ COPY --from=build /opt .
38
+
39
+ RUN yarn install --pure-lockfile --production
40
+ {{#if prisma}}
41
+ COPY ./prisma ./prisma{{/if}}{{#or swagger oidc}}
28
42
  COPY ./views ./views{{/or}}
43
+ COPY processes.config.js .
29
44
 
30
45
  EXPOSE 8081
31
46
  ENV PORT 8081
32
47
  ENV NODE_ENV production
33
48
 
34
- CMD ["yarn", "start:prod"]
49
+ CMD ["pm2-runtime", "start", "processes.config.js", "--env", "production"]
@@ -1,12 +1,27 @@
1
- # {{projectName}}
1
+ <p style="text-align: center" align="center">
2
+ <a href="https://tsed.io" target="_blank"><img src="https://tsed.io/tsed-og.png" width="200" alt="Ts.ED logo"/></a>
3
+ </p>
2
4
 
3
- > An awesome project based on Ts.ED framework
5
+ <div align="center">
6
+ <h1>Ts.ED - {{projectName}}</h1>
7
+ <br />
8
+ <div align="center">
9
+ <a href="https://cli.tsed.io/">Website</a>
10
+ <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
11
+ <a href="https://cli.tsed.io/getting-started.html">Getting started</a>
12
+ <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
13
+ <a href="https://api.tsed.io/rest/slack/tsedio/tsed">Slack</a>
14
+ <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
15
+ <a href="https://twitter.com/TsED_io">Twitter</a>
16
+ </div>
17
+ <hr />
18
+ </div>
4
19
 
5
- See [Ts.ED](https://tsed.io) project for more information.
20
+ > An awesome project based on Ts.ED framework
6
21
 
7
- ## Build setup
22
+ ## Getting started
8
23
 
9
- > **Important!** Ts.ED requires Node >= 10, Express >= 4 and TypeScript >= 3.
24
+ > **Important!** Ts.ED requires Node >= 14, Express >= 4 and TypeScript >= 4.
10
25
 
11
26
  ```batch
12
27
  # install dependencies
@@ -19,3 +34,34 @@ $ {{#if yarn}}yarn{{/if}}{{#if npm}}npm run{{/if}} start
19
34
  $ {{#if yarn}}yarn{{/if}}{{#if npm}}npm run{{/if}} build
20
35
  $ {{#if yarn}}yarn{{/if}}{{#if npm}}npm run{{/if}} start:prod
21
36
  ```
37
+
38
+ ## Docker
39
+
40
+ ```
41
+ # build docker image
42
+ docker compose build
43
+
44
+ # start docker image
45
+ docker compose up
46
+ ```
47
+
48
+ ## Barrelsby
49
+
50
+ This project uses [barrelsby](https://www.npmjs.com/package/barrelsby) to generate index files to import the controllers.
51
+
52
+ Edit `.barreslby.json` to customize it:
53
+
54
+ ```json
55
+ {
56
+ "directory": [
57
+ "./src/controllers/rest",
58
+ "./src/controllers/pages"
59
+ ],
60
+ "exclude": [
61
+ "__mock__",
62
+ "__mocks__",
63
+ ".spec.ts"
64
+ ],
65
+ "delete": true
66
+ }
67
+ ```
@@ -0,0 +1,24 @@
1
+ 'use strict'
2
+
3
+ const path = require('path')
4
+ const defaultLogFile = path.join(__dirname, '/logs/project-server.log')
5
+
6
+ // eslint-disable-next-line node/exports-style
7
+ module.exports = {
8
+ 'apps': [
9
+ {
10
+ name: "api",
11
+ 'script': `${process.env.WORKDIR}/dist/index.js`,
12
+ 'cwd': process.env.WORKDIR,
13
+ node_args: process.env.NODE_ARGS || "--max_old_space_size=1800",
14
+ exec_mode: "cluster",
15
+ instances: process.env.NODE_ENV === "test" ? 1 : process.env.NB_INSTANCES || 2,
16
+ autorestart: true,
17
+ max_memory_restart: process.env.MAX_MEMORY_RESTART || "750M",
18
+ 'out_file': defaultLogFile,
19
+ 'error_file': defaultLogFile,
20
+ 'merge_logs': true,
21
+ 'kill_timeout': 30000,
22
+ }
23
+ ]
24
+ }
@@ -1,3 +1,7 @@
1
- export const config = require("dotenv").config();
1
+ import dotenv from "dotenv"
2
2
 
3
- export const isProduction = process.env.NODE_ENV === "production";
3
+ export const envs = {
4
+ ...process.env,
5
+ ...dotenv.config().parsed
6
+ };
7
+ export const isProduction = process.env.NODE_ENV === "production";
@@ -1,5 +1,6 @@
1
1
  import {join} from "path";
2
- import {loggerConfig} from "./logger";{{#if mongoose}}
2
+ import {readFileSync} from "fs";
3
+ import loggerConfig from "./logger";{{#if mongoose}}
3
4
  import mongooseConfig from "./mongoose";
4
5
  {{/if}}{{#if typeorm}}
5
6
  import typeormConfig from "./typeorm";
@@ -8,12 +9,11 @@ import oidcConfig from "./oidc";
8
9
  import {FileSyncAdapter} from "@tsed/adapters";
9
10
  {{/if}}
10
11
 
11
- const {version} = require("../../package.json");
12
- export const rootDir = join(__dirname, "..");
12
+ const pkg = JSON.parse(readFileSync("./package.json", {encoding: "utf8"}));
13
13
 
14
14
  export const config: Partial<TsED.Configuration> = {
15
- version,
16
- rootDir,
15
+ version: pkg.version,
16
+ envs,
17
17
  logger: loggerConfig,
18
18
  {{#if typeorm}}
19
19
  typeorm: typeormConfig,
@@ -1,5 +1,5 @@
1
- import {PlatformLoggerSettings, $log} from "@tsed/common";
2
- import {isProduction} from "../env";
1
+ import {$log, PlatformLoggerSettings} from "@tsed/common";
2
+ import {isProduction} from "../envs";
3
3
 
4
4
  if (isProduction) {
5
5
  $log.appenders.set("stdout", {
@@ -19,6 +19,6 @@ if (isProduction) {
19
19
  });
20
20
  }
21
21
 
22
- export const loggerConfig: Partial<PlatformLoggerSettings> = {
22
+ export default <PlatformLoggerSettings> {
23
23
  disableRoutesSummary: isProduction
24
24
  };
@@ -6,9 +6,9 @@ import {Hidden, Get, Returns} from "@tsed/schema";
6
6
 
7
7
  @Hidden()
8
8
  @Controller("/")
9
- export class IndexCtrl {
9
+ export class IndexController {
10
10
  @Constant("swagger")
11
- swagger: SwaggerSettings[];
11
+ private swagger: SwaggerSettings[];
12
12
 
13
13
  @Get("/")
14
14
  @View("swagger.ejs")
@@ -4,13 +4,14 @@ import {Server} from "./Server";
4
4
 
5
5
  async function bootstrap() {
6
6
  try {
7
- $log.debug("Start server...");
8
7
  const platform = await {{platformSymbol}}.bootstrap(Server);
9
-
10
8
  await platform.listen();
11
- $log.debug("Server initialized");
12
- } catch (er) {
13
- $log.error(er);
9
+
10
+ process.on("SIGINT", () => {
11
+ platform.stop();
12
+ });
13
+ } catch (error) {
14
+ $log.error({event: "SERVER_BOOTSTRAP_ERROR", error});
14
15
  }
15
16
  }
16
17