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

package/lib/porcelain.tsp

@@ -41,8 +41,6 @@ namespace MsGraph;
   @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},
@@ -51,7 +49,6 @@ namespace MsGraph;
     > is Foundations.GraphFoundations.CollectionOperation<
       TResource, TParams, TResponse, TErrorResponse>;
 
-    // @select("*")
     @get op GetPagedCollection<
     TResource extends {} = Automatic.CalculatedResourceType,
     TParams =  {... Automatic.GraphRouteParams},
@@ -62,7 +59,6 @@ namespace MsGraph;
 
 // TODO: GetDelta?  FUnction etc.?
 
-    // @select("*")
     @post op Post<
       TResource extends {} = Automatic.CalculatedResourceType,
       TParams = { ... Automatic.GraphRouteParams, @body body: TResource },
@@ -71,7 +67,6 @@ namespace MsGraph;
     > is Foundations.GraphFoundations.CollectionOperation<
       TResource, TParams, TResponse, TErrorResponse>;
         
-    // @select("*")
     @get op GetResource<
     TResource extends {} = Automatic.CalculatedResourceType,
     TParams =  {... Automatic.GraphRouteParams},
@@ -96,7 +91,6 @@ namespace MsGraph;
     > is Foundations.GraphFoundations.ResourceOperation<
       TResource, TParams, TResponse, TErrorResponse>;
 
-    // @select("*")
     @patch op PatchWithResponse<
     TResource extends {} = Automatic.CalculatedResourceType,
     TParams =  {... Automatic.GraphRouteParams},
@@ -113,7 +107,6 @@ namespace MsGraph;
     > is Foundations.GraphFoundations.ResourceOperation<
       TResource, TParams, TResponse, TErrorResponse>;
 
-    // @select("*")
     @put op PutWithResponse<
     TResource extends {} = Automatic.CalculatedResourceType,
     TParams =  {... Automatic.GraphRouteParams},
@@ -122,6 +115,24 @@ namespace MsGraph;
     > is Foundations.GraphFoundations.ResourceOperation<
       TResource, TParams, TResponse, TErrorResponse>;
 
