@microsoft/typespec-msgraph 0.0.1-Preview.21 → 0.0.1-Preview.23

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 (114) hide show
  1. package/dist/src/components/annotations.js +2 -2
  2. package/dist/src/components/enum-type-element.js +1 -1
  3. package/dist/src/components/enum-type-element.js.map +1 -1
  4. package/dist/src/components/property-element.d.ts.map +1 -1
  5. package/dist/src/components/property-element.js +1 -1
  6. package/dist/src/components/property-element.js.map +1 -1
  7. package/dist/src/decorators/ags-attribute.d.ts.map +1 -1
  8. package/dist/src/decorators/ags-attribute.js +2 -4
  9. package/dist/src/decorators/ags-attribute.js.map +1 -1
  10. package/dist/src/decorators/function.js +1 -1
  11. package/dist/src/decorators/function.js.map +1 -1
  12. package/dist/src/decorators/graphFlags.d.ts +11 -0
  13. package/dist/src/decorators/graphFlags.d.ts.map +1 -0
  14. package/dist/src/decorators/{flags.js → graphFlags.js} +5 -5
  15. package/dist/src/decorators/graphFlags.js.map +1 -0
  16. package/dist/src/decorators/index.d.ts +2 -1
  17. package/dist/src/decorators/index.d.ts.map +1 -1
  18. package/dist/src/decorators/index.js +2 -1
  19. package/dist/src/decorators/index.js.map +1 -1
  20. package/dist/src/decorators/passthrough-address-url-msa.d.ts +2 -1
  21. package/dist/src/decorators/passthrough-address-url-msa.d.ts.map +1 -1
  22. package/dist/src/decorators/passthrough-address-url-msa.js +2 -1
  23. package/dist/src/decorators/passthrough-address-url-msa.js.map +1 -1
  24. package/dist/src/decorators/passthrough-address-url.d.ts +2 -1
  25. package/dist/src/decorators/passthrough-address-url.d.ts.map +1 -1
  26. package/dist/src/decorators/passthrough-address-url.js +2 -1
  27. package/dist/src/decorators/passthrough-address-url.js.map +1 -1
  28. package/dist/src/decorators/prefixed-graph-routes.d.ts +10 -0
  29. package/dist/src/decorators/prefixed-graph-routes.d.ts.map +1 -0
  30. package/dist/src/decorators/prefixed-graph-routes.js +27 -0
  31. package/dist/src/decorators/prefixed-graph-routes.js.map +1 -0
  32. package/dist/src/emitter.d.ts.map +1 -1
  33. package/dist/src/emitter.js +9 -6
  34. package/dist/src/emitter.js.map +1 -1
  35. package/dist/src/entities/address-url.js +2 -2
  36. package/dist/src/entities/address-url.js.map +1 -1
  37. package/dist/src/entities/annotations.d.ts +2 -2
  38. package/dist/src/entities/annotations.d.ts.map +1 -1
  39. package/dist/src/entities/annotations.js +10 -10
  40. package/dist/src/entities/annotations.js.map +1 -1
  41. package/dist/src/entities/enum.d.ts +1 -1
  42. package/dist/src/entities/enum.d.ts.map +1 -1
  43. package/dist/src/entities/enum.js +5 -3
  44. package/dist/src/entities/enum.js.map +1 -1
  45. package/dist/src/entities/model.d.ts +19 -12
  46. package/dist/src/entities/model.d.ts.map +1 -1
  47. package/dist/src/entities/model.js +65 -8
  48. package/dist/src/entities/model.js.map +1 -1
  49. package/dist/src/entities/ms-graph-route.js +6 -6
  50. package/dist/src/entities/ms-graph-route.js.map +1 -1
  51. package/dist/src/entities/namespace.d.ts +1 -0
  52. package/dist/src/entities/namespace.d.ts.map +1 -1
  53. package/dist/src/entities/namespace.js +31 -5
  54. package/dist/src/entities/namespace.js.map +1 -1
  55. package/dist/src/index.d.ts +1 -0
  56. package/dist/src/index.d.ts.map +1 -1
  57. package/dist/src/index.js +1 -0
  58. package/dist/src/index.js.map +1 -1
  59. package/dist/src/lib.d.ts +7 -0
  60. package/dist/src/lib.d.ts.map +1 -1
  61. package/dist/src/lib.js +7 -1
  62. package/dist/src/lib.js.map +1 -1
  63. package/dist/src/linter.d.ts.map +1 -1
  64. package/dist/src/linter.js +7 -2
  65. package/dist/src/linter.js.map +1 -1
  66. package/dist/src/rules/address-url.d.ts +1 -0
  67. package/dist/src/rules/address-url.d.ts.map +1 -1
  68. package/dist/src/rules/address-url.js +85 -3
  69. package/dist/src/rules/address-url.js.map +1 -1
  70. package/dist/src/rules/documentation.d.ts +4 -0
  71. package/dist/src/rules/documentation.d.ts.map +1 -0
  72. package/dist/src/rules/documentation.js +88 -0
  73. package/dist/src/rules/documentation.js.map +1 -0
  74. package/dist/src/rules/entity.d.ts +3 -0
  75. package/dist/src/rules/entity.d.ts.map +1 -1
  76. package/dist/src/rules/entity.js +32 -5
  77. package/dist/src/rules/entity.js.map +1 -1
  78. package/dist/src/rules/enum.d.ts +2 -0
  79. package/dist/src/rules/enum.d.ts.map +1 -1
  80. package/dist/src/rules/enum.js +27 -1
  81. package/dist/src/rules/enum.js.map +1 -1
  82. package/dist/src/rules/expand.js +3 -3
  83. package/dist/src/rules/expand.js.map +1 -1
  84. package/dist/src/rules/index.d.ts +1 -0
  85. package/dist/src/rules/index.d.ts.map +1 -1
  86. package/dist/src/rules/index.js +1 -0
  87. package/dist/src/rules/index.js.map +1 -1
  88. package/dist/src/rules/model.d.ts +5 -0
  89. package/dist/src/rules/model.d.ts.map +1 -1
  90. package/dist/src/rules/model.js +73 -3
  91. package/dist/src/rules/model.js.map +1 -1
  92. package/dist/src/rules/operation-inside-interface.d.ts.map +1 -1
  93. package/dist/src/rules/operation-inside-interface.js +7 -7
  94. package/dist/src/rules/operation-inside-interface.js.map +1 -1
  95. package/dist/src/rules/order-by.js +3 -3
  96. package/dist/src/rules/order-by.js.map +1 -1
  97. package/dist/src/rules/ownerless.d.ts.map +1 -1
  98. package/dist/src/rules/ownerless.js +3 -6
  99. package/dist/src/rules/ownerless.js.map +1 -1
  100. package/dist/src/rules/required-for-create.d.ts.map +1 -1
  101. package/dist/src/rules/required-for-create.js +4 -5
  102. package/dist/src/rules/required-for-create.js.map +1 -1
  103. package/dist/src/utils.d.ts +2 -2
  104. package/dist/src/utils.d.ts.map +1 -1
  105. package/dist/src/utils.js +68 -128
  106. package/dist/src/utils.js.map +1 -1
  107. package/dist/src/validate.d.ts.map +1 -1
  108. package/dist/src/validate.js +3 -0
  109. package/dist/src/validate.js.map +1 -1
  110. package/lib/decorators.tsp +23 -11
  111. package/package.json +4 -4
  112. package/dist/src/decorators/flags.d.ts +0 -11
  113. package/dist/src/decorators/flags.d.ts.map +0 -1
  114. package/dist/src/decorators/flags.js.map +0 -1
