@azure-tools/rlc-common 0.13.4 → 0.14.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.
Files changed (41) hide show
  1. package/.rush/temp/operation/build/state.json +1 -1
  2. package/.rush/temp/package-deps_build.json +10 -10
  3. package/CHANGELOG.md +9 -0
  4. package/dist/buildClient.js +2 -1
  5. package/dist/buildClient.js.map +1 -1
  6. package/dist/buildClientDefinitions.js +1 -1
  7. package/dist/buildClientDefinitions.js.map +1 -1
  8. package/dist/buildObjectTypes.js +8 -7
  9. package/dist/buildObjectTypes.js.map +1 -1
  10. package/dist/buildTopLevelIndexFile.js +4 -2
  11. package/dist/buildTopLevelIndexFile.js.map +1 -1
  12. package/dist/helpers/pathUtils.js +5 -2
  13. package/dist/helpers/pathUtils.js.map +1 -1
  14. package/dist/interfaces.js.map +1 -1
  15. package/dist/metadata/buildPackageFile.js +2 -2
  16. package/dist/package.json +1 -1
  17. package/dist-esm/buildClient.js +1 -1
  18. package/dist-esm/buildClient.js.map +1 -1
  19. package/dist-esm/buildClientDefinitions.js +1 -1
  20. package/dist-esm/buildClientDefinitions.js.map +1 -1
  21. package/dist-esm/buildObjectTypes.js +7 -7
  22. package/dist-esm/buildObjectTypes.js.map +1 -1
  23. package/dist-esm/buildTopLevelIndexFile.js +4 -2
  24. package/dist-esm/buildTopLevelIndexFile.js.map +1 -1
  25. package/dist-esm/helpers/pathUtils.js +5 -2
  26. package/dist-esm/helpers/pathUtils.js.map +1 -1
  27. package/dist-esm/interfaces.js.map +1 -1
  28. package/dist-esm/metadata/buildPackageFile.js +2 -2
  29. package/dist-esm/package.json +1 -1
  30. package/package.json +1 -1
  31. package/src/buildClient.ts +1 -1
  32. package/src/buildClientDefinitions.ts +4 -1
  33. package/src/buildIndexFile.ts +1 -1
  34. package/src/buildObjectTypes.ts +7 -3
  35. package/src/buildTopLevelIndexFile.ts +5 -2
  36. package/src/helpers/pathUtils.ts +8 -2
  37. package/src/interfaces.ts +2 -0
  38. package/src/metadata/buildPackageFile.ts +2 -2
  39. package/types/buildClient.d.ts +2 -0
  40. package/types/helpers/pathUtils.d.ts +1 -1
  41. package/types/interfaces.d.ts +2 -0
package/.rush/temp/operation/build/state.json CHANGED
@@ -1,3 +1,3 @@
1
1
  {
2
- "nonCachedDurationMs": 7895.242514000041
2
+ "nonCachedDurationMs": 9115.808034999995
3
3
  }
package/.rush/temp/package-deps_build.json CHANGED
@@ -3,38 +3,38 @@
3
3
  "packages/rlc-common/.eslintrc.json": "9fa7b6e2fbe4e63955031b8f8556b51c0a16a46b",
4
4
  "packages/rlc-common/.prettierignore": "0f7a61c11bf3ac442a984b1136525710e0ebf6d3",
5
5
  "packages/rlc-common/.prettierrc": "83e03202b2f3ad5b8df166a965fea698eccb0f90",
6
- "packages/rlc-common/CHANGELOG.md": "afc111dee4c881da5339018cb889ee7747eb33ed",
6
+ "packages/rlc-common/CHANGELOG.md": "1b62099575528a2b5b25e047886148894121b7fd",
7
7
  "packages/rlc-common/CONTRIBUTING.md": "1e6cd52a747c7461956721c6d6b64466608a33ab",
8
8
  "packages/rlc-common/README.md": "4089f33033d3351a176a9d9c6dcaff93cbe9514d",
9
- "packages/rlc-common/package.json": "9b864a94d2d1d52f796a169b3b426b594761c86a",
9
+ "packages/rlc-common/package.json": "1440b3cc41d9425a64ac00c0300ea361f26aed92",
10
10
  "packages/rlc-common/publishPackage.js": "3512e26d1199937b1962f3b4189aa9c506d9da1a",
11
- "packages/rlc-common/src/buildClient.ts": "576075adc1df556d2e9cebbf383c0948a288c0d9",
12
- "packages/rlc-common/src/buildClientDefinitions.ts": "9d57b0bb46ce84fd442bf4cc0e3631de48778bf2",
13
- "packages/rlc-common/src/buildIndexFile.ts": "8aca048bd46b2376b71f6544b5220be59a28b537",
11
+ "packages/rlc-common/src/buildClient.ts": "784e3048ab72e78b2e399bddcbf194e66edfe008",
12
+ "packages/rlc-common/src/buildClientDefinitions.ts": "bf75621520a625598926a892f920bd1199d88fe8",
13
+ "packages/rlc-common/src/buildIndexFile.ts": "cfc029164ebcd100cb5dddb0ff304f44484e45ce",
14
14
  "packages/rlc-common/src/buildIsUnexpectedHelper.ts": "e2b617ad98544a7646157e5027e761e07b63d048",
15
15
  "packages/rlc-common/src/buildLogger.ts": "ee2ceec802a6cf786ea9167b9a789d20657de800",
16
16
  "packages/rlc-common/src/buildMethodShortcuts.ts": "833a2b2965d7b71d5a696b358498a9f9e68d83d1",
17
- "packages/rlc-common/src/buildObjectTypes.ts": "bfb85f686fe53b4d1c925cfd196b75cfc13af82b",
17
+ "packages/rlc-common/src/buildObjectTypes.ts": "8657a24a0bf16ae26250c4adcc814ff5107f8295",
18
18
  "packages/rlc-common/src/buildPaginateHelper.ts": "d1afe6e72d621385075d34d7dd076d78a66f8a23",
19
19
  "packages/rlc-common/src/buildParameterTypes.ts": "99caa0918989011cad8b8444fdeca97631cb814a",
20
20
  "packages/rlc-common/src/buildPollingHelper.ts": "337cce768dad140a273c39fc0201aef8456565ff",
21
21
  "packages/rlc-common/src/buildResponseTypes.ts": "de968fde0a81c59ae074a867427324598f6f4ad1",
22
22
  "packages/rlc-common/src/buildSchemaType.ts": "91a4c4d9bb9a7669d0c1b03e5e1309305d8b9c04",
23
23
  "packages/rlc-common/src/buildSerializeHelper.ts": "aafcf79da4a1241350a4b67bcdc11fe43a50d075",
24
- "packages/rlc-common/src/buildTopLevelIndexFile.ts": "180942844aa448323ab1319931a115043e57cdbd",
24
+ "packages/rlc-common/src/buildTopLevelIndexFile.ts": "8df2628afeb92ce3524f1717e7169fd9826a59f3",
25
25
  "packages/rlc-common/src/helpers/apiVersionUtil.ts": "9682b91071325e9d2c85f970b84e33555927bdd3",
26
26
  "packages/rlc-common/src/helpers/nameConstructors.ts": "1b5caa8937405c163320e4c32c615eb0f526349e",
27
27
  "packages/rlc-common/src/helpers/nameUtils.ts": "7c80ac90a96a7a1e4702b4e6b6a9122a095c7937",
28
28
  "packages/rlc-common/src/helpers/operationHelpers.ts": "b57a9a060e32c3795b90a4817d789eee474c278a",
29
- "packages/rlc-common/src/helpers/pathUtils.ts": "166b066c7eacbc820bd6d366da965f17e25d46b3",
29
+ "packages/rlc-common/src/helpers/pathUtils.ts": "d23effe48effd2e20631c76e097cd42452d0f7d3",
30
30
  "packages/rlc-common/src/helpers/schemaHelpers.ts": "722c52837218b8cfafdc36fe29e675e0df4acb09",
31
31
  "packages/rlc-common/src/helpers/shortcutMethods.ts": "cd52b21e05192c7b3fce3ff26eae2ac03ab62679",
32
32
  "packages/rlc-common/src/index.ts": "3d16dd6148dd3bd43d7b0e7132d81472f74ba27e",
33
- "packages/rlc-common/src/interfaces.ts": "b601cdb2ad253cac4f49ebfb9d32566d953216d3",
33
+ "packages/rlc-common/src/interfaces.ts": "7b4c7b97636bf964129eb2ae061a50b198beb104",
34
34
  "packages/rlc-common/src/metadata/buildApiExtractorConfig.ts": "4bcc63b3551d923d2881adb015b23978a2539e14",
35
35
  "packages/rlc-common/src/metadata/buildESLintConfig.ts": "b0530cba08bf5e29cc1d307b93363f66c1e6b81d",
36
36
  "packages/rlc-common/src/metadata/buildLicenseFile.ts": "ce4083770e48d3b0dd670f7efc324a7fed10dac4",
37
- "packages/rlc-common/src/metadata/buildPackageFile.ts": "111a72005bc04126ac5917d6cd1a40a6309f922e",
37
+ "packages/rlc-common/src/metadata/buildPackageFile.ts": "f738ecdc6e16ff4b44047d6fcfc23361a8fb900f",
38
38
  "packages/rlc-common/src/metadata/buildReadmeFile.ts": "649510f75d04ba8438202b92b83a56d3d3206efe",
