@microsoft/typespec-msgraph 0.0.1-Preview.6 → 0.0.1-Preview.7

package/dist/src/components/annotations.d.ts

@@ -1,9 +1,9 @@
 import { FC } from "react";
-import { EntitySetAnnotations, SingletonAnnotations } from "../entities/annotations.js";
-export declare const EntitySetAnnotationsList: FC<{
-    elements: Map<string, EntitySetAnnotations>;
+import { CollectionAnnotations, ResourceAnnotations } from "../entities/annotations.js";
+export declare const CollectionAnnotationsList: FC<{
+    elements: Map<string, CollectionAnnotations>;
 }>;
-export declare const SingletonAnnotationsList: FC<{
-    elements: Map<string, SingletonAnnotations>;
+export declare const ResourceAnnotationsList: FC<{
+    elements: Map<string, ResourceAnnotations>;
 }>;
 //# sourceMappingURL=annotations.d.ts.map

package/dist/src/components/annotations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../../src/components/annotations.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAA;AAUjC,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AASxF,eAAO,MAAM,wBAAwB,EAAE,EAAE,CAAC;IAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;CAAE,CAInF,CAAA;AAEN,eAAO,MAAM,wBAAwB,EAAE,EAAE,CAAC;IAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;CAAE,CAInF,CAAA"}
+{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../../src/components/annotations.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAA;AAUjC,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AASxF,eAAO,MAAM,yBAAyB,EAAE,EAAE,CAAC;IAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAA;CAAE,CAIrF,CAAA;AAEN,eAAO,MAAM,uBAAuB,EAAE,EAAE,CAAC;IAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;CAAE,CAIjF,CAAA"}

package/dist/src/components/annotations.js

@@ -9,37 +9,37 @@ import { TopSupportedAnnotation } from "./top-supported-annotation.js";
 import { DescriptionAnnotation } from "./description-annotation.js";
 import { UpdateRestrictionsAnnotation } from "./update-restrictions-annotation.js";
 const AnnotationsElem = (props) => React.createElement("Annotations", props);
-export const EntitySetAnnotationsList = ({ elements }) => React.createElement(ItemList, { items: elements, render: (element) => React.createElement(EntitySetAnnotationsElement, { element: element }) });
-export const SingletonAnnotationsList = ({ elements }) => React.createElement(ItemList, { items: elements, render: (element) => React.createElement(SingletonAnnotationsElement, { element: element }) });
-const EntitySetAnnotationsElement = ({ element, }) => React.createElement(AnnotationsElem, { Target: element.Target },
+export const CollectionAnnotationsList = ({ elements }) => React.createElement(ItemList, { items: elements, render: (element) => React.createElement(CollectionAnnotationsElement, { element: element }) });
+export const ResourceAnnotationsList = ({ elements }) => React.createElement(ItemList, { items: elements, render: (element) => React.createElement(ResourceAnnotationsElement, { element: element }) });
+const CollectionAnnotationsElement = ({ element, }) => React.createElement(AnnotationsElem, { Target: element.Target },
     React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.ReadRestrictions" },
         React.createElement(RecordElement, null,
             React.createElement(PropertyValueElement, { Property: "Readable", Bool: element.HasGetOnCollection }),
             React.createElement(PropertyValueElement, { Property: "ReadByKeyRestrictions" },
                 React.createElement(RecordElement, null,
-                    React.createElement(PropertyValueElement, { Property: "Readable", Bool: element.HasGetOnItem }))))),
+                    React.createElement(PropertyValueElement, { Property: "Readable", Bool: element.HasGetOnResource }))))),
     React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.InsertRestrictions" },
         React.createElement(RecordElement, null,
             React.createElement(PropertyValueElement, { Property: "Insertable", Bool: element.HasPostOnCollection }))),
-    React.createElement(UpdateRestrictionsAnnotation, { hasUpdateOperation: element.HasPatchOnItem }),
+    React.createElement(UpdateRestrictionsAnnotation, { hasUpdateOperation: element.HasPatchOnResource }),
     React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.DeleteRestrictions" },
         React.createElement(RecordElement, null,
-            React.createElement(PropertyValueElement, { Property: "Deletable", Bool: element.HasDeleteOnItem }))),
-    React.createElement(CountRestrictionsAnnotation, { hasCountOperation: element.HasCountOperation }),
-    React.createElement(ExpandRestrictionsAnnotation, { hasExpandOperation: element.HasExpandOperation, nonExpandableProperties: element.NonExpandableProperties }),
-    React.createElement(SearchRestrictionsAnnotation, { hasSearchOperation: element.HasSearchOperation }),
-    React.createElement(SkipSupportedAnnotation, { hasSkipOperation: element.HasSkipOperation }),
-    React.createElement(SortRestrictionsAnnotation, { hasSortOperation: element.HasSortOperation, nonSortableProperties: element.NonSortableProperties }),
-    React.createElement(TopSupportedAnnotation, { hasTopOperation: element.HasTopOperation }),
+            React.createElement(PropertyValueElement, { Property: "Deletable", Bool: element.HasDeleteOnResource }))),
+    React.createElement(CountRestrictionsAnnotation, { hasCountOnCollection: element.HasCountOnCollection }),
+    React.createElement(ExpandRestrictionsAnnotation, { hasExpandOnCollectionOrResource: element.HasExpandOnCollectionOrResource, nonExpandableProperties: element.NonExpandableProperties }),
+    React.createElement(SearchRestrictionsAnnotation, { hasSearchOnCollection: element.HasSearchOnCollection }),
+    React.createElement(SkipSupportedAnnotation, { hasSkipOnCollection: element.HasSkipOnCollection }),
+    React.createElement(SortRestrictionsAnnotation, { hasSortOnCollection: element.HasSortOnCollection, nonSortableProperties: element.NonSortableProperties }),
+    React.createElement(TopSupportedAnnotation, { hasTopOnCollection: element.HasTopOnCollection }),
     React.createElement(DescriptionAnnotation, { description: element.Description }));
-const SingletonAnnotationsElement = ({ element, }) => React.createElement(AnnotationsElem, { Target: element.Target },
+const ResourceAnnotationsElement = ({ element, }) => React.createElement(AnnotationsElem, { Target: element.Target },
     React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.ReadRestrictions" },
         React.createElement(RecordElement, null,
-            React.createElement(PropertyValueElement, { Property: "Readable", Bool: element.HasGetOnItem }))),
-    React.createElement(UpdateRestrictionsAnnotation, { hasUpdateOperation: element.HasPatchOnItem }),
+            React.createElement(PropertyValueElement, { Property: "Readable", Bool: element.HasGetOnResource }))),
+    React.createElement(UpdateRestrictionsAnnotation, { hasUpdateOperation: element.HasPatchOnResource }),
     React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.DeleteRestrictions" },
         React.createElement(RecordElement, null,
-            React.createElement(PropertyValueElement, { Property: "Deletable", Bool: element.HasDeleteOnItem }))),
-    React.createElement(ExpandRestrictionsAnnotation, { hasExpandOperation: element.HasExpandOperation, nonExpandableProperties: element.NonExpandableProperties }),
+            React.createElement(PropertyValueElement, { Property: "Deletable", Bool: element.HasDeleteOnResource }))),
+    React.createElement(ExpandRestrictionsAnnotation, { hasExpandOnCollectionOrResource: element.HasExpandOnCollectionOrResource, nonExpandableProperties: element.NonExpandableProperties }),
     React.createElement(DescriptionAnnotation, { description: element.Description }));
 //# sourceMappingURL=annotations.js.map

