@abp/ng.schematics 8.2.0-rc.4 → 8.2.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/commands/api/index.js +2 -0
- package/commands/api/index.js.map +1 -1
- package/constants/volo.d.ts +3 -0
- package/constants/volo.js +29 -1
- package/constants/volo.js.map +1 -1
- package/package.json +1 -1
- package/utils/generics.js +2 -2
- package/utils/generics.js.map +1 -1
- package/utils/model.d.ts +4 -2
- package/utils/model.js +57 -3
- package/utils/model.js.map +1 -1
package/commands/api/index.js
CHANGED
|
@@ -19,6 +19,7 @@ function default_1(schema) {
|
|
|
19
19
|
const createProxyConfigWriter = (0, utils_1.createProxyConfigWriterCreator)(targetPath);
|
|
20
20
|
const data = readProxyConfig(tree);
|
|
21
21
|
data.types = (0, utils_1.sanitizeTypeNames)(data.types);
|
|
22
|
+
(0, utils_1.resolveSelfGenericProps)({ solution, types: data.types });
|
|
22
23
|
const types = data.types;
|
|
23
24
|
const modules = data.modules;
|
|
24
25
|
const serviceType = schema.serviceType || enums_1.defaultEServiceType;
|
|
@@ -99,6 +100,7 @@ function createModelGenerator(params) {
|
|
|
99
100
|
}
|
|
100
101
|
modelImports[path] = [...new Set([...modelImports[path], ref])];
|
|
101
102
|
})));
|
|
103
|
+
(0, utils_1.resolveAbpPackages)(models);
|
|
102
104
|
return (0, schematics_1.chain)(models.map(model => (0, utils_1.applyWithOverwrite)((0, schematics_1.url)('./files-model'), [
|
|
103
105
|
(0, schematics_1.applyTemplates)({
|
|
104
106
|
...cases,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/commands/api/index.ts"],"names":[],"mappings":";;AAAA,+CAAiD;AACjD,2DAQoC;AACpC,uCAA2E;AAE3E,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/commands/api/index.ts"],"names":[],"mappings":"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"}
|
package/constants/volo.d.ts
CHANGED
|
@@ -1,2 +1,5 @@
|
|
|
1
1
|
export declare const VOLO_REGEX: RegExp;
|
|
2
2
|
export declare const VOLO_REMOTE_STREAM_CONTENT: string[];
|
|
3
|
+
export declare const SAAS_NAMESPACE = "Volo.Saas";
|
|
4
|
+
export declare const TENANT_KEY = "tenant";
|
|
5
|
+
export declare const VOLO_PACKAGE_PROXY_IMPORTS: Map<string, string>;
|
package/constants/volo.js
CHANGED
|
@@ -1,9 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.VOLO_REMOTE_STREAM_CONTENT = exports.VOLO_REGEX = void 0;
|
|
3
|
+
exports.VOLO_PACKAGE_PROXY_IMPORTS = exports.TENANT_KEY = exports.SAAS_NAMESPACE = exports.VOLO_REMOTE_STREAM_CONTENT = exports.VOLO_REGEX = void 0;
|
|
4
4
|
exports.VOLO_REGEX = /^Volo\.Abp\.(Application\.Dtos|ObjectExtending)/;
|
|
5
5
|
exports.VOLO_REMOTE_STREAM_CONTENT = [
|
|
6
6
|
'Volo.Abp.Content.IRemoteStreamContent',
|
|
7
7
|
'Volo.Abp.Content.RemoteStreamContent',
|
|
8
8
|
];
|
|
9
|
+
exports.SAAS_NAMESPACE = 'Volo.Saas';
|
|
10
|
+
exports.TENANT_KEY = 'tenant';
|
|
11
|
+
exports.VOLO_PACKAGE_PROXY_IMPORTS = new Map([
|
|
12
|
+
['Volo.Abp.Identity.IdentityUserDto', '@volo/abp.ng.identity/proxy'],
|
|
13
|
+
['Volo.Abp.Identity.IdentityRoleDto', '@volo/abp.ng.identity/proxy'],
|
|
14
|
+
['Volo.Abp.FileManagement.FileDescriptorDto', '@volo/abp.ng.file-management/proxy'],
|
|
15
|
+
['Volo.Abp.FileManagement.DirectoryContentDto', '@volo/abp.ng.file-management/proxy'],
|
|
16
|
+
['Volo.Abp.AuditLogging.AuditLogDto', '@volo/abp.ng.audit-logging/proxy'],
|
|
17
|
+
['Volo.Abp.AuditLogging.AuditLogActionDto', '@volo/abp.ng.audit-logging/proxy'],
|
|
18
|
+
['Volo.Abp.AuditLogging.EntityChangeDto', '@volo/abp.ng.audit-logging/proxy'],
|
|
19
|
+
['Volo.Abp.AuditLogging.EntityPropertyChangeDto', '@volo/abp.ng.audit-logging/proxy'],
|
|
20
|
+
['Volo.Chat.Messages', '@volo/abp.ng.chat/proxy'],
|
|
21
|
+
['Volo.Chat.ChatMessageDto', '@volo/abp.ng.chat/proxy'],
|
|
22
|
+
['Volo.Chat.ChatConversationDto', '@volo/abp.ng.chat/proxy'],
|
|
23
|
+
['Volo.Abp.Gdpr.GdprRequestDto', '@volo/abp.ng.gdpr/proxy'],
|
|
24
|
+
['Volo.Saas.Tenants.TenantDto', '@volo/abp.ng.saas/proxy'],
|
|
25
|
+
//TenantConnectionStringDto it must end with Strings.
|
|
26
|
+
['Volo.Saas.Tenants.TenantConnectionStringDto', '@volo/abp.ng.saas/proxy'],
|
|
27
|
+
['Volo.Saas.Editions.EditionDto', '@volo/abp.ng.saas/proxy'],
|
|
28
|
+
[
|
|
29
|
+
'Volo.Abp.TextTemplateManagement.TextTemplates.TextTemplateContentDto',
|
|
30
|
+
'@volo/abp.ng.saas/proxy',
|
|
31
|
+
],
|
|
32
|
+
[
|
|
33
|
+
'Volo.Abp.TextTemplateManagement.TextTemplates.TemplateDefinitionDto',
|
|
34
|
+
'@volo/abp.ng.saas/proxy',
|
|
35
|
+
],
|
|
36
|
+
]);
|
|
9
37
|
//# 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;IACxC,uCAAuC;IACvC,sCAAsC;CACvC,CAAC"}
|
|
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;AAEW,QAAA,cAAc,GAAG,WAAW,CAAC;AAC7B,QAAA,UAAU,GAAG,QAAQ,CAAC;AAEtB,QAAA,0BAA0B,GAAG,IAAI,GAAG,CAAiB;IAChE,CAAC,mCAAmC,EAAE,6BAA6B,CAAC;IACpE,CAAC,mCAAmC,EAAE,6BAA6B,CAAC;IACpE,CAAC,2CAA2C,EAAE,oCAAoC,CAAC;IACnF,CAAC,6CAA6C,EAAE,oCAAoC,CAAC;IACrF,CAAC,mCAAmC,EAAE,kCAAkC,CAAC;IACzE,CAAC,yCAAyC,EAAE,kCAAkC,CAAC;IAC/E,CAAC,uCAAuC,EAAE,kCAAkC,CAAC;IAC7E,CAAC,+CAA+C,EAAE,kCAAkC,CAAC;IACrF,CAAC,oBAAoB,EAAE,yBAAyB,CAAC;IACjD,CAAC,0BAA0B,EAAE,yBAAyB,CAAC;IACvD,CAAC,+BAA+B,EAAE,yBAAyB,CAAC;IAC5D,CAAC,8BAA8B,EAAE,yBAAyB,CAAC;IAC3D,CAAC,6BAA6B,EAAE,yBAAyB,CAAC;IAC1D,qDAAqD;IACrD,CAAC,6CAA6C,EAAE,yBAAyB,CAAC;IAC1E,CAAC,+BAA+B,EAAE,yBAAyB,CAAC;IAC5D;QACE,sEAAsE;QACtE,yBAAyB;KAC1B;IACD;QACE,qEAAqE;QACrE,yBAAyB;KAC1B;CACF,CAAC,CAAC"}
|
package/package.json
CHANGED
package/utils/generics.js
CHANGED
|
@@ -63,7 +63,7 @@ function extractSimpleGenerics(sourceType) {
|
|
|
63
63
|
return {
|
|
64
64
|
identifier: getLastSegment(identifier),
|
|
65
65
|
generics: generics.map(getLastSegment),
|
|
66
|
-
array
|
|
66
|
+
array,
|
|
67
67
|
};
|
|
68
68
|
}
|
|
69
69
|
exports.extractSimpleGenerics = extractSimpleGenerics;
|
|
@@ -74,7 +74,7 @@ function extractGenerics(sourceType) {
|
|
|
74
74
|
return {
|
|
75
75
|
identifier,
|
|
76
76
|
generics: generics.split(/,\s*/).filter(Boolean),
|
|
77
|
-
array: isArray ? '[]' : ''
|
|
77
|
+
array: isArray ? '[]' : '',
|
|
78
78
|
};
|
|
79
79
|
}
|
|
80
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/model.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Interface, Model, Type, TypeWithEnum } from '../models';
|
|
1
|
+
import { Import, Interface, Model, Type, TypeWithEnum } from '../models';
|
|
2
2
|
export interface ModelGeneratorParams {
|
|
3
3
|
targetPath: string;
|
|
4
4
|
solution: string;
|
|
@@ -8,5 +8,7 @@ export interface ModelGeneratorParams {
|
|
|
8
8
|
}
|
|
9
9
|
export declare function createImportRefsToModelReducer(params: ModelGeneratorParams): (models: Model[], importRefs: string[]) => Model[];
|
|
10
10
|
export declare function createImportRefToInterfaceReducerCreator(params: ModelGeneratorParams): (interfaces: Interface[], ref: string) => Interface[];
|
|
11
|
-
export declare function createRefToImportReducerCreator(params: ModelGeneratorParams): (namespace: string) => (imports:
|
|
11
|
+
export declare function createRefToImportReducerCreator(params: ModelGeneratorParams): (namespace: string) => (imports: Import[], types: TypeWithEnum[]) => Import[];
|
|
12
12
|
export declare function parseBaseTypeWithGenericTypes(type: string): string[];
|
|
13
|
+
export declare function resolveAbpPackages(models: Model[]): void;
|
|
14
|
+
export declare function resolveSelfGenericProps(params: Partial<ModelGeneratorParams>): void;
|
package/utils/model.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseBaseTypeWithGenericTypes = exports.createRefToImportReducerCreator = exports.createImportRefToInterfaceReducerCreator = exports.createImportRefsToModelReducer = void 0;
|
|
4
|
-
const constants_1 = require("../constants");
|
|
3
|
+
exports.resolveSelfGenericProps = exports.resolveAbpPackages = exports.parseBaseTypeWithGenericTypes = exports.createRefToImportReducerCreator = exports.createImportRefToInterfaceReducerCreator = exports.createImportRefsToModelReducer = void 0;
|
|
5
4
|
const models_1 = require("../models");
|
|
6
5
|
const generics_1 = require("./generics");
|
|
7
6
|
const namespace_1 = require("./namespace");
|
|
@@ -9,6 +8,7 @@ const path_1 = require("./path");
|
|
|
9
8
|
const text_1 = require("./text");
|
|
10
9
|
const tree_1 = require("./tree");
|
|
11
10
|
const type_1 = require("./type");
|
|
11
|
+
const constants_1 = require("../constants");
|
|
12
12
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
13
13
|
const shouldQuote = require('should-quote');
|
|
14
14
|
function createImportRefsToModelReducer(params) {
|
|
@@ -20,7 +20,7 @@ function createImportRefsToModelReducer(params) {
|
|
|
20
20
|
const interfaces = importRefs.reduce(reduceImportRefsToInterfaces, []);
|
|
21
21
|
sortInterfaces(interfaces);
|
|
22
22
|
interfaces.forEach(_interface => {
|
|
23
|
-
if (constants_1.VOLO_REGEX.test(_interface.ref))
|
|
23
|
+
if (constants_1.VOLO_REGEX.test(_interface.ref) || constants_1.VOLO_PACKAGE_PROXY_IMPORTS.has(_interface.ref))
|
|
24
24
|
return;
|
|
25
25
|
if (types[_interface.ref].isEnum) {
|
|
26
26
|
if (!enums.includes(_interface.ref))
|
|
@@ -158,4 +158,58 @@ function parseBaseTypeWithGenericTypes(type) {
|
|
|
158
158
|
return nodeToText(parsedTypeNode);
|
|
159
159
|
}
|
|
160
160
|
exports.parseBaseTypeWithGenericTypes = parseBaseTypeWithGenericTypes;
|
|
161
|
+
function resolveAbpPackages(models) {
|
|
162
|
+
for (const model of models) {
|
|
163
|
+
renamePropForTenant(model.interfaces);
|
|
164
|
+
model.imports.forEach((imp, i) => {
|
|
165
|
+
fixImportNameForTenant(imp);
|
|
166
|
+
for (const ref of imp.refs) {
|
|
167
|
+
const path = constants_1.VOLO_PACKAGE_PROXY_IMPORTS.get(ref);
|
|
168
|
+
if (path) {
|
|
169
|
+
model.imports[i] = new models_1.Import({ ...imp, path });
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
exports.resolveAbpPackages = resolveAbpPackages;
|
|
176
|
+
function renamePropForTenant(interfaces) {
|
|
177
|
+
for (const inters of interfaces) {
|
|
178
|
+
for (const prop of inters.properties) {
|
|
179
|
+
const isTenant = prop.name.toLocaleLowerCase().includes(constants_1.TENANT_KEY);
|
|
180
|
+
const isSaasDto = prop.refs.filter(f => f.startsWith(constants_1.SAAS_NAMESPACE)).length > 0;
|
|
181
|
+
if (isTenant && isSaasDto) {
|
|
182
|
+
prop.type = 'Saas' + prop.type;
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
function fixImportNameForTenant(imp) {
|
|
188
|
+
imp.specifiers.forEach((spe, index) => {
|
|
189
|
+
const isTenant = spe.toLocaleLowerCase().includes(constants_1.TENANT_KEY);
|
|
190
|
+
if (isTenant) {
|
|
191
|
+
imp.specifiers[index] = 'Saas' + spe;
|
|
192
|
+
}
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
function resolveSelfGenericProps(params) {
|
|
196
|
+
const { types, solution } = params;
|
|
197
|
+
if (!types || !solution) {
|
|
198
|
+
return;
|
|
199
|
+
}
|
|
200
|
+
Object.keys(types)
|
|
201
|
+
.filter(f => f.startsWith(solution))
|
|
202
|
+
.forEach(key => {
|
|
203
|
+
const type = types[key];
|
|
204
|
+
if (type.genericArguments?.length) {
|
|
205
|
+
type.properties?.map(prop => {
|
|
206
|
+
if (prop.type.includes('<>')) {
|
|
207
|
+
prop.type = prop.type.replace('<>', `<${type.genericArguments.join(', ')}>`);
|
|
208
|
+
prop.typeSimple = prop.typeSimple.replace('<>', `<${type.genericArguments.join(', ')}>`);
|
|
209
|
+
}
|
|
210
|
+
});
|
|
211
|
+
}
|
|
212
|
+
});
|
|
213
|
+
}
|
|
214
|
+
exports.resolveSelfGenericProps = resolveSelfGenericProps;
|
|
161
215
|
//# sourceMappingURL=model.js.map
|
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,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/model.ts"],"names":[],"mappings":"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"}
|