@microsoft/typespec-msgraph 0.0.1-Preview.20 → 0.0.1-Preview.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/components/entity-container-element.d.ts.map +1 -1
- package/dist/src/components/entity-container-element.js +6 -2
- package/dist/src/components/entity-container-element.js.map +1 -1
- package/dist/src/components/property-element.js +1 -1
- package/dist/src/components/property-element.js.map +1 -1
- package/dist/src/components/schema-element.d.ts.map +1 -1
- package/dist/src/components/schema-element.js +4 -1
- package/dist/src/components/schema-element.js.map +1 -1
- package/dist/src/decorators/abstract.d.ts +2 -0
- package/dist/src/decorators/abstract.d.ts.map +1 -1
- package/dist/src/decorators/abstract.js +2 -0
- package/dist/src/decorators/abstract.js.map +1 -1
- package/dist/src/decorators/action.d.ts +2 -0
- package/dist/src/decorators/action.d.ts.map +1 -1
- package/dist/src/decorators/action.js +2 -0
- package/dist/src/decorators/action.js.map +1 -1
- package/dist/src/decorators/additional-query-parameters.d.ts +2 -0
- package/dist/src/decorators/additional-query-parameters.d.ts.map +1 -1
- package/dist/src/decorators/additional-query-parameters.js +2 -0
- package/dist/src/decorators/additional-query-parameters.js.map +1 -1
- package/dist/src/decorators/address-url-msa.d.ts +2 -0
- package/dist/src/decorators/address-url-msa.d.ts.map +1 -1
- package/dist/src/decorators/address-url-msa.js +2 -0
- package/dist/src/decorators/address-url-msa.js.map +1 -1
- package/dist/src/decorators/ags-attribute.d.ts +2 -2
- package/dist/src/decorators/ags-attribute.d.ts.map +1 -1
- package/dist/src/decorators/ags-attribute.js +22 -19
- package/dist/src/decorators/ags-attribute.js.map +1 -1
- package/dist/src/decorators/contains.d.ts +2 -0
- package/dist/src/decorators/contains.d.ts.map +1 -1
- package/dist/src/decorators/contains.js +2 -0
- package/dist/src/decorators/contains.js.map +1 -1
- package/dist/src/decorators/deprecated-definition.d.ts +2 -0
- package/dist/src/decorators/deprecated-definition.d.ts.map +1 -1
- package/dist/src/decorators/deprecated-definition.js.map +1 -1
- package/dist/src/decorators/expand.d.ts +2 -0
- package/dist/src/decorators/expand.d.ts.map +1 -1
- package/dist/src/decorators/expand.js +2 -0
- package/dist/src/decorators/expand.js.map +1 -1
- package/dist/src/decorators/experimental.d.ts +2 -0
- package/dist/src/decorators/experimental.d.ts.map +1 -1
- package/dist/src/decorators/experimental.js +2 -0
- package/dist/src/decorators/experimental.js.map +1 -1
- package/dist/src/decorators/flags.d.ts +2 -0
- package/dist/src/decorators/flags.d.ts.map +1 -1
- package/dist/src/decorators/flags.js +2 -0
- package/dist/src/decorators/flags.js.map +1 -1
- package/dist/src/decorators/function.d.ts +2 -0
- package/dist/src/decorators/function.d.ts.map +1 -1
- package/dist/src/decorators/function.js +2 -0
- package/dist/src/decorators/function.js.map +1 -1
- package/dist/src/decorators/global-operation.d.ts +2 -0
- package/dist/src/decorators/global-operation.d.ts.map +1 -1
- package/dist/src/decorators/global-operation.js +2 -0
- package/dist/src/decorators/global-operation.js.map +1 -1
- package/dist/src/decorators/graph-deprecated.d.ts +2 -0
- package/dist/src/decorators/graph-deprecated.d.ts.map +1 -1
- package/dist/src/decorators/graph-deprecated.js +2 -0
- package/dist/src/decorators/graph-deprecated.js.map +1 -1
- package/dist/src/decorators/graph-route.d.ts +2 -0
- package/dist/src/decorators/graph-route.d.ts.map +1 -1
- package/dist/src/decorators/graph-route.js +33 -1
- package/dist/src/decorators/graph-route.js.map +1 -1
- package/dist/src/decorators/immutable.d.ts +2 -0
- package/dist/src/decorators/immutable.d.ts.map +1 -1
- package/dist/src/decorators/immutable.js +2 -0
- package/dist/src/decorators/immutable.js.map +1 -1
- package/dist/src/decorators/is-owner.d.ts +2 -0
- package/dist/src/decorators/is-owner.d.ts.map +1 -1
- package/dist/src/decorators/is-owner.js +2 -0
- package/dist/src/decorators/is-owner.js.map +1 -1
- package/dist/src/decorators/limited-charset.d.ts +2 -0
- package/dist/src/decorators/limited-charset.d.ts.map +1 -1
- package/dist/src/decorators/limited-charset.js +2 -0
- package/dist/src/decorators/limited-charset.js.map +1 -1
- package/dist/src/decorators/media.d.ts +2 -0
- package/dist/src/decorators/media.d.ts.map +1 -1
- package/dist/src/decorators/media.js +2 -0
- package/dist/src/decorators/media.js.map +1 -1
- package/dist/src/decorators/open.d.ts +2 -0
- package/dist/src/decorators/open.d.ts.map +1 -1
- package/dist/src/decorators/open.js +2 -0
- package/dist/src/decorators/open.js.map +1 -1
- package/dist/src/decorators/operation-parameters.d.ts +2 -0
- package/dist/src/decorators/operation-parameters.d.ts.map +1 -1
- package/dist/src/decorators/operation-parameters.js +2 -0
- package/dist/src/decorators/operation-parameters.js.map +1 -1
- package/dist/src/decorators/ownerless.d.ts +2 -0
- package/dist/src/decorators/ownerless.d.ts.map +1 -1
- package/dist/src/decorators/ownerless.js +2 -0
- package/dist/src/decorators/ownerless.js.map +1 -1
- package/dist/src/decorators/passthrough-address-url-msa.d.ts +2 -0
- package/dist/src/decorators/passthrough-address-url-msa.d.ts.map +1 -1
- package/dist/src/decorators/passthrough-address-url-msa.js +2 -0
- package/dist/src/decorators/passthrough-address-url-msa.js.map +1 -1
- package/dist/src/decorators/passthrough-address-url.d.ts +2 -0
- package/dist/src/decorators/passthrough-address-url.d.ts.map +1 -1
- package/dist/src/decorators/passthrough-address-url.js +2 -0
- package/dist/src/decorators/passthrough-address-url.js.map +1 -1
- package/dist/src/decorators/private-preview.d.ts +2 -2
- package/dist/src/decorators/private-preview.d.ts.map +1 -1
- package/dist/src/decorators/private-preview.js.map +1 -1
- package/dist/src/decorators/privileged.d.ts +2 -0
- package/dist/src/decorators/privileged.d.ts.map +1 -1
- package/dist/src/decorators/privileged.js +2 -0
- package/dist/src/decorators/privileged.js.map +1 -1
- package/dist/src/decorators/read-only.d.ts +2 -0
- package/dist/src/decorators/read-only.d.ts.map +1 -1
- package/dist/src/decorators/read-only.js +2 -0
- package/dist/src/decorators/read-only.js.map +1 -1
- package/dist/src/decorators/reference-target.d.ts +1 -0
- package/dist/src/decorators/reference-target.d.ts.map +1 -1
- package/dist/src/decorators/reference-target.js +1 -0
- package/dist/src/decorators/reference-target.js.map +1 -1
- package/dist/src/decorators/references.d.ts +2 -0
- package/dist/src/decorators/references.d.ts.map +1 -1
- package/dist/src/decorators/references.js +2 -0
- package/dist/src/decorators/references.js.map +1 -1
- package/dist/src/decorators/return-source.d.ts +2 -0
- package/dist/src/decorators/return-source.d.ts.map +1 -1
- package/dist/src/decorators/return-source.js +2 -0
- package/dist/src/decorators/return-source.js.map +1 -1
- package/dist/src/decorators/select.d.ts +2 -0
- package/dist/src/decorators/select.d.ts.map +1 -1
- package/dist/src/decorators/select.js +2 -0
- package/dist/src/decorators/select.js.map +1 -1
- package/dist/src/decorators/workload-name-msa.d.ts +2 -0
- package/dist/src/decorators/workload-name-msa.d.ts.map +1 -1
- package/dist/src/decorators/workload-name-msa.js +2 -0
- package/dist/src/decorators/workload-name-msa.js.map +1 -1
- package/dist/src/decorators/workload-name.d.ts +2 -0
- package/dist/src/decorators/workload-name.d.ts.map +1 -1
- package/dist/src/decorators/workload-name.js +2 -0
- package/dist/src/decorators/workload-name.js.map +1 -1
- package/dist/src/decorators/workload-namespace.d.ts +2 -0
- package/dist/src/decorators/workload-namespace.d.ts.map +1 -1
- package/dist/src/decorators/workload-namespace.js +2 -0
- package/dist/src/decorators/workload-namespace.js.map +1 -1
- package/dist/src/decorators/write-only.d.ts +2 -0
- package/dist/src/decorators/write-only.d.ts.map +1 -1
- package/dist/src/decorators/write-only.js +2 -0
- package/dist/src/decorators/write-only.js.map +1 -1
- package/dist/src/entities/annotations.d.ts.map +1 -1
- package/dist/src/entities/annotations.js +6 -6
- package/dist/src/entities/annotations.js.map +1 -1
- package/dist/src/entities/entity-container.d.ts +3 -0
- package/dist/src/entities/entity-container.d.ts.map +1 -1
- package/dist/src/entities/entity-container.js +3 -0
- package/dist/src/entities/entity-container.js.map +1 -1
- package/dist/src/entities/enum.js +3 -3
- package/dist/src/entities/enum.js.map +1 -1
- package/dist/src/entities/model.d.ts +1 -0
- package/dist/src/entities/model.d.ts.map +1 -1
- package/dist/src/entities/model.js +37 -30
- package/dist/src/entities/model.js.map +1 -1
- package/dist/src/entities/ms-graph-route.d.ts.map +1 -1
- package/dist/src/entities/ms-graph-route.js +4 -7
- package/dist/src/entities/ms-graph-route.js.map +1 -1
- package/dist/src/entities/namespace.d.ts +11 -0
- package/dist/src/entities/namespace.d.ts.map +1 -1
- package/dist/src/entities/namespace.js +146 -13
- package/dist/src/entities/namespace.js.map +1 -1
- package/dist/src/entities/operation.d.ts +5 -0
- package/dist/src/entities/operation.d.ts.map +1 -1
- package/dist/src/entities/operation.js +59 -3
- package/dist/src/entities/operation.js.map +1 -1
- package/dist/src/entities/revision-definition.d.ts +2 -2
- package/dist/src/entities/revision-definition.d.ts.map +1 -1
- package/dist/src/entities/revision-definition.js +14 -3
- package/dist/src/entities/revision-definition.js.map +1 -1
- package/dist/src/lib.d.ts +4 -0
- package/dist/src/lib.d.ts.map +1 -1
- package/dist/src/lib.js +3 -1
- package/dist/src/lib.js.map +1 -1
- package/dist/src/linter.d.ts.map +1 -1
- package/dist/src/linter.js +9 -2
- package/dist/src/linter.js.map +1 -1
- package/dist/src/rules/delta.d.ts.map +1 -1
- package/dist/src/rules/delta.js +6 -7
- package/dist/src/rules/delta.js.map +1 -1
- package/dist/src/rules/expand.d.ts.map +1 -1
- package/dist/src/rules/expand.js +0 -3
- package/dist/src/rules/expand.js.map +1 -1
- package/dist/src/rules/filter.js +7 -7
- package/dist/src/rules/filter.js.map +1 -1
- package/dist/src/rules/function.d.ts +1 -0
- package/dist/src/rules/function.d.ts.map +1 -1
- package/dist/src/rules/function.js +39 -0
- package/dist/src/rules/function.js.map +1 -1
- package/dist/src/rules/graph-route.d.ts +1 -0
- package/dist/src/rules/graph-route.d.ts.map +1 -1
- package/dist/src/rules/graph-route.js +72 -1
- package/dist/src/rules/graph-route.js.map +1 -1
- package/dist/src/rules/operation-inside-interface.d.ts +3 -0
- package/dist/src/rules/operation-inside-interface.d.ts.map +1 -1
- package/dist/src/rules/operation-inside-interface.js +36 -2
- package/dist/src/rules/operation-inside-interface.js.map +1 -1
- package/dist/src/rules/record-t.d.ts +6 -0
- package/dist/src/rules/record-t.d.ts.map +1 -1
- package/dist/src/rules/record-t.js +48 -1
- package/dist/src/rules/record-t.js.map +1 -1
- package/dist/src/utils.d.ts +19 -3
- package/dist/src/utils.d.ts.map +1 -1
- package/dist/src/utils.js +202 -31
- package/dist/src/utils.js.map +1 -1
- package/dist/src/validate.d.ts.map +1 -1
- package/dist/src/validate.js +2 -0
- package/dist/src/validate.js.map +1 -1
- package/lib/decorators.tsp +1 -1
- package/lib/shared-models.tsp +5 -0
- package/package.json +3 -4
package/dist/src/lib.d.ts
CHANGED
|
@@ -64,6 +64,8 @@ export declare const reportDiagnostic: <C extends "decorator-missing-dependencie
|
|
|
64
64
|
readonly entityAndComplexAreMutuallyExclusive: import("@typespec/compiler").CallableMessage<[string]>;
|
|
65
65
|
readonly filterPropertiesShouldBeSimple: import("@typespec/compiler").CallableMessage<[string, string]>;
|
|
66
66
|
readonly navigationPropertyShouldBeTargettedWithOneInterface: import("@typespec/compiler").CallableMessage<[string]>;
|
|
67
|
+
readonly graphRouteMustMatchModelStructure: import("@typespec/compiler").CallableMessage<[string, string]>;
|
|
68
|
+
readonly overloadedFunctionReturnTypesMustBeSame: import("@typespec/compiler").CallableMessage<[string, string]>;
|
|
67
69
|
};
|
|
68
70
|
"singleton-invalid-name": {
|
|
69
71
|
readonly default: import("@typespec/compiler").CallableMessage<[string]>;
|
|
@@ -141,6 +143,8 @@ export declare const reportDiagnostic: <C extends "decorator-missing-dependencie
|
|
|
141
143
|
readonly entityAndComplexAreMutuallyExclusive: import("@typespec/compiler").CallableMessage<[string]>;
|
|
142
144
|
readonly filterPropertiesShouldBeSimple: import("@typespec/compiler").CallableMessage<[string, string]>;
|
|
143
145
|
readonly navigationPropertyShouldBeTargettedWithOneInterface: import("@typespec/compiler").CallableMessage<[string]>;
|
|
146
|
+
readonly graphRouteMustMatchModelStructure: import("@typespec/compiler").CallableMessage<[string, string]>;
|
|
147
|
+
readonly overloadedFunctionReturnTypesMustBeSame: import("@typespec/compiler").CallableMessage<[string, string]>;
|
|
144
148
|
};
|
|
145
149
|
"singleton-invalid-name": {
|
|
146
150
|
readonly default: import("@typespec/compiler").CallableMessage<[string]>;
|
package/dist/src/lib.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,YAAY,CAAC;AAEnC,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAeD,eAAO,MAAQ,gBAAgB
|
|
1
|
+
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,YAAY,CAAC;AAEnC,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAeD,eAAO,MAAQ,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAqGpB,CAAC"}
|
package/dist/src/lib.js
CHANGED
|
@@ -84,6 +84,8 @@ export const { reportDiagnostic } = createTypeSpecLibrary({
|
|
|
84
84
|
entityAndComplexAreMutuallyExclusive: paramMessage `The @entity and @complex decorators are mutually exclusive and cannot be used together on "${"model"}" model.`,
|
|
85
85
|
filterPropertiesShouldBeSimple: paramMessage `The property "${"property"}" defined in the @filter decorator must be a simple property in the model "${"model"}".`,
|
|
86
86
|
navigationPropertyShouldBeTargettedWithOneInterface: paramMessage `The navigation properties "${"models"}" should not be targetted by more than one interface with @delta. Please choose one interface for each navigation property.`,
|
|
87
|
+
graphRouteMustMatchModelStructure: paramMessage `The @graphRoute "${"graphRoute"}" must match a navigation path in the model "${"model"}".`,
|
|
88
|
+
overloadedFunctionReturnTypesMustBeSame: paramMessage `The return types "${"returnTypes"}" of the overloaded function "${"operation"}" must be identical.`,
|
|
87
89
|
},
|
|
88
90
|
},
|
|
89
91
|
"singleton-invalid-name": {
|
|
@@ -106,7 +108,7 @@ export const { reportDiagnostic } = createTypeSpecLibrary({
|
|
|
106
108
|
recordTypeCannotBePrepopulated: paramMessage `The record type "${"type"}" cannot be prepopulated.`,
|
|
107
109
|
recordTypeCannotBeNull: paramMessage `The record type "${"type"}" cannot be null.`,
|
|
108
110
|
recordTypeCannotBeUsedInLine: paramMessage `Using inline record as type on ${"type"} is not supported. Create a complex entity to represent it.`,
|
|
109
|
-
interfaceWithPartialBindingType: paramMessage `The interface "${"interface"}" targets a partial type "${"type"}" and as such cannot declare operations.`,
|
|
111
|
+
interfaceWithPartialBindingType: paramMessage `The interface "${"interface"}" targets a partial or non-owned type "${"type"}" and as such cannot declare operations.`,
|
|
110
112
|
}
|
|
111
113
|
}
|
|
112
114
|
},
|
package/dist/src/lib.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"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"}
|
package/dist/src/linter.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linter.d.ts","sourceRoot":"","sources":["../../src/linter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"linter.d.ts","sourceRoot":"","sources":["../../src/linter.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,OAAO,+CAoBlB,CAAA"}
|
package/dist/src/linter.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import { defineLinter } from "@typespec/compiler";
|
|
2
|
-
import { modelShouldBeEntityOrComplexType, singletonOrEntitySetHostingBindingsShouldExist, useEvolvableEnumRule, mediaTypeValuesShouldBeMinimallyFormattedForMIMETypes, interfaceNavigationSourceShouldHaveMediaIf$ValueIsSpecified } from "./rules/index.js";
|
|
2
|
+
import { modelShouldBeEntityOrComplexType, singletonOrEntitySetHostingBindingsShouldExist, useEvolvableEnumRule, mediaTypeValuesShouldBeMinimallyFormattedForMIMETypes, interfaceNavigationSourceShouldHaveMediaIf$ValueIsSpecified, getPutPostAndPatchOperationsShouldHaveSelectDecorator, useRecordTypeInsteadOfDictionary, dictionaryTypeIsMostlyUsedWithRecordType } from "./rules/index.js";
|
|
3
3
|
export const $linter = defineLinter({
|
|
4
|
-
rules: [useEvolvableEnumRule, singletonOrEntitySetHostingBindingsShouldExist,
|
|
4
|
+
rules: [useEvolvableEnumRule, singletonOrEntitySetHostingBindingsShouldExist,
|
|
5
|
+
modelShouldBeEntityOrComplexType, mediaTypeValuesShouldBeMinimallyFormattedForMIMETypes,
|
|
6
|
+
interfaceNavigationSourceShouldHaveMediaIf$ValueIsSpecified, getPutPostAndPatchOperationsShouldHaveSelectDecorator,
|
|
7
|
+
useRecordTypeInsteadOfDictionary, dictionaryTypeIsMostlyUsedWithRecordType
|
|
8
|
+
],
|
|
5
9
|
ruleSets: {
|
|
6
10
|
recommended: {
|
|
7
11
|
enable: {
|
|
@@ -10,6 +14,9 @@ export const $linter = defineLinter({
|
|
|
10
14
|
[`@microsoft/typespec-msgraph/${modelShouldBeEntityOrComplexType.name}`]: true,
|
|
11
15
|
[`@microsoft/typespec-msgraph/${mediaTypeValuesShouldBeMinimallyFormattedForMIMETypes.name}`]: true,
|
|
12
16
|
[`@microsoft/typespec-msgraph/${interfaceNavigationSourceShouldHaveMediaIf$ValueIsSpecified.name}`]: true,
|
|
17
|
+
[`@microsoft/typespec-msgraph/${getPutPostAndPatchOperationsShouldHaveSelectDecorator.name}`]: true,
|
|
18
|
+
[`@microsoft/typespec-msgraph/${useRecordTypeInsteadOfDictionary.name}`]: true,
|
|
19
|
+
[`@microsoft/typespec-msgraph/${dictionaryTypeIsMostlyUsedWithRecordType.name}`]: true,
|
|
13
20
|
},
|
|
14
21
|
},
|
|
15
22
|
}
|
package/dist/src/linter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linter.js","sourceRoot":"","sources":["../../src/linter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gCAAgC,EAAE,8CAA8C,
|
|
1
|
+
{"version":3,"file":"linter.js","sourceRoot":"","sources":["../../src/linter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gCAAgC,EAAE,8CAA8C,EACvF,oBAAoB,EAAE,qDAAqD,EAC3E,2DAA2D,EAAE,qDAAqD,EAClH,gCAAgC,EAAE,wCAAwC,EAC1E,MAAM,kBAAkB,CAAC;AAE3B,MAAM,CAAC,MAAM,OAAO,GAAG,YAAY,CAAC;IAClC,KAAK,EAAE,CAAC,oBAAoB,EAAE,8CAA8C;QAC1E,gCAAgC,EAAE,qDAAqD;QACvF,2DAA2D,EAAE,qDAAqD;QAClH,gCAAgC,EAAE,wCAAwC;KAC3E;IACD,QAAQ,EAAE;QACR,WAAW,EAAE;YACX,MAAM,EAAE;gBACN,CAAC,+BAA+B,oBAAoB,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBAClE,CAAC,+BAA+B,8CAA8C,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBAC5F,CAAC,+BAA+B,gCAAgC,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBAC9E,CAAC,+BAA+B,qDAAqD,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBACnG,CAAC,+BAA+B,2DAA2D,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBACzG,CAAC,+BAA+B,qDAAqD,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBACnG,CAAC,+BAA+B,gCAAgC,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBAC9E,CAAC,+BAA+B,wCAAwC,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;aACvF;SACF;KACF;CACF,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delta.d.ts","sourceRoot":"","sources":["../../../src/rules/delta.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,OAAO,
|
|
1
|
+
{"version":3,"file":"delta.d.ts","sourceRoot":"","sources":["../../../src/rules/delta.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,OAAO,EAA0D,MAAM,oBAAoB,CAAC;AAOjJ,wBAAgB,kDAAkD,CAAC,OAAO,EAAE,OAAO,QAmBlF;AAED,wBAAgB,uCAAuC,CAAC,OAAO,EAAE,OAAO,QAkBvE;AAED,wBAAgB,qEAAqE,CAAC,OAAO,EAAE,OAAO,QAwBrG;AAED,wBAAgB,4DAA4D,CAAC,OAAO,EAAE,OAAO,QA2B5F;AAED,wBAAgB,2DAA2D,CAAC,OAAO,EAAE,OAAO,QAiC3F;AAED,wBAAgB,kEAAkE,CAAC,OAAO,EAAE,OAAO,QA8BlG"}
|
package/dist/src/rules/delta.js
CHANGED
|
@@ -2,7 +2,7 @@ import { getPropertyType, navigateTypesInNamespace } from "@typespec/compiler";
|
|
|
2
2
|
import { GetDeclaredNamespaces } from "../entities/namespace.js";
|
|
3
3
|
import { isDelta, isEntity, isFunction } from "../index.js";
|
|
4
4
|
import { reportDiagnostic } from "../lib.js";
|
|
5
|
-
import { extractTypesFromUnion, filterMapByIdenticalValues, getNavigationSourceType, getSourceInterfaces, isCollection, isNavigationProperty } from "../utils.js";
|
|
5
|
+
import { extractTypesFromUnion, filterMapByIdenticalValues, getInterfaceNavigationSourceType, getNavigationSourceType, getSourceInterfaces, isCollection, isNavigationProperty } from "../utils.js";
|
|
6
6
|
import { getOperationVerb } from "@typespec/http";
|
|
7
7
|
export function validateDeltaCanOnlyBeAppliedToFunctionsNamedDelta(program) {
|
|
8
8
|
for (const namespace of GetDeclaredNamespaces(program)) {
|
|
@@ -130,17 +130,16 @@ export function validateNavigationPropertyShouldBeTargettedByOneInterfaceWithDel
|
|
|
130
130
|
const deltaInterfacesWithSameNavigationSource = getInterfacesWithNavigationSources(program, namespace.interfaces);
|
|
131
131
|
const allRepeatedNavigationSources = [...deltaInterfacesWithSameNavigationSource.values()];
|
|
132
132
|
// Get all navigation properties that are used in the models
|
|
133
|
-
const navigationPropertyTypes =
|
|
133
|
+
const navigationPropertyTypes = getNavigationProperties(program, namespace);
|
|
134
134
|
// Check if the navigation source type is used as a navigation property in the models and add them to a list to report all at once
|
|
135
135
|
let modelPropertiesToReport = [];
|
|
136
136
|
for (let i = 0; i < navigationPropertyTypes.length; i++) {
|
|
137
|
-
if (allRepeatedNavigationSources.includes(navigationPropertyTypes[i].name)) {
|
|
137
|
+
if (allRepeatedNavigationSources.includes(navigationPropertyTypes[i].type.name)) {
|
|
138
138
|
modelPropertiesToReport.push(navigationPropertyTypes[i].name);
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
141
|
modelPropertiesToReport = [...new Set(modelPropertiesToReport)];
|
|
142
142
|
if (modelPropertiesToReport.length > 0) {
|
|
143
|
-
console.log("reporting");
|
|
144
143
|
reportDiagnostic(program, {
|
|
145
144
|
code: "decorator-invalid-use",
|
|
146
145
|
target: navigationPropertyTypes.find((model) => model.name === modelPropertiesToReport[0]), // Because we cannot target more than one at a time
|
|
@@ -152,14 +151,14 @@ export function validateNavigationPropertyShouldBeTargettedByOneInterfaceWithDel
|
|
|
152
151
|
}
|
|
153
152
|
}
|
|
154
153
|
}
|
|
155
|
-
function
|
|
154
|
+
function getNavigationProperties(program, namespace) {
|
|
156
155
|
const modelsInNamespace = [...namespace.models].map(([_, model]) => model);
|
|
157
156
|
const allModelProperties = modelsInNamespace.flatMap((model) => model.properties);
|
|
158
157
|
let navigationPropertyTypes = [];
|
|
159
158
|
for (const properties of allModelProperties) {
|
|
160
159
|
for (const [_, property] of properties) {
|
|
161
160
|
if (isNavigationProperty(program, property) && getPropertyType(property).kind === "Model") {
|
|
162
|
-
navigationPropertyTypes.push(property
|
|
161
|
+
navigationPropertyTypes.push((property));
|
|
163
162
|
}
|
|
164
163
|
}
|
|
165
164
|
}
|
|
@@ -171,7 +170,7 @@ function getInterfacesWithNavigationSources(program, interfaces) {
|
|
|
171
170
|
const theOperations = theInterface.operations;
|
|
172
171
|
for (const [_, theOperation] of theOperations) {
|
|
173
172
|
if (isDelta(program, theOperation)) {
|
|
174
|
-
const navigationSourceType =
|
|
173
|
+
const navigationSourceType = getInterfaceNavigationSourceType(program, theInterface);
|
|
175
174
|
if (navigationSourceType) {
|
|
176
175
|
interfacesWithNavigationSourceType.set(theInterface, navigationSourceType.name);
|
|
177
176
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delta.js","sourceRoot":"","sources":["../../../src/rules/delta.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"delta.js","sourceRoot":"","sources":["../../../src/rules/delta.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expand.d.ts","sourceRoot":"","sources":["../../../src/rules/expand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,OAAO,EAAqD,MAAM,oBAAoB,CAAC;AAOvG,wBAAgB,uCAAuC,CAAC,OAAO,EAAE,OAAO,QA8BvE;AAED,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"expand.d.ts","sourceRoot":"","sources":["../../../src/rules/expand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,OAAO,EAAqD,MAAM,oBAAoB,CAAC;AAOvG,wBAAgB,uCAAuC,CAAC,OAAO,EAAE,OAAO,QA8BvE;AAED,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,OAAO,QAyCtE"}
|
package/dist/src/rules/expand.js
CHANGED
|
@@ -45,9 +45,6 @@ export function validateExpandOnlyNavigationProperties(program) {
|
|
|
45
45
|
if (!returnType) {
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
48
|
-
if (isDelta(program, operation) && operation.name === "delta") {
|
|
49
|
-
return;
|
|
50
|
-
}
|
|
51
48
|
const modelType = returnType.indexer ? returnType.indexer.value : returnType;
|
|
52
49
|
const navigationProperties = [...walkPropertiesInherited(modelType)]
|
|
53
50
|
.filter((property) => isContains(program, property) || isReferences(program, property))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expand.js","sourceRoot":"","sources":["../../../src/rules/expand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AACvG,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,MAAM,UAAU,uCAAuC,CAAC,OAAgB;IACtE,KAAK,MAAM,SAAS,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;QACvD,wBAAwB,CAAC,SAAS,EAAE;YAClC,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE;gBACvB,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;oBAClC,OAAO;gBACT,CAAC;gBAED,IAAI,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,KAAK,EAAE,CAAC;oBACnD,IAAG,uBAAuB,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;wBAC7D,OAAO;oBACT,CAAC;gBACH,CAAC;gBAED,IAAG,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,EAAC,CAAC;oBAC5D,OAAO;gBACT,CAAC;gBAED,gBAAgB,CAAC,OAAO,EAAE;oBACxB,IAAI,EAAE,uBAAuB;oBAC7B,MAAM,EAAE,SAAS;oBACjB,SAAS,EAAE,WAAW;oBACtB,MAAM,EAAE;wBACN,SAAS,EAAE,SAAS;wBACpB,MAAM,EAAE,eAAe;qBACxB;iBACF,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAAA,CAAC;AAEF,MAAM,UAAU,sCAAsC,CAAC,OAAgB;IACrE,KAAK,MAAM,SAAS,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;QACvD,wBAAwB,CAAC,SAAS,EAAE;YAClC,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE;gBACvB,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gBAC/C,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;oBACrB,OAAO;gBACT,CAAC;gBAED,MAAM,UAAU,GAAG,uBAAuB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gBAC/D,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,OAAO;gBACT,CAAC;gBAED,
|
|
1
|
+
{"version":3,"file":"expand.js","sourceRoot":"","sources":["../../../src/rules/expand.ts"],"names":[],"mappings":"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"}
|
package/dist/src/rules/filter.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getFilter, isDelta, isFilter } from "../index.js";
|
|
2
2
|
import { getOperationVerb } from "@typespec/http";
|
|
3
|
-
import {
|
|
3
|
+
import { getModelStructuralPropertyNames, getNavigationSourceType, isNavigationProperty, isTypeCollection } from "../utils.js";
|
|
4
4
|
import { reportDiagnostic } from "../lib.js";
|
|
5
5
|
import { getPropertyType, navigateTypesInNamespace, walkPropertiesInherited } from "@typespec/compiler";
|
|
6
6
|
import { GetDeclaredNamespaces } from "../entities/namespace.js";
|
|
@@ -74,13 +74,13 @@ export function validateFilterOnlyAppliesToModelProperties(program) {
|
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
76
76
|
const model = returnType.indexer ? returnType.indexer.value : returnType;
|
|
77
|
-
const
|
|
78
|
-
const
|
|
79
|
-
const
|
|
80
|
-
if (!
|
|
77
|
+
const filterPropertyNames = getFilter(program, operation);
|
|
78
|
+
const structuralPropertyNames = getModelStructuralPropertyNames(program, model);
|
|
79
|
+
const invalidFilterPropertyNames = filterPropertyNames.filter(p => !structuralPropertyNames.includes(p));
|
|
80
|
+
if (!invalidFilterPropertyNames.length) {
|
|
81
81
|
return;
|
|
82
82
|
}
|
|
83
|
-
if (
|
|
83
|
+
if (invalidFilterPropertyNames.length === 1 && invalidFilterPropertyNames[0] === "*") {
|
|
84
84
|
return;
|
|
85
85
|
}
|
|
86
86
|
reportDiagnostic(program, {
|
|
@@ -89,7 +89,7 @@ export function validateFilterOnlyAppliesToModelProperties(program) {
|
|
|
89
89
|
messageId: "filterProperties",
|
|
90
90
|
format: {
|
|
91
91
|
model: model.name,
|
|
92
|
-
properties:
|
|
92
|
+
properties: invalidFilterPropertyNames.join(", "),
|
|
93
93
|
},
|
|
94
94
|
});
|
|
95
95
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/rules/filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/rules/filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../../src/rules/function.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../../src/rules/function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,OAAO,EAAwC,MAAM,oBAAoB,CAAC;AAO9F,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,QAqBpD;AAED,wBAAgB,oDAAoD,CAAC,OAAO,EAAE,OAAO,QAwCpF"}
|
|
@@ -2,6 +2,8 @@ import { isVoidType, navigateTypesInNamespace } from "@typespec/compiler";
|
|
|
2
2
|
import { isFunction } from "../index.js";
|
|
3
3
|
import { reportDiagnostic } from "../lib.js";
|
|
4
4
|
import { GetDeclaredNamespaces } from "../entities/namespace.js";
|
|
5
|
+
import { GetMsGraphOperations, getFunctionOperationsAndOtherOperations, getGroupedOverloadedFunctions } from "../entities/operation.js";
|
|
6
|
+
import { checkFunctionOverloads } from "../utils.js";
|
|
5
7
|
export function validateVoidFunction(program) {
|
|
6
8
|
for (const namespace of GetDeclaredNamespaces(program)) {
|
|
7
9
|
navigateTypesInNamespace(namespace, {
|
|
@@ -23,4 +25,41 @@ export function validateVoidFunction(program) {
|
|
|
23
25
|
}
|
|
24
26
|
}
|
|
25
27
|
;
|
|
28
|
+
export function validateOverloadedFunctionReturnTypesMustBeIdentical(program) {
|
|
29
|
+
for (const namespace of GetDeclaredNamespaces(program)) {
|
|
30
|
+
const operations = GetMsGraphOperations(program, namespace.interfaces);
|
|
31
|
+
const { functionOperations } = getFunctionOperationsAndOtherOperations(operations);
|
|
32
|
+
const groupedOverloadedFunctions = getGroupedOverloadedFunctions(functionOperations);
|
|
33
|
+
const invalidReturnTypes = new Map();
|
|
34
|
+
groupedOverloadedFunctions.forEach(overloadedFunctions => {
|
|
35
|
+
for (let i = 0; i < overloadedFunctions.length; i++) {
|
|
36
|
+
for (let j = i + 1; j < overloadedFunctions.length; j++) {
|
|
37
|
+
if (checkFunctionOverloads(overloadedFunctions[i], overloadedFunctions[j])) {
|
|
38
|
+
const returnType1 = overloadedFunctions[i].ReturnTypeName;
|
|
39
|
+
const returnType2 = overloadedFunctions[j].ReturnTypeName;
|
|
40
|
+
if (returnType1 !== returnType2) {
|
|
41
|
+
invalidReturnTypes.set(returnType1, namespace.operations.get(overloadedFunctions[i].Name));
|
|
42
|
+
invalidReturnTypes.set(returnType2, namespace.operations.get(overloadedFunctions[j].Name));
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
if (invalidReturnTypes.size > 0) {
|
|
47
|
+
const invalidReturnTypesArray = Array.from(invalidReturnTypes.keys());
|
|
48
|
+
const operations = [...namespace.interfaces].flatMap(([_, $interface]) => [...$interface.operations]);
|
|
49
|
+
const target = operations.find(([_, operation]) => operation.name === overloadedFunctions[i].Name)[1];
|
|
50
|
+
reportDiagnostic(program, {
|
|
51
|
+
code: "decorator-invalid-use",
|
|
52
|
+
target: target,
|
|
53
|
+
messageId: "overloadedFunctionReturnTypesMustBeSame",
|
|
54
|
+
format: {
|
|
55
|
+
returnTypes: invalidReturnTypesArray.join(", "),
|
|
56
|
+
operation: target.name
|
|
57
|
+
},
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
invalidReturnTypes.clear();
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
}
|
|
26
65
|
//# sourceMappingURL=function.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/rules/function.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/rules/function.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,4 +11,5 @@ export declare function validateGraphRouteAndInterfaceExtendsMatchForCollections
|
|
|
11
11
|
export declare function validateGraphRouteInterfaceExtendsGraphStandardInterface(program: Program): void;
|
|
12
12
|
export declare function validateDuplicateGraphRoutesNotAllowed(program: Program): void;
|
|
13
13
|
export declare function validateGraphRouteParametersMustBeUnique(program: Program): void;
|
|
14
|
+
export declare function validateGraphRouteMustMatchModelStructureWithRespectToNavigationProperties(program: Program): void;
|
|
14
15
|
//# sourceMappingURL=graph-route.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph-route.d.ts","sourceRoot":"","sources":["../../../src/rules/graph-route.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwB,OAAO,EAAkC,MAAM,oBAAoB,CAAC;AAInG;;GAEG;AAEH,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,OAAO,QAW9D;AAyBD,wBAAgB,oDAAoD,CAAC,OAAO,EAAE,OAAO,QAWpF;AAqDD,wBAAgB,wDAAwD,CAAC,OAAO,EAAE,OAAO,QA2BxF;AAeD;;GAEG;AACH,wBAAgB,wDAAwD,CAAC,OAAO,EAAE,OAAO,QA0BxF;AAED,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,OAAO,QAwBtE;AAgBD,wBAAgB,wCAAwC,CAAC,OAAO,EAAE,OAAO,QA6BxE"}
|
|
1
|
+
{"version":3,"file":"graph-route.d.ts","sourceRoot":"","sources":["../../../src/rules/graph-route.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwB,OAAO,EAAkC,MAAM,oBAAoB,CAAC;AAInG;;GAEG;AAEH,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,OAAO,QAW9D;AAyBD,wBAAgB,oDAAoD,CAAC,OAAO,EAAE,OAAO,QAWpF;AAqDD,wBAAgB,wDAAwD,CAAC,OAAO,EAAE,OAAO,QA2BxF;AAeD;;GAEG;AACH,wBAAgB,wDAAwD,CAAC,OAAO,EAAE,OAAO,QA0BxF;AAED,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,OAAO,QAwBtE;AAgBD,wBAAgB,wCAAwC,CAAC,OAAO,EAAE,OAAO,QA6BxE;AAED,wBAAgB,0EAA0E,CAAC,OAAO,EAAE,OAAO,QAsC1G"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { reportDiagnostic } from "../lib.js";
|
|
2
2
|
import { extractParamsFromPath, getGraphRoutePaths, getGraphRoutes, hasGraphRoute } from "../index.js";
|
|
3
3
|
import { navigateTypesInNamespace } from "@typespec/compiler";
|
|
4
|
-
import { getIdForType, getSourceInterfaces } from "../utils.js";
|
|
4
|
+
import { getAllNestedNavigationPaths, getIdForType, getSourceInterfaces, removeRoutePathParams } from "../utils.js";
|
|
5
5
|
import { GetDeclaredNamespaces } from "../entities/namespace.js";
|
|
6
6
|
/**
|
|
7
7
|
* @graphRoute should not have a leading forward slash
|
|
@@ -222,4 +222,75 @@ export function validateGraphRouteParametersMustBeUnique(program) {
|
|
|
222
222
|
});
|
|
223
223
|
}
|
|
224
224
|
}
|
|
225
|
+
export function validateGraphRouteMustMatchModelStructureWithRespectToNavigationProperties(program) {
|
|
226
|
+
for (const namespace of GetDeclaredNamespaces(program)) {
|
|
227
|
+
navigateTypesInNamespace(namespace, {
|
|
228
|
+
interface: ($interface) => {
|
|
229
|
+
if (!hasGraphRoute(program, $interface)) {
|
|
230
|
+
return;
|
|
231
|
+
}
|
|
232
|
+
const graphRoutePaths = getGraphRoutePaths(program, $interface);
|
|
233
|
+
graphRoutePaths.forEach(graphRoutePath => {
|
|
234
|
+
if (removeRoutePathParams(graphRoutePath).split("/").length === 1) {
|
|
235
|
+
return;
|
|
236
|
+
}
|
|
237
|
+
const entitySegment = getEntitySegment(graphRoutePath);
|
|
238
|
+
const structuralPath = getStructuralPathFromGraphRoute(entitySegment, graphRoutePath);
|
|
239
|
+
const models = namespace.models;
|
|
240
|
+
const routeModel = models.get(entitySegment);
|
|
241
|
+
if (routeModel) {
|
|
242
|
+
const structuralProperties = getAllNestedNavigationPaths(program, routeModel);
|
|
243
|
+
if (!structuralProperties.includes(structuralPath)) {
|
|
244
|
+
reportDiagnostic(program, {
|
|
245
|
+
code: "decorator-invalid-use",
|
|
246
|
+
target: $interface,
|
|
247
|
+
messageId: "graphRouteMustMatchModelStructure",
|
|
248
|
+
format: {
|
|
249
|
+
graphRoute: graphRoutePath,
|
|
250
|
+
model: routeModel.name,
|
|
251
|
+
}
|
|
252
|
+
});
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
});
|
|
256
|
+
}
|
|
257
|
+
});
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
/**
|
|
261
|
+
* This function removes the composable function pattern from the path
|
|
262
|
+
* accessReviews/{reviewId}/instances/{instanceId}/decisions/filterByCurrentUser(string) -> accessReviews/{reviewId}/instances/{instanceId}/decisions
|
|
263
|
+
* @param path
|
|
264
|
+
* @returns
|
|
265
|
+
*/
|
|
266
|
+
const removeComposableFunctionPattern = (path) => {
|
|
267
|
+
const pattern = /\/[^/]+(\((?:[^]*|\([^()]*\))*\))/g;
|
|
268
|
+
if (pattern.test(path)) {
|
|
269
|
+
return path.replace(pattern, '');
|
|
270
|
+
}
|
|
271
|
+
return path;
|
|
272
|
+
};
|
|
273
|
+
function getStructuralPathFromGraphRoute(entitySegment, graphRoutePath) {
|
|
274
|
+
let structuralPath = entitySegment.concat("/", removeRoutePathParams(graphRoutePath).split("/").slice(1).join("/"));
|
|
275
|
+
structuralPath = removeTrailingRef(structuralPath);
|
|
276
|
+
structuralPath = removeComposableFunctionPattern(structuralPath);
|
|
277
|
+
return structuralPath;
|
|
278
|
+
}
|
|
279
|
+
function removeTrailingRef(path) {
|
|
280
|
+
if (path.endsWith("/$ref")) {
|
|
281
|
+
return path.slice(0, -5);
|
|
282
|
+
}
|
|
283
|
+
return path;
|
|
284
|
+
}
|
|
285
|
+
function getEntitySegment(graphRoutePath) {
|
|
286
|
+
const routeWithoutParams = removeRoutePathParams(graphRoutePath);
|
|
287
|
+
const pathParts = routeWithoutParams.split("/");
|
|
288
|
+
return removeLastOccurrenceOfSCharacter(pathParts[0]);
|
|
289
|
+
}
|
|
290
|
+
function removeLastOccurrenceOfSCharacter(path) {
|
|
291
|
+
if (path.endsWith("s")) {
|
|
292
|
+
path = path.slice(0, -1);
|
|
293
|
+
}
|
|
294
|
+
return path;
|
|
295
|
+
}
|
|
225
296
|
//# sourceMappingURL=graph-route.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph-route.js","sourceRoot":"","sources":["../../../src/rules/graph-route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACvG,OAAO,EAAuC,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AACnG,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"graph-route.js","sourceRoot":"","sources":["../../../src/rules/graph-route.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { Program } from "@typespec/compiler";
|
|
2
2
|
export declare function validateOperationInsideInterface(program: Program): void;
|
|
3
3
|
export declare function validateOperationsShouldNotBeAddedToInterfaceWithPartialTypes(program: Program): void;
|
|
4
|
+
export declare const getPutPostAndPatchOperationsShouldHaveSelectDecorator: import("@typespec/compiler").LinterRuleDefinition<"get-put-post-patch-operations-should-have-select-decorator", {
|
|
5
|
+
readonly default: import("@typespec/compiler").CallableMessage<[string]>;
|
|
6
|
+
}>;
|
|
4
7
|
//# sourceMappingURL=operation-inside-interface.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation-inside-interface.d.ts","sourceRoot":"","sources":["../../../src/rules/operation-inside-interface.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
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,6 +1,6 @@
|
|
|
1
1
|
import { reportDiagnostic } from "../lib.js";
|
|
2
|
-
import { getInterfaceNavigationSourceType, isExcludedCoreType, isInterfaceBindingTypeOwned } from "../utils.js";
|
|
3
|
-
import { getLocationContext, navigateTypesInNamespace } from "@typespec/compiler";
|
|
2
|
+
import { getInterfaceNavigationSourceType, getModelType, isExcludedCoreType, isInterfaceBindingTypeOwned } from "../utils.js";
|
|
3
|
+
import { createRule, getLocationContext, navigateTypesInNamespace, paramMessage } from "@typespec/compiler";
|
|
4
4
|
import { GetDeclaredNamespaces } from "../entities/namespace.js";
|
|
5
5
|
import { isGlobalOperation } from "../index.js";
|
|
6
6
|
export function validateOperationInsideInterface(program) {
|
|
@@ -59,4 +59,38 @@ export function validateOperationsShouldNotBeAddedToInterfaceWithPartialTypes(pr
|
|
|
59
59
|
});
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
|
+
export const getPutPostAndPatchOperationsShouldHaveSelectDecorator = createRule({
|
|
63
|
+
name: "get-put-post-patch-operations-should-have-select-decorator",
|
|
64
|
+
severity: "warning",
|
|
65
|
+
description: "Get, Put, Post and Patch(if it returns a response) operations must be marked with @select",
|
|
66
|
+
messages: {
|
|
67
|
+
default: paramMessage `Operation '${"operation"}' must be marked with @select decorator`,
|
|
68
|
+
},
|
|
69
|
+
create(context) {
|
|
70
|
+
return {
|
|
71
|
+
operation: (operation) => {
|
|
72
|
+
if (isExcludedCoreType(context.program, operation)) {
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
const modelType = getModelType(operation.returnType);
|
|
76
|
+
if (operation.decorators.some(decorator => {
|
|
77
|
+
var _a, _b, _c, _d;
|
|
78
|
+
return ((_a = decorator.definition) === null || _a === void 0 ? void 0 : _a.name) === "@get" ||
|
|
79
|
+
((_b = decorator.definition) === null || _b === void 0 ? void 0 : _b.name) === "@put" ||
|
|
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");
|
|
82
|
+
})) {
|
|
83
|
+
if (!operation.decorators.some(decorator => { var _a; return ((_a = decorator.definition) === null || _a === void 0 ? void 0 : _a.name) === "@select"; })) {
|
|
84
|
+
context.reportDiagnostic({
|
|
85
|
+
target: operation,
|
|
86
|
+
format: {
|
|
87
|
+
operation: operation.name,
|
|
88
|
+
}
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
});
|
|
62
96
|
//# sourceMappingURL=operation-inside-interface.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"operation-inside-interface.js","sourceRoot":"","sources":["../../../src/rules/operation-inside-interface.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,4 +2,10 @@ import { Program } from "@typespec/compiler";
|
|
|
2
2
|
export declare function validateRecordsCannotBePrepopulated(program: Program): void;
|
|
3
3
|
export declare function validateRecordTypeCannotBeNull(program: Program): void;
|
|
4
4
|
export declare function validateRecordTypeCannotBeUsedInLine(program: Program): void;
|
|
5
|
+
export declare const useRecordTypeInsteadOfDictionary: import("@typespec/compiler").LinterRuleDefinition<"use-record-type-instead-of-dictionary", {
|
|
6
|
+
readonly default: import("@typespec/compiler").CallableMessage<[]>;
|
|
7
|
+
}>;
|
|
8
|
+
export declare const dictionaryTypeIsMostlyUsedWithRecordType: import("@typespec/compiler").LinterRuleDefinition<"dictionary-type-is-mostly-used-with-record-type", {
|
|
9
|
+
readonly default: import("@typespec/compiler").CallableMessage<[]>;
|
|
10
|
+
}>;
|
|
5
11
|
//# sourceMappingURL=record-t.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-t.d.ts","sourceRoot":"","sources":["../../../src/rules/record-t.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,OAAO,
|
|
1
|
+
{"version":3,"file":"record-t.d.ts","sourceRoot":"","sources":["../../../src/rules/record-t.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,OAAO,EAA0E,MAAM,oBAAoB,CAAC;AAM5H,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,OAAO,QAyBnE;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,OAAO,QA4B9D;AAED,wBAAgB,oCAAoC,CAAC,OAAO,EAAE,OAAO,QAiBpE;AAED,eAAO,MAAM,gCAAgC;;EAsB3C,CAAA;AAEF,eAAO,MAAM,wCAAwC;;EAsBnD,CAAA"}
|