@abp/ng.schematics 6.0.0-rc.4 → 6.0.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.
- package/collection.json +5 -0
- package/commands/api/index.js +38 -28
- package/commands/api/index.js.map +1 -1
- package/commands/api/schema.json +9 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/.eslintrc.json.template +44 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/config/ng-package.json.template +7 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/config/src/__libraryName@kebab__-config.module.ts.template +12 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/config/src/enums/index.ts.template +1 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/config/src/enums/route-names.ts.template +3 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/config/src/providers/index.ts.template +1 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/config/src/providers/route.provider.ts.template +26 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/config/src/public-api.ts.template +3 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/karma.conf.js.template +44 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/ng-package.json.template +7 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/package.json.template +11 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__-routing.module.ts.template +18 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__.module.ts.template +22 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/src/public-api.ts.template +4 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/src/test.ts.template +26 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template +20 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.prod.json.template +10 -0
- package/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.spec.json.template +17 -0
- package/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/ng-package.json.template +7 -0
- package/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/lib/__target@kebab__-__libraryName@kebab__.module.ts.template +11 -0
- package/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/lib/index.ts.template +1 -0
- package/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/public-api.ts.template +1 -0
- package/commands/create-lib/index.d.ts +6 -0
- package/commands/create-lib/index.js +124 -0
- package/commands/create-lib/index.js.map +1 -0
- package/commands/create-lib/models/generate-lib-schema.d.ts +13 -0
- package/commands/create-lib/models/generate-lib-schema.js +3 -0
- package/commands/create-lib/models/generate-lib-schema.js.map +1 -0
- package/commands/create-lib/models/index.d.ts +1 -0
- package/commands/create-lib/models/index.js +18 -0
- package/commands/create-lib/models/index.js.map +1 -0
- package/commands/create-lib/schema.json +36 -0
- package/commands/proxy-add/index.js +15 -15
- package/commands/proxy-add/index.js.map +1 -1
- package/commands/proxy-add/schema.json +9 -0
- package/commands/proxy-index/index.d.ts +3 -2
- package/commands/proxy-index/index.js +5 -5
- package/commands/proxy-index/index.js.map +1 -1
- package/commands/proxy-index/schema.json +9 -0
- package/commands/proxy-refresh/index.d.ts +2 -2
- package/commands/proxy-refresh/index.js +13 -13
- package/commands/proxy-refresh/index.js.map +1 -1
- package/commands/proxy-refresh/schema.json +10 -0
- package/commands/proxy-remove/index.d.ts +2 -2
- package/commands/proxy-remove/index.js +13 -13
- package/commands/proxy-remove/index.js.map +1 -1
- package/commands/proxy-remove/schema.json +9 -0
- package/constants/index.js +6 -2
- package/constants/index.js.map +1 -1
- package/constants/symbols.d.ts +1 -0
- package/constants/symbols.js +5 -0
- package/constants/symbols.js.map +1 -0
- package/enums/exception.d.ts +2 -1
- package/enums/index.js +6 -2
- package/enums/index.js.map +1 -1
- package/models/generate-proxy-schema.d.ts +4 -0
- package/models/index.js +6 -2
- package/models/index.js.map +1 -1
- package/models/method.js +3 -3
- package/models/method.js.map +1 -1
- package/package.json +6 -5
- package/test-setup.js +2 -2
- package/test-setup.js.map +1 -1
- package/utils/angular/ast-utils.d.ts +1 -14
- package/utils/angular/ast-utils.js +45 -117
- package/utils/angular/ast-utils.js.map +1 -1
- package/utils/angular/change.d.ts +6 -4
- package/utils/angular/change.js +29 -4
- package/utils/angular/change.js.map +1 -1
- package/utils/angular/dependencies.d.ts +1 -1
- package/utils/angular/dependencies.js +7 -9
- package/utils/angular/dependencies.js.map +1 -1
- package/utils/angular/dependency.d.ts +96 -0
- package/utils/angular/dependency.js +123 -0
- package/utils/angular/dependency.js.map +1 -0
- package/utils/angular/find-module.d.ts +2 -4
- package/utils/angular/find-module.js +22 -22
- package/utils/angular/find-module.js.map +1 -1
- package/utils/angular/generate-from-files.d.ts +17 -0
- package/utils/angular/generate-from-files.js +37 -0
- package/utils/angular/generate-from-files.js.map +1 -0
- package/utils/angular/index.d.ts +1 -5
- package/utils/angular/index.js +7 -7
- package/utils/angular/index.js.map +1 -1
- package/utils/angular/json-file.d.ts +4 -4
- package/utils/angular/json-file.js +24 -17
- package/utils/angular/json-file.js.map +1 -1
- package/utils/angular/ng-ast-utils.d.ts +7 -0
- package/utils/angular/ng-ast-utils.js +13 -21
- package/utils/angular/ng-ast-utils.js.map +1 -1
- package/utils/angular/parse-name.d.ts +1 -1
- package/utils/angular/parse-name.js +6 -6
- package/utils/angular/parse-name.js.map +1 -1
- package/utils/angular/paths.d.ts +1 -1
- package/utils/angular/paths.js +2 -2
- package/utils/angular/paths.js.map +1 -1
- package/utils/angular/project-targets.d.ts +1 -1
- package/utils/angular/project-targets.js +1 -1
- package/utils/angular/validation.d.ts +8 -2
- package/utils/angular/validation.js +10 -55
- package/utils/angular/validation.js.map +1 -1
- package/utils/angular/workspace-models.d.ts +16 -15
- package/utils/angular/workspace-models.js +9 -4
- package/utils/angular/workspace-models.js.map +1 -1
- package/utils/angular/workspace.d.ts +40 -5
- package/utils/angular/workspace.js +96 -38
- package/utils/angular/workspace.js.map +1 -1
- package/utils/angular-schematic/generate-lib.d.ts +3 -0
- package/utils/angular-schematic/generate-lib.js +54 -0
- package/utils/angular-schematic/generate-lib.js.map +1 -0
- package/utils/angular-schematic/index.d.ts +1 -0
- package/utils/angular-schematic/index.js +18 -0
- package/utils/angular-schematic/index.js.map +1 -0
- package/utils/api.js +1 -1
- package/utils/api.js.map +1 -1
- package/utils/ast.js +3 -3
- package/utils/ast.js.map +1 -1
- package/utils/barrel.js +1 -1
- package/utils/barrel.js.map +1 -1
- package/utils/common.js +1 -1
- package/utils/common.js.map +1 -1
- package/utils/enum.js +2 -2
- package/utils/enum.js.map +1 -1
- package/utils/generics.js +1 -2
- package/utils/generics.js.map +1 -1
- package/utils/index.js +6 -2
- package/utils/index.js.map +1 -1
- package/utils/methods.js +2 -1
- package/utils/methods.js.map +1 -1
- package/utils/model.js +17 -19
- package/utils/model.js.map +1 -1
- package/utils/namespace.js +1 -1
- package/utils/namespace.js.map +1 -1
- package/utils/path.js +1 -1
- package/utils/path.js.map +1 -1
- package/utils/rule.js +3 -3
- package/utils/rule.js.map +1 -1
- package/utils/service.js +15 -11
- package/utils/service.js.map +1 -1
- package/utils/source.js +19 -19
- package/utils/source.js.map +1 -1
- package/utils/text.js +18 -9
- package/utils/text.js.map +1 -1
- package/utils/type.js +6 -6
- package/utils/type.js.map +1 -1
- package/utils/workspace.d.ts +9 -1
- package/utils/workspace.js +51 -9
- package/utils/workspace.js.map +1 -1
- package/utils/angular/config.d.ts +0 -455
- package/utils/angular/config.js +0 -71
- package/utils/angular/config.js.map +0 -1
- package/utils/angular/json-utils.d.ts +0 -14
- package/utils/angular/json-utils.js +0 -159
- package/utils/angular/json-utils.js.map +0 -1
- package/utils/angular/latest-versions.d.ts +0 -18
- package/utils/angular/latest-versions.js +0 -27
- package/utils/angular/latest-versions.js.map +0 -1
- package/utils/angular/lint-fix.d.ts +0 -9
- package/utils/angular/lint-fix.js +0 -42
- package/utils/angular/lint-fix.js.map +0 -1
- package/utils/angular/tsconfig.d.ts +0 -16
- package/utils/angular/tsconfig.js +0 -63
- package/utils/angular/tsconfig.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './generate-lib';
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./generate-lib"), exports);
|
|
18
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular-schematic/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B"}
|
package/utils/api.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.createApisGenerator = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
function createApisGenerator(schema, generated) {
|
|
6
|
-
return schematics_1.chain(generated.map(m => schematics_1.schematic('api',
|
|
6
|
+
return (0, schematics_1.chain)(generated.map(m => (0, schematics_1.schematic)('api', { ...schema, module: m })));
|
|
7
7
|
}
|
|
8
8
|
exports.createApisGenerator = createApisGenerator;
|
|
9
9
|
//# sourceMappingURL=api.js.map
|
package/utils/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/api.ts"],"names":[],"mappings":";;;AAAA,2DAA8D;AAG9D,SAAgB,mBAAmB,CAAC,MAA2B,EAAE,SAAmB;IAClF,OAAO,kBAAK,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/api.ts"],"names":[],"mappings":";;;AAAA,2DAA8D;AAG9D,SAAgB,mBAAmB,CAAC,MAA2B,EAAE,SAAmB;IAClF,OAAO,IAAA,kBAAK,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,sBAAS,EAAC,KAAK,EAAE,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAC/E,CAAC;AAFD,kDAEC"}
|
package/utils/ast.js
CHANGED
|
@@ -4,13 +4,13 @@ exports.isBooleanStringOrNumberLiteral = exports.getAssignedPropertyFromObjectli
|
|
|
4
4
|
const ts = require("typescript");
|
|
5
5
|
const ast_utils_1 = require("./angular/ast-utils");
|
|
6
6
|
function findEnvironmentExpression(source) {
|
|
7
|
-
const expressions = ast_utils_1.findNodes(source, ts.isObjectLiteralExpression);
|
|
7
|
+
const expressions = (0, ast_utils_1.findNodes)(source, ts.isObjectLiteralExpression);
|
|
8
8
|
return expressions.find(expr => expr.getText().includes('production'));
|
|
9
9
|
}
|
|
10
10
|
exports.findEnvironmentExpression = findEnvironmentExpression;
|
|
11
11
|
function getAssignedPropertyFromObjectliteral(expression, variableSelector) {
|
|
12
|
-
const expressions = ast_utils_1.findNodes(expression, isBooleanStringOrNumberLiteral);
|
|
13
|
-
const literal = expressions.find(node => Boolean(variableSelector.reduceRight((acc, key) =>
|
|
12
|
+
const expressions = (0, ast_utils_1.findNodes)(expression, isBooleanStringOrNumberLiteral);
|
|
13
|
+
const literal = expressions.find(node => Boolean(variableSelector.reduceRight((acc, key) => acc?.name?.getText() === key ? acc.parent.parent : undefined, node.parent)));
|
|
14
14
|
return literal ? literal.getText() : undefined;
|
|
15
15
|
}
|
|
16
16
|
exports.getAssignedPropertyFromObjectliteral = getAssignedPropertyFromObjectliteral;
|
package/utils/ast.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/ast.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,mDAAgD;AAEhD,SAAgB,yBAAyB,CAAC,MAAqB;IAC7D,MAAM,WAAW,GAAG,qBAAS,
|
|
1
|
+
{"version":3,"file":"ast.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/ast.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,mDAAgD;AAEhD,SAAgB,yBAAyB,CAAC,MAAqB;IAC7D,MAAM,WAAW,GAAG,IAAA,qBAAS,EAAC,MAAM,EAAE,EAAE,CAAC,yBAAyB,CAAC,CAAC;IACpE,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;AACzE,CAAC;AAHD,8DAGC;AAED,SAAgB,oCAAoC,CAClD,UAAsC,EACtC,gBAA0B;IAE1B,MAAM,WAAW,GAAG,IAAA,qBAAS,EAAC,UAAU,EAAE,8BAA8B,CAAC,CAAC;IAE1E,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtC,OAAO,CACL,gBAAgB,CAAC,WAAW,CAC1B,CAAC,GAA0B,EAAE,GAAG,EAAE,EAAE,CAClC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAC9D,IAAI,CAAC,MAAM,CACZ,CACF,CACF,CAAC;IAEF,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACjD,CAAC;AAjBD,oFAiBC;AAED,SAAgB,8BAA8B,CAC5C,IAAa;IAEb,OAAO,CACL,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC;QACxB,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,WAAW;QACvC,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,YAAY,CACzC,CAAC;AACJ,CAAC;AATD,wEASC"}
|
package/utils/barrel.js
CHANGED
|
@@ -16,7 +16,7 @@ function createBarrelsGenerator(rootPath) {
|
|
|
16
16
|
}
|
|
17
17
|
exports.createBarrelsGenerator = createBarrelsGenerator;
|
|
18
18
|
function generateBarrelFromPath(tree, indexPath) {
|
|
19
|
-
const saveFile = file_1.createFileSaver(tree);
|
|
19
|
+
const saveFile = (0, file_1.createFileSaver)(tree);
|
|
20
20
|
const asterisk = collectAsteriskBarrel(tree, indexPath);
|
|
21
21
|
const named = collectNamedBarrel(tree, indexPath);
|
|
22
22
|
if (asterisk.exports.length + named.exports.length)
|
package/utils/barrel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"barrel.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/barrel.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAE/C,4CAA0C;AAC1C,iCAAyC;AAEzC,SAAgB,yBAAyB,CAAC,UAAkB;IAC1D,OAAO,sBAAsB,CAAC,UAAU,GAAG,sBAAU,CAAC,CAAC;AACzD,CAAC;AAFD,8DAEC;AAED,SAAgB,sBAAsB,CAAC,QAAgB;IACrD,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,sBAAsB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AALD,wDAKC;AAED,SAAgB,sBAAsB,CAAC,IAAU,EAAE,SAAiB;IAClE,MAAM,QAAQ,GAAG,sBAAe,
|
|
1
|
+
{"version":3,"file":"barrel.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/barrel.ts"],"names":[],"mappings":"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"}
|
package/utils/common.js
CHANGED
|
@@ -18,7 +18,7 @@ exports.isNullOrUndefined = isNullOrUndefined;
|
|
|
18
18
|
function readFileInTree(tree, filePath) {
|
|
19
19
|
const buffer = tree.read(filePath);
|
|
20
20
|
if (isNullOrUndefined(buffer))
|
|
21
|
-
throw new schematics_1.SchematicsException(interpolate("[File Not Found] There is no file at \"{0}\" path." /* FileNotFound */, filePath));
|
|
21
|
+
throw new schematics_1.SchematicsException(interpolate("[File Not Found] There is no file at \"{0}\" path." /* Exception.FileNotFound */, filePath));
|
|
22
22
|
const text = buffer.toString('utf-8');
|
|
23
23
|
return ts.createSourceFile(filePath, text, ts.ScriptTarget.Latest, true);
|
|
24
24
|
}
|
package/utils/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/common.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AACvE,iCAAiC;AAGjC,SAAgB,WAAW,CAAC,IAAY,EAAE,GAAG,MAAqC;IAChF,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QAC1B,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;QAClD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAPD,kCAOC;AAED,SAAgB,iBAAiB,CAAC,KAAU;IAC1C,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AAC/C,CAAC;AAFD,8CAEC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,QAAgB;IACzD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,iBAAiB,CAAC,MAAM,CAAC;QAC3B,MAAM,IAAI,gCAAmB,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/common.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AACvE,iCAAiC;AAGjC,SAAgB,WAAW,CAAC,IAAY,EAAE,GAAG,MAAqC;IAChF,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QAC1B,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;QAClD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAPD,kCAOC;AAED,SAAgB,iBAAiB,CAAC,KAAU;IAC1C,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AAC/C,CAAC;AAFD,8CAEC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,QAAgB;IACzD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,iBAAiB,CAAC,MAAM,CAAC;QAC3B,MAAM,IAAI,gCAAmB,CAAC,WAAW,oFAAyB,QAAQ,CAAC,CAAC,CAAC;IAE/E,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtC,OAAO,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAC3E,CAAC;AAPD,wCAOC;AAED,SAAgB,yBAAyB,CAAI,SAAY;IACvD,MAAM,SAAS,GAAwB,EAAE,CAAC;IAE1C,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACjD,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,OAAO,SAAc,CAAC;AACxB,CAAC;AARD,8DAQC"}
|
package/utils/enum.js
CHANGED
|
@@ -23,8 +23,8 @@ function createImportRefToEnumMapper({ solution, types }) {
|
|
|
23
23
|
return (ref) => {
|
|
24
24
|
const { enumNames, enumValues } = types[ref];
|
|
25
25
|
if (!enumNames || !enumValues)
|
|
26
|
-
throw new schematics_1.SchematicsException(common_1.interpolate("[Type Definition Not Found] There is no type definition for \"{0}\"." /* NoTypeDefinition */, ref));
|
|
27
|
-
const namespace = namespace_1.parseNamespace(solution, ref);
|
|
26
|
+
throw new schematics_1.SchematicsException((0, common_1.interpolate)("[Type Definition Not Found] There is no type definition for \"{0}\"." /* Exception.NoTypeDefinition */, ref));
|
|
27
|
+
const namespace = (0, namespace_1.parseNamespace)(solution, ref);
|
|
28
28
|
const members = enumNames.map((key, i) => ({
|
|
29
29
|
key: shouldQuote(key) ? `'${key}'` : key,
|
|
30
30
|
value: enumValues[i],
|
package/utils/enum.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/enum.ts"],"names":[],"mappings":";;;AAAA,2DAAiE;AAGjE,qCAAuC;AACvC,2CAA6C;AAC7C,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAU5C,SAAgB,YAAY,CAAC,IAAY;IACvC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAChC,CAAC;AAFD,oCAEC;AAED,SAAgB,uBAAuB,CAAC,cAAwC;IAC9E,OAAO,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC;SAC/B,MAAM,CAAC,YAAY,CAAC;SACpB,MAAM,CAAC,CAAC,GAAa,EAAE,IAAI,EAAE,EAAE;QAC9B,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3D,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACX,CAAC;AAPD,0DAOC;AAED,SAAgB,2BAA2B,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAuB;IAClF,OAAO,CAAC,GAAW,EAAE,EAAE;QACrB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU;YAC3B,MAAM,IAAI,gCAAmB,CAAC,oBAAW,
|
|
1
|
+
{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/enum.ts"],"names":[],"mappings":";;;AAAA,2DAAiE;AAGjE,qCAAuC;AACvC,2CAA6C;AAC7C,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAU5C,SAAgB,YAAY,CAAC,IAAY;IACvC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAChC,CAAC;AAFD,oCAEC;AAED,SAAgB,uBAAuB,CAAC,cAAwC;IAC9E,OAAO,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC;SAC/B,MAAM,CAAC,YAAY,CAAC;SACpB,MAAM,CAAC,CAAC,GAAa,EAAE,IAAI,EAAE,EAAE;QAC9B,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3D,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACX,CAAC;AAPD,0DAOC;AAED,SAAgB,2BAA2B,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAuB;IAClF,OAAO,CAAC,GAAW,EAAE,EAAE;QACrB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU;YAC3B,MAAM,IAAI,gCAAmB,CAAC,IAAA,oBAAW,2GAA6B,GAAG,CAAC,CAAC,CAAC;QAE9E,MAAM,SAAS,GAAG,IAAA,0BAAc,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACzC,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG;YACxC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;SACrB,CAAC,CAAC,CAAC;QAEJ,OAAO;YACL,SAAS;YACT,oEAAoE;YACpE,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAG;YAC3B,OAAO;SACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAnBD,kEAmBC"}
|
package/utils/generics.js
CHANGED
|
@@ -67,9 +67,8 @@ function extractSimpleGenerics(sourceType) {
|
|
|
67
67
|
}
|
|
68
68
|
exports.extractSimpleGenerics = extractSimpleGenerics;
|
|
69
69
|
function extractGenerics(sourceType) {
|
|
70
|
-
var _a, _b;
|
|
71
70
|
const regex = /(?<identifier>[^<]+)(<(?<generics>.+)>)?/g;
|
|
72
|
-
const { identifier = '', generics = '' } =
|
|
71
|
+
const { identifier = '', generics = '' } = regex.exec(sourceType)?.groups ?? {};
|
|
73
72
|
return {
|
|
74
73
|
identifier,
|
|
75
74
|
generics: generics.split(/,\s*/).filter(Boolean),
|
package/utils/generics.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generics.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/generics.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generics.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/generics.ts"],"names":[],"mappings":"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"}
|
package/utils/index.js
CHANGED
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
8
12
|
}));
|
|
9
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
-
for (var p in m) if (p !== "default" && !
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
15
|
};
|
|
12
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
17
|
__exportStar(require("./angular"), exports);
|
package/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,wCAAsB;AACtB,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,6CAA2B;AAC3B,2CAAyB;AACzB,4CAA0B;AAC1B,0CAAwB;AACxB,8CAA4B;AAC5B,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,8CAA4B"}
|
package/utils/methods.js
CHANGED
|
@@ -3,5 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getParamName = void 0;
|
|
4
4
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
5
5
|
const shouldQuote = require('should-quote');
|
|
6
|
-
|
|
6
|
+
const getParamName = (paramName) => shouldQuote(paramName) ? `["${paramName}"]` : paramName;
|
|
7
|
+
exports.getParamName = getParamName;
|
|
7
8
|
//# sourceMappingURL=methods.js.map
|
package/utils/methods.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"methods.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/methods.ts"],"names":[],"mappings":";;;AAAA,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"methods.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/methods.ts"],"names":[],"mappings":";;;AAAA,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACrC,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAE,EAAE,CAChD,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AAD7C,QAAA,YAAY,gBACiC"}
|
package/utils/model.js
CHANGED
|
@@ -38,7 +38,7 @@ function createImportRefsToModelReducer(params) {
|
|
|
38
38
|
models.push(new models_1.Model({
|
|
39
39
|
interfaces: [_interface],
|
|
40
40
|
namespace,
|
|
41
|
-
path: path_1.relativePathToModel(namespace, namespace),
|
|
41
|
+
path: (0, path_1.relativePathToModel)(namespace, namespace),
|
|
42
42
|
}));
|
|
43
43
|
}
|
|
44
44
|
});
|
|
@@ -46,7 +46,7 @@ function createImportRefsToModelReducer(params) {
|
|
|
46
46
|
const toBeImported = [];
|
|
47
47
|
model.interfaces.forEach(_interface => {
|
|
48
48
|
const { baseType } = types[_interface.ref];
|
|
49
|
-
if (baseType && namespace_1.parseNamespace(solution, baseType) !== model.namespace)
|
|
49
|
+
if (baseType && (0, namespace_1.parseNamespace)(solution, baseType) !== model.namespace)
|
|
50
50
|
toBeImported.push({
|
|
51
51
|
type: baseType.split('<')[0],
|
|
52
52
|
isEnum: false,
|
|
@@ -58,7 +58,7 @@ function createImportRefsToModelReducer(params) {
|
|
|
58
58
|
return;
|
|
59
59
|
if (propType.isEnum)
|
|
60
60
|
toBeImported.push({ type: ref, isEnum: true });
|
|
61
|
-
else if (namespace_1.parseNamespace(solution, ref) !== model.namespace)
|
|
61
|
+
else if ((0, namespace_1.parseNamespace)(solution, ref) !== model.namespace)
|
|
62
62
|
toBeImported.push({ type: ref, isEnum: false });
|
|
63
63
|
});
|
|
64
64
|
});
|
|
@@ -77,25 +77,24 @@ function sortInterfaces(interfaces) {
|
|
|
77
77
|
}
|
|
78
78
|
function createImportRefToInterfaceReducerCreator(params) {
|
|
79
79
|
const { solution, types } = params;
|
|
80
|
-
const parseType = type_1.createTypeParser(type_1.removeTypeModifiers);
|
|
81
|
-
const simplifyType = type_1.createTypeSimplifier();
|
|
82
|
-
const getIdentifier = (type) => type_1.removeTypeModifiers(simplifyType(type));
|
|
80
|
+
const parseType = (0, type_1.createTypeParser)(type_1.removeTypeModifiers);
|
|
81
|
+
const simplifyType = (0, type_1.createTypeSimplifier)();
|
|
82
|
+
const getIdentifier = (type) => (0, type_1.removeTypeModifiers)(simplifyType(type));
|
|
83
83
|
const genericsCollector = new generics_1.GenericsCollector(getIdentifier);
|
|
84
84
|
return reduceRefsToInterfaces;
|
|
85
85
|
function reduceRefsToInterfaces(interfaces, ref) {
|
|
86
|
-
var _a;
|
|
87
86
|
const typeDef = types[ref];
|
|
88
87
|
if (!typeDef)
|
|
89
88
|
return interfaces;
|
|
90
|
-
const namespace = namespace_1.parseNamespace(solution, ref);
|
|
89
|
+
const namespace = (0, namespace_1.parseNamespace)(solution, ref);
|
|
91
90
|
let { baseType: base, genericArguments } = typeDef;
|
|
92
91
|
genericArguments = genericArguments || [];
|
|
93
92
|
let identifier = getIdentifier(ref);
|
|
94
|
-
identifier = generics_1.replacePlaceholdersWithGenerics(identifier, genericArguments, genericsCollector);
|
|
93
|
+
identifier = (0, generics_1.replacePlaceholdersWithGenerics)(identifier, genericArguments, genericsCollector);
|
|
95
94
|
if (base) {
|
|
96
|
-
if (type_1.extendsSelf(ref, base)) {
|
|
97
|
-
genericsCollector.collect(generics_1.extractGenerics(base).generics, genericArguments);
|
|
98
|
-
return reduceRefsToInterfaces(interfaces, generics_1.generateRefWithPlaceholders(base));
|
|
95
|
+
if ((0, type_1.extendsSelf)(ref, base)) {
|
|
96
|
+
genericsCollector.collect((0, generics_1.extractGenerics)(base).generics, genericArguments);
|
|
97
|
+
return reduceRefsToInterfaces(interfaces, (0, generics_1.generateRefWithPlaceholders)(base));
|
|
99
98
|
}
|
|
100
99
|
else {
|
|
101
100
|
base = getIdentifier(base);
|
|
@@ -104,11 +103,11 @@ function createImportRefToInterfaceReducerCreator(params) {
|
|
|
104
103
|
const { generics } = genericsCollector;
|
|
105
104
|
const _interface = new models_1.Interface({ identifier, base, namespace, ref, generics });
|
|
106
105
|
genericsCollector.reset();
|
|
107
|
-
|
|
108
|
-
let name = prop.jsonName || text_1.camel(prop.name);
|
|
106
|
+
typeDef.properties?.forEach(prop => {
|
|
107
|
+
let name = prop.jsonName || (0, text_1.camel)(prop.name);
|
|
109
108
|
name = shouldQuote(name) ? `'${name}'` : name;
|
|
110
109
|
const type = simplifyType(prop.typeSimple);
|
|
111
|
-
const refs = parseType(prop.type).reduce((acc, r) => acc.concat(tree_1.parseGenerics(r).toGenerics()), []);
|
|
110
|
+
const refs = parseType(prop.type).reduce((acc, r) => acc.concat((0, tree_1.parseGenerics)(r).toGenerics()), []);
|
|
112
111
|
const property = new models_1.Property({ name, type, refs });
|
|
113
112
|
property.setOptional(isOptionalProperty(prop));
|
|
114
113
|
_interface.properties.push(property);
|
|
@@ -117,8 +116,7 @@ function createImportRefToInterfaceReducerCreator(params) {
|
|
|
117
116
|
return [..._interface.properties, ..._interface.generics]
|
|
118
117
|
.reduce((refs, prop) => {
|
|
119
118
|
prop.refs.forEach(type => {
|
|
120
|
-
|
|
121
|
-
if ((_a = types[type]) === null || _a === void 0 ? void 0 : _a.isEnum)
|
|
119
|
+
if (types[type]?.isEnum)
|
|
122
120
|
return;
|
|
123
121
|
if (interfaces.some(i => i.ref === type))
|
|
124
122
|
return;
|
|
@@ -126,14 +124,14 @@ function createImportRefToInterfaceReducerCreator(params) {
|
|
|
126
124
|
});
|
|
127
125
|
return refs;
|
|
128
126
|
}, [])
|
|
129
|
-
.concat(base ? tree_1.parseGenerics(typeDef.baseType).toGenerics() : [])
|
|
127
|
+
.concat(base ? (0, tree_1.parseGenerics)(typeDef.baseType).toGenerics() : [])
|
|
130
128
|
.reduce(reduceRefsToInterfaces, interfaces);
|
|
131
129
|
}
|
|
132
130
|
}
|
|
133
131
|
exports.createImportRefToInterfaceReducerCreator = createImportRefToInterfaceReducerCreator;
|
|
134
132
|
function createRefToImportReducerCreator(params) {
|
|
135
133
|
const { solution } = params;
|
|
136
|
-
return (namespace) => type_1.createTypesToImportsReducer(solution, namespace);
|
|
134
|
+
return (namespace) => (0, type_1.createTypesToImportsReducer)(solution, namespace);
|
|
137
135
|
}
|
|
138
136
|
exports.createRefToImportReducerCreator = createRefToImportReducerCreator;
|
|
139
137
|
function isOptionalProperty(prop) {
|
package/utils/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/model.ts"],"names":[],"mappings":";;;AAAA,4CAA0C;AAC1C,sCAAwF;AACxF,yCAKoB;AACpB,2CAA6C;AAC7C,iCAA6C;AAC7C,iCAA+B;AAC/B,iCAAuC;AACvC,iCAMgB;AAChB,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAU5C,SAAgB,8BAA8B,CAAC,MAA4B;IACzE,MAAM,4BAA4B,GAAG,wCAAwC,CAAC,MAAM,CAAC,CAAC;IACtF,MAAM,wBAAwB,GAAG,+BAA+B,CAAC,MAAM,CAAC,CAAC;IACzE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAEnC,OAAO,CAAC,MAAe,EAAE,UAAoB,EAAE,EAAE;QAC/C,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,4BAA4B,EAAE,EAAE,CAAC,CAAC;QAEvE,cAAc,CAAC,UAAU,CAAC,CAAC;QAE3B,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC9B,IAAI,sBAAU,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,OAAO;YAE5C,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAE,CAAC,MAAM,EAAE;gBACjC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAChE,OAAO;aACR;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,UAAU,CAAC,SAAS,CAAC,CAAC;YAC1E,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;gBACd,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,UAAU,CAAC;oBAAE,OAAO;gBAEvF,MAAM,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAC3C;iBAAM;gBACL,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;gBAEjC,MAAM,CAAC,IAAI,CACT,IAAI,cAAK,CAAC;oBACR,UAAU,EAAE,CAAC,UAAU,CAAC;oBACxB,SAAS;oBACT,IAAI,EAAE,0BAAmB,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/model.ts"],"names":[],"mappings":"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"}
|
package/utils/namespace.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.parseNamespace = void 0;
|
|
4
4
|
const type_1 = require("./type");
|
|
5
5
|
function parseNamespace(solution, type) {
|
|
6
|
-
const parseType = type_1.createTypeParser(type_1.removeGenerics);
|
|
6
|
+
const parseType = (0, type_1.createTypeParser)(type_1.removeGenerics);
|
|
7
7
|
let namespace = parseType(type)[0].split('.').slice(0, -1).join('.');
|
|
8
8
|
if (solution === namespace)
|
|
9
9
|
return '';
|
package/utils/namespace.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/namespace.ts"],"names":[],"mappings":";;;AAAA,iCAA0D;AAE1D,SAAgB,cAAc,CAAC,QAAgB,EAAE,IAAY;IAC3D,MAAM,SAAS,GAAG,uBAAgB,
|
|
1
|
+
{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/namespace.ts"],"names":[],"mappings":";;;AAAA,iCAA0D;AAE1D,SAAgB,cAAc,CAAC,QAAgB,EAAE,IAAY;IAC3D,MAAM,SAAS,GAAG,IAAA,uBAAgB,EAAC,qBAAc,CAAC,CAAC;IACnD,IAAI,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAErE,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAEtC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAC5C,GAAG,GAAG,GAAG,IAAI,MAAM,GAAG,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,mBAAmB,CAAC,CAAC;QACrD,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACzC,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,SAAS,CAAC;AACnB,CAAC;AAdD,wCAcC"}
|
package/utils/path.js
CHANGED
|
@@ -5,7 +5,7 @@ const core_1 = require("@angular-devkit/core");
|
|
|
5
5
|
const text_1 = require("./text");
|
|
6
6
|
function relativePathToEnum(namespace, enumNamespace, enumName) {
|
|
7
7
|
const path = calculateRelativePath(namespace, enumNamespace);
|
|
8
|
-
return path + `/${text_1.kebab(enumName)}.enum`;
|
|
8
|
+
return path + `/${(0, text_1.kebab)(enumName)}.enum`;
|
|
9
9
|
}
|
|
10
10
|
exports.relativePathToEnum = relativePathToEnum;
|
|
11
11
|
function relativePathToModel(namespace, modelNamespace) {
|
package/utils/path.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/path.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,iCAA+B;AAE/B,SAAgB,kBAAkB,CAAC,SAAiB,EAAE,aAAqB,EAAE,QAAgB;IAC3F,MAAM,IAAI,GAAG,qBAAqB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IAC7D,OAAO,IAAI,GAAG,IAAI,YAAK,
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/path.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,iCAA+B;AAE/B,SAAgB,kBAAkB,CAAC,SAAiB,EAAE,aAAqB,EAAE,QAAgB;IAC3F,MAAM,IAAI,GAAG,qBAAqB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IAC7D,OAAO,IAAI,GAAG,IAAI,IAAA,YAAK,EAAC,QAAQ,CAAC,OAAO,CAAC;AAC3C,CAAC;AAHD,gDAGC;AAED,SAAgB,mBAAmB,CAAC,SAAiB,EAAE,cAAsB;IAC3E,MAAM,IAAI,GAAG,qBAAqB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IAC9D,OAAO,IAAI,GAAG,SAAS,CAAC;AAC1B,CAAC;AAHD,kDAGC;AAED,SAAS,qBAAqB,CAAC,GAAW,EAAE,GAAW;IACrD,IAAI,GAAG,KAAK,GAAG;QAAE,OAAO,GAAG,CAAC;IAE5B,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzC,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEzC,OAAO,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;QACrC,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC;YAAE,MAAM;QAEnC,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,EAAE,CAAC;KAChB;IAED,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;IAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,GAAG,cAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAE7E,OAAO,mBAAmB,CAAC,iBAAiB,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAY;IACrC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;AACtC,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAY;IACvC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAClC,CAAC"}
|
package/utils/rule.js
CHANGED
|
@@ -7,20 +7,20 @@ function applyWithOverwrite(source, rules) {
|
|
|
7
7
|
const mapped = rules.map(r => {
|
|
8
8
|
return ((_tree, _ctx) => new Promise(res => res(r(_tree, _ctx))));
|
|
9
9
|
});
|
|
10
|
-
const rule = schematics_1.mergeWith(schematics_1.apply(source, [...mapped, overwriteFileIfExists(tree)]));
|
|
10
|
+
const rule = (0, schematics_1.mergeWith)((0, schematics_1.apply)(source, [...mapped, overwriteFileIfExists(tree)]));
|
|
11
11
|
return rule(tree, _context);
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
14
|
exports.applyWithOverwrite = applyWithOverwrite;
|
|
15
15
|
function mergeAndAllowDelete(host, rule) {
|
|
16
16
|
return async (tree, context) => {
|
|
17
|
-
const nextTree = await schematics_1.callRule(rule, tree, context).toPromise();
|
|
17
|
+
const nextTree = await (0, schematics_1.callRule)(rule, tree, context).toPromise();
|
|
18
18
|
host.merge(nextTree, schematics_1.MergeStrategy.AllowDeleteConflict);
|
|
19
19
|
};
|
|
20
20
|
}
|
|
21
21
|
exports.mergeAndAllowDelete = mergeAndAllowDelete;
|
|
22
22
|
function overwriteFileIfExists(tree) {
|
|
23
|
-
return schematics_1.forEach(fileEntry => {
|
|
23
|
+
return (0, schematics_1.forEach)(fileEntry => {
|
|
24
24
|
if (!tree.exists(fileEntry.path))
|
|
25
25
|
return fileEntry;
|
|
26
26
|
tree.overwrite(fileEntry.path, fileEntry.content);
|
package/utils/rule.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rule.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/rule.ts"],"names":[],"mappings":";;;AAAA,2DAUoC;AAGpC,SAAgB,kBAAkB,CAAC,MAAc,EAAE,KAAa;IAC9D,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAO,CAAC,CAAC,EAAE;YACjC,OAAO,CAAC,CAAC,KAAW,EAAE,IAAsB,EAAE,EAAE,CAC9C,IAAI,OAAO,CAAa,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAS,CAAC;QACjE,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,sBAAS,
|
|
1
|
+
{"version":3,"file":"rule.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/rule.ts"],"names":[],"mappings":";;;AAAA,2DAUoC;AAGpC,SAAgB,kBAAkB,CAAC,MAAc,EAAE,KAAa;IAC9D,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAO,CAAC,CAAC,EAAE;YACjC,OAAO,CAAC,CAAC,KAAW,EAAE,IAAsB,EAAE,EAAE,CAC9C,IAAI,OAAO,CAAa,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAS,CAAC;QACjE,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAC,IAAA,kBAAK,EAAC,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AATD,gDASC;AAED,SAAgB,mBAAmB,CAAC,IAAU,EAAE,IAAU;IACxD,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAQ,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;QACjE,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,0BAAa,CAAC,mBAAmB,CAAC,CAAC;IAC1D,CAAC,CAAC;AACJ,CAAC;AALD,kDAKC;AAED,SAAgB,qBAAqB,CAAC,IAAU;IAC9C,OAAO,IAAA,oBAAO,EAAC,SAAS,CAAC,EAAE;QACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YAAE,OAAO,SAAS,CAAC;QAEnD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAPD,sDAOC"}
|
package/utils/service.js
CHANGED
|
@@ -17,13 +17,13 @@ function createControllerToServiceMapper({ solution, types, apiName, }) {
|
|
|
17
17
|
const mapActionToMethod = createActionToMethodMapper();
|
|
18
18
|
return (controller) => {
|
|
19
19
|
const name = controller.controllerName;
|
|
20
|
-
const namespace = namespace_1.parseNamespace(solution, controller.type);
|
|
20
|
+
const namespace = (0, namespace_1.parseNamespace)(solution, controller.type);
|
|
21
21
|
const actions = Object.values(controller.actions);
|
|
22
22
|
const typeWithoutIRemoteStreamContent = getTypesWithoutIRemoteStreamContent(types);
|
|
23
23
|
const imports = actions.reduce(createActionToImportsReducer(solution, typeWithoutIRemoteStreamContent, namespace), []);
|
|
24
24
|
imports.push(new models_1.Import({ path: '@abp/ng.core', specifiers: ['RestService'] }));
|
|
25
25
|
imports.push(new models_1.Import({ path: '@angular/core', specifiers: ['Injectable'] }));
|
|
26
|
-
import_1.sortImports(imports);
|
|
26
|
+
(0, import_1.sortImports)(imports);
|
|
27
27
|
const methods = actions.map(mapActionToMethod);
|
|
28
28
|
sortMethods(methods);
|
|
29
29
|
return new models_1.Service({ apiName, imports, methods, name, namespace });
|
|
@@ -31,7 +31,7 @@ function createControllerToServiceMapper({ solution, types, apiName, }) {
|
|
|
31
31
|
}
|
|
32
32
|
exports.createControllerToServiceMapper = createControllerToServiceMapper;
|
|
33
33
|
function getTypesWithoutIRemoteStreamContent(types) {
|
|
34
|
-
const newType =
|
|
34
|
+
const newType = { ...types };
|
|
35
35
|
delete newType[constants_1.VOLO_REMOTE_STREAM_CONTENT];
|
|
36
36
|
return newType;
|
|
37
37
|
}
|
|
@@ -49,7 +49,7 @@ function createActionToMethodMapper() {
|
|
|
49
49
|
}
|
|
50
50
|
exports.createActionToMethodMapper = createActionToMethodMapper;
|
|
51
51
|
function createActionToBodyMapper() {
|
|
52
|
-
const adaptType = type_1.createTypeAdapter();
|
|
52
|
+
const adaptType = (0, type_1.createTypeAdapter)();
|
|
53
53
|
return ({ httpMethod, parameters, returnValue, url }) => {
|
|
54
54
|
const responseType = adaptType(returnValue.typeSimple);
|
|
55
55
|
const responseTypeWithNamespace = returnValue.typeSimple;
|
|
@@ -60,7 +60,7 @@ function createActionToBodyMapper() {
|
|
|
60
60
|
}
|
|
61
61
|
exports.createActionToBodyMapper = createActionToBodyMapper;
|
|
62
62
|
function createActionToSignatureMapper() {
|
|
63
|
-
const adaptType = type_1.createTypeAdapter();
|
|
63
|
+
const adaptType = (0, type_1.createTypeAdapter)();
|
|
64
64
|
return (action) => {
|
|
65
65
|
const signature = new models_1.Signature({ name: getMethodNameFromAction(action) });
|
|
66
66
|
const versionParameter = getVersionParameter(action);
|
|
@@ -87,7 +87,12 @@ function getVersionParameter(action) {
|
|
|
87
87
|
(p.name == 'api-version' && p.bindingSourceId == enums_1.eBindingSourceId.Query));
|
|
88
88
|
const bestVersion = findBestApiVersion(action);
|
|
89
89
|
return versionParameter && bestVersion
|
|
90
|
-
?
|
|
90
|
+
? {
|
|
91
|
+
...versionParameter,
|
|
92
|
+
name: (0, text_1.camelizeHyphen)(versionParameter.name),
|
|
93
|
+
defaultValue: `"${bestVersion}"`,
|
|
94
|
+
}
|
|
95
|
+
: null;
|
|
91
96
|
}
|
|
92
97
|
// Implementation of https://github.com/abpframework/abp/commit/c3f77c1229508279015054a9b4f5586404a88a14#diff-a4dbf6be9a1aa21d8294f11047774949363ee6b601980bf3225e8046c0748c9eR101
|
|
93
98
|
function findBestApiVersion(action) {
|
|
@@ -98,8 +103,7 @@ function findBestApiVersion(action) {
|
|
|
98
103
|
return configuredVersion;
|
|
99
104
|
}
|
|
100
105
|
*/
|
|
101
|
-
|
|
102
|
-
if (!((_a = action.supportedVersions) === null || _a === void 0 ? void 0 : _a.length)) {
|
|
106
|
+
if (!action.supportedVersions?.length) {
|
|
103
107
|
// TODO: return configuredVersion if exists or '1.0'
|
|
104
108
|
return '1.0';
|
|
105
109
|
}
|
|
@@ -107,10 +111,10 @@ function findBestApiVersion(action) {
|
|
|
107
111
|
return action.supportedVersions[action.supportedVersions.length - 1];
|
|
108
112
|
}
|
|
109
113
|
function createActionToImportsReducer(solution, types, namespace) {
|
|
110
|
-
const mapTypesToImports = type_1.createTypesToImportsReducer(solution, namespace);
|
|
111
|
-
const parseType = type_1.createTypeParser(type_1.removeTypeModifiers);
|
|
114
|
+
const mapTypesToImports = (0, type_1.createTypesToImportsReducer)(solution, namespace);
|
|
115
|
+
const parseType = (0, type_1.createTypeParser)(type_1.removeTypeModifiers);
|
|
112
116
|
return (imports, { parametersOnMethod, returnValue }) => mapTypesToImports(imports, [returnValue, ...parametersOnMethod].reduce((acc, param) => {
|
|
113
|
-
parseType(param.type).forEach(paramType => tree_1.parseGenerics(paramType)
|
|
117
|
+
parseType(param.type).forEach(paramType => (0, tree_1.parseGenerics)(paramType)
|
|
114
118
|
.toGenerics()
|
|
115
119
|
.forEach(type => {
|
|
116
120
|
if (types[type])
|
package/utils/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/service.ts"],"names":[],"mappings":";;;AAAA,sCAYmB;AACnB,qCAAuC;AACvC,2CAA6C;AAC7C,iCAAuC;AACvC,iCAKgB;AAChB,oCAA4C;AAC5C,iCAAwC;AACxC,4CAAwD;AAExD,SAAgB,mBAAmB,CAAC,UAAsB;IACxD,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7F,CAAC;AAFD,kDAEC;AAED,SAAgB,+BAA+B,CAAC,EAC9C,QAAQ,EACR,KAAK,EACL,OAAO,GACgB;IACvB,MAAM,iBAAiB,GAAG,0BAA0B,EAAE,CAAC;IAEvD,OAAO,CAAC,UAAsB,EAAE,EAAE;QAChC,MAAM,IAAI,GAAG,UAAU,CAAC,cAAc,CAAC;QACvC,MAAM,SAAS,GAAG,0BAAc,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/service.ts"],"names":[],"mappings":"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"}
|