@@ -8,6 +8,7 @@ export * from "./contains.js";
8
8
  export * from "./count.js";
9
9
  export * from "./delta.js";
10
10
  export * from "./disallowed-typespec-decorators.js";
11
+ export * from "./documentation.js";
11
12
  export * from "./entity.js";
12
13
  export * from "./enum.js";
13
14
  export * from "./expand.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rules/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oDAAoD,CAAC;AACnE,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,qCAAqC,CAAC;AACpD,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,iCAAiC,CAAC;AAChD,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rules/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oDAAoD,CAAC;AACnE,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,qCAAqC,CAAC;AACpD,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,iCAAiC,CAAC;AAChD,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC"}
@@ -8,6 +8,7 @@ export * from "./contains.js";
8
8
  export * from "./count.js";
9
9
  export * from "./delta.js";
10
10
  export * from "./disallowed-typespec-decorators.js";
11
+ export * from "./documentation.js";
11
12
  export * from "./entity.js";
12
13
  export * from "./enum.js";
13
14
  export * from "./expand.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rules/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oDAAoD,CAAC;AACnE,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,qCAAqC,CAAC;AACpD,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,iCAAiC,CAAC;AAChD,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rules/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oDAAoD,CAAC;AACnE,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,qCAAqC,CAAC;AACpD,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,iCAAiC,CAAC;AAChD,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC"}
