@abp/ng.schematics 7.0.0-rc.5 → 7.0.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/create-lib/files-package/__libraryName@kebab__/karma.conf.js.template +1 -1
- package/commands/create-lib/index.d.ts +3 -0
- package/commands/create-lib/index.js +71 -3
- package/commands/create-lib/index.js.map +1 -1
- package/commands/create-lib/schema.json +12 -3
- package/models/api-definition.d.ts +2 -2
- package/models/method.js +2 -4
- package/models/method.js.map +1 -1
- package/package.json +1 -1
- package/utils/common.js +7 -7
- package/utils/common.js.map +1 -1
- package/utils/methods.d.ts +1 -0
- package/utils/methods.js +15 -1
- package/utils/methods.js.map +1 -1
|
@@ -25,7 +25,7 @@ module.exports = function (config) {
|
|
|
25
25
|
suppressAll: true // removes the duplicated traces
|
|
26
26
|
},
|
|
27
27
|
coverageReporter: {
|
|
28
|
-
dir: require('path').join(__dirname, '../../coverage
|
|
28
|
+
dir: require('path').join(__dirname, '../../coverage/<%= kebab(libraryName) %>'),
|
|
29
29
|
subdir: '.',
|
|
30
30
|
reporters: [
|
|
31
31
|
{ type: 'html' },
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { Rule, Tree } from '@angular-devkit/schematics';
|
|
2
|
+
import { WorkspaceDefinition } from '../../utils/angular/workspace';
|
|
2
3
|
import { GenerateLibSchema } from './models/generate-lib-schema';
|
|
3
4
|
export default function (schema: GenerateLibSchema): (tree: Tree) => Promise<Rule | undefined>;
|
|
4
5
|
export declare function addLibToWorkspaceIfNotExist(name: string, packagesDir: string): Rule;
|
|
5
6
|
export declare function updateTsConfig(packageName: string, path: string): (host: Tree) => import("@angular-devkit/schematics/src/tree/interface").Tree | undefined;
|
|
6
7
|
export declare function createLibSecondaryEntry(tree: Tree, options: GenerateLibSchema): Promise<Rule>;
|
|
8
|
+
export declare function importConfigModuleToDefaultProjectAppModule(workspace: WorkspaceDefinition, packageName: string): (tree: Tree) => void;
|
|
9
|
+
export declare function addRoutingToAppRoutingModule(workspace: WorkspaceDefinition, packageName: string): (tree: Tree) => void;
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createLibSecondaryEntry = exports.updateTsConfig = exports.addLibToWorkspaceIfNotExist = void 0;
|
|
3
|
+
exports.addRoutingToAppRoutingModule = exports.importConfigModuleToDefaultProjectAppModule = exports.createLibSecondaryEntry = exports.updateTsConfig = exports.addLibToWorkspaceIfNotExist = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
-
const
|
|
6
|
-
const cases = require("../../utils/text");
|
|
5
|
+
const ts = require("typescript");
|
|
7
6
|
const core_1 = require("@angular-devkit/core");
|
|
7
|
+
const utils_1 = require("../../utils");
|
|
8
8
|
const generate_lib_1 = require("../../utils/angular-schematic/generate-lib");
|
|
9
|
+
const cases = require("../../utils/text");
|
|
9
10
|
function default_1(schema) {
|
|
10
11
|
return async (tree) => {
|
|
11
12
|
if (schema.override || !(await checkLibExist(schema, tree))) {
|
|
@@ -87,6 +88,8 @@ function addLibToWorkspaceIfNotExist(name, packagesDir) {
|
|
|
87
88
|
: (0, schematics_1.noop)(),
|
|
88
89
|
(0, generate_lib_1.addLibToWorkspaceFile)(projectRoot, packageName),
|
|
89
90
|
updateTsConfig(packageName, pathImportLib),
|
|
91
|
+
importConfigModuleToDefaultProjectAppModule(workspace, packageName),
|
|
92
|
+
addRoutingToAppRoutingModule(workspace, packageName),
|
|
90
93
|
]);
|
|
91
94
|
};
|
|
92
95
|
}
|
|
@@ -100,7 +103,9 @@ function updateTsConfig(packageName, path) {
|
|
|
100
103
|
}
|
|
101
104
|
const file = new utils_1.JSONFile(host, tsConfig);
|
|
102
105
|
const jsonPath = ['compilerOptions', 'paths', packageName];
|
|
106
|
+
const jsonPathConfig = ['compilerOptions', 'paths', `${packageName}/config`];
|
|
103
107
|
file.modify(jsonPath, [`${path}/src/public-api.ts`]);
|
|
108
|
+
file.modify(jsonPathConfig, [`${path}/config/src/public-api.ts`]);
|
|
104
109
|
};
|
|
105
110
|
}
|
|
106
111
|
exports.updateTsConfig = updateTsConfig;
|
|
@@ -121,4 +126,67 @@ async function createLibSecondaryEntry(tree, options) {
|
|
|
121
126
|
]);
|
|
122
127
|
}
|
|
123
128
|
exports.createLibSecondaryEntry = createLibSecondaryEntry;
|
|
129
|
+
function importConfigModuleToDefaultProjectAppModule(workspace, packageName) {
|
|
130
|
+
return (tree) => {
|
|
131
|
+
const projectName = (0, utils_1.readWorkspaceSchema)(tree).defaultProject || (0, utils_1.getFirstApplication)(tree).name;
|
|
132
|
+
const project = workspace.projects.get(projectName);
|
|
133
|
+
const appModulePath = `${project?.sourceRoot}/app/app.module.ts`;
|
|
134
|
+
const appModule = tree.read(appModulePath);
|
|
135
|
+
if (!appModule) {
|
|
136
|
+
return;
|
|
137
|
+
}
|
|
138
|
+
const appModuleContent = appModule.toString();
|
|
139
|
+
if (appModuleContent.includes(`${(0, utils_1.camel)(packageName)}ConfigModule`)) {
|
|
140
|
+
return;
|
|
141
|
+
}
|
|
142
|
+
const forRootStatement = `${(0, utils_1.pascal)(packageName)}ConfigModule.forRoot()`;
|
|
143
|
+
const text = tree.read(appModulePath);
|
|
144
|
+
if (!text) {
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
147
|
+
const sourceText = text.toString();
|
|
148
|
+
if (sourceText.includes(forRootStatement)) {
|
|
149
|
+
return;
|
|
150
|
+
}
|
|
151
|
+
const source = ts.createSourceFile(appModulePath, sourceText, ts.ScriptTarget.Latest, true);
|
|
152
|
+
const changes = (0, utils_1.addImportToModule)(source, appModulePath, forRootStatement, `${(0, utils_1.kebab)(packageName)}/config`);
|
|
153
|
+
const recorder = tree.beginUpdate(appModulePath);
|
|
154
|
+
for (const change of changes) {
|
|
155
|
+
if (change instanceof utils_1.InsertChange) {
|
|
156
|
+
recorder.insertLeft(change.pos, change.toAdd);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
tree.commitUpdate(recorder);
|
|
160
|
+
return;
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
exports.importConfigModuleToDefaultProjectAppModule = importConfigModuleToDefaultProjectAppModule;
|
|
164
|
+
function addRoutingToAppRoutingModule(workspace, packageName) {
|
|
165
|
+
return (tree) => {
|
|
166
|
+
const projectName = (0, utils_1.readWorkspaceSchema)(tree).defaultProject || (0, utils_1.getFirstApplication)(tree).name;
|
|
167
|
+
const project = workspace.projects.get(projectName);
|
|
168
|
+
const appRoutingModulePath = `${project?.sourceRoot}/app/app-routing.module.ts`;
|
|
169
|
+
const appRoutingModule = tree.read(appRoutingModulePath);
|
|
170
|
+
if (!appRoutingModule) {
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
173
|
+
const appRoutingModuleContent = appRoutingModule.toString();
|
|
174
|
+
const moduleName = `${(0, utils_1.pascal)(packageName)}Module`;
|
|
175
|
+
if (appRoutingModuleContent.includes(moduleName)) {
|
|
176
|
+
return;
|
|
177
|
+
}
|
|
178
|
+
const source = ts.createSourceFile(appRoutingModulePath, appRoutingModuleContent, ts.ScriptTarget.Latest, true);
|
|
179
|
+
const importPath = `${(0, utils_1.kebab)(packageName)}`;
|
|
180
|
+
const importStatement = `() => import('${importPath}').then(m => m.${moduleName}.forLazy())`;
|
|
181
|
+
const routeDefinition = `{ path: '${(0, utils_1.kebab)(packageName)}', loadChildren: ${importStatement} }`;
|
|
182
|
+
const change = (0, utils_1.addRouteDeclarationToModule)(source, `${(0, utils_1.kebab)(packageName)}`, routeDefinition);
|
|
183
|
+
const recorder = tree.beginUpdate(appRoutingModulePath);
|
|
184
|
+
if (change instanceof utils_1.InsertChange) {
|
|
185
|
+
recorder.insertLeft(change.pos, change.toAdd);
|
|
186
|
+
}
|
|
187
|
+
tree.commitUpdate(recorder);
|
|
188
|
+
return;
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
exports.addRoutingToAppRoutingModule = addRoutingToAppRoutingModule;
|
|
124
192
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/commands/create-lib/index.ts"],"names":[],"mappings":";;;AAAA,2DASoC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/commands/create-lib/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,19 +16,28 @@
|
|
|
16
16
|
"isSecondaryEntrypoint": {
|
|
17
17
|
"description": "Is secondary entrypoint",
|
|
18
18
|
"type": "boolean",
|
|
19
|
-
"$default":
|
|
19
|
+
"$default": {
|
|
20
|
+
"$source": "argv",
|
|
21
|
+
"index": 1
|
|
22
|
+
},
|
|
20
23
|
"x-prompt": "Is secondary entrypoint?"
|
|
21
24
|
},
|
|
22
25
|
"isModuleTemplate": {
|
|
23
26
|
"description": "Is module template",
|
|
24
27
|
"type": "boolean",
|
|
25
|
-
"$default":
|
|
28
|
+
"$default": {
|
|
29
|
+
"$source": "argv",
|
|
30
|
+
"index": 2
|
|
31
|
+
},
|
|
26
32
|
"x-prompt": "Is module template?"
|
|
27
33
|
},
|
|
28
34
|
"override": {
|
|
29
35
|
"description": "Override existing files",
|
|
30
36
|
"type": "boolean",
|
|
31
|
-
"$default":
|
|
37
|
+
"$default": {
|
|
38
|
+
"$source": "argv",
|
|
39
|
+
"index": 3
|
|
40
|
+
},
|
|
32
41
|
"x-prompt": "Override existing files?"
|
|
33
42
|
}
|
|
34
43
|
},
|
|
@@ -34,11 +34,11 @@ export interface Controller {
|
|
|
34
34
|
export interface InterfaceDef {
|
|
35
35
|
type: string;
|
|
36
36
|
name: string;
|
|
37
|
-
methods
|
|
37
|
+
methods?: InterfaceMethodDef[];
|
|
38
38
|
}
|
|
39
39
|
export interface InterfaceMethodDef {
|
|
40
40
|
name: string;
|
|
41
|
-
parametersOnMethod
|
|
41
|
+
parametersOnMethod?: InterfaceParameterOnMethodDef[];
|
|
42
42
|
returnValue: {
|
|
43
43
|
type: string;
|
|
44
44
|
typeSimple: string;
|
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/common.js
CHANGED
|
@@ -34,27 +34,27 @@ exports.removeDefaultPlaceholders = removeDefaultPlaceholders;
|
|
|
34
34
|
const sanitizeTypeNameRegExp = /\+/g;
|
|
35
35
|
const sanitizeTypeName = (name) => name.replace(sanitizeTypeNameRegExp, '_');
|
|
36
36
|
function sanitizeControllerTypeNames(controllers) {
|
|
37
|
-
Object.values(controllers).forEach(controller => {
|
|
38
|
-
controller.interfaces
|
|
39
|
-
i.methods
|
|
37
|
+
Object.values(controllers || {}).forEach(controller => {
|
|
38
|
+
controller.interfaces?.forEach(i => {
|
|
39
|
+
i.methods?.forEach(m => {
|
|
40
40
|
m.returnValue.type = sanitizeTypeName(m.returnValue.type);
|
|
41
41
|
m.returnValue.typeSimple = sanitizeTypeName(m.returnValue.typeSimple);
|
|
42
|
-
m.parametersOnMethod
|
|
42
|
+
m.parametersOnMethod?.forEach(p => {
|
|
43
43
|
p.type = sanitizeTypeName(p.type);
|
|
44
44
|
p.typeAsString = sanitizeTypeName(p.typeAsString);
|
|
45
45
|
p.typeSimple = sanitizeTypeName(p.typeSimple);
|
|
46
46
|
});
|
|
47
47
|
});
|
|
48
48
|
});
|
|
49
|
-
Object.values(controller.actions).forEach(a => {
|
|
49
|
+
Object.values(controller.actions || {}).forEach(a => {
|
|
50
50
|
a.returnValue.type = sanitizeTypeName(a.returnValue.type);
|
|
51
51
|
a.returnValue.typeSimple = sanitizeTypeName(a.returnValue.typeSimple);
|
|
52
|
-
a.parametersOnMethod
|
|
52
|
+
a.parametersOnMethod?.forEach(p => {
|
|
53
53
|
p.type = sanitizeTypeName(p.type);
|
|
54
54
|
p.typeAsString = sanitizeTypeName(p.typeAsString);
|
|
55
55
|
p.typeSimple = sanitizeTypeName(p.typeSimple);
|
|
56
56
|
});
|
|
57
|
-
a.parameters
|
|
57
|
+
a.parameters?.forEach(p => {
|
|
58
58
|
p.type = sanitizeTypeName(p.type);
|
|
59
59
|
p.typeSimple = sanitizeTypeName(p.typeSimple);
|
|
60
60
|
});
|
package/utils/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/common.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AACvE,iCAAiC;AAIjC,SAAgB,WAAW,CAAC,IAAY,EAAE,GAAG,MAAqC;IAChF,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QAC1B,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;QAClD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAPD,kCAOC;AAED,SAAgB,iBAAiB,CAAC,KAAU;IAC1C,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AAC/C,CAAC;AAFD,8CAEC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,QAAgB;IACzD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,iBAAiB,CAAC,MAAM,CAAC;QAC3B,MAAM,IAAI,gCAAmB,CAAC,WAAW,oFAAyB,QAAQ,CAAC,CAAC,CAAC;IAE/E,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtC,OAAO,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAC3E,CAAC;AAPD,wCAOC;AAED,SAAgB,yBAAyB,CAAmC,SAAY;IACtF,MAAM,SAAS,GAAuC,EAAE,CAAC;IAEzD,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACjD,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,OAAO,SAAc,CAAC;AACxB,CAAC;AARD,8DAQC;AAED,MAAM,sBAAsB,GAAG,KAAK,CAAC;AACrC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;AAErF,SAAgB,2BAA2B,CACzC,WAAuC;IAEvC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/common.ts"],"names":[],"mappings":"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"}
|
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"}
|