package/dist/src/components/annotations.js.map

@@ -1 +1 @@
-{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../src/components/annotations.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../src/components/annotations.tsx"],"names":[],"mappings":"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"}

package/dist/src/components/count-restrictions-annotation.d.ts

@@ -1,5 +1,5 @@
 import { FC } from "react";
 export declare const CountRestrictionsAnnotation: FC<{
-    hasCountOperation: boolean;
+    hasCountOnCollection: boolean;
 }>;
 //# sourceMappingURL=count-restrictions-annotation.d.ts.map

package/dist/src/components/count-restrictions-annotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"count-restrictions-annotation.d.ts","sourceRoot":"","sources":["../../../src/components/count-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGlC,eAAO,MAAM,2BAA2B,EAAE,EAAE,CAAC;IAAE,iBAAiB,EAAE,OAAO,CAAA;CAAE,CAKrD,CAAA"}
+{"version":3,"file":"count-restrictions-annotation.d.ts","sourceRoot":"","sources":["../../../src/components/count-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGlC,eAAO,MAAM,2BAA2B,EAAE,EAAE,CAAC;IAAE,oBAAoB,EAAE,OAAO,CAAA;CAAE,CAKxD,CAAA"}

package/dist/src/components/count-restrictions-annotation.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { AnnotationElement, PropertyValueElement, RecordElement } from "./common-elements.js";
-export const CountRestrictionsAnnotation = ({ hasCountOperation }) => React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.CountRestrictions" },
+export const CountRestrictionsAnnotation = ({ hasCountOnCollection }) => React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.CountRestrictions" },
     React.createElement(RecordElement, null,
-        React.createElement(PropertyValueElement, { Property: "Countable", Bool: hasCountOperation })));
+        React.createElement(PropertyValueElement, { Property: "Countable", Bool: hasCountOnCollection })));
 //# sourceMappingURL=count-restrictions-annotation.js.map

package/dist/src/components/count-restrictions-annotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"count-restrictions-annotation.js","sourceRoot":"","sources":["../../../src/components/count-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE9F,MAAM,CAAC,MAAM,2BAA2B,GAAuC,CAAC,EAAE,iBAAiB,EAAE,EAAE,EAAE,CACvG,oBAAC,iBAAiB,IAAC,IAAI,EAAC,6CAA6C;IACnE,oBAAC,aAAa;QACZ,oBAAC,oBAAoB,IAAC,QAAQ,EAAC,WAAW,EAAC,IAAI,EAAE,iBAAiB,GAAI,CACxD,CACE,CAAA"}
+{"version":3,"file":"count-restrictions-annotation.js","sourceRoot":"","sources":["../../../src/components/count-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE9F,MAAM,CAAC,MAAM,2BAA2B,GAA0C,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAC7G,oBAAC,iBAAiB,IAAC,IAAI,EAAC,6CAA6C;IACnE,oBAAC,aAAa;QACZ,oBAAC,oBAAoB,IAAC,QAAQ,EAAC,WAAW,EAAC,IAAI,EAAE,oBAAoB,GAAI,CAC3D,CACE,CAAA"}

package/dist/src/components/expand-restrictions-annotation.d.ts

@@ -1,6 +1,6 @@
 import { FC } from "react";
 export declare const ExpandRestrictionsAnnotation: FC<{
-    hasExpandOperation: boolean;
+    hasExpandOnCollectionOrResource: boolean;
     nonExpandableProperties: string[] | undefined;
 }>;
 //# sourceMappingURL=expand-restrictions-annotation.d.ts.map

package/dist/src/components/expand-restrictions-annotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expand-restrictions-annotation.d.ts","sourceRoot":"","sources":["../../../src/components/expand-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGlC,eAAO,MAAM,4BAA4B,EAAE,EAAE,CAAC;IAAE,kBAAkB,EAAE,OAAO,CAAC;IAAC,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;CAAE,CAOpG,CAAA"}
+{"version":3,"file":"expand-restrictions-annotation.d.ts","sourceRoot":"","sources":["../../../src/components/expand-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGlC,eAAO,MAAM,4BAA4B,EAAE,EAAE,CAAC;IAAE,+BAA+B,EAAE,OAAO,CAAC;IAAC,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;CAAE,CAOjH,CAAA"}

package/dist/src/components/expand-restrictions-annotation.js

@@ -1,9 +1,9 @@
 import React from "react";
 import { AnnotationElement, CollectionElement, NavigationPropertyPathElement, PropertyValueElement, RecordElement } from "./common-elements.js";
-export const ExpandRestrictionsAnnotation = ({ hasExpandOperation, nonExpandableProperties }) => React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.ExpandRestrictions" },
+export const ExpandRestrictionsAnnotation = ({ hasExpandOnCollectionOrResource, nonExpandableProperties }) => React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.ExpandRestrictions" },
     React.createElement(RecordElement, null,
-        React.createElement(PropertyValueElement, { Property: "Expandable", Bool: hasExpandOperation }),
-        hasExpandOperation ? React.createElement(NonExpandableProperties, { nonExpandableProperties: nonExpandableProperties }) : React.createElement(React.Fragment, null)));
+        React.createElement(PropertyValueElement, { Property: "Expandable", Bool: hasExpandOnCollectionOrResource }),
+        hasExpandOnCollectionOrResource ? React.createElement(NonExpandableProperties, { nonExpandableProperties: nonExpandableProperties }) : React.createElement(React.Fragment, null)));
 const NonExpandableProperties = ({ nonExpandableProperties }) => React.createElement(PropertyValueElement, { Property: "NonExpandableProperties" },
     React.createElement(CollectionElement, null, nonExpandableProperties === null || nonExpandableProperties === void 0 ? void 0 : nonExpandableProperties.map((property) => (React.createElement(NavigationPropertyPathElement, { key: property },
         React.createElement(React.Fragment, null, property))))));

