@microsoft/typespec-msgraph 0.0.1-Preview.14 → 0.0.1-Preview.16

package/lib/porcelain.tsp

@@ -23,14 +23,14 @@ namespace MsGraph;
       ): TResponse | TErrorResponse;
 
       op ResourceOperation<
-        TResource extends {},
+        TResource,
         TParams,
         TResponse,
         TErrorResponse = ResourceErrorResponse
       > is GraphFoundations.Operation<TParams, TResponse, TErrorResponse>;
 
       op CollectionOperation<
-        TResource extends {},
+        TResource,
         TParams,
         TResponse,
         TErrorResponse = CollectionErrorResponse
@@ -42,7 +42,7 @@ namespace MsGraph;
   interface GraphOps {
 
     @get op GetCollection<
-    TResource extends {} = Automatic.CalculatedResourceType,
+    TResource = Automatic.CalculatedResourceType,
     TParams =  {... Automatic.GraphRouteParams},
     TResponse = CollectionResponse<TResource>,
     TErrorResponse = CollectionErrorResponse
@@ -50,7 +50,7 @@ namespace MsGraph;
       TResource, TParams, TResponse, TErrorResponse>;
 
     @get op GetPagedCollection<
-    TResource extends {} = Automatic.CalculatedResourceType,
+    TResource = Automatic.CalculatedResourceType,
     TParams =  {... Automatic.GraphRouteParams},
     TResponse = PagedCollectionResponse<TResource>,
     TErrorResponse = CollectionErrorResponse
@@ -60,23 +60,39 @@ namespace MsGraph;
 // TODO: GetDelta?  FUnction etc.?
 
     @post op Post<
-      TResource extends {} = Automatic.CalculatedResourceType,
+      TResource = Automatic.CalculatedResourceType,
       TParams = { ... Automatic.GraphRouteParams, @body body: TResource },
       TResponse = ResourceCreatedResponse<TResource>,
       TErrorResponse = CollectionErrorResponse
     > is Foundations.GraphFoundations.CollectionOperation<
       TResource, TParams, TResponse, TErrorResponse>;
         
+    @post op PostMediaValue<
+      TResource,
+      TParams = { ... Automatic.GraphRouteParams, ...TResource },
+      TResponse = ResourceCreatedResponse<TResource>,
+      TErrorResponse = CollectionErrorResponse
+    > is Foundations.GraphFoundations.CollectionOperation<
+      TResource, TParams, TResponse, TErrorResponse>;
+        
     @get op GetResource<
-    TResource extends {} = Automatic.CalculatedResourceType,
+    TResource = Automatic.CalculatedResourceType,
     TParams =  {... Automatic.GraphRouteParams},
     TResponse = ResourceResponse<TResource>,
     TErrorResponse = ResourceErrorResponse
     > is Foundations.GraphFoundations.ResourceOperation<
       TResource, TParams, TResponse, TErrorResponse>;
 
+    @get op GetMediaValue<
+    TResource,
+    TParams =  {... Automatic.GraphRouteParams, @path value:"$value"},
+    TResponse = ResourceResponse<TResource>,
+    TErrorResponse = ResourceErrorResponse
+    > is Foundations.GraphFoundations.ResourceOperation<
+      TResource, TParams, TResponse, TErrorResponse>;
+
     @delete op Delete<
-    TResource extends {} = Automatic.CalculatedResourceType,
+    TResource = Automatic.CalculatedResourceType,
     TParams =  {... Automatic.GraphRouteParams},
     TResponse = EmptyResponse,
     TErrorResponse = ResourceErrorResponse
@@ -84,41 +100,50 @@ namespace MsGraph;
       TResource, TParams, TResponse, TErrorResponse>;
 
     @patch op PatchNoResponse<
-    TResource extends {} = Automatic.CalculatedResourceType,
-    TParams =  {... Automatic.GraphRouteParams},
+    TResource = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams, @body body: TResource},
     TResponse = EmptyResponse,
     TErrorResponse = ResourceErrorResponse
     > is Foundations.GraphFoundations.ResourceOperation<
       TResource, TParams, TResponse, TErrorResponse>;
 
     @patch op PatchWithResponse<
