@autorest/powershell 4.0.636 → 4.0.638
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/.rush/temp/operation/build/state.json +1 -1
- package/.rush/temp/package-deps_build.json +5 -5
- package/autorest-configuration-for-sdk.md +4 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +1 -0
- package/dist/main.js.map +1 -1
- package/dist/plugins/sdk-modifiers.d.ts +1 -0
- package/dist/plugins/sdk-modifiers.d.ts.map +1 -1
- package/dist/plugins/sdk-modifiers.js +63 -8
- package/dist/plugins/sdk-modifiers.js.map +1 -1
- package/package.json +1 -1
- package/resources/templates/methodBodyRestCall.ejs +4 -2
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"powershell/.eslintrc.yaml": "7fee80e080ad3c75ef9ebc99625635eb47f6c345",
|
|
5
5
|
"powershell/.npmignore": "33986ae1f99f00e14a6a7872e41f0860a44bf33f",
|
|
6
6
|
"powershell/LICENSE": "21071075c24599ee98254f702bcfc504cdc275a6",
|
|
7
|
-
"powershell/autorest-configuration-for-sdk.md": "
|
|
7
|
+
"powershell/autorest-configuration-for-sdk.md": "d6bd98068a88d8f9cb41b8a731cfea21d0787e4e",
|
|
8
8
|
"powershell/autorest-configuration.md": "3a47bf36e4b80be07ddfd20d77fabf82aacfd77f",
|
|
9
9
|
"powershell/changelog.md": "438e32cc7c4d86e08e32c2fd4085928c0e70b1b9",
|
|
10
10
|
"powershell/cmdlets/class.ts": "2d45f70309d2b59b5728efdcf31372b806408797",
|
|
@@ -71,11 +71,11 @@
|
|
|
71
71
|
"powershell/llcsharp/schema/string.ts": "d8508369f8bc1e0748c0737d254f105f9495a655",
|
|
72
72
|
"powershell/llcsharp/schema/uri.ts": "29680c6bf8db7bcdc8ce2e389ae2c7f9efaed2ac",
|
|
73
73
|
"powershell/llcsharp/validations.ts": "0a86cb8934b4536461efbce10de737075c599866",
|
|
74
|
-
"powershell/main.ts": "
|
|
74
|
+
"powershell/main.ts": "0eacdbffe3e1179a7e66ce79e9e3882855b42f0a",
|
|
75
75
|
"powershell/models/model-extensions.ts": "f0c617b9bfb04b4424a853e1b1eecba9059ba788",
|
|
76
76
|
"powershell/module/module-class.ts": "327af665b5d81e4cc1b8fa9da7382e9c73300de5",
|
|
77
77
|
"powershell/module/module-namespace.ts": "f6afc90087e8d733f0323b0de8ba41d923955732",
|
|
78
|
-
"powershell/package.json": "
|
|
78
|
+
"powershell/package.json": "271472d1bb57f7ba697f881e7d24bb0b619cd3d0",
|
|
79
79
|
"powershell/plugins/add-azure-completers-v2.ts": "3b1ddf7a067dbac2f07561fb3f6cbf1b66e555aa",
|
|
80
80
|
"powershell/plugins/create-commands-v2.ts": "915b737aad5f455a9cd0aa4e08034349a2de8ea0",
|
|
81
81
|
"powershell/plugins/cs-namer-v2.ts": "1b64031416f18b604950012b5683758adefce535",
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"powershell/plugins/sdk-cs-namer.ts": "a0673dfc433b4ef5300a6085bee16de94be18912",
|
|
92
92
|
"powershell/plugins/sdk-cs-simplifier.ts": "fcd053343a163f715b20c1271671b17f97babfe1",
|
|
93
93
|
"powershell/plugins/sdk-generate.ts": "496507224d55354e17d71a29d63f01dfd4b03ce2",
|
|
94
|
-
"powershell/plugins/sdk-modifiers.ts": "
|
|
94
|
+
"powershell/plugins/sdk-modifiers.ts": "e64c3cd68efff29b63a0c00502b8efab4868c6b7",
|
|
95
95
|
"powershell/plugins/sdk-tweak-model.ts": "d1af92a9fc52899af5b3a5c1bf2a80408d7d5f1a",
|
|
96
96
|
"powershell/readme.md": "eeb191589b240161a10502f6d21e35b23f9bc805",
|
|
97
97
|
"powershell/resources/assets/build-module.ps1": "c26357176385948d5bc05d821bedcce28ae38d8c",
|
|
@@ -343,7 +343,7 @@
|
|
|
343
343
|
"powershell/resources/templates/extensions.ejs": "b4423a4a855d1ea936304b5c261e5bcb9527c356",
|
|
344
344
|
"powershell/resources/templates/longRunningOperationMethod.ejs": "0855dbf8175dfc3e7ece0e9a0fe11af003b9d56c",
|
|
345
345
|
"powershell/resources/templates/method.ejs": "69f517f288a762dde1e2f618daa40f624e03ae9a",
|
|
346
|
-
"powershell/resources/templates/methodBodyRestCall.ejs": "
|
|
346
|
+
"powershell/resources/templates/methodBodyRestCall.ejs": "f70d9dd000ef6cd33ce4c05b370fecf11b54159b",
|
|
347
347
|
"powershell/resources/templates/methodGroupInterface.ejs": "62bfa9b452c6cce5b23bde3ca46a4df65c1a3753",
|
|
348
348
|
"powershell/resources/templates/model.ejs": "2ebf9803e8576bf59b9787984456c3a73a00475e",
|
|
349
349
|
"powershell/resources/templates/page.ejs": "657e785359b8255e84e8d81d0cf33340578ff654",
|
|
@@ -63,9 +63,12 @@ pipeline:
|
|
|
63
63
|
createSdkInlinedPropertiesPlugin:
|
|
64
64
|
input: modelerfour/identity
|
|
65
65
|
|
|
66
|
-
|
|
66
|
+
applyModelNameModifiersSdk:
|
|
67
67
|
input: createSdkInlinedPropertiesPlugin
|
|
68
68
|
|
|
69
|
+
csnamerSdk:
|
|
70
|
+
input: applyModelNameModifiersSdk
|
|
71
|
+
|
|
69
72
|
applyModifiersSdk:
|
|
70
73
|
input: csnamerSdk
|
|
71
74
|
|
package/dist/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../main.ts"],"names":[],"mappings":"AA0BA,wBAAsB,IAAI,
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../main.ts"],"names":[],"mappings":"AA0BA,wBAAsB,IAAI,kBAuBzB"}
|
package/dist/main.js
CHANGED
|
@@ -43,6 +43,7 @@ async function main() {
|
|
|
43
43
|
pluginHost.Add('simplifierPlugin', sdk_cs_simplifier_1.simplifierPlugin);
|
|
44
44
|
pluginHost.Add('csnamerSdk', sdk_cs_namer_1.csnamerSdk);
|
|
45
45
|
pluginHost.Add('applyModifiersSdk', sdk_modifiers_1.applyModifiersSdk);
|
|
46
|
+
pluginHost.Add('applyModelNameModifiersSdk', sdk_modifiers_1.applyModelNameModifiersSdk);
|
|
46
47
|
pluginHost.Add('createSdkInlinedPropertiesPlugin', sdk_create_inline_properties_1.createSdkInlinedPropertiesPlugin);
|
|
47
48
|
await pluginHost.Run();
|
|
48
49
|
}
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../main.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,6DAA8D;AAC9D,+FAA0F;AAC1F,qEAAgE;AAChE,uFAAgF;AAChF,qEAAgE;AAChE,uDAAkD;AAClD,uDAAgD;AAChD,uDAAmD;AACnD,2DAAuD;AACvD,+EAAmE;AACnE,yDAA0D;AAC1D,2EAAqE;AACrE,yDAAkD;AAClD,+DAAgE;AAChE,mEAA+D;AAC/D,yDAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../main.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,6DAA8D;AAC9D,+FAA0F;AAC1F,qEAAgE;AAChE,uFAAgF;AAChF,qEAAgE;AAChE,uDAAkD;AAClD,uDAAgD;AAChD,uDAAmD;AACnD,2DAAuD;AACvD,+EAAmE;AACnE,yDAA0D;AAC1D,2EAAqE;AACrE,yDAAkD;AAClD,+DAAgE;AAChE,mEAA+D;AAC/D,yDAAoD;AACpD,2DAAwF;AACxF,yFAA0F;AAE1F,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,EAAE,CAAC;AAEjC,KAAK,UAAU,IAAI;IACxB,MAAM,UAAU,GAAG,IAAI,kCAAiB,EAAE,CAAC;IAC3C,6CAA6C;IAC7C,UAAU,CAAC,GAAG,CAAC,kBAAkB,EAAE,0CAAkB,CAAC,CAAC;IACvD,UAAU,CAAC,GAAG,CAAC,mBAAmB,EAAE,qCAAgB,CAAC,CAAC;IACtD,UAAU,CAAC,GAAG,CAAC,wBAAwB,EAAE,qDAAuB,CAAC,CAAC;IAClE,UAAU,CAAC,GAAG,CAAC,8BAA8B,EAAE,+DAA6B,CAAC,CAAC;IAC9E,UAAU,CAAC,GAAG,CAAC,oBAAoB,EAAE,qCAAgB,CAAC,CAAC;IACvD,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,uBAAS,CAAC,CAAC;IACxC,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,qBAAO,CAAC,CAAC;IACtC,UAAU,CAAC,GAAG,CAAC,cAAc,EAAE,+BAAgB,CAAC,CAAC;IACjD,UAAU,CAAC,GAAG,CAAC,yBAAyB,EAAE,wCAAc,CAAC,CAAC;IAC1D,UAAU,CAAC,GAAG,CAAC,aAAa,EAAE,wBAAU,CAAC,CAAC;IAC1C,UAAU,CAAC,GAAG,CAAC,eAAe,EAAE,4BAAY,CAAC,CAAC;IAC9C,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,uBAAQ,CAAC,CAAC;IACrC,UAAU,CAAC,GAAG,CAAC,qBAAqB,EAAE,qCAAmB,CAAC,CAAC;IAC3D,UAAU,CAAC,GAAG,CAAC,kBAAkB,EAAE,oCAAgB,CAAC,CAAC;IACrD,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,yBAAU,CAAC,CAAC;IACzC,UAAU,CAAC,GAAG,CAAC,mBAAmB,EAAE,iCAAiB,CAAC,CAAC;IACvD,UAAU,CAAC,GAAG,CAAC,4BAA4B,EAAE,0CAA0B,CAAC,CAAC;IACzE,UAAU,CAAC,GAAG,CAAC,kCAAkC,EAAE,+DAAgC,CAAC,CAAC;IAErF,MAAM,UAAU,CAAC,GAAG,EAAE,CAAC;AACzB,CAAC;AAvBD,oBAuBC;AAED,IAAI,EAAE,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { AutorestExtensionHost as Host } from '@autorest/extension-base';
|
|
2
2
|
export declare function applyModifiersSdk(service: Host): Promise<void>;
|
|
3
|
+
export declare function applyModelNameModifiersSdk(service: Host): Promise<void>;
|
|
3
4
|
//# sourceMappingURL=sdk-modifiers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk-modifiers.d.ts","sourceRoot":"","sources":["../../plugins/sdk-modifiers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,qBAAqB,IAAI,IAAI,EAAW,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"sdk-modifiers.d.ts","sourceRoot":"","sources":["../../plugins/sdk-modifiers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,qBAAqB,IAAI,IAAI,EAAW,MAAM,0BAA0B,CAAC;AA2LlF,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,IAAI,iBAYpD;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,IAAI,iBAY7D"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
5
5
|
*--------------------------------------------------------------------------------------------*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.applyModifiersSdk = void 0;
|
|
7
|
+
exports.applyModelNameModifiersSdk = exports.applyModifiersSdk = void 0;
|
|
8
8
|
const extension_base_1 = require("@autorest/extension-base");
|
|
9
9
|
const codegen_1 = require("@azure-tools/codegen");
|
|
10
10
|
const linq_1 = require("@azure-tools/linq");
|
|
@@ -42,7 +42,7 @@ function isWhereModelDirective(it) {
|
|
|
42
42
|
return false;
|
|
43
43
|
}
|
|
44
44
|
async function tweakModel(state) {
|
|
45
|
-
var _a
|
|
45
|
+
var _a;
|
|
46
46
|
// only look at directives without the `transform` node.
|
|
47
47
|
for (const directive of directives.filter(each => !each.transform)) {
|
|
48
48
|
const getPatternToMatch = (selector) => {
|
|
@@ -89,18 +89,61 @@ async function tweakModel(state) {
|
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
|
+
else if (models) {
|
|
93
|
+
// comment out below to disable model name change, which will be added in the tweakModelName before the plugin csnamerSdk
|
|
94
|
+
// for (const model of values(models)) {
|
|
95
|
+
// const prevName = model.language.csharp?.name;
|
|
96
|
+
// if (model.language.csharp) {
|
|
97
|
+
// model.language.default.fullname = model.language.csharp.fullname = model.language.default.name = model.language.csharp.name = modelNameReplacer ? modelNameRegex ? model.language.csharp.name.replace(modelNameRegex, modelNameReplacer) : modelNameReplacer : model.language.csharp.name;
|
|
98
|
+
// }
|
|
99
|
+
// state.message({
|
|
100
|
+
// Channel: Channel.Debug, Text: `[DIRECTIVE] Changed model-name from ${prevName} to ${model.language.csharp?.name}.`
|
|
101
|
+
// });
|
|
102
|
+
// }
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
return state.model;
|
|
107
|
+
}
|
|
108
|
+
async function tweakModelName(state) {
|
|
109
|
+
var _a;
|
|
110
|
+
// only look at directives without the `transform` node.
|
|
111
|
+
for (const directive of directives.filter(each => !each.transform)) {
|
|
112
|
+
const getPatternToMatch = (selector) => {
|
|
113
|
+
return selector ? !hasSpecialChars(selector) ? new RegExp(`^${selector}$`, 'gi') : new RegExp(selector, 'gi') : undefined;
|
|
114
|
+
};
|
|
115
|
+
if (isWhereModelDirective(directive)) {
|
|
116
|
+
const selectType = directive.select;
|
|
117
|
+
const modelNameRegex = getPatternToMatch(directive.where['model-name']);
|
|
118
|
+
const propertyNameRegex = getPatternToMatch(directive.where['property-name']);
|
|
119
|
+
const modelNameReplacer = directive.set['model-name'];
|
|
120
|
+
const propertyNameReplacer = directive.set['property-name'];
|
|
121
|
+
// select all models
|
|
122
|
+
let models = [...(_a = state.model.schemas.objects) !== null && _a !== void 0 ? _a : []];
|
|
123
|
+
// let models = values(state.model.schemas).toArray();
|
|
124
|
+
if (modelNameRegex) {
|
|
125
|
+
models = (0, linq_1.values)(models)
|
|
126
|
+
.where(model => !!`${model.language.default.name}`.match(modelNameRegex))
|
|
127
|
+
.toArray();
|
|
128
|
+
}
|
|
129
|
+
if (propertyNameRegex && selectType === 'model') {
|
|
130
|
+
models = (0, linq_1.values)(models)
|
|
131
|
+
.where(model => (0, linq_1.values)((0, resolve_conflicts_1.allVirtualProperties)(model.language.default.virtualProperties))
|
|
132
|
+
.any(property => !!`${property.name}`.match(propertyNameRegex)))
|
|
133
|
+
.toArray();
|
|
134
|
+
}
|
|
135
|
+
if (propertyNameRegex && (selectType === undefined || selectType === 'property')) {
|
|
136
|
+
// skip directive for property
|
|
137
|
+
}
|
|
92
138
|
else if (models) {
|
|
93
139
|
for (const model of (0, linq_1.values)(models)) {
|
|
94
|
-
const prevName =
|
|
95
|
-
|
|
96
|
-
model.language.default.fullname = model.language.csharp.fullname = model.language.default.name = model.language.csharp.name = modelNameReplacer ? modelNameRegex ? model.language.csharp.name.replace(modelNameRegex, modelNameReplacer) : modelNameReplacer : model.language.csharp.name;
|
|
97
|
-
}
|
|
140
|
+
const prevName = model.language.default.name;
|
|
141
|
+
model.language.default.name = modelNameReplacer ? modelNameRegex ? model.language.default.name.replace(modelNameRegex, modelNameReplacer) : modelNameReplacer : model.language.default.name;
|
|
98
142
|
state.message({
|
|
99
|
-
Channel: extension_base_1.Channel.Debug, Text: `[DIRECTIVE] Changed model-name from ${prevName} to ${
|
|
143
|
+
Channel: extension_base_1.Channel.Debug, Text: `[DIRECTIVE] Changed model-name from ${prevName} to ${model.language.default.name}.`
|
|
100
144
|
});
|
|
101
145
|
}
|
|
102
146
|
}
|
|
103
|
-
continue;
|
|
104
147
|
}
|
|
105
148
|
}
|
|
106
149
|
return state.model;
|
|
@@ -117,4 +160,16 @@ async function applyModifiersSdk(service) {
|
|
|
117
160
|
await service.writeFile({ filename: 'code-model-v4-modifiers-sdk.yaml', content: (0, codegen_1.serialize)(result), sourceMap: undefined, artifactType: 'code-model-sdk' });
|
|
118
161
|
}
|
|
119
162
|
exports.applyModifiersSdk = applyModifiersSdk;
|
|
163
|
+
async function applyModelNameModifiersSdk(service) {
|
|
164
|
+
// dolauli implement directives
|
|
165
|
+
const allDirectives = await service.getValue('directive');
|
|
166
|
+
directives = (0, linq_1.values)(allDirectives)
|
|
167
|
+
// .select(directive => directive)
|
|
168
|
+
.where(directive => isWhereModelDirective(directive))
|
|
169
|
+
.toArray();
|
|
170
|
+
const state = await new model_state_1.ModelState(service).init();
|
|
171
|
+
const result = await tweakModelName(state);
|
|
172
|
+
await service.writeFile({ filename: 'code-model-v4-model-name-modifiers-sdk.yaml', content: (0, codegen_1.serialize)(result), sourceMap: undefined, artifactType: 'code-model-sdk' });
|
|
173
|
+
}
|
|
174
|
+
exports.applyModelNameModifiersSdk = applyModelNameModifiersSdk;
|
|
120
175
|
//# sourceMappingURL=sdk-modifiers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk-modifiers.js","sourceRoot":"","sources":["../../plugins/sdk-modifiers.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,6DAAkF;AAClF,kDAAuE;AAEvE,4CAA4E;AAI5E,sDAAkD;AAElD,kEAAwF;AAKxF,IAAI,UAAU,GAAe,EAAE,CAAC;AAGhC,SAAS,eAAe,CAAC,GAAW;IAClC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,cAAc,CAAC,WAAgB,EAAE,iBAAgC,EAAE,aAAqB;IAC/F,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,KAAK,MAAM,IAAI,IAAI,IAAA,aAAM,EAAC,iBAAiB,CAAC,EAAE;QAC5C,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;YACnC,KAAK,IAAI,mBAAmB,IAAI,2BAA2B,CAAC;SAC7D;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,WAAW,CAAC,SAAc,EAAE,iBAAgC,EAAE,aAAqB;IAC1F,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,KAAK,MAAM,IAAI,IAAI,IAAA,aAAM,EAAC,iBAAiB,CAAC,EAAE;QAC5C,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;YACjC,KAAK,IAAI,aAAa,IAAI,WAAW,aAAa,gBAAgB,CAAC;SACpE;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAcD,SAAS,qBAAqB,CAAC,EAAO;IACpC,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;IAC9B,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC;IAG1B,IAAI,KAAK,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,OAAO,CAAC,EAAE;QAEnG,OAAO,IAAI,CAAC;KAEb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,KAAY;;IACpC,wDAAwD;IACxD,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QAClE,MAAM,iBAAiB,GAAG,CAAC,QAA4B,EAAsB,EAAE;YAC7E,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,QAAQ,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5H,CAAC,CAAC;QAEF,IAAI,qBAAqB,CAAC,SAAS,CAAC,EAAE;YACpC,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;YACpC,MAAM,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;YACxE,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;YAE9E,MAAM,iBAAiB,GAAG,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACtD,MAAM,oBAAoB,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YAE5D,oBAAoB;YACpB,IAAI,MAAM,GAAG,CAAC,GAAG,MAAA,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC;YACpD,sDAAsD;YACtD,IAAI,cAAc,EAAE;gBAClB,MAAM,GAAG,IAAA,aAAM,EAAC,MAAM,CAAC;qBACpB,KAAK,CAAC,KAAK,CAAC,EAAE,WACb,OAAA,CAAC,CAAC,GAAG,MAAA,KAAK,CAAC,QAAQ,CAAC,MAAM,0CAAE,IAAI,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA,EAAA,CAAC;qBAC1D,OAAO,EAAE,CAAC;aACd;YAED,IAAI,iBAAiB,IAAI,UAAU,KAAK,OAAO,EAAE;gBAC/C,MAAM,GAAG,IAAA,aAAM,EAAC,MAAM,CAAC;qBACpB,KAAK,CAAC,KAAK,CAAC,EAAE;;oBAAC,OAAA,IAAA,aAAM,EAAC,IAAA,wCAAoB,EAAC,MAAA,KAAK,CAAC,QAAQ,CAAC,MAAM,0CAAE,iBAAiB,CAAC,CAAC;yBACnF,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAA;iBAAA,CAAC;qBACjE,OAAO,EAAE,CAAC;aACd;YAED,IAAI,iBAAiB,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,UAAU,CAAC,EAAE;gBAChF,MAAM,UAAU,GAAG,IAAA,aAAM,EAAC,MAAM,CAAC;qBAC9B,UAAU,CAAC,KAAK,CAAC,EAAE,WAAC,OAAA,IAAA,wCAAoB,EAAC,MAAA,KAAK,CAAC,QAAQ,CAAC,MAAM,0CAAE,iBAAiB,CAAC,CAAA,EAAA,CAAC;qBACnF,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;qBAChE,OAAO,EAAE,CAAC;gBACb,KAAK,MAAM,QAAQ,IAAI,IAAA,aAAM,EAAC,UAAU,CAAC,EAAE;oBACzC,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC;oBAC/B,QAAQ,CAAC,IAAI,GAAG,oBAAoB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAEjK,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;wBAClB,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,wBAAO,CAAC,KAAK,EAAE,IAAI,EAAE,cAAc,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,0BAA0B,QAAQ,UAAU,EAAE,CAAC,CAAC;qBAC9K;oBACD,IAAI,iBAAiB,EAAE;wBACrB,KAAK,CAAC,OAAO,CAAC;4BACZ,OAAO,EAAE,wBAAO,CAAC,KAAK,EAAE,IAAI,EAAE,0CAA0C,QAAQ,OAAO,QAAQ,CAAC,IAAI,GAAG;yBACxG,CAAC,CAAC;qBACJ;iBACF;aAEF;iBAAM,IAAI,MAAM,EAAE;gBACjB,
|
|
1
|
+
{"version":3,"file":"sdk-modifiers.js","sourceRoot":"","sources":["../../plugins/sdk-modifiers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -29,7 +29,8 @@ if (method.extensions && method.extensions['x-ms-request-id']) {
|
|
|
29
29
|
}
|
|
30
30
|
<% } -%>
|
|
31
31
|
<%if(method.requests[0].protocol.http.method != 'patch') {-%>
|
|
32
|
-
|
|
32
|
+
<%# for odata, validation is not needed. -%>
|
|
33
|
+
<%-parameter.extensions && parameter.extensions['x-ms-odata'] ? '' : project.helper.ValidateType(parameter.schema, method, parameter.language.default.name, parameter.nullable)%>
|
|
33
34
|
<%}-%>
|
|
34
35
|
<%}-%>
|
|
35
36
|
<% });-%>
|
|
@@ -42,7 +43,8 @@ if (method.extensions && method.extensions['x-ms-request-id']) {
|
|
|
42
43
|
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "<%-prefix%><%-parameter.language.default.name%>");
|
|
43
44
|
}
|
|
44
45
|
<% } -%>
|
|
45
|
-
|
|
46
|
+
<%# for odata, validation is not needed. -%>
|
|
47
|
+
<%- parameter.extensions && parameter.extensions['x-ms-odata'] ? '' : project.helper.ValidateType(parameter.schema, method, prefix + parameter.language.default.name, parameter.nullable)%>
|
|
46
48
|
<%});}-%>
|
|
47
49
|
<%(method.parameters || []).filter(p => p.protocol.http.in == 'complex').forEach(function(parameter) {-%>
|
|
48
50
|
<%-project.helper.PopulateGroupParameters(parameter)%>
|