@microsoft/typespec-msgraph 0.0.1-Preview.3 → 0.0.1-Preview.30

package/dist/src/entities/operation.js

@@ -1,41 +1,73 @@
 import { isVoidType, getDoc } from "@typespec/compiler";
 import { isPathParam } from "@typespec/http";
-import { getAction } from "@typespec/rest";
-import { buildAttributes, getFunction, isOperationParameters } from "../index.js";
-import { isTypeNullable, getPropertyTypeName, extractTypesFromUnion } from "../utils.js";
+import { extractParamsFromPath, getAction, getFunction, getGraphRoutePaths, getGraphRoutes, getReturnSource, hasReturnSource, isAction, isFunction, isGlobalOperation, isOperationParameters, supportsLimitedCharset } from "../index.js";
+import { isTypeNullable, getPropertyTypeName, extractTypesFromUnion, getInterfaceNavigationSourceType, getSourceInterfaces, checkFunctionOverloadsWithReturnType, isTypeCollection, getDeltaProperties, removeRoutePathParams, getComposableFunctionSegmentFromGraphRoute, removeTrailingSlash, isTypeDefinedInExternalLibrary } from "../utils.js";
 import { getDefaultPropertyValue } from "./property.js";
+import { buildAttributes } from "../decorators/ags-attribute.js";
+import { GetRevisionDefinition } from "./revision-definition.js";
+import { usedLibraryTypesKey } from "./namespace.js";
+import { getMsGraphAddressUrl, getMsGraphAddressUrlMsa } from "./address-url.js";
 export var OperationKind;
 (function (OperationKind) {
     OperationKind[OperationKind["Unknown"] = 0] = "Unknown";
     OperationKind[OperationKind["Action"] = 1] = "Action";
     OperationKind[OperationKind["Function"] = 2] = "Function";
-})(OperationKind = OperationKind || (OperationKind = {}));
-export function GetMsGraphOperation(program, operation) {
-    const bindingTypeName = getBindingTypeName(program, operation);
-    if (!bindingTypeName) {
-        return undefined;
-    }
+})(OperationKind || (OperationKind = {}));
+export function GetMsGraphOperations(program, interfaces) {
+    let operations = new Array();
+    [...interfaces].flatMap(([_, $interface]) => [...$interface.operations].filter(([_, $operation]) => [...$operation.decorators].filter(($decoratorApplication) => { var _a, _b; return ((_a = $decoratorApplication.definition) === null || _a === void 0 ? void 0 : _a.name) === "@function" || ((_b = $decoratorApplication.definition) === null || _b === void 0 ? void 0 : _b.name) === "@action"; }).length || isAction(program, $operation) || isFunction(program, $operation)))
+        .forEach(([_, operation]) => {
+        const bindingTypeName = getBindingTypeName(program, operation);
+        if (!bindingTypeName) {
+            return;
+        }
+        operations.push(GetMsGraphOperation(program, bindingTypeName, operation));
+    });
+    operations = applyFunctionOverloadingRules(operations);
+    return operations;
+}
+function GetMsGraphOperation(program, bindingTypeName, operation) {
+    const parameterProperties = deleteRoutingParameters(program, operation);
     const element = {
         Name: "",
         Kind: OperationKind.Unknown,
         BindingTypeName: bindingTypeName,
         AgsAttributes: buildAttributes(program, operation),
-        Properties: getParameterProperties(program, operation.parameters.properties),
-        UnionProperties: new Array,
+        Properties: getParameterProperties(program, parameterProperties),
+        UnionProperties: new Array(),
         IsVoid: isVoidType(operation.returnType),
         IsNullable: false,
+        IsComposable: undefined,
         ReturnTypeName: "",
-        Description: getDoc(program, operation)
+        Description: getDoc(program, operation),
+        DeltaProperties: undefined,
+        RevisionDefinition: GetRevisionDefinition(program, operation, operation.namespace),
+        IsGlobalOperation: isGlobalOperation(program, operation),
+        ReturnSource: hasReturnSource(program, operation) ? getReturnSource(program, operation) : null,
+        AddressUrl: getMsGraphAddressUrl(program, operation),
+        AddressUrlMsa: getMsGraphAddressUrlMsa(program, operation),
     };
     if (!element.IsVoid) {
-        const returnType = operation.returnType.kind === "Model" && !!operation.returnType.templateMapper && !!operation.returnType.templateMapper.args.length
-            ? operation.returnType.templateMapper.args[0]
-            : operation.returnType;
+        let returnType = operation.returnType;
+        // Remove unions with Error responses added in by standard Operation base op.
+        if (returnType.kind === "Union") {
+            const unionTypes = extractTypesFromUnion(returnType);
+            const filteredTypes = unionTypes.filter((type) => {
+                if (type.kind === "Model" && type.name.endsWith("ErrorResponse")) {
+                    return false;
+                }
+                return true;
+            });
+            returnType = filteredTypes[0];
+        }
         if (!returnType || isVoidType(returnType)) {
             element.IsVoid = true;
         }
+        if (isTypeDefinedInExternalLibrary(program, returnType)) {
+            program.stateSet(usedLibraryTypesKey).add(returnType);
+        }
         element.IsNullable = isTypeNullable(program, operation.returnType);
-        element.ReturnTypeName = getPropertyTypeName(program, returnType);
+        element.ReturnTypeName = operation.name === "delta" ? getDeltaCollectionReturnType(program, operation, returnType) : getPropertyTypeName(program, returnType);
     }
     const actionName = getAction(program, operation);
     if (actionName) {
@@ -43,10 +75,13 @@ export function GetMsGraphOperation(program, operation) {
         element.Kind = OperationKind.Action;
     }
     else {
-        const functionName = getFunction(program, operation);
-        if (functionName) {
-            element.Name = functionName;
+        const theFunction = getFunction(program, operation);
+        if (theFunction) {
+            element.Name = theFunction.name;
+            element.IsComposable = theFunction.isComposable;
             element.Kind = OperationKind.Function;
+            element.DeltaProperties = theFunction.isComposable && isTypeCollection(program, operation.returnType)
+                ? generateDeltaPropertiesForComposableFunction(program, operation) : undefined;
             const parameterProperty = operation.parameters.properties.get("parameters");
             if (parameterProperty && parameterProperty.type.kind === "Union") {
                 const parameterProperties = extractTypesFromUnion(parameterProperty.type)
@@ -58,31 +93,133 @@ export function GetMsGraphOperation(program, operation) {
     }
     return element;
 }
+function applyFunctionOverloadingRules(operations) {
+    if (operations.length === 0) {
+        return operations;
+    }
+    const { nonFunctionOperations, functionOperations } = getFunctionOperationsAndOtherOperations(operations);
+    const groupedOverloadedFunctions = getGroupedOverloadedFunctions(functionOperations);
+    const uniqueOperations = [];
+    groupedOverloadedFunctions.forEach((overloadedFunctions) => {
+        if (overloadedFunctions.length === 1) {
+            uniqueOperations.push(overloadedFunctions[0]);
+            return;
+        }
+        const filteredOperations = overloadedFunctions.filter((func, i) => {
+            const remainingFuncs = overloadedFunctions.slice(i + 1);
+            if (remainingFuncs.some(remainingFunc => checkFunctionOverloadsWithReturnType(func, remainingFunc))) {
+                return false;
+            }
+            return true;
+        });
+        uniqueOperations.push(...filteredOperations);
+    });
+    return [...uniqueOperations, ...nonFunctionOperations];
+}
+export function getFunctionOperationsAndOtherOperations(operations) {
+    const { nonFunctionOperations, functionOperations } = [...operations].reduce((accumulationObject, operation) => {
+        if (operation.Kind === OperationKind.Function) {
+            accumulationObject.functionOperations.push(operation);
+        }
+        else {
+            accumulationObject.nonFunctionOperations.push(operation);
+        }
+        return accumulationObject;
+    }, { nonFunctionOperations: [], functionOperations: [] });
+    return { nonFunctionOperations, functionOperations };
+}
+export function getGroupedOverloadedFunctions(operations) {
+    const groupedOperations = new Map();
+    operations.forEach((operation) => {
+        const key = `${operation.Name}:${operation.BindingTypeName}`;
+        if (groupedOperations.has(key)) {
+            groupedOperations.get(key).push(operation);
+        }
+        else {
+            groupedOperations.set(key, [operation]);
+        }
+    });
+    return groupedOperations;
+}
+function getDeltaCollectionReturnType(program, operation, operationReturnType) {
+    const propertyTypeName = getPropertyTypeName(program, operationReturnType);
+    if (getSourceInterfaces(operation.interface).some((theInterface) => theInterface.name === "Collection") && !propertyTypeName.startsWith("Collection")) {
+        return `Collection(${propertyTypeName})`;
+    }
+    return propertyTypeName;
+}
+function deleteRoutingParameters(program, operation) {
+    const parameterProperties = operation.parameters.properties;
+    const paths = getGraphRoutePaths(program, operation.interface);
+    if (paths === null || paths === void 0 ? void 0 : paths.length) {
+        const routingParams = paths.flatMap((path) => extractParamsFromPath(path));
+        parameterProperties.forEach((key, value) => {
+            if (routingParams.includes(key.name)) {
+                parameterProperties.delete(key.name);
+            }
+        });
+    }
+    return parameterProperties;
+}
 function getBindingTypeName(program, operation) {
-    var _a, _b;
-    const bindingType = (_b = (_a = operation.interface) === null || _a === void 0 ? void 0 : _a.operations.get("_isOperation")) === null || _b === void 0 ? void 0 : _b.returnType;
+    const bindingType = getInterfaceNavigationSourceType(program, operation.interface);
     if (!bindingType) {
         return undefined;
     }
-    return getPropertyTypeName(program, bindingType);
+    const propertyTypeName = getPropertyTypeName(program, bindingType);
+    if (getSourceInterfaces(operation.interface).some((theInterface) => theInterface.name === "Collection")) {
+        return `Collection(${propertyTypeName})`;
+    }
+    return propertyTypeName;
 }
 function getParameterProperties(program, parameters) {
     const properties = [...parameters].flatMap(([, property]) => {
-        if (isPathParam(program, property)) {
+        var _a;
+        if (isPathParam(program, property) || property.name === "graphRouteParams") {
             return [];
         }
         if (property.type.kind === "Model" && isOperationParameters(program, property.type)) {
             return getParameterProperties(program, property.type.properties);
         }
-        return [{
+        if (isTypeDefinedInExternalLibrary(program, property.type)) {
+            program.stateSet(usedLibraryTypesKey).add(property.type);
+        }
+        return [
+            {
                 Name: property.name,
                 IsNullable: isTypeNullable(program, property.type),
                 PropertyTypeName: getPropertyTypeName(program, property.type),
                 IsOptional: property.optional,
                 DefaultValue: getDefaultPropertyValue(program, property),
                 Description: getDoc(program, property),
-            }];
+                AgsAttributes: buildAttributes(program, property),
+                RevisionDefinition: GetRevisionDefinition(program, property, (_a = property.model) === null || _a === void 0 ? void 0 : _a.namespace),
+                IsGlobalOperation: false,
+                SupportsLimitedCharset: supportsLimitedCharset(program, property),
+            },
+        ];
     });
     return properties;
 }
+function generateDeltaPropertiesForComposableFunction(program, operation) {
+    if (!operation.interface)
+        return;
+    // graph routes for operation interface
+    const routePaths = getGraphRoutePaths(program, operation.interface)
+        .map(path => removeRoutePathParams(path));
+    let deltaProperties = undefined;
+    for (const [key, value] of getGraphRoutes(program)) {
+        const composableFunction = getComposableFunctionSegmentFromGraphRoute(key);
+        if (!composableFunction)
+            continue;
+        const routeWithoutFunction = removeRoutePathParams(removeTrailingSlash(key.replace(composableFunction, "")));
+        if (routePaths.includes(routeWithoutFunction) && composableFunction.split('(')[0] === operation.name) {
+            deltaProperties = getDeltaProperties(program, value);
+        }
+        if (deltaProperties) {
+            return deltaProperties;
+        }
+    }
+    return;
+}
 //# sourceMappingURL=operation.js.map

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../src/entities/property.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG5D,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,aAAa,GACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAuDrC"}
+{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../src/entities/property.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,aAAa,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAGvE,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,aAAa,GACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAiErC"}

package/dist/src/entities/property.js

@@ -10,6 +10,9 @@ export function getDefaultPropertyValue(program, property) {
         case "Number":
             defaultValueValue = property.default.value;
             break;
+        case "EnumMember":
+            defaultValueValue = property.defaultValue.value.name;
+            break;
         default:
             return undefined;
     }
@@ -44,9 +47,16 @@ export function getDefaultPropertyValue(program, property) {
         case "Edm.Stream":
             defaultValueKey = "Binary";
             break;
+        case "Edm.Guid":
+            defaultValueKey = "Guid";
+            break;
         case "Edm.Duration":
         case "Edm.TimeOfDay":
         default:
+            if (property.type.kind === "Enum") {
+                defaultValueKey = "String";
+                break;
+            }
             return undefined;
     }
     return { [defaultValueKey]: defaultValueValue };

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

@@ -1 +1 @@
-{"version":3,"file":"property.js","sourceRoot":"","sources":["../../../src/entities/property.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,UAAU,uBAAuB,CACrC,OAAgB,EAChB,QAAuB;IAEvB,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;QACrB,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,iBAAiB,GAAQ,SAAS,CAAC;IACvC,QAAQ,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE;QAC7B,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,QAAQ;YACX,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;YAC3C,MAAM;QACR;YACE,OAAO,SAAS,CAAC;KACpB;IAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE7D,IAAI,eAAe,GAAG,QAAQ,CAAC;IAC/B,QAAQ,QAAQ,EAAE;QAChB,KAAK,YAAY;YACf,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,sBAAsB;YACzB,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,UAAU,CAAC;QAChB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW;YACd,eAAe,GAAG,KAAK,CAAC;YACxB,MAAM;QACR,KAAK,YAAY,CAAC;QAClB,KAAK,YAAY;YACf,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,UAAU;YACb,eAAe,GAAG,MAAM,CAAC;YACzB,MAAM;QACR,KAAK,oBAAoB;YACvB,eAAe,GAAG,gBAAgB,CAAC;YACnC,MAAM;QACR,KAAK,aAAa;YAChB,eAAe,GAAG,SAAS,CAAC;YAC5B,MAAM;QACR,KAAK,YAAY;YACf,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,cAAc,CAAC;QACpB,KAAK,eAAe,CAAC;QACrB;YACE,OAAO,SAAS,CAAC;KACpB;IAED,OAAO,EAAE,CAAC,eAAe,CAAC,EAAE,iBAAiB,EAAE,CAAC;AAClD,CAAC"}
+{"version":3,"file":"property.js","sourceRoot":"","sources":["../../../src/entities/property.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,UAAU,uBAAuB,CACrC,OAAgB,EAChB,QAAuB;IAEvB,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,iBAAiB,GAAQ,SAAS,CAAC;IACvC,QAAQ,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC9B,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,QAAQ;YACX,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;YAC3C,MAAM;QACR,KAAK,YAAY;YACb,iBAAiB,GAAI,QAAQ,CAAC,YAA0B,CAAC,KAAK,CAAC,IAAI,CAAC;YACtE,MAAM;QACR;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE7D,IAAI,eAAe,GAAG,QAAQ,CAAC;IAC/B,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,YAAY;YACf,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,sBAAsB;YACzB,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,UAAU,CAAC;QAChB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW;YACd,eAAe,GAAG,KAAK,CAAC;YACxB,MAAM;QACR,KAAK,YAAY,CAAC;QAClB,KAAK,YAAY;YACf,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,UAAU;YACb,eAAe,GAAG,MAAM,CAAC;YACzB,MAAM;QACR,KAAK,oBAAoB;YACvB,eAAe,GAAG,gBAAgB,CAAC;YACnC,MAAM;QACR,KAAK,aAAa;YAChB,eAAe,GAAG,SAAS,CAAC;YAC5B,MAAM;QACR,KAAK,YAAY;YACf,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,UAAU;YACb,eAAe,GAAG,MAAM,CAAC;YACzB,MAAM;QACR,KAAK,cAAc,CAAC;QACpB,KAAK,eAAe,CAAC;QACrB;YACE,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAClC,eAAe,GAAG,QAAQ,CAAC;gBAC3B,MAAM;YACR,CAAC;YACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,EAAE,CAAC,eAAe,CAAC,EAAE,iBAAiB,EAAE,CAAC;AAClD,CAAC"}

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

@@ -1,9 +1,10 @@
-import { Enum, EnumMember, Model, ModelProperty, Namespace, Operation, Program } from "@typespec/compiler";
+import { Enum, EnumMember, Interface, Model, ModelProperty, Namespace, Operation, Program } from "@typespec/compiler";
 export interface RevisionDefinition {
     Date: string;
     Version: string;
     Description?: string;
     RemovalDate: string;
+    Category?: 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 | Interface, namespace: Namespace | undefined): RevisionDefinition | undefined;
 //# sourceMappingURL=revision-definition.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"revision-definition.d.ts","sourceRoot":"","sources":["../../../src/entities/revision-definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAiB,MAAM,oBAAoB,CAAC;AAG1H,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,UAAU,GAAG,IAAI,GAAG,SAAS,GAAG,SAAS,EACvE,SAAS,EAAE,SAAS,GAAG,SAAS,GAC/B,kBAAkB,GAAG,SAAS,CAgBhC"}
+{"version":3,"file":"revision-definition.d.ts","sourceRoot":"","sources":["../../../src/entities/revision-definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAQ,MAAM,oBAAoB,CAAC;AAG5H,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,UAAU,GAAG,IAAI,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,EACnF,SAAS,EAAE,SAAS,GAAG,SAAS,GAC/B,kBAAkB,GAAG,SAAS,CAiBhC"}

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

@@ -1,16 +1,26 @@
-import { getDeprecated } from "@typespec/compiler";
-import { getPrivatePreview, getDeprecatedDefinitions, getPrivatePreviewDefinitions } from "../index.js";
-export function GetRevisionDefinition(program, item, namespace) {
+import { getPrivatePreview, getDeprecatedDefinitions, getPrivatePreviewDefinitions, getGraphDeprecated } from "../index.js";
+export function GetRevisionDefinition(program, type, namespace) {
     if (!namespace) {
         return undefined;
     }
-    const deprecated = getDeprecated(program, item);
+    const deprecated = getGraphDeprecated(program, type);
     if (deprecated) {
         return getRevisionDefinitionFromDeprecation(program, namespace, deprecated);
     }
-    const privatePreview = getPrivatePreview(program, item);
-    if (privatePreview) {
-        return getRevisionDefinitionFromPrivatePreview(program, namespace, privatePreview);
+    const privatePreview = getPrivatePreview(program, type)
+        || getPrivatePreviewFromNamespace(program, type)
+        || undefined;
+    return privatePreview
+        ? getRevisionDefinitionFromPrivatePreview(program, namespace, privatePreview)
+        : undefined;
+}
+function getPrivatePreviewFromNamespace(program, type) {
+    switch (type.kind) {
+        case 'Model':
+        case "Enum":
+        case "Interface":
+        case "Operation":
+            return getPrivatePreview(program, type.namespace);
     }
     return undefined;
 }
@@ -25,6 +35,7 @@ function getRevisionDefinitionFromDeprecation(program, namespace, deprecated) {
         RemovalDate: definition.removalDate,
         Version: `${definition.announcementDate.substring(0, 7)}/${definition.category}`,
         Description: definition.description,
+        Category: definition.category,
     };
 }
 function getRevisionDefinitionFromPrivatePreview(program, namespace, deprecated) {

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

@@ -1 +1 @@
-{"version":3,"file":"revision-definition.js","sourceRoot":"","sources":["../../../src/entities/revision-definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC1H,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AASxG,MAAM,UAAU,qBAAqB,CACnC,OAAgB,EAChB,IAAuE,EACvE,SAAgC;IAEhC,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,SAAS,CAAA;KACjB;IAED,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAChD,IAAI,UAAU,EAAE;QACd,OAAO,oCAAoC,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;KAC7E;IAED,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACxD,IAAI,cAAc,EAAE;QAClB,OAAO,uCAAuC,CAAC,OAAO,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;KACpF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,oCAAoC,CAC3C,OAAgB,EAChB,SAAoB,EACpB,UAAkB;IAElB,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,SAAS,CAAC;KAClB;IAED,OAAO;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB;QACjC,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,OAAO,EAAE,GAAG,UAAU,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,UAAU,CAAC,QAAQ,EAAE;QAChF,WAAW,EAAE,UAAU,CAAC,WAAW;KACpC,CAAC;AACJ,CAAC;AAED,SAAS,uCAAuC,CAC9C,OAAgB,EAChB,SAAoB,EACpB,UAAkB;IAElB,MAAM,yBAAyB,GAAG,4BAA4B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACnF,MAAM,UAAU,GAAG,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC7D,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,SAAS,CAAC;KAClB;IAED,OAAO;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB;QACjC,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,OAAO,EAAE,GAAG,UAAU,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,mBAAmB,UAAU,CAAC,IAAI,EAAE;KAC5F,CAAC;AACJ,CAAC"}
+{"version":3,"file":"revision-definition.js","sourceRoot":"","sources":["../../../src/entities/revision-definition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,4BAA4B,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAU5H,MAAM,UAAU,qBAAqB,CACnC,OAAgB,EAChB,IAAmF,EACnF,SAAgC;IAEhC,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACrD,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,oCAAoC,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC;WAClD,8BAA8B,CAAC,OAAO,EAAE,IAAI,CAAC;WAC7C,SAAS,CAAC;IAEf,OAAO,cAAc;QACnB,CAAC,CAAC,uCAAuC,CAAC,OAAO,EAAE,SAAS,EAAE,cAAc,CAAC;QAC7E,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,SAAS,8BAA8B,CAAC,OAAgB,EAAE,IAAU;IAClE,QAAO,IAAI,CAAC,IAAI,EAAC,CAAC;QAChB,KAAK,OAAO,CAAC;QACb,KAAK,MAAM,CAAC;QACZ,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW;YACd,OAAO,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,SAAiB,CAAC,CAAA;IAC7D,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,oCAAoC,CAC3C,OAAgB,EAChB,SAAoB,EACpB,UAAkB;IAElB,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB;QACjC,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,OAAO,EAAE,GAAG,UAAU,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,UAAU,CAAC,QAAQ,EAAE;QAChF,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,QAAQ,EAAE,UAAU,CAAC,QAAQ;KAC9B,CAAC;AACJ,CAAC;AAED,SAAS,uCAAuC,CAC9C,OAAgB,EAChB,SAAoB,EACpB,UAAkB;IAElB,MAAM,yBAAyB,GAAG,4BAA4B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACnF,MAAM,UAAU,GAAG,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC7D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB;QACjC,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,OAAO,EAAE,GAAG,UAAU,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,mBAAmB,UAAU,CAAC,IAAI,EAAE;KAC5F,CAAC;AACJ,CAAC"}

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

@@ -0,0 +1,8 @@
+import { Namespace, Program } from "@typespec/compiler";
+export interface MsGraphTerm {
+    Name: string;
+    Type: string;
+    Description: string;
+}
+export declare function GetMsGraphTerms(program: Program, namespace: Namespace): MsGraphTerm[];
+//# sourceMappingURL=term.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"term.d.ts","sourceRoot":"","sources":["../../../src/entities/term.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAIxD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,WAAW,EAAE,CAYrF"}

package/dist/src/entities/term.js

@@ -0,0 +1,14 @@
+import { getTerms } from "../index.js";
+import { getNameForModelType } from "../utils.js";
+export function GetMsGraphTerms(program, namespace) {
+    const terms = new Array();
+    getTerms(program, namespace).forEach((term, _) => {
+        terms.push({
+            Name: term.name,
+            Type: getNameForModelType(program, term.type),
+            Description: term.description,
+        });
+    });
+    return terms;
+}
+//# sourceMappingURL=term.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"term.js","sourceRoot":"","sources":["../../../src/entities/term.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAQlD,MAAM,UAAU,eAAe,CAAC,OAAgB,EAAE,SAAoB;IACpE,MAAM,KAAK,GAAG,IAAI,KAAK,EAAe,CAAC;IAEvC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QAC/C,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC;YAC7C,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/src/index.d.ts

@@ -1,4 +1,6 @@
 export * from "./decorators/index.js";
 export * from "./emitter.js";
+export * from "./validate.js";
 export * from "./linter.js";
+export { $flags } from "./lib.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC"}

package/dist/src/index.js

@@ -1,4 +1,6 @@
 export * from "./decorators/index.js";
 export * from "./emitter.js";
+export * from "./validate.js";
 export * from "./linter.js";
+export { $flags } from "./lib.js";
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC"}