-    TResource extends {} = Automatic.CalculatedResourceType,
-    TParams =  {... Automatic.GraphRouteParams},
+    TResource = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams, @body body: TResource},
     TResponse = ResourceResponse<TResource>,
     TErrorResponse = ResourceErrorResponse
     > is Foundations.GraphFoundations.ResourceOperation<
       TResource, TParams, TResponse, TErrorResponse>;
 
     @put op PutNoResponse<
-    TResource extends {} = Automatic.CalculatedResourceType,
-    TParams =  {... Automatic.GraphRouteParams},
+    TResource = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams, @body body: TResource},
     TResponse = EmptyResponse,
     TErrorResponse = ResourceErrorResponse
     > is Foundations.GraphFoundations.ResourceOperation<
       TResource, TParams, TResponse, TErrorResponse>;
 
     @put op PutWithResponse<
-    TResource extends {} = Automatic.CalculatedResourceType,
-    TParams =  {... Automatic.GraphRouteParams},
+    TResource = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams, @body body: TResource},
     TResponse = ResourceResponse<TResource>,
     TErrorResponse = ResourceErrorResponse
     > is Foundations.GraphFoundations.ResourceOperation<
       TResource, TParams, TResponse, TErrorResponse>;
 
+    @put op PutMediaValueNoResponse<
+    TResource,
+    TParams =  {... Automatic.GraphRouteParams, @path value:"$value", ...TResource},
+    TResponse = EmptyResponse,
+    TErrorResponse = ResourceErrorResponse
+    > is Foundations.GraphFoundations.ResourceOperation<
+      TResource, TParams, TResponse, TErrorResponse>;
+
+
     @action op Action<
     TReturnType = void,
     TActionParams extends {} = {},
-    TResource extends {} = Automatic.CalculatedResourceType,
+    TResource = Automatic.CalculatedResourceType,
     TParams =  {... Automatic.GraphRouteParams, ... TActionParams},
     TResponse = TReturnType,
     TErrorResponse = MsGraph.Responses.OperationErrorResponse
@@ -127,7 +152,7 @@ namespace MsGraph;
     @function op Function<
     TReturnType,
     TFunctionParams extends {} = {},
-    TResource extends {} = Automatic.CalculatedResourceType,
+    TResource = Automatic.CalculatedResourceType,
     TParams =  {... Automatic.GraphRouteParams, ... TFunctionParams},
     TResponse = TReturnType,
     TErrorResponse = MsGraph.Responses.OperationErrorResponse
