Merge branch 'main' into mini-website-refresh

Author: mario-guerra

.chronus/changes/openapi3-split-types-2025-2-17-10-23-32.md

@@ -0,0 +1,6 @@
+---
+changeKind: internal
+packages:
+  - "@typespec/openapi3"
+---
+

.chronus/changes/reserve-keywords-2025-2-12-22-22-24.md

@@ -17,6 +17,10 @@ Adding new keywords for future use:
   - `struct`
   - `record`
   - `module`
+  - `mod`
+  - `pub`
+  - `sub`
+  - `typeref`
   - `trait`
   - `this`
   - `self`

packages/compiler/src/core/scanner.ts

@@ -174,6 +174,10 @@ export enum Token {
   StructKeyword,
   RecordKeyword,
   ModuleKeyword,
+  ModKeyword,
+  PubKeyword,
+  SubKeyword,
+  TypeRefKeyword,
   TraitKeyword,
   ThisKeyword,
   SelfKeyword,
@@ -314,6 +318,10 @@ export const TokenDisplay = getTokenDisplayTable([
   [Token.StructKeyword, "'struct'"],
   [Token.RecordKeyword, "'record'"],
   [Token.ModuleKeyword, "'module'"],
+  [Token.ModKeyword, "'mod'"],
+  [Token.PubKeyword, "'pub'"],
+  [Token.SubKeyword, "'sub'"],
+  [Token.TypeRefKeyword, "'typeref'"],
   [Token.TraitKeyword, "'trait'"],
   [Token.ThisKeyword, "'this'"],
   [Token.SelfKeyword, "'self'"],
@@ -378,6 +386,10 @@ export const Keywords: ReadonlyMap<string, Token> = new Map([
   ["struct", Token.StructKeyword],
   ["record", Token.RecordKeyword],
   ["module", Token.ModuleKeyword],
+  ["mod", Token.ModKeyword],
+  ["pub", Token.PubKeyword],
+  ["sub", Token.SubKeyword],
+  ["typeref", Token.TypeRefKeyword],
   ["trait", Token.TraitKeyword],
   ["this", Token.ThisKeyword],
   ["self", Token.SelfKeyword],

packages/openapi3/api-extractor.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+  "extends": "../../api-extractor.base.json"
+}

packages/openapi3/package.json

@@ -50,7 +50,8 @@
     "lint:fix": "eslint . --fix",
     "regen-docs": "tspd doc .  --enable-experimental  --output-dir ../../website/src/content/docs/docs/emitters/openapi3/reference",
     "regen-specs": "cross-env RECORD=true vitest run",
-    "gen-version": "node scripts/generate-version.js"
+    "gen-version": "node scripts/generate-version.js",
+    "api-extractor": "api-extractor run --local --verbose"
   },
   "files": [
     "lib/*.tsp",

packages/openapi3/src/index.ts

@@ -1,11 +1,73 @@
 export const namespace = "TypeSpec.OpenAPI";
 
 export { convertOpenAPI3Document } from "./cli/actions/convert/convert.js";
-export * from "./decorators.js";
+export { $oneOf, $useRef, getOneOf, getRef } from "./decorators.js";
 export { $lib } from "./lib.js";
-export * from "./openapi.js";
+export {
+  $onEmit,
+  getOpenAPI3,
+  resolveOptions,
+  type ResolvedOpenAPI3EmitterOptions,
+} from "./openapi.js";
 
-export * from "./types.js";
+export type {
+  CommonOpenAPI3Schema,
+  Extensions,
+  HttpMethod,
+  JsonSchema,
+  JsonSchemaType,
+  JsonType,
+  OpenAPI3ApiKeySecurityScheme,
+  OpenAPI3AuthorizationCodeOAuthFlow,
+  OpenAPI3ClientCredentialsFlow,
+  OpenAPI3Components,
+  OpenAPI3Discriminator,
+  OpenAPI3Document,
+  OpenAPI3Encoding,
+  OpenAPI3Example,
+  OpenAPI3ExternalDocs,
+  OpenAPI3Header,
+  OpenAPI3HeaderParameter,
+  OpenAPI3HttpSecurityScheme,
+  OpenAPI3ImplicitOAuthFlow,
+  OpenAPI3Info,
+  OpenAPI3Link,
+  OpenAPI3MediaType,
+  OpenAPI3OAuth2Flow,
+  OpenAPI3OAuth2SecurityScheme,
+  OpenAPI3OAuthFlows,
+  OpenAPI3OpenIdConnectSecurityScheme,
+  OpenAPI3Operation,
+  OpenAPI3Parameter,
+  OpenAPI3ParameterBase,
+  OpenAPI3ParameterType,
+  OpenAPI3PasswordOAuthFlow,
+  OpenAPI3PathItem,
+  OpenAPI3PathParameter,
+  OpenAPI3QueryParameter,
+  OpenAPI3RequestBody,
+  OpenAPI3Response,
+  OpenAPI3Responses,
+  OpenAPI3Schema,
+  OpenAPI3SchemaProperty,
+  OpenAPI3SecurityScheme,
+  OpenAPI3SecuritySchemeBase,
+  OpenAPI3Server,
+  OpenAPI3ServerVariable,
+  OpenAPI3ServiceRecord,
+  OpenAPI3StatusCode,
+  OpenAPI3Tag,
+  OpenAPI3UnversionedServiceRecord,
+  OpenAPI3VersionedDocumentRecord,
+  OpenAPI3VersionedServiceRecord,
+  OpenAPI3XmlSchema,
+  OpenAPIComponents3_1,
+  OpenAPIDocument3_1,
+  OpenAPISchema3_1,
+  Ref,
+  Refable,
+  SupportedOpenAPIDocuments,
+} from "./types.js";
 
 /** @internal */
 export { $decorators } from "./tsp-index.js";