@azure-tools/rlc-common 0.20.0 → 0.21.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 (11) hide show
  1. package/.rush/temp/operation/build/state.json +1 -1
  2. package/.rush/temp/package-deps_build.json +3 -3
  3. package/CHANGELOG.md +9 -0
  4. package/dist/buildObjectTypes.js +8 -5
  5. package/dist/buildObjectTypes.js.map +1 -1
  6. package/dist/package.json +1 -1
  7. package/dist-esm/buildObjectTypes.js +9 -5
  8. package/dist-esm/buildObjectTypes.js.map +1 -1
  9. package/dist-esm/package.json +1 -1
  10. package/package.json +1 -1
  11. package/src/buildObjectTypes.ts +14 -9
package/.rush/temp/operation/build/state.json CHANGED
@@ -1,3 +1,3 @@
1
1
  {
2
- "nonCachedDurationMs": 6552.547216000006
2
+ "nonCachedDurationMs": 7887.664955000015
3
3
  }
package/.rush/temp/package-deps_build.json CHANGED
@@ -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": "d3982db628407b41d7791777080ddfce59a5a5b7",
6
+ "packages/rlc-common/CHANGELOG.md": "9b1df8a930d794d58035dc0c1ca41dc2408de149",
7
7
  "packages/rlc-common/CONTRIBUTING.md": "38ef379872af08f6935263aafac67abe9ce60a1c",
8
8
  "packages/rlc-common/README.md": "cf3a9e48211f34b1cda27882d2f3cf07078f001e",
9
- "packages/rlc-common/package.json": "9e928769f59ea4c8016df2bce8a784a55d8ae972",
9
+ "packages/rlc-common/package.json": "89bf02824db806430fa8762f6134c8c67f3f11eb",
10
10
  "packages/rlc-common/publishPackage.js": "3512e26d1199937b1962f3b4189aa9c506d9da1a",
11
11
  "packages/rlc-common/src/buildClient.ts": "f08b1d5c065a1636255a178c40eb3dcb4816b30b",
12
12
  "packages/rlc-common/src/buildClientDefinitions.ts": "5d0997c633b7dcdd7711a5bf60164cc7a477e758",
@@ -14,7 +14,7 @@
14
14
  "packages/rlc-common/src/buildIsUnexpectedHelper.ts": "6cc2bc9d41510f6aaed8cae689626822bac94d26",
15
15
  "packages/rlc-common/src/buildLogger.ts": "f479d7e83fc04ed70eefa9738762a705ccda07d3",
16
16
  "packages/rlc-common/src/buildMethodShortcuts.ts": "833a2b2965d7b71d5a696b358498a9f9e68d83d1",
17
- "packages/rlc-common/src/buildObjectTypes.ts": "c1ab9cb0a3e12644e2c52a61ccafc301041a861b",
17
+ "packages/rlc-common/src/buildObjectTypes.ts": "fdf9c4328f887defd5b22ded332747e928c293ab",
18
18
  "packages/rlc-common/src/buildPaginateHelper.ts": "c40461534e7072349be81f90f5f78f9ece813d53",
19
19
  "packages/rlc-common/src/buildParameterTypes.ts": "09048ac406388b84b5d455fe9a790ecc54c7afb7",
20
20
  "packages/rlc-common/src/buildPollingHelper.ts": "11c440dc45e38c9eca8c60ea8884f4436d61f5b8",