@@ -1,4 +1,9 @@
1
+ import { Program } from "@typespec/compiler";
1
2
  export declare const modelShouldBeEntityOrComplexType: import("@typespec/compiler").LinterRuleDefinition<"model-should-be-entity-or-complex-type", {
2
3
  readonly default: import("@typespec/compiler").CallableMessage<[string]>;
3
4
  }>;
5
+ export declare const containedNavigationPropertyTypeShouldNotBeExternallyReferenced: import("@typespec/compiler").LinterRuleDefinition<"contained-navigation-property-type-should-not-be-externally-referenced", {
6
+ readonly default: import("@typespec/compiler").CallableMessage<[string]>;
7
+ }>;
8
+ export declare function validatePropertyTypeIsNotStringLiteral(program: Program): void;
4
9
  //# sourceMappingURL=model.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/rules/model.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gCAAgC;;EAmC3C,CAAA"}
1
+ {"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/rules/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,OAAO,EAA0E,MAAM,oBAAoB,CAAC;AAOjK,eAAO,MAAM,gCAAgC;;EAmC3C,CAAA;AAEF,eAAO,MAAM,8DAA8D;;EAyBzE,CAAA;AAEF,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,OAAO,QA4BtE"}
@@ -1,6 +1,8 @@
1
- import { createRule, getLocationContext, paramMessage } from "@typespec/compiler";
2
- import { isExcludedCoreType } from "../utils.js";
3
- import { isEntity, isComplex } from "../index.js";
1
+ import { createRule, getLocationContext, navigateTypesInNamespace, paramMessage } from "@typespec/compiler";
2
+ import { extractTypesFromUnion, getTypeModel, isExcludedCoreType, isTypeDefinedInExternalLibrary } from "../utils.js";
3
+ import { isEntity, isComplex, isContains } from "../index.js";
4
+ import { GetDeclaredNamespaces } from "../entities/namespace.js";
5
+ import { reportDiagnostic } from "../lib.js";
4
6
  export const modelShouldBeEntityOrComplexType = createRule({
5
7
  name: "model-should-be-entity-or-complex-type",
6
8
  severity: "warning",
@@ -33,4 +35,72 @@ export const modelShouldBeEntityOrComplexType = createRule({
33
35
  };
34
36
  },
35
37
  });
38
+ export const containedNavigationPropertyTypeShouldNotBeExternallyReferenced = createRule({
39
+ name: "contained-navigation-property-type-should-not-be-externally-referenced",
40
+ severity: "warning",
41
+ description: "Contained navigation property type should not be an externally referenced type",
42
+ messages: {
43
+ default: paramMessage `Contained navigation property '${"property"}' type should not be an externally referenced type.`,
44
+ },
45
+ create(context) {
46
+ return {
47
+ model: (model) => {
48
+ const properties = model.properties;
49
+ for (const [_, property] of properties) {
50
+ const propertyType = getTypeModel(context.program, property.type);
51
+ if (propertyType && isContains(context.program, property) && isTypeDefinedInExternalLibrary(context.program, propertyType)) {
52
+ context.reportDiagnostic({
53
+ target: property,
54
+ format: {
55
+ property: property.name,
56
+ }
57
+ });
58
+ }
59
+ }
60
+ }
61
+ };
62
+ }
63
+ });
64
+ export function validatePropertyTypeIsNotStringLiteral(program) {
65
+ for (const namespace of GetDeclaredNamespaces(program)) {
66
+ navigateTypesInNamespace(namespace, {
67
+ modelProperty: (property) => {
68
+ if (!property.model || isExcludedCoreType(program, property.model)) {
69
+ return;
70
+ }
71
+ // To skip cases like '@path value:"$value"', '@header contentType: "image/*"'
72
+ const propDecoratorToSkip = ["@path", "@header"];
73
+ const propDecorators = property.decorators
74
+ .map((decorator) => { var _a; return (_a = decorator.definition) === null || _a === void 0 ? void 0 : _a.name; });
75
+ if (propDecoratorToSkip.some(value => propDecorators.includes(value))) {
76
+ return;
77
+ }
78
+ if (property.type.kind === "Union") {
79
+ const unionTypes = extractTypesFromUnion(property.type);
80
+ unionTypes.forEach(type => {
81
+ reportModelPropertyTypeDiagnostics(program, property, type.kind);
82
+ });
83
+ }
84
+ else {
85
+ reportModelPropertyTypeDiagnostics(program, property, property.type.kind);
86
+ }
87
+ }
88
+ });
89
+ }
90
+ }
91
+ function reportModelPropertyTypeDiagnostics(program, property, propertyTypeKind) {
92
+ const literalTypes = ["String", "Boolean", "Number", "Tuple"];
93
+ if (!literalTypes.includes(propertyTypeKind)) {
94
+ return;
95
+ }
96
+ reportDiagnostic(program, {
97
+ code: "type-invalid-use",
98
+ target: property,
99
+ messageId: "propertyTypeCannotBeStringLiteral",
100
+ format: {
101
+ property: property.name,
102
+ type: propertyTypeKind.toLowerCase()
103
+ }
104
+ });
105
+ }
36
106
  //# sourceMappingURL=model.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/rules/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGlD,MAAM,CAAC,MAAM,gCAAgC,GAAG,UAAU,CAAC;IACzD,IAAI,EAAE,wCAAwC;IAC9C,QAAQ,EAAE,SAAS;IACnB,WAAW,EAAE,wCAAwC;IACrD,QAAQ,EAAE;QACR,OAAO,EAAE,YAAY,CAAA,UAAU,OAAO,qCAAqC;KAC5E;IACD,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBAChH,OAAO;gBACT,CAAC;gBAED,IAAI,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;oBAC1E,OAAO;gBACT,CAAC;gBAED,MAAM,eAAe,GAAG,KAAK,CAAC,UAAU,CAAC;gBACzC,KAAI,MAAM,SAAS,IAAI,eAAe,EAAC,CAAC;oBACtC,IAAG,SAAS,CAAC,SAAS,CAAC,IAAI,KAAK,sBAAsB,EAAC,CAAC;wBACtD,OAAO;oBACT,CAAC;gBACH,CAAC;gBAED,OAAO,CAAC,gBAAgB,CAAC;oBACvB,MAAM,EAAE,KAAK;oBACb,MAAM,EAAE;wBACN,KAAK,EAAE,KAAK,CAAC,IAAI;qBAClB;iBACF,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CAEF,CAAC,CAAA"}
