task-script-support-cli 0.3.3 → 0.4.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/assets/yargs-template/task-runner/src/tasks/check-env.ts +7 -7
- package/assets/yargs-template/task-runner/src/types/state.ts +5 -3
- package/assets/yargs-template/task-runner/tests/tasks/check-env.test.ts +8 -3
- package/dist/assets/yargs-template/task-runner/src/tasks/check-env.ts +7 -7
- package/dist/assets/yargs-template/task-runner/src/types/state.ts +5 -3
- package/dist/assets/yargs-template/task-runner/tests/tasks/check-env.test.ts +8 -3
- package/dist/package.json +1 -1
- package/dist/src/index.js +1 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/services/arg-service.d.ts +1 -1
- package/dist/src/services/arg-service.js +1 -1
- package/dist/src/services/arg-service.js.map +1 -1
- package/dist/src/tasks/generate/resolve-injectables.d.ts.map +1 -1
- package/dist/src/tasks/generate/resolve-injectables.js +2 -2
- package/dist/src/tasks/generate/resolve-injectables.js.map +1 -1
- package/dist/src/types/process.d.ts +1 -0
- package/dist/src/types/process.d.ts.map +1 -1
- package/dist/src/types/process.js +1 -0
- package/dist/src/types/process.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +1 -1
- package/src/services/arg-service.ts +1 -1
- package/src/tasks/generate/resolve-injectables.ts +2 -4
- package/src/types/process.ts +1 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import chalk from "chalk";
|
|
2
2
|
import { AppTask } from "../wrappers/app-task";
|
|
3
3
|
import { autoInjectable } from "tsyringe";
|
|
4
|
-
import { EnvironmentConfigKeys } from "../types/state";
|
|
4
|
+
import { EnvironmentConfigKeys, EnvKey } from "../types/state";
|
|
5
5
|
import { UtilService } from "../services/util-service";
|
|
6
6
|
|
|
7
7
|
/**
|
|
@@ -11,17 +11,17 @@ import { UtilService } from "../services/util-service";
|
|
|
11
11
|
export default class CheckEnv extends AppTask {
|
|
12
12
|
loggerName = "Check Environment";
|
|
13
13
|
|
|
14
|
-
requiredEnv:
|
|
15
|
-
secretEnv: Set<
|
|
14
|
+
requiredEnv: Set<EnvKey> = new Set();
|
|
15
|
+
secretEnv: Set<EnvKey> = new Set([
|
|
16
16
|
// add keys that should be masked in log output here
|
|
17
17
|
]);
|
|
18
|
-
optionalEnv = [
|
|
18
|
+
optionalEnv: Set<EnvKey> = new Set([
|
|
19
19
|
EnvironmentConfigKeys.NODE_ENV,
|
|
20
20
|
EnvironmentConfigKeys.PINO_LOG_TARGET,
|
|
21
21
|
EnvironmentConfigKeys.PINO_LOG_DIR_PATH,
|
|
22
22
|
EnvironmentConfigKeys.PINO_LOG_FILENAME,
|
|
23
23
|
EnvironmentConfigKeys.PINO_LOG_LEVEL,
|
|
24
|
-
];
|
|
24
|
+
]);
|
|
25
25
|
|
|
26
26
|
async run() {
|
|
27
27
|
this.logger.debug(chalk.blueBright("Running Check Environment"));
|
|
@@ -32,7 +32,7 @@ export default class CheckEnv extends AppTask {
|
|
|
32
32
|
.filter((e) => !!process.env[e])
|
|
33
33
|
.forEach((e) => {
|
|
34
34
|
let envVal = process.env[e] || "";
|
|
35
|
-
if (this.secretEnv.has(e)) {
|
|
35
|
+
if (this.secretEnv.has(e as EnvKey)) {
|
|
36
36
|
envVal = UtilService.maskValue(envVal);
|
|
37
37
|
}
|
|
38
38
|
this.logger.debug(
|
|
@@ -40,7 +40,7 @@ export default class CheckEnv extends AppTask {
|
|
|
40
40
|
);
|
|
41
41
|
});
|
|
42
42
|
|
|
43
|
-
this.requiredEnv
|
|
43
|
+
[...this.requiredEnv]
|
|
44
44
|
.filter((e) => !process.env[e])
|
|
45
45
|
.forEach((e) =>
|
|
46
46
|
errorMessages.push(`Missing required environment variable ${e}`),
|
|
@@ -3,8 +3,8 @@ import yargs from "yargs";
|
|
|
3
3
|
|
|
4
4
|
// Add app data here as needed. Use readonly for immutable fields.
|
|
5
5
|
//
|
|
6
|
-
// Note: this object gets passed to deepMerge upon updating app state
|
|
7
|
-
// which also merges array fields. This might be fine or you might want
|
|
6
|
+
// Note: this object gets passed to deepMerge upon updating the app state,
|
|
7
|
+
// which also merges array fields. This might be fine, or you might want
|
|
8
8
|
// to make your arrays <type>[] | undefined to allow clobbering.
|
|
9
9
|
export interface AppStateData {
|
|
10
10
|
readonly errorMessages?: string[];
|
|
@@ -29,7 +29,9 @@ export const EnvironmentConfigKeys = {
|
|
|
29
29
|
NODE_ENV: "NODE_ENV",
|
|
30
30
|
PINO_LOG_FILENAME: "PINO_LOG_FILENAME",
|
|
31
31
|
PINO_LOG_TARGET: "PINO_LOG_TARGET",
|
|
32
|
-
};
|
|
32
|
+
} as const;
|
|
33
|
+
|
|
34
|
+
export type EnvKey = keyof typeof EnvironmentConfigKeys;
|
|
33
35
|
|
|
34
36
|
export const DefaultValues = {
|
|
35
37
|
debugMode: false,
|
|
@@ -4,6 +4,7 @@ import { LogService } from "../../src/services/log-service";
|
|
|
4
4
|
import { CommandService } from "task-script-support";
|
|
5
5
|
import { AppStateData, CLIArgs } from "../../src/types/state";
|
|
6
6
|
import { container } from "tsyringe";
|
|
7
|
+
import chalk from "chalk";
|
|
7
8
|
|
|
8
9
|
describe("CheckEnv", () => {
|
|
9
10
|
let mockLogService = {} as LogService;
|
|
@@ -37,7 +38,7 @@ describe("CheckEnv", () => {
|
|
|
37
38
|
|
|
38
39
|
await checkEnv.run();
|
|
39
40
|
expect(mockLogService.debug).toHaveBeenCalledWith(
|
|
40
|
-
"Running Check Environment",
|
|
41
|
+
chalk.blueBright("Running Check Environment"),
|
|
41
42
|
);
|
|
42
43
|
expect(checkEnv.state.data.environmentValidated).toBe(true);
|
|
43
44
|
});
|
|
@@ -48,7 +49,7 @@ describe("CheckEnv", () => {
|
|
|
48
49
|
throw testError;
|
|
49
50
|
});
|
|
50
51
|
const checkEnv = container.resolve(CheckEnv);
|
|
51
|
-
checkEnv.requiredEnv = ["MISSING_ENV_VAR"];
|
|
52
|
+
(checkEnv.requiredEnv as unknown) = ["MISSING_ENV_VAR"];
|
|
52
53
|
try {
|
|
53
54
|
expect(await checkEnv.run()).toThrow(testError);
|
|
54
55
|
} catch (err) {
|
|
@@ -65,7 +66,11 @@ describe("CheckEnv", () => {
|
|
|
65
66
|
throw testError;
|
|
66
67
|
});
|
|
67
68
|
const checkEnv = container.resolve(CheckEnv);
|
|
68
|
-
checkEnv.requiredEnv = [
|
|
69
|
+
(checkEnv.requiredEnv as unknown) = [
|
|
70
|
+
"MISSING_ENV_1",
|
|
71
|
+
"MISSING_ENV_2",
|
|
72
|
+
"MISSING_ENV_3",
|
|
73
|
+
];
|
|
69
74
|
try {
|
|
70
75
|
await checkEnv.run();
|
|
71
76
|
} catch (err) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import chalk from "chalk";
|
|
2
2
|
import { AppTask } from "../wrappers/app-task";
|
|
3
3
|
import { autoInjectable } from "tsyringe";
|
|
4
|
-
import { EnvironmentConfigKeys } from "../types/state";
|
|
4
|
+
import { EnvironmentConfigKeys, EnvKey } from "../types/state";
|
|
5
5
|
import { UtilService } from "../services/util-service";
|
|
6
6
|
|
|
7
7
|
/**
|
|
@@ -11,17 +11,17 @@ import { UtilService } from "../services/util-service";
|
|
|
11
11
|
export default class CheckEnv extends AppTask {
|
|
12
12
|
loggerName = "Check Environment";
|
|
13
13
|
|
|
14
|
-
requiredEnv:
|
|
15
|
-
secretEnv: Set<
|
|
14
|
+
requiredEnv: Set<EnvKey> = new Set();
|
|
15
|
+
secretEnv: Set<EnvKey> = new Set([
|
|
16
16
|
// add keys that should be masked in log output here
|
|
17
17
|
]);
|
|
18
|
-
optionalEnv = [
|
|
18
|
+
optionalEnv: Set<EnvKey> = new Set([
|
|
19
19
|
EnvironmentConfigKeys.NODE_ENV,
|
|
20
20
|
EnvironmentConfigKeys.PINO_LOG_TARGET,
|
|
21
21
|
EnvironmentConfigKeys.PINO_LOG_DIR_PATH,
|
|
22
22
|
EnvironmentConfigKeys.PINO_LOG_FILENAME,
|
|
23
23
|
EnvironmentConfigKeys.PINO_LOG_LEVEL,
|
|
24
|
-
];
|
|
24
|
+
]);
|
|
25
25
|
|
|
26
26
|
async run() {
|
|
27
27
|
this.logger.debug(chalk.blueBright("Running Check Environment"));
|
|
@@ -32,7 +32,7 @@ export default class CheckEnv extends AppTask {
|
|
|
32
32
|
.filter((e) => !!process.env[e])
|
|
33
33
|
.forEach((e) => {
|
|
34
34
|
let envVal = process.env[e] || "";
|
|
35
|
-
if (this.secretEnv.has(e)) {
|
|
35
|
+
if (this.secretEnv.has(e as EnvKey)) {
|
|
36
36
|
envVal = UtilService.maskValue(envVal);
|
|
37
37
|
}
|
|
38
38
|
this.logger.debug(
|
|
@@ -40,7 +40,7 @@ export default class CheckEnv extends AppTask {
|
|
|
40
40
|
);
|
|
41
41
|
});
|
|
42
42
|
|
|
43
|
-
this.requiredEnv
|
|
43
|
+
[...this.requiredEnv]
|
|
44
44
|
.filter((e) => !process.env[e])
|
|
45
45
|
.forEach((e) =>
|
|
46
46
|
errorMessages.push(`Missing required environment variable ${e}`),
|
|
@@ -3,8 +3,8 @@ import yargs from "yargs";
|
|
|
3
3
|
|
|
4
4
|
// Add app data here as needed. Use readonly for immutable fields.
|
|
5
5
|
//
|
|
6
|
-
// Note: this object gets passed to deepMerge upon updating app state
|
|
7
|
-
// which also merges array fields. This might be fine or you might want
|
|
6
|
+
// Note: this object gets passed to deepMerge upon updating the app state,
|
|
7
|
+
// which also merges array fields. This might be fine, or you might want
|
|
8
8
|
// to make your arrays <type>[] | undefined to allow clobbering.
|
|
9
9
|
export interface AppStateData {
|
|
10
10
|
readonly errorMessages?: string[];
|
|
@@ -29,7 +29,9 @@ export const EnvironmentConfigKeys = {
|
|
|
29
29
|
NODE_ENV: "NODE_ENV",
|
|
30
30
|
PINO_LOG_FILENAME: "PINO_LOG_FILENAME",
|
|
31
31
|
PINO_LOG_TARGET: "PINO_LOG_TARGET",
|
|
32
|
-
};
|
|
32
|
+
} as const;
|
|
33
|
+
|
|
34
|
+
export type EnvKey = keyof typeof EnvironmentConfigKeys;
|
|
33
35
|
|
|
34
36
|
export const DefaultValues = {
|
|
35
37
|
debugMode: false,
|
|
@@ -4,6 +4,7 @@ import { LogService } from "../../src/services/log-service";
|
|
|
4
4
|
import { CommandService } from "task-script-support";
|
|
5
5
|
import { AppStateData, CLIArgs } from "../../src/types/state";
|
|
6
6
|
import { container } from "tsyringe";
|
|
7
|
+
import chalk from "chalk";
|
|
7
8
|
|
|
8
9
|
describe("CheckEnv", () => {
|
|
9
10
|
let mockLogService = {} as LogService;
|
|
@@ -37,7 +38,7 @@ describe("CheckEnv", () => {
|
|
|
37
38
|
|
|
38
39
|
await checkEnv.run();
|
|
39
40
|
expect(mockLogService.debug).toHaveBeenCalledWith(
|
|
40
|
-
"Running Check Environment",
|
|
41
|
+
chalk.blueBright("Running Check Environment"),
|
|
41
42
|
);
|
|
42
43
|
expect(checkEnv.state.data.environmentValidated).toBe(true);
|
|
43
44
|
});
|
|
@@ -48,7 +49,7 @@ describe("CheckEnv", () => {
|
|
|
48
49
|
throw testError;
|
|
49
50
|
});
|
|
50
51
|
const checkEnv = container.resolve(CheckEnv);
|
|
51
|
-
checkEnv.requiredEnv = ["MISSING_ENV_VAR"];
|
|
52
|
+
(checkEnv.requiredEnv as unknown) = ["MISSING_ENV_VAR"];
|
|
52
53
|
try {
|
|
53
54
|
expect(await checkEnv.run()).toThrow(testError);
|
|
54
55
|
} catch (err) {
|
|
@@ -65,7 +66,11 @@ describe("CheckEnv", () => {
|
|
|
65
66
|
throw testError;
|
|
66
67
|
});
|
|
67
68
|
const checkEnv = container.resolve(CheckEnv);
|
|
68
|
-
checkEnv.requiredEnv = [
|
|
69
|
+
(checkEnv.requiredEnv as unknown) = [
|
|
70
|
+
"MISSING_ENV_1",
|
|
71
|
+
"MISSING_ENV_2",
|
|
72
|
+
"MISSING_ENV_3",
|
|
73
|
+
];
|
|
69
74
|
try {
|
|
70
75
|
await checkEnv.run();
|
|
71
76
|
} catch (err) {
|
package/dist/package.json
CHANGED
package/dist/src/index.js
CHANGED
|
@@ -28,7 +28,7 @@ program
|
|
|
28
28
|
program
|
|
29
29
|
.command("gen [name]")
|
|
30
30
|
.option("-n, --target-name <name>", "Name of Generated Target")
|
|
31
|
-
.option("-
|
|
31
|
+
.option("-l, --lean", "Skip injection selection")
|
|
32
32
|
.option("-s, --service", "Generate a service")
|
|
33
33
|
.option("-c, --command", "Generate a command")
|
|
34
34
|
.option("-t, --task", "Generate a task")
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"./src/","sources":["src/index.ts"],"names":[],"mappings":";;;;;AAAA,4BAA0B;AAE1B,oDAA4B;AAC5B,uCAAqC;AACrC,0DAAkC;AAElC,gBAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAE/B,0DAAsD;AAEtD,gCAAgC;AAChC,0BAAW,CAAC,sBAAsB,EAAE,CAAC;AAErC,4CAAgD;AAChD,wCAA4C;AAC5C,wCAA4C;AAC5C,oDAAwD;AAExD,MAAM,EAAE,OAAO,EAAE,GAAG,mBAAS,CAAC;AAC9B,MAAM,IAAI,GAAG,0BAAW,CAAC,UAAU,EAAE,CAAC;AACtC,MAAM,OAAO,GAAG,0BAAW,CAAC,aAAa,EAAE,CAAC;AAE5C,OAAO;KACJ,OAAO,CAAC,GAAG,IAAI,aAAa,OAAO,EAAE,EAAE,eAAe,CAAC;KACvD,WAAW,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAEhF,OAAO;KACJ,OAAO,CAAC,OAAO,CAAC;KAChB,MAAM,CAAC,oBAAS,CAAC,OAAO,CAAC,oBAAY,CAAC,CAAC,OAAO,CAAC;KAC/C,MAAM,CAAC,qBAAqB,EAAE,kCAAkC,CAAC,CAAC;AAErE,OAAO;KACJ,OAAO,CAAC,YAAY,CAAC;KACrB,MAAM,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;KAC9D,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"./src/","sources":["src/index.ts"],"names":[],"mappings":";;;;;AAAA,4BAA0B;AAE1B,oDAA4B;AAC5B,uCAAqC;AACrC,0DAAkC;AAElC,gBAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAE/B,0DAAsD;AAEtD,gCAAgC;AAChC,0BAAW,CAAC,sBAAsB,EAAE,CAAC;AAErC,4CAAgD;AAChD,wCAA4C;AAC5C,wCAA4C;AAC5C,oDAAwD;AAExD,MAAM,EAAE,OAAO,EAAE,GAAG,mBAAS,CAAC;AAC9B,MAAM,IAAI,GAAG,0BAAW,CAAC,UAAU,EAAE,CAAC;AACtC,MAAM,OAAO,GAAG,0BAAW,CAAC,aAAa,EAAE,CAAC;AAE5C,OAAO;KACJ,OAAO,CAAC,GAAG,IAAI,aAAa,OAAO,EAAE,EAAE,eAAe,CAAC;KACvD,WAAW,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAEhF,OAAO;KACJ,OAAO,CAAC,OAAO,CAAC;KAChB,MAAM,CAAC,oBAAS,CAAC,OAAO,CAAC,oBAAY,CAAC,CAAC,OAAO,CAAC;KAC/C,MAAM,CAAC,qBAAqB,EAAE,kCAAkC,CAAC,CAAC;AAErE,OAAO;KACJ,OAAO,CAAC,YAAY,CAAC;KACrB,MAAM,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;KAC9D,MAAM,CAAC,YAAY,EAAE,0BAA0B,CAAC;KAChD,MAAM,CAAC,eAAe,EAAE,oBAAoB,CAAC;KAC7C,MAAM,CAAC,eAAe,EAAE,oBAAoB,CAAC;KAC7C,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC;KACvC,MAAM,CAAC,oBAAS,CAAC,OAAO,CAAC,gBAAU,CAAC,CAAC,OAAO,CAAC,CAAC;AAEjD,OAAO;KACJ,OAAO,CAAC,YAAY,CAAC;KACrB,MAAM,CAAC,mBAAmB,EAAE,yBAAyB,CAAC;IACvD,mDAAmD;KAClD,MAAM,CAAC,oBAAS,CAAC,OAAO,CAAC,gBAAU,CAAC,CAAC,OAAO,CAAC,CAAC;AAEjD,OAAO;KACJ,OAAO,CAAC,WAAW,CAAC;KACpB,MAAM,CAAC,oBAAS,CAAC,OAAO,CAAC,4BAAgB,CAAC,CAAC,OAAO,CAAC,CAAC;AAEvD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
|
|
@@ -3,7 +3,7 @@ export declare class ArgService {
|
|
|
3
3
|
private args?;
|
|
4
4
|
constructor(args?: CLIArg[] | undefined);
|
|
5
5
|
getOption<T = string>(longNameOption: string): T;
|
|
6
|
-
hasFlag(flag: string):
|
|
6
|
+
hasFlag(flag: string): boolean;
|
|
7
7
|
cleanTargetName(name: string): string;
|
|
8
8
|
hasPositionalArg(index?: number, typeOf?: string): boolean;
|
|
9
9
|
getPositionalArg<T = string>(index?: number): T | undefined;
|
|
@@ -43,7 +43,7 @@ let ArgService = class ArgService {
|
|
|
43
43
|
if (!this.args) {
|
|
44
44
|
throw new Error("Missing Arguments in ArgService!");
|
|
45
45
|
}
|
|
46
|
-
return this.args.find((arg) => {
|
|
46
|
+
return !!this.args.find((arg) => {
|
|
47
47
|
if (arg === undefined)
|
|
48
48
|
return false;
|
|
49
49
|
if (typeof arg === "string")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arg-service.js","sourceRoot":"./src/","sources":["src/services/arg-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uCAA6C;AAC7C,8CAAiE;AACjE,iDAA6C;AAGtC,IAAM,UAAU,GAAhB,MAAM,UAAU;IACe;IAApC,YAAoC,IAAe;QAAf,SAAI,GAAJ,IAAI,CAAW;IAAG,CAAC;IAEvD,SAAS,CAAa,cAAsB;QAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,UAAU,GAAgB,EAAE,CAAC;QACnC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,SAAS;gBAC9D,SAAS;YACX,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC;QAED,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAC3B,CAAC,GAAc,EAAE,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,SAAS,CACtD,CAAC;QACF,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,KAAK,CAAC,cAAc,CAAM,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,qCAAqC,cAAc,EAAE,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"arg-service.js","sourceRoot":"./src/","sources":["src/services/arg-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-injectables.d.ts","sourceRoot":"./src/","sources":["src/tasks/generate/resolve-injectables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAiB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-injectables.d.ts","sourceRoot":"./src/","sources":["src/tasks/generate/resolve-injectables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAiB,MAAM,mBAAmB,CAAC;AAG5D;;GAEG;AAEH,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,OAAO;IAInD,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IANrB,UAAU,SAAwB;gBAGxB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW;IAKlC;;;;;;;OAOG;IACG,GAAG,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IA2BtD;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAsBhD;;;;;;OAMG;IACG,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAsBrE;;;;;;OAMG;YACW,gBAAgB;IAkB9B;;;;OAIG;IACH,OAAO,CAAC,UAAU;CAGnB"}
|
|
@@ -17,6 +17,7 @@ const prompt_service_1 = require("../../services/prompt-service");
|
|
|
17
17
|
const util_service_1 = require("../../services/util-service");
|
|
18
18
|
const format_1 = require("../../types/format");
|
|
19
19
|
const state_1 = require("../../types/state");
|
|
20
|
+
const process_1 = require("../../types/process");
|
|
20
21
|
/**
|
|
21
22
|
* ResolveInjectables
|
|
22
23
|
*/
|
|
@@ -119,8 +120,7 @@ let ResolveInjectables = class ResolveInjectables extends app_task_1.AppTask {
|
|
|
119
120
|
* @returns true if the task should be skipped.
|
|
120
121
|
*/
|
|
121
122
|
shouldSkip() {
|
|
122
|
-
return
|
|
123
|
-
this.state.data.genData?.targetType !== state_1.GenTargetType.Command);
|
|
123
|
+
return this.argService.hasFlag(process_1.CLIOptions.lean);
|
|
124
124
|
}
|
|
125
125
|
};
|
|
126
126
|
ResolveInjectables = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-injectables.js","sourceRoot":"./src/","sources":["src/tasks/generate/resolve-injectables.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sDAAkD;AAClD,uCAA0C;AAC1C,8DAA0D;AAC1D,oEAAgE;AAChE,kEAA8D;AAC9D,8DAA0D;AAE1D,+CAA8C;AAC9C,6CAA4D;
|
|
1
|
+
{"version":3,"file":"resolve-injectables.js","sourceRoot":"./src/","sources":["src/tasks/generate/resolve-injectables.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.d.ts","sourceRoot":"./src/","sources":["src/types/process.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;CACtD;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;CACpD;AAED,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;AAEnD,oBAAY,UAAU;IACpB,UAAU,eAAe;IACzB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,IAAI,SAAS;IACb,UAAU,eAAe;IACzB,IAAI,SAAS;CACd"}
|
|
1
|
+
{"version":3,"file":"process.d.ts","sourceRoot":"./src/","sources":["src/types/process.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;CACtD;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;CACpD;AAED,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;AAEnD,oBAAY,UAAU;IACpB,UAAU,eAAe;IACzB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,IAAI,SAAS;IACb,UAAU,eAAe;IACzB,IAAI,SAAS;IACb,IAAI,SAAS;CACd"}
|
|
@@ -8,6 +8,7 @@ var CLIOptions;
|
|
|
8
8
|
CLIOptions["command"] = "command";
|
|
9
9
|
CLIOptions["task"] = "task";
|
|
10
10
|
CLIOptions["targetName"] = "targetName";
|
|
11
|
+
CLIOptions["lean"] = "lean";
|
|
11
12
|
CLIOptions["name"] = "name";
|
|
12
13
|
})(CLIOptions || (exports.CLIOptions = CLIOptions = {}));
|
|
13
14
|
//# sourceMappingURL=process.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.js","sourceRoot":"./src/","sources":["src/types/process.ts"],"names":[],"mappings":";;;AAWA,IAAY,
|
|
1
|
+
{"version":3,"file":"process.js","sourceRoot":"./src/","sources":["src/types/process.ts"],"names":[],"mappings":";;;AAWA,IAAY,UAQX;AARD,WAAY,UAAU;IACpB,uCAAyB,CAAA;IACzB,iCAAmB,CAAA;IACnB,iCAAmB,CAAA;IACnB,2BAAa,CAAA;IACb,uCAAyB,CAAA;IACzB,2BAAa,CAAA;IACb,2BAAa,CAAA;AACf,CAAC,EARW,UAAU,0BAAV,UAAU,QAQrB"}
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -32,7 +32,7 @@ program
|
|
|
32
32
|
program
|
|
33
33
|
.command("gen [name]")
|
|
34
34
|
.option("-n, --target-name <name>", "Name of Generated Target")
|
|
35
|
-
.option("-
|
|
35
|
+
.option("-l, --lean", "Skip injection selection")
|
|
36
36
|
.option("-s, --service", "Generate a service")
|
|
37
37
|
.option("-c, --command", "Generate a command")
|
|
38
38
|
.option("-t, --task", "Generate a task")
|
|
@@ -32,7 +32,7 @@ export class ArgService {
|
|
|
32
32
|
if (!this.args) {
|
|
33
33
|
throw new Error("Missing Arguments in ArgService!");
|
|
34
34
|
}
|
|
35
|
-
return this.args.find((arg) => {
|
|
35
|
+
return !!this.args.find((arg) => {
|
|
36
36
|
if (arg === undefined) return false;
|
|
37
37
|
if (typeof arg === "string") return false;
|
|
38
38
|
if (Array.isArray(arg)) return false;
|
|
@@ -7,6 +7,7 @@ import { UtilService } from "../../services/util-service";
|
|
|
7
7
|
import { ProjectImport } from "../../types/project";
|
|
8
8
|
import { CaseType } from "../../types/format";
|
|
9
9
|
import { AppState, GenTargetType } from "../../types/state";
|
|
10
|
+
import { CLIOptions } from "../../types/process";
|
|
10
11
|
|
|
11
12
|
/**
|
|
12
13
|
* ResolveInjectables
|
|
@@ -146,9 +147,6 @@ export default class ResolveInjectables extends AppTask {
|
|
|
146
147
|
* @returns true if the task should be skipped.
|
|
147
148
|
*/
|
|
148
149
|
private shouldSkip(): boolean {
|
|
149
|
-
return (
|
|
150
|
-
!this.argService.hasFlag("inject") &&
|
|
151
|
-
this.state.data.genData?.targetType !== GenTargetType.Command
|
|
152
|
-
);
|
|
150
|
+
return this.argService.hasFlag(CLIOptions.lean);
|
|
153
151
|
}
|
|
154
152
|
}
|