@microsoft/typespec-msgraph 0.0.1-Preview.8 → 1.0.0-Preview.2

package/lib/responses.tsp

@@ -5,72 +5,48 @@
 import "@typespec/http";
 import "@microsoft/typespec-msgraph";
 import "./shared-models.tsp";
+import "./bodies.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;
-  }
-}
+using MsGraph;
+using MsGraph.SharedModels;
+using MsGraph.Bodies;
 
 // 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.")
+namespace MsGraph.Responses {
+  /** 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.")
-  model ResourceResponse<TResource, TStatus = 200, TBody = Bodies.ResourceBody<TResource>>
+  /** Response to represent a Microsoft Graph individual resource response payload. */
+  model ResourceResponse<TResource, TStatus = 200, TBody = TResource>
+    is Http.Response<TStatus> {
+    ...Http.Body<TBody>;
+  }
+
+  /** Response to represent a Microsoft Graph individual resource response payload. */
+  model ScalarResponse<TScalar, TStatus = 200, TBody = TScalar>
     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>>
+  /** Response to represent a Microsoft Graph resource creation response payload. */
+  model ResourceCreatedResponse<TResource, TStatus = 201, TBody = 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 +54,6 @@ namespace TypeSpec.MsGraph.Responses {
 
   alias ResourceErrorResponse = ErrorResponse<400 | 404 | 429>;
   alias CollectionErrorResponse = ErrorResponse<400 | 429>;
+  alias OperationErrorResponse = ErrorResponse<400 | 429>;
   
 }

package/lib/shared-models.tsp

@@ -4,71 +4,27 @@
 // -------------------------------------------------
 import "@microsoft/typespec-msgraph";
 
-using TypeSpec.MsGraph;
+using MsGraph;
 
-namespace TypeSpec.MsGraph.SharedModels;
+@publicNamespace("microsoft.graph")
+namespace 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.")
+  @doc("The primary entity base model.")
   @entity
-  model msGraphEntity {
+  model entity {
     @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;
+  scalar webUrl extends url;
 
   @doc("Scalar type for URLs that represent Graph APIs.")
-  scalar url extends string;
+  scalar graphUrl extends url;
 
-  @doc("Complex type to represent a nested error that potentially has other recursive nested errors.")
-  @complex
+  @doc("A dictionary of name-value pairs. Names must be valid property names, values may be restricted to a list of types via an annotation with term `Validation.OpenPropertyTypeConstraint")
   @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[];
-  }
+  model Dictionary {}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/typespec-msgraph",
-  "version": "0.0.1-Preview.8",
+  "version": "1.0.0-Preview.2",
   "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",
@@ -38,11 +38,11 @@
   },
   "scripts": {
     "clean": "rimraf ./dist ./temp",
-    "build": "tsc -p .",
+    "build": "tsc -p . && tsp compile --noEmit lib/msgraph.tsp",
     "watch": "tsc -p . --watch",
-    "test": "mocha",
-    "buildntest": "tsc -p . && mocha",
-    "test-official": "c8 mocha --forbid-only",
+    "test": "mocha --parallel",
+    "buildntest": "tsc -p . && mocha --parallel",
+    "test-official": "c8 mocha --forbid-only --parallel",
     "lint": "eslint . --ext .ts,.tsx --max-warnings=0",
     "lint:fix": "eslint . --fix --ext .ts,.tsx"
   },
@@ -52,28 +52,26 @@
     "!dist/test/**"
   ],
   "dependencies": {
-    "@xmldom/xmldom": "~0.8.2",
-    "@typespec/compiler": "~0.45.0",
-    "@typespec/http": "~0.45.0",
-    "@typespec/lint": "~0.45.0",
-    "prettier": "~2.8.7",
-    "react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-reconciler": "~0.27.0"
+    "@typespec/compiler": "~0.66.0",
+    "@typespec/http": "~0.66.0",
+    "@xmldom/xmldom": "~0.8.10",
+    "prettier": "~3.2.5",
+    "react": "~18.3.1",
+    "react-dom": "~18.3.1",
+    "react-reconciler": "~0.29.2"
   },
   "devDependencies": {
-    "@types/mocha": "~10.0.0",
-    "@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.7.0",
-    "c8": "~7.13.0",
-    "eslint": "^8.36.0",
-    "mocha": "~10.2.0",
-    "rimraf": "~5.0.0",
-    "typescript": "~5.0.2",
-    "xpath": "~0.0.32",
-    "tsx": "~3.12.3"
+    "@types/mocha": "~10.0.10",
+    "@types/node": "~20.12.14",
+    "@types/react": "~18.3.18",
+    "@types/react-reconciler": "~0.28.9",
+    "c8": "~9.1.0",
+    "eslint": "^9.20.1",
+    "mocha": "~11.1.0",
+    "rimraf": "~5.0.10",
+    "source-map-support": "~0.5.21",
+    "tsx": "~4.19.3",
+    "typescript": "~5.7.3",
+    "xpath": "~0.0.34"
   }
 }

package/dist/src/decorators/flags.d.ts

@@ -1,9 +0,0 @@
-import { DecoratorContext, Enum, Program } from "@typespec/compiler";
-/**
- * `@flags` - mark an enum as a flag.
- *
- * `@flags` can only be applied to enums.
- */
-export declare function $flags(context: DecoratorContext, target: Enum): void;
-export declare function isFlags(program: Program, target: Enum): boolean;
-//# sourceMappingURL=flags.d.ts.map

package/dist/src/decorators/flags.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"flags.d.ts","sourceRoot":"","sources":["../../../src/decorators/flags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAIrE;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,IAAI,QAE7D;AAED,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,WAErD"}

package/dist/src/decorators/flags.js

@@ -1,13 +0,0 @@
-const flagsKey = Symbol("flags");
-/**
- * `@flags` - mark an enum as a flag.
- *
- * `@flags` can only be applied to enums.
- */
-export function $flags(context, target) {
-    context.program.stateSet(flagsKey).add(target);
-}
-export function isFlags(program, target) {
-    return program.stateSet(flagsKey).has(target);
-}
-//# sourceMappingURL=flags.js.map

package/dist/src/decorators/flags.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../../src/decorators/flags.ts"],"names":[],"mappings":"AAEA,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;AAEjC;;;;GAIG;AACH,MAAM,UAAU,MAAM,CAAC,OAAyB,EAAE,MAAY;IAC5D,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,OAAgB,EAAE,MAAY;IACpD,OAAO,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAChD,CAAC"}

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,2 +0,0 @@
-export declare const hasStreamOnlyOnEntity: import("@typespec/lint").LintRule;
-//# 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":"AAKA,eAAO,MAAM,qBAAqB,mCAuBhC,CAAC"}

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

@@ -1,29 +0,0 @@
-import { createRule } from "@typespec/lint";
-import { hasStream } from "../decorators/has-stream.js";
-import { isEntity } from "../index.js";
-import { reportDiagnostic } from "../lib.js";
-export const hasStreamOnlyOnEntity = createRule({
-    name: "has-stream-on-entity",
-    create({ program }) {
-        return {
-            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,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,MAAM,CAAC,MAAM,qBAAqB,GAAG,UAAU,CAAC;IAC9C,IAAI,EAAE,sBAAsB;IAC5B,MAAM,CAAC,EAAE,OAAO,EAAE;QAChB,OAAO;YACL,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;IACJ,CAAC;CACF,CAAC,CAAC"}