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

package/dist/src/entities/annotations.js

@@ -0,0 +1,99 @@
+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) {
+    const annotations = new Map();
+    navigationSources.forEach((entity, routePath) => {
+        annotations.set(routePath, getSingletonAnnotations(program, namespaceName, routePath, entity));
+    });
+    return annotations;
+}
+function getSingletonAnnotations(program, namespaceName, routePath, entity) {
+    const singleton = entity.theInterface;
+    const type = getInterfaceNavigationSourceType(program, singleton);
+    const operationMethods = [...entity.operations].map(operation => ({
+        operation,
+        verb: getOperationVerb(program, operation),
+    }));
+    const [hasExpandOperation, nonExpandableProperties] = getExpandProperties(program, type, singleton);
+    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,
+        NonExpandableProperties: nonExpandableProperties,
+        Description: getDoc(program, singleton),
+    };
+    return annotations;
+}
+export function GetEntitySetAnnotations(program, namespaceName, sources) {
+    const annotations = new Map();
+    sources.forEach((entity, routePath) => {
+        annotations.set(routePath, getEntitySetAnnotations(program, namespaceName, routePath, entity));
+    });
+    return annotations;
+}
+function getEntitySetAnnotations(program, namespaceName, routePath, entity) {
+    const entitySet = entity.theInterface;
+    const type = getInterfaceNavigationSourceType(program, entitySet);
+    const operationMethods = entity.operations.map(operation => ({
+        operation,
+        verb: getOperationVerb(program, operation),
+        hasEmptyParameters: operation.parameters.properties.size === 0,
+    }));
+    const [hasExpandOperation, nonExpandableProperties] = getExpandProperties(program, type, entitySet);
+    const [hasSortOperation, nonSortableProperties] = getSortProperties(program, type, entitySet);
+    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,
+        NonExpandableProperties: nonExpandableProperties,
+        HasSortOperation: hasSortOperation,
+        NonSortableProperties: nonSortableProperties,
+        HasTopOperation: operationMethods.some(({ operation }) => isTop(program, operation)),
+        Description: getDoc(program, entitySet),
+    };
+    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);
+        const navigationProperties = [...walkPropertiesInherited(type)]
+            .filter((property) => isContains(program, property) || isReferences(program, property))
+            .map((property) => property.name);
+        const nonExpandableProperties = navigationProperties.filter((property) => { var _a; return (_a = !(expandableProperties === null || expandableProperties === void 0 ? void 0 : expandableProperties.includes(property))) !== null && _a !== void 0 ? _a : false; });
+        return [true, nonExpandableProperties];
+    }
+    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);
+        const nonNavigationProperties = [...walkPropertiesInherited(type)]
+            .filter((property) => !isContains(program, property) && !isReferences(program, property))
+            .map((property) => property.name);
+        const nonSortableProperties = nonNavigationProperties.filter((property) => !sortableProperties.includes(property));
+        return [true, nonSortableProperties];
+    }
+    return [false, undefined];
+}
+//# sourceMappingURL=annotations.js.map

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

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

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

@@ -1,35 +1,15 @@
-import { Program, Namespace } from "@typespec/compiler";
-export interface EntityContainer {
-    AgsAttributes: Record<string, string>;
-    SingletonElements: Singleton[];
-    EntitySetElements: EntitySet[];
-}
+import { Program } from "@typespec/compiler";
+import { MsGraphInterface } from "../utils.js";
 export interface Singleton {
     Name: string | undefined;
     TypeName: string;
     AgsAttributes: Record<string, string>;
-    HasExpandOperation: boolean;
-    NonExpandableProperties: string[] | undefined;
-    Description: string | undefined;
 }
 export interface EntitySet {
     Name: string | undefined;
     TypeName: string;
     AgsAttributes: Record<string, string | boolean | undefined>;
-    HasGetOnCollection: boolean;
-    HasGetOnItem: boolean;
-    HasPostOnCollection: boolean;
-    HasPatchOnItem: boolean;
-    HasDeleteOnItem: boolean;
-    HasCountOperation: boolean;
-    HasExpandOperation: boolean;
-    NonExpandableProperties: string[] | undefined;
-    HasSearchOperation: boolean;
-    HasSkipOperation: boolean;
-    HasSortOperation: boolean;
-    NonSortableProperties: string[] | undefined;
-    HasTopOperation: boolean;
-    Description: string | undefined;
 }
