@abp/ng.schematics 6.0.1 → 6.0.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/models/method.js +2 -4
- package/models/method.js.map +1 -1
- package/package.json +1 -1
- package/utils/api.js +1 -1
- package/utils/api.js.map +1 -1
- package/utils/methods.d.ts +1 -0
- package/utils/methods.js +15 -1
- package/utils/methods.js.map +1 -1
- package/utils/workspace.d.ts +5 -1
- package/utils/workspace.js +8 -2
- package/utils/workspace.js.map +1 -1
package/models/method.js
CHANGED
|
@@ -30,12 +30,10 @@ class Body {
|
|
|
30
30
|
this.registerActionParameter = (param) => {
|
|
31
31
|
const { bindingSourceId, descriptorName, jsonName, name, nameOnMethod } = param;
|
|
32
32
|
const camelName = (0, text_1.camel)(name);
|
|
33
|
-
const paramName = jsonName || camelName;
|
|
33
|
+
const paramName = jsonName || shouldQuote(name) ? name : camelName;
|
|
34
34
|
let value = (0, text_1.camelizeHyphen)(nameOnMethod);
|
|
35
35
|
if (descriptorName) {
|
|
36
|
-
value =
|
|
37
|
-
? `${descriptorName}['${paramName}']`
|
|
38
|
-
: `${descriptorName}.${paramName}`;
|
|
36
|
+
value = (0, methods_1.getParamValueName)(paramName, descriptorName);
|
|
39
37
|
}
|
|
40
38
|
switch (bindingSourceId) {
|
|
41
39
|
case enums_1.eBindingSourceId.Model:
|
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":";;;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;IAoCf,YAAY,OAAoB;QAjChC,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,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,IAAI,CAAC,yBAAyB,KAAK,sCAA0B,CAAC;IACvE,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;AAhDD,oBAgDC"}
|
package/package.json
CHANGED
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 (0, schematics_1.chain)(generated.map(m => (0, schematics_1.schematic)('api', { ...schema, module: m })));
|
|
6
|
+
return (0, schematics_1.chain)(generated.map(m => (0, schematics_1.schematic)('api', { ...schema, module: m, entryPoint: schema.entryPoint || '__default' })));
|
|
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,IAAA,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,EACV,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAChB,IAAA,sBAAS,EAAC,KAAK,EAAE,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,WAAW,EAAE,CAAC,CACzF,CACF,CAAC;AACJ,CAAC;AAND,kDAMC"}
|
package/utils/methods.d.ts
CHANGED
package/utils/methods.js
CHANGED
|
@@ -1,8 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getParamName = void 0;
|
|
3
|
+
exports.getParamValueName = exports.getParamName = void 0;
|
|
4
4
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
5
|
+
const text_1 = require("./text");
|
|
5
6
|
const shouldQuote = require('should-quote');
|
|
6
7
|
const getParamName = (paramName) => shouldQuote(paramName) ? `["${paramName}"]` : paramName;
|
|
7
8
|
exports.getParamName = getParamName;
|
|
9
|
+
// check dot exists in param name and camelize access continuously
|
|
10
|
+
const getParamValueName = (paramName, descriptorName) => {
|
|
11
|
+
if (paramName.includes('.')) {
|
|
12
|
+
const splitted = paramName.split('.');
|
|
13
|
+
const param = splitted.map(x => (shouldQuote(x) ? `[${x}]` : `.${(0, text_1.camel)(x)}`)).join('');
|
|
14
|
+
return `${descriptorName}${param}`;
|
|
15
|
+
}
|
|
16
|
+
if (shouldQuote(paramName)) {
|
|
17
|
+
return `${descriptorName}['${paramName}']`;
|
|
18
|
+
}
|
|
19
|
+
return `${descriptorName}.${paramName}`;
|
|
20
|
+
};
|
|
21
|
+
exports.getParamValueName = getParamValueName;
|
|
8
22
|
//# 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;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"}
|
|
1
|
+
{"version":3,"file":"methods.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/methods.ts"],"names":[],"mappings":";;;AAAA,8DAA8D;AAC9D,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;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/workspace.d.ts
CHANGED
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
import { workspaces } from '@angular-devkit/core';
|
|
2
2
|
import { Tree } from '@angular-devkit/schematics';
|
|
3
3
|
import { Project } from '../models';
|
|
4
|
-
import { WorkspaceSchema } from './angular';
|
|
4
|
+
import { ProjectType, WorkspaceSchema } from './angular';
|
|
5
5
|
export declare function isLibrary(project: workspaces.ProjectDefinition): boolean;
|
|
6
6
|
export declare function readEnvironment(tree: Tree, project: workspaces.ProjectDefinition): import("typescript").ObjectLiteralExpression | undefined;
|
|
7
|
+
export declare function getFirstApplication(tree: Tree): {
|
|
8
|
+
name: string | undefined;
|
|
9
|
+
project: import("./angular").WorkspaceProject<ProjectType> | undefined;
|
|
10
|
+
};
|
|
7
11
|
export declare function readWorkspaceSchema(tree: Tree): WorkspaceSchema;
|
|
8
12
|
export declare function resolveProject<T = any>(tree: Tree, name: string, notFoundValue?: T): Promise<Project | T>;
|
|
9
13
|
export declare function getWorkspaceSchema(host: Tree): WorkspaceSchema;
|
package/utils/workspace.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.buildTargetPath = exports.getWorkspacePath = exports.getWorkspaceSchema = exports.resolveProject = exports.readWorkspaceSchema = exports.readEnvironment = exports.isLibrary = void 0;
|
|
3
|
+
exports.buildTargetPath = exports.getWorkspacePath = exports.getWorkspaceSchema = exports.resolveProject = exports.readWorkspaceSchema = exports.getFirstApplication = exports.readEnvironment = exports.isLibrary = void 0;
|
|
4
4
|
/* eslint-disable no-empty */
|
|
5
5
|
const core_1 = require("@angular-devkit/core");
|
|
6
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
@@ -22,6 +22,12 @@ function readEnvironment(tree, project) {
|
|
|
22
22
|
return (0, ast_1.findEnvironmentExpression)(source);
|
|
23
23
|
}
|
|
24
24
|
exports.readEnvironment = readEnvironment;
|
|
25
|
+
function getFirstApplication(tree) {
|
|
26
|
+
const workspace = readWorkspaceSchema(tree);
|
|
27
|
+
const [name, project] = Object.entries(workspace.projects).find(([_, project]) => project.projectType === angular_1.ProjectType.Application) || [];
|
|
28
|
+
return { name, project };
|
|
29
|
+
}
|
|
30
|
+
exports.getFirstApplication = getFirstApplication;
|
|
25
31
|
function readWorkspaceSchema(tree) {
|
|
26
32
|
if (!tree.exists('/angular.json'))
|
|
27
33
|
throw new schematics_1.SchematicsException("[Workspace Not Found] Make sure you are running schematics at the root directory of your workspace and it has an angular.json file." /* Exception.NoWorkspace */);
|
|
@@ -41,7 +47,7 @@ async function resolveProject(tree, name,
|
|
|
41
47
|
// eslint-disable-next-line
|
|
42
48
|
// @typescript-eslint/no-explicit-any
|
|
43
49
|
notFoundValue = symbols_1.NOT_FOUND_VALUE) {
|
|
44
|
-
name = name || readWorkspaceSchema(tree).defaultProject;
|
|
50
|
+
name = name || readWorkspaceSchema(tree).defaultProject || getFirstApplication(tree).name;
|
|
45
51
|
const workspace = await (0, angular_1.getWorkspace)(tree);
|
|
46
52
|
let definition;
|
|
47
53
|
try {
|
package/utils/workspace.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/workspace.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,+CAA2D;AAC3D,2DAAuE;AAGvE,uCAAyF;AACzF,+BAAkD;AAClD,qCAA0C;AAC1C,kDAAuD;AACvD,oEAAiE;AAEjE,SAAgB,SAAS,CAAC,OAAqC;IAC7D,OAAO,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,qBAAW,CAAC,OAAO,CAAC;AACnE,CAAC;AAFD,8BAEC;AAED,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAqC;IAC/E,IAAI,SAAS,CAAC,OAAO,CAAC;QAAE,OAAO,SAAS,CAAC;IAEzC,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,IAAI,GAAG,OAAO,CAAC,IAAI,MAAM,CAAC;IAC5D,MAAM,OAAO,GAAG,OAAO,GAAG,8BAA8B,CAAC;IACzD,MAAM,MAAM,GAAG,IAAA,uBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,OAAO,IAAA,+BAAyB,EAAC,MAAM,CAAC,CAAC;AAC3C,CAAC;AAPD,0CAOC;AAED,SAAgB,mBAAmB,CAAC,IAAU;IAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;QAAE,MAAM,IAAI,gCAAmB,mKAAuB,CAAC;IAExF,IAAI,eAAgC,CAAC;IAErC,IAAI;QACF,eAAe,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;KAC5C;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,gCAAmB,sGAA4B,CAAC;KAC3D;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAZD,kDAYC;AACD,2BAA2B;AAC3B,qCAAqC;AAC9B,KAAK,UAAU,cAAc,CAClC,IAAU,EACV,IAAY;AACZ,2BAA2B;AAC3B,qCAAqC;AACrC,gBAAmB,yBAAiC;IAEpD,IAAI,GAAG,IAAI,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/workspace.ts"],"names":[],"mappings":"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"}
|