+    @action op Action<
+    TReturnType = void,
+    TActionParams extends {} = {},
+    TResource extends {} = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams, ... TActionParams},
+    TResponse = TReturnType,
+    TErrorResponse = MsGraph.Responses.OperationErrorResponse
+    >(...TParams): TResponse | TErrorResponse;
+
+    @function op Function<
+    TReturnType,
+    TFunctionParams extends {} = {},
+    TResource extends {} = Automatic.CalculatedResourceType,
+    TParams =  {... Automatic.GraphRouteParams, ... TFunctionParams},
+    TResponse = TReturnType,
+    TErrorResponse = MsGraph.Responses.OperationErrorResponse
+    >(...TParams): TResponse | TErrorResponse;
+
   }
 
   namespace Automatic {

package/lib/responses.tsp

@@ -16,9 +16,27 @@ using MsGraph.SharedModels;
 // 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: publicError;
+    error: GraphError;
   }
 
   model ResourceBody<TResource> {
@@ -44,33 +62,39 @@ namespace MsGraph.Responses.Bodies {
 
 // Response models represent the response as a whole, including the status code, headers, and body.
 namespace MsGraph.Responses {
-  @doc("Response to represent a Microsoft Graph collection response payload.")
+  /** 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.")
+  /** 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.")
+  /** 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.")
+  /** Response to represent a Microsoft Graph individual resource response payload. */
+  model ScalarResponse<TScalar, TStatus = 200, TBody = TScalar>
+    is Http.Response<TStatus> {
+    ...Http.Body<TBody>;
+  }
+
+  /** 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.")
+  /** 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.")
+  /** Response to represent a Microsoft Graph error response payload. */
   model ErrorResponse<TStatus>
    is Http.Response<TStatus> {
     ...Http.Body<Bodies.ErrorBody>;
@@ -78,5 +102,6 @@ namespace MsGraph.Responses {
 
   alias ResourceErrorResponse = ErrorResponse<400 | 404 | 429>;
   alias CollectionErrorResponse = ErrorResponse<400 | 429>;
+  alias OperationErrorResponse = ErrorResponse<400 | 429>;
   
 }

package/lib/shared-models.tsp

@@ -16,35 +16,6 @@ namespace MsGraph.SharedModels;
     @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;
@@ -52,24 +23,3 @@ namespace MsGraph.SharedModels;
   @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[];
-  }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/typespec-msgraph",
-  "version": "0.0.1-Preview.12",
+  "version": "0.0.1-Preview.14",
   "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,10 +53,9 @@
   ],
   "dependencies": {
     "@xmldom/xmldom": "~0.8.4",
-    "@typespec/compiler": "~0.49.0",
-    "@typespec/http": "~0.49.0",
-    "@typespec/lint": "~0.49.0",
-    "prettier": "~2.8.7",
+    "@typespec/compiler": "~0.52.0",
+    "@typespec/http": "~0.52.0",
+    "prettier": "~3.1.1",
     "react-dom": "~18.2.0",
     "react": "~18.2.0",
     "react-reconciler": "~0.27.0"
@@ -64,10 +63,9 @@
   "devDependencies": {
     "@types/mocha": "~10.0.1",
     "@types/node": "~18.11.9",
-    "@types/prettier": "2.6.0",
     "@types/react": "~18.0.5",
     "@types/react-reconciler": "~0.28.0",
-    "@typespec/eslint-config-typespec": "~0.49.0",
+    "@typespec/eslint-config-typespec": "~0.52.0",
     "c8": "~8.0.1",
     "eslint": "^8.49.0",
     "mocha": "~10.2.0",

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

@@ -1 +0,0 @@
-{"version":3,"file":"linter.d.ts","sourceRoot":"","sources":["../../src/linter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AA4C7C,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,QAM3C"}

package/dist/src/linter.js

@@ -1,44 +0,0 @@
-import { getLinter } from "@typespec/lint";
-import { $lib } from "./lib.js";
-import * as theRules from "./rules/index.js";
-const linter = getLinter($lib);
-linter.registerRules([
-    theRules.alternateKeyOnKeyRule,
-    theRules.alternateKeyOnPrimitivePropertyRule,
-    theRules.alternateKeyRequiresKeyRule,
-    theRules.computedCannotBeCombinedWithRule,
-    theRules.containsOnlyAppliesToNavigationPropertyRule,
-    theRules.countAppliesToGetOperationsThatReturnCollectionsRule,
-    theRules.disallowedTypeSpecDecoratorsRule,
-    theRules.entityMustHaveKeyRule,
-    theRules.expandOnlyNavigationPropertiesRule,
-    theRules.expandOnlyOnGetNavigationSourceRule,
-    theRules.extendsOnSameTypeRule,
-    theRules.filterAppliesToGetOperationsThatReturnCollectionsRule,
-    theRules.filterOnlyAppliesToModelPropertiesRule,
-    theRules.filterPropertiesMustNotBeEmptyRule,
-    theRules.hasStreamOnlyOnEntity,
-    theRules.invalidPublicNamespaceNameRule,
-    theRules.keyOnlyOnEntityNonNullablePrimitivePropertyRule,
-    theRules.namespaceIsRequiredRule,
-    theRules.openOnlyAppliesToStructuredType,
-    theRules.operationInsideInterfaceRule,
-    theRules.operationParametersMatchGraphRouteParametersRule,
-    theRules.orderByOnlyNonNavigationPropertiesRule,
-    theRules.orderByAppliesToGetOperationsThatReturnCollectionsRule,
-    theRules.referencesOnlyAppliesToNavigationPropertyRule,
-    theRules.searchAppliesToGetOperationsThatReturnCollectionsRule,
-    theRules.skipAppliesToGetOperationsThatReturnCollectionsRule,
-    theRules.topAppliesToGetOperationsThatReturnCollectionsRule,
-    theRules.useEvolvableEnumRule,
-    theRules.voidFunctionRule,
-    theRules.allowedValuesCannotBeEmptyRule,
-    theRules.graphRouteLeadingSlashRule,
-    theRules.extendedModelBaseShouldMatchPartialBaseModel,
-], { autoEnable: true });
-export function $onValidate(program) {
-    linter.autoEnableRules();
-    linter.lintOnValidate(program);
-    theRules.validateAbstractOnlyAppliesToStructuredTypes(program);
-}
-//# sourceMappingURL=linter.js.map

package/dist/src/linter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"linter.js","sourceRoot":"","sources":["../../src/linter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAQ,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAE9C,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAC/B,MAAM,CAAC,aAAa,CAClB;IACE,QAAQ,CAAC,qBAAqB;IAC9B,QAAQ,CAAC,mCAAmC;IAC5C,QAAQ,CAAC,2BAA2B;IACpC,QAAQ,CAAC,gCAAgC;IACzC,QAAQ,CAAC,2CAA2C;IACpD,QAAQ,CAAC,oDAAoD;IAC7D,QAAQ,CAAC,gCAAgC;IACzC,QAAQ,CAAC,qBAAqB;IAC9B,QAAQ,CAAC,kCAAkC;IAC3C,QAAQ,CAAC,mCAAmC;IAC5C,QAAQ,CAAC,qBAAqB;IAC9B,QAAQ,CAAC,qDAAqD;IAC9D,QAAQ,CAAC,sCAAsC;IAC/C,QAAQ,CAAC,kCAAkC;IAC3C,QAAQ,CAAC,qBAAqB;IAC9B,QAAQ,CAAC,8BAA8B;IACvC,QAAQ,CAAC,+CAA+C;IACxD,QAAQ,CAAC,uBAAuB;IAChC,QAAQ,CAAC,+BAA+B;IACxC,QAAQ,CAAC,4BAA4B;IACrC,QAAQ,CAAC,gDAAgD;IACzD,QAAQ,CAAC,sCAAsC;IAC/C,QAAQ,CAAC,sDAAsD;IAC/D,QAAQ,CAAC,6CAA6C;IACtD,QAAQ,CAAC,qDAAqD;IAC9D,QAAQ,CAAC,mDAAmD;IAC5D,QAAQ,CAAC,kDAAkD;IAC3D,QAAQ,CAAC,oBAAoB;IAC7B,QAAQ,CAAC,gBAAgB;IACzB,QAAQ,CAAC,8BAA8B;IACvC,QAAQ,CAAC,0BAA0B;IACnC,QAAQ,CAAC,4CAA4C;CACtD,EACD,EAAE,UAAU,EAAE,IAAI,EAAE,CACrB,CAAC;AAEF,MAAM,UAAU,WAAW,CAAC,OAAgB;IAC1C,MAAM,CAAC,eAAe,EAAE,CAAC;IACzB,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAE/B,QAAQ,CAAC,4CAA4C,CAAC,OAAO,CAAC,CAAC;AAEjE,CAAC"}