@autorest/typescript 6.0.46 → 6.0.47
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 +6 -12
- package/dist/src/generators/static/packageFileGenerator.js.map +1 -1
- package/dist/src/generators/test/vitestGenerator.d.ts.map +1 -1
- package/dist/src/generators/test/vitestGenerator.js +2 -21
- package/dist/src/generators/test/vitestGenerator.js.map +1 -1
- package/dist/src/restLevelClient/generateRestLevel.d.ts.map +1 -1
- package/dist/src/restLevelClient/generateRestLevel.js +14 -2
- package/dist/src/restLevelClient/generateRestLevel.js.map +1 -1
- package/dist/src/typescriptGenerator.d.ts.map +1 -1
- package/dist/src/typescriptGenerator.js +12 -8
- package/dist/src/typescriptGenerator.js.map +1 -1
- package/package.json +2 -2
- package/src/generators/static/packageFileGenerator.ts +6 -13
- package/src/generators/test/vitestGenerator.ts +2 -21
- package/src/restLevelClient/generateRestLevel.ts +15 -2
- package/src/typescriptGenerator.ts +13 -8
|
@@ -80,7 +80,6 @@ function regularAutorestPackage(clientDetails, packageDetails) {
|
|
|
80
80
|
scripts: {
|
|
81
81
|
build: "npm run clean && tshy && npm run extract-api",
|
|
82
82
|
minify: `uglifyjs -c -m --comments --source-map "content='./dist/index.js.map'" -o ./dist/index.min.js ./dist/index.js`,
|
|
83
|
-
prepack: "npm run build",
|
|
84
83
|
pack: `${shouldUsePnpmDep && azureSdkForJs ? "pnpm" : "npm"} pack 2>&1`,
|
|
85
84
|
"extract-api": "rimraf review && mkdirp ./review && api-extractor run --local",
|
|
86
85
|
lint: "echo skipped",
|
|
@@ -106,8 +105,8 @@ function regularAutorestPackage(clientDetails, packageDetails) {
|
|
|
106
105
|
browser: "./dist/browser/index.js",
|
|
107
106
|
"react-native": "./dist/react-native/index.js",
|
|
108
107
|
tshy: {
|
|
109
|
-
// only JS sdk repo has tsconfig.src.json
|
|
110
|
-
project: azureSdkForJs ? "
|
|
108
|
+
// only JS sdk repo has tsconfig.src.build.json
|
|
109
|
+
project: azureSdkForJs ? "../../../tsconfig.src.build.json" : undefined,
|
|
111
110
|
exports: {
|
|
112
111
|
"./package.json": "./package.json",
|
|
113
112
|
".": "./src/index.ts",
|
|
@@ -127,12 +126,12 @@ function regularAutorestPackage(clientDetails, packageDetails) {
|
|
|
127
126
|
delete packageInfo.devDependencies["mkdirp"];
|
|
128
127
|
packageInfo.scripts["build"] =
|
|
129
128
|
"npm run clean && dev-tool run build-package && dev-tool run extract-api";
|
|
130
|
-
packageInfo.scripts["clean"] = "
|
|
129
|
+
packageInfo.scripts["clean"] = "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log";
|
|
131
130
|
packageInfo.scripts["extract-api"] = "dev-tool run extract-api";
|
|
132
131
|
packageInfo.scripts["update-snippets"] = "dev-tool run update-snippets";
|
|
133
132
|
delete packageInfo.scripts["minify"];
|
|
134
|
-
packageInfo.scripts["check-format"] = "
|
|
135
|
-
packageInfo.scripts["format"] = "
|
|
133
|
+
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}\" ";
|
|
134
|
+
packageInfo.scripts["format"] = "prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\" ";
|
|
136
135
|
}
|
|
137
136
|
else {
|
|
138
137
|
packageInfo.devDependencies["@rollup/plugin-commonjs"] = "^24.0.0";
|
|
@@ -158,13 +157,8 @@ function regularAutorestPackage(clientDetails, packageDetails) {
|
|
|
158
157
|
packageInfo.devDependencies["@vitest/coverage-istanbul"] = shouldUsePnpmDep && azureSdkForJs ? "catalog:testing" : "^3.0.9";
|
|
159
158
|
packageInfo.devDependencies["playwright"] = shouldUsePnpmDep && azureSdkForJs ? "catalog:testing" : "^1.52.0";
|
|
160
159
|
packageInfo.devDependencies["vitest"] = shouldUsePnpmDep && azureSdkForJs ? "catalog:testing" : "^3.0.9";
|
|
161
|
-
packageInfo.scripts["test"] = "npm run
|
|
162
|
-
packageInfo.scripts["unit-test"] =
|
|
163
|
-
"npm run unit-test:node && npm run unit-test:browser";
|
|
164
|
-
packageInfo.scripts["integration-test"] =
|
|
165
|
-
"npm run integration-test:node && npm run integration-test:browser";
|
|
160
|
+
packageInfo.scripts["test"] = "npm run test:node && npm run test:browser";
|
|
166
161
|
if (azureSdkForJs) {
|
|
167
|
-
packageInfo.scripts["test"] = "npm run test:node && npm run test:browser";
|
|
168
162
|
packageInfo.scripts["test:node"] = "dev-tool run test:vitest";
|
|
169
163
|
packageInfo.scripts["test:node:esm"] = "dev-tool run test:vitest --esm";
|
|
170
164
|
}
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vitestGenerator.d.ts","sourceRoot":"","sources":["../../../../src/generators/test/vitestGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"vitestGenerator.d.ts","sourceRoot":"","sources":["../../../../src/generators/test/vitestGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAoBnC,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,SAAS,GAAG,MAAM,GAAG,KAAK,QAwBrC"}
|
|
@@ -3,32 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.generateVitestConfig = generateVitestConfig;
|
|
4
4
|
const autorestSession_1 = require("../../autorestSession");
|
|
5
5
|
const nodeConfig = `
|
|
6
|
-
import { defineConfig, mergeConfig } from "vitest/config";
|
|
7
6
|
import viteConfig from "../../../vitest.shared.config.ts";
|
|
8
7
|
|
|
9
|
-
export default
|
|
10
|
-
viteConfig,
|
|
11
|
-
defineConfig({
|
|
12
|
-
test: {
|
|
13
|
-
testTimeout: 1200000,
|
|
14
|
-
hookTimeout: 1200000,
|
|
15
|
-
},
|
|
16
|
-
}),
|
|
17
|
-
);`;
|
|
8
|
+
export default viteConfig;`;
|
|
18
9
|
const browserConfig = `
|
|
19
|
-
import { defineConfig, mergeConfig } from "vitest/config";
|
|
20
10
|
import viteConfig from "../../../vitest.browser.shared.config.ts";
|
|
21
11
|
|
|
22
|
-
export default
|
|
23
|
-
viteConfig,
|
|
24
|
-
defineConfig({
|
|
25
|
-
test: {
|
|
26
|
-
include: ["dist-test/browser/test/**/*.spec.js"],
|
|
27
|
-
testTimeout: 1200000,
|
|
28
|
-
hookTimeout: 1200000,
|
|
29
|
-
},
|
|
30
|
-
}),
|
|
31
|
-
);`;
|
|
12
|
+
export default viteConfig;`;
|
|
32
13
|
const esmConfig = `
|
|
33
14
|
import { mergeConfig } from "vitest/config";
|
|
34
15
|
import vitestConfig from "./vitest.config.ts";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vitestGenerator.js","sourceRoot":"","sources":["../../../../src/generators/test/vitestGenerator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"vitestGenerator.js","sourceRoot":"","sources":["../../../../src/generators/test/vitestGenerator.ts"],"names":[],"mappings":";;AAoBA,oDA0BC;AA7CD,2DAA2D;AAE3D,MAAM,UAAU,GAAG;;;2BAGQ,CAAC;AAE5B,MAAM,aAAa,GAAG;;;2BAGK,CAAC;AAE5B,MAAM,SAAS,GAAG;;;;;2DAKyC,CAAC;AAE5D,SAAgB,oBAAoB,CAClC,OAAgB,EAChB,QAAoC;IAEpC,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,GAAG,IAAA,oCAAkB,GAAE,CAAC;IAC/E,IACE,aAAa,KAAK,KAAK;QACvB,gBAAgB,KAAK,KAAK;QAC1B,YAAY,KAAK,KAAK,EACtB,CAAC;QACD,OAAO;IACT,CAAC;IACD,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,SAAS;YACZ,OAAO,CAAC,gBAAgB,CAAC,0BAA0B,EAAE,aAAa,EAAE;gBAClE,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;QACL,KAAK,MAAM;YACT,OAAO,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,UAAU,EAAE;gBACvD,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;QACL,KAAK,KAAK;YACR,OAAO,CAAC,gBAAgB,CAAC,sBAAsB,EAAE,SAAS,EAAE;gBAC1D,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;IACP,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateRestLevel.d.ts","sourceRoot":"","sources":["../../../src/restLevelClient/generateRestLevel.ts"],"names":[],"mappings":"AA+CA;;GAEG;AACH,wBAAsB,uBAAuB,
|
|
1
|
+
{"version":3,"file":"generateRestLevel.d.ts","sourceRoot":"","sources":["../../../src/restLevelClient/generateRestLevel.ts"],"names":[],"mappings":"AA+CA;;GAEG;AACH,wBAAsB,uBAAuB,kBAyJ5C"}
|
|
@@ -163,9 +163,21 @@ function generateRestLevelClient() {
|
|
|
163
163
|
const isJson = /\.json$/gi.test(filePath);
|
|
164
164
|
const isSourceCode = /\.(ts|js)$/gi.test(filePath);
|
|
165
165
|
let fileContents = fs.readFileSync(filePath);
|
|
166
|
-
const
|
|
166
|
+
const licenseHeaderOnly = `
|
|
167
|
+
// Copyright (c) Microsoft Corporation.
|
|
168
|
+
// Licensed under the MIT License.
|
|
169
|
+
`;
|
|
170
|
+
const licenseHeaderWithCodeGen = `
|
|
171
|
+
${licenseHeaderOnly}
|
|
172
|
+
|
|
173
|
+
// Code generated by Microsoft (R) AutoRest Code Generator.
|
|
174
|
+
// Changes may cause incorrect behavior and will be lost if the code is regenerated.
|
|
175
|
+
`;
|
|
167
176
|
if (isSourceCode) {
|
|
168
|
-
|
|
177
|
+
// Check if the file is in the src folder (auto-generated) vs test/sample folders
|
|
178
|
+
const isSrcFile = filePath.includes('/src/') || filePath.includes('\\src\\');
|
|
179
|
+
const licenseHeader = isSrcFile ? licenseHeaderWithCodeGen : licenseHeaderOnly;
|
|
180
|
+
fileContents = `${licenseHeader.trimLeft()}\n${fileContents}`;
|
|
169
181
|
}
|
|
170
182
|
// Format the contents if necessary
|
|
171
183
|
if (isJson || isSourceCode) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateRestLevel.js","sourceRoot":"","sources":["../../../src/restLevelClient/generateRestLevel.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiDlC,
|
|
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;AA8CjE,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;AA8CjE,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CA6Hf"}
|
|
@@ -154,14 +154,15 @@ function generateTypeScriptLibrary(codeModel, host) {
|
|
|
154
154
|
yield (0, LROGenerator_1.generateLroFiles)(clientDetails, project);
|
|
155
155
|
yield (0, pagingHelperGenerator_1.generatePagingFiles)(clientDetails, project);
|
|
156
156
|
(0, tracingFileGenerator_1.generateTracingFile)(project);
|
|
157
|
-
const
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
157
|
+
const licenseHeaderOnly = `
|
|
158
|
+
// Copyright (c) Microsoft Corporation.
|
|
159
|
+
// Licensed under the MIT License.
|
|
160
|
+
`;
|
|
161
|
+
const licenseHeaderWithCodeGen = `
|
|
162
|
+
${licenseHeaderOnly}
|
|
163
|
+
|
|
164
|
+
// Code generated by Microsoft (R) AutoRest Code Generator.
|
|
165
|
+
// Changes may cause incorrect behavior and will be lost if the code is regenerated.
|
|
165
166
|
`;
|
|
166
167
|
// Save the source files to the virtual filesystem
|
|
167
168
|
project.saveSync();
|
|
@@ -176,6 +177,9 @@ function generateTypeScriptLibrary(codeModel, host) {
|
|
|
176
177
|
let fileContents = fs.readFileSync(filePath);
|
|
177
178
|
// Add the license header to source code files
|
|
178
179
|
if (shouldGenerateLicense && isSourceCode) {
|
|
180
|
+
// Check if the file is in the src folder (auto-generated) vs test/sample folders
|
|
181
|
+
const isSrcFile = filePath.includes('/src/') || filePath.includes('\\src\\');
|
|
182
|
+
const licenseHeader = isSrcFile ? licenseHeaderWithCodeGen : licenseHeaderOnly;
|
|
179
183
|
fileContents = `${licenseHeader.trimLeft()}\n${fileContents}`;
|
|
180
184
|
}
|
|
181
185
|
// Format the contents if necessary
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescriptGenerator.js","sourceRoot":"","sources":["../../src/typescriptGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqDlC,
|
|
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.47",
|
|
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.44.0"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@azure-tools/test-recorder": "^3.0.0",
|
|
@@ -128,7 +128,6 @@ function regularAutorestPackage(
|
|
|
128
128
|
build:
|
|
129
129
|
"npm run clean && tshy && npm run extract-api",
|
|
130
130
|
minify: `uglifyjs -c -m --comments --source-map "content='./dist/index.js.map'" -o ./dist/index.min.js ./dist/index.js`,
|
|
131
|
-
prepack: "npm run build",
|
|
132
131
|
pack: `${shouldUsePnpmDep && azureSdkForJs ? "pnpm" : "npm"} pack 2>&1`,
|
|
133
132
|
"extract-api": "rimraf review && mkdirp ./review && api-extractor run --local",
|
|
134
133
|
lint: "echo skipped",
|
|
@@ -155,8 +154,8 @@ function regularAutorestPackage(
|
|
|
155
154
|
browser: "./dist/browser/index.js",
|
|
156
155
|
"react-native": "./dist/react-native/index.js",
|
|
157
156
|
tshy: {
|
|
158
|
-
// only JS sdk repo has tsconfig.src.json
|
|
159
|
-
project: azureSdkForJs ? "
|
|
157
|
+
// only JS sdk repo has tsconfig.src.build.json
|
|
158
|
+
project: azureSdkForJs ? "../../../tsconfig.src.build.json" : undefined,
|
|
160
159
|
exports: {
|
|
161
160
|
"./package.json": "./package.json",
|
|
162
161
|
".": "./src/index.ts",
|
|
@@ -176,12 +175,12 @@ function regularAutorestPackage(
|
|
|
176
175
|
delete packageInfo.devDependencies["mkdirp"];
|
|
177
176
|
packageInfo.scripts["build"] =
|
|
178
177
|
"npm run clean && dev-tool run build-package && dev-tool run extract-api";
|
|
179
|
-
packageInfo.scripts["clean"] = "
|
|
178
|
+
packageInfo.scripts["clean"] = "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log";
|
|
180
179
|
packageInfo.scripts["extract-api"] = "dev-tool run extract-api";
|
|
181
180
|
packageInfo.scripts["update-snippets"] = "dev-tool run update-snippets";
|
|
182
181
|
delete packageInfo.scripts["minify"];
|
|
183
|
-
packageInfo.scripts["check-format"] = "
|
|
184
|
-
packageInfo.scripts["format"] = "
|
|
182
|
+
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}\" ";
|
|
183
|
+
packageInfo.scripts["format"] = "prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\" ";
|
|
185
184
|
} else {
|
|
186
185
|
packageInfo.devDependencies["@rollup/plugin-commonjs"] = "^24.0.0";
|
|
187
186
|
packageInfo.devDependencies["@rollup/plugin-json"] = "^6.0.0";
|
|
@@ -207,15 +206,9 @@ function regularAutorestPackage(
|
|
|
207
206
|
packageInfo.devDependencies["@vitest/coverage-istanbul"] = shouldUsePnpmDep && azureSdkForJs ? "catalog:testing" : "^3.0.9";
|
|
208
207
|
packageInfo.devDependencies["playwright"] = shouldUsePnpmDep && azureSdkForJs ? "catalog:testing" : "^1.52.0";
|
|
209
208
|
packageInfo.devDependencies["vitest"] = shouldUsePnpmDep && azureSdkForJs ? "catalog:testing" : "^3.0.9";
|
|
210
|
-
|
|
211
|
-
packageInfo.scripts["test"] = "npm run integration-test";
|
|
212
|
-
packageInfo.scripts["unit-test"] =
|
|
213
|
-
"npm run unit-test:node && npm run unit-test:browser";
|
|
214
|
-
packageInfo.scripts["integration-test"] =
|
|
215
|
-
"npm run integration-test:node && npm run integration-test:browser";
|
|
209
|
+
packageInfo.scripts["test"] = "npm run test:node && npm run test:browser";
|
|
216
210
|
|
|
217
211
|
if (azureSdkForJs) {
|
|
218
|
-
packageInfo.scripts["test"] = "npm run test:node && npm run test:browser";
|
|
219
212
|
packageInfo.scripts["test:node"] = "dev-tool run test:vitest";
|
|
220
213
|
packageInfo.scripts["test:node:esm"] = "dev-tool run test:vitest --esm";
|
|
221
214
|
} else {
|
|
@@ -2,33 +2,14 @@ import { Project } from "ts-morph";
|
|
|
2
2
|
import { getAutorestOptions } from "../../autorestSession";
|
|
3
3
|
|
|
4
4
|
const nodeConfig = `
|
|
5
|
-
import { defineConfig, mergeConfig } from "vitest/config";
|
|
6
5
|
import viteConfig from "../../../vitest.shared.config.ts";
|
|
7
6
|
|
|
8
|
-
export default
|
|
9
|
-
viteConfig,
|
|
10
|
-
defineConfig({
|
|
11
|
-
test: {
|
|
12
|
-
testTimeout: 1200000,
|
|
13
|
-
hookTimeout: 1200000,
|
|
14
|
-
},
|
|
15
|
-
}),
|
|
16
|
-
);`;
|
|
7
|
+
export default viteConfig;`;
|
|
17
8
|
|
|
18
9
|
const browserConfig = `
|
|
19
|
-
import { defineConfig, mergeConfig } from "vitest/config";
|
|
20
10
|
import viteConfig from "../../../vitest.browser.shared.config.ts";
|
|
21
11
|
|
|
22
|
-
export default
|
|
23
|
-
viteConfig,
|
|
24
|
-
defineConfig({
|
|
25
|
-
test: {
|
|
26
|
-
include: ["dist-test/browser/test/**/*.spec.js"],
|
|
27
|
-
testTimeout: 1200000,
|
|
28
|
-
hookTimeout: 1200000,
|
|
29
|
-
},
|
|
30
|
-
}),
|
|
31
|
-
);`;
|
|
12
|
+
export default viteConfig;`;
|
|
32
13
|
|
|
33
14
|
const esmConfig = `
|
|
34
15
|
import { mergeConfig } from "vitest/config";
|
|
@@ -169,10 +169,23 @@ export async function generateRestLevelClient() {
|
|
|
169
169
|
const isJson = /\.json$/gi.test(filePath);
|
|
170
170
|
const isSourceCode = /\.(ts|js)$/gi.test(filePath);
|
|
171
171
|
let fileContents = fs.readFileSync(filePath);
|
|
172
|
-
const
|
|
172
|
+
const licenseHeaderOnly = `
|
|
173
|
+
// Copyright (c) Microsoft Corporation.
|
|
174
|
+
// Licensed under the MIT License.
|
|
175
|
+
`;
|
|
176
|
+
|
|
177
|
+
const licenseHeaderWithCodeGen = `
|
|
178
|
+
${licenseHeaderOnly}
|
|
179
|
+
|
|
180
|
+
// Code generated by Microsoft (R) AutoRest Code Generator.
|
|
181
|
+
// Changes may cause incorrect behavior and will be lost if the code is regenerated.
|
|
182
|
+
`;
|
|
173
183
|
|
|
174
184
|
if (isSourceCode) {
|
|
175
|
-
|
|
185
|
+
// Check if the file is in the src folder (auto-generated) vs test/sample folders
|
|
186
|
+
const isSrcFile = filePath.includes('/src/') || filePath.includes('\\src\\');
|
|
187
|
+
const licenseHeader = isSrcFile ? licenseHeaderWithCodeGen : licenseHeaderOnly;
|
|
188
|
+
fileContents = `${licenseHeader.trimLeft()}\n${fileContents}`;
|
|
176
189
|
}
|
|
177
190
|
|
|
178
191
|
// Format the contents if necessary
|
|
@@ -133,14 +133,16 @@ export async function generateTypeScriptLibrary(
|
|
|
133
133
|
await generatePagingFiles(clientDetails, project);
|
|
134
134
|
generateTracingFile(project);
|
|
135
135
|
|
|
136
|
-
const
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
136
|
+
const licenseHeaderOnly = `
|
|
137
|
+
// Copyright (c) Microsoft Corporation.
|
|
138
|
+
// Licensed under the MIT License.
|
|
139
|
+
`;
|
|
140
|
+
|
|
141
|
+
const licenseHeaderWithCodeGen = `
|
|
142
|
+
${licenseHeaderOnly}
|
|
143
|
+
|
|
144
|
+
// Code generated by Microsoft (R) AutoRest Code Generator.
|
|
145
|
+
// Changes may cause incorrect behavior and will be lost if the code is regenerated.
|
|
144
146
|
`;
|
|
145
147
|
|
|
146
148
|
// Save the source files to the virtual filesystem
|
|
@@ -158,6 +160,9 @@ export async function generateTypeScriptLibrary(
|
|
|
158
160
|
|
|
159
161
|
// Add the license header to source code files
|
|
160
162
|
if (shouldGenerateLicense && isSourceCode) {
|
|
163
|
+
// Check if the file is in the src folder (auto-generated) vs test/sample folders
|
|
164
|
+
const isSrcFile = filePath.includes('/src/') || filePath.includes('\\src\\');
|
|
165
|
+
const licenseHeader = isSrcFile ? licenseHeaderWithCodeGen : licenseHeaderOnly;
|
|
161
166
|
fileContents = `${licenseHeader.trimLeft()}\n${fileContents}`;
|
|
162
167
|
}
|
|
163
168
|
|