package/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ## 0.21.0 (2024-01-26)
2
+
3
+ - [Feature] Upgrade TypeSpec compiler to 0.51.0。 Please refer to pr [#2203](https://github.com/Azure/autorest.typescript/pull/2203).
4
+ - [Feature] Support decimal type in Modular. Please refer to pr [#2233](https://github.com/Azure/autorest.typescript/pull/2233).
5
+ - [Feature] Support never type in Modular. Please refer to pr [#2233](https://github.com/Azure/autorest.typescript/pull/2233).
6
+ - [BugFix] Fix empty model generation failure in Modular. Please refer to pr [#2117](https://github.com/Azure/autorest.typescript/pull/2117).
7
+ - [BugFix] Fix circular reference generation failure in Modular. Please refer to pr [#2228](https://github.com/Azure/autorest.typescript/pull/2228).
8
+ - [BugFix] Fix array item type optional issue. Please refer to pr [#2103](https://github.com/Azure/autorest.typescript/pull/2103).
9
+
1
10
  ## 0.20.0 (2024-01-16)
2
11
 
3
12
  - [Feature] Support decimal type in RLC. Please refer to pr [#2170](https://github.com/Azure/autorest.typescript/pull/2170).
package/dist/buildObjectTypes.js CHANGED
@@ -42,11 +42,12 @@ function buildObjectAliases(model, importedModels, schemaUsage) {
42
42
  for (const objectSchema of objectSchemas) {
43
43
  if (objectSchema.alias || objectSchema.outputAlias) {
44
44
  const description = objectSchema.description;
45
- objectAliases.push(Object.assign(Object.assign({ kind: ts_morph_1.StructureKind.TypeAlias }, (description && { docs: [{ description }] })), { name: schemaUsage.includes(interfaces_js_1.SchemaContext.Input)
46
- ? `${objectSchema.typeName}`
47
- : `${objectSchema.outputTypeName}`, type: schemaUsage.includes(interfaces_js_1.SchemaContext.Input)
45
+ const modelName = schemaUsage.includes(interfaces_js_1.SchemaContext.Input)
46
+ ? `${objectSchema.typeName}`
47
+ : `${objectSchema.outputTypeName}`;
48
+ objectAliases.push(Object.assign(Object.assign({ kind: ts_morph_1.StructureKind.TypeAlias }, (description && { docs: [{ description }] })), { name: modelName, type: schemaUsage.includes(interfaces_js_1.SchemaContext.Input)
48
49
  ? `${objectSchema.alias}`
49
- : `${objectSchema.outputAlias}`, isExported: true }));
50
+ : `${objectSchema.outputAlias}`, isExported: true, docs: [description !== null && description !== void 0 ? description : "Alias for " + modelName] }));
50
51
  if ((_b = objectSchema.alias) === null || _b === void 0 ? void 0 : _b.startsWith("Paged<")) {
51
52
  importedModels.add("Paged");
52
53
  }
@@ -157,7 +158,9 @@ function getDiscriminatorProperty(model, objectSchema) {
157
158
  return {
158
159
  kind: ts_morph_1.StructureKind.PropertySignature,
159
160
  name: `"${discriminatorPropertyName}"`,
160
- type: ((_a = model.options) === null || _a === void 0 ? void 0 : _a.sourceFrom) === "Swagger" ? discriminators : (_b = objectSchema.discriminator) === null || _b === void 0 ? void 0 : _b.type
161
+ type: ((_a = model.options) === null || _a === void 0 ? void 0 : _a.sourceFrom) === "Swagger"
162
+ ? discriminators
163
+ : (_b = objectSchema.discriminator) === null || _b === void 0 ? void 0 : _b.type
161
164
  };
162
165
  }
163
166
  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/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@azure-tools/rlc-common","version":"0.20.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":"^15.1.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.2.0","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
+ {"name":"@azure-tools/rlc-common","version":"0.21.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":"^15.1.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.2.0","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/"}
package/dist-esm/buildObjectTypes.js CHANGED
@@ -30,16 +30,18 @@ export function buildObjectAliases(model, importedModels, schemaUsage) {
30
30
  for (const objectSchema of objectSchemas) {
31
31
  if (objectSchema.alias || objectSchema.outputAlias) {
32
32
  const description = objectSchema.description;
33
+ const modelName = schemaUsage.includes(SchemaContext.Input)
34
+ ? `${objectSchema.typeName}`
35
+ : `${objectSchema.outputTypeName}`;
33
36
  objectAliases.push({
34
37
  kind: StructureKind.TypeAlias,
35
38
  ...(description && { docs: [{ description }] }),
36
- name: schemaUsage.includes(SchemaContext.Input)
37
- ? `${objectSchema.typeName}`
38
- : `${objectSchema.outputTypeName}`,
39
+ name: modelName,
39
40
  type: schemaUsage.includes(SchemaContext.Input)
40
41
  ? `${objectSchema.alias}`
41
42
  : `${objectSchema.outputAlias}`,
42
- isExported: true
43
+ isExported: true,
44
+ docs: [description ?? "Alias for " + modelName]
43
45
  });
44
46
  if (objectSchema.alias?.startsWith("Paged<")) {
45
47
  importedModels.add("Paged");
@@ -155,7 +157,9 @@ function getDiscriminatorProperty(model, objectSchema) {
155
157
  return {
156
158
  kind: StructureKind.PropertySignature,
157
159
  name: `"${discriminatorPropertyName}"`,
158
- type: model.options?.sourceFrom === "Swagger" ? discriminators : objectSchema.discriminator?.type
160
+ type: model.options?.sourceFrom === "Swagger"
161
+ ? discriminators
162
+ : objectSchema.discriminator?.type
159
163
  };
160
164
  }
161
165
  return undefined;
package/dist-esm/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-esm/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@azure-tools/rlc-common","version":"0.20.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 --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":"^15.1.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.2.0","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
+ {"name":"@azure-tools/rlc-common","version":"0.21.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 --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":"^15.1.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.2.0","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/"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@azure-tools/rlc-common",
3
- "version": "0.20.0",
3
+ "version": "0.21.0",
4
4
  "description": "",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
package/src/buildObjectTypes.ts CHANGED
@@ -69,16 +69,18 @@ export function buildObjectAliases(
69
69
  for (const objectSchema of objectSchemas) {
70
70
  if (objectSchema.alias || objectSchema.outputAlias) {
71
71
  const description = objectSchema.description;
72
+ const modelName = schemaUsage.includes(SchemaContext.Input)
73
+ ? `${objectSchema.typeName}`
74
+ : `${objectSchema.outputTypeName}`;
72
75
  objectAliases.push({
73
76
  kind: StructureKind.TypeAlias,
74
77
  ...(description && { docs: [{ description }] }),
75
- name: schemaUsage.includes(SchemaContext.Input)
76
- ? `${objectSchema.typeName}`
77
- : `${objectSchema.outputTypeName}`,
78
+ name: modelName,
78
79
  type: schemaUsage.includes(SchemaContext.Input)
79
80
  ? `${objectSchema.alias}`
80
81
  : `${objectSchema.outputAlias}`,
81
- isExported: true
82
+ isExported: true,
83
+ docs: [description ?? "Alias for " + modelName]
82
84
  });
83
85
  if (objectSchema.alias?.startsWith("Paged<")) {
84
86
  importedModels.add("Paged");
@@ -268,7 +270,10 @@ function getDiscriminatorProperty(
268
270
  return {
269
271
  kind: StructureKind.PropertySignature,
270
272
  name: `"${discriminatorPropertyName}"`,
271
- type: model.options?.sourceFrom === "Swagger" ? discriminators : objectSchema.discriminator?.type
273
+ type:
274
+ model.options?.sourceFrom === "Swagger"
275
+ ? discriminators
276
+ : objectSchema.discriminator?.type
272
277
  };
273
278
  }
274
279
 
@@ -300,8 +305,8 @@ function getDiscriminatorValue(objectSchema: ObjectSchema): string | undefined {
300
305
  const discriminatorValue = objectSchema.discriminatorValue
301
306
  ? objectSchema.discriminatorValue
302
307
  : objectSchema.discriminator
303
- ? objectSchema.name
304
- : undefined;
308
+ ? objectSchema.name
309
+ : undefined;
305
310
  const children = objectSchema.children?.immediate ?? [];
306
311
 
307
312
  // If the current object has a discriminatorValue but doesn't have any children
@@ -457,8 +462,8 @@ export function getPropertySignature(
457
462
  generateForOutput(schemaUsage, property.usage) && property.outputTypeName
458
463
  ? property.outputTypeName
459
464
  : property.typeName
460
- ? property.typeName
461
- : property.type;
465
+ ? property.typeName
466
+ : property.type;
462
467
  if (property.typeName && property.fromCore) {
463
468
  importedModels.add(property.typeName);
464
469
  type = property.typeName;