@abp/ng.schematics 9.3.4 → 10.0.0-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template +7 -4
- package/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template +1 -1
- package/commands/create-lib/files-package-standalone/__libraryName@kebab__/tsconfig.lib.json.template +1 -1
- package/models/method.d.ts +1 -0
- package/models/method.js +4 -0
- package/models/method.js.map +1 -1
- package/package.json +1 -1
- package/test-setup.js +0 -6
- package/test-setup.js.map +1 -1
- package/utils/methods.d.ts +1 -0
- package/utils/methods.js +6 -3
- package/utils/methods.js.map +1 -1
- package/utils/service.js +1 -1
- package/utils/service.js.map +1 -1
package/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template
CHANGED
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
providedIn: 'root',
|
|
6
6
|
})
|
|
7
7
|
export class <%= name %>Service {
|
|
8
|
+
private restService = inject(RestService);
|
|
8
9
|
apiName = '<%= apiName %>';<%
|
|
9
10
|
for (let {body, signature} of methods) { %>
|
|
10
11
|
<%
|
|
@@ -20,12 +21,14 @@ export class <%= name %>Service {
|
|
|
20
21
|
if (isBlob) { %>
|
|
21
22
|
responseType: 'blob',<% } %>
|
|
22
23
|
url: <%= body.url %>,<%
|
|
23
|
-
if (body.params.length) { %>
|
|
24
|
+
if (body.dictParamVar && !body.params.length) { %>
|
|
25
|
+
params: <%= body.dictParamVar %>,<% } %><%
|
|
26
|
+
if (body.dictParamVar && body.params.length) { %>
|
|
27
|
+
params: { ...<%= body.dictParamVar %>, <%= body.params.join(', ') %> },<% } %><%
|
|
28
|
+
if (!body.dictParamVar && body.params.length) { %>
|
|
24
29
|
params: { <%= body.params.join(', ') %> },<% }
|
|
25
30
|
if (body.body) { %>
|
|
26
31
|
body: <%= body.body %>,<% } %>
|
|
27
32
|
},
|
|
28
33
|
{ apiName: this.apiName,...config });<% } %>
|
|
29
|
-
|
|
30
|
-
constructor(private restService: RestService) {}
|
|
31
|
-
}
|
|
34
|
+
}
|
package/models/method.d.ts
CHANGED
package/models/method.js
CHANGED
|
@@ -38,6 +38,10 @@ class Body {
|
|
|
38
38
|
switch (bindingSourceId) {
|
|
39
39
|
case enums_1.eBindingSourceId.Model:
|
|
40
40
|
case enums_1.eBindingSourceId.Query:
|
|
41
|
+
if ((0, methods_1.isDictionaryType)(param.type, param.typeSimple)) {
|
|
42
|
+
this.dictParamVar = value;
|
|
43
|
+
break;
|
|
44
|
+
}
|
|
41
45
|
this.params.push(paramName === value ? value : `${(0, methods_1.getParamName)(paramName)}: ${value}`);
|
|
42
46
|
break;
|
|
43
47
|
case enums_1.eBindingSourceId.FormFile:
|
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,
|
|
1
|
+
{"version":3,"file":"method.js","sourceRoot":"","sources":["../../../../packages/schematics/src/models/method.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/test-setup.js
CHANGED
|
@@ -1,10 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
require("jest-preset-angular/setup-jest");
|
|
4
|
-
const testing_1 = require("@angular/core/testing");
|
|
5
|
-
const testing_2 = require("@angular/platform-browser-dynamic/testing");
|
|
6
|
-
(0, testing_1.getTestBed)().resetTestEnvironment();
|
|
7
|
-
(0, testing_1.getTestBed)().initTestEnvironment(testing_2.BrowserDynamicTestingModule, (0, testing_2.platformBrowserDynamicTesting)(), {
|
|
8
|
-
teardown: { destroyAfterEach: false },
|
|
9
|
-
});
|
|
10
4
|
//# sourceMappingURL=test-setup.js.map
|
package/test-setup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-setup.js","sourceRoot":"","sources":["../../../packages/schematics/src/test-setup.ts"],"names":[],"mappings":";;AAAA,0CAAwC
|
|
1
|
+
{"version":3,"file":"test-setup.js","sourceRoot":"","sources":["../../../packages/schematics/src/test-setup.ts"],"names":[],"mappings":";;AAAA,0CAAwC"}
|
package/utils/methods.d.ts
CHANGED
package/utils/methods.js
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getParamValueName = exports.getParamName = void 0;
|
|
3
|
+
exports.isDictionaryType = exports.getParamValueName = exports.getParamName = void 0;
|
|
4
4
|
const text_1 = require("./text");
|
|
5
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
6
5
|
const shouldQuote = require('should-quote');
|
|
7
6
|
const getParamName = (paramName) => shouldQuote(paramName) ? `["${paramName}"]` : paramName;
|
|
8
7
|
exports.getParamName = getParamName;
|
|
9
|
-
// check dot exists in param name and camelize access continuously
|
|
10
8
|
const getParamValueName = (paramName, descriptorName) => {
|
|
11
9
|
if (paramName.includes('.')) {
|
|
12
10
|
const splitted = paramName.split('.');
|
|
@@ -19,4 +17,9 @@ const getParamValueName = (paramName, descriptorName) => {
|
|
|
19
17
|
return `${descriptorName}.${paramName}`;
|
|
20
18
|
};
|
|
21
19
|
exports.getParamValueName = getParamValueName;
|
|
20
|
+
function isDictionaryType(type, typeSimple) {
|
|
21
|
+
const haystacks = [type || '', typeSimple || ''];
|
|
22
|
+
return haystacks.some(t => /(^|\b)(System\.Collections\.Generic\.)?(I)?Dictionary\s*</.test(t));
|
|
23
|
+
}
|
|
24
|
+
exports.isDictionaryType = isDictionaryType;
|
|
22
25
|
//# 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,iCAA+B;AAE/B,
|
|
1
|
+
{"version":3,"file":"methods.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/methods.ts"],"names":[],"mappings":";;;AAAA,iCAA+B;AAE/B,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;AAEnD,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;AAEF,SAAgB,gBAAgB,CAAC,IAAa,EAAE,UAAmB;IACjE,MAAM,SAAS,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC;IACjD,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,2DAA2D,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAClG,CAAC;AAHD,4CAGC"}
|
package/utils/service.js
CHANGED
|
@@ -22,7 +22,7 @@ function createControllerToServiceMapper({ solution, types, apiName, }) {
|
|
|
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', 'Rest'] }));
|
|
25
|
-
imports.push(new models_1.Import({ path: '@angular/core', specifiers: ['Injectable'] }));
|
|
25
|
+
imports.push(new models_1.Import({ path: '@angular/core', specifiers: ['Injectable', 'inject'] }));
|
|
26
26
|
(0, import_1.sortImports)(imports);
|
|
27
27
|
const methods = actions.map(mapActionToMethod);
|
|
28
28
|
sortMethods(methods);
|
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,iCAMgB;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;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/service.ts"],"names":[],"mappings":"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"}
|