@azure-tools/rlc-common 0.52.3 → 0.53.0-alpha.20260513.1
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/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +16 -0
- package/dist/buildIndexFile.js +9 -0
- package/dist/buildIndexFile.js.map +1 -1
- package/dist/metadata/buildPackageFile.js +44 -9
- package/dist/metadata/buildPackageFile.js.map +1 -1
- package/dist/metadata/buildTestConfig.js +28 -60
- package/dist/metadata/buildTestConfig.js.map +1 -1
- package/dist/metadata/buildTsConfig.js +120 -93
- package/dist/metadata/buildTsConfig.js.map +1 -1
- package/dist/metadata/buildVitestConfig.js +5 -21
- package/dist/metadata/buildVitestConfig.js.map +1 -1
- package/dist/metadata/buildWarpConfig.js +18 -18
- package/dist/metadata/buildWarpConfig.js.map +1 -1
- package/dist/metadata/packageJson/buildAzureMonorepoPackage.js +9 -3
- package/dist/metadata/packageJson/buildAzureMonorepoPackage.js.map +1 -1
- package/dist/metadata/packageJson/packageCommon.js +9 -0
- package/dist/metadata/packageJson/packageCommon.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist-esm/buildIndexFile.js +9 -0
- package/dist-esm/buildIndexFile.js.map +1 -1
- package/dist-esm/metadata/buildPackageFile.js +41 -6
- package/dist-esm/metadata/buildPackageFile.js.map +1 -1
- package/dist-esm/metadata/buildTestConfig.js +28 -59
- package/dist-esm/metadata/buildTestConfig.js.map +1 -1
- package/dist-esm/metadata/buildTsConfig.js +115 -90
- package/dist-esm/metadata/buildTsConfig.js.map +1 -1
- package/dist-esm/metadata/buildVitestConfig.js +5 -21
- package/dist-esm/metadata/buildVitestConfig.js.map +1 -1
- package/dist-esm/metadata/buildWarpConfig.js +18 -18
- package/dist-esm/metadata/buildWarpConfig.js.map +1 -1
- package/dist-esm/metadata/packageJson/buildAzureMonorepoPackage.js +8 -3
- package/dist-esm/metadata/packageJson/buildAzureMonorepoPackage.js.map +1 -1
- package/dist-esm/metadata/packageJson/packageCommon.js +9 -0
- package/dist-esm/metadata/packageJson/packageCommon.js.map +1 -1
- package/dist-esm/package.json +1 -1
- package/package.json +1 -1
- package/src/buildIndexFile.ts +10 -0
- package/src/metadata/buildPackageFile.ts +49 -7
- package/src/metadata/buildTestConfig.ts +36 -75
- package/src/metadata/buildTsConfig.ts +146 -99
- package/src/metadata/buildVitestConfig.ts +6 -23
- package/src/metadata/buildWarpConfig.ts +19 -19
- package/src/metadata/packageJson/buildAzureMonorepoPackage.ts +8 -3
- package/src/metadata/packageJson/packageCommon.ts +9 -0
- package/test/integration/packageJson.spec.ts +154 -8
- package/test/integration/vitestConfig.spec.ts +1 -1
- package/test/integration/warpConfig.spec.ts +97 -0
- package/types/metadata/buildPackageFile.d.ts +7 -2
- package/types/metadata/buildTestConfig.d.ts +6 -4
- package/types/metadata/buildTsConfig.d.ts +35 -3
- package/types/metadata/buildVitestConfig.d.ts +1 -1
- package/types/metadata/buildWarpConfig.d.ts +7 -3
- package/types/metadata/packageJson/packageCommon.d.ts +8 -0
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @azure-tools/rlc-common@0.
|
|
2
|
+
> @azure-tools/rlc-common@0.53.0 build /mnt/vss/_work/1/s/packages/rlc-common
|
|
3
3
|
> rimraf --glob dist/* dist-esm/* types/* && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node publishPackage.js
|
|
4
4
|
|
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,19 @@
|
|
|
1
|
+
## 0.53.0 (2026-05-13)
|
|
2
|
+
|
|
3
|
+
- [Feature] Bump TypeSpec dependencies to latest stable. Please refer to [#3959](https://github.com/Azure/autorest.typescript/pull/3959)
|
|
4
|
+
- [Bugfix] Deduplicate statusCodes in getExpectedStatuses. Please refer to [#3956](https://github.com/Azure/autorest.typescript/pull/3956)
|
|
5
|
+
- [Feature] Align Azure monorepo package.json metadata with new repository schema across codegen packages. Please refer to [#3950](https://github.com/Azure/autorest.typescript/pull/3950)
|
|
6
|
+
- [Feature] Add spector integration tests for ClientDoc, ResponseAsBool, Documentation_Lists, and Documentation_TextFormatting. Please refer to [#3944](https://github.com/Azure/autorest.typescript/pull/3944)
|
|
7
|
+
- [Bugfix] Fix nightly CI. Please refer to [#3947](https://github.com/Azure/autorest.typescript/pull/3947)
|
|
8
|
+
- [Bugfix] Stop generating vitest.esm.config.ts. Please refer to [#3941](https://github.com/Azure/autorest.typescript/pull/3941)
|
|
9
|
+
- [Feature] Use `V` prefix for digit-starting members in API version enums. Please refer to [#3939](https://github.com/Azure/autorest.typescript/pull/3939)
|
|
10
|
+
- [Feature] Migrate generated configs to eng/tsconfigs pattern. Please refer to [#3938](https://github.com/Azure/autorest.typescript/pull/3938)
|
|
11
|
+
- [Bugfix] Fix: optional header with `@clientDefaultValue` always omitted instead of sending default. Please refer to [#3936](https://github.com/Azure/autorest.typescript/pull/3936)
|
|
12
|
+
- [Feature] Support multi-client generation with InitializedBy.Parent only. Please refer to [#3933](https://github.com/Azure/autorest.typescript/pull/3933)
|
|
13
|
+
- [Feature] Re-export RestError and isRestError from @azure/core-rest-pipeline for Azure flavor packages. Please refer to [#3930](https://github.com/Azure/autorest.typescript/pull/3930)
|
|
14
|
+
- [Feature] Use #platform/* subpath imports for polyfill resolution. Please refer to [#3928](https://github.com/Azure/autorest.typescript/pull/3928)
|
|
15
|
+
- [Bugfix] Fix package.json dependency migration when moving from Swagger to TypeSpec modular. Please refer to [#3811](https://github.com/Azure/autorest.typescript/pull/3811)
|
|
16
|
+
|
|
1
17
|
## 0.52.3 (2026-04-23)
|
|
2
18
|
|
|
3
19
|
- [Feature] Bump TypeSpec dependencies to latest stable. Please refer to [#3932](https://github.com/Azure/autorest.typescript/pull/3932)
|
package/dist/buildIndexFile.js
CHANGED
|
@@ -6,6 +6,7 @@ exports.buildIndexFile = buildIndexFile;
|
|
|
6
6
|
const ts_morph_1 = require("ts-morph");
|
|
7
7
|
const nameUtils_js_1 = require("./helpers/nameUtils.js");
|
|
8
8
|
const operationHelpers_js_1 = require("./helpers/operationHelpers.js");
|
|
9
|
+
const packageUtil_js_1 = require("./helpers/packageUtil.js");
|
|
9
10
|
const path = require("path");
|
|
10
11
|
const nameConstructors_js_1 = require("./helpers/nameConstructors.js");
|
|
11
12
|
function buildIndexFile(model) {
|
|
@@ -228,6 +229,14 @@ function generateRLCIndex(file, model) {
|
|
|
228
229
|
}
|
|
229
230
|
]);
|
|
230
231
|
}
|
|
232
|
+
if ((0, packageUtil_js_1.isAzurePackage)(model)) {
|
|
233
|
+
file.addExportDeclarations([
|
|
234
|
+
{
|
|
235
|
+
moduleSpecifier: "@azure/core-rest-pipeline",
|
|
236
|
+
namedExports: ["RestError", "isRestError"]
|
|
237
|
+
}
|
|
238
|
+
]);
|
|
239
|
+
}
|
|
231
240
|
file.addExportAssignment({
|
|
232
241
|
expression: createClientFuncName,
|
|
233
242
|
isExportEquals: false
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildIndexFile.js","sourceRoot":"","sources":["../src/buildIndexFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;
|
|
1
|
+
{"version":3,"file":"buildIndexFile.js","sourceRoot":"","sources":["../src/buildIndexFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,20 +59,22 @@ function buildPackageFile(model, { exports, dependencies, clientContextPaths } =
|
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
61
|
/**
|
|
62
|
-
* Automatically updates the package.json
|
|
63
|
-
*
|
|
62
|
+
* Automatically updates the package.json for an existing Azure SDK package.
|
|
63
|
+
* - Migrates `@azure/core-client` → `@azure-rest/core-client` when found in dependencies.
|
|
64
|
+
* - Updates `@azure/core-lro` from `^2.x` to `^3.1.0`.
|
|
65
|
+
* - Adds LRO dependencies (`@azure/core-lro`, `@azure/abort-controller`) when the package has
|
|
66
|
+
* polling operations (for non-monorepo Azure packages).
|
|
67
|
+
* - Updates exports (tshy or warp) when `exports` is provided.
|
|
68
|
+
* - Updates `//metadata.constantPaths` when `clientContextPaths` is provided.
|
|
64
69
|
*/
|
|
65
70
|
function updatePackageFile(model, existingFilePathOrContent, { exports, clientContextPaths } = {}) {
|
|
66
|
-
var _a, _b;
|
|
71
|
+
var _a, _b, _c, _d, _f;
|
|
67
72
|
const hasLro = (0, operationHelpers_js_1.hasPollingOperations)(model);
|
|
68
73
|
const isAzure = (0, packageUtil_js_1.isAzurePackage)(model);
|
|
69
74
|
const needsLroUpdate = isAzure && hasLro;
|
|
70
75
|
const needsExportsUpdate = exports;
|
|
71
76
|
const needsConstantPathsUpdate = clientContextPaths && clientContextPaths.length > 0;
|
|
72
|
-
|
|
73
|
-
if (!needsLroUpdate && !needsExportsUpdate && !needsConstantPathsUpdate) {
|
|
74
|
-
return;
|
|
75
|
-
}
|
|
77
|
+
const needsPlatformImportsUpdate = ((_a = model.options) === null || _a === void 0 ? void 0 : _a.azureSdkForJs) && ((_b = model.options) === null || _b === void 0 ? void 0 : _b.moduleKind) === "esm";
|
|
76
78
|
let packageInfo;
|
|
77
79
|
if (typeof existingFilePathOrContent === "string") {
|
|
78
80
|
let packageFile;
|
|
@@ -89,9 +91,34 @@ function updatePackageFile(model, existingFilePathOrContent, { exports, clientCo
|
|
|
89
91
|
else {
|
|
90
92
|
packageInfo = existingFilePathOrContent;
|
|
91
93
|
}
|
|
94
|
+
// Migrate AutoRest-specific dependency names and versions to their TypeSpec equivalents.
|
|
95
|
+
const deps = { ...((_c = packageInfo.dependencies) !== null && _c !== void 0 ? _c : {}) };
|
|
96
|
+
let needsCoreClientUpdate = false;
|
|
97
|
+
// @azure/core-client is AutoRest-only; TypeSpec uses @azure-rest/core-client.
|
|
98
|
+
if ("@azure/core-client" in deps) {
|
|
99
|
+
needsCoreClientUpdate = true;
|
|
100
|
+
}
|
|
101
|
+
// Early return if nothing needs to be updated
|
|
102
|
+
if (!needsLroUpdate &&
|
|
103
|
+
!needsExportsUpdate &&
|
|
104
|
+
!needsConstantPathsUpdate &&
|
|
105
|
+
!needsPlatformImportsUpdate &&
|
|
106
|
+
!needsCoreClientUpdate) {
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
// Ensure warp packages have #platform/* imports for polyfill resolution
|
|
110
|
+
if (needsPlatformImportsUpdate) {
|
|
111
|
+
packageInfo.imports = {
|
|
112
|
+
"#platform/*.js": {
|
|
113
|
+
browser: "./src/*-browser.mjs",
|
|
114
|
+
"react-native": "./src/*-react-native.mjs",
|
|
115
|
+
default: "./src/*.js"
|
|
116
|
+
}
|
|
117
|
+
};
|
|
118
|
+
}
|
|
92
119
|
// Update exports based on build system (warp for monorepo, tshy for others)
|
|
93
120
|
if (needsExportsUpdate) {
|
|
94
|
-
if ((
|
|
121
|
+
if ((_d = model.options) === null || _d === void 0 ? void 0 : _d.azureSdkForJs) {
|
|
95
122
|
// Warp: update resolved exports in package.json
|
|
96
123
|
packageInfo.exports = (0, packageCommon_js_1.resolveWarpExports)(exports);
|
|
97
124
|
}
|
|
@@ -99,11 +126,19 @@ function updatePackageFile(model, existingFilePathOrContent, { exports, clientCo
|
|
|
99
126
|
// Tshy: update tshy.exports in package.json
|
|
100
127
|
const newTshy = (0, packageCommon_js_1.getTshyConfig)({
|
|
101
128
|
exports,
|
|
102
|
-
azureSdkForJs: (
|
|
129
|
+
azureSdkForJs: (_f = model.options) === null || _f === void 0 ? void 0 : _f.azureSdkForJs
|
|
103
130
|
});
|
|
104
131
|
packageInfo.tshy.exports = newTshy.exports;
|
|
105
132
|
}
|
|
106
133
|
}
|
|
134
|
+
// Update Core Client dependency
|
|
135
|
+
if (needsCoreClientUpdate) {
|
|
136
|
+
delete deps["@azure/core-client"];
|
|
137
|
+
if (!("@azure-rest/core-client" in deps)) {
|
|
138
|
+
deps["@azure-rest/core-client"] = "^2.3.1";
|
|
139
|
+
}
|
|
140
|
+
packageInfo.dependencies = deps;
|
|
141
|
+
}
|
|
107
142
|
// Update LRO dependencies for Azure packages
|
|
108
143
|
if (needsLroUpdate) {
|
|
109
144
|
packageInfo.dependencies = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildPackageFile.js","sourceRoot":"","sources":["../../src/metadata/buildPackageFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AA4BlC,4CAwDC;
|
|
1
|
+
{"version":3,"file":"buildPackageFile.js","sourceRoot":"","sources":["../../src/metadata/buildPackageFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,23 +4,7 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.buildTestBrowserTsConfig = buildTestBrowserTsConfig;
|
|
6
6
|
exports.buildTestNodeTsConfig = buildTestNodeTsConfig;
|
|
7
|
-
exports.buildTestMainTsConfig = buildTestMainTsConfig;
|
|
8
|
-
const ts_morph_1 = require("ts-morph");
|
|
9
7
|
const utils_js_1 = require("./utils.js");
|
|
10
|
-
const highLevelTsTestConfig = {
|
|
11
|
-
references: [
|
|
12
|
-
{
|
|
13
|
-
path: "./tsconfig.test.node.json"
|
|
14
|
-
},
|
|
15
|
-
{
|
|
16
|
-
path: "./tsconfig.browser.config.json"
|
|
17
|
-
}
|
|
18
|
-
],
|
|
19
|
-
compilerOptions: {
|
|
20
|
-
composite: true
|
|
21
|
-
},
|
|
22
|
-
files: []
|
|
23
|
-
};
|
|
24
8
|
function shouldGenerateTestConfig(model) {
|
|
25
9
|
var _a, _b, _c, _d;
|
|
26
10
|
const isAzureSdkForJs = (_b = (_a = model.options) === null || _a === void 0 ? void 0 : _a.azureSdkForJs) !== null && _b !== void 0 ? _b : false;
|
|
@@ -28,64 +12,48 @@ function shouldGenerateTestConfig(model) {
|
|
|
28
12
|
((_d = model.options) === null || _d === void 0 ? void 0 : _d.generateTest) === false ||
|
|
29
13
|
isAzureSdkForJs !== true);
|
|
30
14
|
}
|
|
15
|
+
/**
|
|
16
|
+
* Builds config/tsconfig.test.browser.json — extends eng/tsconfigs/test.browser.json
|
|
17
|
+
*/
|
|
31
18
|
function buildTestBrowserTsConfig(model) {
|
|
32
19
|
if (!shouldGenerateTestConfig(model)) {
|
|
33
20
|
return;
|
|
34
21
|
}
|
|
35
|
-
const browserFilePath = "tsconfig.browser.config.json";
|
|
36
|
-
const project = new ts_morph_1.Project();
|
|
37
22
|
const name = (0, utils_js_1.getPackageName)(model);
|
|
38
|
-
const browserContent = {
|
|
39
|
-
extends: "../../../tsconfig.browser.base.json",
|
|
40
|
-
compilerOptions: {
|
|
41
|
-
paths: {
|
|
42
|
-
[name]: ["./dist/browser/index.d.ts"],
|
|
43
|
-
[`${name}/*`]: ["./dist/browser/*"],
|
|
44
|
-
"$internal/*": ["./dist/browser/*"]
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
};
|
|
48
|
-
const browserConfigFile = project.createSourceFile(browserFilePath, JSON.stringify(browserContent, null, 2), {
|
|
49
|
-
overwrite: true
|
|
50
|
-
});
|
|
51
23
|
return {
|
|
52
|
-
path:
|
|
53
|
-
content:
|
|
24
|
+
path: "config/tsconfig.test.browser.json",
|
|
25
|
+
content: JSON.stringify({
|
|
26
|
+
extends: "../../../../eng/tsconfigs/test.browser.json",
|
|
27
|
+
compilerOptions: {
|
|
28
|
+
paths: {
|
|
29
|
+
[name]: ["../src/index.ts"],
|
|
30
|
+
[`${name}/*`]: ["../src/*"],
|
|
31
|
+
"$internal/*": ["../src/*"]
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}, null, 2)
|
|
54
35
|
};
|
|
55
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* Builds config/tsconfig.test.node.json — extends eng/tsconfigs/test.node.json
|
|
39
|
+
*/
|
|
56
40
|
function buildTestNodeTsConfig(model) {
|
|
57
41
|
if (!shouldGenerateTestConfig(model)) {
|
|
58
42
|
return;
|
|
59
43
|
}
|
|
60
|
-
const testNodeFilePath = "tsconfig.test.node.json";
|
|
61
|
-
const project = new ts_morph_1.Project();
|
|
62
44
|
const name = (0, utils_js_1.getPackageName)(model);
|
|
63
|
-
const testNodeContent = {
|
|
64
|
-
extends: "../../../tsconfig.test.node.base.json",
|
|
65
|
-
compilerOptions: {
|
|
66
|
-
paths: {
|
|
67
|
-
[name]: ["./src/index.ts"],
|
|
68
|
-
[`${name}/*`]: ["./src/*"],
|
|
69
|
-
"$internal/*": ["./src/*"]
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
};
|
|
73
|
-
const testNodeConfigFile = project.createSourceFile(testNodeFilePath, JSON.stringify(testNodeContent, null, 2), {
|
|
74
|
-
overwrite: true
|
|
75
|
-
});
|
|
76
|
-
return {
|
|
77
|
-
path: testNodeFilePath,
|
|
78
|
-
content: testNodeConfigFile.getFullText()
|
|
79
|
-
};
|
|
80
|
-
}
|
|
81
|
-
function buildTestMainTsConfig(model) {
|
|
82
|
-
if (!shouldGenerateTestConfig(model)) {
|
|
83
|
-
return;
|
|
84
|
-
}
|
|
85
|
-
const testFilePath = "tsconfig.test.json";
|
|
86
45
|
return {
|
|
87
|
-
path:
|
|
88
|
-
content: JSON.stringify(
|
|
46
|
+
path: "config/tsconfig.test.node.json",
|
|
47
|
+
content: JSON.stringify({
|
|
48
|
+
extends: "../../../../eng/tsconfigs/test.node.json",
|
|
49
|
+
compilerOptions: {
|
|
50
|
+
paths: {
|
|
51
|
+
[name]: ["../src/index.ts"],
|
|
52
|
+
[`${name}/*`]: ["../src/*"],
|
|
53
|
+
"$internal/*": ["../src/*"]
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}, null, 2)
|
|
89
57
|
};
|
|
90
58
|
}
|
|
91
59
|
//# sourceMappingURL=buildTestConfig.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTestConfig.js","sourceRoot":"","sources":["../../src/metadata/buildTestConfig.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;
|
|
1
|
+
{"version":3,"file":"buildTestConfig.js","sourceRoot":"","sources":["../../src/metadata/buildTestConfig.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAiBlC,4DAwBC;AAKD,sDAwBC;AAnED,yCAA4C;AAE5C,SAAS,wBAAwB,CAAC,KAAe;;IAC/C,MAAM,eAAe,GAAG,MAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,aAAa,mCAAI,KAAK,CAAC;IAC9D,OAAO,CAAC,CACN,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,gBAAgB,MAAK,KAAK;QACzC,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,YAAY,MAAK,KAAK;QACrC,eAAe,KAAK,IAAI,CACzB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,wBAAwB,CAAC,KAAe;IACtD,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,yBAAc,EAAC,KAAK,CAAC,CAAC;IAEnC,OAAO;QACL,IAAI,EAAE,mCAAmC;QACzC,OAAO,EAAE,IAAI,CAAC,SAAS,CACrB;YACE,OAAO,EAAE,6CAA6C;YACtD,eAAe,EAAE;gBACf,KAAK,EAAE;oBACL,CAAC,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC;oBAC3B,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC;oBAC3B,aAAa,EAAE,CAAC,UAAU,CAAC;iBAC5B;aACF;SACF,EACD,IAAI,EACJ,CAAC,CACF;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CAAC,KAAe;IACnD,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,yBAAc,EAAC,KAAK,CAAC,CAAC;IAEnC,OAAO;QACL,IAAI,EAAE,gCAAgC;QACtC,OAAO,EAAE,IAAI,CAAC,SAAS,CACrB;YACE,OAAO,EAAE,0CAA0C;YACnD,eAAe,EAAE;gBACf,KAAK,EAAE;oBACL,CAAC,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC;oBAC3B,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC;oBAC3B,aAAa,EAAE,CAAC,UAAU,CAAC;iBAC5B;aACF;SACF,EACD,IAAI,EACJ,CAAC,CACF;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -3,135 +3,162 @@
|
|
|
3
3
|
// Licensed under the MIT License.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.buildTsConfig = buildTsConfig;
|
|
6
|
-
exports.
|
|
6
|
+
exports.buildTsSrcEsmConfig = buildTsSrcEsmConfig;
|
|
7
|
+
exports.buildTsSrcBrowserConfig = buildTsSrcBrowserConfig;
|
|
8
|
+
exports.buildTsSrcReactNativeConfig = buildTsSrcReactNativeConfig;
|
|
9
|
+
exports.buildTsSrcCjsConfig = buildTsSrcCjsConfig;
|
|
7
10
|
exports.buildTsSampleConfig = buildTsSampleConfig;
|
|
8
|
-
exports.buildTsTestConfig = buildTsTestConfig;
|
|
9
11
|
exports.buildTsSnippetsConfig = buildTsSnippetsConfig;
|
|
10
12
|
const ts_morph_1 = require("ts-morph");
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
]
|
|
18
|
-
};
|
|
19
|
-
};
|
|
20
|
-
const tsSrcConfigInAzureSdkForJs = `{
|
|
21
|
-
extends: "../../../tsconfig.lib.json"
|
|
22
|
-
}`;
|
|
23
|
-
const tsSampleConfigInAzureSdkForJs = function (clientPackageName) {
|
|
24
|
-
return `{
|
|
25
|
-
extends: "../../../tsconfig.samples.base.json",
|
|
26
|
-
compilerOptions: {
|
|
27
|
-
paths: {
|
|
28
|
-
"${clientPackageName}": ["./dist/esm"]
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
}`;
|
|
32
|
-
};
|
|
33
|
-
const tsTestConfigInAzureSdkForJs = `{
|
|
34
|
-
extends: ["./tsconfig.src.json", "../../../tsconfig.test.base.json"]
|
|
35
|
-
}`;
|
|
36
|
-
const restLevelTsConfigNotInAzureSdkForJs = function (model) {
|
|
37
|
-
const { options } = model;
|
|
38
|
-
return {
|
|
39
|
-
compilerOptions: {
|
|
40
|
-
target: "ES2017",
|
|
41
|
-
module: (options === null || options === void 0 ? void 0 : options.moduleKind) === "esm" ? "NodeNext" : "es6",
|
|
42
|
-
lib: [],
|
|
43
|
-
declaration: true,
|
|
44
|
-
declarationMap: true,
|
|
45
|
-
inlineSources: true,
|
|
46
|
-
sourceMap: true,
|
|
47
|
-
importHelpers: true,
|
|
48
|
-
strict: true,
|
|
49
|
-
alwaysStrict: true,
|
|
50
|
-
noUnusedLocals: true,
|
|
51
|
-
noUnusedParameters: true,
|
|
52
|
-
noImplicitReturns: true,
|
|
53
|
-
noFallthroughCasesInSwitch: true,
|
|
54
|
-
forceConsistentCasingInFileNames: true,
|
|
55
|
-
moduleResolution: (options === null || options === void 0 ? void 0 : options.moduleKind) === "esm" ? "NodeNext" : "node",
|
|
56
|
-
allowSyntheticDefaultImports: true,
|
|
57
|
-
esModuleInterop: true,
|
|
58
|
-
outDir: (options === null || options === void 0 ? void 0 : options.moduleKind) === "cjs" ? "./dist-esm" : undefined,
|
|
59
|
-
declarationDir: (options === null || options === void 0 ? void 0 : options.moduleKind) === "cjs" ? "./types" : undefined
|
|
60
|
-
},
|
|
61
|
-
include: ["src/**/*.ts"]
|
|
62
|
-
};
|
|
63
|
-
};
|
|
13
|
+
/**
|
|
14
|
+
* Builds the root tsconfig.json.
|
|
15
|
+
*
|
|
16
|
+
* For azureSdkForJs packages, emits project references pointing into the
|
|
17
|
+
* `config/` subfolder (following the eng/tsconfigs pattern).
|
|
18
|
+
*/
|
|
64
19
|
function buildTsConfig(model) {
|
|
65
20
|
var _a;
|
|
66
21
|
const { packageDetails, azureSdkForJs } = model.options || {};
|
|
67
22
|
const { generateTest, generateSample } = model.options || {};
|
|
68
|
-
// Take the undefined as true by default
|
|
69
23
|
const clientPackageName = (_a = packageDetails === null || packageDetails === void 0 ? void 0 : packageDetails.name) !== null && _a !== void 0 ? _a : "";
|
|
70
24
|
const project = new ts_morph_1.Project();
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
25
|
+
let tsConfig;
|
|
26
|
+
if (azureSdkForJs) {
|
|
27
|
+
const references = [
|
|
28
|
+
{ path: "./config/tsconfig.src.esm.json" },
|
|
29
|
+
{ path: "./config/tsconfig.src.browser.json" },
|
|
30
|
+
{ path: "./config/tsconfig.src.react-native.json" },
|
|
31
|
+
{ path: "./config/tsconfig.src.cjs.json" }
|
|
32
|
+
];
|
|
75
33
|
if (generateTest) {
|
|
76
|
-
|
|
34
|
+
references.push({ path: "./config/tsconfig.test.node.json" }, { path: "./config/tsconfig.test.browser.json" });
|
|
77
35
|
}
|
|
78
36
|
if (generateSample) {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
];
|
|
37
|
+
references.push({ path: "./config/tsconfig.samples.json" });
|
|
38
|
+
}
|
|
39
|
+
if (generateTest) {
|
|
40
|
+
references.push({ path: "./config/tsconfig.snippets.json" });
|
|
84
41
|
}
|
|
42
|
+
tsConfig = { references, files: [] };
|
|
85
43
|
}
|
|
86
44
|
else {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
45
|
+
const { options } = model;
|
|
46
|
+
tsConfig = {
|
|
47
|
+
compilerOptions: {
|
|
48
|
+
target: "ES2017",
|
|
49
|
+
module: (options === null || options === void 0 ? void 0 : options.moduleKind) === "esm" ? "NodeNext" : "es6",
|
|
50
|
+
lib: [],
|
|
51
|
+
declaration: true,
|
|
52
|
+
declarationMap: true,
|
|
53
|
+
inlineSources: true,
|
|
54
|
+
sourceMap: true,
|
|
55
|
+
importHelpers: true,
|
|
56
|
+
strict: true,
|
|
57
|
+
alwaysStrict: true,
|
|
58
|
+
noUnusedLocals: true,
|
|
59
|
+
noUnusedParameters: true,
|
|
60
|
+
noImplicitReturns: true,
|
|
61
|
+
noFallthroughCasesInSwitch: true,
|
|
62
|
+
forceConsistentCasingInFileNames: true,
|
|
63
|
+
moduleResolution: (options === null || options === void 0 ? void 0 : options.moduleKind) === "esm" ? "NodeNext" : "node",
|
|
64
|
+
allowSyntheticDefaultImports: true,
|
|
65
|
+
esModuleInterop: true,
|
|
66
|
+
outDir: (options === null || options === void 0 ? void 0 : options.moduleKind) === "cjs" ? "./dist-esm" : undefined,
|
|
67
|
+
declarationDir: (options === null || options === void 0 ? void 0 : options.moduleKind) === "cjs" ? "./types" : undefined
|
|
68
|
+
},
|
|
69
|
+
include: ["src/**/*.ts"]
|
|
70
|
+
};
|
|
92
71
|
if (generateTest) {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
72
|
+
tsConfig.include.push("test/**/*.ts");
|
|
73
|
+
}
|
|
74
|
+
if (generateSample) {
|
|
75
|
+
tsConfig.include.push("samples-dev/**/*.ts");
|
|
76
|
+
tsConfig.compilerOptions["paths"] = {};
|
|
77
|
+
tsConfig.compilerOptions["paths"][clientPackageName] = ["./src/index"];
|
|
99
78
|
}
|
|
100
79
|
}
|
|
101
80
|
const filePath = "tsconfig.json";
|
|
102
|
-
const configFile = project.createSourceFile(filePath, JSON.stringify(
|
|
103
|
-
overwrite: true
|
|
104
|
-
});
|
|
81
|
+
const configFile = project.createSourceFile(filePath, JSON.stringify(tsConfig, null, 2), { overwrite: true });
|
|
105
82
|
return {
|
|
106
83
|
path: filePath,
|
|
107
84
|
content: configFile.getFullText()
|
|
108
85
|
};
|
|
109
86
|
}
|
|
110
|
-
|
|
87
|
+
/**
|
|
88
|
+
* Builds config/tsconfig.src.esm.json — extends eng/tsconfigs/src.esm.json
|
|
89
|
+
*/
|
|
90
|
+
function buildTsSrcEsmConfig() {
|
|
111
91
|
return {
|
|
112
|
-
path: "tsconfig.src.json",
|
|
113
|
-
content:
|
|
92
|
+
path: "config/tsconfig.src.esm.json",
|
|
93
|
+
content: JSON.stringify({
|
|
94
|
+
extends: "../../../../eng/tsconfigs/src.esm.json",
|
|
95
|
+
include: ["../src/index.ts"]
|
|
96
|
+
}, null, 2)
|
|
114
97
|
};
|
|
115
98
|
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
99
|
+
/**
|
|
100
|
+
* Builds config/tsconfig.src.browser.json — extends eng/tsconfigs/src.browser.json
|
|
101
|
+
*/
|
|
102
|
+
function buildTsSrcBrowserConfig() {
|
|
103
|
+
return {
|
|
104
|
+
path: "config/tsconfig.src.browser.json",
|
|
105
|
+
content: JSON.stringify({
|
|
106
|
+
extends: "../../../../eng/tsconfigs/src.browser.json",
|
|
107
|
+
include: ["../src/index.ts"]
|
|
108
|
+
}, null, 2)
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* Builds config/tsconfig.src.react-native.json — extends eng/tsconfigs/src.react-native.json
|
|
113
|
+
*/
|
|
114
|
+
function buildTsSrcReactNativeConfig() {
|
|
115
|
+
return {
|
|
116
|
+
path: "config/tsconfig.src.react-native.json",
|
|
117
|
+
content: JSON.stringify({
|
|
118
|
+
extends: "../../../../eng/tsconfigs/src.react-native.json",
|
|
119
|
+
include: ["../src/index.ts"]
|
|
120
|
+
}, null, 2)
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
/**
|
|
124
|
+
* Builds config/tsconfig.src.cjs.json — extends eng/tsconfigs/src.cjs.json
|
|
125
|
+
*/
|
|
126
|
+
function buildTsSrcCjsConfig() {
|
|
119
127
|
return {
|
|
120
|
-
path: "tsconfig.
|
|
121
|
-
content:
|
|
128
|
+
path: "config/tsconfig.src.cjs.json",
|
|
129
|
+
content: JSON.stringify({
|
|
130
|
+
extends: "../../../../eng/tsconfigs/src.cjs.json",
|
|
131
|
+
include: ["../src/index.ts"]
|
|
132
|
+
}, null, 2)
|
|
122
133
|
};
|
|
123
134
|
}
|
|
124
|
-
|
|
135
|
+
/**
|
|
136
|
+
* Builds config/tsconfig.samples.json — extends eng/tsconfigs/samples.json
|
|
137
|
+
*/
|
|
138
|
+
function buildTsSampleConfig(model) {
|
|
139
|
+
var _a;
|
|
140
|
+
const { packageDetails } = model.options || {};
|
|
141
|
+
const clientPackageName = (_a = packageDetails === null || packageDetails === void 0 ? void 0 : packageDetails.name) !== null && _a !== void 0 ? _a : "";
|
|
125
142
|
return {
|
|
126
|
-
path: "tsconfig.
|
|
127
|
-
content:
|
|
143
|
+
path: "config/tsconfig.samples.json",
|
|
144
|
+
content: JSON.stringify({
|
|
145
|
+
extends: "../../../../eng/tsconfigs/samples.json",
|
|
146
|
+
compilerOptions: {
|
|
147
|
+
paths: {
|
|
148
|
+
[clientPackageName]: ["../dist/esm"]
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
}, null, 2)
|
|
128
152
|
};
|
|
129
153
|
}
|
|
154
|
+
/**
|
|
155
|
+
* Builds config/tsconfig.snippets.json — extends eng/tsconfigs/snippets.json
|
|
156
|
+
*/
|
|
130
157
|
function buildTsSnippetsConfig() {
|
|
131
158
|
return {
|
|
132
|
-
path: "tsconfig.snippets.json",
|
|
159
|
+
path: "config/tsconfig.snippets.json",
|
|
133
160
|
content: JSON.stringify({
|
|
134
|
-
extends:
|
|
161
|
+
extends: "../../../../eng/tsconfigs/snippets.json"
|
|
135
162
|
}, null, 2)
|
|
136
163
|
};
|
|
137
164
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTsConfig.js","sourceRoot":"","sources":["../../src/metadata/buildTsConfig.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;
|
|
1
|
+
{"version":3,"file":"buildTsConfig.js","sourceRoot":"","sources":["../../src/metadata/buildTsConfig.ts"],"names":[],"mappings":"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"}
|