ng-alain 20.0.2 → 20.1.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/ng-add/index.js +2 -2
- package/ng-add/index.js.map +1 -1
- package/ng-add/index.ts +2 -2
- package/package.json +1 -1
- package/sta/index.js +8 -8
- package/sta/index.js.map +1 -1
- package/sta/index.ts +8 -8
- package/utils/lib-versions.js +1 -1
- package/utils/lib-versions.ts +1 -1
- package/utils/log.js +6 -6
- package/utils/log.js.map +1 -1
- package/utils/log.ts +6 -6
- package/utils/versions.js +1 -1
- package/utils/versions.ts +1 -1
package/ng-add/index.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.default = default_1;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
6
|
-
const
|
|
6
|
+
const listr2_1 = require("listr2");
|
|
7
7
|
const utils_1 = require("../utils");
|
|
8
8
|
const node_1 = require("../utils/node");
|
|
9
9
|
const V = 20;
|
|
@@ -35,7 +35,7 @@ function isValidProjectName(tree, name) {
|
|
|
35
35
|
function finished() {
|
|
36
36
|
return (_, context) => {
|
|
37
37
|
context.addTask(new tasks_1.NodePackageInstallTask());
|
|
38
|
-
context.logger.info(
|
|
38
|
+
context.logger.info(listr2_1.color.green(`
|
|
39
39
|
✓ Congratulations, NG-ALAIN scaffold generation complete 🎉.
|
|
40
40
|
|
|
41
41
|
NG-ALAIN documentation site: https://ng-alain.com
|
package/ng-add/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;AA0DA,4BAuCC;AAjGD,2DAAiH;AACjH,4DAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|
package/ng-add/index.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { chain, Rule, schematic, Tree, SchematicContext, SchematicsException } from '@angular-devkit/schematics';
|
|
2
2
|
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
|
|
3
|
-
import
|
|
3
|
+
import { color } from 'listr2';
|
|
4
4
|
|
|
5
5
|
import { Schema as ApplicationOptions } from '../application/schema';
|
|
6
6
|
import { DEFAULT_WORKSPACE_PATH, readJSON, readPackage } from '../utils';
|
|
@@ -47,7 +47,7 @@ function finished(): Rule {
|
|
|
47
47
|
context.addTask(new NodePackageInstallTask());
|
|
48
48
|
|
|
49
49
|
context.logger.info(
|
|
50
|
-
|
|
50
|
+
color.green(`
|
|
51
51
|
✓ Congratulations, NG-ALAIN scaffold generation complete 🎉.
|
|
52
52
|
|
|
53
53
|
NG-ALAIN documentation site: https://ng-alain.com
|
package/package.json
CHANGED
package/sta/index.js
CHANGED
|
@@ -12,9 +12,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.default = default_1;
|
|
13
13
|
const core_1 = require("@angular-devkit/core");
|
|
14
14
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
15
|
-
const colors = require("ansi-colors");
|
|
16
15
|
const fs_1 = require("fs");
|
|
17
16
|
const jsonc_parser_1 = require("jsonc-parser");
|
|
17
|
+
const listr2_1 = require("listr2");
|
|
18
18
|
const path_1 = require("path");
|
|
19
19
|
const swagger_typescript_api_1 = require("swagger-typescript-api");
|
|
20
20
|
const json_1 = require("../utils/json");
|
|
@@ -110,18 +110,18 @@ function fix(output, res, tree, context, config) {
|
|
|
110
110
|
function genProxy(config) {
|
|
111
111
|
return (tree, context) => {
|
|
112
112
|
var _a;
|
|
113
|
-
context.logger.info(
|
|
113
|
+
context.logger.info(listr2_1.color.blue(`- Name: ${config.name}`));
|
|
114
114
|
const output = (config.output = (0, path_1.resolve)(process.cwd(), (_a = config.output) !== null && _a !== void 0 ? _a : `./src/app/_${config.name}`));
|
|
115
115
|
const templates = (0, path_1.resolve)(__dirname, './templates');
|
|
116
116
|
if (config.url) {
|
|
117
|
-
context.logger.info(
|
|
117
|
+
context.logger.info(listr2_1.color.blue(`- Using url data: ${config.url}`));
|
|
118
118
|
}
|
|
119
119
|
else if (config.filePath) {
|
|
120
|
-
context.logger.info(
|
|
120
|
+
context.logger.info(listr2_1.color.blue(`- Using file data: ${config.filePath}`));
|
|
121
121
|
}
|
|
122
|
-
context.logger.info(
|
|
122
|
+
context.logger.info(listr2_1.color.blue(`- Output: ${output}`));
|
|
123
123
|
return new Promise(resolve => {
|
|
124
|
-
context.logger.info(
|
|
124
|
+
context.logger.info(listr2_1.color.blue(`Start generating...`));
|
|
125
125
|
const options = Object.assign({ name: `${config.name}.ts`, url: config.url, input: config.filePath, spec: config.spec, output,
|
|
126
126
|
templates, toJS: false, modular: true, cleanOutput: true, generateUnionEnums: true, generateClient: true, extractRequestParams: false, generateResponses: false, generateRouteTypes: true, generateApi: true, silent: true, disableStrictSSL: true, moduleNameFirstTag: true, defaultResponseType: 'any', typePrefix: config.modelTypePrefix, hooks: {
|
|
127
127
|
onInit: (c) => {
|
|
@@ -188,7 +188,7 @@ function genProxy(config) {
|
|
|
188
188
|
}
|
|
189
189
|
function finished() {
|
|
190
190
|
return (_, context) => {
|
|
191
|
-
context.logger.info(
|
|
191
|
+
context.logger.info(listr2_1.color.green(`✓ Finished, refer to: https://ng-alain.com/cli/sta`));
|
|
192
192
|
};
|
|
193
193
|
}
|
|
194
194
|
function tryLoadConfig(context, configPath) {
|
|
@@ -196,7 +196,7 @@ function tryLoadConfig(context, configPath) {
|
|
|
196
196
|
return null;
|
|
197
197
|
try {
|
|
198
198
|
const configFile = (0, path_1.resolve)(process.cwd(), configPath);
|
|
199
|
-
context.logger.info(
|
|
199
|
+
context.logger.info(listr2_1.color.blue(`- Use config file: ${configFile}`));
|
|
200
200
|
if ((0, fs_1.existsSync)(configFile)) {
|
|
201
201
|
return (0, jsonc_parser_1.parse)((0, fs_1.readFileSync)(configFile).toString('utf8'));
|
|
202
202
|
}
|
package/sta/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sta/index.ts"],"names":[],"mappings":";;;;;;;;;;;AA2OA,4BAoBC;AA/PD,+CAAiD;AAEjD,2DAAsG;AACtG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sta/index.ts"],"names":[],"mappings":"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"}
|
package/sta/index.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { normalize } from '@angular-devkit/core';
|
|
2
2
|
import { ProjectDefinition } from '@angular-devkit/core/src/workspace';
|
|
3
3
|
import { Rule, SchematicsException, Tree, chain, SchematicContext } from '@angular-devkit/schematics';
|
|
4
|
-
import * as colors from 'ansi-colors';
|
|
5
4
|
import { rmSync, mkdirSync, existsSync, readFileSync } from 'fs';
|
|
6
5
|
import { parse } from 'jsonc-parser';
|
|
6
|
+
import { color } from 'listr2';
|
|
7
7
|
import { resolve, join } from 'path';
|
|
8
8
|
import { generateApi, GenerateApiOutput, GenerateApiParams } from 'swagger-typescript-api';
|
|
9
9
|
|
|
@@ -120,18 +120,18 @@ function fix(output: string, res: GenerateApiOutput, tree: Tree, context: Schema
|
|
|
120
120
|
|
|
121
121
|
function genProxy(config: STAConfig): Rule {
|
|
122
122
|
return (tree: Tree, context: SchematicContext) => {
|
|
123
|
-
context.logger.info(
|
|
123
|
+
context.logger.info(color.blue(`- Name: ${config.name}`));
|
|
124
124
|
const output = (config.output = resolve(process.cwd(), config.output ?? `./src/app/_${config.name}`));
|
|
125
125
|
const templates = resolve(__dirname, './templates');
|
|
126
126
|
if (config.url) {
|
|
127
|
-
context.logger.info(
|
|
127
|
+
context.logger.info(color.blue(`- Using url data: ${config.url}`));
|
|
128
128
|
} else if (config.filePath) {
|
|
129
|
-
context.logger.info(
|
|
129
|
+
context.logger.info(color.blue(`- Using file data: ${config.filePath}`));
|
|
130
130
|
}
|
|
131
|
-
context.logger.info(
|
|
131
|
+
context.logger.info(color.blue(`- Output: ${output}`));
|
|
132
132
|
|
|
133
133
|
return new Promise<void>(resolve => {
|
|
134
|
-
context.logger.info(
|
|
134
|
+
context.logger.info(color.blue(`Start generating...`));
|
|
135
135
|
const options = {
|
|
136
136
|
name: `${config.name}.ts`,
|
|
137
137
|
url: config.url,
|
|
@@ -215,7 +215,7 @@ function genProxy(config: STAConfig): Rule {
|
|
|
215
215
|
|
|
216
216
|
function finished(): Rule {
|
|
217
217
|
return (_: Tree, context: SchematicContext) => {
|
|
218
|
-
context.logger.info(
|
|
218
|
+
context.logger.info(color.green(`✓ Finished, refer to: https://ng-alain.com/cli/sta`));
|
|
219
219
|
};
|
|
220
220
|
}
|
|
221
221
|
|
|
@@ -224,7 +224,7 @@ function tryLoadConfig(context: SchematicContext, configPath?: string): STAConfi
|
|
|
224
224
|
|
|
225
225
|
try {
|
|
226
226
|
const configFile = resolve(process.cwd(), configPath);
|
|
227
|
-
context.logger.info(
|
|
227
|
+
context.logger.info(color.blue(`- Use config file: ${configFile}`));
|
|
228
228
|
if (existsSync(configFile)) {
|
|
229
229
|
return parse(readFileSync(configFile).toString('utf8'));
|
|
230
230
|
}
|
package/utils/lib-versions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ZORROVERSION = exports.VERSION = void 0;
|
|
4
|
-
exports.VERSION = '^20.
|
|
4
|
+
exports.VERSION = '^20.1.1';
|
|
5
5
|
exports.ZORROVERSION = '^20.3.1';
|
|
6
6
|
//# sourceMappingURL=lib-versions.js.map
|
package/utils/lib-versions.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = '^20.
|
|
1
|
+
export const VERSION = '^20.1.1';
|
|
2
2
|
export const ZORROVERSION = '^20.3.1';
|
package/utils/log.js
CHANGED
|
@@ -5,20 +5,20 @@ exports.logInfo = logInfo;
|
|
|
5
5
|
exports.logWarn = logWarn;
|
|
6
6
|
exports.logEx = logEx;
|
|
7
7
|
exports.logFinished = logFinished;
|
|
8
|
-
const
|
|
8
|
+
const listr2_1 = require("listr2");
|
|
9
9
|
function logStart(context, message) {
|
|
10
|
-
context.logger.info(`${
|
|
10
|
+
context.logger.info(`${listr2_1.color.green('✓')} ${message}`);
|
|
11
11
|
}
|
|
12
12
|
function logInfo(context, message) {
|
|
13
|
-
context.logger.info(` ${
|
|
13
|
+
context.logger.info(` ${listr2_1.color.green('✓')} ${message}`);
|
|
14
14
|
}
|
|
15
15
|
function logWarn(context, message) {
|
|
16
|
-
context.logger.info(` ${
|
|
16
|
+
context.logger.info(` ${listr2_1.color.yellow(`⚠ ${message}`)}`);
|
|
17
17
|
}
|
|
18
18
|
function logEx(context, message) {
|
|
19
|
-
context.logger.error(` ${
|
|
19
|
+
context.logger.error(` ${listr2_1.color.yellow(`x ${message}`)}`);
|
|
20
20
|
}
|
|
21
21
|
function logFinished(context, message) {
|
|
22
|
-
context.logger.info(`${
|
|
22
|
+
context.logger.info(`${listr2_1.color.green(`✓ ${message}`)}`);
|
|
23
23
|
}
|
|
24
24
|
//# sourceMappingURL=log.js.map
|
package/utils/log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../schematics/utils/log.ts"],"names":[],"mappings":";;AAGA,4BAEC;AAED,0BAEC;AAED,0BAEC;AAED,sBAEC;AAED,kCAEC;AApBD,
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../schematics/utils/log.ts"],"names":[],"mappings":";;AAGA,4BAEC;AAED,0BAEC;AAED,0BAEC;AAED,sBAEC;AAED,kCAEC;AApBD,mCAA+B;AAE/B,SAAgB,QAAQ,CAAC,OAAyB,EAAE,OAAe;IACjE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,cAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;AACxD,CAAC;AAED,SAAgB,OAAO,CAAC,OAAyB,EAAE,OAAe;IAChE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,cAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED,SAAgB,OAAO,CAAC,OAAyB,EAAE,OAAe;IAChE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,cAAK,CAAC,MAAM,CAAC,KAAK,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;AAC3D,CAAC;AAED,SAAgB,KAAK,CAAC,OAAyB,EAAE,OAAe;IAC9D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,cAAK,CAAC,MAAM,CAAC,KAAK,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;AAC5D,CAAC;AAED,SAAgB,WAAW,CAAC,OAAyB,EAAE,OAAe;IACpE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,cAAK,CAAC,KAAK,CAAC,KAAK,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;AACxD,CAAC"}
|
package/utils/log.ts
CHANGED
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
import { SchematicContext } from '@angular-devkit/schematics';
|
|
2
|
-
import
|
|
2
|
+
import { color } from 'listr2';
|
|
3
3
|
|
|
4
4
|
export function logStart(context: SchematicContext, message: string): void {
|
|
5
|
-
context.logger.info(`${
|
|
5
|
+
context.logger.info(`${color.green('✓')} ${message}`);
|
|
6
6
|
}
|
|
7
7
|
|
|
8
8
|
export function logInfo(context: SchematicContext, message: string): void {
|
|
9
|
-
context.logger.info(` ${
|
|
9
|
+
context.logger.info(` ${color.green('✓')} ${message}`);
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
export function logWarn(context: SchematicContext, message: string): void {
|
|
13
|
-
context.logger.info(` ${
|
|
13
|
+
context.logger.info(` ${color.yellow(`⚠ ${message}`)}`);
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
export function logEx(context: SchematicContext, message: string): void {
|
|
17
|
-
context.logger.error(` ${
|
|
17
|
+
context.logger.error(` ${color.yellow(`x ${message}`)}`);
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
export function logFinished(context: SchematicContext, message: string): void {
|
|
21
|
-
context.logger.info(`${
|
|
21
|
+
context.logger.info(`${color.green(`✓ ${message}`)}`);
|
|
22
22
|
}
|
package/utils/versions.js
CHANGED
|
@@ -28,7 +28,7 @@ function UpgradeMainVersions(tree, version = lib_versions_1.VERSION) {
|
|
|
28
28
|
`eslint@^9.35.0`,
|
|
29
29
|
`eslint-config-prettier@^10.1.8`,
|
|
30
30
|
`eslint-plugin-import@~2.32.0`,
|
|
31
|
-
`eslint-plugin-jsdoc@~
|
|
31
|
+
`eslint-plugin-jsdoc@~61.1.4`,
|
|
32
32
|
`eslint-plugin-prefer-arrow@~1.2.3`,
|
|
33
33
|
`eslint-plugin-prettier@~5.5.4`,
|
|
34
34
|
`eslint-plugin-unused-imports@^4.2.0`,
|
package/utils/versions.ts
CHANGED
|
@@ -23,7 +23,7 @@ export function UpgradeMainVersions(tree: Tree, version: string = VERSION): void
|
|
|
23
23
|
`eslint@^9.35.0`,
|
|
24
24
|
`eslint-config-prettier@^10.1.8`,
|
|
25
25
|
`eslint-plugin-import@~2.32.0`,
|
|
26
|
-
`eslint-plugin-jsdoc@~
|
|
26
|
+
`eslint-plugin-jsdoc@~61.1.4`,
|
|
27
27
|
`eslint-plugin-prefer-arrow@~1.2.3`,
|
|
28
28
|
`eslint-plugin-prettier@~5.5.4`,
|
|
29
29
|
`eslint-plugin-unused-imports@^4.2.0`,
|