39
39
  "packages/rlc-common/src/metadata/buildRollupConfig.ts": "56a0ac2b69266d8a3192981abc4c09fcde444634",
40
40
  "packages/rlc-common/src/metadata/buildTsConfig.ts": "861d8af19f1e8658b7fef02b51c63d4f006c76f3",
package/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ## 0.14.0 (2023-07-26)
2
+
3
+ - [Feature] Support multi-client in Modular, Please refer to pr [#1830](https://github.com/Azure/autorest.typescript/pull/1830).
4
+ - [Feature] Upgrade typespec compiler to v0.46.0, Please refer to pr [#1927](https://github.com/Azure/autorest.typescript/pull/1927).
5
+ - [Feature] Support enum as discriminator property, Please refer to pr [#1924](https://github.com/Azure/autorest.typescript/pull/1924).
6
+ - [Feature] Add `models` subpath for Modular package, Please refer to pr [#1915](https://github.com/Azure/autorest.typescript/pull/1915).
7
+ - [Feature] Enable a flag to take interface name as operation group, Please refer to pr [#1911](https://github.com/Azure/autorest.typescript/pull/1911).
8
+ - [Bugfix] Fix the generation failure when the request and response body is union type, Please refer to pr [#1935](https://github.com/Azure/autorest.typescript/pull/1935).
9
+
1
10
  ## 0.13.4 (2023-06-30)
2
11
 
3
12
  - [Feature] Ignore client.tsp in RLC generation. Please refer to pr [#1896](https://github.com/Azure/autorest.typescript/pull/1896).
package/dist/buildClient.js CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) Microsoft Corporation.
3
3
  // Licensed under the MIT License.
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
- exports.buildClient = void 0;
5
+ exports.getClientFactoryBody = exports.buildClient = void 0;
6
6
  const ts_morph_1 = require("ts-morph");
7
7
  const path = require("path");
8
8
  const nameUtils_js_1 = require("./helpers/nameUtils.js");
@@ -254,6 +254,7 @@ function getClientFactoryBody(model, clientTypeName) {
254
254
  returnStatement
255
255
  ];
256
256
  }
257
+ exports.getClientFactoryBody = getClientFactoryBody;
257
258
  function normalizeUrlInfo(model) {
258
259
  if (!model ||
259
260
  !model.urlInfo ||
package/dist/buildClient.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildClient.js","sourceRoot":"","sources":["../src/buildClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildClient.js","sourceRoot":"","sources":["../src/buildClient.ts"],"names":[],"mappings":"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"}
package/dist/buildClientDefinitions.js CHANGED
@@ -124,7 +124,7 @@ function getOperationReturnTypeName({ operationGroupName, name }, operationGroup
124
124
  if (operationGroupCount > 1 &&
125
125
  operationGroupName &&
126
126
  operationGroupName !== "Client") {
127
- return `${(0, nameUtils_js_2.pascalCase)(operationGroupName)}${(0, nameUtils_js_2.pascalCase)(name)}`;
127
+ return (0, nameUtils_js_1.normalizeName)(`${(0, nameUtils_js_2.pascalCase)(operationGroupName)}${(0, nameUtils_js_2.pascalCase)(name)}`, nameUtils_js_1.NameType.Interface);
128
128
  }
129
129
  return (0, nameUtils_js_2.pascalCase)(name);
130
130
  }
package/dist/buildClientDefinitions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildClientDefinitions.js","sourceRoot":"","sources":["../src/buildClientDefinitions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildClientDefinitions.js","sourceRoot":"","sources":["../src/buildClientDefinitions.ts"],"names":[],"mappings":"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"}
package/dist/buildObjectTypes.js CHANGED
@@ -23,7 +23,7 @@ function buildObjectInterfaces(model, importedModels, schemaUsage) {
23
23
  continue;
24
24
  }
25
25
  const baseName = getObjectBaseName(objectSchema, schemaUsage);
26
- const interfaceDeclaration = getObjectInterfaceDeclaration(baseName, objectSchema, schemaUsage, importedModels);
26
+ const interfaceDeclaration = getObjectInterfaceDeclaration(model, baseName, objectSchema, schemaUsage, importedModels);
27
27
  objectInterfaces.push(interfaceDeclaration);
28
28
  }
29
29
  return objectInterfaces;
@@ -108,7 +108,7 @@ function getPolymorphicTypeAlias(baseName, objectSchema, schemaUsage) {
108
108
  * Builds the interface for the current object schema. If it is a polymorphic
109
109
  * root node it will suffix it with Base.
110
110
  */
111
- function getObjectInterfaceDeclaration(baseName, objectSchema, schemaUsage, importedModels) {
111
+ function getObjectInterfaceDeclaration(model, baseName, objectSchema, schemaUsage, importedModels) {
112
112
  var _a;
113
113
  let interfaceName = `${baseName}`;
114
114
  if (isPolymorphicParent(objectSchema)) {
@@ -117,7 +117,7 @@ function getObjectInterfaceDeclaration(baseName, objectSchema, schemaUsage, impo
117
117
  const properties = (_a = objectSchema.properties) !== null && _a !== void 0 ? _a : {};
118
118
  let propertySignatures = getPropertySignatures(properties, schemaUsage, importedModels);
119
119
  // Add the polymorphic property if exists
120
- propertySignatures = addDiscriminatorProperty(objectSchema, propertySignatures);
120
+ propertySignatures = addDiscriminatorProperty(model, objectSchema, propertySignatures);
121
121
  // Calculate the parents of the current object
122
122
  const extendFrom = getImmediateParentsNames(objectSchema, schemaUsage);
123
123
  const description = objectSchema.description;
@@ -126,8 +126,8 @@ function getObjectInterfaceDeclaration(baseName, objectSchema, schemaUsage, impo
126
126
  function isPolymorphicParent(objectSchema) {
127
127
  return objectSchema.isPolyParent ? true : false;
128
128
  }
129
- function addDiscriminatorProperty(objectSchema, properties) {
130
- const polymorphicProperty = getDiscriminatorProperty(objectSchema);
129
+ function addDiscriminatorProperty(model, objectSchema, properties) {
130
+ const polymorphicProperty = getDiscriminatorProperty(model, objectSchema);
131
131
  if (polymorphicProperty) {
132
132
  // It is possible that the polymorphic property needs to override an existing property.
133
133
  // This is usually the case on the top level parent where the property already has a type of string
@@ -140,7 +140,8 @@ function addDiscriminatorProperty(objectSchema, properties) {
140
140
  /**
141
141
  * Finds the name of the property used as discriminator and the discriminator value.
142
142
  */
143
- function getDiscriminatorProperty(objectSchema) {
143
+ function getDiscriminatorProperty(model, objectSchema) {
144
+ var _a;
144
145
  const discriminatorValue = objectSchema.discriminatorValue;
145
146
  if (!discriminatorValue && !objectSchema.discriminator) {
146
147
  return undefined;
@@ -154,7 +155,7 @@ function getDiscriminatorProperty(objectSchema) {
154
155
  return {
155
156
  kind: ts_morph_1.StructureKind.PropertySignature,
156
157
  name: `"${discriminatorPropertyName}"`,
157
- type: discriminators
158
+ type: ((_a = model.options) === null || _a === void 0 ? void 0 : _a.sourceFrom) === "Swagger" ? discriminators : `string`
158
159
  };
159
160
  }
160
161
  return undefined;
package/dist/buildObjectTypes.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildObjectTypes.js","sourceRoot":"","sources":["../src/buildObjectTypes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildObjectTypes.js","sourceRoot":"","sources":["../src/buildObjectTypes.ts"],"names":[],"mappings":"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"}
package/dist/buildTopLevelIndexFile.js CHANGED
@@ -15,11 +15,13 @@ function buildTopLevelIndex(model) {
15
15
  }
16
16
  const project = new ts_morph_1.Project();
17
17
  const { srcPath } = model;
18
- const { multiClient, batch } = model.options;
18
+ const { multiClient } = model.options;
19
+ const batch = model.options.batch;
19
20
  if (srcPath) {
20
21
  const clientName = model.libraryName;
21
22
  const moduleName = (0, nameUtils_js_1.normalizeName)(clientName, nameUtils_js_1.NameType.File);
22
- const relativePath = "./" + (0, pathUtils_js_1.getRelativePartFromSrcPath)(srcPath);
23
+ const relativePath = "./" +
24
+ (0, pathUtils_js_1.getRelativePartFromSrcPath)(srcPath, model.options.isModularLibrary);
23
25
  batchOutputFolder.push([relativePath, clientName, moduleName]);
24
26
  }
25
27
  if (multiClient &&
package/dist/buildTopLevelIndexFile.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildTopLevelIndexFile.js","sourceRoot":"","sources":["../src/buildTopLevelIndexFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,yDAAiE;AAEjE,uCAAmC;AACnC,6BAA6B;AAC7B,yDAAoE;AACpE,uEAAoE;AAEpE,MAAM,iBAAiB,GAA+B,EAAE,CAAC;AAEzD,SAAgB,kBAAkB,CAAC,KAAe;IAChD,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;QAClB,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;IAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC1B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;IAC7C,IAAI,OAAO,EAAE;QACX,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,MAAM,UAAU,GAAG,IAAA,4BAAa,EAAC,UAAU,EAAE,uBAAQ,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,YAAY,GAAG,IAAI,GAAG,IAAA,yCAA0B,EAAC,OAAO,CAAC,CAAC;QAChE,iBAAiB,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;KAChE;IACD,IACE,WAAW;QACX,KAAK;QACL,KAAK,CAAC,MAAM,GAAG,CAAC;QAChB,iBAAiB,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EACzC;QACA,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,UAAU,EAAE,SAAS,EAAE;YAChE,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACjC,SAAS,CAAC,oBAAoB,CAAC;gBAC7B,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC;gBACxB,eAAe,EAAE,IAAA,yCAAmB,EAClC;oBACE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;oBACrB,aAAa,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,WAAW;iBACrC,EACD,KAAK,CACN;aACF,CAAC,CAAC;YACH,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,SAAS,CAAC,oBAAoB,CAAC;YAC7B,YAAY,EAAE,CAAC,GAAG,UAAU,CAAC;SAC9B,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CACxB,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EACpD,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAC5C,UAAU,CACX,CAAC;QACF,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;KACpC;AACH,CAAC;AA/CD,gDA+CC"}
1
+ {"version":3,"file":"buildTopLevelIndexFile.js","sourceRoot":"","sources":["../src/buildTopLevelIndexFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,yDAAiE;AAEjE,uCAAmC;AACnC,6BAA6B;AAC7B,yDAAoE;AACpE,uEAAoE;AAEpE,MAAM,iBAAiB,GAA+B,EAAE,CAAC;AAEzD,SAAgB,kBAAkB,CAAC,KAAe;IAChD,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;QAClB,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;IAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC1B,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;IACtC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;IAClC,IAAI,OAAO,EAAE;QACX,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,MAAM,UAAU,GAAG,IAAA,4BAAa,EAAC,UAAU,EAAE,uBAAQ,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,YAAY,GAChB,IAAI;YACJ,IAAA,yCAA0B,EAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QACtE,iBAAiB,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;KAChE;IACD,IACE,WAAW;QACX,KAAK;QACL,KAAK,CAAC,MAAM,GAAG,CAAC;QAChB,iBAAiB,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EACzC;QACA,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,UAAU,EAAE,SAAS,EAAE;YAChE,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACjC,SAAS,CAAC,oBAAoB,CAAC;gBAC7B,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC;gBACxB,eAAe,EAAE,IAAA,yCAAmB,EAClC;oBACE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;oBACrB,aAAa,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,WAAW;iBACrC,EACD,KAAK,CACN;aACF,CAAC,CAAC;YACH,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,SAAS,CAAC,oBAAoB,CAAC;YAC7B,YAAY,EAAE,CAAC,GAAG,UAAU,CAAC;SAC9B,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CACxB,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EACpD,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAC5C,UAAU,CACX,CAAC;QACF,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;KACpC;AACH,CAAC;AAlDD,gDAkDC"}
package/dist/helpers/pathUtils.js CHANGED
@@ -2,9 +2,12 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getRelativePartFromSrcPath = void 0;
4
4
  const path = require("path");
5
- function getRelativePartFromSrcPath(srcPath) {
5
+ function getRelativePartFromSrcPath(srcPath, isModularLibrary = false) {
6
6
  const sep = srcPath.includes(path.sep + "src") ? path.sep : "/";
7
- const relativePart = srcPath.substring(srcPath.indexOf(sep + "src") + 4);
7
+ let relativePart = srcPath.substring(srcPath.indexOf(sep + "src") + 4);
8
+ if (isModularLibrary) {
9
+ relativePart = relativePart.substring(srcPath.indexOf(sep + "rest"), +5);
10
+ }
8
11
  return relativePart.startsWith(sep)
9
12
  ? relativePart.substring(1)
10
13
  : relativePart;
package/dist/helpers/pathUtils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../src/helpers/pathUtils.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAE7B,SAAgB,0BAA0B,CAAC,OAAe;IACxD,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAChE,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACzE,OAAO,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC;QACjC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;QAC3B,CAAC,CAAC,YAAY,CAAC;AACnB,CAAC;AAND,gEAMC"}
1
+ {"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../src/helpers/pathUtils.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAE7B,SAAgB,0BAA0B,CACxC,OAAe,EACf,mBAA4B,KAAK;IAEjC,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAChE,IAAI,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACvE,IAAI,gBAAgB,EAAE;QACpB,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC1E;IACD,OAAO,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC;QACjC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;QAC3B,CAAC,CAAC,YAAY,CAAC;AACnB,CAAC;AAZD,gEAYC"}
package/dist/interfaces.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AA4Fa,QAAA,2BAA2B,GAAG,CAAC,EAC1C,QAAA,0BAA0B,GAAG,CAAC,CAAC;AA4CjC,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+DAAc,CAAA;IACd,+DAAc,CAAA;AAChB,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB;AAMD,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,kDAAkD;IAClD,gCAAe,CAAA;IACf,qDAAqD;IACrD,kCAAiB,CAAA;IACjB,wDAAwD;IACxD,wCAAuB,CAAA;AACzB,CAAC,EAPW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAOxB"}
1
+ {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AA4Fa,QAAA,2BAA2B,GAAG,CAAC,EAC1C,QAAA,0BAA0B,GAAG,CAAC,CAAC;AA6CjC,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+DAAc,CAAA;IACd,+DAAc,CAAA;AAChB,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB;AAMD,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,kDAAkD;IAClD,gCAAe,CAAA;IACf,qDAAqD;IACrD,kCAAiB,CAAA;IACjB,wDAAwD;IACxD,wCAAuB,CAAA;AACzB,CAAC,EAPW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAOxB"}
package/dist/metadata/buildPackageFile.js CHANGED
@@ -113,10 +113,10 @@ function restLevelPackage(model, hasSamplesGenerated) {
113
113
  },
114
114
  sideEffects: false,
115
115
  autoPublish: false,
116
- dependencies: Object.assign(Object.assign({ "@azure/core-auth": "^1.3.0", "@azure-rest/core-client": "^1.1.3", "@azure/core-rest-pipeline": "^1.8.0", "@azure/logger": "^1.0.0", tslib: "^2.2.0" }, (hasPaging && {
116
+ dependencies: Object.assign(Object.assign({ "@azure/core-auth": "^1.3.0", "@azure-rest/core-client": "^1.1.4", "@azure/core-rest-pipeline": "^1.8.0", "@azure/logger": "^1.0.0", tslib: "^2.2.0" }, (hasPaging && {
117
117
  "@azure/core-paging": "^1.5.0"
118
118
  })), (hasLRO && {
119
- "@azure/core-lro": "^2.5.3",
119
+ "@azure/core-lro": "^2.5.4",
120
120
  "@azure/abort-controller": "^1.0.0"
121
121
  })),
122
122
  devDependencies: {
package/dist/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@azure-tools/rlc-common","version":"0.13.4","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 dist/* dist-esm/* types/* && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node publishPackage.js","build:cjs":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig-cjs.json && node publishPackage.js","build:esm":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig.json && node publishPackage.js","test":"echo \"Error: no test specified\" && exit 1"},"keywords":[],"author":"","license":"ISC","dependencies":{"ts-morph":"^15.1.0","lodash":"^4.17.21","handlebars":"^4.7.7"},"devDependencies":{"@types/node":"^18.0.0","eslint":"^8.9.0","prettier":"~2.7.1","typescript":"~5.0.0","rimraf":"^3.0.2","@types/lodash":"^4.14.182","fs-extra":"^10.0.0","@types/fs-extra":"^8.1.0","ts-node":"^10.7.0"},"bugs":{"url":"https://github.com/Azure/autorest.typescript/issues"},"homepage":"https://github.com/Azure/autorest.typescript/tree/main/packages/rlc-common/"}
1
+ {"name":"@azure-tools/rlc-common","version":"0.14.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 dist/* dist-esm/* types/* && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node publishPackage.js","build:cjs":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig-cjs.json && node publishPackage.js","build:esm":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig.json && node publishPackage.js","test":"echo \"Error: no test specified\" && exit 1"},"keywords":[],"author":"","license":"ISC","dependencies":{"ts-morph":"^15.1.0","lodash":"^4.17.21","handlebars":"^4.7.7"},"devDependencies":{"@types/node":"^18.0.0","eslint":"^8.9.0","prettier":"~2.7.1","typescript":"~5.0.0","rimraf":"^3.0.2","@types/lodash":"^4.14.182","fs-extra":"^10.0.0","@types/fs-extra":"^8.1.0","ts-node":"^10.7.0"},"bugs":{"url":"https://github.com/Azure/autorest.typescript/issues"},"homepage":"https://github.com/Azure/autorest.typescript/tree/main/packages/rlc-common/"}
package/dist-esm/buildClient.js CHANGED
@@ -140,7 +140,7 @@ export function buildClient(model) {
140
140
  function isSecurityInfoDefined(credentialScopes, credentialKeyHeaderName) {
141
141
  return ((credentialScopes && credentialScopes.length > 0) || credentialKeyHeaderName);
142
142
  }
143
- function getClientFactoryBody(model, clientTypeName) {
143
+ export function getClientFactoryBody(model, clientTypeName) {
144
144
  if (!model.options || !model.options.packageDetails || !model.urlInfo) {
145
145
  return "";
146
146
  }
package/dist-esm/buildClient.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildClient.js","sourceRoot":"","sources":["../src/buildClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildClient.js","sourceRoot":"","sources":["../src/buildClient.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAGL,OAAO,EAEP,aAAa,EACb,uBAAuB,EAGxB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,EAAE,iCAAiC,EAAE,MAAM,2BAA2B,CAAC;AAE9E,OAAO,EACL,aAAa,EACb,mBAAmB,EACpB,MAAM,+BAA+B,CAAC;AAEvC,SAAS,yBAAyB,CAChC,UAAkB,EAClB,qBAAuC;IAEvC,IAAI,CAAC,qBAAqB,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE;QAChE,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACrD,OAAO;YACL,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,gBAAgB,EAAE,IAAI;SACvB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,GAAG,UAAU,SAAS;QAC5B,OAAO,EAAE,CAAC,eAAe,CAAC;QAC1B,UAAU,EAAE,IAAI;QAChB,UAAU;KACX,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAe;IACzC,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACnC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,KAAK,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE;QAC/D,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,gBAAgB;IAChB,MAAM,mBAAmB,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IAEjD,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACxB,MAAM,aAAa,GAAG,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM;IACzD,sGAAsG;IACtG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAC7B,CAAC;IAEF,MAAM,qBAAqB,GAAG,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM;IACjE,sGAAsG;IACtG,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CACxB,CAAC;IAEF,MAAM,sBAAsB,GAAG,yBAAyB,CACtD,mBAAmB,EACnB,qBAAqB,CACtB,CAAC;IAEF,IAAI,sBAAsB,EAAE;QAC1B,UAAU,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC;KACjD;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;QAClB,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;IAC7C,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,GACjE,KAAK,CAAC,OAAO,CAAC;IAChB,MAAM,eAAe,GACnB,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7E,IAAI,uBAAuB,EAAE;QAC3B,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;KACvC;IAED,MAAM,kBAAkB,GAAG;QACzB,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;QACxB,GAAG,CAAC,cAAc,KAAK,KAAK;YAC5B,CAAC,qBAAqB,CAAC,gBAAgB,EAAE,uBAAuB,CAAC;YAC/D,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACE;oBACE,IAAI,EAAE,aAAa;oBACnB,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC;oBACjC,WAAW,EAAE,qCAAqC;iBACnD;aACF,CAAC;KACP,CAAC;IAEF,MAAM,eAAe,GAAG;QACtB,GAAG,kBAAkB;QACrB;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,GAAG,sBAAsB,EAAE,IAAI,IAAI,eAAe,OAAO;YAC/D,WAAW,EAAE,2CAA2C;SACzD;KACF,CAAC;IACF,MAAM,iBAAiB,GAAG;QACxB,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,cAAc;QACpB,UAAU,EAAE,eAAe;QAC3B,IAAI,EAAE;YACJ;gBACE,WAAW,EACT,kCAAkC,mBAAmB,OAAO;oBAC5D,eAAe;yBACZ,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;wBACb,OAAO,UAAU,KAAK,CAAC,IAAI,MACzB,KAAK,CAAC,WAAW,IAAI,gBAAgB,GAAG,KAAK,CAAC,IAChD,EAAE,CAAC;oBACL,CAAC,CAAC;yBACD,IAAI,CAAC,IAAI,CAAC;aAChB;SACF;QACD,UAAU,EAAE,mBAAmB;QAC/B,eAAe,EAAE,KAAK;QACtB,UAAU,EAAE,oBAAoB,CAAC,KAAK,EAAE,mBAAmB,CAAC;KAC7D,CAAC;IAEF,IAAI,CAAC,WAAW,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QAChD,iBAAiB,CAAC,eAAe,GAAG,IAAI,CAAC;KAC1C;IACD,UAAU,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IAE1C,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/D,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACzD,KAAK,CAAC,GAAG,EAAE,CAAC;KACb;IACD,MAAM,UAAU,GACd,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC;QAC7C,CAAC,CAAC,CAAC,CAAC;IAER,MAAM,UAAU,GAAG,GACjB,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAC9C,QAAQ,CAAC;IACT,UAAU,CAAC,qBAAqB,CAAC;QAC/B;YACE,YAAY,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;YAC5C,eAAe,EAAE,yBAAyB;SAC3C;QACD;YACE,YAAY,EAAE,CAAC,QAAQ,CAAC;YACxB,eAAe,EAAE,mBAAmB,CAClC;gBACE,OAAO,EAAE,UAAU;gBACnB,aAAa,EAAE,GAAG,UAAU,KAAK;aAClC,EACD,KAAK,CACN;SACF;KACF,CAAC,CAAC;IAEH,IACE,cAAc;QACd,qBAAqB,CAAC,gBAAgB,EAAE,uBAAuB,CAAC,EAChE;QACA,UAAU,CAAC,qBAAqB,CAAC;YAC/B;gBACE,YAAY,EAAE,eAAe;gBAC7B,eAAe,EAAE,kBAAkB;aACpC;SACF,CAAC,CAAC;KACJ;IACD,UAAU,CAAC,qBAAqB,CAAC;QAC/B;YACE,YAAY,EAAE,CAAC,GAAG,mBAAmB,EAAE,CAAC;YACxC,eAAe,EAAE,mBAAmB,CAClC;gBACE,OAAO,EAAE,qBAAqB;gBAC9B,aAAa,EAAE,wBAAwB;aACxC,EACD,KAAK,CACN;SACF;KACF,CAAC,CAAC;IACH,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,WAAW,EAAE,EAAE,CAAC;AAC/D,CAAC;AAED,SAAS,qBAAqB,CAC5B,gBAA2B,EAC3B,uBAAgC;IAEhC,OAAO,CACL,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,uBAAuB,CAC7E,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,KAAe,EACf,cAAsB;IAEtB,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;QACrE,OAAO,EAAE,CAAC;KACX;IACD,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;IAC3D,IAAI,iBAAiB,GAAG,cAAc,CAAC,gBAAgB,IAAI,EAAE,CAAC;IAC9D,MAAM,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC;IAC9C,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;IAElD,MAAM,qBAAqB,GAAa,EAAE,CAAC;IAE3C,KAAK,MAAM,KAAK,IAAI,aAAa,IAAI,EAAE,EAAE;QACvC,IAAI,KAAK,CAAC,KAAK,EAAE;YACf,MAAM,KAAK,GACT,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;YACrE,qBAAqB,CAAC,IAAI,CACxB,SAAS,KAAK,CAAC,IAAI,cAAc,KAAK,CAAC,IAAI,OAAO,KAAK,EAAE,CAC1D,CAAC;SACH;KACF;IAED,IAAI,OAAe,CAAC;IACpB,IAAI,aAAa,IAAI,QAAQ,EAAE;QAC7B,IAAI,cAAc,GAAG,QAAQ,CAAC;QAC9B,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YACrC,cAAc,GAAG,cAAc,CAAC,OAAO,CACrC,IAAI,YAAY,CAAC,IAAI,GAAG,EACxB,MAAM,YAAY,CAAC,IAAI,GAAG,CAC3B,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,wBAAwB,cAAc,IAAI,CAAC;KACtD;SAAM;QACL,OAAO,GAAG,uBAAuB,QAAQ,GAAG,CAAC;KAC9C;IAED,IAAI,mBAAmB,GAAW,EAAE,CAAC;IACrC,oFAAoF;IACpF,IACE,CAAC,KAAK,CAAC,cAAc,EAAE,eAAe,KAAK,OAAO;QAChD,KAAK,CAAC,cAAc,EAAE,eAAe,KAAK,MAAM,CAAC;QACnD,CAAC,CAAC,KAAK,CAAC,cAAc,EAAE,YAAY,EACpC;QACA,mBAAmB,GAAG,+CAA+C,KAAK,CAAC,cAAc,EAAE,YAAY,GAAG,CAAC;KAC5G;IAED,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACxC,iBAAiB,GAAG,iBAAiB,GAAG,OAAO,CAAC;KACjD;IACD,MAAM,sBAAsB,GAC1B,kCAAkC;QAClC,iBAAiB;QACjB,GAAG;QACH,cAAc;QACd,IAAI,CAAC;IACP,MAAM,eAAe,GACnB,4JAA4J,CAAC;IAC/J,MAAM,kBAAkB,GAA+B;QACrD,IAAI,EAAE,aAAa,CAAC,iBAAiB;QACrC,eAAe,EAAE,uBAAuB,CAAC,KAAK;QAC9C,YAAY,EAAE,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC;KAC1E,CAAC;IAEF,MAAM,yBAAyB,GAAG;;;;;;;;MAQ9B,CAAC;IAEL,MAAM,gBAAgB,GAA+B;QACnD,IAAI,EAAE,aAAa,CAAC,iBAAiB;QACrC,eAAe,EAAE,uBAAuB,CAAC,KAAK;QAC9C,YAAY,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;KAC1D,CAAC;IAEF,MAAM,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;IAEpE,MAAM,YAAY,GAChB,gBAAgB,IAAI,gBAAgB,CAAC,MAAM;QACzC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QACpD,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,MAAM,GAAG,YAAY;QACzB,CAAC,CAAC,2CAA2C,YAAY,IAAI;QAC7D,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,gBAAgB,GAAG,uBAAuB;QAC9C,CAAC,CAAC,+DAA+D,uBAAuB,IAAI;QAC5F,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,WAAW,GACf,MAAM,IAAI,gBAAgB;QACxB,CAAC,CAAC;;;YAGI,MAAM;YACN,gBAAgB;;QAEpB;QACF,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,SAAS,GAAG;mBACD,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE;aACvC,cAAc;OACpB,CAAC;IAEN,IAAI,eAAe,GAAG,gBAAgB,CAAC;IAEvC,IAAI,gBAAgB,EAAE;QACpB,MAAM,uBAAuB,GAAG,iCAAiC,CAC/D,KAAK,CAAC,KAAK,CACZ,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACpE,+EAA+E;YAC/E,4EAA4E;YAC5E,yDAAyD;YACzD,OAAO,GACL,GAAG,IAAI,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,KAC1C,KAAK,uBAAuB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC;QAC9C,CAAC,CAAC,CAAC;QACH,eAAe,GAAG,uBAAuB,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC;KACnE;IAED,OAAO;QACL,GAAG,qBAAqB;QACxB,gBAAgB;QAChB,mBAAmB;QACnB,WAAW;QACX,sBAAsB;QACtB,kBAAkB;QAClB,yBAAyB;QACzB,SAAS;QACT,eAAe;KAChB,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAe;IACvC,IACE,CAAC,KAAK;QACN,CAAC,KAAK,CAAC,OAAO;QACd,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ;QACvB,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa;QAC5B,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EACxC;QACA,OAAO;KACR;IAED,IAAI,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC5C,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;IAClD,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;QACrC,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;QAC/B,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC/D,IAAI,IAAI,KAAK,cAAc,EAAE;YAC3B,YAAY,CAAC,IAAI,GAAG,cAAc,CAAC;YACnC,cAAc,GAAG,cAAc,CAAC,OAAO,CACrC,IAAI,IAAI,GAAG,EACX,IAAI,cAAc,GAAG,CACtB,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,OAAO,CAAC,QAAQ,GAAG,cAAc,CAAC;AAC1C,CAAC"}
package/dist-esm/buildClientDefinitions.js CHANGED
@@ -119,7 +119,7 @@ function getOperationReturnTypeName({ operationGroupName, name }, operationGroup
119
119
  if (operationGroupCount > 1 &&
120
120
  operationGroupName &&
121
121
  operationGroupName !== "Client") {
122
- return `${pascalCase(operationGroupName)}${pascalCase(name)}`;
122
+ return normalizeName(`${pascalCase(operationGroupName)}${pascalCase(name)}`, NameType.Interface);
123
123
  }
124
124
  return pascalCase(name);
125
125
  }
package/dist-esm/buildClientDefinitions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildClientDefinitions.js","sourceRoot":"","sources":["../src/buildClientDefinitions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildClientDefinitions.js","sourceRoot":"","sources":["../src/buildClientDefinitions.ts"],"names":[],"mappings":"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"}
package/dist-esm/buildObjectTypes.js CHANGED
@@ -16,7 +16,7 @@ export function buildObjectInterfaces(model, importedModels, schemaUsage) {
16
16
  continue;
17
17
  }
18
18
  const baseName = getObjectBaseName(objectSchema, schemaUsage);
19
- const interfaceDeclaration = getObjectInterfaceDeclaration(baseName, objectSchema, schemaUsage, importedModels);
19
+ const interfaceDeclaration = getObjectInterfaceDeclaration(model, baseName, objectSchema, schemaUsage, importedModels);
20
20
  objectInterfaces.push(interfaceDeclaration);
21
21
  }
22
22
  return objectInterfaces;
@@ -101,7 +101,7 @@ function getPolymorphicTypeAlias(baseName, objectSchema, schemaUsage) {
101
101
  * Builds the interface for the current object schema. If it is a polymorphic
102
102
  * root node it will suffix it with Base.
103
103
  */
104
- function getObjectInterfaceDeclaration(baseName, objectSchema, schemaUsage, importedModels) {
104
+ function getObjectInterfaceDeclaration(model, baseName, objectSchema, schemaUsage, importedModels) {
105
105
  let interfaceName = `${baseName}`;
106
106
  if (isPolymorphicParent(objectSchema)) {
107
107
  interfaceName = `${baseName}Parent`;
@@ -109,7 +109,7 @@ function getObjectInterfaceDeclaration(baseName, objectSchema, schemaUsage, impo
109
109
  const properties = objectSchema.properties ?? {};
110
110
  let propertySignatures = getPropertySignatures(properties, schemaUsage, importedModels);
111
111
  // Add the polymorphic property if exists
112
- propertySignatures = addDiscriminatorProperty(objectSchema, propertySignatures);
112
+ propertySignatures = addDiscriminatorProperty(model, objectSchema, propertySignatures);
113
113
  // Calculate the parents of the current object
114
114
  const extendFrom = getImmediateParentsNames(objectSchema, schemaUsage);
115
115
  const description = objectSchema.description;
@@ -125,8 +125,8 @@ function getObjectInterfaceDeclaration(baseName, objectSchema, schemaUsage, impo
125
125
  function isPolymorphicParent(objectSchema) {
126
126
  return objectSchema.isPolyParent ? true : false;
127
127
  }
128
- function addDiscriminatorProperty(objectSchema, properties) {
129
- const polymorphicProperty = getDiscriminatorProperty(objectSchema);
128
+ function addDiscriminatorProperty(model, objectSchema, properties) {
129
+ const polymorphicProperty = getDiscriminatorProperty(model, objectSchema);
130
130
  if (polymorphicProperty) {
131
131
  // It is possible that the polymorphic property needs to override an existing property.
132
132
  // This is usually the case on the top level parent where the property already has a type of string
@@ -139,7 +139,7 @@ function addDiscriminatorProperty(objectSchema, properties) {
139
139
  /**
140
140
  * Finds the name of the property used as discriminator and the discriminator value.
141
141
  */
142
- function getDiscriminatorProperty(objectSchema) {
142
+ function getDiscriminatorProperty(model, objectSchema) {
143
143
  const discriminatorValue = objectSchema.discriminatorValue;
144
144
  if (!discriminatorValue && !objectSchema.discriminator) {
145
145
  return undefined;
@@ -153,7 +153,7 @@ function getDiscriminatorProperty(objectSchema) {
153
153
  return {
154
154
  kind: StructureKind.PropertySignature,
155
155
  name: `"${discriminatorPropertyName}"`,
156
- type: discriminators
156
+ type: model.options?.sourceFrom === "Swagger" ? discriminators : `string`
157
157
  };
158
158
  }
159
159
  return undefined;
package/dist-esm/buildObjectTypes.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildObjectTypes.js","sourceRoot":"","sources":["../src/buildObjectTypes.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAGL,aAAa,EAEd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAKL,aAAa,EACd,MAAM,iBAAiB,CAAC;AAEzB;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACnC,KAAe,EACf,cAA2B,EAC3B,WAA4B;IAE5B,MAAM,aAAa,GAAmB,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAChE,CAAC,CAAC,EAAE,EAAE,CACJ,cAAc,CAAC,CAAC,CAAC;QAChB,CAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAClE,CAAC;IACF,MAAM,gBAAgB,GAAoC,EAAE,CAAC;IAE7D,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,IAAI,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC,WAAW,EAAE;YAClD,SAAS;SACV;QACD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAC9D,MAAM,oBAAoB,GAAG,6BAA6B,CACxD,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,cAAc,CACf,CAAC;QAEF,gBAAgB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;KAC7C;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,KAAe,EACf,cAA2B,EAC3B,WAA4B;IAE5B,MAAM,aAAa,GAAmB,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAChE,CAAC,CAAC,EAAE,EAAE,CACJ,cAAc,CAAC,CAAC,CAAC;QAChB,CAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAClE,CAAC;IACF,MAAM,aAAa,GAAoC,EAAE,CAAC;IAE1D,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,IAAI,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC,WAAW,EAAE;YAClD,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;YAC7C,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,aAAa,CAAC,SAAS;gBAC7B,GAAG,CAAC,WAAW,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;gBAC/C,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC;oBAC7C,CAAC,CAAC,GAAG,YAAY,CAAC,QAAQ,EAAE;oBAC5B,CAAC,CAAC,GAAG,YAAY,CAAC,cAAc,EAAE;gBACpC,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC;oBAC7C,CAAC,CAAC,GAAG,YAAY,CAAC,KAAK,EAAE;oBACzB,CAAC,CAAC,GAAG,YAAY,CAAC,WAAW,EAAE;gBACjC,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;YACH,IAAI,YAAY,CAAC,KAAK,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE;gBAC5C,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aAC7B;SACF;KACF;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,KAAe,EACf,WAA4B;IAE5B,4CAA4C;IAC5C,MAAM,aAAa,GAAoC,EAAE,CAAC;IAC1D,MAAM,aAAa,GAAmB,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAChE,CAAC,CAAC,EAAE,EAAE,CACJ,cAAc,CAAC,CAAC,CAAC;QAChB,CAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAClE,CAAC;IACF,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAG,uBAAuB,CACvC,QAAQ,EACR,YAAY,EACZ,WAAW,CACZ,CAAC;QACF,IAAI,SAAS,EAAE;YACb,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC/B;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB,CACxB,YAA0B,EAC1B,WAA4B;IAE5B,MAAM,UAAU,GAAG,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9E,MAAM,IAAI,GAAG,aAAa,CACxB,YAAY,CAAC,IAAI,EACjB,QAAQ,CAAC,SAAS,EAClB,IAAI,CAAC,iBAAiB,CACvB,CAAC;IAEF,OAAO,GAAG,IAAI,GAAG,UAAU,EAAE,CAAC;AAChC,CAAC;AAED;;;GAGG;AACH,SAAS,uBAAuB,CAC9B,QAAgB,EAChB,YAA0B,EAC1B,WAA4B;IAE5B,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,EAAE;QACtC,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,0EAA0E;IAC1E,IAAI,YAAY,CAAC,kBAAkB,EAAE;QACnC,UAAU,CAAC,IAAI,CAAC,GAAG,QAAQ,QAAQ,CAAC,CAAC;KACtC;IAED,KAAK,MAAM,KAAK,IAAI,YAAY,CAAC,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE;QACpD,MAAM,UAAU,GAAG,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC;YAC3D,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,IAAI,GAAG,aAAa,CACxB,KAAK,CAAC,IAAI,EACV,QAAQ,CAAC,SAAS,EAClB,IAAI,CAAC,kBAAkB,CACxB,CAAC;QAEF,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,UAAU,EAAE,CAAC,CAAC;KACzC;IAED,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;IAE7C,OAAO;QACL,IAAI,EAAE,aAAa,CAAC,SAAS;QAC7B,GAAG,CAAC,WAAW,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;QAC/C,IAAI,EAAE,GAAG,QAAQ,EAAE;QACnB,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;QAC5B,UAAU,EAAE,IAAI;KACjB,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,6BAA6B,CACpC,QAAgB,EAChB,YAA0B,EAC1B,WAA4B,EAC5B,cAA2B;IAE3B,IAAI,aAAa,GAAG,GAAG,QAAQ,EAAE,CAAC;IAClC,IAAI,mBAAmB,CAAC,YAAY,CAAC,EAAE;QACrC,aAAa,GAAG,GAAG,QAAQ,QAAQ,CAAC;KACrC;IAED,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,IAAI,EAAE,CAAC;IAEjD,IAAI,kBAAkB,GAAG,qBAAqB,CAC5C,UAAU,EACV,WAAW,EACX,cAAc,CACf,CAAC;IAEF,yCAAyC;IACzC,kBAAkB,GAAG,wBAAwB,CAC3C,YAAY,EACZ,kBAAkB,CACnB,CAAC;IAEF,8CAA8C;IAC9C,MAAM,UAAU,GAAG,wBAAwB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAEvE,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;IAC7C,OAAO;QACL,IAAI,EAAE,aAAa,CAAC,SAAS;QAC7B,GAAG,CAAC,WAAW,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;QAC/C,IAAI,EAAE,aAAa;QACnB,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,kBAAkB;QAC9B,GAAG,CAAC,UAAU,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;KAC3C,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,YAA0B;IACrD,OAAO,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AAClD,CAAC;AAED,SAAS,wBAAwB,CAC/B,YAA0B,EAC1B,UAAwC;IAExC,MAAM,mBAAmB,GAAG,wBAAwB,CAAC,YAAY,CAAC,CAAC;IAEnE,IAAI,mBAAmB,EAAE;QACvB,uFAAuF;QACvF,mGAAmG;QACnG,oEAAoE;QACpE,MAAM,kBAAkB,GAAG,UAAU,CAAC,MAAM,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,mBAAmB,CAAC,IAAI,CAC3C,CAAC;QACF,OAAO,CAAC,GAAG,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;KACrD;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;GAEG;AACH,SAAS,wBAAwB,CAC/B,YAA0B;IAE1B,MAAM,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,CAAC;IAC3D,IAAI,CAAC,kBAAkB,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE;QACtD,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,cAAc,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;IAC3D,MAAM,yBAAyB,GAAG,4BAA4B,CAAC,YAAY,CAAC,CAAC;IAE7E,IAAI,cAAc,EAAE;QAClB,IAAI,yBAAyB,KAAK,SAAS,EAAE;YAC3C,MAAM,IAAI,KAAK,CACb,6CAA6C,YAAY,CAAC,IAAI,0DAA0D,CACzH,CAAC;SACH;QAED,OAAO;YACL,IAAI,EAAE,aAAa,CAAC,iBAAiB;YACrC,IAAI,EAAE,IAAI,yBAAyB,GAAG;YACtC,IAAI,EAAE,cAAc;SACrB,CAAC;KACH;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,SAAS,4BAA4B,CAAC,YAA0B;IAC9D,IAAI,YAAY,CAAC,aAAa,KAAK,SAAS,EAAE;QAC5C,OAAO,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC;KACxC;IAED,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IAEnD,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;QAC/B,IAAI,cAAc,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,aAAa,EAAE;YAClD,OAAO,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC;SAClC;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,SAAS,qBAAqB,CAAC,YAA0B;IACvD,MAAM,kBAAkB,GAAG,YAAY,CAAC,kBAAkB;QACxD,CAAC,CAAC,YAAY,CAAC,kBAAkB;QACjC,CAAC,CAAC,YAAY,CAAC,aAAa;YAC5B,CAAC,CAAC,YAAY,CAAC,IAAI;YACnB,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,EAAE,SAAS,IAAI,EAAE,CAAC;IAExD,+EAA+E;IAC/E,sEAAsE;IACtE,IAAI,kBAAkB,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;QAC1C,OAAO,IAAI,kBAAkB,GAAG,CAAC;KAClC;IAED,wEAAwE;IACxE,IAAI,QAAQ,EAAE;QACZ,MAAM,qBAAqB,GAAG,YAAY,CAAC,aAAa,CAAC;QACzD,+GAA+G;QAC/G,IAAI,CAAC,qBAAqB,EAAE;YAC1B,OAAO,IAAI,kBAAkB,GAAG,CAAC;SAClC;QAED,qHAAqH;QACrH,MAAM,WAAW,GAAG,YAAY,CAAC,QAAQ,EAAE,GAAG,IAAI,EAAE,CAAC;QAErD,+DAA+D;QAC/D,MAAM,iBAAiB,GAAG,kBAAkB;YAC1C,CAAC,CAAC,CAAC,IAAI,kBAAkB,GAAG,CAAC;YAC7B,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,WAAW,GAAG,2BAA2B,CAAC,WAAW,CAAC,CAAC,GAAG,CAC9D,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAChB,CAAC;QAEF,OAAO,CAAC,GAAG,iBAAiB,EAAE,GAAG,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAC3D;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,SAAS,2BAA2B,CAAC,QAAwB;IAC3D,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9C,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE;QAC5B,IAAI,cAAc,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,kBAAkB,EAAE;YACrD,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACnD;KACF;IAED,OAAO,CAAC,GAAG,mBAAmB,CAAC,CAAC;AAClC,CAAC;AAED;;GAEG;AACH,SAAS,wBAAwB,CAC/B,YAA0B,EAC1B,WAA4B;IAE5B,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE;QACpC,OAAO,EAAE,CAAC;KACX;IAED,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,2FAA2F;IAC3F,4FAA4F;IAC5F,IAAI,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;QAC3D,UAAU,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;KAC5C;IAED,8DAA8D;IAC9D,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS;SAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;SACrC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,MAAM,UAAU,GAAG,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC;YAC3D,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,IAAI,GAAG,GAAG,aAAa,CAC3B,MAAM,CAAC,IAAI,EACX,QAAQ,CAAC,SAAS,EAClB,IAAI,CAAC,kBAAkB,CACxB,GAAG,UAAU,EAAE,CAAC;QAEjB,OAAO,cAAc,CAAC,MAAM,CAAC,IAAI,mBAAmB,CAAC,MAAM,CAAC;YAC1D,CAAC,CAAC,GAAG,IAAI,QAAQ;YACjB,CAAC,CAAC,IAAI,CAAC;IACX,CAAC,CAAC,CAAC;IAEL,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,qBAAqB,CAC5B,UAAuC,EACvC,WAA4B,EAC5B,cAA2B;IAE3B,IAAI,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9C,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE,CACtC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC5E,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;IACxE,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7E,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/B,oBAAoB,CAClB,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAC7B,WAAW,EACX,cAAc,CACf,CACF,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,QAA8B,EAC9B,WAA4B,EAC5B,cAA2B;IAE3B,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC;IAEnC,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;IACzC,IAAI,IAAI,GACN,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,cAAc;QACvE,CAAC,CAAC,QAAQ,CAAC,cAAc;QACzB,CAAC,CAAC,QAAQ,CAAC,QAAQ;YACnB,CAAC,CAAC,QAAQ,CAAC,QAAQ;YACnB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IACpB,IAAI,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,EAAE;QAC1C,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC;KAC1B;IACD,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,GAAG,CAAC,WAAW,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;QAC/C,gBAAgB,EAAE,CAAC,QAAQ,CAAC,QAAQ;QACpC,UAAU,EACR,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,QAAQ;QACrE,IAAI;QACJ,IAAI,EAAE,aAAa,CAAC,iBAAiB;KACtC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,WAA4B,EAC5B,aAA+B;IAE/B,OAAO,CACL,CAAC,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC;QACzC,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAChD,CAAC,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC;YAC5C,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CACpD,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"buildObjectTypes.js","sourceRoot":"","sources":["../src/buildObjectTypes.ts"],"names":[],"mappings":"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"}
package/dist-esm/buildTopLevelIndexFile.js CHANGED
@@ -12,11 +12,13 @@ export function buildTopLevelIndex(model) {
12
12
  }
13
13
  const project = new Project();
14
14
  const { srcPath } = model;
15
- const { multiClient, batch } = model.options;
15
+ const { multiClient } = model.options;
16
+ const batch = model.options.batch;
16
17
  if (srcPath) {
17
18
  const clientName = model.libraryName;
18
19
  const moduleName = normalizeName(clientName, NameType.File);
19
- const relativePath = "./" + getRelativePartFromSrcPath(srcPath);
20
+ const relativePath = "./" +
21
+ getRelativePartFromSrcPath(srcPath, model.options.isModularLibrary);
20
22
  batchOutputFolder.push([relativePath, clientName, moduleName]);
21
23
  }
22
24
  if (multiClient &&
package/dist-esm/buildTopLevelIndexFile.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildTopLevelIndexFile.js","sourceRoot":"","sources":["../src/buildTopLevelIndexFile.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,MAAM,iBAAiB,GAA+B,EAAE,CAAC;AAEzD,MAAM,UAAU,kBAAkB,CAAC,KAAe;IAChD,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;QAClB,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC1B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;IAC7C,IAAI,OAAO,EAAE;QACX,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,MAAM,UAAU,GAAG,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,YAAY,GAAG,IAAI,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;QAChE,iBAAiB,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;KAChE;IACD,IACE,WAAW;QACX,KAAK;QACL,KAAK,CAAC,MAAM,GAAG,CAAC;QAChB,iBAAiB,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EACzC;QACA,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,UAAU,EAAE,SAAS,EAAE;YAChE,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACjC,SAAS,CAAC,oBAAoB,CAAC;gBAC7B,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC;gBACxB,eAAe,EAAE,mBAAmB,CAClC;oBACE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;oBACrB,aAAa,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,WAAW;iBACrC,EACD,KAAK,CACN;aACF,CAAC,CAAC;YACH,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,SAAS,CAAC,oBAAoB,CAAC;YAC7B,YAAY,EAAE,CAAC,GAAG,UAAU,CAAC;SAC9B,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CACxB,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EACpD,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAC5C,UAAU,CACX,CAAC;QACF,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;KACpC;AACH,CAAC"}
1
+ {"version":3,"file":"buildTopLevelIndexFile.js","sourceRoot":"","sources":["../src/buildTopLevelIndexFile.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,MAAM,iBAAiB,GAA+B,EAAE,CAAC;AAEzD,MAAM,UAAU,kBAAkB,CAAC,KAAe;IAChD,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;QAClB,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC1B,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;IACtC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;IAClC,IAAI,OAAO,EAAE;QACX,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,MAAM,UAAU,GAAG,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,YAAY,GAChB,IAAI;YACJ,0BAA0B,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QACtE,iBAAiB,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;KAChE;IACD,IACE,WAAW;QACX,KAAK;QACL,KAAK,CAAC,MAAM,GAAG,CAAC;QAChB,iBAAiB,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EACzC;QACA,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,UAAU,EAAE,SAAS,EAAE;YAChE,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACjC,SAAS,CAAC,oBAAoB,CAAC;gBAC7B,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC;gBACxB,eAAe,EAAE,mBAAmB,CAClC;oBACE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;oBACrB,aAAa,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,WAAW;iBACrC,EACD,KAAK,CACN;aACF,CAAC,CAAC;YACH,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,SAAS,CAAC,oBAAoB,CAAC;YAC7B,YAAY,EAAE,CAAC,GAAG,UAAU,CAAC;SAC9B,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CACxB,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EACpD,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAC5C,UAAU,CACX,CAAC;QACF,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;KACpC;AACH,CAAC"}
package/dist-esm/helpers/pathUtils.js CHANGED
@@ -1,7 +1,10 @@
1
1
  import * as path from "path";
2
- export function getRelativePartFromSrcPath(srcPath) {
2
+ export function getRelativePartFromSrcPath(srcPath, isModularLibrary = false) {
3
3
  const sep = srcPath.includes(path.sep + "src") ? path.sep : "/";
4
- const relativePart = srcPath.substring(srcPath.indexOf(sep + "src") + 4);
4
+ let relativePart = srcPath.substring(srcPath.indexOf(sep + "src") + 4);
5
+ if (isModularLibrary) {
6
+ relativePart = relativePart.substring(srcPath.indexOf(sep + "rest"), +5);
7
+ }
5
8
  return relativePart.startsWith(sep)
6
9
  ? relativePart.substring(1)
7
10
  : relativePart;
package/dist-esm/helpers/pathUtils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../src/helpers/pathUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,MAAM,UAAU,0BAA0B,CAAC,OAAe;IACxD,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAChE,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACzE,OAAO,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC;QACjC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;QAC3B,CAAC,CAAC,YAAY,CAAC;AACnB,CAAC"}
1
+ {"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../src/helpers/pathUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,MAAM,UAAU,0BAA0B,CACxC,OAAe,EACf,mBAA4B,KAAK;IAEjC,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAChE,IAAI,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACvE,IAAI,gBAAgB,EAAE;QACpB,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC1E;IACD,OAAO,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC;QACjC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;QAC3B,CAAC,CAAC,YAAY,CAAC;AACnB,CAAC"}
package/dist-esm/interfaces.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"AA4FA,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,EAC1C,0BAA0B,GAAG,CAAC,CAAC;AA4CjC,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+DAAc,CAAA;IACd,+DAAc,CAAA;AAChB,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB;AAMD,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,kDAAkD;IAClD,gCAAe,CAAA;IACf,qDAAqD;IACrD,kCAAiB,CAAA;IACjB,wDAAwD;IACxD,wCAAuB,CAAA;AACzB,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB"}
1
+ {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"AA4FA,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,EAC1C,0BAA0B,GAAG,CAAC,CAAC;AA6CjC,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+DAAc,CAAA;IACd,+DAAc,CAAA;AAChB,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB;AAMD,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,kDAAkD;IAClD,gCAAe,CAAA;IACf,qDAAqD;IACrD,kCAAiB,CAAA;IACjB,wDAAwD;IACxD,wCAAuB,CAAA;AACzB,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB"}
package/dist-esm/metadata/buildPackageFile.js CHANGED
@@ -109,7 +109,7 @@ function restLevelPackage(model, hasSamplesGenerated) {
109
109
  autoPublish: false,
110
110
  dependencies: {
111
111
  "@azure/core-auth": "^1.3.0",
112
- "@azure-rest/core-client": "^1.1.3",
112
+ "@azure-rest/core-client": "^1.1.4",
113
113
  "@azure/core-rest-pipeline": "^1.8.0",
114
114
  "@azure/logger": "^1.0.0",
115
115
  tslib: "^2.2.0",
@@ -117,7 +117,7 @@ function restLevelPackage(model, hasSamplesGenerated) {
117
117
  "@azure/core-paging": "^1.5.0"
118
118
  }),
119
119
  ...(hasLRO && {
120
- "@azure/core-lro": "^2.5.3",
120
+ "@azure/core-lro": "^2.5.4",
121
121
  "@azure/abort-controller": "^1.0.0"
122
122
  })
123
123
  },
package/dist-esm/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@azure-tools/rlc-common","version":"0.13.4","description":"","type":"module","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 dist/* dist-esm/* types/* && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node publishPackage.js","build:cjs":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig-cjs.json && node publishPackage.js","build:esm":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig.json && node publishPackage.js","test":"echo \"Error: no test specified\" && exit 1"},"keywords":[],"author":"","license":"ISC","dependencies":{"ts-morph":"^15.1.0","lodash":"^4.17.21","handlebars":"^4.7.7"},"devDependencies":{"@types/node":"^18.0.0","eslint":"^8.9.0","prettier":"~2.7.1","typescript":"~5.0.0","rimraf":"^3.0.2","@types/lodash":"^4.14.182","fs-extra":"^10.0.0","@types/fs-extra":"^8.1.0","ts-node":"^10.7.0"},"bugs":{"url":"https://github.com/Azure/autorest.typescript/issues"},"homepage":"https://github.com/Azure/autorest.typescript/tree/main/packages/rlc-common/"}
1
+ {"name":"@azure-tools/rlc-common","version":"0.14.0","description":"","type":"module","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 dist/* dist-esm/* types/* && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node publishPackage.js","build:cjs":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig-cjs.json && node publishPackage.js","build:esm":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig.json && node publishPackage.js","test":"echo \"Error: no test specified\" && exit 1"},"keywords":[],"author":"","license":"ISC","dependencies":{"ts-morph":"^15.1.0","lodash":"^4.17.21","handlebars":"^4.7.7"},"devDependencies":{"@types/node":"^18.0.0","eslint":"^8.9.0","prettier":"~2.7.1","typescript":"~5.0.0","rimraf":"^3.0.2","@types/lodash":"^4.14.182","fs-extra":"^10.0.0","@types/fs-extra":"^8.1.0","ts-node":"^10.7.0"},"bugs":{"url":"https://github.com/Azure/autorest.typescript/issues"},"homepage":"https://github.com/Azure/autorest.typescript/tree/main/packages/rlc-common/"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@azure-tools/rlc-common",
3
- "version": "0.13.4",
3
+ "version": "0.14.0",
4
4
  "description": "",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
package/src/buildClient.ts CHANGED
@@ -203,7 +203,7 @@ function isSecurityInfoDefined(
203
203
  );
204
204
  }
205
205
 
206
- function getClientFactoryBody(
206
+ export function getClientFactoryBody(
207
207
  model: RLCModel,
208
208
  clientTypeName: string
209
209
  ): string | WriterFunction | (string | WriterFunction | StatementStructures)[] {
package/src/buildClientDefinitions.ts CHANGED
@@ -192,7 +192,10 @@ function getOperationReturnTypeName(
192
192
  operationGroupName &&
193
193
  operationGroupName !== "Client"
194
194
  ) {
195
- return `${pascalCase(operationGroupName)}${pascalCase(name)}`;
195
+ return normalizeName(
196
+ `${pascalCase(operationGroupName)}${pascalCase(name)}`,
197
+ NameType.Interface
198
+ );
196
199
  }
197
200
 
198
201
  return pascalCase(name);
package/src/buildIndexFile.ts CHANGED
@@ -130,7 +130,7 @@ function generateRLCIndexForMultiClient(file: SourceFile, model: RLCModel) {
130
130
  });
131
131
  exports.push("UnexpectedHelper");
132
132
  }
133
-
133
+
134
134
  if (hasPollingOperations(model)) {
135
135
  file.addImportDeclaration({
136
136
  namespaceImport: "PollingHelper",
package/src/buildObjectTypes.ts CHANGED
@@ -38,6 +38,7 @@ export function buildObjectInterfaces(
38
38
  }
39
39
  const baseName = getObjectBaseName(objectSchema, schemaUsage);
40
40
  const interfaceDeclaration = getObjectInterfaceDeclaration(
41
+ model,
41
42
  baseName,
42
43
  objectSchema,
43
44
  schemaUsage,
@@ -175,6 +176,7 @@ function getPolymorphicTypeAlias(
175
176
  * root node it will suffix it with Base.
176
177
  */
177
178
  function getObjectInterfaceDeclaration(
179
+ model: RLCModel,
178
180
  baseName: string,
179
181
  objectSchema: ObjectSchema,
180
182
  schemaUsage: SchemaContext[],
@@ -195,6 +197,7 @@ function getObjectInterfaceDeclaration(
195
197
 
196
198
  // Add the polymorphic property if exists
197
199
  propertySignatures = addDiscriminatorProperty(
200
+ model,
198
201
  objectSchema,
199
202
  propertySignatures
200
203
  );
@@ -218,10 +221,11 @@ function isPolymorphicParent(objectSchema: ObjectSchema) {
218
221
  }
219
222
 
220
223
  function addDiscriminatorProperty(
224
+ model: RLCModel,
221
225
  objectSchema: ObjectSchema,
222
226
  properties: PropertySignatureStructure[]
223
227
  ): PropertySignatureStructure[] {
224
- const polymorphicProperty = getDiscriminatorProperty(objectSchema);
228
+ const polymorphicProperty = getDiscriminatorProperty(model, objectSchema);
225
229
 
226
230
  if (polymorphicProperty) {
227
231
  // It is possible that the polymorphic property needs to override an existing property.
@@ -240,6 +244,7 @@ function addDiscriminatorProperty(
240
244
  * Finds the name of the property used as discriminator and the discriminator value.
241
245
  */
242
246
  function getDiscriminatorProperty(
247
+ model: RLCModel,
243
248
  objectSchema: ObjectSchema
244
249
  ): PropertySignatureStructure | undefined {
245
250
  const discriminatorValue = objectSchema.discriminatorValue;
@@ -256,11 +261,10 @@ function getDiscriminatorProperty(
256
261
  `getDiscriminatorProperty: Expected object ${objectSchema.name} to have a discriminator in its hierarchy but found none`
257
262
  );
258
263
  }
259
-
260
264
  return {
261
265
  kind: StructureKind.PropertySignature,
262
266
  name: `"${discriminatorPropertyName}"`,
263
- type: discriminators
267
+ type: model.options?.sourceFrom === "Swagger" ? discriminators : `string`
264
268
  };
265
269
  }
266
270
 
package/src/buildTopLevelIndexFile.ts CHANGED
@@ -16,11 +16,14 @@ export function buildTopLevelIndex(model: RLCModel) {
16
16
  }
17
17
  const project = new Project();
18
18
  const { srcPath } = model;
19
- const { multiClient, batch } = model.options;
19
+ const { multiClient } = model.options;
20
+ const batch = model.options.batch;
20
21
  if (srcPath) {
21
22
  const clientName = model.libraryName;
22
23
  const moduleName = normalizeName(clientName, NameType.File);
23
- const relativePath = "./" + getRelativePartFromSrcPath(srcPath);
24
+ const relativePath =
25
+ "./" +
26
+ getRelativePartFromSrcPath(srcPath, model.options.isModularLibrary);
24
27
  batchOutputFolder.push([relativePath, clientName, moduleName]);
25
28
  }
26
29
  if (
package/src/helpers/pathUtils.ts CHANGED
@@ -1,8 +1,14 @@
1
1
  import * as path from "path";
2
2
 
3
- export function getRelativePartFromSrcPath(srcPath: string) {
3
+ export function getRelativePartFromSrcPath(
4
+ srcPath: string,
5
+ isModularLibrary: boolean = false
6
+ ) {
4
7
  const sep = srcPath.includes(path.sep + "src") ? path.sep : "/";
5
- const relativePart = srcPath.substring(srcPath.indexOf(sep + "src") + 4);
8
+ let relativePart = srcPath.substring(srcPath.indexOf(sep + "src") + 4);
9
+ if (isModularLibrary) {
10
+ relativePart = relativePart.substring(srcPath.indexOf(sep + "rest"), +5);
11
+ }
6
12
  return relativePart.startsWith(sep)
7
13
  ? relativePart.substring(1)
8
14
  : relativePart;
package/src/interfaces.ts CHANGED
@@ -123,6 +123,7 @@ export interface RLCOptions {
123
123
  azureArm?: boolean;
124
124
  sourceFrom?: "Cadl" | "Swagger";
125
125
  isModularLibrary?: boolean;
126
+ enableOperationGroup?: boolean;
126
127
  }
127
128
 
128
129
  export interface ServiceInfo {
@@ -231,6 +232,7 @@ export interface ParameterMetadata {
231
232
  export interface OperationResponse {
232
233
  operationGroup: string;
233
234
  operationName: string;
235
+ path: string;
234
236
  responses: ResponseMetadata[];
235
237
  }
236
238
  export interface ResponseMetadata {
package/src/metadata/buildPackageFile.ts CHANGED
@@ -153,7 +153,7 @@ function restLevelPackage(model: RLCModel, hasSamplesGenerated: boolean) {
153
153
  autoPublish: false,
154
154
  dependencies: {
155
155
  "@azure/core-auth": "^1.3.0",
156
- "@azure-rest/core-client": "^1.1.3",
156
+ "@azure-rest/core-client": "^1.1.4",
157
157
  "@azure/core-rest-pipeline": "^1.8.0",
158
158
  "@azure/logger": "^1.0.0",
159
159
  tslib: "^2.2.0",
@@ -161,7 +161,7 @@ function restLevelPackage(model: RLCModel, hasSamplesGenerated: boolean) {
161
161
  "@azure/core-paging": "^1.5.0"
162
162
  }),
163
163
  ...(hasLRO && {
164
- "@azure/core-lro": "^2.5.3",
164
+ "@azure/core-lro": "^2.5.4",
165
165
  "@azure/abort-controller": "^1.0.0"
166
166
  })
167
167
  },
package/types/buildClient.d.ts CHANGED
@@ -1,2 +1,4 @@
1
+ import { StatementStructures, WriterFunction } from "ts-morph";
1
2
  import { RLCModel, File } from "./interfaces.js";
2
3
  export declare function buildClient(model: RLCModel): File | undefined;
4
+ export declare function getClientFactoryBody(model: RLCModel, clientTypeName: string): string | WriterFunction | (string | WriterFunction | StatementStructures)[];
package/types/helpers/pathUtils.d.ts CHANGED
@@ -1 +1 @@
1
- export declare function getRelativePartFromSrcPath(srcPath: string): string;
1
+ export declare function getRelativePartFromSrcPath(srcPath: string, isModularLibrary?: boolean): string;
package/types/interfaces.d.ts CHANGED
@@ -107,6 +107,7 @@ export interface RLCOptions {
107
107
  azureArm?: boolean;
108
108
  sourceFrom?: "Cadl" | "Swagger";
109
109
  isModularLibrary?: boolean;
110
+ enableOperationGroup?: boolean;
110
111
  }
111
112
  export interface ServiceInfo {
112
113
  title?: string;
@@ -202,6 +203,7 @@ export interface ParameterMetadata {
202
203
  export interface OperationResponse {
203
204
  operationGroup: string;
204
205
  operationName: string;
206
+ path: string;
205
207
  responses: ResponseMetadata[];
206
208
  }
207
209
  export interface ResponseMetadata {