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

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

@@ -1,30 +1,31 @@
-import { Interface, Program } from "@typespec/compiler";
-export interface SingletonAnnotations {
+import { Program } from "@typespec/compiler";
+import { MsGraphInterface } from "../utils.js";
+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: Interface[]): SingletonAnnotations[];
-export declare function GetEntitySetAnnotations(program: Program, namespaceName: string, navigationSources: Interface[]): 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,EAAE,SAAS,EAAoB,OAAO,EAAmC,MAAM,oBAAoB,CAAC;AAK3G,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;AAOD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,GAAG,oBAAoB,EAAE,CAOvI;AAiCD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,GAAG,oBAAoB,EAAE,CAOvI"}
+{"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

@@ -1,75 +1,78 @@
 import { getDoc, walkPropertiesInherited } from "@typespec/compiler";
-import { getInterfaceNavigationSourceType, getInterfacesOfKinds } from "../utils.js";
+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) {
-    const singletonMap = getInterfacesOfKinds(program, navigationSources, ["Singleton"]);
-    const annotations = [...singletonMap].map(([routePath, entity]) => getSingletonAnnotations(program, namespaceName, routePath, entity));
+export function GetResourceAnnotations(program, namespaceName, navigationSources) {
+    const annotations = new Map();
+    navigationSources.forEach((entity, routePath) => {
+        annotations.set(routePath, getResourceAnnotations(program, namespaceName, routePath, entity));
+    });
     return annotations;
 }
-function getSingletonAnnotations(program, namespaceName, routePath, entity) {
-    const singleton = entity.theInterface;
-    const operations = entity.operations;
-    const type = getInterfaceNavigationSourceType(program, singleton);
-    const operationMethods = [...operations].map(operation => ({
+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, navigationSources) {
-    const entitySetMap = getInterfacesOfKinds(program, navigationSources, ["EntitySet", "EntitySetResource"]);
-    const annotations = [...entitySetMap].map(([routePath, entity]) => getEntitySetAnnotations(program, namespaceName, routePath, entity));
+export function GetCollectionAnnotations(program, namespaceName, sources) {
+    const annotations = new Map();
+    sources.forEach((entity, routePath) => {
+        annotations.set(routePath, getCollectionAnnotations(program, namespaceName, routePath, entity));
+    });
     return annotations;
 }
-function getEntitySetAnnotations(program, namespaceName, routePath, entity) {
-    const entitySet = entity.theInterface;
-    const operations = entity.operations;
-    const type = getInterfaceNavigationSourceType(program, entitySet);
-    const operationMethods = operations.map(operation => ({
+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);
@@ -78,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);

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

@@ -1 +1 @@
-{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../src/entities/annotations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../src/entities/annotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,MAAM,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAoB,gCAAgC,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,EAAY,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAoCrI,MAAM,UAAU,sBAAsB,CAAC,OAAgB,EAAE,aAAqB,EAAE,iBAAgD;IAC9H,MAAM,WAAW,GAAG,IAAI,GAAG,EAA+B,CAAC;IAE3D,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QAC9C,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,sBAAsB,CAAC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,sBAAsB,CAC7B,OAAgB,EAChB,aAAqB,EACrB,SAAiB,EACjB,MAAwB;IAExB,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC;IAErC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,QAAQ,CAAE,CAAC;IAElE,MAAM,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAE1D,MAAM,gBAAgB,GAAsB,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACnF,SAAS;QACT,IAAI,EAAE,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC;QAC1C,oBAAoB,EAAE,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,KAAK,iBAAiB;KACjF,CAAC,CAAC,CAAA;IAEH,MAAM,CAAC,+BAA+B,EAAE,uBAAuB,CAAC,GAAG,mBAAmB,CAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAExH,MAAM,WAAW,GAAwB;QACvC,MAAM,EAAE,GAAG,aAAa,cAAc,SAAS,EAAE;QACjD,gBAAgB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC;QACrE,kBAAkB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC;QACzE,mBAAmB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC;QAC3E,+BAA+B,EAAE,+BAA+B;QAChE,uBAAuB,EAAE,uBAAuB;QAChD,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC;KACvC,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAAgB,EAAE,aAAqB,EAAE,OAAsC;IACtH,MAAM,WAAW,GAAG,IAAI,GAAG,EAAiC,CAAC;IAE7D,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QACpC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,wBAAwB,CAAC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAClG,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,wBAAwB,CAC/B,OAAgB,EAChB,aAAqB,EACrB,SAAiB,EACjB,MAAwB;IAExB,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC;IAEvC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,UAAU,CAAE,CAAC;IAEpE,MAAM,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAE1D,MAAM,gBAAgB,GAAsB,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC9E,SAAS;QACT,IAAI,EAAE,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC;QAC1C,oBAAoB,EAAE,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,KAAK,iBAAiB;KACjF,CAAC,CAAC,CAAC;IAEJ,MAAM,CAAC,+BAA+B,EAAE,uBAAuB,CAAC,GAAG,mBAAmB,CAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACxH,MAAM,CAAC,mBAAmB,EAAE,qBAAqB,CAAC,GAAG,iBAAiB,CAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAExG,MAAM,WAAW,GAA0B;QACzC,MAAM,EAAE,GAAG,aAAa,cAAc,SAAS,EAAE;QACjD,kBAAkB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;QAC1F,gBAAgB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;QACzF,mBAAmB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC;QAClE,kBAAkB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;QAC7F,mBAAmB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;QAC/F,oBAAoB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QAC/E,qBAAqB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QACjF,mBAAmB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QAC7E,+BAA+B,EAAE,+BAA+B;QAChE,uBAAuB,EAAE,uBAAuB;QAChD,mBAAmB,EAAE,mBAAmB;QACxC,qBAAqB,EAAE,qBAAqB;QAC5C,kBAAkB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QAC3E,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;KACzC,CAAA;IAED,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAgB,EAAE,IAAW,EAAE,gBAAmC;IAC7F,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CACtD,CAAC,CAAC,IAAI,KAAK,KAAK;QAChB,CAAC,CAAC,oBAAoB;QACtB,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAElC,IAAI,qBAAqB,EAAE;QACzB,MAAM,oBAAoB,GAAG,SAAS,CAAC,OAAO,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAEjF,MAAM,oBAAoB,GAAG,CAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;aAC5D,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;aACtF,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEpC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,WAAC,OAAA,MAAA,CAAC,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA,mCAAI,KAAK,CAAA,EAAA,CAAC,CAAC;QAE9H,OAAO,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAA;KACvC;IAED,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAC3B,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAgB,EAAE,IAAW,EAAE,gBAAmC;IAC3F,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CACpD,CAAC,CAAC,IAAI,KAAK,KAAK;QAChB,CAAC,CAAC,oBAAoB;QACtB,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAEnC,IAAI,mBAAmB,EAAE;QACvB,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAE9E,MAAM,uBAAuB,GAAG,CAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;aAC/D,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;aACxF,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEpC,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEnH,OAAO,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;KACtC;IAED,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;AAC5B,CAAC"}

package/dist/src/entities/entity-container.d.ts

@@ -1,4 +1,5 @@
-import { Program, Interface } from "@typespec/compiler";
+import { Program } from "@typespec/compiler";
+import { MsGraphInterface } from "../utils.js";
 export interface Singleton {
     Name: string | undefined;
     TypeName: string;
@@ -9,6 +10,6 @@ export interface EntitySet {
     TypeName: string;
     AgsAttributes: Record<string, string | boolean | undefined>;
 }
-export declare function GetSingletons(program: Program, navigationSources: Interface[]): Singleton[];
-export declare function GetEntitySets(program: Program, navigationSources: Interface[]): EntitySet[];
+export declare function GetSingletons(program: Program, sources: Map<string, MsGraphInterface>): Map<string, Singleton>;
+export declare function GetEntitySets(program: Program, sources: Map<string, MsGraphInterface>): Map<string, EntitySet>;
 //# sourceMappingURL=entity-container.d.ts.map

package/dist/src/entities/entity-container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity-container.d.ts","sourceRoot":"","sources":["../../../src/entities/entity-container.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,SAAS,EAEV,MAAM,oBAAoB,CAAC;AAS5B,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;CAC7D;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAO3F;AAkBD,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAO3F"}
+{"version":3,"file":"entity-container.d.ts","sourceRoot":"","sources":["../../../src/entities/entity-container.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAER,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAGL,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;CAC7D;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAQ9G;AAkBD,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAQ9G"}

package/dist/src/entities/entity-container.js

@@ -1,9 +1,11 @@
 import { buildAttributes } from "../decorators/ags-attribute.js";
-import { getPropertyTypeName, getInterfaceNavigationSourceType, getInterfacesOfKinds, } from "../utils.js";
-export function GetSingletons(program, navigationSources) {
-    const singletonMap = getInterfacesOfKinds(program, navigationSources, ["Singleton"]);
-    const elements = [...singletonMap].map(([routePath, entity]) => getSingleton(program, routePath, entity));
-    return elements;
+import { getPropertyTypeName, getInterfaceNavigationSourceType, } from "../utils.js";
+export function GetSingletons(program, sources) {
+    const singletons = new Map();
+    sources.forEach((entity, routePath) => {
+        singletons.set(routePath, getSingleton(program, routePath, entity));
+    });
+    return singletons;
 }
 function getSingleton(program, routePath, entity) {
     const singleton = entity.theInterface;
@@ -16,10 +18,12 @@ function getSingleton(program, routePath, entity) {
     };
     return entry;
 }
-export function GetEntitySets(program, navigationSources) {
-    const entitySetMap = getInterfacesOfKinds(program, navigationSources, ["EntitySet", "EntitySetResource"]);
-    const elements = [...entitySetMap].map(([routePath, entity]) => getEntitySet(program, routePath, entity));
-    return elements;
+export function GetEntitySets(program, sources) {
+    const entitySets = new Map();
+    sources.forEach((entity, routePath) => {
+        entitySets.set(routePath, getEntitySet(program, routePath, entity));
+    });
+    return entitySets;
 }
 function getEntitySet(program, routePath, entity) {
     const entitySet = entity.theInterface;
@@ -33,6 +37,6 @@ function getEntitySet(program, routePath, entity) {
     return entry;
 }
 function getOperationAgsAttributes(program, operations) {
-    return operations.reduce((attr, item) => ({ ...attr, ...buildAttributes(program, item) }), {});
+    return operations.reduce((attr, operation) => ({ ...attr, ...buildAttributes(program, operation) }), {});
 }
 //# sourceMappingURL=entity-container.js.map

package/dist/src/entities/entity-container.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-container.js","sourceRoot":"","sources":["../../../src/entities/entity-container.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EACL,mBAAmB,EACnB,gCAAgC,EAChC,oBAAoB,GAErB,MAAM,aAAa,CAAC;AAcrB,MAAM,UAAU,aAAa,CAAC,OAAgB,EAAE,iBAA8B;IAC5E,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAErF,MAAM,QAAQ,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,CAC7D,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAE5C,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,YAAY,CAAC,OAAgB,EAAE,SAAiB,EAAE,MAAwB;IACjF,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC;IAEtC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,SAAS,CAAE,CAAC;IAEnE,MAAM,aAAa,GAAG,EAAE,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;IAE3H,MAAM,KAAK,GAAc;QACvB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC;QAC5C,aAAa,EAAE,aAAa;KAC7B,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAgB,EAAE,iBAA8B;IAC5E,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,EAAE,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC,CAAA;IAEzG,MAAM,QAAQ,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,CAC7D,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAE5C,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,YAAY,CAAC,OAAgB,EAAE,SAAiB,EAAE,MAAwB;IACjF,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC;IAEtC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,SAAS,CAAE,CAAC;IAEnE,MAAM,aAAa,GAAG,EAAE,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;IAE3H,MAAM,KAAK,GAAc;QACvB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC;QAC5C,aAAa,EAAE,aAAa;KAC7B,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,yBAAyB,CAAC,OAAgB,EAAE,UAAuB;IAC1E,OAAO,UAAU,CAAC,MAAM,CACtB,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,EAChE,EAAE,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"entity-container.js","sourceRoot":"","sources":["../../../src/entities/entity-container.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EACL,mBAAmB,EACnB,gCAAgC,GAEjC,MAAM,aAAa,CAAC;AAcrB,MAAM,UAAU,aAAa,CAAC,OAAgB,EAAE,OAAsC;IACpF,MAAM,UAAU,GAAG,IAAI,GAAG,EAAqB,CAAC;IAEhD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QACpC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,YAAY,CAAC,OAAgB,EAAE,SAAiB,EAAE,MAAwB;IACjF,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC;IAEtC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,SAAS,CAAE,CAAC;IAEnE,MAAM,aAAa,GAAG,EAAE,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;IAE3H,MAAM,KAAK,GAAc;QACvB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC;QAC5C,aAAa,EAAE,aAAa;KAC7B,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAgB,EAAE,OAAsC;IACpF,MAAM,UAAU,GAAG,IAAI,GAAG,EAAqB,CAAC;IAEhD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QACpC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,YAAY,CAAC,OAAgB,EAAE,SAAiB,EAAE,MAAwB;IACjF,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC;IAEtC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,SAAS,CAAE,CAAC;IAEnE,MAAM,aAAa,GAAG,EAAE,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;IAE3H,MAAM,KAAK,GAAc;QACvB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC;QAC5C,aAAa,EAAE,aAAa;KAC7B,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,yBAAyB,CAAC,OAAgB,EAAE,UAAuB;IAC1E,OAAO,UAAU,CAAC,MAAM,CACtB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,EAC1E,EAAE,CACH,CAAC;AACJ,CAAC"}

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

@@ -5,6 +5,7 @@ export interface MsGraphEnum {
     AgsAttributes: Record<string, string>;
     RevisionDefinition: RevisionDefinition | undefined;
     Elements: MsGraphEnumMember[];
+    IsFlags: boolean | undefined;
 }
 export interface MsGraphEnumMember {
     Name: string;

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

@@ -1 +1 @@
-{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../src/entities/enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAc,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAGrF,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACpD;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,GAAG,WAAW,CASvF"}
+{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../src/entities/enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAc,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAIrF,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;CAC9B;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACpD;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,GAAG,WAAW,CAUvF"}

package/dist/src/entities/enum.js

@@ -1,11 +1,13 @@
 import { GetRevisionDefinition } from "./revision-definition.js";
 import { buildAttributes } from "../decorators/ags-attribute.js";
+import { isFlags } from "../index.js";
 export function GetMsGraphEnumTypeElement(program, enumType) {
     const element = {
         Name: enumType.name,
         AgsAttributes: buildAttributes(program, enumType),
         RevisionDefinition: GetRevisionDefinition(program, enumType, enumType === null || enumType === void 0 ? void 0 : enumType.namespace),
         Elements: [...enumType.members].map(([_, m]) => getMsGraphEnumMember(program, m)),
+        IsFlags: isFlags(program, enumType),
     };
     return element;
 }

package/dist/src/entities/enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/entities/enum.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAsB,MAAM,0BAA0B,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAgBjE,MAAM,UAAU,yBAAyB,CAAC,OAAgB,EAAE,QAAc;IACxE,MAAM,OAAO,GAAgB;QAC3B,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,aAAa,EAAE,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC;QACjD,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,CAAC;QACjF,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;KAClF,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAgB,EAAE,MAAkB;;IAChE,MAAM,OAAO,GAAsB;QACjC,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,aAAa,EAAE,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC;QAC/C,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAA,MAAM,CAAC,IAAI,0CAAE,SAAS,CAAC;KACnF,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/entities/enum.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAsB,MAAM,0BAA0B,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAiBtC,MAAM,UAAU,yBAAyB,CAAC,OAAgB,EAAE,QAAc;IACxE,MAAM,OAAO,GAAgB;QAC3B,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,aAAa,EAAE,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC;QACjD,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,CAAC;QACjF,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACjF,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC;KACpC,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAgB,EAAE,MAAkB;;IAChE,MAAM,OAAO,GAAsB;QACjC,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,aAAa,EAAE,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC;QAC/C,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAA,MAAM,CAAC,IAAI,0CAAE,SAAS,CAAC;KACnF,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}

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

@@ -3,10 +3,10 @@ import { RevisionDefinition } from "./revision-definition.js";
 export interface MsGraphModel {
     Kind: MsGraphModelKind;
     Name: string;
-    IsAbstract: true | undefined;
+    IsAbstract: boolean;
     BaseType: string | undefined;
-    IsOpenType: true | undefined;
-    HasStream: true | undefined;
+    IsOpenType: boolean;
+    HasStream: boolean;
     AgsAttributes: Record<string, string>;
     Properties: MsGraphModelProperty[];
     RevisionDefinition: RevisionDefinition | undefined;
@@ -36,5 +36,5 @@ export interface AlternateKeyProperty {
     IsModel: boolean;
     ModelProperty: ModelProperty;
 }
-export declare function GetMsGraphModels(program: Program, models: Map<string, Model>): MsGraphModel[];
+export declare function GetMsGraphModels(program: Program, models: Map<string, Model>): Map<string, MsGraphModel>;
 //# sourceMappingURL=model.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/entities/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAiB,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAsBrF,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,IAAI,GAAG,SAAS,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,UAAU,EAAE,IAAI,GAAG,SAAS,CAAC;IAC7B,SAAS,EAAE,IAAI,GAAG,SAAS,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS,CAAC;IACjD,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,oBAAY,gBAAgB;IAC1B,OAAO,IAAA;IACP,MAAM,IAAA;IACN,OAAO,IAAA;CACR;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;IACpC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,YAAY,EAAE,CAW7F"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/entities/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAiB,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAsBrF,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS,CAAC;IACjD,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,oBAAY,gBAAgB;IAC1B,OAAO,IAAA;IACP,MAAM,IAAA;IACN,OAAO,IAAA;CACR;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;IACpC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAWxG"}

package/dist/src/entities/model.js

@@ -10,14 +10,14 @@ export var MsGraphModelKind;
     MsGraphModelKind[MsGraphModelKind["Complex"] = 2] = "Complex";
 })(MsGraphModelKind = MsGraphModelKind || (MsGraphModelKind = {}));
 export function GetMsGraphModels(program, models) {
-    const result = new Array();
-    models.forEach(m => {
+    const map = new Map();
+    models.forEach((m, key) => {
         const model = getMsGraphModel(program, m);
         if (model) {
-            result.push(model);
+            map.set(key, model);
         }
     });
-    return result;
+    return map;
 }
 function getMsGraphModel(program, model) {
     let kind = MsGraphModelKind.Unknown;
@@ -33,10 +33,10 @@ function getMsGraphModel(program, model) {
     return {
         Kind: kind,
         Name: model.name,
-        IsAbstract: isAbstract(program, model) ? true : undefined,
+        IsAbstract: isAbstract(program, model),
         BaseType: model.baseModel ? getIdForType(program, model.baseModel) : undefined,
-        IsOpenType: isOpen(program, model) ? true : undefined,
-        HasStream: hasStream(program, model) ? true : undefined,
+        IsOpenType: isOpen(program, model),
+        HasStream: hasStream(program, model),
         AgsAttributes: buildAttributes(program, model),
         RevisionDefinition: GetRevisionDefinition(program, model, model.namespace),
         Description: getDoc(program, model),

package/dist/src/entities/model.js.map

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

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

@@ -3,17 +3,19 @@ import { MsGraphEnum } from "./enum.js";
 import { MsGraphModel } from "./model.js";
 import { EntitySet, Singleton } from "./entity-container.js";
 import { MsGraphOperation } from "./operation.js";
-import { EntitySetAnnotations, SingletonAnnotations } from "./annotations.js";
+import { CollectionAnnotations, ResourceAnnotations } from "./annotations.js";
 export interface MsGraphNamespace {
     Name: string;
     Enums: MsGraphEnum[];
-    Models: MsGraphModel[];
+    Models: Map<string, MsGraphModel>;
     AgsAttributes: Record<string, string>;
-    Singletons: Singleton[];
-    EntitySets: EntitySet[];
+    Singletons: Map<string, Singleton>;
+    EntitySets: Map<string, EntitySet>;
     Operations: MsGraphOperation[];
-    EntitySetAnnotations: EntitySetAnnotations[];
-    SingletonAnnotations: SingletonAnnotations[];
+    EntitySetAnnotations: Map<string, CollectionAnnotations>;
+    SingletonAnnotations: Map<string, ResourceAnnotations>;
+    ResourceAnnotations: Map<string, ResourceAnnotations>;
+    CollectionAnnotations: Map<string, CollectionAnnotations>;
 }
 export declare function GetMsGraphNamespaces(program: Program): MsGraphNamespace[];
 //# sourceMappingURL=namespace.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../../src/entities/namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,OAAO,EAAQ,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAA6B,WAAW,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAoB,YAAY,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAgC,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAwB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAoD,MAAM,kBAAkB,CAAC;AAGhI,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAC/B,oBAAoB,EAAE,oBAAoB,EAAE,CAAC;IAC7C,oBAAoB,EAAE,oBAAoB,EAAE,CAAC;CAC9C;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,EAAE,CAOzE"}
+{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../../src/entities/namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,OAAO,EAAQ,MAAM,oBAAoB,CAAC;AAEzE,OAAO,EAA6B,WAAW,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAoB,YAAY,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAgC,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAwB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAoD,MAAM,kBAAkB,CAAC;AAGhI,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAClC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACnC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACnC,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAC/B,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IACzD,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACvD,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACtD,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;CAC3D;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,EAAE,CAOzE"}

package/dist/src/entities/namespace.js

@@ -1,9 +1,9 @@
-import { getNamespaceName, getNavigationSources, isExcludedCoreType } from "../utils.js";
+import { getInterfacesOfKinds, getNamespaceName, isExcludedCoreType, isNavigationSource } from "../utils.js";
 import { GetMsGraphEnumTypeElement } from "./enum.js";
 import { GetMsGraphModels } from "./model.js";
 import { GetEntitySets, GetSingletons } from "./entity-container.js";
 import { GetMsGraphOperations } from "./operation.js";
-import { GetEntitySetAnnotations, GetSingletonAnnotations } from "./annotations.js";
+import { GetCollectionAnnotations, GetResourceAnnotations } from "./annotations.js";
 import { buildAttributes } from "../index.js";
 export function GetMsGraphNamespaces(program) {
     const root = program.checker.getGlobalNamespaceType();
@@ -25,14 +25,20 @@ function hasChildren(type) {
 }
 function getMsGraphNamespace(program, namespace) {
     const namespaceName = getNamespaceName(program, namespace);
-    const navigationSources = getNavigationSources(program, namespace);
     const models = GetMsGraphModels(program, namespace.models);
     const enums = [...namespace.enums].map(([_, e]) => GetMsGraphEnumTypeElement(program, e));
-    const singletons = GetSingletons(program, navigationSources);
-    const entitySets = GetEntitySets(program, navigationSources);
+    const sources = getNavigationSources(namespace.interfaces);
+    const singletonSources = getInterfacesOfKinds(program, sources, ["Singleton"]);
+    const entitySetSources = getInterfacesOfKinds(program, sources, ["EntitySet", "EntitySetResource"]);
+    const resourceSources = getInterfacesOfKinds(program, sources, ["Resource"]);
+    const collectionSources = getInterfacesOfKinds(program, sources, ["Collection"]);
+    const singletons = GetSingletons(program, singletonSources);
+    const entitySets = GetEntitySets(program, entitySetSources);
+    const singletonAnnotations = GetResourceAnnotations(program, namespaceName, singletonSources);
+    const entitySetAnnotations = GetCollectionAnnotations(program, namespaceName, entitySetSources);
+    const resourceAnnotations = GetResourceAnnotations(program, namespaceName, resourceSources);
+    const collectionAnnotations = GetCollectionAnnotations(program, namespaceName, collectionSources);
     const operations = GetMsGraphOperations(program, namespace.interfaces);
-    const entitySetAnnotations = GetEntitySetAnnotations(program, namespaceName, navigationSources);
-    const singletonAnnotations = GetSingletonAnnotations(program, namespaceName, navigationSources);
     return {
         Name: namespaceName,
         Enums: enums,
@@ -41,8 +47,19 @@ function getMsGraphNamespace(program, namespace) {
         Singletons: singletons,
         EntitySets: entitySets,
         Operations: operations,
-        EntitySetAnnotations: entitySetAnnotations,
         SingletonAnnotations: singletonAnnotations,
+        EntitySetAnnotations: entitySetAnnotations,
+        ResourceAnnotations: resourceAnnotations,
+        CollectionAnnotations: collectionAnnotations,
     };
 }
+function getNavigationSources(interfaces) {
+    const navigationSources = new Map();
+    interfaces.forEach((theInterface, key) => {
+        if (isNavigationSource(theInterface)) {
+            navigationSources.set(key, theInterface);
+        }
+    });
+    return navigationSources;
+}
 //# sourceMappingURL=namespace.js.map

package/dist/src/entities/namespace.js.map

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

package/dist/src/entities/revision-definition.d.ts

@@ -5,5 +5,5 @@ export interface RevisionDefinition {
     Description?: string;
     RemovalDate: string;
 }
-export declare function GetRevisionDefinition(program: Program, item: Model | ModelProperty | EnumMember | Enum | Operation | Namespace, namespace: Namespace | undefined): RevisionDefinition | undefined;
+export declare function GetRevisionDefinition(program: Program, type: Model | ModelProperty | EnumMember | Enum | Operation | Namespace, namespace: Namespace | undefined): RevisionDefinition | undefined;
 //# sourceMappingURL=revision-definition.d.ts.map

package/dist/src/entities/revision-definition.js

@@ -1,14 +1,14 @@
 import { getDeprecated } from "@typespec/compiler";
 import { getPrivatePreview, getDeprecatedDefinitions, getPrivatePreviewDefinitions } from "../index.js";
-export function GetRevisionDefinition(program, item, namespace) {
+export function GetRevisionDefinition(program, type, namespace) {
     if (!namespace) {
         return undefined;
     }
-    const deprecated = getDeprecated(program, item);
+    const deprecated = getDeprecated(program, type);
     if (deprecated) {
         return getRevisionDefinitionFromDeprecation(program, namespace, deprecated);
     }
-    const privatePreview = getPrivatePreview(program, item);
+    const privatePreview = getPrivatePreview(program, type);
     if (privatePreview) {
         return getRevisionDefinitionFromPrivatePreview(program, namespace, privatePreview);
     }