@azure-tools/rlc-common 0.32.0 → 0.33.0
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/.rush/temp/package-deps_build.json +11 -11
- package/.rush/temp/shrinkwrap-deps.json +1 -1
- package/CHANGELOG.md +15 -0
- package/dist/metadata/buildPackageFile.js +31 -22
- package/dist/metadata/buildPackageFile.js.map +1 -1
- package/dist/metadata/buildTsConfig.js +4 -2
- package/dist/metadata/buildTsConfig.js.map +1 -1
- package/dist/metadata/packageJson/azurePackageCommon.js +9 -9
- package/dist/metadata/packageJson/azurePackageCommon.js.map +1 -1
- package/dist/metadata/packageJson/buildAzureMonorepoPackage.js +4 -4
- package/dist/metadata/packageJson/buildAzureMonorepoPackage.js.map +1 -1
- package/dist/metadata/packageJson/buildAzureStandalonePackage.js +4 -2
- package/dist/metadata/packageJson/buildAzureStandalonePackage.js.map +1 -1
- package/dist/metadata/packageJson/packageCommon.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist-esm/metadata/buildPackageFile.js +29 -21
- package/dist-esm/metadata/buildPackageFile.js.map +1 -1
- package/dist-esm/metadata/buildTsConfig.js +4 -2
- package/dist-esm/metadata/buildTsConfig.js.map +1 -1
- package/dist-esm/metadata/packageJson/azurePackageCommon.js +9 -9
- package/dist-esm/metadata/packageJson/azurePackageCommon.js.map +1 -1
- package/dist-esm/metadata/packageJson/buildAzureMonorepoPackage.js +4 -4
- package/dist-esm/metadata/packageJson/buildAzureMonorepoPackage.js.map +1 -1
- package/dist-esm/metadata/packageJson/buildAzureStandalonePackage.js +4 -2
- package/dist-esm/metadata/packageJson/buildAzureStandalonePackage.js.map +1 -1
- package/dist-esm/metadata/packageJson/packageCommon.js.map +1 -1
- package/dist-esm/package.json +1 -1
- package/package.json +1 -1
- package/src/metadata/buildPackageFile.ts +39 -24
- package/src/metadata/buildTsConfig.ts +4 -2
- package/src/metadata/packageJson/azurePackageCommon.ts +11 -9
- package/src/metadata/packageJson/buildAzureMonorepoPackage.ts +13 -12
- package/src/metadata/packageJson/buildAzureStandalonePackage.ts +9 -8
- package/src/metadata/packageJson/packageCommon.ts +2 -0
- package/test/integration/mockHelper.ts +3 -1
- package/test/integration/packageJson.spec.ts +42 -8
- package/types/metadata/buildPackageFile.d.ts +7 -2
- package/types/metadata/packageJson/azurePackageCommon.d.ts +1 -3
- package/types/metadata/packageJson/buildAzureMonorepoPackage.d.ts +0 -6
- package/types/metadata/packageJson/packageCommon.d.ts +2 -0
|
@@ -3,10 +3,10 @@
|
|
|
3
3
|
"packages/rlc-common/.eslintrc.json": "2d81532fb2ba8ccac75fb55afeeef06c620970f3",
|
|
4
4
|
"packages/rlc-common/.prettierignore": "0f7a61c11bf3ac442a984b1136525710e0ebf6d3",
|
|
5
5
|
"packages/rlc-common/.prettierrc": "83e03202b2f3ad5b8df166a965fea698eccb0f90",
|
|
6
|
-
"packages/rlc-common/CHANGELOG.md": "
|
|
6
|
+
"packages/rlc-common/CHANGELOG.md": "a4865653e74f8a640a51932660a53841e574de9e",
|
|
7
7
|
"packages/rlc-common/CONTRIBUTING.md": "38ef379872af08f6935263aafac67abe9ce60a1c",
|
|
8
8
|
"packages/rlc-common/README.md": "cf3a9e48211f34b1cda27882d2f3cf07078f001e",
|
|
9
|
-
"packages/rlc-common/package.json": "
|
|
9
|
+
"packages/rlc-common/package.json": "8fcd55cbe844dbd9b63cccfeb81ea921dad6f0a2",
|
|
10
10
|
"packages/rlc-common/publishPackage.js": "3512e26d1199937b1962f3b4189aa9c506d9da1a",
|
|
11
11
|
"packages/rlc-common/src/buildClient.ts": "615d27248dc9d8828801bbdd8b902f0207fe5ffb",
|
|
12
12
|
"packages/rlc-common/src/buildClientDefinitions.ts": "1ca2cfcf588dac8d081e70ab159a4b2d99db38a2",
|
|
@@ -40,16 +40,16 @@
|
|
|
40
40
|
"packages/rlc-common/src/metadata/buildBrowserConfig.ts": "e0aef3bad59df46f17513010876897bf1e1a0908",
|
|
41
41
|
"packages/rlc-common/src/metadata/buildESLintConfig.ts": "ff8b8c170bddba8293cf67b4c93bb69b8e98f11f",
|
|
42
42
|
"packages/rlc-common/src/metadata/buildLicenseFile.ts": "93aede17cfd25fd7793180cab3a4398af90edc9e",
|
|
43
|
-
"packages/rlc-common/src/metadata/buildPackageFile.ts": "
|
|
43
|
+
"packages/rlc-common/src/metadata/buildPackageFile.ts": "643863a38cfd773ff7476b101b2c330485ef73e4",
|
|
44
44
|
"packages/rlc-common/src/metadata/buildReadmeFile.ts": "8366c61e781cd4589b1765708d538ecad9dacc32",
|
|
45
45
|
"packages/rlc-common/src/metadata/buildRollupConfig.ts": "6d05e8cdab182f7529b725cdc70d7adfdeb108f1",
|
|
46
|
-
"packages/rlc-common/src/metadata/buildTsConfig.ts": "
|
|
46
|
+
"packages/rlc-common/src/metadata/buildTsConfig.ts": "f0559c62848f2bb9d221d1a39aeeacb6cadca291",
|
|
47
47
|
"packages/rlc-common/src/metadata/buildVitestConfig.ts": "0e8fed4600c6727da03767e38adab03753e65840",
|
|
48
|
-
"packages/rlc-common/src/metadata/packageJson/azurePackageCommon.ts": "
|
|
49
|
-
"packages/rlc-common/src/metadata/packageJson/buildAzureMonorepoPackage.ts": "
|
|
50
|
-
"packages/rlc-common/src/metadata/packageJson/buildAzureStandalonePackage.ts": "
|
|
48
|
+
"packages/rlc-common/src/metadata/packageJson/azurePackageCommon.ts": "b3195294ecfa5a67a3a32c6e2127c624bd3594c1",
|
|
49
|
+
"packages/rlc-common/src/metadata/packageJson/buildAzureMonorepoPackage.ts": "9db097e6dfbae5d7f47ac69985d100ec557f3443",
|
|
50
|
+
"packages/rlc-common/src/metadata/packageJson/buildAzureStandalonePackage.ts": "0c1842ed2dd176b813c6455a0f7e1ba24e117ed3",
|
|
51
51
|
"packages/rlc-common/src/metadata/packageJson/buildFlavorlessPackage.ts": "6e6b9132d0332229147a39e5284be5c964f7bd74",
|
|
52
|
-
"packages/rlc-common/src/metadata/packageJson/packageCommon.ts": "
|
|
52
|
+
"packages/rlc-common/src/metadata/packageJson/packageCommon.ts": "e6acbfb431579f89232752dbf5e610314600ed5e",
|
|
53
53
|
"packages/rlc-common/src/static/paginateContent.ts": "db871d05c9ef53a1d0b498f2a24e8a2349e2c44b",
|
|
54
54
|
"packages/rlc-common/src/static/pollingContent.ts": "e258455ebf140e9e11bf567771ac373de9ec8f76",
|
|
55
55
|
"packages/rlc-common/src/static/sampleTemplate.ts": "e27b992af09b5c6b5f7e30a16af60eb3f90f42b0",
|
|
@@ -62,14 +62,14 @@
|
|
|
62
62
|
"packages/rlc-common/test/helpers/importsUtil.spec.ts": "878af744d2d51cc7c37661965a53b878d5f7c46f",
|
|
63
63
|
"packages/rlc-common/test/helpers/nameUtils.spec.ts": "33ef9c79391097b8f5f70e6987a5877add0152c0",
|
|
64
64
|
"packages/rlc-common/test/helpers/typeUtil.spec.ts": "ddabcac40ae1c30c0088ca421c612c4f2a7b3a31",
|
|
65
|
-
"packages/rlc-common/test/integration/mockHelper.ts": "
|
|
66
|
-
"packages/rlc-common/test/integration/packageJson.spec.ts": "
|
|
65
|
+
"packages/rlc-common/test/integration/mockHelper.ts": "5c7f57aaaea34fb206bd37571491fb56ac80613b",
|
|
66
|
+
"packages/rlc-common/test/integration/packageJson.spec.ts": "b4e0976cbc3f884acfabb7b42ca8fcf29ff5e4c0",
|
|
67
67
|
"packages/rlc-common/test/integration/static/package.json": "09d24ae57d9e1d9ff74e057c0caa90a22ffe147a",
|
|
68
68
|
"packages/rlc-common/test/integration/vitestConfig.spec.ts": "ec157c5cdbcd50f8e3864c069c9447ab85034e1e",
|
|
69
69
|
"packages/rlc-common/tsconfig-cjs.json": "50cb4508ae77cfe12f376a367fb9fbe6f46f8dd7",
|
|
70
70
|
"packages/rlc-common/tsconfig-common.json": "84c874d137a56103d2fa8b5ab33744e25540874c",
|
|
71
71
|
"packages/rlc-common/tsconfig.json": "2ce338052b40a33cef04fa132458b8630ae1a809",
|
|
72
|
-
"packages/rlc-common/.rush/temp/shrinkwrap-deps.json": "
|
|
72
|
+
"packages/rlc-common/.rush/temp/shrinkwrap-deps.json": "461a3bb0ada11413b8db8a5b221802536559bb6f"
|
|
73
73
|
},
|
|
74
74
|
"arguments": "rimraf --glob dist/* dist-esm/* types/* && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node publishPackage.js "
|
|
75
75
|
}
|
|
@@ -160,7 +160,7 @@
|
|
|
160
160
|
"/minimatch/5.0.1": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
|
|
161
161
|
"/minimatch/9.0.5": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
|
|
162
162
|
"/minimist/1.2.8": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
|
|
163
|
-
"/minipass/7.
|
|
163
|
+
"/minipass/7.1.2": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
|
|
164
164
|
"/mkdirp/3.0.1": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
|
|
165
165
|
"/mocha/10.2.0": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==",
|
|
166
166
|
"/ms/2.1.2": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
|
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,18 @@
|
|
|
1
|
+
## 0.33.0 (2024-09-06)
|
|
2
|
+
|
|
3
|
+
- [Feature] Fix body optionality default parameter to true for implicit body. Please refer to [#2731](https://github.com/Azure/autorest.typescript/pull/2731)
|
|
4
|
+
- [Feature] Upgrade tcgc to v0.45.4. Please refer to [#2782](https://github.com/Azure/autorest.typescript/pull/2782)
|
|
5
|
+
- [Feature] Support typecheck command for sample scripts. Please refer to [#2784](https://github.com/Azure/autorest.typescript/pull/2784)
|
|
6
|
+
- [Feature] Remove the paging dependency in Modular. Please refer to [#2781](https://github.com/Azure/autorest.typescript/pull/2781)
|
|
7
|
+
- [Feature] Update LRO version in package.json for autorest rlc generation. Please refer to [#2763](https://github.com/Azure/autorest.typescript/pull/2763)
|
|
8
|
+
- [Feature] Generate plainDate and plainTime as string in both RLC and Modular. Please refer to [#2703](https://github.com/Azure/autorest.typescript/pull/2703)
|
|
9
|
+
- [Feature] Support TypeSpec enum name. Please refer to [#2767](https://github.com/Azure/autorest.typescript/pull/2767)
|
|
10
|
+
- [Bugfix] Set core-util dependency with binder. Please refer to [#2743](https://github.com/Azure/autorest.typescript/pull/2743)
|
|
11
|
+
- [Bugfix] Fix constant type serialization and deserialization. Please refer to [#2776](https://github.com/Azure/autorest.typescript/pull/2776)
|
|
12
|
+
- [Bugfix] Standardize OSS copyright header. Please refer to [#2775](https://github.com/Azure/autorest.typescript/pull/2775)
|
|
13
|
+
- [Bugfix] Fix special union within anonymous model issue. Please refer to [#2767](https://github.com/Azure/autorest.typescript/pull/2767)
|
|
14
|
+
- [Bugfix] Get paging properties from parent models. Please refer to [#2764](https://github.com/Azure/autorest.typescript/pull/2764)
|
|
15
|
+
|
|
1
16
|
## 0.32.0 (2024-08-15)
|
|
2
17
|
|
|
3
18
|
- [Feature] Remove internal RLC layer from modular. Please refer to [#2728](https://github.com/Azure/autorest.typescript/pull/2728).
|
|
@@ -4,16 +4,16 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.buildPackageFile = buildPackageFile;
|
|
6
6
|
exports.updatePackageFile = updatePackageFile;
|
|
7
|
-
const buildFlavorlessPackage_js_1 = require("./packageJson/buildFlavorlessPackage.js");
|
|
8
|
-
const buildAzureMonorepoPackage_js_1 = require("./packageJson/buildAzureMonorepoPackage.js");
|
|
9
7
|
const nameUtils_js_1 = require("../helpers/nameUtils.js");
|
|
10
|
-
const pathUtils_js_1 = require("../helpers/pathUtils.js");
|
|
11
8
|
const operationHelpers_js_1 = require("../helpers/operationHelpers.js");
|
|
12
|
-
const buildAzureStandalonePackage_js_1 = require("./packageJson/buildAzureStandalonePackage.js");
|
|
13
|
-
const ts_morph_1 = require("ts-morph");
|
|
14
9
|
const packageUtil_js_1 = require("../helpers/packageUtil.js");
|
|
15
|
-
|
|
16
|
-
|
|
10
|
+
const ts_morph_1 = require("ts-morph");
|
|
11
|
+
const buildAzureMonorepoPackage_js_1 = require("./packageJson/buildAzureMonorepoPackage.js");
|
|
12
|
+
const buildAzureStandalonePackage_js_1 = require("./packageJson/buildAzureStandalonePackage.js");
|
|
13
|
+
const buildFlavorlessPackage_js_1 = require("./packageJson/buildFlavorlessPackage.js");
|
|
14
|
+
const pathUtils_js_1 = require("../helpers/pathUtils.js");
|
|
15
|
+
function buildPackageFile(model, { exports, dependencies } = {}) {
|
|
16
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
17
17
|
const config = {
|
|
18
18
|
description: getDescription(model),
|
|
19
19
|
moduleKind: (_b = (_a = model.options) === null || _a === void 0 ? void 0 : _a.moduleKind) !== null && _b !== void 0 ? _b : "esm",
|
|
@@ -23,7 +23,8 @@ function buildPackageFile(model, exports) {
|
|
|
23
23
|
withTests: ((_d = model.options) === null || _d === void 0 ? void 0 : _d.generateTest) === true,
|
|
24
24
|
nameWithoutScope: (_f = (_e = model.options) === null || _e === void 0 ? void 0 : _e.packageDetails) === null || _f === void 0 ? void 0 : _f.nameWithoutScope,
|
|
25
25
|
exports,
|
|
26
|
-
azureArm: (_g = model.options) === null || _g === void 0 ? void 0 : _g.azureArm
|
|
26
|
+
azureArm: (_g = model.options) === null || _g === void 0 ? void 0 : _g.azureArm,
|
|
27
|
+
isModularLibrary: (_j = (_h = model.options) === null || _h === void 0 ? void 0 : _h.isModularLibrary) !== null && _j !== void 0 ? _j : false
|
|
27
28
|
};
|
|
28
29
|
let packageInfo = (0, buildFlavorlessPackage_js_1.buildFlavorlessPackage)(config);
|
|
29
30
|
const extendedConfig = {
|
|
@@ -31,8 +32,9 @@ function buildPackageFile(model, exports) {
|
|
|
31
32
|
clientFilePaths: [getClientFilePath(model)],
|
|
32
33
|
hasLro: (0, operationHelpers_js_1.hasPollingOperations)(model),
|
|
33
34
|
hasPaging: (0, operationHelpers_js_1.hasPagingOperations)(model),
|
|
34
|
-
monorepoPackageDirectory: (
|
|
35
|
-
specSource: (
|
|
35
|
+
monorepoPackageDirectory: (_k = model.options) === null || _k === void 0 ? void 0 : _k.azureOutputDirectory,
|
|
36
|
+
specSource: (_m = (_l = model.options) === null || _l === void 0 ? void 0 : _l.sourceFrom) !== null && _m !== void 0 ? _m : "TypeSpec",
|
|
37
|
+
dependencies
|
|
36
38
|
};
|
|
37
39
|
if ((0, packageUtil_js_1.isAzureMonorepoPackage)(model)) {
|
|
38
40
|
packageInfo = (0, buildAzureMonorepoPackage_js_1.buildAzureMonorepoPackage)(extendedConfig);
|
|
@@ -56,22 +58,30 @@ function buildPackageFile(model, exports) {
|
|
|
56
58
|
/**
|
|
57
59
|
* Automatically updates the package.json with correct paging and LRO dependencies for Azure SDK.
|
|
58
60
|
*/
|
|
59
|
-
function updatePackageFile(model,
|
|
60
|
-
|
|
61
|
+
function updatePackageFile(model, existingFilePathOrContent) {
|
|
62
|
+
var _a;
|
|
61
63
|
const hasPaging = (0, operationHelpers_js_1.hasPagingOperations)(model), hasLro = (0, operationHelpers_js_1.hasPollingOperations)(model);
|
|
62
64
|
if (!(0, packageUtil_js_1.isAzurePackage)(model) || (!hasPaging && !hasLro)) {
|
|
63
65
|
return;
|
|
64
66
|
}
|
|
65
|
-
let
|
|
66
|
-
|
|
67
|
-
packageFile
|
|
67
|
+
let packageInfo;
|
|
68
|
+
if (typeof existingFilePathOrContent === "string") {
|
|
69
|
+
let packageFile;
|
|
70
|
+
try {
|
|
71
|
+
const project = new ts_morph_1.Project();
|
|
72
|
+
packageFile = project.addSourceFileAtPath(existingFilePathOrContent);
|
|
73
|
+
}
|
|
74
|
+
catch (e) {
|
|
75
|
+
// If the file doesn't exist, we don't need to update it.
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
packageInfo = JSON.parse(packageFile.getFullText());
|
|
68
79
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
return;
|
|
80
|
+
else {
|
|
81
|
+
packageInfo = existingFilePathOrContent;
|
|
72
82
|
}
|
|
73
|
-
|
|
74
|
-
if (hasPaging) {
|
|
83
|
+
// no need to update paging dependency for modular libraries
|
|
84
|
+
if (hasPaging && ((_a = model.options) === null || _a === void 0 ? void 0 : _a.isModularLibrary) !== true) {
|
|
75
85
|
packageInfo.dependencies = {
|
|
76
86
|
...packageInfo.dependencies,
|
|
77
87
|
"@azure/core-paging": "^1.5.0"
|
|
@@ -84,10 +94,9 @@ function updatePackageFile(model, existingFilePath) {
|
|
|
84
94
|
"@azure/abort-controller": "^2.1.2"
|
|
85
95
|
};
|
|
86
96
|
}
|
|
87
|
-
packageFile.replaceWithText(JSON.stringify(packageInfo, null, 2));
|
|
88
97
|
return {
|
|
89
98
|
path: "package.json",
|
|
90
|
-
content:
|
|
99
|
+
content: JSON.stringify(packageInfo, null, 2)
|
|
91
100
|
};
|
|
92
101
|
}
|
|
93
102
|
function getPackageVersion(model) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildPackageFile.js","sourceRoot":"","sources":["../../src/metadata/buildPackageFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;
|
|
1
|
+
{"version":3,"file":"buildPackageFile.js","sourceRoot":"","sources":["../../src/metadata/buildPackageFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAyBlC,4CAuDC;AAKD,8CA4CC;AA/HD,0DAAkE;AAClE,wEAGwC;AACxC,8DAImC;AAEnC,uCAA+C;AAE/C,6FAAuF;AACvF,iGAA2F;AAC3F,uFAAiF;AACjF,0DAAqE;AAOrE,SAAgB,gBAAgB,CAC9B,KAAe,EACf,EAAE,OAAO,EAAE,YAAY,KAAyB,EAAE;;IAElD,MAAM,MAAM,GAA4B;QACtC,WAAW,EAAE,cAAc,CAAC,KAAK,CAAC;QAClC,UAAU,EAAE,MAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,UAAU,mCAAI,KAAK;QAC9C,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC;QAC3B,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC;QACjC,WAAW,EAAE,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,cAAc,MAAK,IAAI;QACnD,SAAS,EAAE,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,YAAY,MAAK,IAAI;QAC/C,gBAAgB,EAAE,MAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,cAAc,0CAAE,gBAAgB;QACjE,OAAO;QACP,QAAQ,EAAE,MAAA,KAAK,CAAC,OAAO,0CAAE,QAAQ;QACjC,gBAAgB,EAAE,MAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,gBAAgB,mCAAI,KAAK;KAC3D,CAAC;IAEF,IAAI,WAAW,GAAwB,IAAA,kDAAsB,EAAC,MAAM,CAAC,CAAC;IAEtE,MAAM,cAAc,GAAG;QACrB,GAAG,MAAM;QACT,eAAe,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,EAAE,IAAA,0CAAoB,EAAC,KAAK,CAAC;QACnC,SAAS,EAAE,IAAA,yCAAmB,EAAC,KAAK,CAAC;QACrC,wBAAwB,EAAE,MAAA,KAAK,CAAC,OAAO,0CAAE,oBAAoB;QAC7D,UAAU,EAAE,MAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,UAAU,mCAAI,UAAU;QACnD,YAAY;KACb,CAAC;IAEF,IAAI,IAAA,uCAAsB,EAAC,KAAK,CAAC,EAAE,CAAC;QAClC,WAAW,GAAG,IAAA,wDAAyB,EAAC,cAAc,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,IAAA,yCAAwB,EAAC,KAAK,CAAC,EAAE,CAAC;QACpC,WAAW,GAAG,IAAA,4DAA2B,EAAC,cAAc,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;IAC9B,MAAM,QAAQ,GAAG,cAAc,CAAC;IAEhC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO;IACT,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAC1C,QAAQ,EACR,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,EACpC;QACE,SAAS,EAAE,IAAI;KAChB,CACF,CAAC;IACF,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,WAAW,CAAC,WAAW,EAAE;KACnC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,iBAAiB,CAC/B,KAAe,EACf,yBAAuD;;IAEvD,MAAM,SAAS,GAAG,IAAA,yCAAmB,EAAC,KAAK,CAAC,EAC1C,MAAM,GAAG,IAAA,0CAAoB,EAAC,KAAK,CAAC,CAAC;IACvC,IAAI,CAAC,IAAA,+BAAc,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtD,OAAO;IACT,CAAC;IACD,IAAI,WAAW,CAAC;IAChB,IAAI,OAAO,yBAAyB,KAAK,QAAQ,EAAE,CAAC;QAClD,IAAI,WAAuB,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;YAC9B,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,CAAC;QACvE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,yDAAyD;YACzD,OAAO;QACT,CAAC;QACD,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;IACtD,CAAC;SAAM,CAAC;QACN,WAAW,GAAG,yBAAyB,CAAC;IAC1C,CAAC;IAED,4DAA4D;IAC5D,IAAI,SAAS,IAAI,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,gBAAgB,MAAK,IAAI,EAAE,CAAC;QAC1D,WAAW,CAAC,YAAY,GAAG;YACzB,GAAG,WAAW,CAAC,YAAY;YAC3B,oBAAoB,EAAE,QAAQ;SAC/B,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,WAAW,CAAC,YAAY,GAAG;YACzB,GAAG,WAAW,CAAC,YAAY;YAC3B,iBAAiB,EAAE,QAAQ;YAC3B,yBAAyB,EAAE,QAAQ;SACpC,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;KAC9C,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAe;;IACxC,OAAO,MAAA,MAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,cAAc,0CAAE,OAAO,mCAAI,cAAc,CAAC;AAClE,CAAC;AAED,SAAS,cAAc,CAAC,KAAe;;IACrC,MAAM,WAAW,GAAG,MAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,cAAc,0CAAE,WAAW,CAAC;IAC/D,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,uBAAuB,KAAK,CAAC,WAAW,GAAG,CAAC;IACrD,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,cAAc,CAAC,KAAe;;IACrC,OAAO,MAAA,MAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,cAAc,0CAAE,IAAI,mCAAI,KAAK,CAAC,WAAW,CAAC;AAClE,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAe;IACxC,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC1B,MAAM,eAAe,GAAG,IAAA,yCAA0B,EAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,cAAc,GAAG,IAAA,4BAAa,EAAC,KAAK,CAAC,WAAW,EAAE,uBAAQ,CAAC,IAAI,CAAC,CAAC;IACvE,OAAO,eAAe;QACpB,CAAC,CAAC,OAAO,eAAe,IAAI,cAAc,KAAK;QAC/C,CAAC,CAAC,OAAO,cAAc,KAAK,CAAC;AACjC,CAAC"}
|
|
@@ -12,7 +12,8 @@ const restLevelTsConfigInAzureSdkForJs = function (model) {
|
|
|
12
12
|
compilerOptions: {
|
|
13
13
|
module: "NodeNext",
|
|
14
14
|
moduleResolution: "NodeNext",
|
|
15
|
-
rootDir: "."
|
|
15
|
+
rootDir: ".",
|
|
16
|
+
skipLibCheck: true
|
|
16
17
|
},
|
|
17
18
|
include: [
|
|
18
19
|
"./src/**/*.ts",
|
|
@@ -26,7 +27,8 @@ const restLevelTsConfigInAzureSdkForJs = function (model) {
|
|
|
26
27
|
extends: "../../../tsconfig",
|
|
27
28
|
compilerOptions: {
|
|
28
29
|
outDir: "./dist-esm",
|
|
29
|
-
declarationDir: "./types"
|
|
30
|
+
declarationDir: "./types",
|
|
31
|
+
skipLibCheck: true
|
|
30
32
|
},
|
|
31
33
|
include: ["src/**/*.ts"]
|
|
32
34
|
};
|
|
@@ -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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"}
|
|
@@ -21,8 +21,9 @@ function getAzureCommonPackageInfo(config) {
|
|
|
21
21
|
/**
|
|
22
22
|
* Builds the common dependencies for an Azure package.
|
|
23
23
|
*/
|
|
24
|
-
function getAzurePackageDependencies({ hasLro, hasPaging, specSource }) {
|
|
25
|
-
let
|
|
24
|
+
function getAzurePackageDependencies({ hasLro, hasPaging, specSource, dependencies, isModularLibrary }) {
|
|
25
|
+
let azureDependencies = {
|
|
26
|
+
...dependencies,
|
|
26
27
|
"@azure-rest/core-client": specSource === "Swagger" ? "^1.4.0" : "^2.1.0",
|
|
27
28
|
"@azure/core-auth": "^1.6.0",
|
|
28
29
|
"@azure/core-rest-pipeline": "^1.5.0",
|
|
@@ -30,19 +31,19 @@ function getAzurePackageDependencies({ hasLro, hasPaging, specSource }) {
|
|
|
30
31
|
tslib: "^2.6.2"
|
|
31
32
|
};
|
|
32
33
|
if (hasLro) {
|
|
33
|
-
|
|
34
|
-
...
|
|
34
|
+
azureDependencies = {
|
|
35
|
+
...azureDependencies,
|
|
35
36
|
"@azure/core-lro": "^3.0.0",
|
|
36
37
|
"@azure/abort-controller": "^2.1.2"
|
|
37
38
|
};
|
|
38
39
|
}
|
|
39
|
-
if (hasPaging) {
|
|
40
|
-
|
|
41
|
-
...
|
|
40
|
+
if (hasPaging && isModularLibrary !== true) {
|
|
41
|
+
azureDependencies = {
|
|
42
|
+
...azureDependencies,
|
|
42
43
|
"@azure/core-paging": "^1.5.0"
|
|
43
44
|
};
|
|
44
45
|
}
|
|
45
|
-
return
|
|
46
|
+
return azureDependencies;
|
|
46
47
|
}
|
|
47
48
|
function getAzureCjsCommonInfo({ withTests, withSamples, name, nameWithoutScope, moduleKind }) {
|
|
48
49
|
if (moduleKind !== "cjs") {
|
|
@@ -120,7 +121,6 @@ function getAzurePackageDevDependencies(config) {
|
|
|
120
121
|
const esmDevDependencies = getAzurePackageEsmDevDependencies(config);
|
|
121
122
|
const cjsDevDependencies = getAzurePackageCjsDevDependencies(config);
|
|
122
123
|
const testDevDependencies = {
|
|
123
|
-
"@azure/core-util": "^1.0.0",
|
|
124
124
|
"@azure/identity": "^4.2.1"
|
|
125
125
|
};
|
|
126
126
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azurePackageCommon.js","sourceRoot":"","sources":["../../../src/metadata/packageJson/azurePackageCommon.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAgBlC,8DAQC;AAKD,
|
|
1
|
+
{"version":3,"file":"azurePackageCommon.js","sourceRoot":"","sources":["../../../src/metadata/packageJson/azurePackageCommon.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.buildAzureMonorepoPackage = buildAzureMonorepoPackage;
|
|
6
6
|
exports.getAzureMonorepoDependencies = getAzureMonorepoDependencies;
|
|
7
7
|
exports.getAzureMonorepoPackageInfo = getAzureMonorepoPackageInfo;
|
|
8
|
-
const packageCommon_js_1 = require("./packageCommon.js");
|
|
9
8
|
const azurePackageCommon_js_1 = require("./azurePackageCommon.js");
|
|
9
|
+
const packageCommon_js_1 = require("./packageCommon.js");
|
|
10
10
|
/**
|
|
11
11
|
* Builds the package.json for an Azure package that will be hosted in the azure-sdk-for-js mono repo.
|
|
12
12
|
*/
|
|
@@ -150,14 +150,14 @@ function getAzureMonorepoScripts(config) {
|
|
|
150
150
|
...(0, packageCommon_js_1.getCommonPackageScripts)(config),
|
|
151
151
|
audit: "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
|
|
152
152
|
"build:samples": config.withSamples
|
|
153
|
-
? "dev-tool samples publish
|
|
153
|
+
? "dev-tool run typecheck --paths samples-dev/*.ts && dev-tool samples publish -f"
|
|
154
154
|
: "echo skipped",
|
|
155
|
-
"check-format":
|
|
155
|
+
"check-format": `dev-tool run vendored prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.{ts,cts,mts}" "test/**/*.{ts,cts,mts}" "*.{js,cjs,mjs,json}" ${config.withSamples ? '"samples-dev/*.ts"' : ""}`,
|
|
156
156
|
"execute:samples": config.withSamples
|
|
157
157
|
? "dev-tool samples run samples-dev"
|
|
158
158
|
: "echo skipped",
|
|
159
159
|
"extract-api": "rimraf review && mkdirp ./review && dev-tool run extract-api",
|
|
160
|
-
format:
|
|
160
|
+
format: `dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.{ts,cts,mts}" "test/**/*.{ts,cts,mts}" "*.{js,cjs,mjs,json}" ${config.withSamples ? '"samples-dev/*.ts"' : ""}`,
|
|
161
161
|
"integration-test:browser": "echo skipped",
|
|
162
162
|
"integration-test:node": "echo skipped",
|
|
163
163
|
"generate:client": "echo skipped",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildAzureMonorepoPackage.js","sourceRoot":"","sources":["../../../src/metadata/packageJson/buildAzureMonorepoPackage.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;
|
|
1
|
+
{"version":3,"file":"buildAzureMonorepoPackage.js","sourceRoot":"","sources":["../../../src/metadata/packageJson/buildAzureMonorepoPackage.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
// Licensed under the MIT License.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.buildAzureStandalonePackage = buildAzureStandalonePackage;
|
|
6
|
-
const packageCommon_js_1 = require("./packageCommon.js");
|
|
7
6
|
const azurePackageCommon_js_1 = require("./azurePackageCommon.js");
|
|
7
|
+
const packageCommon_js_1 = require("./packageCommon.js");
|
|
8
8
|
/**
|
|
9
9
|
* Builds the package.json for an Azure package that won't be hosted in the azure-sdk-for-js repo.
|
|
10
10
|
*/
|
|
@@ -25,7 +25,9 @@ function getAzureStandalonePackageInfo(config) {
|
|
|
25
25
|
}
|
|
26
26
|
function getAzureStandaloneDependencies(config) {
|
|
27
27
|
return {
|
|
28
|
-
dependencies:
|
|
28
|
+
dependencies: {
|
|
29
|
+
...(0, azurePackageCommon_js_1.getAzurePackageDependencies)(config)
|
|
30
|
+
},
|
|
29
31
|
devDependencies: getStandaloneDevDependencies(config)
|
|
30
32
|
};
|
|
31
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildAzureStandalonePackage.js","sourceRoot":"","sources":["../../../src/metadata/packageJson/buildAzureStandalonePackage.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;
|
|
1
|
+
{"version":3,"file":"buildAzureStandalonePackage.js","sourceRoot":"","sources":["../../../src/metadata/packageJson/buildAzureStandalonePackage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageCommon.js","sourceRoot":"","sources":["../../../src/metadata/packageJson/packageCommon.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;
|
|
1
|
+
{"version":3,"file":"packageCommon.js","sourceRoot":"","sources":["../../../src/metadata/packageJson/packageCommon.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@azure-tools/rlc-common","version":"0.
|
|
1
|
+
{"name":"@azure-tools/rlc-common","version":"0.33.0","description":"","type":"commonjs","main":"dist/index.js","module":"dist-esm/index.js","exports":{".":{"types":"./types/index.d.ts","require":"./dist/index.js","import":"./dist-esm/index.js"}},"types":"./types/index.d.ts","scripts":{"lint":"eslint src --ext .ts --max-warnings=0","lint:fix":"eslint src --fix --ext .ts","format":"npm run -s prettier -- --write","check-format":"npm run prettier -- --check","prettier":"prettier --config ./.prettierrc \"src/**/*.ts\"","build":"rimraf --glob dist/* dist-esm/* types/* && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node publishPackage.js","build:cjs":"rimraf --glob dist/* dist-esm/* types/* && tsc -p tsconfig-cjs.json && node publishPackage.js","build:esm":"rimraf --glob dist/* dist-esm/* types/* && tsc -p tsconfig.json && node publishPackage.js","test":"npm run unit-test","unit-test":"cross-env TS_NODE_PROJECT=tsconfig.json mocha -r ts-node/register --loader=ts-node/esm --experimental-specifier-resolution=node test/**/*.spec.ts"},"keywords":[],"author":"","license":"ISC","dependencies":{"ts-morph":"^23.0.0","lodash":"^4.17.21","handlebars":"^4.7.7"},"devDependencies":{"@types/node":"^18.0.0","eslint":"^8.9.0","prettier":"^3.1.0","typescript":"~5.5.3","rimraf":"^5.0.0","@types/lodash":"^4.14.182","fs-extra":"^10.0.0","@types/fs-extra":"^8.1.0","ts-node":"^10.7.0","mocha":"^10.2.0","chai":"^4.3.7","@types/chai":"^4.3.4","@types/mocha":"^10.0.1","@typescript-eslint/eslint-plugin":"^6.8.0","@typescript-eslint/parser":"^6.8.0","eslint-plugin-require-extensions":"0.1.3","cross-env":"7.0.3"},"bugs":{"url":"https://github.com/Azure/autorest.typescript/issues"},"homepage":"https://github.com/Azure/autorest.typescript/tree/main/packages/rlc-common/"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
// Copyright (c) Microsoft Corporation.
|
|
2
2
|
// Licensed under the MIT License.
|
|
3
|
-
import {
|
|
4
|
-
import { buildAzureMonorepoPackage } from "./packageJson/buildAzureMonorepoPackage.js";
|
|
5
|
-
import { normalizeName, NameType } from "../helpers/nameUtils.js";
|
|
6
|
-
import { getRelativePartFromSrcPath } from "../helpers/pathUtils.js";
|
|
3
|
+
import { NameType, normalizeName } from "../helpers/nameUtils.js";
|
|
7
4
|
import { hasPagingOperations, hasPollingOperations } from "../helpers/operationHelpers.js";
|
|
8
|
-
import {
|
|
5
|
+
import { isAzureMonorepoPackage, isAzurePackage, isAzureStandalonePackage } from "../helpers/packageUtil.js";
|
|
9
6
|
import { Project } from "ts-morph";
|
|
10
|
-
import {
|
|
11
|
-
|
|
7
|
+
import { buildAzureMonorepoPackage } from "./packageJson/buildAzureMonorepoPackage.js";
|
|
8
|
+
import { buildAzureStandalonePackage } from "./packageJson/buildAzureStandalonePackage.js";
|
|
9
|
+
import { buildFlavorlessPackage } from "./packageJson/buildFlavorlessPackage.js";
|
|
10
|
+
import { getRelativePartFromSrcPath } from "../helpers/pathUtils.js";
|
|
11
|
+
export function buildPackageFile(model, { exports, dependencies } = {}) {
|
|
12
12
|
const config = {
|
|
13
13
|
description: getDescription(model),
|
|
14
14
|
moduleKind: model.options?.moduleKind ?? "esm",
|
|
@@ -18,7 +18,8 @@ export function buildPackageFile(model, exports) {
|
|
|
18
18
|
withTests: model.options?.generateTest === true,
|
|
19
19
|
nameWithoutScope: model.options?.packageDetails?.nameWithoutScope,
|
|
20
20
|
exports,
|
|
21
|
-
azureArm: model.options?.azureArm
|
|
21
|
+
azureArm: model.options?.azureArm,
|
|
22
|
+
isModularLibrary: model.options?.isModularLibrary ?? false
|
|
22
23
|
};
|
|
23
24
|
let packageInfo = buildFlavorlessPackage(config);
|
|
24
25
|
const extendedConfig = {
|
|
@@ -27,7 +28,8 @@ export function buildPackageFile(model, exports) {
|
|
|
27
28
|
hasLro: hasPollingOperations(model),
|
|
28
29
|
hasPaging: hasPagingOperations(model),
|
|
29
30
|
monorepoPackageDirectory: model.options?.azureOutputDirectory,
|
|
30
|
-
specSource: model.options?.sourceFrom ?? "TypeSpec"
|
|
31
|
+
specSource: model.options?.sourceFrom ?? "TypeSpec",
|
|
32
|
+
dependencies
|
|
31
33
|
};
|
|
32
34
|
if (isAzureMonorepoPackage(model)) {
|
|
33
35
|
packageInfo = buildAzureMonorepoPackage(extendedConfig);
|
|
@@ -51,22 +53,29 @@ export function buildPackageFile(model, exports) {
|
|
|
51
53
|
/**
|
|
52
54
|
* Automatically updates the package.json with correct paging and LRO dependencies for Azure SDK.
|
|
53
55
|
*/
|
|
54
|
-
export function updatePackageFile(model,
|
|
55
|
-
const project = new Project();
|
|
56
|
+
export function updatePackageFile(model, existingFilePathOrContent) {
|
|
56
57
|
const hasPaging = hasPagingOperations(model), hasLro = hasPollingOperations(model);
|
|
57
58
|
if (!isAzurePackage(model) || (!hasPaging && !hasLro)) {
|
|
58
59
|
return;
|
|
59
60
|
}
|
|
60
|
-
let
|
|
61
|
-
|
|
62
|
-
packageFile
|
|
61
|
+
let packageInfo;
|
|
62
|
+
if (typeof existingFilePathOrContent === "string") {
|
|
63
|
+
let packageFile;
|
|
64
|
+
try {
|
|
65
|
+
const project = new Project();
|
|
66
|
+
packageFile = project.addSourceFileAtPath(existingFilePathOrContent);
|
|
67
|
+
}
|
|
68
|
+
catch (e) {
|
|
69
|
+
// If the file doesn't exist, we don't need to update it.
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
packageInfo = JSON.parse(packageFile.getFullText());
|
|
63
73
|
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
return;
|
|
74
|
+
else {
|
|
75
|
+
packageInfo = existingFilePathOrContent;
|
|
67
76
|
}
|
|
68
|
-
|
|
69
|
-
if (hasPaging) {
|
|
77
|
+
// no need to update paging dependency for modular libraries
|
|
78
|
+
if (hasPaging && model.options?.isModularLibrary !== true) {
|
|
70
79
|
packageInfo.dependencies = {
|
|
71
80
|
...packageInfo.dependencies,
|
|
72
81
|
"@azure/core-paging": "^1.5.0"
|
|
@@ -79,10 +88,9 @@ export function updatePackageFile(model, existingFilePath) {
|
|
|
79
88
|
"@azure/abort-controller": "^2.1.2"
|
|
80
89
|
};
|
|
81
90
|
}
|
|
82
|
-
packageFile.replaceWithText(JSON.stringify(packageInfo, null, 2));
|
|
83
91
|
return {
|
|
84
92
|
path: "package.json",
|
|
85
|
-
content:
|
|
93
|
+
content: JSON.stringify(packageInfo, null, 2)
|
|
86
94
|
};
|
|
87
95
|
}
|
|
88
96
|
function getPackageVersion(model) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildPackageFile.js","sourceRoot":"","sources":["../../src/metadata/buildPackageFile.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"buildPackageFile.js","sourceRoot":"","sources":["../../src/metadata/buildPackageFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,8 @@ const restLevelTsConfigInAzureSdkForJs = function (model) {
|
|
|
8
8
|
compilerOptions: {
|
|
9
9
|
module: "NodeNext",
|
|
10
10
|
moduleResolution: "NodeNext",
|
|
11
|
-
rootDir: "."
|
|
11
|
+
rootDir: ".",
|
|
12
|
+
skipLibCheck: true
|
|
12
13
|
},
|
|
13
14
|
include: [
|
|
14
15
|
"./src/**/*.ts",
|
|
@@ -22,7 +23,8 @@ const restLevelTsConfigInAzureSdkForJs = function (model) {
|
|
|
22
23
|
extends: "../../../tsconfig",
|
|
23
24
|
compilerOptions: {
|
|
24
25
|
outDir: "./dist-esm",
|
|
25
|
-
declarationDir: "./types"
|
|
26
|
+
declarationDir: "./types",
|
|
27
|
+
skipLibCheck: true
|
|
26
28
|
},
|
|
27
29
|
include: ["src/**/*.ts"]
|
|
28
30
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTsConfig.js","sourceRoot":"","sources":["../../src/metadata/buildTsConfig.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,MAAM,gCAAgC,GAEX,UAAU,KAAe;IAClD,IAAI,KAAK,CAAC,OAAO,EAAE,UAAU,KAAK,KAAK,EAAE,CAAC;QACxC,OAAO;YACL,OAAO,EAAE,mBAAmB;YAC5B,eAAe,EAAE;gBACf,MAAM,EAAE,UAAU;gBAClB,gBAAgB,EAAE,UAAU;gBAC5B,OAAO,EAAE,GAAG;
|
|
1
|
+
{"version":3,"file":"buildTsConfig.js","sourceRoot":"","sources":["../../src/metadata/buildTsConfig.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,MAAM,gCAAgC,GAEX,UAAU,KAAe;IAClD,IAAI,KAAK,CAAC,OAAO,EAAE,UAAU,KAAK,KAAK,EAAE,CAAC;QACxC,OAAO;YACL,OAAO,EAAE,mBAAmB;YAC5B,eAAe,EAAE;gBACf,MAAM,EAAE,UAAU;gBAClB,gBAAgB,EAAE,UAAU;gBAC5B,OAAO,EAAE,GAAG;gBACZ,YAAY,EAAE,IAAI;aACnB;YACD,OAAO,EAAE;gBACP,eAAe;gBACf,gBAAgB;gBAChB,gBAAgB;gBAChB,cAAc;aACf;SACF,CAAC;IACJ,CAAC;IAED,OAAO;QACL,OAAO,EAAE,mBAAmB;QAC5B,eAAe,EAAE;YACf,MAAM,EAAE,YAAY;YACpB,cAAc,EAAE,SAAS;YACzB,YAAY,EAAE,IAAI;SACnB;QACD,OAAO,EAAE,CAAC,aAAa,CAAC;KACzB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,mCAAmC,GAEd,UAAU,KAAe;IAClD,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC1B,OAAO;QACL,eAAe,EAAE;YACf,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,OAAO,EAAE,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK;YAC1D,GAAG,EAAE,EAAE;YACP,WAAW,EAAE,IAAI;YACjB,cAAc,EAAE,IAAI;YACpB,aAAa,EAAE,IAAI;YACnB,SAAS,EAAE,IAAI;YACf,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE,IAAI;YACZ,YAAY,EAAE,IAAI;YAClB,cAAc,EAAE,IAAI;YACpB,kBAAkB,EAAE,IAAI;YACxB,iBAAiB,EAAE,IAAI;YACvB,0BAA0B,EAAE,IAAI;YAChC,gCAAgC,EAAE,IAAI;YACtC,gBAAgB,EAAE,OAAO,EAAE,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM;YACrE,4BAA4B,EAAE,IAAI;YAClC,eAAe,EAAE,IAAI;YACrB,MAAM,EAAE,OAAO,EAAE,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS;YAChE,cAAc,EAAE,OAAO,EAAE,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;SACtE;QACD,OAAO,EAAE,CAAC,eAAe,CAAC;KAC3B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,aAAa,CAAC,KAAe;IAC3C,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC;IAC9D,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC;IAC7D,wCAAwC;IACxC,MAAM,iBAAiB,GAAG,cAAc,EAAE,IAAI,IAAI,EAAE,CAAC;IACrD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAE9B,MAAM,iBAAiB,GAAG,aAAa;QACrC,CAAC,CAAC,gCAAgC,CAAC,KAAK,CAAC;QACzC,CAAC,CAAC,mCAAmC,CAAC,KAAK,CAAC,CAAC;IAE/C,IAAI,YAAY,EAAE,CAAC;QACjB,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACnD,CAAC;IACD,IAAI,cAAc,EAAE,CAAC;QACnB,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACtD,iBAAiB,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QAChD,iBAAiB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,iBAAiB,CAAC,GAAG;YAC9D,aAAa;SACd,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe,CAAC;IACjC,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CACzC,QAAQ,EACR,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,EACjC;QACE,SAAS,EAAE,IAAI;KAChB,CACF,CAAC;IACF,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,UAAU,CAAC,WAAW,EAAE;KAClC,CAAC;AACJ,CAAC"}
|