1
+ {"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/rules/model.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"operation-inside-interface.d.ts","sourceRoot":"","sources":["../../../src/rules/operation-inside-interface.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,OAAO,EAAsF,MAAM,oBAAoB,CAAC;AAInJ,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,OAAO,QAqBhE;AAED,wBAAgB,6DAA6D,CAAC,OAAO,EAAE,OAAO,QAuC7F;AAED,eAAO,MAAM,qDAAqD;;EAiChE,CAAA"}
1
+ {"version":3,"file":"operation-inside-interface.d.ts","sourceRoot":"","sources":["../../../src/rules/operation-inside-interface.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAA0E,MAAM,oBAAoB,CAAC;AAIrH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,OAAO,QAqBhE;AAED,wBAAgB,6DAA6D,CAAC,OAAO,EAAE,OAAO,QAuC7F;AAED,eAAO,MAAM,qDAAqD;;EAiChE,CAAA"}
@@ -1,8 +1,8 @@
1
1
  import { reportDiagnostic } from "../lib.js";
2
- import { getInterfaceNavigationSourceType, getModelType, isExcludedCoreType, isInterfaceBindingTypeOwned } from "../utils.js";
2
+ import { getInterfaceNavigationSourceType, getTypeModel, isExcludedCoreType, isInterfaceBindingTypeOwned } from "../utils.js";
3
3
  import { createRule, getLocationContext, navigateTypesInNamespace, paramMessage } from "@typespec/compiler";
4
4
  import { GetDeclaredNamespaces } from "../entities/namespace.js";
5
- import { isGlobalOperation } from "../index.js";
5
+ import { isAction, isFunction, isGlobalOperation } from "../index.js";
6
6
  export function validateOperationInsideInterface(program) {
7
7
  for (const namespace of GetDeclaredNamespaces(program)) {
8
8
  navigateTypesInNamespace(namespace, {
@@ -37,10 +37,10 @@ export function validateOperationsShouldNotBeAddedToInterfaceWithPartialTypes(pr
37
37
  }
38
38
  if (!isInterfaceBindingTypeOwned(program, theInterface)) {
39
39
  const operations = [...theInterface.operations].map(([_, theOperation]) => {
40
- if (theOperation.decorators.some(decorator => { var _a, _b; return ((_a = decorator.definition) === null || _a === void 0 ? void 0 : _a.name) !== "@function" && ((_b = decorator.definition) === null || _b === void 0 ? void 0 : _b.name) !== "@action"; })) {
41
- return theOperation;
40
+ if (isFunction(program, theOperation) || isAction(program, theOperation)) {
41
+ return null;
42
42
  }
43
- return null;
43
+ return theOperation;
44
44
  }).filter(theOperation => theOperation !== null)
45
45
  .filter(operation => !isGlobalOperation(program, operation));
46
46
  if (operations.length > 0) {
@@ -72,13 +72,13 @@ export const getPutPostAndPatchOperationsShouldHaveSelectDecorator = createRule(
72
72
  if (isExcludedCoreType(context.program, operation)) {
73
73
  return;
74
74
  }
75
- const modelType = getModelType(operation.returnType);
75
+ const typeModel = getTypeModel(context.program, operation.returnType);
76
76
  if (operation.decorators.some(decorator => {
77
77
  var _a, _b, _c, _d;
78
78
  return ((_a = decorator.definition) === null || _a === void 0 ? void 0 : _a.name) === "@get" ||
79
79
  ((_b = decorator.definition) === null || _b === void 0 ? void 0 : _b.name) === "@put" ||
80
80
  ((_c = decorator.definition) === null || _c === void 0 ? void 0 : _c.name) === "@post" ||
81
- (((_d = decorator.definition) === null || _d === void 0 ? void 0 : _d.name) === "@patch" && modelType && modelType.name !== "EmptyResponse");
81
+ (((_d = decorator.definition) === null || _d === void 0 ? void 0 : _d.name) === "@patch" && typeModel && typeModel.name !== "EmptyResponse");
82
82
  })) {
83
83
  if (!operation.decorators.some(decorator => { var _a; return ((_a = decorator.definition) === null || _a === void 0 ? void 0 : _a.name) === "@select"; })) {
84
84
  context.reportDiagnostic({
@@ -1 +1 @@
1
- {"version":3,"file":"operation-inside-interface.js","sourceRoot":"","sources":["../../../src/rules/operation-inside-interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAyB,gCAAgC,EAAE,YAAY,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AACrJ,OAAO,EAA6B,UAAU,EAAE,kBAAkB,EAAc,wBAAwB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACnJ,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,UAAU,gCAAgC,CAAC,OAAgB;IAC/D,KAAK,MAAM,SAAS,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;QACvD,wBAAwB,CAAC,SAAS,EAAE;YAClC,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE;gBACvB,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;oBACxB,OAAO;gBACT,CAAC;gBAED,IAAI,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;oBAC3C,OAAO;gBACT,CAAC;gBAED,gBAAgB,CAAC,OAAO,EAAE;oBACxB,IAAI,EAAE,8BAA8B;oBACpC,MAAM,EAAE,SAAS;oBACjB,SAAS,EAAE,WAAW;oBACtB,MAAM,EAAE,EAAE;iBACX,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAAA,CAAC;AAEF,MAAM,UAAU,6DAA6D,CAAC,OAAgB;IAC5F,KAAK,MAAM,SAAS,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;QACvD,wBAAwB,CAAC,SAAS,EAAE;YAClC,SAAS,EAAE,CAAC,YAAY,EAAE,EAAE;;gBAC1B,IAAI,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC;oBAC9C,OAAO;gBACT,CAAC;gBAED,IAAG,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,IAAI,KAAK,SAAS,EAAC,CAAC;oBAC/D,OAAO;gBACT,CAAC;gBAED,IAAG,CAAC,2BAA2B,CAAC,OAAO,EAAE,YAAY,CAAC,EACtD,CAAC;oBACC,MAAM,UAAU,GAAG,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,GAAG,CACjD,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,EAAE;wBACpB,IAAG,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,eAAC,OAAA,CAAA,MAAA,SAAS,CAAC,UAAU,0CAAE,IAAI,MAAK,WAAW,IAAI,CAAA,MAAA,SAAS,CAAC,UAAU,0CAAE,IAAI,MAAK,SAAS,CAAA,EAAA,CAAC,EAAC,CAAC;4BACpI,OAAO,YAAY,CAAC;wBACtB,CAAC;wBACD,OAAO,IAAI,CAAC;oBACd,CAAC,CACF,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,KAAK,IAAI,CAAC;yBAC9C,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,OAAO,EAAE,SAAU,CAAC,CAAC,CAAC;oBAE9D,IAAG,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACzB,gBAAgB,CAAC,OAAO,EAAE;4BACxB,IAAI,EAAE,kBAAkB;4BACxB,MAAM,EAAE,YAAY;4BACpB,SAAS,EAAE,iCAAiC;4BAC5C,MAAM,EAAE;gCACN,SAAS,EAAE,YAAY,CAAC,IAAI;gCAC5B,IAAI,EAAE,CAAA,MAAA,gCAAgC,CAAC,OAAO,EAAE,YAAY,CAAC,0CAAE,IAAI,KAAI,EAAE;6BAC1E;yBACF,CAAC,CAAA;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,qDAAqD,GAAG,UAAU,CAAC;IAC9E,IAAI,EAAE,4DAA4D;IAClE,QAAQ,EAAE,SAAS;IACnB,WAAW,EAAE,2FAA2F;IACxG,QAAQ,EAAE;QACR,OAAO,EAAE,YAAY,CAAA,cAAc,WAAW,yCAAyC;KACxF;IACD,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE;gBACvB,IAAI,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;oBACnD,OAAO;gBACT,CAAC;gBAED,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;gBAErD,IAAG,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;;oBACvC,OAAA,CAAA,MAAA,SAAS,CAAC,UAAU,0CAAE,IAAI,MAAK,MAAM;wBACrC,CAAA,MAAA,SAAS,CAAC,UAAU,0CAAE,IAAI,MAAK,MAAM;wBACrC,CAAA,MAAA,SAAS,CAAC,UAAU,0CAAE,IAAI,MAAK,OAAO;wBACtC,CAAC,CAAA,MAAA,SAAS,CAAC,UAAU,0CAAE,IAAI,MAAK,QAAQ,IAAI,SAAS,IAAK,SAAmB,CAAC,IAAI,KAAK,eAAe,CAAC,CAAA;iBAAA,CAAC,EAAC,CAAC;oBAC1G,IAAG,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,SAAS,CAAC,UAAU,0CAAE,IAAI,MAAK,SAAS,CAAA,EAAA,CAAC,EAAC,CAAC;wBACpF,OAAO,CAAC,gBAAgB,CAAC;4BACvB,MAAM,EAAE,SAAS;4BACjB,MAAM,EAAE;gCACN,SAAS,EAAE,SAAS,CAAC,IAAI;6BAC1B;yBACF,CAAC,CAAA;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;SACF,CAAA;IACH,CAAC;CACF,CAAC,CAAA"}
1
+ {"version":3,"file":"operation-inside-interface.js","sourceRoot":"","sources":["../../../src/rules/operation-inside-interface.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { navigateTypesInNamespace, walkPropertiesInherited } from "@typespec/compiler";
2
2
  import { getOperationVerb } from "@typespec/http";
3
- import { getOrderBy, isContains, isOrderBy, isReferences } from "../index.js";
4
- import { isTypeCollection } from "../utils.js";
3
+ import { getOrderBy, isOrderBy } from "../index.js";
4
+ import { isNavigationProperty, isTypeCollection } from "../utils.js";
5
5
  import { reportDiagnostic } from "../lib.js";
6
6
  import { getNavigationSourceType } from "../utils.js";
7
7
  import { GetDeclaredNamespaces } from "../entities/namespace.js";
@@ -47,7 +47,7 @@ export function validateOrderByOnlyNonNavigationProperties(program) {
47
47
  }
48
48
  const modelType = returnType.indexer ? returnType.indexer.value : returnType;
49
49
  const nonNavigationProperties = [...walkPropertiesInherited(modelType)]
50
- .filter((property) => !isContains(program, property) && !isReferences(program, property))
50
+ .filter((property) => !isNavigationProperty(program, property))
51
51
  .map((property) => property.name);
52
52
  const invalidOrderBys = ordered.filter((property) => !nonNavigationProperties.includes(property));
53
53
  if (!invalidOrderBys.length) {
@@ -1 +1 @@
1
- {"version":3,"file":"order-by.js","sourceRoot":"","sources":["../../../src/rules/order-by.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"order-by.js","sourceRoot":"","sources":["../../../src/rules/order-by.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"ownerless.d.ts","sourceRoot":"","sources":["../../../src/rules/ownerless.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAiD,MAAM,oBAAoB,CAAC;AAO9G;;GAEG;AAEH,wBAAgB,yEAAyE,CAAC,OAAO,EAAE,OAAO,QAqBzG;AAED,wBAAgB,0EAA0E,CAAC,OAAO,EAAE,OAAO,QA2B1G;AAED,wBAAgB,kDAAkD,CAAC,OAAO,EAAE,OAAO,QAalF;AAED,wBAAgB,iDAAiD,CAAC,OAAO,EAAE,OAAO,QAcjF;AAED,wBAAgB,6CAA6C,CAAC,OAAO,EAAE,OAAO,QAc7E;AAED,wBAAgB,uEAAuE,CAAC,OAAO,EAAE,OAAO,QAkBvG"}
1
+ {"version":3,"file":"ownerless.d.ts","sourceRoot":"","sources":["../../../src/rules/ownerless.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAiD,MAAM,oBAAoB,CAAC;AAO9G;;GAEG;AAEH,wBAAgB,yEAAyE,CAAC,OAAO,EAAE,OAAO,QAqBzG;AAED,wBAAgB,0EAA0E,CAAC,OAAO,EAAE,OAAO,QAwB1G;AAED,wBAAgB,kDAAkD,CAAC,OAAO,EAAE,OAAO,QAalF;AAED,wBAAgB,iDAAiD,CAAC,OAAO,EAAE,OAAO,QAcjF;AAED,wBAAgB,6CAA6C,CAAC,OAAO,EAAE,OAAO,QAc7E;AAED,wBAAgB,uEAAuE,CAAC,OAAO,EAAE,OAAO,QAkBvG"}
@@ -1,6 +1,6 @@
1
1
  import { getLocationContext, navigateTypesInNamespace, } from "@typespec/compiler";
2
- import { getGraphRoutePaths, hasIsOwner, isComplex, isContains, isOwnerless, isReferences } from "../index.js";
3
- import { getInterfaceNavigationSourceType } from "../utils.js";
2
+ import { getGraphRoutePaths, hasIsOwner, isComplex, isOwnerless } from "../index.js";
3
+ import { getInterfaceNavigationSourceType, isNavigationProperty } from "../utils.js";
4
4
  import { reportDiagnostic } from "../lib.js";
5
5
  import { GetDeclaredNamespaces, getNavigationSources } from "../entities/namespace.js";
6
6
  /***
@@ -39,10 +39,7 @@ export function validateOwnerlessEntityModelReferencedMustOnlyHaveNavigationProp
39
39
  if (bindingType) {
40
40
  const bindingTypeProperties = [...bindingType.properties];
41
41
  bindingTypeProperties.forEach(([_, property]) => {
42
- if (isContains(program, property)) {
43
- return;
44
- }
45
- if (isReferences(program, property)) {
42
+ if (isNavigationProperty(program, property)) {
46
43
  return;
47
44
  }
48
45
  if (property.type.kind === "Model" && isComplex(program, property.type)) {
@@ -1 +1 @@
1
- {"version":3,"file":"ownerless.js","sourceRoot":"","sources":["../../../src/rules/ownerless.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ownerless.js","sourceRoot":"","sources":["../../../src/rules/ownerless.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"required-for-create.d.ts","sourceRoot":"","sources":["../../../src/rules/required-for-create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,OAAO,EAA4B,MAAM,oBAAoB,CAAC;AAI9E,wBAAgB,iCAAiC,CAAC,OAAO,EAAE,OAAO,QAuCjE"}
1
+ {"version":3,"file":"required-for-create.d.ts","sourceRoot":"","sources":["../../../src/rules/required-for-create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,OAAO,EAA4B,MAAM,oBAAoB,CAAC;AAI9E,wBAAgB,iCAAiC,CAAC,OAAO,EAAE,OAAO,QAsCjE"}
@@ -1,5 +1,5 @@
1
- import { isComputed, isContains, isReferences, isRequiredForCreate } from "../index.js";
2
- import { getIdForType, isTypeNullable } from "../utils.js";
1
+ import { isComputed, isRequiredForCreate } from "../index.js";
2
+ import { getIdForType, isNavigationProperty, isTypeNullable } from "../utils.js";
3
3
  import { getOperationVerb } from "@typespec/http";
4
4
  import { navigateTypesInNamespace } from "@typespec/compiler";
5
5
  import { reportDiagnostic } from "../lib.js";
@@ -18,10 +18,9 @@ export function validateRequiredRequestParameters(program) {
18
18
  [...model.properties].forEach(([_, property]) => {
19
19
  if (!(isRequiredForCreate(program, property) ||
20
20
  isTypeNullable(program, property.type) ||
21
- isReferences(program, property) ||
22
- isContains(program, property) ||
21
+ isNavigationProperty(program, property) ||
23
22
  isComputed(program, property) ||
24
- property.default)) {
23
+ property.defaultValue)) {
25
24
  reportDiagnostic(program, {
26
25
  code: "element-missing-dependencies",
27
26
  target: property,
@@ -1 +1 @@
1
- {"version":3,"file":"required-for-create.js","sourceRoot":"","sources":["../../../src/rules/required-for-create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAkB,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,MAAM,UAAU,iCAAiC,CAAC,OAAgB;IAChE,KAAK,MAAM,SAAS,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;QACvD,wBAAwB,CAAC,SAAS,EAAE;YAClC,SAAS,EAAE,CAAC,YAAY,EAAE,EAAE;gBAC1B,MAAM,cAAc,GAAG,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC;qBAChD,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC;qBAClC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,MAAM,CAAC,CAAC;gBAE1E,cAAc,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;oBACnC,IAAI,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;wBAChD,MAAM,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBACzD,MAAM,KAAK,GAAU,IAAK,CAAC,IAAI,CAAC;wBAChC,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,EAAE;4BAC9C,IACE,CAAC,CACC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC;gCACtC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC;gCACtC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC;gCAC/B,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC;gCAC7B,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC;gCAC7B,QAAQ,CAAC,OAAO,CACjB,EACD,CAAC;gCACD,gBAAgB,CAAC,OAAO,EAAE;oCACxB,IAAI,EAAE,8BAA8B;oCACpC,MAAM,EAAE,QAAQ;oCAChB,SAAS,EAAE,2BAA2B;oCACtC,MAAM,EAAE;wCACN,QAAQ,EAAE,QAAQ,CAAC,IAAI;wCACvB,KAAK,EAAE,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAM,CAAC;qCAC9C;iCACF,CAAC,CAAC;4BACL,CAAC;wBACH,CAAC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"required-for-create.js","sourceRoot":"","sources":["../../../src/rules/required-for-create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAkB,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,MAAM,UAAU,iCAAiC,CAAC,OAAgB;IAChE,KAAK,MAAM,SAAS,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;QACvD,wBAAwB,CAAC,SAAS,EAAE;YAClC,SAAS,EAAE,CAAC,YAAY,EAAE,EAAE;gBAC1B,MAAM,cAAc,GAAG,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC;qBAChD,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC;qBAClC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,MAAM,CAAC,CAAC;gBAE1E,cAAc,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;oBACnC,IAAI,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;wBAChD,MAAM,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBACzD,MAAM,KAAK,GAAU,IAAK,CAAC,IAAI,CAAC;wBAChC,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,EAAE;4BAC9C,IACE,CAAC,CACC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC;gCACtC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC;gCACtC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC;gCACvC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC;gCAC7B,QAAQ,CAAC,YAAY,CACtB,EACD,CAAC;gCACD,gBAAgB,CAAC,OAAO,EAAE;oCACxB,IAAI,EAAE,8BAA8B;oCACpC,MAAM,EAAE,QAAQ;oCAChB,SAAS,EAAE,2BAA2B;oCACtC,MAAM,EAAE;wCACN,QAAQ,EAAE,QAAQ,CAAC,IAAI;wCACvB,KAAK,EAAE,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAM,CAAC;qCAC9C;iCACF,CAAC,CAAC;4BACL,CAAC;wBACH,CAAC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
@@ -55,7 +55,7 @@ export declare function isExcludedCoreType(program: Program, type: Model | Scala
55
55
  export declare function isExcludedLibraryType(program: Program, type: Model | Scalar | Operation | ModelProperty | Interface | Namespace | Enum): boolean;
56
56
  export declare function isNavigationProperty(program: Program, property: ModelProperty): boolean;
57
57
  export declare function isNavigationSource(theInterface: Interface): boolean;
58
- export declare function isTopLevelNavigationSource(program: Program, theInterface: MsGraphInterface): boolean;
58
+ export declare function isTopLevelNavigationSource(theInterface: MsGraphInterface): boolean;
59
59
  export declare function getInterfaceNavigationSourceType(program: Program, theInterface: Interface): Model | undefined;
60
60
  export declare function getNavigationSourceType(program: Program, operation: Operation): Model | undefined;
61
61
  /**
@@ -96,5 +96,5 @@ export declare function removeTrailingSlash(path: string): string;
96
96
  export declare function isEqual<T>(obj1: T, obj2: T): boolean;
97
97
  export declare function checkFunctionOverloadsWithReturnType(operation1: MsGraphOperation, operation2: MsGraphOperation): boolean;
98
98
  export declare function checkFunctionOverloads(operation1: MsGraphOperation, operation2: MsGraphOperation): boolean;
99
- export declare function getModelType(type: Type): Model | undefined;
99
+ export declare function getTypeModel(program: Program, type: Type, structuralPropertiesOnly?: boolean): Model | undefined;
100
100
  //# sourceMappingURL=utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}