-export declare function GetEntityContainer(program: Program, namespace: Namespace): EntityContainer;
+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,EAAE,OAAO,EAAsE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAK3H,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,iBAAiB,EAAE,SAAS,EAAE,CAAA;IAC9B,iBAAiB,EAAE,SAAS,EAAE,CAAA;CAC/B;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,kBAAkB,EAAE,OAAO,CAAA;IAC3B,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC7C,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;CAChC;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAAA;IAC3D,kBAAkB,EAAE,OAAO,CAAA;IAC3B,YAAY,EAAE,OAAO,CAAA;IACrB,mBAAmB,EAAE,OAAO,CAAA;IAC5B,cAAc,EAAE,OAAO,CAAA;IACvB,eAAe,EAAE,OAAO,CAAA;IACxB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC7C,kBAAkB,EAAE,OAAO,CAAA;IAC3B,gBAAgB,EAAE,OAAO,CAAA;IACzB,gBAAgB,EAAE,OAAO,CAAA;IACzB,qBAAqB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC3C,eAAe,EAAE,OAAO,CAAA;IACxB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;CAChC;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,eAAe,CAe1F"}
+{"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,132 +1,42 @@
-import { getDoc, walkPropertiesInherited } from "@typespec/compiler";
-import { getRoutePath, getOperationVerb } from "@typespec/http";
-import { buildAttributes, isExpand, getExpand, isContains, isReferences, isCount, isSearch, isSkip, isTop, isOrderBy, getOrderBy } from "../index.js";
-import { getPropertyTypeName } from "../utils.js";
-export function GetEntityContainer(program, namespace) {
-    const navigationSources = [...namespace.interfaces]
-        .filter(([_, $interface]) => $interface.operations.has("_isNavigationSource"))
-        .map(([_, $interface]) => [
-        $interface.operations.get("_isNavigationSource").returnType,
-        $interface,
-    ]);
-    const entityContainer = {
-        AgsAttributes: buildAttributes(program, namespace),
-        SingletonElements: getMsGraphSingletonElements(program, navigationSources),
-        EntitySetElements: getMsGraphEntitySetElements(program, navigationSources),
-    };
-    return entityContainer;
-}
-function getMsGraphSingletonElements(program, navigationSources) {
-    const singletons = navigationSources
-        .filter(([returnType, _]) => returnType.kind === "Model" && returnType.name !== "Array")
-        .map(([_, $interface]) => $interface);
-    const elements = singletons.map(singleton => getMsGraphSingletonElement(program, singleton));
-    return elements;
+import { buildAttributes } from "../decorators/ags-attribute.js";
+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 getMsGraphSingletonElement(program, singleton) {
-    const routePath = getRoutePath(program, singleton);
-    const type = singleton.operations.get("_isNavigationSource").returnType;
-    const element = {
-        Name: routePath === null || routePath === void 0 ? void 0 : routePath.path.split("/")[0],
+function getSingleton(program, routePath, entity) {
+    const singleton = entity.theInterface;
+    const type = getInterfaceNavigationSourceType(program, singleton);
+    const agsAttributes = { ...getOperationAgsAttributes(program, entity.operations), ...buildAttributes(program, singleton) };
+    const entry = {
+        Name: routePath,
         TypeName: getPropertyTypeName(program, type),
-        AgsAttributes: buildAttributes(program, singleton),
-        HasExpandOperation: false,
-        NonExpandableProperties: undefined,
-        Description: getDoc(program, singleton)
+        AgsAttributes: agsAttributes,
     };
-    const expandedOperation = [...singleton.operations].find(([_, operation]) => getOperationVerb(program, operation) === "get" &&
-        operation.parameters.properties.size === 0 &&
-        isExpand(program, operation));
-    if (expandedOperation) {
-        element.HasExpandOperation = true;
-        // Destructuring to get the operation from the [string, Operation] expandedOperation tuple
-        const [_, operation] = expandedOperation;
-        const expandableProperties = getExpand(program, operation);
-        const navigationProperties = [...walkPropertiesInherited(type)]
-            .filter((property) => isContains(program, property) || isReferences(program, property))
-            .map((property) => property.name);
-        element.NonExpandableProperties = navigationProperties.filter(property => { var _a; return (_a = !(expandableProperties === null || expandableProperties === void 0 ? void 0 : expandableProperties.includes(property))) !== null && _a !== void 0 ? _a : false; });
-    }
-    return element;
+    return entry;
 }
-function getMsGraphEntitySetElements(program, navigationSources) {
-    const entitySets = navigationSources
-        .filter(([returnType, _]) => returnType.kind === "Model" && returnType.name === "Array")
-        .reduce((map, [_, item]) => {
-        var _a;
-        const key = (_a = getRoutePath(program, item)) === null || _a === void 0 ? void 0 : _a.path.split("/")[0];
-        if (!key) {
-            return map;
-        }
-        const items = [...(map.get(key) || []), ...item.operations.values()];
-        map.set(key, items);
-        return map;
-    }, new Map());
-    const elements = [...entitySets]
-        .map(([_, operations]) => getMsGraphEntitySetElement(program, operations))
-        .filter((element) => !!element);
-    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 getMsGraphEntitySetElement(program, operations) {
-    var _a;
-    const entitySet = operations[0].interface;
-    if (entitySet === undefined) {
-        return undefined;
-    }
-    let agsAttributes = operations.reduce((attr, item) => ({ ...attr, ...buildAttributes(program, item) }), {});
-    agsAttributes = { ...agsAttributes, ...buildAttributes(program, entitySet) };
-    const returnType = entitySet.operations.get("_isNavigationSource").returnType;
-    const type = returnType.indexer.value;
-    const operationMethods = operations.map((operation) => ({
-        operation,
-        verb: getOperationVerb(program, operation),
-        hasEmptyParameters: operation.parameters.properties.size === 0,
-    }));
+function getEntitySet(program, routePath, entity) {
+    const entitySet = entity.theInterface;
+    const type = getInterfaceNavigationSourceType(program, entitySet);
+    const agsAttributes = { ...getOperationAgsAttributes(program, entity.operations), ...buildAttributes(program, entitySet) };
     const entry = {
-        Name: (_a = getRoutePath(program, entitySet)) === null || _a === void 0 ? void 0 : _a.path.split("/")[0],
+        Name: routePath,
         TypeName: getPropertyTypeName(program, type),
         AgsAttributes: agsAttributes,
-        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 }) => verb === "patch"),
-        HasDeleteOnItem: operationMethods.some(({ verb }) => verb === "delete"),
-        HasCountOperation: [...entitySet.operations].some(([_, operation]) => isCount(program, operation)),
-        HasExpandOperation: false,
-        NonExpandableProperties: undefined,
-        HasSearchOperation: [...entitySet.operations].some(([_, operation]) => isSearch(program, operation)),
-        HasSkipOperation: [...entitySet.operations].some(([_, operation]) => isSkip(program, operation)),
-        HasSortOperation: false,
-        NonSortableProperties: undefined,
-        HasTopOperation: [...entitySet.operations].some(([_, operation]) => isTop(program, operation)),
-        Description: getDoc(program, entitySet),
     };
-    const expandedOperation = [...entitySet.operations].find(([_, operation]) => getOperationVerb(program, operation) === "get" &&
-        operation.parameters.properties.size === 0 &&
-        isExpand(program, operation));
-    if (expandedOperation) {
-        entry.HasExpandOperation = true;
-        // Destructuring to get the operation from the [string, Operation] expandedOperation tuple
-        const [_, operation] = expandedOperation;
-        const expandableProperties = getExpand(program, operation);
-        const navigationProperties = [...walkPropertiesInherited(type)]
-            .filter((property) => isContains(program, property) || isReferences(program, property))
-            .map((property) => property.name);
-        entry.NonExpandableProperties = navigationProperties.filter(property => { var _a; return (_a = !(expandableProperties === null || expandableProperties === void 0 ? void 0 : expandableProperties.includes(property))) !== null && _a !== void 0 ? _a : false; });
-    }
-    const sortOperation = [...entitySet.operations].find(([_, operation]) => getOperationVerb(program, operation) === "get" &&
-        operation.parameters.properties.size === 0 &&
-        isOrderBy(program, operation));
-    if (sortOperation) {
-        entry.HasSortOperation = true;
-        // Destructuring to get the operation from the [string, Operation] orderedOperation tuple
-        const [_, operation] = sortOperation;
-        const sortableProperties = getOrderBy(program, operation);
-        const nonNavigationProperties = [...walkPropertiesInherited(type)]
-            .filter((property) => !isContains(program, property) && !isReferences(program, property))
-            .map((property) => property.name);
-        entry.NonSortableProperties = nonNavigationProperties.filter((property) => !sortableProperties.includes(property));
-    }
     return entry;
 }
+function getOperationAgsAttributes(program, operations) {
+    return operations.reduce((attr, item) => ({ ...attr, ...buildAttributes(program, item) }), {});
+}
 //# 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":"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"}
+{"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,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,EAChE,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,CAAA;AAE9D,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAEpF,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAA;IAClD,QAAQ,EAAE,iBAAiB,EAAE,CAAA;CAC9B;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;IAClC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAA;CACnD;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 { buildAttributes } from "../index.js";
 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))
+        Elements: [...enumType.members].map(([_, m]) => getMsGraphEnumMember(program, m)),
+        IsFlags: isFlags(program, enumType),
     };
     return element;
 }
