@abp/ng.schematics 7.2.1 → 7.2.3
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/README.md +129 -2
- package/constants/volo.d.ts +1 -1
- package/constants/volo.js +4 -1
- package/constants/volo.js.map +1 -1
- package/enums/binding-source-id.d.ts +2 -1
- package/enums/binding-source-id.js +1 -0
- package/enums/binding-source-id.js.map +1 -1
- package/models/method.js +2 -1
- package/models/method.js.map +1 -1
- package/package.json +22 -8
- package/utils/generics.d.ts +2 -0
- package/utils/generics.js +4 -1
- package/utils/generics.js.map +1 -1
- package/utils/methods.js.map +1 -1
- package/utils/rule.js +3 -0
- package/utils/rule.js.map +1 -1
- package/utils/service.d.ts +2 -0
- package/utils/service.js +17 -2
- package/utils/service.js.map +1 -1
- package/utils/type.js +2 -2
- package/utils/type.js.map +1 -1
package/README.md
CHANGED
|
@@ -1,3 +1,130 @@
|
|
|
1
|
-
|
|
1
|
+
## ℹ️ Description
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
ABP Framework is a complete open-source infrastructure to create modern web applications by following the best practices and conventions of software development. This package is a part of the [ABP Framework](https://abp.io) and contains client-side files.
|
|
4
|
+
For more information, check out the below links:
|
|
5
|
+
|
|
6
|
+
🔗Official Website: https://abp.io
|
|
7
|
+
|
|
8
|
+
🔗Commercial Website: https://commercial.abp.io
|
|
9
|
+
|
|
10
|
+
🔗Commercial Demo: https://commercial.abp.io/demo
|
|
11
|
+
|
|
12
|
+
🔗GitHub Repository: https://github.com/abpframework/abp
|
|
13
|
+
|
|
14
|
+
🔗Official Theme: https://www.LeptonTheme.com
|
|
15
|
+
|
|
16
|
+
🔗Documentation: https://docs.abp.io
|
|
17
|
+
|
|
18
|
+
🔗Community: https://community.abp.io
|
|
19
|
+
|
|
20
|
+
🔗Blog: https://blog.abp.io
|
|
21
|
+
|
|
22
|
+
🔗Books: https://abp.io/books
|
|
23
|
+
|
|
24
|
+
🔗Twitter: https://twitter.com/abpframework
|
|
25
|
+
|
|
26
|
+
🔗Discord: https://community.abp.io/discord
|
|
27
|
+
|
|
28
|
+
🔗Stackoverflow: https://stackoverflow.com/questions/tagged/abp
|
|
29
|
+
|
|
30
|
+
🔗YouTube: https://www.youtube.com/@Volosoft
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
## 🤔 Why ABP Platform?
|
|
34
|
+
|
|
35
|
+
Why should you use the ABP.IO Platform instead of creating a new solution from scratch?
|
|
36
|
+
|
|
37
|
+
You can find the answer here 👉🏻 [Why ABP Platform?](https://docs.abp.io/en/commercial/latest/why-abp-io-platform)
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
## 🚀 Key Features of the ABP Framework
|
|
41
|
+
|
|
42
|
+
🟡 Modularity
|
|
43
|
+
|
|
44
|
+
🟡 Multi-Tenancy
|
|
45
|
+
|
|
46
|
+
🟡 Bootstrap Tag Helpers
|
|
47
|
+
|
|
48
|
+
🟡 Dynamic Forms
|
|
49
|
+
|
|
50
|
+
🟡 Authentication
|
|
51
|
+
|
|
52
|
+
🟡 Authorization
|
|
53
|
+
|
|
54
|
+
🟡 Distributed Event Bus
|
|
55
|
+
|
|
56
|
+
🟡 BLOB Storing
|
|
57
|
+
|
|
58
|
+
🟡 Text Templating
|
|
59
|
+
|
|
60
|
+
🟡 Tooling: ABP CLI
|
|
61
|
+
|
|
62
|
+
🟡 Cross-Cutting Concerns
|
|
63
|
+
|
|
64
|
+
🟡 Bundling & Minification
|
|
65
|
+
|
|
66
|
+
🟡 Virtual File System
|
|
67
|
+
|
|
68
|
+
🟡 Theming
|
|
69
|
+
|
|
70
|
+
🟡 Background Jobs
|
|
71
|
+
|
|
72
|
+
🟡 DDD Infrastructure
|
|
73
|
+
|
|
74
|
+
🟡 Auto REST APIs
|
|
75
|
+
|
|
76
|
+
🟡 Dynamic Client Proxies
|
|
77
|
+
|
|
78
|
+
🟡 Multiple Database Providers
|
|
79
|
+
|
|
80
|
+
🟡 Data filtering
|
|
81
|
+
|
|
82
|
+
🟡 Test Infrastructure
|
|
83
|
+
|
|
84
|
+
🟡 Audit Logging
|
|
85
|
+
|
|
86
|
+
🟡 Object to Object Mapping
|
|
87
|
+
|
|
88
|
+
🟡 Email & SMS Abstractions
|
|
89
|
+
|
|
90
|
+
🟡 Localization
|
|
91
|
+
|
|
92
|
+
🟡 Setting Management
|
|
93
|
+
|
|
94
|
+
🟡 Extension Methods
|
|
95
|
+
|
|
96
|
+
🟡 Aspect Oriented Programming
|
|
97
|
+
|
|
98
|
+
🟡 Dependency Injection
|
|
99
|
+
|
|
100
|
+
|
|
101
|
+
## 🧐 How It Works?
|
|
102
|
+
|
|
103
|
+
The following page explains how you use the ABP.IO Platform as a .NET developer 👉 [How it works?](https://commercial.abp.io/how-it-works)
|
|
104
|
+
|
|
105
|
+
|
|
106
|
+
### 📘 Supported Database Providers
|
|
107
|
+
|
|
108
|
+
🔵 Entity Framework Core
|
|
109
|
+
|
|
110
|
+
🔵 MongoDB
|
|
111
|
+
|
|
112
|
+
🔵 Dapper
|
|
113
|
+
|
|
114
|
+
|
|
115
|
+
### 🎴 Supported UI Frameworks
|
|
116
|
+
|
|
117
|
+
🔵 Angular
|
|
118
|
+
|
|
119
|
+
🔵 Razor Pages
|
|
120
|
+
|
|
121
|
+
🔵 Blazor Web Assembly
|
|
122
|
+
|
|
123
|
+
🔵 Blazor Server
|
|
124
|
+
|
|
125
|
+
🔵 MAUI with Blazor Hybrid
|
|
126
|
+
|
|
127
|
+
|
|
128
|
+
## 📫 Bug & Support
|
|
129
|
+
|
|
130
|
+
Support for open-source ABP Framework client-side packages is available at [GitHub Issues](https://github.com/abpframework/abp/issues), and the commercial support is available at [support.abp.io](https://support.abp.io).
|
package/constants/volo.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export declare const VOLO_REGEX: RegExp;
|
|
2
|
-
export declare const VOLO_REMOTE_STREAM_CONTENT
|
|
2
|
+
export declare const VOLO_REMOTE_STREAM_CONTENT: string[];
|
package/constants/volo.js
CHANGED
|
@@ -2,5 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.VOLO_REMOTE_STREAM_CONTENT = exports.VOLO_REGEX = void 0;
|
|
4
4
|
exports.VOLO_REGEX = /^Volo\.Abp\.(Application\.Dtos|ObjectExtending)/;
|
|
5
|
-
exports.VOLO_REMOTE_STREAM_CONTENT =
|
|
5
|
+
exports.VOLO_REMOTE_STREAM_CONTENT = [
|
|
6
|
+
'Volo.Abp.Content.IRemoteStreamContent',
|
|
7
|
+
'Volo.Abp.Content.RemoteStreamContent',
|
|
8
|
+
];
|
|
6
9
|
//# sourceMappingURL=volo.js.map
|
package/constants/volo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"volo.js","sourceRoot":"","sources":["../../../../packages/schematics/src/constants/volo.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG,iDAAiD,CAAC;AAC/D,QAAA,0BAA0B,GAAG,uCAAuC,
|
|
1
|
+
{"version":3,"file":"volo.js","sourceRoot":"","sources":["../../../../packages/schematics/src/constants/volo.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG,iDAAiD,CAAC;AAC/D,QAAA,0BAA0B,GAAG;IACxC,uCAAuC;IACvC,sCAAsC;CACvC,CAAC"}
|
|
@@ -7,5 +7,6 @@ var eBindingSourceId;
|
|
|
7
7
|
eBindingSourceId["Model"] = "ModelBinding";
|
|
8
8
|
eBindingSourceId["Path"] = "Path";
|
|
9
9
|
eBindingSourceId["Query"] = "Query";
|
|
10
|
+
eBindingSourceId["FormFile"] = "FormFile";
|
|
10
11
|
})(eBindingSourceId = exports.eBindingSourceId || (exports.eBindingSourceId = {}));
|
|
11
12
|
//# sourceMappingURL=binding-source-id.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binding-source-id.js","sourceRoot":"","sources":["../../../../packages/schematics/src/enums/binding-source-id.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"binding-source-id.js","sourceRoot":"","sources":["../../../../packages/schematics/src/enums/binding-source-id.ts"],"names":[],"mappings":";;;AAAA,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,0CAAsB,CAAA;IACtB,iCAAa,CAAA;IACb,mCAAe,CAAA;IACf,yCAAqB,CAAA;AACvB,CAAC,EANW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAM3B"}
|
package/models/method.js
CHANGED
|
@@ -40,6 +40,7 @@ class Body {
|
|
|
40
40
|
case enums_1.eBindingSourceId.Query:
|
|
41
41
|
this.params.push(paramName === value ? value : `${(0, methods_1.getParamName)(paramName)}: ${value}`);
|
|
42
42
|
break;
|
|
43
|
+
case enums_1.eBindingSourceId.FormFile:
|
|
43
44
|
case enums_1.eBindingSourceId.Body:
|
|
44
45
|
this.body = value;
|
|
45
46
|
break;
|
|
@@ -56,7 +57,7 @@ class Body {
|
|
|
56
57
|
this.setUrlQuotes();
|
|
57
58
|
}
|
|
58
59
|
isBlobMethod() {
|
|
59
|
-
return
|
|
60
|
+
return constants_1.VOLO_REMOTE_STREAM_CONTENT.some(x => x === this.responseTypeWithNamespace);
|
|
60
61
|
}
|
|
61
62
|
setUrlQuotes() {
|
|
62
63
|
this.url = /{/.test(this.url) ? `\`/${this.url}\`` : `'/${this.url}'`;
|
package/models/method.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method.js","sourceRoot":"","sources":["../../../../packages/schematics/src/models/method.ts"],"names":[],"mappings":";;;AAAA,oCAA6D;AAC7D,wCAAsD;AACtD,8CAAmE;AAInE,4CAA0D;AAC1D,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE5C,MAAa,MAAM;IAIjB,YAAY,OAAsB;QAChC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC;CACF;AAPD,wBAOC;AAID,MAAa,SAAS;IAOpB,YAAY,OAAyB;QANrC,aAAQ,GAAG,EAAE,CAAC;QACd,aAAQ,GAAG,uBAAe,CAAC,MAAM,CAAC;QAElC,eAAU,GAAe,EAAE,CAAC;QAC5B,eAAU,GAAG,EAAE,CAAC;QAGd,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC;CACF;AAVD,8BAUC;AAOD,MAAa,IAAI;
|
|
1
|
+
{"version":3,"file":"method.js","sourceRoot":"","sources":["../../../../packages/schematics/src/models/method.ts"],"names":[],"mappings":";;;AAAA,oCAA6D;AAC7D,wCAAsD;AACtD,8CAAmE;AAInE,4CAA0D;AAC1D,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE5C,MAAa,MAAM;IAIjB,YAAY,OAAsB;QAChC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC;CACF;AAPD,wBAOC;AAID,MAAa,SAAS;IAOpB,YAAY,OAAyB;QANrC,aAAQ,GAAG,EAAE,CAAC;QACd,aAAQ,GAAG,uBAAe,CAAC,MAAM,CAAC;QAElC,eAAU,GAAe,EAAE,CAAC;QAC5B,eAAU,GAAG,EAAE,CAAC;QAGd,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC;CACF;AAVD,8BAUC;AAOD,MAAa,IAAI;IAqCf,YAAY,OAAoB;QAlChC,WAAM,GAAa,EAAE,CAAC;QAEtB,gBAAW,GAAG,KAAK,CAAC;QAIpB,4BAAuB,GAAG,CAAC,KAAsB,EAAE,EAAE;YACnD,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;YAChF,MAAM,SAAS,GAAG,IAAA,YAAK,EAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,SAAS,GAAG,QAAQ,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YACnE,IAAI,KAAK,GAAG,IAAA,qBAAc,EAAC,YAAY,CAAC,CAAC;YACzC,IAAI,cAAc,EAAE;gBAClB,KAAK,GAAG,IAAA,2BAAiB,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;aACtD;YAED,QAAQ,eAAe,EAAE;gBACvB,KAAK,wBAAgB,CAAC,KAAK,CAAC;gBAC5B,KAAK,wBAAgB,CAAC,KAAK;oBACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAA,sBAAY,EAAC,SAAS,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;oBACvF,MAAM;gBACR,KAAK,wBAAgB,CAAC,QAAQ,CAAC;gBAC/B,KAAK,wBAAgB,CAAC,IAAI;oBACxB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;oBAClB,MAAM;gBACR,KAAK,wBAAgB,CAAC,IAAI;oBACxB,gDAAgD;oBAChD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,SAAS,GAAG,GAAG,GAAG,SAAS,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC;oBACtF,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,GAAG,KAAK,GAAG,GAAG,CAAC,CAAC;oBACvD,MAAM;gBACR;oBACE,MAAM;aACT;QACH,CAAC,CAAC;QAGA,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED,YAAY;QACV,OAAO,sCAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACpF,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC;IACxE,CAAC;CACF;AAjDD,oBAiDC"}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abp/ng.schematics",
|
|
3
|
-
"version": "7.2.
|
|
4
|
-
"
|
|
5
|
-
"
|
|
6
|
-
"
|
|
7
|
-
|
|
3
|
+
"version": "7.2.3",
|
|
4
|
+
"homepage": "https://abp.io",
|
|
5
|
+
"repository": {
|
|
6
|
+
"type": "git",
|
|
7
|
+
"url": "https://github.com/abpframework/abp.git"
|
|
8
|
+
},
|
|
8
9
|
"author": "",
|
|
9
|
-
"license": "MIT",
|
|
10
10
|
"schematics": "./collection.json",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@angular-devkit/core": "~15.0.1",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"got": "^11.5.2",
|
|
16
16
|
"jsonc-parser": "^2.3.0",
|
|
17
17
|
"should-quote": "^1.0.0",
|
|
18
|
-
"typescript": "4.8.4"
|
|
18
|
+
"typescript": "~4.8.4"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"@schematics/angular": "~14.2.1",
|
|
@@ -26,5 +26,19 @@
|
|
|
26
26
|
},
|
|
27
27
|
"publishConfig": {
|
|
28
28
|
"access": "public"
|
|
29
|
-
}
|
|
29
|
+
},
|
|
30
|
+
"license": "LGPL-3.0",
|
|
31
|
+
"keywords": [
|
|
32
|
+
"aspnetcore",
|
|
33
|
+
"boilerplate",
|
|
34
|
+
"framework",
|
|
35
|
+
"web",
|
|
36
|
+
"best-practices",
|
|
37
|
+
"angular",
|
|
38
|
+
"maui",
|
|
39
|
+
"blazor",
|
|
40
|
+
"mvc",
|
|
41
|
+
"csharp",
|
|
42
|
+
"webapp"
|
|
43
|
+
]
|
|
30
44
|
}
|
package/utils/generics.d.ts
CHANGED
|
@@ -16,9 +16,11 @@ export declare function generateRefWithPlaceholders(sourceType: string): string;
|
|
|
16
16
|
export declare function extractSimpleGenerics(sourceType: string): {
|
|
17
17
|
identifier: string;
|
|
18
18
|
generics: string[];
|
|
19
|
+
array: string;
|
|
19
20
|
};
|
|
20
21
|
export declare function extractGenerics(sourceType: string): {
|
|
21
22
|
identifier: string;
|
|
22
23
|
generics: string[];
|
|
24
|
+
array: string;
|
|
23
25
|
};
|
|
24
26
|
export declare function replacePlaceholdersWithGenerics(type: string, generics: string[], genericsCollector: GenericsCollector): string;
|
package/utils/generics.js
CHANGED
|
@@ -59,19 +59,22 @@ function generateRefWithPlaceholders(sourceType) {
|
|
|
59
59
|
}
|
|
60
60
|
exports.generateRefWithPlaceholders = generateRefWithPlaceholders;
|
|
61
61
|
function extractSimpleGenerics(sourceType) {
|
|
62
|
-
const { identifier, generics } = extractGenerics(sourceType);
|
|
62
|
+
const { identifier, generics, array } = extractGenerics(sourceType);
|
|
63
63
|
return {
|
|
64
64
|
identifier: getLastSegment(identifier),
|
|
65
65
|
generics: generics.map(getLastSegment),
|
|
66
|
+
array
|
|
66
67
|
};
|
|
67
68
|
}
|
|
68
69
|
exports.extractSimpleGenerics = extractSimpleGenerics;
|
|
69
70
|
function extractGenerics(sourceType) {
|
|
71
|
+
const isArray = /\[\]$/.test(sourceType);
|
|
70
72
|
const regex = /(?<identifier>[^<]+)(<(?<generics>.+)>)?/g;
|
|
71
73
|
const { identifier = '', generics = '' } = regex.exec(sourceType)?.groups ?? {};
|
|
72
74
|
return {
|
|
73
75
|
identifier,
|
|
74
76
|
generics: generics.split(/,\s*/).filter(Boolean),
|
|
77
|
+
array: isArray ? '[]' : ''
|
|
75
78
|
};
|
|
76
79
|
}
|
|
77
80
|
exports.extractGenerics = extractGenerics;
|
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/methods.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"methods.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/methods.ts"],"names":[],"mappings":";;;AAAA,iCAA+B;
|
|
1
|
+
{"version":3,"file":"methods.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/methods.ts"],"names":[],"mappings":";;;AAAA,iCAA+B;AAE/B,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;AAE1D,kEAAkE;AAC3D,MAAM,iBAAiB,GAAG,CAAC,SAAiB,EAAE,cAAsB,EAAE,EAAE;IAC7E,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC3B,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAA,YAAK,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvF,OAAO,GAAG,cAAc,GAAG,KAAK,EAAE,CAAC;KACpC;IACD,IAAI,WAAW,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO,GAAG,cAAc,KAAK,SAAS,IAAI,CAAC;KAC5C;IACD,OAAO,GAAG,cAAc,IAAI,SAAS,EAAE,CAAC;AAC1C,CAAC,CAAC;AAVW,QAAA,iBAAiB,qBAU5B"}
|
package/utils/rule.js
CHANGED
|
@@ -15,6 +15,9 @@ exports.applyWithOverwrite = applyWithOverwrite;
|
|
|
15
15
|
function mergeAndAllowDelete(host, rule) {
|
|
16
16
|
return async (tree, context) => {
|
|
17
17
|
const nextTree = await (0, schematics_1.callRule)(rule, tree, context).toPromise();
|
|
18
|
+
if (!nextTree) {
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
18
21
|
host.merge(nextTree, schematics_1.MergeStrategy.AllowDeleteConflict);
|
|
19
22
|
};
|
|
20
23
|
}
|
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,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;
|
|
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,IAAG,CAAC,QAAQ,EAAC;YACX,OAAO;SACR;QACD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,0BAAa,CAAC,mBAAmB,CAAC,CAAC;IAC1D,CAAC,CAAC;AACJ,CAAC;AARD,kDAQC;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.d.ts
CHANGED
|
@@ -4,3 +4,5 @@ export declare function createControllerToServiceMapper({ solution, types, apiNa
|
|
|
4
4
|
export declare function createActionToMethodMapper(): (action: Action) => Method;
|
|
5
5
|
export declare function createActionToBodyMapper(): ({ httpMethod, parameters, returnValue, url }: Action) => Body;
|
|
6
6
|
export declare function createActionToSignatureMapper(): (action: Action) => Signature;
|
|
7
|
+
export declare function isRemoteStreamContent(type: string): boolean;
|
|
8
|
+
export declare function isRemoteStreamContentArray(type: string): boolean;
|
package/utils/service.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createActionToSignatureMapper = exports.createActionToBodyMapper = exports.createActionToMethodMapper = exports.createControllerToServiceMapper = exports.serializeParameters = void 0;
|
|
3
|
+
exports.isRemoteStreamContentArray = exports.isRemoteStreamContent = exports.createActionToSignatureMapper = exports.createActionToBodyMapper = exports.createActionToMethodMapper = exports.createControllerToServiceMapper = exports.serializeParameters = void 0;
|
|
4
4
|
const models_1 = require("../models");
|
|
5
5
|
const import_1 = require("./import");
|
|
6
6
|
const namespace_1 = require("./namespace");
|
|
@@ -32,7 +32,9 @@ function createControllerToServiceMapper({ solution, types, apiName, }) {
|
|
|
32
32
|
exports.createControllerToServiceMapper = createControllerToServiceMapper;
|
|
33
33
|
function getTypesWithoutIRemoteStreamContent(types) {
|
|
34
34
|
const newType = { ...types };
|
|
35
|
-
|
|
35
|
+
constants_1.VOLO_REMOTE_STREAM_CONTENT.forEach(fileType => {
|
|
36
|
+
delete newType[fileType];
|
|
37
|
+
});
|
|
36
38
|
return newType;
|
|
37
39
|
}
|
|
38
40
|
function sortMethods(methods) {
|
|
@@ -71,6 +73,11 @@ function createActionToSignatureMapper() {
|
|
|
71
73
|
...(versionParameter ? [versionParameter] : []),
|
|
72
74
|
];
|
|
73
75
|
signature.parameters = parameters.map(p => {
|
|
76
|
+
const isFormData = isRemoteStreamContent(p.type);
|
|
77
|
+
const isFormArray = isRemoteStreamContentArray(p.type);
|
|
78
|
+
if (isFormData || isFormArray) {
|
|
79
|
+
return new models_1.Property({ name: p.name, type: 'FormData' });
|
|
80
|
+
}
|
|
74
81
|
const type = adaptType(p.typeSimple);
|
|
75
82
|
const parameter = new models_1.Property({ name: p.name, type });
|
|
76
83
|
parameter.setDefault(p.defaultValue);
|
|
@@ -82,6 +89,14 @@ function createActionToSignatureMapper() {
|
|
|
82
89
|
};
|
|
83
90
|
}
|
|
84
91
|
exports.createActionToSignatureMapper = createActionToSignatureMapper;
|
|
92
|
+
function isRemoteStreamContent(type) {
|
|
93
|
+
return constants_1.VOLO_REMOTE_STREAM_CONTENT.some(x => x === type);
|
|
94
|
+
}
|
|
95
|
+
exports.isRemoteStreamContent = isRemoteStreamContent;
|
|
96
|
+
function isRemoteStreamContentArray(type) {
|
|
97
|
+
return constants_1.VOLO_REMOTE_STREAM_CONTENT.map(x => `${x}[]`).some(x => x === type);
|
|
98
|
+
}
|
|
99
|
+
exports.isRemoteStreamContentArray = isRemoteStreamContentArray;
|
|
85
100
|
function getMethodNameFromAction(action) {
|
|
86
101
|
return action.uniqueName.split('Async')[0];
|
|
87
102
|
}
|
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,4CAA0D;AAE1D,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,IAAA,0BAAc,EAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,+BAA+B,GAAG,mCAAmC,CAAC,KAAK,CAAC,CAAC;QACnF,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAC5B,4BAA4B,CAAC,QAAQ,EAAE,+BAA+B,EAAE,SAAS,CAAC,EAClF,EAAE,CACH,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,IAAI,eAAM,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QACxF,OAAO,CAAC,IAAI,CAAC,IAAI,eAAM,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;QAChF,IAAA,oBAAW,EAAC,OAAO,CAAC,CAAC;QACrB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC/C,WAAW,CAAC,OAAO,CAAC,CAAC;QACrB,OAAO,IAAI,gBAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IACrE,CAAC,CAAC;AACJ,CAAC;AAvBD,0EAuBC;AAED,SAAS,mCAAmC,CAAC,KAA2B;IACtE,MAAM,OAAO,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;IAC7B,OAAO,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/service.ts"],"names":[],"mappings":"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"}
|
package/utils/type.js
CHANGED
|
@@ -12,8 +12,8 @@ function createTypeSimplifier() {
|
|
|
12
12
|
const parseType = createTypeParser(t => {
|
|
13
13
|
let type = t.replace(/(?<![^<, ])System\.([0-9A-Za-z.]+)/g, (_, match) => constants_1.SYSTEM_TYPES.get(match) ?? 'any');
|
|
14
14
|
type = /any</.test(type) ? 'any' : type;
|
|
15
|
-
const { identifier, generics } = (0, generics_1.extractSimpleGenerics)(type);
|
|
16
|
-
return generics.length ? `${identifier}<${generics.join(', ')}
|
|
15
|
+
const { identifier, generics, array } = (0, generics_1.extractSimpleGenerics)(type);
|
|
16
|
+
return generics.length ? `${identifier}<${generics.join(', ')}>${array}` : identifier;
|
|
17
17
|
});
|
|
18
18
|
return (type) => {
|
|
19
19
|
const parsed = parseType(type);
|
package/utils/type.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/type.ts"],"names":[],"mappings":";;;AAAA,4CAAwD;AACxD,oCAA0C;AAC1C,sCAAiD;AACjD,yCAAmD;AACnD,2CAA6C;AAC7C,iCAAiE;AACjE,iCAAuC;AAEvC,SAAgB,oBAAoB;IAClC,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE;QACrC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,CAClB,qCAAqC,EACrC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,wBAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,CAC/C,CAAC;QAEF,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/type.ts"],"names":[],"mappings":"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"}
|