package/dist/src/components/expand-restrictions-annotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"expand-restrictions-annotation.js","sourceRoot":"","sources":["../../../src/components/expand-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,6BAA6B,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEhJ,MAAM,CAAC,MAAM,4BAA4B,GACrC,CAAC,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,EAAE,EAAE,CACpD,oBAAC,iBAAiB,IAAC,IAAI,EAAC,8CAA8C;IACpE,oBAAC,aAAa;QACZ,oBAAC,oBAAoB,IAAC,QAAQ,EAAC,YAAY,EAAC,IAAI,EAAE,kBAAkB,GAAI;QACtE,kBAAkB,CAAC,CAAC,CAAC,oBAAC,uBAAuB,IAAC,uBAAuB,EAAE,uBAAuB,GAAG,CAAC,CAAC,CAAC,yCAAK,CAC7F,CACE,CAAA;AAExB,MAAM,uBAAuB,GAA0D,CAAC,EAAE,uBAAuB,EAAE,EAAE,EAAE,CACrH,oBAAC,oBAAoB,IAAC,QAAQ,EAAC,yBAAyB;IACtD,oBAAC,iBAAiB,QACf,uBAAuB,aAAvB,uBAAuB,uBAAvB,uBAAuB,CAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAC1C,oBAAC,6BAA6B,IAAC,GAAG,EAAE,QAAQ;QAC1C,0CAAG,QAAQ,CAAI,CACe,CACjC,CAAC,CACgB,CACC,CAAA"}
+{"version":3,"file":"expand-restrictions-annotation.js","sourceRoot":"","sources":["../../../src/components/expand-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,6BAA6B,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEhJ,MAAM,CAAC,MAAM,4BAA4B,GACrC,CAAC,EAAE,+BAA+B,EAAE,uBAAuB,EAAE,EAAE,EAAE,CACjE,oBAAC,iBAAiB,IAAC,IAAI,EAAC,8CAA8C;IACpE,oBAAC,aAAa;QACZ,oBAAC,oBAAoB,IAAC,QAAQ,EAAC,YAAY,EAAC,IAAI,EAAE,+BAA+B,GAAI;QACnF,+BAA+B,CAAC,CAAC,CAAC,oBAAC,uBAAuB,IAAC,uBAAuB,EAAE,uBAAuB,GAAG,CAAC,CAAC,CAAC,yCAAK,CAC1G,CACE,CAAA;AAExB,MAAM,uBAAuB,GAA0D,CAAC,EAAE,uBAAuB,EAAE,EAAE,EAAE,CACrH,oBAAC,oBAAoB,IAAC,QAAQ,EAAC,yBAAyB;IACtD,oBAAC,iBAAiB,QACf,uBAAuB,aAAvB,uBAAuB,uBAAvB,uBAAuB,CAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAC1C,oBAAC,6BAA6B,IAAC,GAAG,EAAE,QAAQ;QAC1C,0CAAG,QAAQ,CAAI,CACe,CACjC,CAAC,CACgB,CACC,CAAA"}

package/dist/src/components/property-element.js

@@ -9,7 +9,7 @@ export const PropertyElement = ({ property }) => property.IsNavigation
     ? React.createElement(NavigationPropertyElement, { property: property })
     : React.createElement(StructuralPropertyElement, { property: property });
 const NavigationPropertyElement = ({ property }) => {
-    return (React.createElement(NavigationProperty, { Name: property.Name, Type: property.PropertyTypeName, ...(property.IsContained ? { ContainsTarget: "true" } : {}), ...property.AgsAttributes },
+    return (React.createElement(NavigationProperty, { Name: property.Name, Type: property.PropertyTypeName, ...(property.IsContained ? { ContainsTarget: "true" } : {}), ...(property.IsNullable ? {} : { Nullable: "false" }), ...property.AgsAttributes },
         React.createElement(RevisionsAnnotation, { definition: property.RevisionDefinition }),
         React.createElement(DescriptionAnnotation, { description: property.Description })));
 };

package/dist/src/components/property-element.js.map

@@ -1 +1 @@
-{"version":3,"file":"property-element.js","sourceRoot":"","sources":["../../../src/components/property-element.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAShE,MAAM,QAAQ,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AAQlF,MAAM,kBAAkB,GAAG,CAAC,KAA8B,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;AAEhH,MAAM,CAAC,MAAM,eAAe,GAA2C,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CACtF,QAAQ,CAAC,YAAY;IACnB,CAAC,CAAC,oBAAC,yBAAyB,IAAC,QAAQ,EAAE,QAAQ,GAAI;IACnD,CAAC,CAAC,oBAAC,yBAAyB,IAAC,QAAQ,EAAE,QAAQ,GAAI,CAAA;AAEvD,MAAM,yBAAyB,GAA2C,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACzF,OAAO,CACL,oBAAC,kBAAkB,IACjB,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,IAAI,EAAE,QAAQ,CAAC,gBAAgB,KAC3B,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACxD,QAAQ,CAAC,aAAa;QAE1B,oBAAC,mBAAmB,IAAC,UAAU,EAAE,QAAQ,CAAC,kBAAkB,GAAI;QAChE,oBAAC,qBAAqB,IAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,GAAI,CACzC,CACtB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAA2C,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACzF,OAAO,CACL,oBAAC,QAAQ,IACP,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,IAAI,EAAE,QAAQ,CAAC,gBAAgB,KAC3B,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,KAClD,QAAQ,CAAC,aAAa;QAE1B,oBAAC,kBAAkB,IAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,GAAI;QACvD,oBAAC,qBAAqB,IAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,GAAI;QAC1D,oBAAC,mBAAmB,IAAC,UAAU,EAAE,QAAQ,CAAC,kBAAkB,GAAI;QAChE,oBAAC,qBAAqB,IAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,GAAI,CACnD,CACZ,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"property-element.js","sourceRoot":"","sources":["../../../src/components/property-element.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAShE,MAAM,QAAQ,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AAQlF,MAAM,kBAAkB,GAAG,CAAC,KAA8B,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;AAEhH,MAAM,CAAC,MAAM,eAAe,GAA2C,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CACtF,QAAQ,CAAC,YAAY;IACnB,CAAC,CAAC,oBAAC,yBAAyB,IAAC,QAAQ,EAAE,QAAQ,GAAI;IACnD,CAAC,CAAC,oBAAC,yBAAyB,IAAC,QAAQ,EAAE,QAAQ,GAAI,CAAA;AAEvD,MAAM,yBAAyB,GAA2C,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACzF,OAAO,CACL,oBAAC,kBAAkB,IACjB,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,IAAI,EAAE,QAAQ,CAAC,gBAAgB,KAC3B,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACxD,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,KAClD,QAAQ,CAAC,aAAa;QAE1B,oBAAC,mBAAmB,IAAC,UAAU,EAAE,QAAQ,CAAC,kBAAkB,GAAI;QAChE,oBAAC,qBAAqB,IAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,GAAI,CACzC,CACtB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAA2C,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACzF,OAAO,CACL,oBAAC,QAAQ,IACP,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,IAAI,EAAE,QAAQ,CAAC,gBAAgB,KAC3B,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,KAClD,QAAQ,CAAC,aAAa;QAE1B,oBAAC,kBAAkB,IAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,GAAI;QACvD,oBAAC,qBAAqB,IAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,GAAI;QAC1D,oBAAC,mBAAmB,IAAC,UAAU,EAAE,QAAQ,CAAC,kBAAkB,GAAI;QAChE,oBAAC,qBAAqB,IAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,GAAI,CACnD,CACZ,CAAC;AACJ,CAAC,CAAC"}

package/dist/src/components/schema-element.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-element.d.ts","sourceRoot":"","sources":["../../../src/components/schema-element.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAKlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAkB5D,eAAO,MAAM,aAAa,EAAE,EAAE,CAAC;IAAE,SAAS,EAAE,gBAAgB,CAAA;CAAE,CAW7D,CAAC"}
+{"version":3,"file":"schema-element.d.ts","sourceRoot":"","sources":["../../../src/components/schema-element.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAKlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAkB5D,eAAO,MAAM,aAAa,EAAE,EAAE,CAAC;IAAE,SAAS,EAAE,gBAAgB,CAAA;CAAE,CAa7D,CAAC"}

package/dist/src/components/schema-element.js

@@ -5,7 +5,7 @@ import { EnumTypeList } from "./enum-type-element.js";
 import { OperationElement } from "./operation-element.js";
 import { EntityTypeElement, ComplexTypeElement } from "./structured-type-element.js";
 import { MsGraphModelKind } from "../entities/model.js";
-import { EntitySetAnnotationsList, SingletonAnnotationsList } from "./annotations.js";
+import { CollectionAnnotationsList, ResourceAnnotationsList } from "./annotations.js";
 const Schema = (props) => React.createElement("Schema", {
     ...props,
     xmlns: "http://docs.oasis-open.org/odata/ns/edm",
@@ -17,8 +17,10 @@ export const SchemaElement = ({ namespace }) => {
         React.createElement(ModelList, { models: namespace.Models }),
         React.createElement(OperationList, { operations: namespace.Operations }),
         React.createElement(EntityContainerElement, { singletons: namespace.Singletons, entitySets: namespace.EntitySets, agsAttributes: namespace.AgsAttributes }),
-        React.createElement(EntitySetAnnotationsList, { elements: namespace.EntitySetAnnotations }),
-        React.createElement(SingletonAnnotationsList, { elements: namespace.SingletonAnnotations })));
+        React.createElement(ResourceAnnotationsList, { elements: namespace.SingletonAnnotations }),
+        React.createElement(CollectionAnnotationsList, { elements: namespace.EntitySetAnnotations }),
+        React.createElement(ResourceAnnotationsList, { elements: namespace.ResourceAnnotations }),
+        React.createElement(CollectionAnnotationsList, { elements: namespace.CollectionAnnotations })));
 };
 const ModelList = ({ models }) => {
     return React.createElement(ItemList, { items: models, render: (model) => {

package/dist/src/components/schema-element.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema-element.js","sourceRoot":"","sources":["../../../src/components/schema-element.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAgB,MAAM,sBAAsB,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAOtF,MAAM,MAAM,GAAG,CAAC,KAAkB,EAAE,EAAE,CACpC,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE;IAC5B,GAAG,KAAK;IACR,KAAK,EAAE,yCAAyC;IAChD,WAAW,EAAE,0CAA0C;CACxD,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,aAAa,GAAwC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;IAClF,OAAO,CACL,oBAAC,MAAM,IAAC,SAAS,EAAE,SAAS,CAAC,IAAI;QAC/B,oBAAC,YAAY,IAAC,QAAQ,EAAE,SAAS,CAAC,KAAK,GAAI;QAC3C,oBAAC,SAAS,IAAC,MAAM,EAAE,SAAS,CAAC,MAAM,GAAI;QACvC,oBAAC,aAAa,IAAC,UAAU,EAAE,SAAS,CAAC,UAAU,GAAI;QACnD,oBAAC,sBAAsB,IAAC,UAAU,EAAE,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,SAAS,CAAC,aAAa,GAAI;QACtI,oBAAC,wBAAwB,IAAC,QAAQ,EAAE,SAAS,CAAC,oBAAoB,GAAI;QACtE,oBAAC,wBAAwB,IAAC,QAAQ,EAAE,SAAS,CAAC,oBAAoB,GAAI,CAC/D,CACV,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAA8C,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;IAC1E,OAAO,oBAAC,QAAQ,IAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YAChD,QAAO,KAAK,CAAC,IAAI,EAAE;gBACjB,KAAK,gBAAgB,CAAC,MAAM,CAAC,CAAC;oBAC5B,OAAO,oBAAC,iBAAiB,IAAC,KAAK,EAAE,KAAK,GAAI,CAAA;iBAC3C;gBACD,KAAK,gBAAgB,CAAC,OAAO,CAAC,CAAC;oBAC7B,OAAO,oBAAC,kBAAkB,IAAC,KAAK,EAAE,KAAK,GAAI,CAAA;iBAC5C;gBACD,OAAO,CAAC,CAAC;oBACP,OAAO,yCAAK,CAAA;iBACb;aACF;QACH,CAAC,GAAI,CAAC;AACR,CAAC,CAAC;AAEF,MAAM,aAAa,GAA2C,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;IAC/E,OAAO,oBAAC,QAAQ,IAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,oBAAC,gBAAgB,IAAC,OAAO,EAAE,SAAS,GAAI,GAAI,CAAA;AACzG,CAAC,CAAC"}
+{"version":3,"file":"schema-element.js","sourceRoot":"","sources":["../../../src/components/schema-element.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAgB,MAAM,sBAAsB,CAAC;AAEtE,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAOtF,MAAM,MAAM,GAAG,CAAC,KAAkB,EAAE,EAAE,CACpC,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE;IAC5B,GAAG,KAAK;IACR,KAAK,EAAE,yCAAyC;IAChD,WAAW,EAAE,0CAA0C;CACxD,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,aAAa,GAAwC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;IAClF,OAAO,CACL,oBAAC,MAAM,IAAC,SAAS,EAAE,SAAS,CAAC,IAAI;QAC/B,oBAAC,YAAY,IAAC,QAAQ,EAAE,SAAS,CAAC,KAAK,GAAI;QAC3C,oBAAC,SAAS,IAAC,MAAM,EAAE,SAAS,CAAC,MAAM,GAAI;QACvC,oBAAC,aAAa,IAAC,UAAU,EAAE,SAAS,CAAC,UAAU,GAAI;QACnD,oBAAC,sBAAsB,IAAC,UAAU,EAAE,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,SAAS,CAAC,aAAa,GAAI;QACtI,oBAAC,uBAAuB,IAAC,QAAQ,EAAE,SAAS,CAAC,oBAAoB,GAAI;QACrE,oBAAC,yBAAyB,IAAC,QAAQ,EAAE,SAAS,CAAC,oBAAoB,GAAI;QACvE,oBAAC,uBAAuB,IAAC,QAAQ,EAAE,SAAS,CAAC,mBAAmB,GAAI;QACpE,oBAAC,yBAAyB,IAAC,QAAQ,EAAE,SAAS,CAAC,qBAAqB,GAAI,CACjE,CACV,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAA8C,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;IAC1E,OAAO,oBAAC,QAAQ,IAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YAChD,QAAO,KAAK,CAAC,IAAI,EAAE;gBACjB,KAAK,gBAAgB,CAAC,MAAM,CAAC,CAAC;oBAC5B,OAAO,oBAAC,iBAAiB,IAAC,KAAK,EAAE,KAAK,GAAI,CAAA;iBAC3C;gBACD,KAAK,gBAAgB,CAAC,OAAO,CAAC,CAAC;oBAC7B,OAAO,oBAAC,kBAAkB,IAAC,KAAK,EAAE,KAAK,GAAI,CAAA;iBAC5C;gBACD,OAAO,CAAC,CAAC;oBACP,OAAO,yCAAK,CAAA;iBACb;aACF;QACH,CAAC,GAAI,CAAC;AACR,CAAC,CAAC;AAEF,MAAM,aAAa,GAA2C,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;IAC/E,OAAO,oBAAC,QAAQ,IAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,oBAAC,gBAAgB,IAAC,OAAO,EAAE,SAAS,GAAI,GAAI,CAAA;AACzG,CAAC,CAAC"}

package/dist/src/components/search-restrictions-annotation.d.ts

@@ -1,5 +1,5 @@
 import { FC } from "react";
 export declare const SearchRestrictionsAnnotation: FC<{
-    hasSearchOperation: boolean;
+    hasSearchOnCollection: boolean;
 }>;
 //# sourceMappingURL=search-restrictions-annotation.d.ts.map

package/dist/src/components/search-restrictions-annotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-restrictions-annotation.d.ts","sourceRoot":"","sources":["../../../src/components/search-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGlC,eAAO,MAAM,4BAA4B,EAAE,EAAE,CAAC;IAAE,kBAAkB,EAAE,OAAO,CAAA;CAAE,CAKvD,CAAA"}
+{"version":3,"file":"search-restrictions-annotation.d.ts","sourceRoot":"","sources":["../../../src/components/search-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGlC,eAAO,MAAM,4BAA4B,EAAE,EAAE,CAAC;IAAE,qBAAqB,EAAE,OAAO,CAAA;CAAE,CAK1D,CAAA"}

package/dist/src/components/search-restrictions-annotation.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { AnnotationElement, PropertyValueElement, RecordElement } from "./common-elements.js";
-export const SearchRestrictionsAnnotation = ({ hasSearchOperation }) => React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.SearchRestrictions" },
+export const SearchRestrictionsAnnotation = ({ hasSearchOnCollection }) => React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.SearchRestrictions" },
     React.createElement(RecordElement, null,
-        React.createElement(PropertyValueElement, { Property: "Searchable", Bool: hasSearchOperation })));
+        React.createElement(PropertyValueElement, { Property: "Searchable", Bool: hasSearchOnCollection })));
 //# sourceMappingURL=search-restrictions-annotation.js.map

package/dist/src/components/search-restrictions-annotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-restrictions-annotation.js","sourceRoot":"","sources":["../../../src/components/search-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE9F,MAAM,CAAC,MAAM,4BAA4B,GAAwC,CAAC,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAC1G,oBAAC,iBAAiB,IAAC,IAAI,EAAC,8CAA8C;IACpE,oBAAC,aAAa;QACZ,oBAAC,oBAAoB,IAAC,QAAQ,EAAC,YAAY,EAAC,IAAI,EAAE,kBAAkB,GAAI,CAC1D,CACE,CAAA"}
+{"version":3,"file":"search-restrictions-annotation.js","sourceRoot":"","sources":["../../../src/components/search-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE9F,MAAM,CAAC,MAAM,4BAA4B,GAA2C,CAAC,EAAE,qBAAqB,EAAE,EAAE,EAAE,CAChH,oBAAC,iBAAiB,IAAC,IAAI,EAAC,8CAA8C;IACpE,oBAAC,aAAa;QACZ,oBAAC,oBAAoB,IAAC,QAAQ,EAAC,YAAY,EAAC,IAAI,EAAE,qBAAqB,GAAI,CAC7D,CACE,CAAA"}

package/dist/src/components/skip-supported-annotation.d.ts

@@ -1,5 +1,5 @@
 import { FC } from "react";
 export declare const SkipSupportedAnnotation: FC<{
-    hasSkipOperation: boolean;
+    hasSkipOnCollection: boolean;
 }>;
 //# sourceMappingURL=skip-supported-annotation.d.ts.map

package/dist/src/components/skip-supported-annotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skip-supported-annotation.d.ts","sourceRoot":"","sources":["../../../src/components/skip-supported-annotation.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGlC,eAAO,MAAM,uBAAuB,EAAE,EAAE,CAAC;IAAE,gBAAgB,EAAE,OAAO,CAAA;CAAE,CACwB,CAAA"}
+{"version":3,"file":"skip-supported-annotation.d.ts","sourceRoot":"","sources":["../../../src/components/skip-supported-annotation.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGlC,eAAO,MAAM,uBAAuB,EAAE,EAAE,CAAC;IAAE,mBAAmB,EAAE,OAAO,CAAA;CAAE,CACwB,CAAA"}

package/dist/src/components/skip-supported-annotation.js

@@ -1,4 +1,4 @@
 import React from "react";
 import { AnnotationElement } from "./common-elements.js";
-export const SkipSupportedAnnotation = ({ hasSkipOperation }) => React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.SkipSupported", Bool: hasSkipOperation });
+export const SkipSupportedAnnotation = ({ hasSkipOnCollection }) => React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.SkipSupported", Bool: hasSkipOnCollection });
 //# sourceMappingURL=skip-supported-annotation.js.map

package/dist/src/components/skip-supported-annotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"skip-supported-annotation.js","sourceRoot":"","sources":["../../../src/components/skip-supported-annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,CAAC,MAAM,uBAAuB,GAAsC,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,CACjG,oBAAC,iBAAiB,IAAC,IAAI,EAAC,yCAAyC,EAAC,IAAI,EAAE,gBAAgB,GAAI,CAAA"}
+{"version":3,"file":"skip-supported-annotation.js","sourceRoot":"","sources":["../../../src/components/skip-supported-annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,CAAC,MAAM,uBAAuB,GAAyC,CAAC,EAAE,mBAAmB,EAAE,EAAE,EAAE,CACvG,oBAAC,iBAAiB,IAAC,IAAI,EAAC,yCAAyC,EAAC,IAAI,EAAE,mBAAmB,GAAI,CAAA"}

package/dist/src/components/sort-restrictions-annotation.d.ts

@@ -1,6 +1,6 @@
 import { FC } from "react";
 export declare const SortRestrictionsAnnotation: FC<{
-    hasSortOperation: boolean;
+    hasSortOnCollection: boolean;
     nonSortableProperties: string[] | undefined;
 }>;
 //# sourceMappingURL=sort-restrictions-annotation.d.ts.map

package/dist/src/components/sort-restrictions-annotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sort-restrictions-annotation.d.ts","sourceRoot":"","sources":["../../../src/components/sort-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGlC,eAAO,MAAM,0BAA0B,EAAE,EAAE,CAAC;IAAE,gBAAgB,EAAE,OAAO,CAAC;IAAC,qBAAqB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;CAAE,CAO9F,CAAA"}
+{"version":3,"file":"sort-restrictions-annotation.d.ts","sourceRoot":"","sources":["../../../src/components/sort-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGlC,eAAO,MAAM,0BAA0B,EAAE,EAAE,CAAC;IAAE,mBAAmB,EAAE,OAAO,CAAC;IAAC,qBAAqB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;CAAE,CAOjG,CAAA"}

package/dist/src/components/sort-restrictions-annotation.js

@@ -1,9 +1,9 @@
 import React from "react";
 import { AnnotationElement, CollectionElement, PropertyPathElement, PropertyValueElement, RecordElement } from "./common-elements.js";
-export const SortRestrictionsAnnotation = ({ hasSortOperation, nonSortableProperties }) => React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.SortRestrictions" },
+export const SortRestrictionsAnnotation = ({ hasSortOnCollection, nonSortableProperties }) => React.createElement(AnnotationElement, { Term: "Org.OData.Capabilities.V1.SortRestrictions" },
     React.createElement(RecordElement, null,
-        React.createElement(PropertyValueElement, { Property: "Sortable", Bool: hasSortOperation }),
-        hasSortOperation ? React.createElement(NonSortableProperties, { nonSortableProperties: nonSortableProperties }) : React.createElement(React.Fragment, null)));
+        React.createElement(PropertyValueElement, { Property: "Sortable", Bool: hasSortOnCollection }),
+        hasSortOnCollection ? React.createElement(NonSortableProperties, { nonSortableProperties: nonSortableProperties }) : React.createElement(React.Fragment, null)));
 const NonSortableProperties = ({ nonSortableProperties }) => React.createElement(PropertyValueElement, { Property: "NonSortableProperties" },
     React.createElement(CollectionElement, null, nonSortableProperties === null || nonSortableProperties === void 0 ? void 0 : nonSortableProperties.map((property) => (React.createElement(PropertyPathElement, { key: property },
         React.createElement(React.Fragment, null, property))))));

package/dist/src/components/sort-restrictions-annotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"sort-restrictions-annotation.js","sourceRoot":"","sources":["../../../src/components/sort-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEtI,MAAM,CAAC,MAAM,0BAA0B,GACnC,CAAC,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,EAAE,EAAE,CAChD,oBAAC,iBAAiB,IAAC,IAAI,EAAC,4CAA4C;IAClE,oBAAC,aAAa;QACZ,oBAAC,oBAAoB,IAAC,QAAQ,EAAC,UAAU,EAAC,IAAI,EAAE,gBAAgB,GAAI;QAClE,gBAAgB,CAAC,CAAC,CAAC,oBAAC,qBAAqB,IAAC,qBAAqB,EAAE,qBAAqB,GAAG,CAAC,CAAC,CAAC,yCAAK,CACrF,CACE,CAAA;AAExB,MAAM,qBAAqB,GAAwD,CAAC,EAAE,qBAAqB,EAAE,EAAE,EAAE,CAC/G,oBAAC,oBAAoB,IAAC,QAAQ,EAAC,uBAAuB;IACpD,oBAAC,iBAAiB,QACf,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CACxC,oBAAC,mBAAmB,IAAC,GAAG,EAAE,QAAQ;QAChC,0CAAG,QAAQ,CAAI,CACK,CACvB,CAAC,CACgB,CACC,CAAA"}
+{"version":3,"file":"sort-restrictions-annotation.js","sourceRoot":"","sources":["../../../src/components/sort-restrictions-annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEtI,MAAM,CAAC,MAAM,0BAA0B,GACnC,CAAC,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,EAAE,EAAE,CACnD,oBAAC,iBAAiB,IAAC,IAAI,EAAC,4CAA4C;IAClE,oBAAC,aAAa;QACZ,oBAAC,oBAAoB,IAAC,QAAQ,EAAC,UAAU,EAAC,IAAI,EAAE,mBAAmB,GAAI;QACrE,mBAAmB,CAAC,CAAC,CAAC,oBAAC,qBAAqB,IAAC,qBAAqB,EAAE,qBAAqB,GAAG,CAAC,CAAC,CAAC,yCAAK,CACxF,CACE,CAAA;AAExB,MAAM,qBAAqB,GAAwD,CAAC,EAAE,qBAAqB,EAAE,EAAE,EAAE,CAC/G,oBAAC,oBAAoB,IAAC,QAAQ,EAAC,uBAAuB;IACpD,oBAAC,iBAAiB,QACf,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CACxC,oBAAC,mBAAmB,IAAC,GAAG,EAAE,QAAQ;QAChC,0CAAG,QAAQ,CAAI,CACK,CACvB,CAAC,CACgB,CACC,CAAA"}

package/dist/src/components/top-supported-annotation.d.ts

@@ -1,5 +1,5 @@
 import { FC } from "react";
 export declare const TopSupportedAnnotation: FC<{
-    hasTopOperation: boolean;
+    hasTopOnCollection: boolean;
 }>;
 //# sourceMappingURL=top-supported-annotation.d.ts.map

package/dist/src/components/top-supported-annotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"top-supported-annotation.d.ts","sourceRoot":"","sources":["../../../src/components/top-supported-annotation.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGlC,eAAO,MAAM,sBAAsB,EAAE,EAAE,CAAC;IAAE,eAAe,EAAE,OAAO,CAAA;CAAE,CAEnE,CAAC"}
+{"version":3,"file":"top-supported-annotation.d.ts","sourceRoot":"","sources":["../../../src/components/top-supported-annotation.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGlC,eAAO,MAAM,sBAAsB,EAAE,EAAE,CAAC;IAAE,kBAAkB,EAAE,OAAO,CAAA;CAAE,CAEtE,CAAC"}

package/dist/src/components/top-supported-annotation.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { AnnotationElement } from "./common-elements.js";
-export const TopSupportedAnnotation = ({ hasTopOperation }) => {
-    return React.createElement(AnnotationElement, { Term: "Org.OData.Core.V1.TopSupported", Bool: hasTopOperation });
+export const TopSupportedAnnotation = ({ hasTopOnCollection }) => {
+    return React.createElement(AnnotationElement, { Term: "Org.OData.Core.V1.TopSupported", Bool: hasTopOnCollection });
 };
 //# sourceMappingURL=top-supported-annotation.js.map

package/dist/src/components/top-supported-annotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"top-supported-annotation.js","sourceRoot":"","sources":["../../../src/components/top-supported-annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,CAAC,MAAM,sBAAsB,GAAqC,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE;IAC9F,OAAO,oBAAC,iBAAiB,IAAC,IAAI,EAAC,gCAAgC,EAAC,IAAI,EAAE,eAAe,GAAI,CAAC;AAC5F,CAAC,CAAC"}
+{"version":3,"file":"top-supported-annotation.js","sourceRoot":"","sources":["../../../src/components/top-supported-annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,CAAC,MAAM,sBAAsB,GAAwC,CAAC,EAAE,kBAAkB,EAAE,EAAE,EAAE;IACpG,OAAO,oBAAC,iBAAiB,IAAC,IAAI,EAAC,gCAAgC,EAAC,IAAI,EAAE,kBAAkB,GAAI,CAAC;AAC/F,CAAC,CAAC"}

package/dist/src/entities/annotations.d.ts

@@ -1,31 +1,31 @@
 import { Program } from "@typespec/compiler";
 import { MsGraphInterface } from "../utils.js";
-export interface SingletonAnnotations {
+export interface ResourceAnnotations {
     Target: string | undefined;
-    HasGetOnItem: boolean;
-    HasPatchOnItem: boolean;
-    HasDeleteOnItem: boolean;
-    HasExpandOperation: boolean;
+    HasGetOnResource: boolean;
+    HasPatchOnResource: boolean;
+    HasDeleteOnResource: boolean;
+    HasExpandOnCollectionOrResource: boolean;
     NonExpandableProperties: string[] | undefined;
     Description: string | undefined;
 }
-export interface EntitySetAnnotations {
+export interface CollectionAnnotations {
     Target: string | undefined;
     HasGetOnCollection: boolean;
-    HasGetOnItem: boolean;
+    HasGetOnResource: boolean;
     HasPostOnCollection: boolean;
-    HasPatchOnItem: boolean;
-    HasDeleteOnItem: boolean;
-    HasCountOperation: boolean;
-    HasExpandOperation: boolean;
+    HasPatchOnResource: boolean;
+    HasDeleteOnResource: boolean;
+    HasCountOnCollection: boolean;
+    HasExpandOnCollectionOrResource: boolean;
     NonExpandableProperties: string[] | undefined;
-    HasSearchOperation: boolean;
-    HasSkipOperation: boolean;
-    HasSortOperation: boolean;
+    HasSearchOnCollection: boolean;
+    HasSkipOnCollection: boolean;
+    HasSortOnCollection: boolean;
     NonSortableProperties: string[] | undefined;
-    HasTopOperation: boolean;
+    HasTopOnCollection: boolean;
     Description: string | undefined;
 }
-export declare function GetSingletonAnnotations(program: Program, namespaceName: string, navigationSources: Map<string, MsGraphInterface>): Map<string, SingletonAnnotations>;
-export declare function GetEntitySetAnnotations(program: Program, namespaceName: string, sources: Map<string, MsGraphInterface>): Map<string, EntitySetAnnotations>;
+export declare function GetResourceAnnotations(program: Program, namespaceName: string, navigationSources: Map<string, MsGraphInterface>): Map<string, ResourceAnnotations>;
+export declare function GetCollectionAnnotations(program: Program, namespaceName: string, sources: Map<string, MsGraphInterface>): Map<string, CollectionAnnotations>;
 //# sourceMappingURL=annotations.d.ts.map

package/dist/src/entities/annotations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../../src/entities/annotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAmC,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAoC,MAAM,aAAa,CAAC;AAIjF,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,eAAe,EAAE,OAAO,CAAC;IACzB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,YAAY,EAAE,OAAO,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,cAAc,EAAE,OAAO,CAAC;IACxB,eAAe,EAAE,OAAO,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,kBAAkB,EAAE,OAAO,CAAC;IAC5B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qBAAqB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC5C,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAQpK;AAgCD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAQ1J"}
+{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../../src/entities/annotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAmC,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAoC,MAAM,aAAa,CAAC;AAIjF,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,+BAA+B,EAAE,OAAO,CAAC;IACzC,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,+BAA+B,EAAE,OAAO,CAAC;IACzC,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,qBAAqB,EAAE,OAAO,CAAC;IAC/B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,qBAAqB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC5C,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAQD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAQlK;AAmCD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAQ5J"}

package/dist/src/entities/annotations.js

@@ -2,76 +2,77 @@ import { getDoc, walkPropertiesInherited } from "@typespec/compiler";
 import { getInterfaceNavigationSourceType } from "../utils.js";
 import { getOperationVerb } from "@typespec/http";
 import { getExpand, getOrderBy, isContains, isCount, isExpand, isOrderBy, isReferences, isSearch, isSkip, isTop } from "../index.js";
-export function GetSingletonAnnotations(program, namespaceName, navigationSources) {
+export function GetResourceAnnotations(program, namespaceName, navigationSources) {
     const annotations = new Map();
     navigationSources.forEach((entity, routePath) => {
-        annotations.set(routePath, getSingletonAnnotations(program, namespaceName, routePath, entity));
+        annotations.set(routePath, getResourceAnnotations(program, namespaceName, routePath, entity));
     });
     return annotations;
 }
-function getSingletonAnnotations(program, namespaceName, routePath, entity) {
-    const singleton = entity.theInterface;
-    const type = getInterfaceNavigationSourceType(program, singleton);
+function getResourceAnnotations(program, namespaceName, routePath, entity) {
+    const resource = entity.theInterface;
+    const type = getInterfaceNavigationSourceType(program, resource);
+    const minimumParameters = routePath.split('/').length - 1;
     const operationMethods = [...entity.operations].map(operation => ({
         operation,
         verb: getOperationVerb(program, operation),
+        hasMinimumParameters: operation.parameters.properties.size === minimumParameters,
     }));
-    const [hasExpandOperation, nonExpandableProperties] = getExpandProperties(program, type, singleton);
+    const [hasExpandOnCollectionOrResource, nonExpandableProperties] = getExpandProperties(program, type, operationMethods);
     const annotations = {
         Target: `${namespaceName}.container/${routePath}`,
-        HasGetOnItem: operationMethods.some(({ verb }) => verb === "get"),
-        HasPatchOnItem: operationMethods.some(({ verb }) => verb === "patch"),
-        HasDeleteOnItem: operationMethods.some(({ verb }) => verb === "delete"),
-        HasExpandOperation: hasExpandOperation,
+        HasGetOnResource: operationMethods.some(({ verb }) => verb === "get"),
+        HasPatchOnResource: operationMethods.some(({ verb }) => verb === "patch"),
+        HasDeleteOnResource: operationMethods.some(({ verb }) => verb === "delete"),
+        HasExpandOnCollectionOrResource: hasExpandOnCollectionOrResource,
         NonExpandableProperties: nonExpandableProperties,
-        Description: getDoc(program, singleton),
+        Description: getDoc(program, resource),
     };
     return annotations;
 }
-export function GetEntitySetAnnotations(program, namespaceName, sources) {
+export function GetCollectionAnnotations(program, namespaceName, sources) {
     const annotations = new Map();
     sources.forEach((entity, routePath) => {
-        annotations.set(routePath, getEntitySetAnnotations(program, namespaceName, routePath, entity));
+        annotations.set(routePath, getCollectionAnnotations(program, namespaceName, routePath, entity));
     });
     return annotations;
 }
-function getEntitySetAnnotations(program, namespaceName, routePath, entity) {
-    const entitySet = entity.theInterface;
-    const type = getInterfaceNavigationSourceType(program, entitySet);
+function getCollectionAnnotations(program, namespaceName, routePath, entity) {
+    const collection = entity.theInterface;
+    const type = getInterfaceNavigationSourceType(program, collection);
+    const minimumParameters = routePath.split('/').length - 1;
     const operationMethods = entity.operations.map(operation => ({
         operation,
         verb: getOperationVerb(program, operation),
-        hasEmptyParameters: operation.parameters.properties.size === 0,
+        hasMinimumParameters: operation.parameters.properties.size === minimumParameters,
     }));
-    const [hasExpandOperation, nonExpandableProperties] = getExpandProperties(program, type, entitySet);
-    const [hasSortOperation, nonSortableProperties] = getSortProperties(program, type, entitySet);
+    const [hasExpandOnCollectionOrResource, nonExpandableProperties] = getExpandProperties(program, type, operationMethods);
+    const [hasSortOnCollection, nonSortableProperties] = getSortProperties(program, type, operationMethods);
     const annotations = {
         Target: `${namespaceName}.container/${routePath}`,
-        HasGetOnCollection: operationMethods.some(({ verb, hasEmptyParameters }) => hasEmptyParameters && verb === "get"),
-        HasGetOnItem: operationMethods.some(({ verb, hasEmptyParameters }) => !hasEmptyParameters && verb === "get"),
-        HasPostOnCollection: operationMethods.some(({ verb }) => verb === "post"),
-        HasPatchOnItem: operationMethods.some(({ verb, hasEmptyParameters }) => !hasEmptyParameters && verb === "patch"),
-        HasDeleteOnItem: operationMethods.some(({ verb, hasEmptyParameters }) => !hasEmptyParameters && verb === "delete"),
-        HasCountOperation: operationMethods.some(({ operation }) => isCount(program, operation)),
-        HasSearchOperation: operationMethods.some(({ operation }) => isSearch(program, operation)),
-        HasSkipOperation: operationMethods.some(({ operation }) => isSkip(program, operation)),
-        HasExpandOperation: hasExpandOperation,
+        HasGetOnCollection: operationMethods.some(m => m.hasMinimumParameters && m.verb === "get"),
+        HasGetOnResource: operationMethods.some(m => !m.hasMinimumParameters && m.verb === "get"),
+        HasPostOnCollection: operationMethods.some(m => m.verb === "post"),
+        HasPatchOnResource: operationMethods.some(m => !m.hasMinimumParameters && m.verb === "patch"),
+        HasDeleteOnResource: operationMethods.some(m => !m.hasMinimumParameters && m.verb === "delete"),
+        HasCountOnCollection: operationMethods.some(m => isCount(program, m.operation)),
+        HasSearchOnCollection: operationMethods.some(m => isSearch(program, m.operation)),
+        HasSkipOnCollection: operationMethods.some(m => isSkip(program, m.operation)),
+        HasExpandOnCollectionOrResource: hasExpandOnCollectionOrResource,
         NonExpandableProperties: nonExpandableProperties,
-        HasSortOperation: hasSortOperation,
+        HasSortOnCollection: hasSortOnCollection,
         NonSortableProperties: nonSortableProperties,
-        HasTopOperation: operationMethods.some(({ operation }) => isTop(program, operation)),
-        Description: getDoc(program, entitySet),
+        HasTopOnCollection: operationMethods.some(m => isTop(program, m.operation)),
+        Description: getDoc(program, collection),
     };
     return annotations;
 }
-function getExpandProperties(program, type, entity) {
-    const expandedOperation = [...entity.operations].find(([_, operation]) => getOperationVerb(program, operation) === "get" &&
-        operation.parameters.properties.size === 0 &&
-        isExpand(program, operation));
-    if (expandedOperation) {
-        // Destructuring to get the operation from the [string, Operation] expandedOperation tuple
-        const [_, operation] = expandedOperation;
-        const expandableProperties = getExpand(program, operation);
+function getExpandProperties(program, type, operationMethods) {
+    const expandOperationMethod = operationMethods.find(m => m.verb === "get" &&
+        m.hasMinimumParameters &&
+        isExpand(program, m.operation));
+    if (expandOperationMethod) {
+        const expandableProperties = getExpand(program, expandOperationMethod.operation);
         const navigationProperties = [...walkPropertiesInherited(type)]
             .filter((property) => isContains(program, property) || isReferences(program, property))
             .map((property) => property.name);
@@ -80,14 +81,12 @@ function getExpandProperties(program, type, entity) {
     }
     return [false, undefined];
 }
-function getSortProperties(program, type, entity) {
-    const sortOperation = [...entity.operations].find(([_, operation]) => getOperationVerb(program, operation) === "get" &&
-        operation.parameters.properties.size === 0 &&
-        isOrderBy(program, operation));
-    if (sortOperation) {
-        // Destructuring to get the operation from the [string, Operation] orderedOperation tuple
-        const [_, operation] = sortOperation;
-        const sortableProperties = getOrderBy(program, operation);
+function getSortProperties(program, type, operationMethods) {
+    const sortOperationMethod = operationMethods.find(m => m.verb === "get" &&
+        m.hasMinimumParameters &&
+        isOrderBy(program, m.operation));
+    if (sortOperationMethod) {
+        const sortableProperties = getOrderBy(program, sortOperationMethod.operation);
         const nonNavigationProperties = [...walkPropertiesInherited(type)]
             .filter((property) => !isContains(program, property) && !isReferences(program, property))
             .map((property) => property.name);