@@ -15,7 +17,7 @@ function getMsGraphEnumMember(program, member) {
         Name: member.name,
         Value: member.value,
         AgsAttributes: buildAttributes(program, member),
-        RevisionDefinition: GetRevisionDefinition(program, member, (_a = member.enum) === null || _a === void 0 ? void 0 : _a.namespace)
+        RevisionDefinition: GetRevisionDefinition(program, member, (_a = member.enum) === null || _a === void 0 ? void 0 : _a.namespace),
     };
     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,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,qBAAqB,EAAsB,MAAM,0BAA0B,CAAA;AAgBpF,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,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,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,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,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

@@ -1,36 +1,25 @@
 import { Model, ModelProperty, Program } from "@typespec/compiler";
 import { RevisionDefinition } from "./revision-definition.js";
 export interface MsGraphModel {
-    Properties: EntityType | ComplexType | undefined;
     Kind: MsGraphModelKind;
-}
-export interface EntityType {
-    StructuredType: StructuredType;
-    KeyProperty: [string, ModelProperty] | undefined;
-    Properties: MsGraphModelProperty[];
-    AlternateKeys: AlternateKeyProperty[];
-    StreamTypes: string[];
-    RevisionDefinition: RevisionDefinition | undefined;
-    Description: string | undefined;
-}
-export interface ComplexType {
-    StructuredType: StructuredType;
+    Name: string;
+    IsAbstract: boolean;
+    BaseType: string | undefined;
+    IsOpenType: boolean;
+    HasStream: boolean;
+    AgsAttributes: Record<string, string>;
     Properties: MsGraphModelProperty[];
     RevisionDefinition: RevisionDefinition | undefined;
     Description: string | undefined;
+    KeyProperty: [string, ModelProperty] | undefined;
+    AlternateKeys: AlternateKeyProperty[];
+    StreamTypes: string[];
 }
 export declare enum MsGraphModelKind {
     Unknown = 0,
     Entity = 1,
     Complex = 2
 }
