@autorest/typescript 6.0.60-alpha.20260306.1 → 6.0.61
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/dist/src/generators/static/packageFileGenerator.d.ts +5 -0
- package/dist/src/generators/static/packageFileGenerator.d.ts.map +1 -1
- package/dist/src/generators/static/packageFileGenerator.js +49 -12
- package/dist/src/generators/static/packageFileGenerator.js.map +1 -1
- package/dist/src/typescriptGenerator.d.ts.map +1 -1
- package/dist/src/typescriptGenerator.js +3 -0
- package/dist/src/typescriptGenerator.js.map +1 -1
- package/package.json +2 -2
- package/src/generators/static/packageFileGenerator.ts +51 -12
- package/src/typescriptGenerator.ts +4 -1
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import { Project } from "ts-morph";
|
|
2
2
|
import { ClientDetails } from "../../models/clientDetails";
|
|
3
3
|
export declare function generatePackageJson(project: Project, clientDetails?: ClientDetails): void;
|
|
4
|
+
/**
|
|
5
|
+
* Generates a warp.config.yml file for Azure SDK monorepo packages (HLC).
|
|
6
|
+
* Only generated when azureSdkForJs is true.
|
|
7
|
+
*/
|
|
8
|
+
export declare function generateWarpConfig(project: Project): void;
|
|
4
9
|
//# sourceMappingURL=packageFileGenerator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageFileGenerator.d.ts","sourceRoot":"","sources":["../../../../src/generators/static/packageFileGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"packageFileGenerator.d.ts","sourceRoot":"","sources":["../../../../src/generators/static/packageFileGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAQ3D,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,aAAa,QA6B9B;AA+ND;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,QAYlD"}
|
|
@@ -3,10 +3,12 @@
|
|
|
3
3
|
// Licensed under the MIT License.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.generatePackageJson = generatePackageJson;
|
|
6
|
+
exports.generateWarpConfig = generateWarpConfig;
|
|
6
7
|
const autorestSession_1 = require("../../autorestSession");
|
|
7
8
|
const hasPollingOperations_1 = require("../../restLevelClient/helpers/hasPollingOperations");
|
|
8
9
|
const nameUtils_1 = require("../../utils/nameUtils");
|
|
9
10
|
const schemaHelpers_1 = require("../../utils/schemaHelpers");
|
|
11
|
+
const rlc_common_1 = require("@azure-tools/rlc-common");
|
|
10
12
|
function generatePackageJson(project, clientDetails) {
|
|
11
13
|
const { restLevelClient, generateMetadata, packageDetails } = (0, autorestSession_1.getAutorestOptions)();
|
|
12
14
|
let packageJsonContents;
|
|
@@ -108,28 +110,38 @@ function regularAutorestPackage(clientDetails, packageDetails) {
|
|
|
108
110
|
autoPublish: true,
|
|
109
111
|
browser: "./dist/browser/index.js",
|
|
110
112
|
"react-native": "./dist/react-native/index.js",
|
|
111
|
-
tshy: {
|
|
112
|
-
// only JS sdk repo has tsconfig.src.build.json
|
|
113
|
-
project: azureSdkForJs ? "../../../tsconfig.src.build.json" : undefined,
|
|
114
|
-
exports: {
|
|
115
|
-
"./package.json": "./package.json",
|
|
116
|
-
".": "./src/index.ts",
|
|
117
|
-
},
|
|
118
|
-
dialects: ["esm", "commonjs"],
|
|
119
|
-
esmDialects: ["browser", "react-native"],
|
|
120
|
-
selfLink: false,
|
|
121
|
-
}
|
|
122
113
|
};
|
|
123
114
|
if (azureOutputDirectory) {
|
|
124
115
|
packageInfo.homepage = `https://github.com/Azure/azure-sdk-for-js/tree/main/${azureOutputDirectory}`;
|
|
125
116
|
}
|
|
126
117
|
if (azureSdkForJs) {
|
|
118
|
+
// Azure monorepo packages use warp (via dev-tool run build-package) instead of tshy
|
|
119
|
+
packageInfo.exports = {
|
|
120
|
+
"./package.json": "./package.json",
|
|
121
|
+
".": {
|
|
122
|
+
browser: {
|
|
123
|
+
types: "./dist/browser/index.d.ts",
|
|
124
|
+
default: "./dist/browser/index.js"
|
|
125
|
+
},
|
|
126
|
+
"react-native": {
|
|
127
|
+
types: "./dist/react-native/index.d.ts",
|
|
128
|
+
default: "./dist/react-native/index.js"
|
|
129
|
+
},
|
|
130
|
+
import: {
|
|
131
|
+
types: "./dist/esm/index.d.ts",
|
|
132
|
+
default: "./dist/esm/index.js"
|
|
133
|
+
},
|
|
134
|
+
require: {
|
|
135
|
+
types: "./dist/commonjs/index.d.ts",
|
|
136
|
+
default: "./dist/commonjs/index.js"
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
};
|
|
127
140
|
packageInfo.devDependencies["@azure/dev-tool"] = "workspace:^";
|
|
128
141
|
packageInfo.devDependencies["cross-env"] = "catalog:";
|
|
129
142
|
packageInfo.devDependencies["eslint"] = "catalog:";
|
|
130
143
|
packageInfo.devDependencies["prettier"] = "catalog:";
|
|
131
144
|
packageInfo.devDependencies["rimraf"] = "catalog:";
|
|
132
|
-
packageInfo.devDependencies["tshy"] = "catalog:";
|
|
133
145
|
delete packageInfo.devDependencies["@microsoft/api-extractor"];
|
|
134
146
|
delete packageInfo.devDependencies["mkdirp"];
|
|
135
147
|
packageInfo.scripts["build"] =
|
|
@@ -142,6 +154,16 @@ function regularAutorestPackage(clientDetails, packageDetails) {
|
|
|
142
154
|
packageInfo.scripts["format"] = "prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\" ";
|
|
143
155
|
}
|
|
144
156
|
else {
|
|
157
|
+
// Non-Azure packages use tshy for building
|
|
158
|
+
packageInfo.tshy = {
|
|
159
|
+
exports: {
|
|
160
|
+
"./package.json": "./package.json",
|
|
161
|
+
".": "./src/index.ts"
|
|
162
|
+
},
|
|
163
|
+
dialects: ["esm", "commonjs"],
|
|
164
|
+
esmDialects: ["browser", "react-native"],
|
|
165
|
+
selfLink: false
|
|
166
|
+
};
|
|
145
167
|
packageInfo.devDependencies["@rollup/plugin-commonjs"] = "^24.0.0";
|
|
146
168
|
packageInfo.devDependencies["@rollup/plugin-json"] = "^6.0.0";
|
|
147
169
|
packageInfo.devDependencies["@rollup/plugin-multi-entry"] = "^6.0.0";
|
|
@@ -189,4 +211,19 @@ function regularAutorestPackage(clientDetails, packageDetails) {
|
|
|
189
211
|
}
|
|
190
212
|
return packageInfo;
|
|
191
213
|
}
|
|
214
|
+
/**
|
|
215
|
+
* Generates a warp.config.yml file for Azure SDK monorepo packages (HLC).
|
|
216
|
+
* Only generated when azureSdkForJs is true.
|
|
217
|
+
*/
|
|
218
|
+
function generateWarpConfig(project) {
|
|
219
|
+
const { generateMetadata, azureSdkForJs } = (0, autorestSession_1.getAutorestOptions)();
|
|
220
|
+
if (!generateMetadata || !azureSdkForJs) {
|
|
221
|
+
return;
|
|
222
|
+
}
|
|
223
|
+
const exportsContent = [' "./package.json": "./package.json"', ' ".": "./src/index.ts"'].join("\n");
|
|
224
|
+
const content = rlc_common_1.WarpConfigTemplate.replace("{{exports}}", exportsContent);
|
|
225
|
+
project.createSourceFile("warp.config.yml", content, {
|
|
226
|
+
overwrite: true
|
|
227
|
+
});
|
|
228
|
+
}
|
|
192
229
|
//# sourceMappingURL=packageFileGenerator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageFileGenerator.js","sourceRoot":"","sources":["../../../../src/generators/static/packageFileGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;
|
|
1
|
+
{"version":3,"file":"packageFileGenerator.js","sourceRoot":"","sources":["../../../../src/generators/static/packageFileGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescriptGenerator.d.ts","sourceRoot":"","sources":["../../src/typescriptGenerator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAmDjE,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"typescriptGenerator.d.ts","sourceRoot":"","sources":["../../src/typescriptGenerator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAmDjE,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAkIf"}
|
|
@@ -109,6 +109,9 @@ function generateTypeScriptLibrary(codeModel, host) {
|
|
|
109
109
|
}
|
|
110
110
|
// Skip metadata generation if `generate-metadata` is explicitly false
|
|
111
111
|
(0, packageFileGenerator_1.generatePackageJson)(project, clientDetails);
|
|
112
|
+
if (azureSdkForJs && generateMetadata) {
|
|
113
|
+
(0, packageFileGenerator_1.generateWarpConfig)(project);
|
|
114
|
+
}
|
|
112
115
|
(0, licenseFileGenerator_1.generateLicenseFile)(project);
|
|
113
116
|
(0, readmeFileGenerator_1.generateReadmeFile)(codeModel, project, clientDetails);
|
|
114
117
|
if (generateTest) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescriptGenerator.js","sourceRoot":"","sources":["../../src/typescriptGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0DlC,
|
|
1
|
+
{"version":3,"file":"typescriptGenerator.js","sourceRoot":"","sources":["../../src/typescriptGenerator.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.
|
|
3
|
+
"version": "6.0.61",
|
|
4
4
|
"browser": {
|
|
5
5
|
"./test-browser/utils/stream-helpers.js": "./test-browser/utils/stream-helpers.browser.js",
|
|
6
6
|
"./test-browser/utils/fileSystem.js": "./test-browser/utils/fileSystem.browser.js",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"source-map-support": "^0.5.16",
|
|
36
36
|
"ts-morph": "^23.0.0",
|
|
37
37
|
"@azure/core-auth": "^1.6.0",
|
|
38
|
-
"@azure-tools/rlc-common": "0.50.
|
|
38
|
+
"@azure-tools/rlc-common": "^0.50.2"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@azure-tools/test-recorder": "^3.0.0",
|
|
@@ -8,6 +8,7 @@ import { getAutorestOptions, getSession } from "../../autorestSession";
|
|
|
8
8
|
import { hasPollingOperations } from "../../restLevelClient/helpers/hasPollingOperations";
|
|
9
9
|
import { NameType, normalizeName } from "../../utils/nameUtils";
|
|
10
10
|
import { getSecurityInfoFromModel } from "../../utils/schemaHelpers";
|
|
11
|
+
import { WarpConfigTemplate } from "@azure-tools/rlc-common";
|
|
11
12
|
|
|
12
13
|
export function generatePackageJson(
|
|
13
14
|
project: Project,
|
|
@@ -157,28 +158,38 @@ function regularAutorestPackage(
|
|
|
157
158
|
autoPublish: true,
|
|
158
159
|
browser: "./dist/browser/index.js",
|
|
159
160
|
"react-native": "./dist/react-native/index.js",
|
|
160
|
-
tshy: {
|
|
161
|
-
// only JS sdk repo has tsconfig.src.build.json
|
|
162
|
-
project: azureSdkForJs ? "../../../tsconfig.src.build.json" : undefined,
|
|
163
|
-
exports: {
|
|
164
|
-
"./package.json": "./package.json",
|
|
165
|
-
".": "./src/index.ts",
|
|
166
|
-
},
|
|
167
|
-
dialects: ["esm", "commonjs"],
|
|
168
|
-
esmDialects: ["browser", "react-native"],
|
|
169
|
-
selfLink: false,
|
|
170
|
-
}
|
|
171
161
|
};
|
|
172
162
|
if (azureOutputDirectory) {
|
|
173
163
|
packageInfo.homepage = `https://github.com/Azure/azure-sdk-for-js/tree/main/${azureOutputDirectory}`;
|
|
174
164
|
}
|
|
175
165
|
if (azureSdkForJs) {
|
|
166
|
+
// Azure monorepo packages use warp (via dev-tool run build-package) instead of tshy
|
|
167
|
+
packageInfo.exports = {
|
|
168
|
+
"./package.json": "./package.json",
|
|
169
|
+
".": {
|
|
170
|
+
browser: {
|
|
171
|
+
types: "./dist/browser/index.d.ts",
|
|
172
|
+
default: "./dist/browser/index.js"
|
|
173
|
+
},
|
|
174
|
+
"react-native": {
|
|
175
|
+
types: "./dist/react-native/index.d.ts",
|
|
176
|
+
default: "./dist/react-native/index.js"
|
|
177
|
+
},
|
|
178
|
+
import: {
|
|
179
|
+
types: "./dist/esm/index.d.ts",
|
|
180
|
+
default: "./dist/esm/index.js"
|
|
181
|
+
},
|
|
182
|
+
require: {
|
|
183
|
+
types: "./dist/commonjs/index.d.ts",
|
|
184
|
+
default: "./dist/commonjs/index.js"
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
};
|
|
176
188
|
packageInfo.devDependencies["@azure/dev-tool"] = "workspace:^";
|
|
177
189
|
packageInfo.devDependencies["cross-env"] = "catalog:";
|
|
178
190
|
packageInfo.devDependencies["eslint"] = "catalog:";
|
|
179
191
|
packageInfo.devDependencies["prettier"] = "catalog:";
|
|
180
192
|
packageInfo.devDependencies["rimraf"] = "catalog:";
|
|
181
|
-
packageInfo.devDependencies["tshy"] = "catalog:";
|
|
182
193
|
|
|
183
194
|
delete packageInfo.devDependencies["@microsoft/api-extractor"];
|
|
184
195
|
delete packageInfo.devDependencies["mkdirp"];
|
|
@@ -192,6 +203,16 @@ function regularAutorestPackage(
|
|
|
192
203
|
packageInfo.scripts["check-format"] = "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\" ";
|
|
193
204
|
packageInfo.scripts["format"] = "prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\" ";
|
|
194
205
|
} else {
|
|
206
|
+
// Non-Azure packages use tshy for building
|
|
207
|
+
packageInfo.tshy = {
|
|
208
|
+
exports: {
|
|
209
|
+
"./package.json": "./package.json",
|
|
210
|
+
".": "./src/index.ts"
|
|
211
|
+
},
|
|
212
|
+
dialects: ["esm", "commonjs"],
|
|
213
|
+
esmDialects: ["browser", "react-native"],
|
|
214
|
+
selfLink: false
|
|
215
|
+
};
|
|
195
216
|
packageInfo.devDependencies["@rollup/plugin-commonjs"] = "^24.0.0";
|
|
196
217
|
packageInfo.devDependencies["@rollup/plugin-json"] = "^6.0.0";
|
|
197
218
|
packageInfo.devDependencies["@rollup/plugin-multi-entry"] = "^6.0.0";
|
|
@@ -242,3 +263,21 @@ function regularAutorestPackage(
|
|
|
242
263
|
}
|
|
243
264
|
return packageInfo;
|
|
244
265
|
}
|
|
266
|
+
|
|
267
|
+
/**
|
|
268
|
+
* Generates a warp.config.yml file for Azure SDK monorepo packages (HLC).
|
|
269
|
+
* Only generated when azureSdkForJs is true.
|
|
270
|
+
*/
|
|
271
|
+
export function generateWarpConfig(project: Project) {
|
|
272
|
+
const { generateMetadata, azureSdkForJs } = getAutorestOptions();
|
|
273
|
+
if (!generateMetadata || !azureSdkForJs) {
|
|
274
|
+
return;
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
const exportsContent = [' "./package.json": "./package.json"', ' ".": "./src/index.ts"'].join("\n");
|
|
278
|
+
const content = WarpConfigTemplate.replace("{{exports}}", exportsContent);
|
|
279
|
+
|
|
280
|
+
project.createSourceFile("warp.config.yml", content, {
|
|
281
|
+
overwrite: true
|
|
282
|
+
});
|
|
283
|
+
}
|
|
@@ -13,7 +13,7 @@ import { generateClient } from "./generators/clientFileGenerator";
|
|
|
13
13
|
import { generateModels } from "./generators/modelsGenerator";
|
|
14
14
|
import { generateMappers } from "./generators/mappersGenerator";
|
|
15
15
|
import { generateIndexFile } from "./generators/indexGenerator";
|
|
16
|
-
import { generatePackageJson } from "./generators/static/packageFileGenerator";
|
|
16
|
+
import { generatePackageJson, generateWarpConfig } from "./generators/static/packageFileGenerator";
|
|
17
17
|
import { generateApiExtractorConfig } from "./generators/static/apiExtractorConfig";
|
|
18
18
|
import { generateLicenseFile } from "./generators/static/licenseFileGenerator";
|
|
19
19
|
import { generateReadmeFile } from "./generators/static/readmeFileGenerator";
|
|
@@ -87,6 +87,9 @@ export async function generateTypeScriptLibrary(
|
|
|
87
87
|
}
|
|
88
88
|
// Skip metadata generation if `generate-metadata` is explicitly false
|
|
89
89
|
generatePackageJson(project, clientDetails);
|
|
90
|
+
if (azureSdkForJs && generateMetadata) {
|
|
91
|
+
generateWarpConfig(project);
|
|
92
|
+
}
|
|
90
93
|
generateLicenseFile(project);
|
|
91
94
|
generateReadmeFile(codeModel, project, clientDetails);
|
|
92
95
|
if (generateTest) {
|