@autorest/typescript 6.0.0-beta.14 → 6.0.0-beta.17
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/CHANGELOG.md +13 -0
- package/README.md +41 -5
- package/dist/src/autorestSession.d.ts +12 -4
- package/dist/src/autorestSession.d.ts.map +1 -1
- package/dist/src/autorestSession.js +3 -9
- package/dist/src/autorestSession.js.map +1 -1
- package/dist/src/conflictResolver.d.ts.map +1 -1
- package/dist/src/conflictResolver.js.map +1 -1
- package/dist/src/generators/clientFileGenerator.d.ts.map +1 -1
- package/dist/src/generators/clientFileGenerator.js +181 -31
- package/dist/src/generators/clientFileGenerator.js.map +1 -1
- package/dist/src/generators/indexGenerator.d.ts.map +1 -1
- package/dist/src/generators/indexGenerator.js +70 -9
- package/dist/src/generators/indexGenerator.js.map +1 -1
- package/dist/src/generators/modelsGenerator.d.ts.map +1 -1
- package/dist/src/generators/modelsGenerator.js +20 -2
- package/dist/src/generators/modelsGenerator.js.map +1 -1
- package/dist/src/generators/operationGenerator.d.ts.map +1 -1
- package/dist/src/generators/operationGenerator.js +10 -8
- package/dist/src/generators/operationGenerator.js.map +1 -1
- package/dist/src/generators/samples/sampleEnv.hbs +4 -0
- package/dist/src/generators/samples/sampleEnvGenerator.d.ts +3 -0
- package/dist/src/generators/samples/sampleEnvGenerator.d.ts.map +1 -0
- package/dist/src/generators/samples/sampleEnvGenerator.js +17 -0
- package/dist/src/generators/samples/sampleEnvGenerator.js.map +1 -0
- package/dist/src/generators/samples/sampleGenerator.d.ts +13 -0
- package/dist/src/generators/samples/sampleGenerator.d.ts.map +1 -0
- package/dist/src/generators/samples/sampleGenerator.js +43 -0
- package/dist/src/generators/samples/sampleGenerator.js.map +1 -0
- package/dist/src/generators/static/apiExtractorConfig.js +2 -2
- package/dist/src/generators/static/apiExtractorConfig.js.map +1 -1
- package/dist/src/generators/static/esLintConfigGenerator.d.ts +3 -0
- package/dist/src/generators/static/esLintConfigGenerator.d.ts.map +1 -0
- package/dist/src/generators/static/esLintConfigGenerator.js +26 -0
- package/dist/src/generators/static/esLintConfigGenerator.js.map +1 -0
- package/dist/src/generators/static/{README.md.hbs → hlcREADME.md.hbs} +23 -0
- package/dist/src/generators/static/karma.conf.js.hbs +141 -0
- package/dist/src/generators/static/karmaConfigFileGenerator.d.ts +3 -0
- package/dist/src/generators/static/karmaConfigFileGenerator.d.ts.map +1 -0
- package/dist/src/generators/static/karmaConfigFileGenerator.js +23 -0
- package/dist/src/generators/static/karmaConfigFileGenerator.js.map +1 -0
- package/dist/src/generators/static/packageFileGenerator.d.ts.map +1 -1
- package/dist/src/generators/static/packageFileGenerator.js +174 -48
- package/dist/src/generators/static/packageFileGenerator.js.map +1 -1
- package/dist/src/generators/static/readmeFileGenerator.d.ts +2 -2
- package/dist/src/generators/static/readmeFileGenerator.d.ts.map +1 -1
- package/dist/src/generators/static/readmeFileGenerator.js +35 -17
- package/dist/src/generators/static/readmeFileGenerator.js.map +1 -1
- package/dist/src/generators/static/rlcREADME.md.hbs +71 -0
- package/dist/src/generators/static/rollupConfigFileGenerator.d.ts.map +1 -1
- package/dist/src/generators/static/rollupConfigFileGenerator.js +12 -71
- package/dist/src/generators/static/rollupConfigFileGenerator.js.map +1 -1
- package/dist/src/generators/static/samples.ts.hbs +49 -0
- package/dist/src/generators/static/tsConfigFileGenerator.d.ts.map +1 -1
- package/dist/src/generators/static/tsConfigFileGenerator.js +40 -18
- package/dist/src/generators/static/tsConfigFileGenerator.js.map +1 -1
- package/dist/src/generators/test/envBrowserFileGenerator.d.ts +3 -0
- package/dist/src/generators/test/envBrowserFileGenerator.d.ts.map +1 -0
- package/dist/src/generators/test/envBrowserFileGenerator.js +15 -0
- package/dist/src/generators/test/envBrowserFileGenerator.js.map +1 -0
- package/dist/src/generators/test/envFileGenerator.d.ts +3 -0
- package/dist/src/generators/test/envFileGenerator.d.ts.map +1 -0
- package/dist/src/generators/test/envFileGenerator.js +23 -0
- package/dist/src/generators/test/envFileGenerator.js.map +1 -0
- package/dist/src/generators/test/recordedClientFileGenerator.d.ts +3 -0
- package/dist/src/generators/test/recordedClientFileGenerator.d.ts.map +1 -0
- package/dist/src/generators/test/recordedClientFileGenerator.js +23 -0
- package/dist/src/generators/test/recordedClientFileGenerator.js.map +1 -0
- package/dist/src/generators/test/rlcEnv.ts.hbs +3 -0
- package/dist/src/generators/test/rlcRecordedClient.ts.hbs +35 -0
- package/dist/src/generators/test/rlcSampleTest.spec.ts.hbs +19 -0
- package/dist/src/generators/{static → test}/sampleTest.ts.hbs +0 -0
- package/dist/src/generators/test/sampleTestGenerator.d.ts.map +1 -1
- package/dist/src/generators/test/sampleTestGenerator.js +23 -7
- package/dist/src/generators/test/sampleTestGenerator.js.map +1 -1
- package/dist/src/generators/utils/pagingOperations.d.ts +5 -0
- package/dist/src/generators/utils/pagingOperations.d.ts.map +1 -1
- package/dist/src/generators/utils/pagingOperations.js +2 -1
- package/dist/src/generators/utils/pagingOperations.js.map +1 -1
- package/dist/src/main.d.ts +2 -2
- package/dist/src/main.d.ts.map +1 -1
- package/dist/src/main.js +3 -3
- package/dist/src/main.js.map +1 -1
- package/dist/src/models/clientDetails.d.ts +7 -0
- package/dist/src/models/clientDetails.d.ts.map +1 -1
- package/dist/src/models/modelDetails.d.ts +2 -2
- package/dist/src/models/modelDetails.d.ts.map +1 -1
- package/dist/src/models/operationDetails.d.ts +1 -0
- package/dist/src/models/operationDetails.d.ts.map +1 -1
- package/dist/src/models/sampleDetails.d.ts +22 -0
- package/dist/src/models/sampleDetails.d.ts.map +1 -0
- package/dist/src/models/sampleDetails.js +3 -0
- package/dist/src/models/sampleDetails.js.map +1 -0
- package/dist/src/restLevelClient/generateClient.d.ts +1 -1
- package/dist/src/restLevelClient/generateClient.d.ts.map +1 -1
- package/dist/src/restLevelClient/generateClient.js +81 -163
- package/dist/src/restLevelClient/generateClient.js.map +1 -1
- package/dist/src/restLevelClient/generateClientDefinition.d.ts +6 -0
- package/dist/src/restLevelClient/generateClientDefinition.d.ts.map +1 -0
- package/dist/src/restLevelClient/generateClientDefinition.js +231 -0
- package/dist/src/restLevelClient/generateClientDefinition.js.map +1 -0
- package/dist/src/restLevelClient/generateMethodShortcuts.d.ts +8 -0
- package/dist/src/restLevelClient/generateMethodShortcuts.d.ts.map +1 -0
- package/dist/src/restLevelClient/generateMethodShortcuts.js +70 -0
- package/dist/src/restLevelClient/generateMethodShortcuts.js.map +1 -0
- package/dist/src/restLevelClient/generateObjectTypes.d.ts.map +1 -1
- package/dist/src/restLevelClient/generateObjectTypes.js.map +1 -1
- package/dist/src/restLevelClient/generatePagingHelper.d.ts.map +1 -1
- package/dist/src/restLevelClient/generatePagingHelper.js +2 -1
- package/dist/src/restLevelClient/generatePagingHelper.js.map +1 -1
- package/dist/src/restLevelClient/generateParameterTypes.d.ts.map +1 -1
- package/dist/src/restLevelClient/generateParameterTypes.js +186 -36
- package/dist/src/restLevelClient/generateParameterTypes.js.map +1 -1
- package/dist/src/restLevelClient/generatePollingHelper.d.ts.map +1 -1
- package/dist/src/restLevelClient/generatePollingHelper.js +3 -1
- package/dist/src/restLevelClient/generatePollingHelper.js.map +1 -1
- package/dist/src/restLevelClient/generateResponseTypes.d.ts.map +1 -1
- package/dist/src/restLevelClient/generateResponseTypes.js +13 -7
- package/dist/src/restLevelClient/generateResponseTypes.js.map +1 -1
- package/dist/src/restLevelClient/generateRestLevel.d.ts.map +1 -1
- package/dist/src/restLevelClient/generateRestLevel.js +26 -4
- package/dist/src/restLevelClient/generateRestLevel.js.map +1 -1
- package/dist/src/restLevelClient/generateSchemaTypes.d.ts.map +1 -1
- package/dist/src/restLevelClient/generateSchemaTypes.js +5 -2
- package/dist/src/restLevelClient/generateSchemaTypes.js.map +1 -1
- package/dist/src/restLevelClient/generateTopLevelIndexFile.d.ts +4 -0
- package/dist/src/restLevelClient/generateTopLevelIndexFile.d.ts.map +1 -0
- package/dist/src/restLevelClient/generateTopLevelIndexFile.js +41 -0
- package/dist/src/restLevelClient/generateTopLevelIndexFile.js.map +1 -0
- package/dist/src/restLevelClient/helpers/operationHelpers.d.ts +10 -0
- package/dist/src/restLevelClient/helpers/operationHelpers.d.ts.map +1 -0
- package/dist/src/restLevelClient/helpers/operationHelpers.js +64 -0
- package/dist/src/restLevelClient/helpers/operationHelpers.js.map +1 -0
- package/dist/src/restLevelClient/interfaces.d.ts +24 -0
- package/dist/src/restLevelClient/interfaces.d.ts.map +1 -0
- package/dist/src/restLevelClient/interfaces.js +3 -0
- package/dist/src/restLevelClient/interfaces.js.map +1 -0
- package/dist/src/restLevelClient/operationHelpers.d.ts.map +1 -1
- package/dist/src/restLevelClient/operationHelpers.js +4 -1
- package/dist/src/restLevelClient/operationHelpers.js.map +1 -1
- package/dist/src/restLevelClient/schemaHelpers.d.ts.map +1 -1
- package/dist/src/restLevelClient/schemaHelpers.js +4 -1
- package/dist/src/restLevelClient/schemaHelpers.js.map +1 -1
- package/dist/src/transforms/operationTransforms.d.ts.map +1 -1
- package/dist/src/transforms/operationTransforms.js +1 -0
- package/dist/src/transforms/operationTransforms.js.map +1 -1
- package/dist/src/transforms/samplesTransforms.d.ts +7 -0
- package/dist/src/transforms/samplesTransforms.d.ts.map +1 -0
- package/dist/src/transforms/samplesTransforms.js +283 -0
- package/dist/src/transforms/samplesTransforms.js.map +1 -0
- package/dist/src/transforms/transforms.d.ts +1 -2
- package/dist/src/transforms/transforms.d.ts.map +1 -1
- package/dist/src/transforms/transforms.js +4 -3
- package/dist/src/transforms/transforms.js.map +1 -1
- package/dist/src/typescriptGenerator.d.ts +2 -2
- package/dist/src/typescriptGenerator.d.ts.map +1 -1
- package/dist/src/typescriptGenerator.js +19 -8
- package/dist/src/typescriptGenerator.js.map +1 -1
- package/dist/src/utils/autorestOptions.d.ts +2 -2
- package/dist/src/utils/autorestOptions.d.ts.map +1 -1
- package/dist/src/utils/autorestOptions.js +107 -30
- package/dist/src/utils/autorestOptions.js.map +1 -1
- package/dist/src/utils/nameUtils.d.ts +6 -2
- package/dist/src/utils/nameUtils.d.ts.map +1 -1
- package/dist/src/utils/nameUtils.js +9 -5
- package/dist/src/utils/nameUtils.js.map +1 -1
- package/dist/src/utils/schemaHelpers.js +8 -3
- package/dist/src/utils/schemaHelpers.js.map +1 -1
- package/package.json +16 -10
- package/src/autorestSession.ts +20 -16
- package/src/conflictResolver.ts +0 -1
- package/src/generators/clientFileGenerator.ts +264 -33
- package/src/generators/indexGenerator.ts +78 -9
- package/src/generators/modelsGenerator.ts +21 -1
- package/src/generators/operationGenerator.ts +11 -9
- package/src/generators/samples/sampleEnv.hbs +4 -0
- package/src/generators/samples/sampleEnvGenerator.ts +14 -0
- package/src/generators/samples/sampleGenerator.ts +50 -0
- package/src/generators/static/apiExtractorConfig.ts +2 -2
- package/src/generators/static/esLintConfigGenerator.ts +24 -0
- package/src/generators/static/{README.md.hbs → hlcREADME.md.hbs} +23 -0
- package/src/generators/static/karma.conf.js.hbs +141 -0
- package/src/generators/static/karmaConfigFileGenerator.ts +20 -0
- package/src/generators/static/packageFileGenerator.ts +187 -48
- package/src/generators/static/readmeFileGenerator.ts +64 -35
- package/src/generators/static/rlcREADME.md.hbs +71 -0
- package/src/generators/static/rollupConfigFileGenerator.ts +13 -71
- package/src/generators/static/samples.ts.hbs +49 -0
- package/src/generators/static/tsConfigFileGenerator.ts +47 -20
- package/src/generators/test/envBrowserFileGenerator.ts +14 -0
- package/src/generators/test/envFileGenerator.ts +22 -0
- package/src/generators/test/recordedClientFileGenerator.ts +22 -0
- package/src/generators/test/rlcEnv.ts.hbs +3 -0
- package/src/generators/test/rlcRecordedClient.ts.hbs +35 -0
- package/src/generators/test/rlcSampleTest.spec.ts.hbs +19 -0
- package/src/generators/{static → test}/sampleTest.ts.hbs +0 -0
- package/src/generators/test/sampleTestGenerator.ts +23 -8
- package/src/generators/utils/pagingOperations.ts +1 -1
- package/src/main.ts +8 -5
- package/src/models/clientDetails.ts +8 -0
- package/src/models/modelDetails.ts +2 -2
- package/src/models/operationDetails.ts +1 -0
- package/src/models/sampleDetails.ts +22 -0
- package/src/restLevelClient/generateClient.ts +99 -250
- package/src/restLevelClient/generateClientDefinition.ts +343 -0
- package/src/restLevelClient/generateMethodShortcuts.ts +121 -0
- package/src/restLevelClient/generateObjectTypes.ts +1 -3
- package/src/restLevelClient/generatePagingHelper.ts +3 -2
- package/src/restLevelClient/generateParameterTypes.ts +295 -70
- package/src/restLevelClient/generatePollingHelper.ts +3 -3
- package/src/restLevelClient/generateResponseTypes.ts +13 -7
- package/src/restLevelClient/generateRestLevel.ts +32 -7
- package/src/restLevelClient/generateSchemaTypes.ts +5 -3
- package/src/restLevelClient/generateTopLevelIndexFile.ts +41 -0
- package/src/restLevelClient/helpers/operationHelpers.ts +93 -0
- package/src/restLevelClient/interfaces.ts +26 -0
- package/src/restLevelClient/operationHelpers.ts +8 -2
- package/src/restLevelClient/schemaHelpers.ts +4 -2
- package/src/transforms/operationTransforms.ts +1 -0
- package/src/transforms/samplesTransforms.ts +300 -0
- package/src/transforms/transforms.ts +6 -6
- package/src/typescriptGenerator.ts +20 -11
- package/src/utils/autorestOptions.ts +170 -59
- package/src/utils/nameUtils.ts +16 -8
- package/src/utils/schemaHelpers.ts +2 -2
- package/dist/src/generators/clientContextFileGenerator.d.ts +0 -5
- package/dist/src/generators/clientContextFileGenerator.d.ts.map +0 -1
- package/dist/src/generators/clientContextFileGenerator.js +0 -263
- package/dist/src/generators/clientContextFileGenerator.js.map +0 -1
- package/dist/src/restLevelClient/helpers/getOperationParameters.d.ts +0 -6
- package/dist/src/restLevelClient/helpers/getOperationParameters.d.ts.map +0 -1
- package/dist/src/restLevelClient/helpers/getOperationParameters.js +0 -29
- package/dist/src/restLevelClient/helpers/getOperationParameters.js.map +0 -1
- package/src/generators/clientContextFileGenerator.ts +0 -405
- package/src/restLevelClient/helpers/getOperationParameters.ts +0 -34
|
@@ -21,6 +21,7 @@ function extractAutorestOptions() {
|
|
|
21
21
|
const host = autorestSession_1.getHost();
|
|
22
22
|
const useCoreV2 = yield getUseCoreV2(host);
|
|
23
23
|
const restLevelClient = yield getRestLevelClient(host);
|
|
24
|
+
const rlcShortcut = yield getHasShortcutMethods(host);
|
|
24
25
|
const azureArm = yield getIsAzureArm(host);
|
|
25
26
|
const addCredentials = yield getAddCredentials(host);
|
|
26
27
|
const credentialKeyHeaderName = yield getKeyCredentialHeaderName(host);
|
|
@@ -41,12 +42,20 @@ function extractAutorestOptions() {
|
|
|
41
42
|
const headAsBoolean = yield getHeadAsBoolean(host);
|
|
42
43
|
const isTestPackage = yield getIsTestPackage(host);
|
|
43
44
|
const generateTest = yield getGenerateTest(host);
|
|
45
|
+
const batch = yield getBatch(host);
|
|
46
|
+
const multiClient = yield getMultiClient(host);
|
|
47
|
+
const generateSample = yield getGenerateSample(host);
|
|
48
|
+
const productDocLink = yield getProductDocLink(host);
|
|
49
|
+
const coreHttpCompatMode = yield getCoreHttpCompatMode(host);
|
|
50
|
+
const azureSdkForJs = yield getAzureSdkForJs(host);
|
|
51
|
+
const dependencyInfo = yield getDependencyInfo(host);
|
|
44
52
|
return {
|
|
45
53
|
azureArm,
|
|
46
54
|
addCredentials,
|
|
47
55
|
credentialKeyHeaderName,
|
|
48
56
|
credentialScopes,
|
|
49
57
|
restLevelClient,
|
|
58
|
+
rlcShortcut,
|
|
50
59
|
srcPath,
|
|
51
60
|
outputPath,
|
|
52
61
|
packageDetails,
|
|
@@ -64,90 +73,115 @@ function extractAutorestOptions() {
|
|
|
64
73
|
headAsBoolean,
|
|
65
74
|
isTestPackage,
|
|
66
75
|
generateTest,
|
|
76
|
+
batch,
|
|
77
|
+
multiClient,
|
|
78
|
+
generateSample,
|
|
79
|
+
azureSdkForJs,
|
|
80
|
+
productDocLink,
|
|
81
|
+
coreHttpCompatMode,
|
|
82
|
+
dependencyInfo
|
|
67
83
|
};
|
|
68
84
|
});
|
|
69
85
|
}
|
|
70
86
|
exports.extractAutorestOptions = extractAutorestOptions;
|
|
87
|
+
function getHasShortcutMethods(host) {
|
|
88
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
89
|
+
const headAsBoolean = yield host.getValue("rlc-shortcut");
|
|
90
|
+
return Boolean(headAsBoolean);
|
|
91
|
+
});
|
|
92
|
+
}
|
|
71
93
|
function getHeadAsBoolean(host) {
|
|
72
94
|
return __awaiter(this, void 0, void 0, function* () {
|
|
73
|
-
const headAsBoolean = yield host.
|
|
95
|
+
const headAsBoolean = yield host.getValue("head-as-boolean");
|
|
74
96
|
return Boolean(headAsBoolean);
|
|
75
97
|
});
|
|
76
98
|
}
|
|
77
99
|
function getIsTestPackage(host) {
|
|
78
100
|
return __awaiter(this, void 0, void 0, function* () {
|
|
79
|
-
const isTestPackage = yield host.
|
|
101
|
+
const isTestPackage = yield host.getValue("is-test-package");
|
|
80
102
|
return isTestPackage === null ? false : Boolean(isTestPackage);
|
|
81
103
|
});
|
|
82
104
|
}
|
|
83
105
|
function getGenerateTest(host) {
|
|
84
106
|
return __awaiter(this, void 0, void 0, function* () {
|
|
85
|
-
const generateTest = yield host.
|
|
107
|
+
const generateTest = yield host.getValue("generate-test");
|
|
86
108
|
return generateTest === null ? false : Boolean(generateTest);
|
|
87
109
|
});
|
|
88
110
|
}
|
|
111
|
+
function getGenerateSample(host) {
|
|
112
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
113
|
+
const generateSample = yield host.getValue("generate-sample");
|
|
114
|
+
return generateSample === null ? false : Boolean(generateSample);
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
function getAzureSdkForJs(host) {
|
|
118
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
119
|
+
const azureSdkForJs = yield host.getValue("azure-sdk-for-js");
|
|
120
|
+
return azureSdkForJs === null ? true : Boolean(azureSdkForJs);
|
|
121
|
+
});
|
|
122
|
+
}
|
|
89
123
|
function getSkipEnumValidation(host) {
|
|
90
124
|
return __awaiter(this, void 0, void 0, function* () {
|
|
91
|
-
const skipEnumValidation = yield host.
|
|
125
|
+
const skipEnumValidation = yield host.getValue("skip-enum-validation");
|
|
92
126
|
return skipEnumValidation === true;
|
|
93
127
|
});
|
|
94
128
|
}
|
|
95
129
|
function getAllowInsecureConnection(host) {
|
|
96
130
|
return __awaiter(this, void 0, void 0, function* () {
|
|
97
|
-
return (yield host.
|
|
131
|
+
return (yield host.getValue("allow-insecure-connection")) || false;
|
|
98
132
|
});
|
|
99
133
|
}
|
|
100
134
|
function getIgnoreNullableOnOptional(host) {
|
|
101
135
|
return __awaiter(this, void 0, void 0, function* () {
|
|
102
136
|
const isAzureArm = yield getIsAzureArm(host);
|
|
103
|
-
return (yield host.
|
|
137
|
+
return (yield host.getValue("ignore-nullable-on-optional"))
|
|
104
138
|
? true
|
|
105
139
|
: isAzureArm;
|
|
106
140
|
});
|
|
107
141
|
}
|
|
108
142
|
function getDisableAsyncOperators(host) {
|
|
109
143
|
return __awaiter(this, void 0, void 0, function* () {
|
|
110
|
-
return (yield host.
|
|
144
|
+
return (yield host.getValue("disable-async-iterators")) === true;
|
|
111
145
|
});
|
|
112
146
|
}
|
|
113
147
|
function getHideClients(host) {
|
|
114
148
|
return __awaiter(this, void 0, void 0, function* () {
|
|
115
|
-
return (yield host.
|
|
149
|
+
return (yield host.getValue("hide-clients")) || false;
|
|
116
150
|
});
|
|
117
151
|
}
|
|
118
152
|
function getGenerateMetadata(host) {
|
|
119
153
|
return __awaiter(this, void 0, void 0, function* () {
|
|
120
|
-
return (yield host.
|
|
154
|
+
return (yield host.getValue("generate-metadata")) !== false;
|
|
121
155
|
});
|
|
122
156
|
}
|
|
123
157
|
function getLicenseHeader(host) {
|
|
124
158
|
return __awaiter(this, void 0, void 0, function* () {
|
|
125
|
-
return (yield host.
|
|
159
|
+
return (yield host.getValue("license-header")) || false;
|
|
126
160
|
});
|
|
127
161
|
}
|
|
128
162
|
function getTitle(host) {
|
|
129
163
|
return __awaiter(this, void 0, void 0, function* () {
|
|
130
|
-
return (yield host.
|
|
164
|
+
return (yield host.getValue("title")) || undefined;
|
|
131
165
|
});
|
|
132
166
|
}
|
|
133
167
|
function getSrcPath(host) {
|
|
134
168
|
return __awaiter(this, void 0, void 0, function* () {
|
|
135
|
-
return (yield host.
|
|
169
|
+
return (yield host.getValue("source-code-folder-path")) || "src";
|
|
136
170
|
});
|
|
137
171
|
}
|
|
138
172
|
function getOutputPath(host) {
|
|
139
173
|
return __awaiter(this, void 0, void 0, function* () {
|
|
140
|
-
return (yield host.
|
|
174
|
+
return (yield host.getValue("output-folder")) || undefined;
|
|
141
175
|
});
|
|
142
176
|
}
|
|
143
177
|
function getKeyCredentialHeaderName(host) {
|
|
144
178
|
return __awaiter(this, void 0, void 0, function* () {
|
|
145
|
-
return (yield host.
|
|
179
|
+
return (yield host.getValue("credential-key-header-name")) || undefined;
|
|
146
180
|
});
|
|
147
181
|
}
|
|
148
182
|
function getAddCredentials(host) {
|
|
149
183
|
return __awaiter(this, void 0, void 0, function* () {
|
|
150
|
-
const addCredentials = yield host.
|
|
184
|
+
const addCredentials = yield host.getValue("add-credentials");
|
|
151
185
|
// Only set addCredentials to false if explicitly set to false
|
|
152
186
|
// otherwise default to true
|
|
153
187
|
if (addCredentials === false) {
|
|
@@ -160,30 +194,30 @@ function getAddCredentials(host) {
|
|
|
160
194
|
}
|
|
161
195
|
function getIsAzureArm(host) {
|
|
162
196
|
return __awaiter(this, void 0, void 0, function* () {
|
|
163
|
-
const flag = (yield host.
|
|
164
|
-
const openapi = (yield host.
|
|
197
|
+
const flag = (yield host.getValue("azure-arm")) === true;
|
|
198
|
+
const openapi = (yield host.getValue("openapi-type")) === "arm";
|
|
165
199
|
return flag || openapi;
|
|
166
200
|
});
|
|
167
201
|
}
|
|
168
202
|
function getRestLevelClient(host) {
|
|
169
203
|
return __awaiter(this, void 0, void 0, function* () {
|
|
170
|
-
return (yield host.
|
|
204
|
+
return (yield host.getValue("rest-level-client")) === true;
|
|
171
205
|
});
|
|
172
206
|
}
|
|
173
207
|
function getUseCoreV2(host) {
|
|
174
208
|
return __awaiter(this, void 0, void 0, function* () {
|
|
175
|
-
const useCoreV2Option = yield host.
|
|
209
|
+
const useCoreV2Option = yield host.getValue("use-core-v2");
|
|
176
210
|
return useCoreV2Option === null ? true : Boolean(useCoreV2Option);
|
|
177
211
|
});
|
|
178
212
|
}
|
|
179
213
|
function getTracingInfo(host) {
|
|
180
214
|
return __awaiter(this, void 0, void 0, function* () {
|
|
181
|
-
const tracing = (yield host.
|
|
215
|
+
const tracing = (yield host.getValue("tracing-info")) || undefined;
|
|
182
216
|
if (tracing && tracing.namespace && tracing.packagePrefix) {
|
|
183
217
|
return tracing;
|
|
184
218
|
}
|
|
185
|
-
const namespace = (yield host.
|
|
186
|
-
const packagePrefix = (yield host.
|
|
219
|
+
const namespace = (yield host.getValue("tracing-info.namespace")) || undefined;
|
|
220
|
+
const packagePrefix = (yield host.getValue("tracing-info.packagePrefix")) || undefined;
|
|
187
221
|
if (packagePrefix && namespace) {
|
|
188
222
|
return {
|
|
189
223
|
namespace,
|
|
@@ -197,13 +231,14 @@ function getTracingInfo(host) {
|
|
|
197
231
|
});
|
|
198
232
|
}
|
|
199
233
|
function getPackageDetails(host) {
|
|
234
|
+
var _a;
|
|
200
235
|
return __awaiter(this, void 0, void 0, function* () {
|
|
201
236
|
const { model } = autorestSession_1.getSession();
|
|
202
237
|
const name = nameUtils_1.normalizeName(model.language.default.name, nameUtils_1.NameType.File);
|
|
203
238
|
// TODO: Look for an existing package.json and
|
|
204
|
-
const packageName = (yield host.
|
|
205
|
-
const packageNameParts = packageName.match(/(^@(.*)\/)?(.*)/);
|
|
206
|
-
const version = (yield host.
|
|
239
|
+
const packageName = (yield host.getValue("package-name")) || name;
|
|
240
|
+
const packageNameParts = (_a = packageName.match(/(^@(.*)\/)?(.*)/)) !== null && _a !== void 0 ? _a : [];
|
|
241
|
+
const version = (yield host.getValue("package-version")) || "1.0.0-beta.1";
|
|
207
242
|
return {
|
|
208
243
|
name: packageName,
|
|
209
244
|
scopeName: packageNameParts[2],
|
|
@@ -215,9 +250,9 @@ function getPackageDetails(host) {
|
|
|
215
250
|
}
|
|
216
251
|
function getCredentialScopes(host) {
|
|
217
252
|
return __awaiter(this, void 0, void 0, function* () {
|
|
218
|
-
const addCredentials = yield host.
|
|
219
|
-
const credentialScopes = yield host.
|
|
220
|
-
const azureArm = yield host.
|
|
253
|
+
const addCredentials = yield host.getValue("add-credentials");
|
|
254
|
+
const credentialScopes = yield host.getValue("credential-scopes");
|
|
255
|
+
const azureArm = yield host.getValue("azure-arm");
|
|
221
256
|
if (credentialScopes && !addCredentials) {
|
|
222
257
|
throw new Error("--credential-scopes must be used with the --add-credentials flag");
|
|
223
258
|
}
|
|
@@ -226,7 +261,7 @@ function getCredentialScopes(host) {
|
|
|
226
261
|
return ["https://management.azure.com/.default"];
|
|
227
262
|
}
|
|
228
263
|
else if (addCredentials) {
|
|
229
|
-
host.
|
|
264
|
+
host.message({
|
|
230
265
|
Channel: extension_base_1.Channel.Warning,
|
|
231
266
|
Text: `You have default credential policy BearerTokenCredentialPolicy
|
|
232
267
|
but not the --credential-scopes flag set while generating non-management plane code.
|
|
@@ -244,11 +279,53 @@ function getCredentialScopes(host) {
|
|
|
244
279
|
exports.getCredentialScopes = getCredentialScopes;
|
|
245
280
|
function getAzureOutputDirectoryPath(host) {
|
|
246
281
|
return __awaiter(this, void 0, void 0, function* () {
|
|
247
|
-
const outputDirectoryPath = yield host.
|
|
282
|
+
const outputDirectoryPath = yield host.getValue("outputFolderUri");
|
|
248
283
|
const outputDirectoryRelativePath = outputDirectoryPath === null || outputDirectoryPath === void 0 ? void 0 : outputDirectoryPath.replace(/\/$/, "").split("/").slice(-3).join("/");
|
|
249
284
|
return (outputDirectoryRelativePath === null || outputDirectoryRelativePath === void 0 ? void 0 : outputDirectoryRelativePath.substr(0, 3)) === "sdk"
|
|
250
285
|
? outputDirectoryRelativePath
|
|
251
286
|
: undefined;
|
|
252
287
|
});
|
|
253
288
|
}
|
|
289
|
+
function getBatch(host) {
|
|
290
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
291
|
+
const batch = yield host.getValue("batch");
|
|
292
|
+
return batch;
|
|
293
|
+
});
|
|
294
|
+
}
|
|
295
|
+
function getProductDocLink(host) {
|
|
296
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
297
|
+
return (yield host.getValue("product-doc-link")) || undefined;
|
|
298
|
+
});
|
|
299
|
+
}
|
|
300
|
+
function getMultiClient(host) {
|
|
301
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
302
|
+
const multiClient = (yield host.getValue("multi-client")) || undefined;
|
|
303
|
+
return !!multiClient;
|
|
304
|
+
});
|
|
305
|
+
}
|
|
306
|
+
function getCoreHttpCompatMode(host) {
|
|
307
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
308
|
+
return (yield host.getValue("core-http-compat-mode")) || false;
|
|
309
|
+
});
|
|
310
|
+
}
|
|
311
|
+
function getDependencyInfo(host) {
|
|
312
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
313
|
+
const dependency = (yield host.getValue("dependency-info")) || undefined;
|
|
314
|
+
if (dependency && dependency.description && dependency.link) {
|
|
315
|
+
return dependency;
|
|
316
|
+
}
|
|
317
|
+
const link = (yield host.getValue("dependency-info.link")) || undefined;
|
|
318
|
+
const description = (yield host.getValue("dependency-info.description")) || undefined;
|
|
319
|
+
if (description && link) {
|
|
320
|
+
return {
|
|
321
|
+
link,
|
|
322
|
+
description
|
|
323
|
+
};
|
|
324
|
+
}
|
|
325
|
+
if (!dependency && !description && !link) {
|
|
326
|
+
return undefined;
|
|
327
|
+
}
|
|
328
|
+
throw new Error("Invalid dependency-info. Make sure that link and description are defined");
|
|
329
|
+
});
|
|
330
|
+
}
|
|
254
331
|
//# sourceMappingURL=autorestOptions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autorestOptions.js","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"autorestOptions.js","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { Operation, OperationGroup } from "@autorest/codemodel";
|
|
2
2
|
import { TypeDetails } from "../models/modelDetails";
|
|
3
|
+
export interface ReservedName {
|
|
4
|
+
name: string;
|
|
5
|
+
reservedFor: NameType[];
|
|
6
|
+
}
|
|
3
7
|
export declare enum NameType {
|
|
4
8
|
Class = 0,
|
|
5
9
|
File = 1,
|
|
@@ -13,13 +17,13 @@ export declare enum CasingConvention {
|
|
|
13
17
|
Pascal = 0,
|
|
14
18
|
Camel = 1
|
|
15
19
|
}
|
|
16
|
-
export declare function guardReservedNames(name: string, nameType: NameType): string;
|
|
20
|
+
export declare function guardReservedNames(name: string, nameType: NameType, customReservedNames?: ReservedName[]): string;
|
|
17
21
|
/**
|
|
18
22
|
* Returns a normalized Type name, this is, the type name capitalized when needed.
|
|
19
23
|
* Otherwise, return the original typename, for example primitives "string", etc. don't need capitalization.
|
|
20
24
|
*/
|
|
21
25
|
export declare function normalizeTypeName({ kind, typeName }: TypeDetails): string;
|
|
22
|
-
export declare function normalizeName(name: string, nameType: NameType, shouldGuard?: boolean): string;
|
|
26
|
+
export declare function normalizeName(name: string, nameType: NameType, shouldGuard?: boolean, customReservedNames?: ReservedName[], casingOverride?: CasingConvention): string;
|
|
23
27
|
export declare function getModelsName(title: string): string;
|
|
24
28
|
export declare function getMappersName(title: string): string;
|
|
25
29
|
export declare function getOperationFullName(operationGroup: OperationGroup, operation: Operation, clientName: string): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nameUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/nameUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAgB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"nameUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/nameUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAgB,MAAM,wBAAwB,CAAC;AAEnE,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,QAAQ,EAAE,CAAC;CACzB;AAED,oBAAY,QAAQ;IAClB,KAAK,IAAA;IACL,IAAI,IAAA;IACJ,SAAS,IAAA;IACT,QAAQ,IAAA;IACR,SAAS,IAAA;IACT,SAAS,IAAA;IACT,cAAc,IAAA;CACf;AAuED,oBAAY,gBAAgB;IAC1B,MAAM,IAAA;IACN,KAAK,IAAA;CACN;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,GAAE,YAAY,EAAO,GACvC,MAAM,CAOR;AAmBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,WAAW,UAQhE;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,QAAQ,EAClB,WAAW,CAAC,EAAE,OAAO,EACrB,mBAAmB,GAAE,YAAY,EAAO,EACxC,cAAc,CAAC,EAAE,gBAAgB,GAChC,MAAM,CAmBR;AAcD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGnD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGpD;AAwCD,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,UAYnB"}
|
|
@@ -85,9 +85,11 @@ var CasingConvention;
|
|
|
85
85
|
CasingConvention[CasingConvention["Pascal"] = 0] = "Pascal";
|
|
86
86
|
CasingConvention[CasingConvention["Camel"] = 1] = "Camel";
|
|
87
87
|
})(CasingConvention = exports.CasingConvention || (exports.CasingConvention = {}));
|
|
88
|
-
function guardReservedNames(name, nameType) {
|
|
88
|
+
function guardReservedNames(name, nameType, customReservedNames = []) {
|
|
89
89
|
const suffix = getSuffix(nameType);
|
|
90
|
-
return ReservedModelNames
|
|
90
|
+
return [...ReservedModelNames, ...customReservedNames]
|
|
91
|
+
.filter(r => r.reservedFor.includes(nameType))
|
|
92
|
+
.find(r => r.name === name.toLowerCase())
|
|
91
93
|
? `${name}${suffix}`
|
|
92
94
|
: name;
|
|
93
95
|
}
|
|
@@ -121,11 +123,11 @@ function normalizeTypeName({ kind, typeName }) {
|
|
|
121
123
|
return typeName;
|
|
122
124
|
}
|
|
123
125
|
exports.normalizeTypeName = normalizeTypeName;
|
|
124
|
-
function normalizeName(name, nameType, shouldGuard) {
|
|
126
|
+
function normalizeName(name, nameType, shouldGuard, customReservedNames = [], casingOverride) {
|
|
125
127
|
if (name.startsWith("$DO_NOT_NORMALIZE$")) {
|
|
126
128
|
return name.replace("$DO_NOT_NORMALIZE$", "");
|
|
127
129
|
}
|
|
128
|
-
const casingConvention = getCasingConvention(nameType);
|
|
130
|
+
const casingConvention = casingOverride !== null && casingOverride !== void 0 ? casingOverride : getCasingConvention(nameType);
|
|
129
131
|
const sanitizedName = sanitizeName(name);
|
|
130
132
|
const parts = getNameParts(sanitizedName);
|
|
131
133
|
const [firstPart, ...otherParts] = parts;
|
|
@@ -134,7 +136,9 @@ function normalizeName(name, nameType, shouldGuard) {
|
|
|
134
136
|
.map(part => part === "null" ? part : toCasing(part, CasingConvention.Pascal))
|
|
135
137
|
.join("");
|
|
136
138
|
const normalized = checkBeginning(`${normalizedFirstPart}${normalizedParts}`);
|
|
137
|
-
return shouldGuard
|
|
139
|
+
return shouldGuard
|
|
140
|
+
? guardReservedNames(normalized, nameType, customReservedNames)
|
|
141
|
+
: normalized;
|
|
138
142
|
}
|
|
139
143
|
exports.normalizeName = normalizeName;
|
|
140
144
|
function checkBeginning(name) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nameUtils.js","sourceRoot":"","sources":["../../../src/utils/nameUtils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"nameUtils.js","sourceRoot":"","sources":["../../../src/utils/nameUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,7 @@ exports.getAdditionalProperties = getAdditionalProperties;
|
|
|
45
45
|
function getTypeForSchema(schema, isNullable = false, useCoreV2 = false) {
|
|
46
46
|
let typeName = "";
|
|
47
47
|
let usedModels = [];
|
|
48
|
-
let defaultValue =
|
|
48
|
+
let defaultValue = undefined;
|
|
49
49
|
let kind = modelDetails_1.PropertyKind.Primitive;
|
|
50
50
|
switch (schema.type) {
|
|
51
51
|
case codemodel_1.SchemaType.Any:
|
|
@@ -145,9 +145,14 @@ function getTypeForSchema(schema, isNullable = false, useCoreV2 = false) {
|
|
|
145
145
|
throw new Error(`Handling of ${schema.type} hasn't been implemented yet`);
|
|
146
146
|
}
|
|
147
147
|
typeName = isNullable ? typeName + " | null" : typeName;
|
|
148
|
-
return
|
|
148
|
+
return {
|
|
149
|
+
typeName,
|
|
149
150
|
kind,
|
|
150
|
-
usedModels,
|
|
151
|
+
usedModels,
|
|
152
|
+
isConstant: schema.type === codemodel_1.SchemaType.Constant,
|
|
153
|
+
nullable: isNullable,
|
|
154
|
+
defaultValue
|
|
155
|
+
};
|
|
151
156
|
}
|
|
152
157
|
exports.getTypeForSchema = getTypeForSchema;
|
|
153
158
|
function isModelNeeded({ kind }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaHelpers.js","sourceRoot":"","sources":["../../../src/utils/schemaHelpers.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,yDAAmE;AAEnE,mDAS6B;AAC7B,iDAAmD;AACnD,uDAAwD;AACxD,2CAAyE;AAEzE;;;;GAIG;AACH,SAAgB,gBAAgB,CAC9B,EAAE,OAAO,EAAgB,EACzB,aAAa,GAAG,KAAK;IAErB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,EAAE,CAAC;KACX;IAED,MAAM,UAAU,GAAoB,aAAa;QAC/C,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IAEhB,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAU,CAAC,MAAM,CAAC,CAAC;AAC9D,CAAC;AAbD,4CAaC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CACrC,EAAE,OAAO,EAAgB,EACzB,aAAa,GAAG,KAAK;IAErB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,UAAU,GAAoB,aAAa;QAC/C,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IAEhB,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAU,CAAC,UAAU,CAAC,CAAC;AAChE,CAAC;AAbD,0DAaC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAC9B,MAAc,EACd,aAAsB,KAAK,EAC3B,YAAqB,KAAK;IAE1B,IAAI,QAAQ,GAAW,EAAE,CAAC;IAC1B,IAAI,UAAU,GAAa,EAAE,CAAC;IAC9B,IAAI,YAAY,
|
|
1
|
+
{"version":3,"file":"schemaHelpers.js","sourceRoot":"","sources":["../../../src/utils/schemaHelpers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@autorest/typescript",
|
|
3
|
-
"version": "6.0.0-beta.
|
|
3
|
+
"version": "6.0.0-beta.17",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"build": "tsc -p . && npm run copyFiles",
|
|
6
6
|
"build:test:browser": "tsc -p tsconfig.browser-test.json && webpack --config webpack.config.test.js",
|
|
@@ -15,12 +15,16 @@
|
|
|
15
15
|
"integration-test:new": "npm-run-all start-test-server generate-and-test integration-test:alone stop-test-server",
|
|
16
16
|
"integration-test:browser": "npm run build:test:browser && karma start karma.conf.js",
|
|
17
17
|
"generate-and-test": "npm-run-all -s build generate-swaggers integration-test:alone integration-test:browser",
|
|
18
|
-
"integration-test:alone": "mocha -r ts-node/register --timeout 2000 './test/integration
|
|
18
|
+
"integration-test:alone": "mocha -r ts-node/register --timeout 2000 './test/integration/**/!(sampleTest).spec.ts'",
|
|
19
19
|
"start-test-server": "ts-node test/utils/start-server.ts",
|
|
20
20
|
"start-test-server:v2": "autorest-testserver",
|
|
21
21
|
"stop-test-server": "autorest-testserver stop",
|
|
22
22
|
"debug": "node --inspect-brk ./dist/src/main.js",
|
|
23
23
|
"generate-swaggers": "ts-node ./test/utils/test-swagger-gen.ts",
|
|
24
|
+
"validate-version-tolerance": "npm run start-test-server:v2 & npm run generate-version-tolerance && npm run generate-version-tolerance:tests && npm run test-version-tolerance && npm run stop-test-server",
|
|
25
|
+
"generate-version-tolerance": "ts-node ./test/utils/version-tolerance.ts",
|
|
26
|
+
"generate-version-tolerance:tests": "ts-node ./test/utils/version-tolerance.ts --test-gen",
|
|
27
|
+
"test-version-tolerance": "mocha -r ts-node/register --timeout 2000 './test/version-tolerance/**/!(sampleTest).spec.ts'",
|
|
24
28
|
"clone:specs": "git clone https://github.com/Azure/azure-rest-api-specs.git ./.tmp/specs",
|
|
25
29
|
"smoke-test": "ts-node ./test/utils/smoke-test.ts",
|
|
26
30
|
"copyFiles": "copyfiles src/**/*.hbs dist/ && copyfiles src/**/**/*.hbs dist/"
|
|
@@ -32,25 +36,27 @@
|
|
|
32
36
|
"LICENSE"
|
|
33
37
|
],
|
|
34
38
|
"dependencies": {
|
|
35
|
-
"@autorest/codemodel": "^4.
|
|
36
|
-
"@autorest/extension-base": "^3.
|
|
37
|
-
"@azure-rest/core-client": "
|
|
39
|
+
"@autorest/codemodel": "^4.17.0",
|
|
40
|
+
"@autorest/extension-base": "^3.4.1",
|
|
41
|
+
"@azure-rest/core-client": "1.0.0-alpha.20220112.1",
|
|
42
|
+
"@autorest/testmodeler": "^1.0.4",
|
|
38
43
|
"@azure-tools/codegen": "^2.5.294",
|
|
39
44
|
"@azure/core-client": "^1.3.0",
|
|
40
45
|
"@azure/core-http": "^1.2.4",
|
|
46
|
+
"@azure/core-http-compat": "^1.1.0",
|
|
41
47
|
"@azure/core-lro": "^2.1.0",
|
|
42
48
|
"@azure/core-paging": "^1.2.0",
|
|
43
|
-
"@azure/core-tracing": "^1.0.0-preview.12",
|
|
44
49
|
"@azure/core-rest-pipeline": "^1.3.0",
|
|
50
|
+
"@azure/core-tracing": "^1.0.0-preview.12",
|
|
45
51
|
"@azure/logger": "^1.0.0",
|
|
46
52
|
"@opentelemetry/api": "^0.10.2",
|
|
47
53
|
"@types/lodash": "^4.14.149",
|
|
54
|
+
"fs-extra": "^10.0.0",
|
|
48
55
|
"handlebars": "^4.7.7",
|
|
49
56
|
"lodash": "^4.17.21",
|
|
50
57
|
"prettier": "^1.19.1",
|
|
51
58
|
"source-map-support": "^0.5.16",
|
|
52
|
-
"ts-morph": "^9.0.0"
|
|
53
|
-
"fs-extra": "^10.0.0"
|
|
59
|
+
"ts-morph": "^9.0.0"
|
|
54
60
|
},
|
|
55
61
|
"devDependencies": {
|
|
56
62
|
"@autorest/test-server": "^3.0.27",
|
|
@@ -58,7 +64,7 @@
|
|
|
58
64
|
"@azure/abort-controller": "^1.0.1",
|
|
59
65
|
"@azure/core-util": "^1.0.0-beta.1",
|
|
60
66
|
"@azure/core-xml": "^1.0.0-beta.1",
|
|
61
|
-
"@microsoft.azure/autorest.testserver": "^3.
|
|
67
|
+
"@microsoft.azure/autorest.testserver": "^3.1.6",
|
|
62
68
|
"@types/chai": "^4.2.8",
|
|
63
69
|
"@types/fs-extra": "^8.1.0",
|
|
64
70
|
"@types/js-yaml": "3.12.1",
|
|
@@ -71,7 +77,7 @@
|
|
|
71
77
|
"@types/yargs": "^15.0.4",
|
|
72
78
|
"@typescript-eslint/eslint-plugin": "~2.0.0",
|
|
73
79
|
"@typescript-eslint/parser": "~2.0.0",
|
|
74
|
-
"autorest": "^3.
|
|
80
|
+
"autorest": "^3.4.2",
|
|
75
81
|
"chai": "^4.2.0",
|
|
76
82
|
"chalk": "^4.0.0",
|
|
77
83
|
"copyfiles": "^2.4.1",
|