-export interface StructuredType {
-    Name: string;
-    Abstract?: string;
-    BaseType?: string;
-    Children?: any;
-    [key: string]: any;
-}
 export interface MsGraphModelProperty {
     Name: string;
     IsNavigation: boolean;
@@ -43,8 +32,9 @@ export interface MsGraphModelProperty {
     RevisionDefinition: RevisionDefinition | undefined;
     Description: string | undefined;
 }
-export interface AlternateKeyProperty extends ModelProperty {
+export interface AlternateKeyProperty {
     IsModel: boolean;
+    ModelProperty: ModelProperty;
 }
-export declare function GetMsGraphModel(program: Program, model: 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,CAAA;AACjF,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAIpF,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,UAAU,GAAG,WAAW,GAAG,SAAS,CAAC;IACjD,IAAI,EAAE,gBAAgB,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,cAAc,EAAE,cAAc,CAAA;IAC9B,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS,CAAA;IAChD,UAAU,EAAE,oBAAoB,EAAE,CAAA;IAClC,aAAa,EAAE,oBAAoB,EAAE,CAAA;IACrC,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAA;IAClD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;CAChC;AAED,MAAM,WAAW,WAAW;IAC1B,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,oBAAoB,EAAE,CAAA;IAClC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAA;IAClD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;CAChC;AAED,oBAAY,gBAAgB;IAC1B,OAAO,IAAA;IACP,MAAM,IAAA;IACN,OAAO,IAAA;CACR;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;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,CAAA;IACnB,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,oBAAqB,SAAQ,aAAa;IACzD,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,YAAY,CAgF5E"}
+{"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"}