@abp/ng.schematics 8.2.0-rc.1 → 8.2.0-rc.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/commands/api/index.js +10 -5
- package/commands/api/index.js.map +1 -1
- package/package.json +1 -1
- package/utils/model.js +7 -4
- package/utils/model.js.map +1 -1
- package/utils/type.js +14 -7
- package/utils/type.js.map +1 -1
package/commands/api/index.js
CHANGED
|
@@ -22,11 +22,13 @@ function default_1(schema) {
|
|
|
22
22
|
const types = data.types;
|
|
23
23
|
const modules = data.modules;
|
|
24
24
|
const serviceType = schema.serviceType || enums_1.defaultEServiceType;
|
|
25
|
-
if (!types || !modules)
|
|
25
|
+
if (!types || !modules) {
|
|
26
26
|
throw new schematics_1.SchematicsException("[Invalid API Definition] The provided API definition is invalid." /* Exception.InvalidApiDefinition */);
|
|
27
|
+
}
|
|
27
28
|
const definition = data.modules[moduleName];
|
|
28
|
-
if (!definition)
|
|
29
|
+
if (!definition) {
|
|
29
30
|
throw new schematics_1.SchematicsException((0, utils_1.interpolate)("[Invalid Module] Backend module \"{0}\" does not exist in API definition." /* Exception.InvalidModule */, moduleName));
|
|
31
|
+
}
|
|
30
32
|
const apiName = definition.remoteServiceName;
|
|
31
33
|
data.modules[moduleName].controllers = (0, utils_1.sanitizeControllerTypeNames)(definition.controllers);
|
|
32
34
|
const controllers = filterControllersByServiceType(serviceType, data.modules[moduleName].controllers);
|
|
@@ -54,8 +56,9 @@ function default_1(schema) {
|
|
|
54
56
|
serviceImports,
|
|
55
57
|
modelImports,
|
|
56
58
|
});
|
|
57
|
-
if (!data.generated.includes(moduleName))
|
|
59
|
+
if (!data.generated.includes(moduleName)) {
|
|
58
60
|
data.generated.push(moduleName);
|
|
61
|
+
}
|
|
59
62
|
data.generated.sort();
|
|
60
63
|
const json = (0, utils_1.generateProxyConfigJson)(data);
|
|
61
64
|
const overwriteProxyConfig = createProxyConfigWriter('overwrite', json);
|
|
@@ -88,10 +91,12 @@ function createModelGenerator(params) {
|
|
|
88
91
|
const reduceImportRefsToModels = (0, utils_1.createImportRefsToModelReducer)(params);
|
|
89
92
|
const models = Object.values(serviceImports).reduce(reduceImportRefsToModels, []);
|
|
90
93
|
models.forEach(({ imports }) => imports.forEach(({ refs, path }) => refs.forEach(ref => {
|
|
91
|
-
if (path === '@abp/ng.core')
|
|
94
|
+
if (path === '@abp/ng.core') {
|
|
92
95
|
return;
|
|
93
|
-
|
|
96
|
+
}
|
|
97
|
+
if (!modelImports[path]) {
|
|
94
98
|
return (modelImports[path] = [ref]);
|
|
99
|
+
}
|
|
95
100
|
modelImports[path] = [...new Set([...modelImports[path], ref])];
|
|
96
101
|
})));
|
|
97
102
|
return (0, schematics_1.chain)(models.map(model => (0, utils_1.applyWithOverwrite)((0, schematics_1.url)('./files-model'), [
|
|
@@ -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,uCAmBqB;AACrB,0CAA0C;AAE1C,mBAAyB,MAA2B;IAClD,MAAM,MAAM,GAAG,IAAA,iCAAyB,EAAC,MAAM,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC;IAE1C,OAAO,IAAA,kBAAK,EAAC;QACX,KAAK,EAAE,IAAU,EAAE,EAAE;YACnB,MAAM,gBAAgB,GAAG,IAAA,iCAAyB,EAAC,MAAM,CAAC,CAAC;YAC3D,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAE9C,oEAAoE;YACpE,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAc,EAAC,IAAI,EAAE,MAAM,CAAC,MAAO,CAAC,CAAC;YAC1D,MAAM,UAAU,GAAG,IAAA,uBAAe,EAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YACzE,MAAM,eAAe,GAAG,IAAA,+BAAuB,EAAC,UAAU,CAAC,CAAC;YAC5D,MAAM,uBAAuB,GAAG,IAAA,sCAA8B,EAAC,UAAU,CAAC,CAAC;YAC3E,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;YACnC,IAAI,CAAC,KAAK,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/commands/api/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/utils/model.js
CHANGED
|
@@ -58,12 +58,15 @@ function createImportRefsToModelReducer(params) {
|
|
|
58
58
|
[..._interface.properties, ..._interface.generics].forEach(prop => {
|
|
59
59
|
prop.refs.forEach(ref => {
|
|
60
60
|
const propType = types[ref];
|
|
61
|
-
if (!propType)
|
|
61
|
+
if (!propType) {
|
|
62
62
|
return;
|
|
63
|
-
|
|
63
|
+
}
|
|
64
|
+
if (propType.isEnum) {
|
|
64
65
|
toBeImported.push({ type: ref, isEnum: true });
|
|
65
|
-
|
|
66
|
+
}
|
|
67
|
+
if ((0, namespace_1.parseNamespace)(solution, ref) !== model.namespace) {
|
|
66
68
|
toBeImported.push({ type: ref, isEnum: false });
|
|
69
|
+
}
|
|
67
70
|
});
|
|
68
71
|
});
|
|
69
72
|
});
|
|
@@ -139,7 +142,7 @@ function createRefToImportReducerCreator(params) {
|
|
|
139
142
|
}
|
|
140
143
|
exports.createRefToImportReducerCreator = createRefToImportReducerCreator;
|
|
141
144
|
function isOptionalProperty(prop) {
|
|
142
|
-
return
|
|
145
|
+
return prop.typeSimple.endsWith('?') || (prop.typeSimple === 'string' && !prop.isRequired);
|
|
143
146
|
}
|
|
144
147
|
function parseBaseTypeWithGenericTypes(type) {
|
|
145
148
|
const parsedTypeNode = (0, tree_1.parseGenerics)(type);
|
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,iCAAiD;AACjD,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,IAAA,0BAAmB,EAAC,SAAS,EAAE,SAAS,CAAC;iBAChD,CAAC,CACH,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACrB,MAAM,YAAY,GAAmB,EAAE,CAAC;YAExC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBACpC,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAE3C,IAAI,QAAQ,IAAI,IAAA,0BAAc,EAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,KAAK,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/model.ts"],"names":[],"mappings":"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"}
|
package/utils/type.js
CHANGED
|
@@ -58,11 +58,16 @@ function createTypesToImportsReducer(solution, namespace) {
|
|
|
58
58
|
return (imports, types) => {
|
|
59
59
|
types.forEach(({ type, isEnum }) => {
|
|
60
60
|
const newImport = mapTypeToImport(type, isEnum);
|
|
61
|
-
if (!newImport)
|
|
61
|
+
if (!newImport) {
|
|
62
62
|
return;
|
|
63
|
+
}
|
|
64
|
+
if (newImport.specifiers.some(f => f.toLocaleLowerCase() === type.toLocaleLowerCase())) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
63
67
|
const existingImport = imports.find(({ keyword, path }) => keyword === newImport.keyword && path === newImport.path);
|
|
64
|
-
if (!existingImport)
|
|
68
|
+
if (!existingImport) {
|
|
65
69
|
return imports.push(newImport);
|
|
70
|
+
}
|
|
66
71
|
existingImport.refs = [...new Set([...existingImport.refs, ...newImport.refs])];
|
|
67
72
|
existingImport.specifiers = [
|
|
68
73
|
...new Set([...existingImport.specifiers, ...newImport.specifiers]),
|
|
@@ -81,11 +86,13 @@ function createTypeToImportMapper(solution, namespace) {
|
|
|
81
86
|
const modelNamespace = (0, namespace_1.parseNamespace)(solution, type);
|
|
82
87
|
const refs = [removeTypeModifiers(type)];
|
|
83
88
|
const specifiers = [adaptType(simplifyType(refs[0]).split('<')[0])];
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
+
let path = (0, path_1.relativePathToModel)(namespace, modelNamespace);
|
|
90
|
+
if (constants_1.VOLO_REGEX.test(type)) {
|
|
91
|
+
path = '@abp/ng.core';
|
|
92
|
+
}
|
|
93
|
+
if (isEnum) {
|
|
94
|
+
path = (0, path_1.relativePathToEnum)(namespace, modelNamespace, specifiers[0]);
|
|
95
|
+
}
|
|
89
96
|
return new models_1.Import({ keyword: enums_1.eImportKeyword.Type, path, refs, specifiers });
|
|
90
97
|
};
|
|
91
98
|
}
|
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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"}
|