@autorest/typescript 6.0.50 → 6.0.51
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.js +14 -10
- package/dist/src/generators/static/packageFileGenerator.js.map +1 -1
- package/dist/src/generators/static/tsConfigFileGenerator.d.ts +0 -1
- package/dist/src/generators/static/tsConfigFileGenerator.d.ts.map +1 -1
- package/dist/src/generators/static/tsConfigFileGenerator.js +0 -9
- package/dist/src/generators/static/tsConfigFileGenerator.js.map +1 -1
- package/dist/src/generators/static/tsConfigTestFileGenerator.d.ts +3 -0
- package/dist/src/generators/static/tsConfigTestFileGenerator.d.ts.map +1 -0
- package/dist/src/generators/static/tsConfigTestFileGenerator.js +54 -0
- package/dist/src/generators/static/tsConfigTestFileGenerator.js.map +1 -0
- package/dist/src/restLevelClient/generateRestLevel.d.ts.map +1 -1
- package/dist/src/restLevelClient/generateRestLevel.js +7 -6
- package/dist/src/restLevelClient/generateRestLevel.js.map +1 -1
- package/dist/src/typescriptGenerator.d.ts.map +1 -1
- package/dist/src/typescriptGenerator.js +6 -5
- package/dist/src/typescriptGenerator.js.map +1 -1
- package/package.json +2 -2
- package/src/generators/static/packageFileGenerator.ts +16 -10
- package/src/generators/static/tsConfigFileGenerator.ts +0 -9
- package/src/generators/static/tsConfigTestFileGenerator.ts +70 -0
- package/src/restLevelClient/generateRestLevel.ts +12 -9
- package/src/typescriptGenerator.ts +13 -6
- package/dist/src/generators/static/tsConfigBrowserFileGenerator.d.ts +0 -3
- package/dist/src/generators/static/tsConfigBrowserFileGenerator.d.ts.map +0 -1
- package/dist/src/generators/static/tsConfigBrowserFileGenerator.js +0 -26
- package/dist/src/generators/static/tsConfigBrowserFileGenerator.js.map +0 -1
- package/src/generators/static/tsConfigBrowserFileGenerator.ts +0 -31
|
@@ -84,7 +84,11 @@ function regularAutorestPackage(clientDetails, packageDetails) {
|
|
|
84
84
|
"extract-api": "rimraf review && mkdirp ./review && api-extractor run --local",
|
|
85
85
|
lint: "echo skipped",
|
|
86
86
|
clean: "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log",
|
|
87
|
-
"build:samples":
|
|
87
|
+
"build:samples": generateSample && clientDetails.samples && clientDetails.samples.length > 0
|
|
88
|
+
? azureArm
|
|
89
|
+
? "tsc -p tsconfig.samples.json && dev-tool samples publish -f"
|
|
90
|
+
: "tsc -p tsconfig.samples.json"
|
|
91
|
+
: "echo skipped.",
|
|
88
92
|
"check-format": "echo skipped",
|
|
89
93
|
"execute:samples": "echo skipped",
|
|
90
94
|
format: "echo skipped",
|
|
@@ -120,14 +124,14 @@ function regularAutorestPackage(clientDetails, packageDetails) {
|
|
|
120
124
|
packageInfo.homepage = `https://github.com/Azure/azure-sdk-for-js/tree/main/${azureOutputDirectory}`;
|
|
121
125
|
}
|
|
122
126
|
if (azureSdkForJs) {
|
|
123
|
-
packageInfo.devDependencies["@azure/dev-tool"] = "workspace
|
|
127
|
+
packageInfo.devDependencies["@azure/dev-tool"] = "workspace:^";
|
|
124
128
|
packageInfo.devDependencies["cross-env"] = "catalog:";
|
|
125
129
|
packageInfo.devDependencies["eslint"] = "catalog:";
|
|
126
130
|
packageInfo.devDependencies["prettier"] = "catalog:";
|
|
127
131
|
packageInfo.devDependencies["rimraf"] = "catalog:";
|
|
128
132
|
packageInfo.devDependencies["tshy"] = "catalog:";
|
|
129
|
-
packageInfo.devDependencies["mkdirp"] = "catalog:";
|
|
130
133
|
delete packageInfo.devDependencies["@microsoft/api-extractor"];
|
|
134
|
+
delete packageInfo.devDependencies["mkdirp"];
|
|
131
135
|
packageInfo.scripts["build"] =
|
|
132
136
|
"npm run clean && dev-tool run build-package && dev-tool run extract-api";
|
|
133
137
|
packageInfo.scripts["clean"] = "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log";
|
|
@@ -149,18 +153,18 @@ function regularAutorestPackage(clientDetails, packageDetails) {
|
|
|
149
153
|
}
|
|
150
154
|
if (generateTest) {
|
|
151
155
|
packageInfo.devDependencies["@azure/identity"] = azureSdkForJs ? "catalog:internal" : "^4.9.0";
|
|
152
|
-
packageInfo.devDependencies["@azure/logger"] = azureSdkForJs ? "workspace
|
|
156
|
+
packageInfo.devDependencies["@azure/logger"] = azureSdkForJs ? "workspace:^" : "^1.1.4";
|
|
153
157
|
// TODO need unify the version when 4.1.0 released
|
|
154
|
-
packageInfo.devDependencies["@azure-tools/test-recorder"] = azureSdkForJs ? "workspace
|
|
155
|
-
packageInfo.devDependencies["@azure-tools/test-credential"] = azureSdkForJs ? "workspace
|
|
158
|
+
packageInfo.devDependencies["@azure-tools/test-recorder"] = azureSdkForJs ? "workspace:^" : "^4.0.0";
|
|
159
|
+
packageInfo.devDependencies["@azure-tools/test-credential"] = azureSdkForJs ? "workspace:^" : "^2.0.0";
|
|
156
160
|
if (azureSdkForJs) {
|
|
157
|
-
packageInfo.devDependencies["@azure-tools/test-utils-vitest"] = azureSdkForJs ? "workspace
|
|
161
|
+
packageInfo.devDependencies["@azure-tools/test-utils-vitest"] = azureSdkForJs ? "workspace:^" : "^1.0.0";
|
|
158
162
|
}
|
|
159
163
|
packageInfo.devDependencies["@types/node"] = azureSdkForJs ? "catalog:" : "^20.0.0";
|
|
160
|
-
packageInfo.devDependencies["@vitest/browser"] = azureSdkForJs ? "catalog:testing" : "^
|
|
161
|
-
packageInfo.devDependencies["@vitest/coverage-istanbul"] = azureSdkForJs ? "catalog:testing" : "^
|
|
164
|
+
packageInfo.devDependencies["@vitest/browser-playwright"] = azureSdkForJs ? "catalog:testing" : "^4.0.6";
|
|
165
|
+
packageInfo.devDependencies["@vitest/coverage-istanbul"] = azureSdkForJs ? "catalog:testing" : "^4.0.6";
|
|
162
166
|
packageInfo.devDependencies["playwright"] = azureSdkForJs ? "catalog:testing" : "^1.52.0";
|
|
163
|
-
packageInfo.devDependencies["vitest"] = azureSdkForJs ? "catalog:testing" : "^
|
|
167
|
+
packageInfo.devDependencies["vitest"] = azureSdkForJs ? "catalog:testing" : "^4.0.6";
|
|
164
168
|
packageInfo.scripts["test"] = "npm run test:node && npm run test:browser";
|
|
165
169
|
if (azureSdkForJs) {
|
|
166
170
|
packageInfo.scripts["test:node"] = "dev-tool run test:vitest";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageFileGenerator.js","sourceRoot":"","sources":["../../../../src/generators/static/packageFileGenerator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"packageFileGenerator.js","sourceRoot":"","sources":["../../../../src/generators/static/packageFileGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,5 @@ import { Project } from "ts-morph";
|
|
|
2
2
|
export declare function generateTsConfig(project: Project): void;
|
|
3
3
|
export declare function generateTsSrcConfig(project: Project): void;
|
|
4
4
|
export declare function generateTsSampleConfig(project: Project): void;
|
|
5
|
-
export declare function generateTsTestConfig(project: Project): void;
|
|
6
5
|
export declare function generateTsSnippetsConfig(project: Project): void;
|
|
7
6
|
//# sourceMappingURL=tsConfigFileGenerator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsConfigFileGenerator.d.ts","sourceRoot":"","sources":["../../../../src/generators/static/tsConfigFileGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"tsConfigFileGenerator.d.ts","sourceRoot":"","sources":["../../../../src/generators/static/tsConfigFileGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AA6CnC,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,QA8ChD;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,QAInD;AACD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,QAYtD;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,QAIxD"}
|
|
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.generateTsConfig = generateTsConfig;
|
|
6
6
|
exports.generateTsSrcConfig = generateTsSrcConfig;
|
|
7
7
|
exports.generateTsSampleConfig = generateTsSampleConfig;
|
|
8
|
-
exports.generateTsTestConfig = generateTsTestConfig;
|
|
9
8
|
exports.generateTsSnippetsConfig = generateTsSnippetsConfig;
|
|
10
9
|
const autorestSession_1 = require("../../autorestSession");
|
|
11
10
|
const highLevelTsConfig = {
|
|
@@ -42,9 +41,6 @@ const highLevelTsSampleConfig = {
|
|
|
42
41
|
extends: "../../../tsconfig.samples.base.json",
|
|
43
42
|
compilerOptions: {}
|
|
44
43
|
};
|
|
45
|
-
const highLevelTsTestConfig = {
|
|
46
|
-
extends: ["./tsconfig.src.json", "../../../tsconfig.test.base.json"]
|
|
47
|
-
};
|
|
48
44
|
const highLevelTsSnippetsConfig = {
|
|
49
45
|
extends: ["../../../tsconfig.snippets.base.json"]
|
|
50
46
|
};
|
|
@@ -101,11 +97,6 @@ function generateTsSampleConfig(project) {
|
|
|
101
97
|
overwrite: true
|
|
102
98
|
});
|
|
103
99
|
}
|
|
104
|
-
function generateTsTestConfig(project) {
|
|
105
|
-
project.createSourceFile("tsconfig.test.json", JSON.stringify(highLevelTsTestConfig, null, 2), {
|
|
106
|
-
overwrite: true
|
|
107
|
-
});
|
|
108
|
-
}
|
|
109
100
|
function generateTsSnippetsConfig(project) {
|
|
110
101
|
project.createSourceFile("tsconfig.snippets.json", JSON.stringify(highLevelTsSnippetsConfig, null, 2), {
|
|
111
102
|
overwrite: true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsConfigFileGenerator.js","sourceRoot":"","sources":["../../../../src/generators/static/tsConfigFileGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;
|
|
1
|
+
{"version":3,"file":"tsConfigFileGenerator.js","sourceRoot":"","sources":["../../../../src/generators/static/tsConfigFileGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tsConfigTestFileGenerator.d.ts","sourceRoot":"","sources":["../../../../src/generators/static/tsConfigTestFileGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAkBnC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,QAgDpD"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT License.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.generateTestTsConfig = generateTestTsConfig;
|
|
6
|
+
const autorestSession_1 = require("../../autorestSession");
|
|
7
|
+
const highLevelTsTestConfig = {
|
|
8
|
+
references: [
|
|
9
|
+
{
|
|
10
|
+
path: "./tsconfig.test.node.json"
|
|
11
|
+
},
|
|
12
|
+
{
|
|
13
|
+
path: "./tsconfig.browser.config.json"
|
|
14
|
+
}
|
|
15
|
+
],
|
|
16
|
+
compilerOptions: {
|
|
17
|
+
composite: true
|
|
18
|
+
},
|
|
19
|
+
files: []
|
|
20
|
+
};
|
|
21
|
+
function generateTestTsConfig(project) {
|
|
22
|
+
const { packageDetails } = (0, autorestSession_1.getAutorestOptions)();
|
|
23
|
+
const highLevelTsBrowserConfig = {
|
|
24
|
+
extends: "../../../tsconfig.browser.base.json",
|
|
25
|
+
compilerOptions: {
|
|
26
|
+
paths: {
|
|
27
|
+
[packageDetails.name]: ["./dist/browser/index.d.ts"],
|
|
28
|
+
[`${packageDetails.name}/*`]: ["./dist/browser/*"],
|
|
29
|
+
"$internal/*": ["./dist/browser/*"]
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
project.createSourceFile("tsconfig.browser.config.json", JSON.stringify(highLevelTsBrowserConfig), {
|
|
34
|
+
overwrite: true
|
|
35
|
+
});
|
|
36
|
+
// Also generate the test node tsconfig that points to source files for tests
|
|
37
|
+
const testNodeTsConfig = {
|
|
38
|
+
extends: "../../../tsconfig.test.node.base.json",
|
|
39
|
+
compilerOptions: {
|
|
40
|
+
paths: {
|
|
41
|
+
[packageDetails.name]: ["./src/index.ts"],
|
|
42
|
+
[`${packageDetails.name}/*`]: ["./src/*"],
|
|
43
|
+
"$internal/*": ["./src/*"]
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
project.createSourceFile("tsconfig.test.node.json", JSON.stringify(testNodeTsConfig), {
|
|
48
|
+
overwrite: true
|
|
49
|
+
});
|
|
50
|
+
project.createSourceFile("tsconfig.test.json", JSON.stringify(highLevelTsTestConfig, null, 2), {
|
|
51
|
+
overwrite: true
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=tsConfigTestFileGenerator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tsConfigTestFileGenerator.js","sourceRoot":"","sources":["../../../../src/generators/static/tsConfigTestFileGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAoBlC,oDAgDC;AAjED,2DAA2D;AAE3D,MAAM,qBAAqB,GAAwB;IACjD,UAAU,EAAE;QACV;YACE,IAAI,EAAE,2BAA2B;SAClC;QACD;YACE,IAAI,EAAE,gCAAgC;SACvC;KACF;IACD,eAAe,EAAE;QACf,SAAS,EAAE,IAAI;KAChB;IACD,KAAK,EAAE,EAAE;CACV,CAAC;AAEF,SAAgB,oBAAoB,CAAC,OAAgB;IACnD,MAAM,EAAE,cAAc,EAAE,GAAG,IAAA,oCAAkB,GAAE,CAAC;IAChD,MAAM,wBAAwB,GAAwB;QACpD,OAAO,EAAE,qCAAqC;QAC9C,eAAe,EAAE;YACf,KAAK,EAAE;gBACL,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,2BAA2B,CAAC;gBACpD,CAAC,GAAG,cAAc,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC;gBAClD,aAAa,EAAE,CAAC,kBAAkB,CAAC;aACpC;SACF;KACF,CAAC;IAEF,OAAO,CAAC,gBAAgB,CACtB,8BAA8B,EAC9B,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,EACxC;QACE,SAAS,EAAE,IAAI;KAChB,CACF,CAAC;IAEF,6EAA6E;IAC7E,MAAM,gBAAgB,GAAwB;QAC5C,OAAO,EAAE,uCAAuC;QAChD,eAAe,EAAE;YACf,KAAK,EAAE;gBACL,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC;gBACzC,CAAC,GAAG,cAAc,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC;gBACzC,aAAa,EAAE,CAAC,SAAS,CAAC;aAC3B;SACF;KACF,CAAC;IAEF,OAAO,CAAC,gBAAgB,CACtB,yBAAyB,EACzB,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAChC;QACE,SAAS,EAAE,IAAI;KAChB,CACF,CAAC;IAEF,OAAO,CAAC,gBAAgB,CACtB,oBAAoB,EACpB,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC,EAC9C;QACE,SAAS,EAAE,IAAI;KAChB,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateRestLevel.d.ts","sourceRoot":"","sources":["../../../src/restLevelClient/generateRestLevel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generateRestLevel.d.ts","sourceRoot":"","sources":["../../../src/restLevelClient/generateRestLevel.ts"],"names":[],"mappings":"AAgDA;;GAEG;AACH,wBAAsB,uBAAuB,kBA2J5C"}
|
|
@@ -139,10 +139,9 @@ function generateRestLevelClient() {
|
|
|
139
139
|
(0, generatorHelpers_1.generateFileByBuilder)(project, rlc_common_1.buildTsSampleConfig, rlcModels);
|
|
140
140
|
}
|
|
141
141
|
if (generateTest) {
|
|
142
|
-
|
|
143
|
-
(0, generatorHelpers_1.generateFileByBuilder)(project, rlc_common_1.
|
|
144
|
-
|
|
145
|
-
(0, generatorHelpers_1.generateFileByBuilder)(project, rlc_common_1.buildTsTestConfig, rlcModels);
|
|
142
|
+
(0, generatorHelpers_1.generateFileByBuilder)(project, rlc_common_1.buildTestNodeTsConfig, rlcModels);
|
|
143
|
+
(0, generatorHelpers_1.generateFileByBuilder)(project, rlc_common_1.buildTestBrowserTsConfig, rlcModels);
|
|
144
|
+
(0, generatorHelpers_1.generateFileByBuilder)(project, rlc_common_1.buildTestMainTsConfig, rlcModels);
|
|
146
145
|
}
|
|
147
146
|
}
|
|
148
147
|
}
|
|
@@ -175,8 +174,10 @@ ${licenseHeaderOnly}
|
|
|
175
174
|
`;
|
|
176
175
|
if (isSourceCode) {
|
|
177
176
|
// Check if the file is in the src folder (auto-generated) vs test/sample folders
|
|
178
|
-
const isSrcFile = filePath.includes(
|
|
179
|
-
const licenseHeader = isSrcFile
|
|
177
|
+
const isSrcFile = filePath.includes("/src/") || filePath.includes("\\src\\");
|
|
178
|
+
const licenseHeader = isSrcFile
|
|
179
|
+
? licenseHeaderWithCodeGen
|
|
180
|
+
: licenseHeaderOnly;
|
|
180
181
|
fileContents = `${licenseHeader.trimLeft()}\n${fileContents}`;
|
|
181
182
|
}
|
|
182
183
|
// Format the contents if necessary
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateRestLevel.js","sourceRoot":"","sources":["../../../src/restLevelClient/generateRestLevel.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"generateRestLevel.js","sourceRoot":"","sources":["../../../src/restLevelClient/generateRestLevel.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;
|
|
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,CA+Hf"}
|
|
@@ -74,7 +74,7 @@ const autorestSession_1 = require("./autorestSession");
|
|
|
74
74
|
const conflictResolver_1 = require("./conflictResolver");
|
|
75
75
|
const snippetsGenerator_1 = require("./generators/test/snippetsGenerator");
|
|
76
76
|
const vitestGenerator_1 = require("./generators/test/vitestGenerator");
|
|
77
|
-
const
|
|
77
|
+
const tsConfigTestFileGenerator_1 = require("./generators/static/tsConfigTestFileGenerator");
|
|
78
78
|
const prettierTypeScriptOptions = {
|
|
79
79
|
parser: "typescript",
|
|
80
80
|
arrowParens: "always",
|
|
@@ -128,8 +128,7 @@ function generateTypeScriptLibrary(codeModel, host) {
|
|
|
128
128
|
}
|
|
129
129
|
if (generateTest) {
|
|
130
130
|
(0, tsConfigFileGenerator_1.generateTsSnippetsConfig)(project);
|
|
131
|
-
(0,
|
|
132
|
-
(0, tsConfigBrowserFileGenerator_1.generateTsBrowserConfig)(project);
|
|
131
|
+
(0, tsConfigTestFileGenerator_1.generateTestTsConfig)(project);
|
|
133
132
|
}
|
|
134
133
|
}
|
|
135
134
|
if (!azureSdkForJs) {
|
|
@@ -178,8 +177,10 @@ ${licenseHeaderOnly}
|
|
|
178
177
|
// Add the license header to source code files
|
|
179
178
|
if (shouldGenerateLicense && isSourceCode) {
|
|
180
179
|
// Check if the file is in the src folder (auto-generated) vs test/sample folders
|
|
181
|
-
const isSrcFile = filePath.includes(
|
|
182
|
-
const licenseHeader = isSrcFile
|
|
180
|
+
const isSrcFile = filePath.includes("/src/") || filePath.includes("\\src\\");
|
|
181
|
+
const licenseHeader = isSrcFile
|
|
182
|
+
? licenseHeaderWithCodeGen
|
|
183
|
+
: licenseHeaderOnly;
|
|
183
184
|
fileContents = `${licenseHeader.trimLeft()}\n${fileContents}`;
|
|
184
185
|
}
|
|
185
186
|
// Format the contents if necessary
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescriptGenerator.js","sourceRoot":"","sources":["../../src/typescriptGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
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.51",
|
|
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.
|
|
38
|
+
"@azure-tools/rlc-common": "^0.46.0"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@azure-tools/test-recorder": "^3.0.0",
|
|
@@ -132,7 +132,12 @@ function regularAutorestPackage(
|
|
|
132
132
|
lint: "echo skipped",
|
|
133
133
|
clean:
|
|
134
134
|
"rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log",
|
|
135
|
-
"build:samples":
|
|
135
|
+
"build:samples":
|
|
136
|
+
generateSample && clientDetails.samples && clientDetails.samples.length > 0
|
|
137
|
+
? azureArm
|
|
138
|
+
? "tsc -p tsconfig.samples.json && dev-tool samples publish -f"
|
|
139
|
+
: "tsc -p tsconfig.samples.json"
|
|
140
|
+
: "echo skipped.",
|
|
136
141
|
"check-format": "echo skipped",
|
|
137
142
|
"execute:samples": "echo skipped",
|
|
138
143
|
format: "echo skipped",
|
|
@@ -168,15 +173,16 @@ function regularAutorestPackage(
|
|
|
168
173
|
packageInfo.homepage = `https://github.com/Azure/azure-sdk-for-js/tree/main/${azureOutputDirectory}`;
|
|
169
174
|
}
|
|
170
175
|
if (azureSdkForJs) {
|
|
171
|
-
packageInfo.devDependencies["@azure/dev-tool"] = "workspace
|
|
176
|
+
packageInfo.devDependencies["@azure/dev-tool"] = "workspace:^";
|
|
172
177
|
packageInfo.devDependencies["cross-env"] = "catalog:";
|
|
173
178
|
packageInfo.devDependencies["eslint"] = "catalog:";
|
|
174
179
|
packageInfo.devDependencies["prettier"] = "catalog:";
|
|
175
180
|
packageInfo.devDependencies["rimraf"] = "catalog:";
|
|
176
181
|
packageInfo.devDependencies["tshy"] = "catalog:";
|
|
177
|
-
packageInfo.devDependencies["mkdirp"] = "catalog:";
|
|
178
182
|
|
|
179
183
|
delete packageInfo.devDependencies["@microsoft/api-extractor"];
|
|
184
|
+
delete packageInfo.devDependencies["mkdirp"];
|
|
185
|
+
|
|
180
186
|
packageInfo.scripts["build"] =
|
|
181
187
|
"npm run clean && dev-tool run build-package && dev-tool run extract-api";
|
|
182
188
|
packageInfo.scripts["clean"] = "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log";
|
|
@@ -198,18 +204,18 @@ function regularAutorestPackage(
|
|
|
198
204
|
|
|
199
205
|
if (generateTest) {
|
|
200
206
|
packageInfo.devDependencies["@azure/identity"] = azureSdkForJs ? "catalog:internal" : "^4.9.0";
|
|
201
|
-
packageInfo.devDependencies["@azure/logger"] = azureSdkForJs ? "workspace
|
|
207
|
+
packageInfo.devDependencies["@azure/logger"] = azureSdkForJs ? "workspace:^" : "^1.1.4";
|
|
202
208
|
// TODO need unify the version when 4.1.0 released
|
|
203
|
-
packageInfo.devDependencies["@azure-tools/test-recorder"] = azureSdkForJs ? "workspace
|
|
204
|
-
packageInfo.devDependencies["@azure-tools/test-credential"] = azureSdkForJs ? "workspace
|
|
209
|
+
packageInfo.devDependencies["@azure-tools/test-recorder"] = azureSdkForJs ? "workspace:^" : "^4.0.0";
|
|
210
|
+
packageInfo.devDependencies["@azure-tools/test-credential"] = azureSdkForJs ? "workspace:^" : "^2.0.0";
|
|
205
211
|
if (azureSdkForJs) {
|
|
206
|
-
packageInfo.devDependencies["@azure-tools/test-utils-vitest"] = azureSdkForJs ? "workspace
|
|
212
|
+
packageInfo.devDependencies["@azure-tools/test-utils-vitest"] = azureSdkForJs ? "workspace:^" : "^1.0.0";
|
|
207
213
|
}
|
|
208
214
|
packageInfo.devDependencies["@types/node"] = azureSdkForJs ? "catalog:" : "^20.0.0";
|
|
209
|
-
packageInfo.devDependencies["@vitest/browser"] = azureSdkForJs ? "catalog:testing" : "^
|
|
210
|
-
packageInfo.devDependencies["@vitest/coverage-istanbul"] = azureSdkForJs ? "catalog:testing" : "^
|
|
215
|
+
packageInfo.devDependencies["@vitest/browser-playwright"] = azureSdkForJs ? "catalog:testing" : "^4.0.6";
|
|
216
|
+
packageInfo.devDependencies["@vitest/coverage-istanbul"] = azureSdkForJs ? "catalog:testing" : "^4.0.6";
|
|
211
217
|
packageInfo.devDependencies["playwright"] = azureSdkForJs ? "catalog:testing" : "^1.52.0";
|
|
212
|
-
packageInfo.devDependencies["vitest"] = azureSdkForJs ? "catalog:testing" : "^
|
|
218
|
+
packageInfo.devDependencies["vitest"] = azureSdkForJs ? "catalog:testing" : "^4.0.6";
|
|
213
219
|
packageInfo.scripts["test"] = "npm run test:node && npm run test:browser";
|
|
214
220
|
|
|
215
221
|
if (azureSdkForJs) {
|
|
@@ -42,10 +42,6 @@ const highLevelTsSampleConfig: Record<string, any> = {
|
|
|
42
42
|
compilerOptions: {}
|
|
43
43
|
}
|
|
44
44
|
|
|
45
|
-
const highLevelTsTestConfig: Record<string, any> = {
|
|
46
|
-
extends: ["./tsconfig.src.json", "../../../tsconfig.test.base.json"]
|
|
47
|
-
}
|
|
48
|
-
|
|
49
45
|
const highLevelTsSnippetsConfig: Record<string, any> = {
|
|
50
46
|
extends: ["../../../tsconfig.snippets.base.json"]
|
|
51
47
|
}
|
|
@@ -116,11 +112,6 @@ export function generateTsSampleConfig(project: Project) {
|
|
|
116
112
|
overwrite: true
|
|
117
113
|
});
|
|
118
114
|
}
|
|
119
|
-
export function generateTsTestConfig(project: Project) {
|
|
120
|
-
project.createSourceFile("tsconfig.test.json", JSON.stringify(highLevelTsTestConfig, null, 2), {
|
|
121
|
-
overwrite: true
|
|
122
|
-
});
|
|
123
|
-
}
|
|
124
115
|
|
|
125
116
|
export function generateTsSnippetsConfig(project: Project) {
|
|
126
117
|
project.createSourceFile("tsconfig.snippets.json", JSON.stringify(highLevelTsSnippetsConfig, null, 2), {
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
// Copyright (c) Microsoft Corporation.
|
|
2
|
+
// Licensed under the MIT License.
|
|
3
|
+
|
|
4
|
+
import { Project } from "ts-morph";
|
|
5
|
+
import { getAutorestOptions } from "../../autorestSession";
|
|
6
|
+
|
|
7
|
+
const highLevelTsTestConfig: Record<string, any> = {
|
|
8
|
+
references: [
|
|
9
|
+
{
|
|
10
|
+
path: "./tsconfig.test.node.json"
|
|
11
|
+
},
|
|
12
|
+
{
|
|
13
|
+
path: "./tsconfig.browser.config.json"
|
|
14
|
+
}
|
|
15
|
+
],
|
|
16
|
+
compilerOptions: {
|
|
17
|
+
composite: true
|
|
18
|
+
},
|
|
19
|
+
files: []
|
|
20
|
+
};
|
|
21
|
+
|
|
22
|
+
export function generateTestTsConfig(project: Project) {
|
|
23
|
+
const { packageDetails } = getAutorestOptions();
|
|
24
|
+
const highLevelTsBrowserConfig: Record<string, any> = {
|
|
25
|
+
extends: "../../../tsconfig.browser.base.json",
|
|
26
|
+
compilerOptions: {
|
|
27
|
+
paths: {
|
|
28
|
+
[packageDetails.name]: ["./dist/browser/index.d.ts"],
|
|
29
|
+
[`${packageDetails.name}/*`]: ["./dist/browser/*"],
|
|
30
|
+
"$internal/*": ["./dist/browser/*"]
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
project.createSourceFile(
|
|
36
|
+
"tsconfig.browser.config.json",
|
|
37
|
+
JSON.stringify(highLevelTsBrowserConfig),
|
|
38
|
+
{
|
|
39
|
+
overwrite: true
|
|
40
|
+
}
|
|
41
|
+
);
|
|
42
|
+
|
|
43
|
+
// Also generate the test node tsconfig that points to source files for tests
|
|
44
|
+
const testNodeTsConfig: Record<string, any> = {
|
|
45
|
+
extends: "../../../tsconfig.test.node.base.json",
|
|
46
|
+
compilerOptions: {
|
|
47
|
+
paths: {
|
|
48
|
+
[packageDetails.name]: ["./src/index.ts"],
|
|
49
|
+
[`${packageDetails.name}/*`]: ["./src/*"],
|
|
50
|
+
"$internal/*": ["./src/*"]
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
project.createSourceFile(
|
|
56
|
+
"tsconfig.test.node.json",
|
|
57
|
+
JSON.stringify(testNodeTsConfig),
|
|
58
|
+
{
|
|
59
|
+
overwrite: true
|
|
60
|
+
}
|
|
61
|
+
);
|
|
62
|
+
|
|
63
|
+
project.createSourceFile(
|
|
64
|
+
"tsconfig.test.json",
|
|
65
|
+
JSON.stringify(highLevelTsTestConfig, null, 2),
|
|
66
|
+
{
|
|
67
|
+
overwrite: true
|
|
68
|
+
}
|
|
69
|
+
);
|
|
70
|
+
}
|
|
@@ -34,10 +34,11 @@ import {
|
|
|
34
34
|
buildSamples,
|
|
35
35
|
updatePackageFile,
|
|
36
36
|
buildSnippets,
|
|
37
|
-
buildTsTestBrowserConfig,
|
|
38
37
|
buildTsSrcConfig,
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
buildTestBrowserTsConfig,
|
|
39
|
+
buildTestNodeTsConfig,
|
|
40
|
+
buildTestMainTsConfig,
|
|
41
|
+
buildTsSampleConfig
|
|
41
42
|
} from "@azure-tools/rlc-common";
|
|
42
43
|
import {
|
|
43
44
|
generateFileByBuilder,
|
|
@@ -140,10 +141,9 @@ export async function generateRestLevelClient() {
|
|
|
140
141
|
generateFileByBuilder(project, buildTsSampleConfig, rlcModels);
|
|
141
142
|
}
|
|
142
143
|
if (generateTest) {
|
|
143
|
-
|
|
144
|
-
generateFileByBuilder(project,
|
|
145
|
-
|
|
146
|
-
generateFileByBuilder(project, buildTsTestConfig, rlcModels);
|
|
144
|
+
generateFileByBuilder(project, buildTestNodeTsConfig, rlcModels);
|
|
145
|
+
generateFileByBuilder(project, buildTestBrowserTsConfig, rlcModels);
|
|
146
|
+
generateFileByBuilder(project, buildTestMainTsConfig, rlcModels);
|
|
147
147
|
}
|
|
148
148
|
}
|
|
149
149
|
} else {
|
|
@@ -183,8 +183,11 @@ ${licenseHeaderOnly}
|
|
|
183
183
|
|
|
184
184
|
if (isSourceCode) {
|
|
185
185
|
// Check if the file is in the src folder (auto-generated) vs test/sample folders
|
|
186
|
-
const isSrcFile =
|
|
187
|
-
|
|
186
|
+
const isSrcFile =
|
|
187
|
+
filePath.includes("/src/") || filePath.includes("\\src\\");
|
|
188
|
+
const licenseHeader = isSrcFile
|
|
189
|
+
? licenseHeaderWithCodeGen
|
|
190
|
+
: licenseHeaderOnly;
|
|
188
191
|
fileContents = `${licenseHeader.trimLeft()}\n${fileContents}`;
|
|
189
192
|
}
|
|
190
193
|
|
|
@@ -18,7 +18,12 @@ import { generateApiExtractorConfig } from "./generators/static/apiExtractorConf
|
|
|
18
18
|
import { generateLicenseFile } from "./generators/static/licenseFileGenerator";
|
|
19
19
|
import { generateReadmeFile } from "./generators/static/readmeFileGenerator";
|
|
20
20
|
import { generateSampleTestFile } from "./generators/test/sampleTestGenerator";
|
|
21
|
-
import {
|
|
21
|
+
import {
|
|
22
|
+
generateTsConfig,
|
|
23
|
+
generateTsSampleConfig,
|
|
24
|
+
generateTsSrcConfig,
|
|
25
|
+
generateTsSnippetsConfig
|
|
26
|
+
} from "./generators/static/tsConfigFileGenerator";
|
|
22
27
|
import { generateRollupConfig } from "./generators/static/rollupConfigFileGenerator";
|
|
23
28
|
import { generateOperations } from "./generators/operationGenerator";
|
|
24
29
|
import { generateOperationsInterfaces } from "./generators/operationInterfaceGenerator";
|
|
@@ -32,7 +37,7 @@ import { getAutorestOptions } from "./autorestSession";
|
|
|
32
37
|
import { conflictResolver } from "./conflictResolver";
|
|
33
38
|
import { generateSnippetsFile } from "./generators/test/snippetsGenerator";
|
|
34
39
|
import { generateVitestConfig } from "./generators/test/vitestGenerator";
|
|
35
|
-
import {
|
|
40
|
+
import { generateTestTsConfig } from "./generators/static/tsConfigTestFileGenerator";
|
|
36
41
|
|
|
37
42
|
const prettierTypeScriptOptions: prettier.Options = {
|
|
38
43
|
parser: "typescript",
|
|
@@ -101,8 +106,7 @@ export async function generateTypeScriptLibrary(
|
|
|
101
106
|
}
|
|
102
107
|
if (generateTest) {
|
|
103
108
|
generateTsSnippetsConfig(project);
|
|
104
|
-
|
|
105
|
-
generateTsBrowserConfig(project);
|
|
109
|
+
generateTestTsConfig(project);
|
|
106
110
|
}
|
|
107
111
|
}
|
|
108
112
|
|
|
@@ -161,8 +165,11 @@ ${licenseHeaderOnly}
|
|
|
161
165
|
// Add the license header to source code files
|
|
162
166
|
if (shouldGenerateLicense && isSourceCode) {
|
|
163
167
|
// Check if the file is in the src folder (auto-generated) vs test/sample folders
|
|
164
|
-
const isSrcFile =
|
|
165
|
-
|
|
168
|
+
const isSrcFile =
|
|
169
|
+
filePath.includes("/src/") || filePath.includes("\\src\\");
|
|
170
|
+
const licenseHeader = isSrcFile
|
|
171
|
+
? licenseHeaderWithCodeGen
|
|
172
|
+
: licenseHeaderOnly;
|
|
166
173
|
fileContents = `${licenseHeader.trimLeft()}\n${fileContents}`;
|
|
167
174
|
}
|
|
168
175
|
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tsConfigBrowserFileGenerator.d.ts","sourceRoot":"","sources":["../../../../src/generators/static/tsConfigBrowserFileGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,QAwBvD"}
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// Copyright (c) Microsoft Corporation.
|
|
3
|
-
// Licensed under the MIT License.
|
|
4
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.generateTsBrowserConfig = generateTsBrowserConfig;
|
|
6
|
-
const autorestSession_1 = require("../../autorestSession");
|
|
7
|
-
function generateTsBrowserConfig(project) {
|
|
8
|
-
const { packageDetails, generateMetadata, } = (0, autorestSession_1.getAutorestOptions)();
|
|
9
|
-
if (!generateMetadata) {
|
|
10
|
-
return;
|
|
11
|
-
}
|
|
12
|
-
const highLevelTsBrowserConfig = {
|
|
13
|
-
"extends": "../../../tsconfig.browser.base.json",
|
|
14
|
-
"compilerOptions": {
|
|
15
|
-
"paths": {
|
|
16
|
-
[packageDetails.name]: ["./dist/browser/index.d.ts"],
|
|
17
|
-
[`${packageDetails.name}/*`]: ["./dist/browser/*"],
|
|
18
|
-
"$internal/*": ["./dist/browser/*"]
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
};
|
|
22
|
-
project.createSourceFile("tsconfig.browser.config.json", JSON.stringify(highLevelTsBrowserConfig), {
|
|
23
|
-
overwrite: true
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
//# sourceMappingURL=tsConfigBrowserFileGenerator.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tsConfigBrowserFileGenerator.js","sourceRoot":"","sources":["../../../../src/generators/static/tsConfigBrowserFileGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAKlC,0DAwBC;AA1BD,2DAA2D;AAE3D,SAAgB,uBAAuB,CAAC,OAAgB;IACpD,MAAM,EACF,cAAc,EACd,gBAAgB,GACnB,GAAG,IAAA,oCAAkB,GAAE,CAAC;IAEzB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACpB,OAAO;IACX,CAAC;IAED,MAAM,wBAAwB,GAAwB;QAClD,SAAS,EAAE,qCAAqC;QAChD,iBAAiB,EAAE;YACf,OAAO,EAAE;gBACL,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,2BAA2B,CAAC;gBACpD,CAAC,GAAG,cAAc,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC;gBAClD,aAAa,EAAE,CAAC,kBAAkB,CAAC;aACtC;SACJ;KACJ,CAAC;IAEF,OAAO,CAAC,gBAAgB,CAAC,8BAA8B,EAAE,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,EAAE;QAC/F,SAAS,EAAE,IAAI;KAClB,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
// Copyright (c) Microsoft Corporation.
|
|
2
|
-
// Licensed under the MIT License.
|
|
3
|
-
|
|
4
|
-
import { Project } from "ts-morph";
|
|
5
|
-
import { getAutorestOptions } from "../../autorestSession";
|
|
6
|
-
|
|
7
|
-
export function generateTsBrowserConfig(project: Project) {
|
|
8
|
-
const {
|
|
9
|
-
packageDetails,
|
|
10
|
-
generateMetadata,
|
|
11
|
-
} = getAutorestOptions();
|
|
12
|
-
|
|
13
|
-
if (!generateMetadata) {
|
|
14
|
-
return;
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
const highLevelTsBrowserConfig: Record<string, any> = {
|
|
18
|
-
"extends": "../../../tsconfig.browser.base.json",
|
|
19
|
-
"compilerOptions": {
|
|
20
|
-
"paths": {
|
|
21
|
-
[packageDetails.name]: ["./dist/browser/index.d.ts"],
|
|
22
|
-
[`${packageDetails.name}/*`]: ["./dist/browser/*"],
|
|
23
|
-
"$internal/*": ["./dist/browser/*"]
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
};
|
|
27
|
-
|
|
28
|
-
project.createSourceFile("tsconfig.browser.config.json", JSON.stringify(highLevelTsBrowserConfig), {
|
|
29
|
-
overwrite: true
|
|
30
|
-
});
|
|
31
|
-
}
|