@@ -137,7 +162,7 @@ namespace MsGraph;
 
   namespace Automatic {
     @doc("Marker type to allow injection of parameters from @route decorator.")
-    model GraphRouteParams { graphRouteParams: string }
+    model GraphRouteParams { @path 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.")

package/lib/responses.tsp

@@ -5,60 +5,12 @@
 import "@typespec/http";
 import "@microsoft/typespec-msgraph";
 import "./shared-models.tsp";
+import "./bodies.tsp";
 
 using TypeSpec.Http;
 using MsGraph;
 using 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 MsGraph.Responses.Bodies {
-
-  /** Complex type to represent a nested error that potentially has other recursive nested errors. */
-  @error
-  model InnerError {
-    code: string;
-    innererror: InnerError | null; // Small e for error NOT a typo.
-  }
-
-  /** Complex type to represent a standard Microsoft Graph error. */
-  @error
-  model GraphError {
-    code: string;
-    message: string;
-    localizedMessage: string;
-    target: string | null;
-    innererror: InnerError | null;  // Small e for error NOT a typo.
-    details: GraphError[];
-  }
-
-  @error
-  model ErrorBody {
-    error: GraphError;
-  }
-
-  model ResourceBody<TResource> {
-   ...TResource;
-  }
-
-  model CollectionBody<TResource> {
-    value: TResource[];
-    `@odata.count`?: int64;
-  }
-
-  @pagedCollection
-  model PagedCollectionBody<TResource> is CollectionBody<TResource> {
-    `@odata.nextLink`?: MsGraph.SharedModels.url;
-  }
-
-  @pagedCollection
-  @deltaCollection
-  model DeltaCollectionBody<TResource> is PagedCollectionBody<TResource> {
-    `@odata.deltaLink`?: MsGraph.SharedModels.url;
-  }
-}
+using MsGraph.Bodies;
 
 // Response models represent the response as a whole, including the status code, headers, and body.
 namespace MsGraph.Responses {
@@ -73,7 +25,7 @@ namespace MsGraph.Responses {
     is CollectionResponse<TResource, TStatus, TBody>;
 
   /** Response to represent a Microsoft Graph individual resource response payload. */
-  model ResourceResponse<TResource, TStatus = 200, TBody = Bodies.ResourceBody<TResource>>
+  model ResourceResponse<TResource, TStatus = 200, TBody = TResource>
     is Http.Response<TStatus> {
     ...Http.Body<TBody>;
   }
@@ -85,7 +37,7 @@ namespace MsGraph.Responses {
   }
 
   /** Response to represent a Microsoft Graph resource creation response payload. */
-  model ResourceCreatedResponse<TResource, TStatus = 201, TBody = Bodies.ResourceBody<TResource>>
+  model ResourceCreatedResponse<TResource, TStatus = 201, TBody = TResource>
     is ResourceResponse<TResource, TStatus, TBody> {
     ...Http.LocationHeader
   }

package/lib/shared-models.tsp

@@ -18,8 +18,8 @@ namespace MsGraph.SharedModels;
 
 
   @doc("Scalar type for URLs that would be expected to work in the browser address bar.")
-  scalar webUrl extends string;
+  scalar webUrl extends url;
 
   @doc("Scalar type for URLs that represent Graph APIs.")
-  scalar url extends string;
+  scalar graphUrl extends url;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/typespec-msgraph",
-  "version": "0.0.1-Preview.14",
+  "version": "0.0.1-Preview.16",
   "author": "Microsoft Corporation",
   "description": "TypeSpec for Microsoft Graph provides a description of the Microsoft Graph APIs. It is used for generating API description languages, client and service code, documentation, and other assets.",
   "homepage": "https://github.com/microsoftgraph/typespec-msgraph",
@@ -53,8 +53,8 @@
   ],
   "dependencies": {
     "@xmldom/xmldom": "~0.8.4",
-    "@typespec/compiler": "~0.52.0",
-    "@typespec/http": "~0.52.0",
+    "@typespec/compiler": "~0.53.1",
+    "@typespec/http": "~0.53.0",
     "prettier": "~3.1.1",
     "react-dom": "~18.2.0",
     "react": "~18.2.0",
@@ -65,7 +65,7 @@
     "@types/node": "~18.11.9",
     "@types/react": "~18.0.5",
     "@types/react-reconciler": "~0.28.0",
-    "@typespec/eslint-config-typespec": "~0.52.0",
+    "@typespec/eslint-config-typespec": "~0.53.0",
     "c8": "~8.0.1",
     "eslint": "^8.49.0",
     "mocha": "~10.2.0",

package/dist/src/decorators/has-stream.d.ts

@@ -1,10 +0,0 @@
-import { DecoratorContext, Model, Program } from "@typespec/compiler";
-/**
- * `@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.
- */
-export declare function $hasStream(context: DecoratorContext, target: Model, args?: string, ...mediaTypes: string[]): void;
-export declare function hasStream(program: Program, target: Model): boolean;
-export declare function getStreamTypes(program: Program, target: Model): string[];
-//# sourceMappingURL=has-stream.d.ts.map

package/dist/src/decorators/has-stream.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"has-stream.d.ts","sourceRoot":"","sources":["../../../src/decorators/has-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAItE;;;;GAIG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,EACb,IAAI,CAAC,EAAE,MAAM,EACb,GAAG,UAAU,EAAE,MAAM,EAAE,QAOxB;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,GAAG,OAAO,CAElE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,EAAE,CAExE"}

package/dist/src/decorators/has-stream.js

@@ -1,17 +0,0 @@
-const hasStreamKey = Symbol("hasStream");
-/**
- * `@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.
- */
-export function $hasStream(context, target, args, ...mediaTypes) {
-    const types = args ? [args, ...mediaTypes] : [];
-    context.program.stateMap(hasStreamKey).set(target, types.filter((t) => t.trim()));
-}
-export function hasStream(program, target) {
-    return program.stateMap(hasStreamKey).has(target);
-}
-export function getStreamTypes(program, target) {
-    return program.stateMap(hasStreamKey).get(target) || [];
-}
-//# sourceMappingURL=has-stream.js.map

package/dist/src/decorators/has-stream.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"has-stream.js","sourceRoot":"","sources":["../../../src/decorators/has-stream.ts"],"names":[],"mappings":"AAEA,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAEzC;;;;GAIG;AACH,MAAM,UAAU,UAAU,CACxB,OAAyB,EACzB,MAAa,EACb,IAAa,EACb,GAAG,UAAoB;IAEvB,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChD,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,GAAG,CACxC,MAAM,EACN,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAC9B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,OAAgB,EAAE,MAAa;IACvD,OAAO,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAgB,EAAE,MAAa;IAC5D,OAAO,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AAC1D,CAAC"}

package/dist/src/rules/has-stream.d.ts

@@ -1,3 +0,0 @@
-import { Program } from "@typespec/compiler";
-export declare function validateHasStreamOnlyOnEntity(program: Program): void;
-//# sourceMappingURL=has-stream.d.ts.map

package/dist/src/rules/has-stream.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"has-stream.d.ts","sourceRoot":"","sources":["../../../src/rules/has-stream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAA4B,MAAM,oBAAoB,CAAC;AAGvE,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,QAsB7D"}

package/dist/src/rules/has-stream.js

@@ -1,30 +0,0 @@
-import { hasStream } from "../decorators/has-stream.js";
-import { isEntity } from "../index.js";
-import { reportDiagnostic } from "../lib.js";
-import { navigateTypesInNamespace } from "@typespec/compiler";
-import { GetDeclaredNamespaces } from "../entities/namespace.js";
-export function validateHasStreamOnlyOnEntity(program) {
-    for (const namespace of GetDeclaredNamespaces(program)) {
-        navigateTypesInNamespace(namespace, {
-            model: (model) => {
-                if (!hasStream(program, model)) {
-                    return;
-                }
-                if (isEntity(program, model)) {
-                    return;
-                }
-                reportDiagnostic(program, {
-                    code: "decorator-invalid-use",
-                    target: model,
-                    messageId: "wrongType",
-                    format: {
-                        decorator: "@hasStream",
-                        target: "@entity model",
-                    },
-                });
-            },
-        });
-    }
-}
-;
-//# sourceMappingURL=has-stream.js.map

package/dist/src/rules/has-stream.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"has-stream.js","sourceRoot":"","sources":["../../../src/rules/has-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAW,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,MAAM,UAAU,6BAA6B,CAAC,OAAgB;IAC5D,KAAK,MAAM,SAAS,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE;QACtD,wBAAwB,CAAC,SAAS,EAAE;YAClC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;oBAC9B,OAAO;iBACR;gBACD,IAAI,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;oBAC5B,OAAO;iBACR;gBACD,gBAAgB,CAAC,OAAO,EAAE;oBACxB,IAAI,EAAE,uBAAuB;oBAC7B,MAAM,EAAE,KAAK;oBACb,SAAS,EAAE,WAAW;oBACtB,MAAM,EAAE;wBACN,SAAS,EAAE,YAAY;wBACvB,MAAM,EAAE,eAAe;qBACxB;iBACF,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;KACJ;AACH,CAAC;AAAA,CAAC"}