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

package/dist/src/utils.js

@@ -1,5 +1,6 @@
 import { getNamespaceFullName, isArrayModelType, } from "@typespec/compiler";
 import { getEntity, isEntity } from "./decorators/index.js";
+import { getRoutePath } from "@typespec/http";
 export function getNameForType(program, type) {
     switch (type.kind) {
         case "Union":
@@ -87,6 +88,30 @@ export function getNavigationTypeId(program, getOperation) {
     }
     return getIdForType(program, returnType.templateArguments[0]);
 }
+export function getInterfacesOfKinds(program, navigationSources, kinds) {
+    const map = new Map();
+    navigationSources.forEach(theInterface => {
+        var _a;
+        if (!theInterface.sourceInterfaces.some(s => kinds.includes(s.name))) {
+            // if source interfaces DO NOT have the kinds.
+            return;
+        }
+        const routePath = (_a = getRoutePath(program, theInterface)) === null || _a === void 0 ? void 0 : _a.path.split("/")[0];
+        if (!routePath) {
+            return;
+        }
+        let operations = [...theInterface.operations.values()];
+        if (map.has(routePath)) {
+            const existing = map.get(routePath);
+            operations = [...operations, ...existing.operations];
+        }
+        map.set(routePath, {
+            theInterface: theInterface,
+            operations: operations,
+        });
+    });
+    return map;
+}
 export function getPropertyTypeName(program, type) {
     var _a;
     if (type.kind === "Union") {
@@ -130,6 +155,28 @@ export function getSingletonTypeId(program, singletonType, getOperation) {
     }
     return getOperation && getNavigationTypeId(program, getOperation);
 }
+/**
+ * Returns whether a type used as a return type matches Graph's  definition of a collection
+ * @param program
+ * @param returnType
+ */
+export function isReturnTypeCollection(program, returnType) {
+    let returnTypes = [];
+    if (returnType.kind === "Model") {
+        returnTypes.push(returnType);
+    }
+    else if (returnType.kind === "Union") {
+        const extracted = extractTypesFromUnion(returnType).filter(t => t.kind === "Model");
+        returnTypes = returnTypes.concat(extracted);
+    }
+    if (returnTypes.length === 0) {
+        return false;
+    }
+    return returnTypes.some(t => isTypeCollection(t));
+}
+function isTypeCollection(type) {
+    return type.kind === "Model" && (type.name === "Array" || type.name.includes("Collection"));
+}
 /**
  * Imported from typespec-azure
  * Returns the full namespace name for the given type, if available.
@@ -167,7 +214,12 @@ export function isExcludedCoreType(program, type) {
     // https://github.com/Azure/typespec-azure/issues/801#issuecomment-1194454247
     //
     const nsName = getNamespaceName(program, type);
-    const excludedNamespaces = ["TypeSpec", "TypeSpec"];
+    const excludedNamespaces = ["TypeSpec"];
+    return excludedNamespaces.find((ns) => nsName.startsWith(ns)) !== undefined;
+}
+export function isExcludedLibraryType(program, type) {
+    const nsName = getNamespaceName(program, type);
+    const excludedNamespaces = ["TypeSpec", "MicrosoftGraph"];
     return excludedNamespaces.find((ns) => nsName.startsWith(ns)) !== undefined;
 }
 export function isNavigationProperty(program, property) {
@@ -183,4 +235,40 @@ export function isNavigationProperty(program, property) {
     }
     return isEntity(program, propertyType);
 }
+export function getNavigationSources(program, namespace) {
+    return [...namespace.interfaces.values()].filter(theInterface => isNavigationSource(theInterface));
+}
+export function isNavigationSource(theInterface) {
+    return findNavigationSource(theInterface) !== undefined;
+}
+// Get the type returned by all operations in an interface representing a navigation source.
+// This is the 'T' in EntitySet<T> and friends.
+export function getInterfaceNavigationSourceType(program, theInterface) {
+    var _a;
+    const navSource = findNavigationSource(theInterface);
+    if (navSource === undefined) {
+        return undefined;
+    }
+    else {
+        return (_a = navSource.templateMapper) === null || _a === void 0 ? void 0 : _a.args[0];
+    }
+}
+// Get the type returned by all operations in an interface representing a navigation source.
+export function getNavigationSourceType(program, operation) {
+    return getInterfaceNavigationSourceType(program, operation.interface);
+}
+function findNavigationSource(theInterface) {
+    for (const baseInterface of theInterface.sourceInterfaces) {
+        if (baseInterface.name === "SingleNavigationSource" || baseInterface.name === "CollectionNavigationSource") {
+            return baseInterface;
+        }
+        else {
+            const baseBase = findNavigationSource(baseInterface);
+            if (baseBase !== undefined) {
+                return baseBase;
+            }
+        }
+    }
+    return undefined;
+}
 //# sourceMappingURL=utils.js.map

package/dist/src/utils.js.map

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

package/lib/decorators.tsp

@@ -48,11 +48,11 @@ extern dec count(target: Operation);
  */
 extern dec deprecatedDefinition(
   target: Namespace,
-  name: string,
-  category: string,
-  announcementDate: string,
-  removalDate: string,
-  description: string
+  name: valueof string,
+  category: valueof string,
+  announcementDate: valueof string,
+  removalDate: valueof string,
+  description: valueof string
 );
 
 /**
@@ -69,21 +69,21 @@ extern dec entity(target: Model);
  * `properties` - Property names in the model returned from the get that can be used in a $expand query parameter.
  * At least one property must be specified.
  */
-extern dec expand(target: Operation, property: string, ...otherProperties: string[]);
+extern dec expand(target: Operation, property: valueof string, ...otherProperties: valueof string[]);
 
 /**
  * `@function` - mark an operation as a function
  *
  * `@function` can only be applied to operations.
  */
-extern dec function(target: Operation, name?: string);
+extern dec function(target: Operation, name?: valueof string);
 
 /**
  * `@hasStream` - indicates that an `@entity` model has a stream.
  *
  * `mediaTypes` - list of media types supported by the stream. If not specified, the stream supports any media type.
  */
-extern dec hasStream(target: Model, ...mediaTypes: string[]);
+extern dec hasStream(target: Model, ...mediaTypes: valueof string[]);
 
 /**
  * `@open` - mark a model type as open
@@ -108,7 +108,7 @@ extern dec operationParameters(target: Model);
  * `properties` - List of property names in the model returned from the get operation that can be used in a $orderBy query parameter.
  * At least one property must be specified.
  */
-extern dec orderBy(target: Operation, property: string, ...otherProperties: string[]);
+extern dec orderBy(target: Operation, property: valueof string, ...otherProperties: valueof string[]);
 
 /**
  * `@privatePreview` - Allow us define a privatePreview element.
@@ -116,7 +116,7 @@ extern dec orderBy(target: Operation, property: string, ...otherProperties: stri
  */
 extern dec privatePreview(
   target: Model | ModelProperty | EnumMember | Enum | Operation | Namespace,
-  name: string
+  name: valueof string
 );
 
 /**
@@ -125,10 +125,10 @@ extern dec privatePreview(
  */
 extern dec privatePreviewDefinition(
   target: Namespace,
-  name: string,
-  announcementDate: string,
-  removalDate: string,
-  owner: string
+  name: valueof string,
+  announcementDate: valueof string,
+  removalDate: valueof string,
+  owner: valueof string
 );
 
 /**
@@ -169,3 +169,79 @@ extern dec top(target: Operation);
  * `@writeOnly` can only be applied to model properties.
  */
 extern dec writeOnly(target: ModelProperty);
+
+/**
+ * `@additionalQueryParameters` - Appends a key=value pair to the query string of the mapped internal URL for all models defined within the namespace.
+ * 
+ * `@additionalQueryParameters` can only be applied to namespaces
+ */
+extern dec additionalQueryParameters(target: Namespace, name: valueof string, value: valueof string);
+
+/**
+ * `@agsAttribute` - Allows all AGS CSDL extensions that are not yet modelled explicitly in TypeSpec to be maintained
+ * 
+ * `@agsAttribute` - Applies to models.
+ */
+extern dec agsAttribute(
+  target: Model | ModelProperty | Enum | EnumMember | Operation | Interface,
+  name: valueof string,
+  value: valueof string
+);
+
+/**
+* `@isOwner` - specify that this workload is the primary owner of this entity model
+*
+* `@isOwner` can be applied to Model where the model also has an @entity decorator or a ModelProperty where it has either an @contains or @references decorator.
+*/
+extern dec isOwner(target: Model | ModelProperty);
+
+/**
+ * `@privileged` - mark the entity as privileged
+ *
+ * `@privileged` can be applied to Model, ModelProperty, Enum, EnumMember, Operation, Namespace.
+ */
+extern dec privileged(target: Model | ModelProperty | Enum | EnumMember | Operation | Namespace);
+
+/**
+ * `@workloadName` - specifies the name used by the underlying workload
+ *
+ * `@workloadName` can be applied to Model, ModelProperty, Enum, EnumMember.
+ */
+extern dec workloadName(
+  target: Model | ModelProperty | Enum | EnumMember,
+  workloadName: valueof string
+);
+
+/**
+ * `@workloadNameMsa` - specifies the name used by the underlying workload for consumer use cases
+ *
+ * `@workloadNameMsa` can be applied to Model, ModelProperty, Enum, EnumMember.
+ */
+extern dec workloadNameMsa(
+  target: Model | ModelProperty | Enum | EnumMember,
+  workloadNameMsa: valueof string
+);
+
+/**
+ * `@pagedCollection` - mark a model as representing a paged collection.
+ *
+ * `@pagedCollection` can only be applied to models.
+ */
+extern dec pagedCollection(target: Model);
+
+/**
+ * `@deltaCollection` - mark a model as representing a delta paged collection.
+ *
+ * `@deltaCollection` can only be applied to models.
+ */
+extern dec deltaCollection(target: Model);
+
+/**
+ * `@graphRoute` - mark an interface or operation with an HTTP route.
+ * 
+ * `@graphRoute` - can only be applied to interfaces or operations.
+ */
+// TODO: Using @graphRoute on an operation currently does not work due to the following TypeSpec core issue
+// https://github.com/microsoft/typespec/issues/2106
+// Disabling all related features while we await the outcome.
+extern dec graphRoute(target: Interface /* | Operation */, path: valueof string);

package/lib/deployment.tsp

@@ -0,0 +1,18 @@
+namespace TypeSpec.MsGraph.Deployment;
+
+enum deploymentTargets {
+  prodBeta,
+  prodV1_0,
+  prodEdu,
+  ppeBeta,
+  ppeV1_0,
+  ppeEdu,
+  mooncakeBeta,
+  mooncakeV1_0,
+  fairfaxBeta,
+  fairfaxV1_0,
+  usNatBeta,
+  usNatV1_0,
+  usSecBeta,
+  usSecV1_0
+}

package/lib/lib.tsp

@@ -1,5 +1,5 @@
 import "../dist/src/index.js";
-import "@typespec/rest";
+import "@typespec/http";
 
 using TypeSpec.Http;
 namespace TypeSpec.MsGraph;
@@ -8,28 +8,23 @@ scalar date;
 
 scalar stream;
 
-model ResourceResponse {}
-
 model EmptyParameters {}
 
-model PagedListResponse {}
+// --- Base interfaces for all interfaces that contain operations returning entities.
+interface SingleNavigationSource<T> {}
+interface CollectionNavigationSource<T> {}
 
-interface Item<T> {
-  @head _isOperation(@path id: string): T;
+interface Resource<T> extends SingleNavigationSource<T> {
 }
 
-interface List<T> {
-  @head _isOperation(): T[];
+interface Collection<T> extends CollectionNavigationSource<T> {
 }
 
-interface Singleton<T> {
-  @head _isNavigationSource(@path id: string): T;
+interface Singleton<T>  extends SingleNavigationSource<T> {
 }
 
-interface EntitySet<T> {
-  @head _isNavigationSource(): T[];
+interface EntitySet<T> extends CollectionNavigationSource<T> {
 }
 
-interface EntitySetResource<T> {
-  @head _isNavigationSource(@path id: string): T[];
+interface EntitySetResource<T> extends SingleNavigationSource<T> {
 }

package/lib/msgraph.tsp

@@ -1,2 +1,6 @@
 import "./lib.tsp";
+import "./shared-models.tsp";
+// TODO: import "./deployment.tsp";
+import "./responses.tsp";
 import "./decorators.tsp";
+import "./porcelain.tsp";

package/lib/porcelain.tsp

@@ -0,0 +1,135 @@
+// -------------------------------------------------
+// porcelain.tsp
+// Operation templates to provide a much-simplified syntax for defining standard Graph operations.
+// -------------------------------------------------
+import "@typespec/http";
+import "./lib.tsp";
+import "./shared-models.tsp";
+import "./responses.tsp";
+
+using TypeSpec.Http;
+using TypeSpec.MsGraph;
+using TypeSpec.MsGraph.SharedModels;
+using TypeSpec.MsGraph.Responses;
+
+namespace TypeSpec.MsGraph;
+
+  namespace Foundations {
+
+    @doc("Foundational operations for individual resources and collections.")
+    interface GraphFoundations {
+      op Operation<TParams, TResponse, TErrorResponse>(
+        ...TParams
+      ): TResponse | TErrorResponse;
+
+      op ResourceOperation<
+        TResource extends {},
+        TParams,
+        TResponse,
+        TErrorResponse = ResourceErrorResponse
+      > is GraphFoundations.Operation<TParams, TResponse, TErrorResponse>;
+
+      op CollectionOperation<
+        TResource extends {},
+        TParams,
+        TResponse,
+        TErrorResponse = CollectionErrorResponse
+      > is GraphFoundations.Operation<TParams, TResponse, TErrorResponse>;
+    }
+  }
+
+  @doc("Primary operation shapes for Microsoft Graph")
+  interface GraphOps {
+
+    // TODO: This is how we should make $select standard for Graph.  Define a select decorator and use it here.
+    // @select("*") 
+    @get op GetCollection<
+    TResource extends {} = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams},
+    TResponse = CollectionResponse<TResource>,
+    TErrorResponse = CollectionErrorResponse
+    > is Foundations.GraphFoundations.CollectionOperation<
+      TResource, TParams, TResponse, TErrorResponse>;
+
+    // @select("*")
+    @get op GetPagedCollection<
+    TResource extends {} = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams},
+    TResponse = PagedCollectionResponse<TResource>,
+    TErrorResponse = CollectionErrorResponse
+    > is Foundations.GraphFoundations.CollectionOperation<
+      TResource, TParams, TResponse, TErrorResponse>;
+
+// TODO: GetDelta?  FUnction etc.?
+
+    // @select("*")
+    @post op Post<
+      TResource extends {} = Automatic.CalculatedResourceType,
+      TParams = { ... Automatic.GraphRouteParams, @body body: TResource },
+      TResponse = ResourceCreatedResponse<TResource>,
+      TErrorResponse = CollectionErrorResponse
+    > is Foundations.GraphFoundations.CollectionOperation<
+      TResource, TParams, TResponse, TErrorResponse>;
+        
+    // @select("*")
+    @get op Get<
+    TResource extends {} = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams},
+    TResponse = ResourceResponse<TResource>,
+    TErrorResponse = ResourceErrorResponse
+    > is Foundations.GraphFoundations.ResourceOperation<
+      TResource, TParams, TResponse, TErrorResponse>;
+
+    @delete op Delete<
+    TResource extends {} = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams},
+    TResponse = EmptyResponse,
+    TErrorResponse = ResourceErrorResponse
+    > is Foundations.GraphFoundations.ResourceOperation<
+      TResource, TParams, TResponse, TErrorResponse>;
+
+    @patch op PatchNoResponse<
+    TResource extends {} = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams},
+    TResponse = EmptyResponse,
+    TErrorResponse = ResourceErrorResponse
+    > is Foundations.GraphFoundations.ResourceOperation<
+      TResource, TParams, TResponse, TErrorResponse>;
+
+    // @select("*")
+    @patch op PatchWithResponse<
+    TResource extends {} = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams},
+    TResponse = ResourceResponse<TResource>,
+    TErrorResponse = ResourceErrorResponse
+    > is Foundations.GraphFoundations.ResourceOperation<
+      TResource, TParams, TResponse, TErrorResponse>;
+
+    @put op PutNoResponse<
+    TResource extends {} = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams},
+    TResponse = EmptyResponse,
+    TErrorResponse = ResourceErrorResponse
+    > is Foundations.GraphFoundations.ResourceOperation<
+      TResource, TParams, TResponse, TErrorResponse>;
+
+    // @select("*")
+    @put op PutWithResponse<
+    TResource extends {} = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams},
+    TResponse = ResourceResponse<TResource>,
+    TErrorResponse = ResourceErrorResponse
+    > is Foundations.GraphFoundations.ResourceOperation<
+      TResource, TParams, TResponse, TErrorResponse>;
+
+  }
+
+  namespace Automatic {
+    @doc("Marker type to allow injection of parameters from @route decorator.")
+    model GraphRouteParams { graphRouteParams: string }
+
+  // TODO: Needs direct support in the graphRoute decorator code to be able to make use of this.
+    @doc("Marker type to indicate to emitter that it should calculate resource from the Resource type of the containing interface's extended interface.")
+    model CalculatedResourceType {}
+  }
+

