@azure-tools/typespec-azure-core 0.42.0-dev.5 → 0.42.0-dev.6

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.
@@ -1 +1 @@
1
- {"version":3,"file":"no-rpc-path-params.d.ts","sourceRoot":"","sources":["../../../src/rules/no-rpc-path-params.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB;;EA4C9B,CAAC"}
1
+ {"version":3,"file":"no-rpc-path-params.d.ts","sourceRoot":"","sources":["../../../src/rules/no-rpc-path-params.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB;;EAgD9B,CAAC"}
@@ -1,4 +1,4 @@
1
- import { createRule, getTypeName } from "@typespec/compiler";
1
+ import { createRule } from "@typespec/compiler";
2
2
  import { isPathParam } from "@typespec/http";
3
3
  import { isExcludedCoreType } from "./utils.js";
4
4
  export const noRpcPathParamsRule = createRule({
@@ -22,7 +22,9 @@ export const noRpcPathParamsRule = createRule({
22
22
  const originalOperation = operation;
23
23
  while (operation.sourceOperation) {
24
24
  operation = operation.sourceOperation;
25
- if (/^Azure\.Core\..*RpcOperation$/.test(getTypeName(operation))) {
25
+ if (operation.name.endsWith("RpcOperation") &&
26
+ operation.namespace?.name === "Core" &&
27
+ operation.namespace?.namespace?.name === "Azure") {
26
28
  // Check the original operation to see if it contains path
27
29
  // parameters. We only need to check the operation parameters
28
30
  // because the route path is validated against the op parameters
@@ -1 +1 @@
1
- {"version":3,"file":"no-rpc-path-params.js","sourceRoot":"","sources":["../../../src/rules/no-rpc-path-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,CAAC,MAAM,mBAAmB,GAAG,UAAU,CAAC;IAC5C,IAAI,EAAE,oBAAoB;IAC1B,WAAW,EAAE,wEAAwE;IACrF,QAAQ,EAAE,SAAS;IACnB,QAAQ,EAAE;QACR,OAAO,EACL,2IAA2I;KAC9I;IACD,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,SAAS,EAAE,CAAC,SAAoB,EAAE,EAAE;gBAClC,uEAAuE;gBACvE,oEAAoE;gBACpE,IACE,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC;oBAC9C,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAC9C,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,sEAAsE;gBACtE,kBAAkB;gBAClB,MAAM,iBAAiB,GAAG,SAAS,CAAC;gBACpC,OAAO,SAAS,CAAC,eAAe,EAAE,CAAC;oBACjC,SAAS,GAAG,SAAS,CAAC,eAAe,CAAC;oBACtC,IAAI,+BAA+B,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;wBACjE,0DAA0D;wBAC1D,8DAA8D;wBAC9D,gEAAgE;wBAChE,cAAc;wBACd,KAAK,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,iBAAiB,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;4BACjE,IAAI,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;gCACxC,OAAO,CAAC,gBAAgB,CAAC;oCACvB,MAAM,EAAE,iBAAiB;iCAC1B,CAAC,CAAC;gCAEH,OAAO;4BACT,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"no-rpc-path-params.js","sourceRoot":"","sources":["../../../src/rules/no-rpc-path-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,CAAC,MAAM,mBAAmB,GAAG,UAAU,CAAC;IAC5C,IAAI,EAAE,oBAAoB;IAC1B,WAAW,EAAE,wEAAwE;IACrF,QAAQ,EAAE,SAAS;IACnB,QAAQ,EAAE;QACR,OAAO,EACL,2IAA2I;KAC9I;IACD,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,SAAS,EAAE,CAAC,SAAoB,EAAE,EAAE;gBAClC,uEAAuE;gBACvE,oEAAoE;gBACpE,IACE,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC;oBAC9C,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAC9C,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,sEAAsE;gBACtE,kBAAkB;gBAClB,MAAM,iBAAiB,GAAG,SAAS,CAAC;gBACpC,OAAO,SAAS,CAAC,eAAe,EAAE,CAAC;oBACjC,SAAS,GAAG,SAAS,CAAC,eAAe,CAAC;oBACtC,IACE,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC;wBACvC,SAAS,CAAC,SAAS,EAAE,IAAI,KAAK,MAAM;wBACpC,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,KAAK,OAAO,EAChD,CAAC;wBACD,0DAA0D;wBAC1D,8DAA8D;wBAC9D,gEAAgE;wBAChE,cAAc;wBACd,KAAK,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,iBAAiB,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;4BACjE,IAAI,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;gCACxC,OAAO,CAAC,gBAAgB,CAAC;oCACvB,MAAM,EAAE,iBAAiB;iCAC1B,CAAC,CAAC;gCAEH,OAAO;4BACT,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"require-docs.d.ts","sourceRoot":"","sources":["../../../src/rules/require-docs.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,oBAAoB;;EA4E/B,CAAC"}
1
+ {"version":3,"file":"require-docs.d.ts","sourceRoot":"","sources":["../../../src/rules/require-docs.ts"],"names":[],"mappings":"AAiEA,eAAO,MAAM,oBAAoB;;EAwF/B,CAAC"}
@@ -1,5 +1,43 @@
1
- import { createRule, getDoc, paramMessage } from "@typespec/compiler";
1
+ import { createRule, getDiscriminatedTypes, getDiscriminator, getDoc, paramMessage, } from "@typespec/compiler";
2
+ import { getVersionsForEnum } from "@typespec/versioning";
2
3
  import { isExcludedCoreType, isInlineModel, isTemplateDeclarationType, isTemplatedInterfaceOperation, isTemplatedOperationSignature, } from "./utils.js";
4
+ /** Versioning enums are self-documenting and don't need separate documentation. */
5
+ function isExcludedVersionEnum(program, enumObj) {
6
+ const versions = getVersionsForEnum(program, enumObj);
7
+ if (versions !== undefined && versions.length > 0) {
8
+ return true;
9
+ }
10
+ return false;
11
+ }
12
+ function findDiscriminator(program, model) {
13
+ if (!model)
14
+ return undefined;
15
+ const disc = getDiscriminator(program, model);
16
+ if (disc) {
17
+ return disc;
18
+ }
19
+ return findDiscriminator(program, model.baseModel);
20
+ }
21
+ /** Discriminator enums and unions are self-documenting and don't need separate documentation. */
22
+ function isExcludedDiscriminator(program, type, discTypes) {
23
+ if (type.kind === "ModelProperty") {
24
+ const disc = findDiscriminator(program, type.model);
25
+ if (disc && disc.propertyName === type.name) {
26
+ return true;
27
+ }
28
+ }
29
+ else if (type.kind === "Enum") {
30
+ for (const [discType, discName] of discTypes) {
31
+ if (discType.kind === "Model") {
32
+ const discObj = discType.properties.get(discName.propertyName);
33
+ if (discObj?.type === type) {
34
+ return true;
35
+ }
36
+ }
37
+ }
38
+ }
39
+ return false;
40
+ }
3
41
  export const requireDocumentation = createRule({
4
42
  name: "documentation-required",
5
43
  description: "Require documentation over enums, models, and operations.",
@@ -8,8 +46,16 @@ export const requireDocumentation = createRule({
8
46
  default: paramMessage `The ${"kind"} named '${"name"}' should have a documentation or description, use doc comment /** */ to provide it.`,
9
47
  },
10
48
  create(context) {
49
+ const discTypes = getDiscriminatedTypes(context.program);
11
50
  return {
12
51
  enum: (enumObj) => {
52
+ // version enums and enum members are considered intrinsically self-documenting
53
+ if (isExcludedVersionEnum(context.program, enumObj)) {
54
+ return;
55
+ }
56
+ if (isExcludedDiscriminator(context.program, enumObj, discTypes)) {
57
+ return;
58
+ }
13
59
  if (!getDoc(context.program, enumObj) && !isExcludedCoreType(context.program, enumObj)) {
14
60
  context.reportDiagnostic({
15
61
  target: enumObj,
@@ -60,6 +106,10 @@ export const requireDocumentation = createRule({
60
106
  });
61
107
  }
62
108
  for (const prop of model.properties.values()) {
109
+ // Properties that are discriminators are considered self-documenting
110
+ if (isExcludedDiscriminator(context.program, prop, discTypes)) {
111
+ return;
112
+ }
63
113
  if (!getDoc(context.program, prop)) {
64
114
  context.reportDiagnostic({
65
115
  target: prop,
@@ -1 +1 @@
1
- {"version":3,"file":"require-docs.js","sourceRoot":"","sources":["../../../src/rules/require-docs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"require-docs.js","sourceRoot":"","sources":["../../../src/rules/require-docs.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"rpc-operation-request-body.d.ts","sourceRoot":"","sources":["../../../src/rules/rpc-operation-request-body.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,2BAA2B;;;EAiCtC,CAAC"}
1
+ {"version":3,"file":"rpc-operation-request-body.d.ts","sourceRoot":"","sources":["../../../src/rules/rpc-operation-request-body.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,2BAA2B;;;EAqCtC,CAAC"}
@@ -1,4 +1,4 @@
1
- import { createRule, getTypeName, paramMessage } from "@typespec/compiler";
1
+ import { createRule, paramMessage } from "@typespec/compiler";
2
2
  import { getHttpOperation } from "@typespec/http";
3
3
  import { isAzureSubNamespace, isExcludedCoreType } from "./utils.js";
4
4
  export const rpcOperationRequestBodyRule = createRule({
@@ -21,7 +21,9 @@ export const rpcOperationRequestBodyRule = createRule({
21
21
  const originalOperation = operation;
22
22
  while (operation.sourceOperation) {
23
23
  operation = operation.sourceOperation;
24
- if (/^Azure\.Core\..*RpcOperation$/.test(getTypeName(operation))) {
24
+ if (operation.name === "RpcOperation" &&
25
+ operation.namespace?.name === "Core" &&
26
+ operation.namespace?.namespace?.name === "Azure") {
25
27
  const httpOperation = getHttpOperation(context.program, originalOperation)[0];
26
28
  const verb = httpOperation.verb.toLowerCase();
27
29
  if (verb === "get" || verb === "delete") {
@@ -1 +1 @@
1
- {"version":3,"file":"rpc-operation-request-body.js","sourceRoot":"","sources":["../../../src/rules/rpc-operation-request-body.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErE,MAAM,CAAC,MAAM,2BAA2B,GAAG,UAAU,CAAC;IACpD,IAAI,EAAE,4BAA4B;IAClC,WAAW,EAAE,gCAAgC;IAC7C,QAAQ,EAAE,SAAS;IACnB,QAAQ,EAAE;QACR,OAAO,EAAE,uDAAuD;QAChE,aAAa,EAAE,YAAY,CAAA,uBAAuB,MAAM,uBAAuB;KAChF;IACD,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,SAAS,EAAE,CAAC,SAAoB,EAAE,EAAE;gBAClC,IAAI,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC;oBAAE,OAAO;gBAC3D,IAAI,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC;oBAAE,OAAO;gBAC3D,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC;oBAAE,OAAO;gBAEvE,MAAM,iBAAiB,GAAG,SAAS,CAAC;gBACpC,OAAO,SAAS,CAAC,eAAe,EAAE,CAAC;oBACjC,SAAS,GAAG,SAAS,CAAC,eAAe,CAAC;oBACtC,IAAI,+BAA+B,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;wBACjE,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC9E,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;wBAC9C,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;4BACxC,OAAO,CAAC,gBAAgB,CAAC;gCACvB,MAAM,EAAE,iBAAiB;gCACzB,SAAS,EAAE,eAAe;gCAC1B,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;6BACvB,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"rpc-operation-request-body.js","sourceRoot":"","sources":["../../../src/rules/rpc-operation-request-body.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErE,MAAM,CAAC,MAAM,2BAA2B,GAAG,UAAU,CAAC;IACpD,IAAI,EAAE,4BAA4B;IAClC,WAAW,EAAE,gCAAgC;IAC7C,QAAQ,EAAE,SAAS;IACnB,QAAQ,EAAE;QACR,OAAO,EAAE,uDAAuD;QAChE,aAAa,EAAE,YAAY,CAAA,uBAAuB,MAAM,uBAAuB;KAChF;IACD,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,SAAS,EAAE,CAAC,SAAoB,EAAE,EAAE;gBAClC,IAAI,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC;oBAAE,OAAO;gBAC3D,IAAI,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC;oBAAE,OAAO;gBAC3D,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC;oBAAE,OAAO;gBAEvE,MAAM,iBAAiB,GAAG,SAAS,CAAC;gBACpC,OAAO,SAAS,CAAC,eAAe,EAAE,CAAC;oBACjC,SAAS,GAAG,SAAS,CAAC,eAAe,CAAC;oBACtC,IACE,SAAS,CAAC,IAAI,KAAK,cAAc;wBACjC,SAAS,CAAC,SAAS,EAAE,IAAI,KAAK,MAAM;wBACpC,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,KAAK,OAAO,EAChD,CAAC;wBACD,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC9E,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;wBAC9C,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;4BACxC,OAAO,CAAC,gBAAgB,CAAC;gCACvB,MAAM,EAAE,iBAAiB;gCACzB,SAAS,EAAE,eAAe;gCAC1B,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;6BACvB,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@azure-tools/typespec-azure-core",
3
- "version": "0.42.0-dev.5",
3
+ "version": "0.42.0-dev.6",
4
4
  "author": "Microsoft Corporation",
5
5
  "description": "TypeSpec Azure Core library",
6
6
  "homepage": "https://azure.github.io/typespec-azure",