package/lib/responses.tsp

@@ -0,0 +1,82 @@
+// -------------------------------------------------
+// responses.tsp
+// Standard responses that Graph will return.
+// -------------------------------------------------
+import "@typespec/http";
+import "@microsoft/typespec-msgraph";
+import "./shared-models.tsp";
+
+using TypeSpec.Http;
+using TypeSpec.MsGraph;
+using TypeSpec.MsGraph.SharedModels;
+
+// Raw body models represent the content of the response body, without any additional metadata.
+// Note that these are primarily marker types.  CSDL has no notion of what actual body content is returned in such types,
+// but by passing markers through, HIDI can translate to OpenAPI.
+// The content of the types exists for other future emitters that run directly off TypeSpec.
+namespace TypeSpec.MsGraph.Responses.Bodies {
+
+  @error
+  model ErrorBody {
+    error: publicError;
+  }
+
+  model ResourceBody<TResource> {
+   ...TResource;
+  }
+
+  model CollectionBody<TResource> {
+    value: TResource[];
+    `@odata.count`?: int64;
+  }
+
+  @pagedCollection
+  model PagedCollectionBody<TResource> is CollectionBody<TResource> {
+    `@odata.nextLink`?: url;
+  }
+
+  @pagedCollection
+  @deltaCollection
+  model DeltaCollectionBody<TResource> is PagedCollectionBody<TResource> {
+    `@odata.deltaLink`?: url;
+  }
+}
+
+// Response models represent the response as a whole, including the status code, headers, and body.
+namespace TypeSpec.MsGraph.Responses {
+  @doc("Response to represent a Microsoft Graph collection response payload.")
+  model CollectionResponse<TResource, TStatus = 200, TBody = Bodies.CollectionBody<TResource>> 
+    is Http.Response<TStatus> {
+    ...Http.Body<TBody>;
+  }
+
+  @doc("Response to represent a Microsoft Graph paged collection response payload.")
+  model PagedCollectionResponse<TResource, TStatus = 200, TBody = Bodies.PagedCollectionBody<TResource>>
+    is CollectionResponse<TResource, TStatus, TBody>;
+
+  @doc("Response to represent a Microsoft Graph individual resource response payload.")
+  model ResourceResponse<TResource, TStatus = 200, TBody = Bodies.ResourceBody<TResource>>
+    is Http.Response<TStatus> {
+    ...Http.Body<TBody>;
+  }
+
+  @doc("Response to represent a Microsoft Graph resource creation response payload.")
+  model ResourceCreatedResponse<TResource, TStatus = 201, TBody = Bodies.ResourceBody<TResource>>
+    is ResourceResponse<TResource, TStatus, TBody> {
+    ...Http.LocationHeader
+  }
+
+  @doc("Response to represent a Microsoft Graph empty response payload.")
+  model EmptyResponse
+    is Http.Response<204>;
+  
+  @doc("Response to represent a Microsoft Graph error response payload.")
+  model ErrorResponse<TStatus>
+   is Http.Response<TStatus> {
+    ...Http.Body<Bodies.ErrorBody>;
+  }
+
+  alias ResourceErrorResponse = ErrorResponse<400 | 404 | 429>;
+  alias CollectionErrorResponse = ErrorResponse<400 | 429>;
+  
+}

package/lib/shared-models.tsp

@@ -0,0 +1,74 @@
+// -------------------------------------------------
+// shared-models.tsp
+// Common types shared among many workloads on Microsoft Graph
+// -------------------------------------------------
+import "@microsoft/typespec-msgraph";
+
+using TypeSpec.MsGraph;
+
+namespace TypeSpec.MsGraph.SharedModels;
+
+  // TODO: Spec how to deal with specified and unspecified ultimate base entities w.r.t. AGS runtime replacement policies. See #140
+  @doc("The primary entity base model for Microsoft Graph.")
+  @entity
+  model msGraphEntity {
+    @key id: string;
+  }
+
+  @doc("Complex type to represent an identity principal by id, when a human-readable name is also useful.")
+  @complex
+  @open
+  model identity {
+    id: string;
+    displayName: string;
+  }
+
+  @doc("Complex type to represent a group of identity principals used at a point in time, such as createdBy, lastModifiedBy.")
+  @complex
+  @open
+  model identitySet {
+    user: identity | null;
+    device: identity | null;
+    application: identity | null;
+  }
+
+  @doc("Enum for identifying the format of a text string.")
+  enum bodyType {
+    text,
+    html
+  }
+
+  @doc("Complex type to represent a chunk of text that could be either plain text or html.")
+  @complex
+  model itemBody {
+    contentType: bodyType;
+    content: string;
+  }
+
+  @doc("Scalar type for URLs that would be expected to work in the browser address bar.")
+  scalar webUrl extends string;
+
+  @doc("Scalar type for URLs that represent Graph APIs.")
+  scalar url extends string;
+
+  @doc("Complex type to represent a nested error that potentially has other recursive nested errors.")
+  @complex
+  @open
+  model innerError {
+    code: string;
+    innererror: innerError | null;
+  }
+
+  @doc("""
+  Complex type to represent a standard Microsoft Graph error.
+  {code}: The error code.
+  """)
+  @complex
+  @error
+  model publicError {
+    code: string;
+    message: string;
+    target: string | null;
+    innererror: innerError | null;
+    details: publicError[];
+  }