Merge branch 'main' into feature/website-design

.vscode/settings.json

@@ -6,9 +6,7 @@
     "**/dist-dev/**": true,
     "**/.docusaurus/**": true,
     "**/CHANGELOG.json": true,
-    "**/CHANGELOG.md": true,
     "docs/spec.html": true,
-    "common/config/rush/pnpm-lock.yaml": true,
     "**/node_modules/**": true,
     "packages/website/versioned_docs/**": true,
     "packages/samples/scratch/**": false // Those files are in gitignore but we still want to search for them

common/changes/@typespec/bundler/fix-playground-external-use_2023-10-04-18-20.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/bundler",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/bundler"
+}

common/changes/@typespec/bundler/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/bundler",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/bundler"
+}

common/changes/@typespec/compiler/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/compiler",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/compiler"
+}

common/changes/@typespec/html-program-viewer/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/html-program-viewer",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/html-program-viewer"
+}

common/changes/@typespec/http/feature-status-code-ranges_2023-09-25-23-04.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/http",
+      "comment": "Add support for status code ranges for http responses. **Change to API** Http responses can now also return a `HttpStatusCodeRange` object for their status codes",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/http"
+}

common/changes/@typespec/http/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/http",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/http"
+}

common/changes/@typespec/internal-build-utils/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/internal-build-utils",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/internal-build-utils"
+}

common/changes/@typespec/json-schema/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/json-schema",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/json-schema"
+}

common/changes/@typespec/library-linter/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/library-linter",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/library-linter"
+}

common/changes/@typespec/lint/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/lint",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/lint"
+}

common/changes/@typespec/openapi/feature-status-code-ranges_2023-09-25-23-04.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/openapi",
+      "comment": "Add support for http status code ranges",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/openapi"
+}

common/changes/@typespec/openapi/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/openapi",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/openapi"
+}

common/changes/@typespec/openapi3/feature-status-code-ranges_2023-09-25-23-04.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/openapi3",
+      "comment": "Add support for http status code ranges",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/openapi3"
+}

common/changes/@typespec/openapi3/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/openapi3",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/openapi3"
+}

common/changes/@typespec/playground/fix-playground-external-use_2023-10-04-18-20.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/playground",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/playground"
+}

common/changes/@typespec/rest/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/rest",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/rest"
+}

common/changes/@typespec/versioning/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/versioning",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/versioning"
+}

common/changes/tmlanguage-generator/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "tmlanguage-generator",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "patch"
+    }
+  ],
+  "packageName": "tmlanguage-generator"
+}

common/changes/typespec-vs/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "typespec-vs",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "typespec-vs"
+}

common/changes/typespec-vscode/pkgjson-cleanup_2023-09-26-19-09.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "typespec-vscode",
+      "comment": "`TypeScript` use `types` entry under `exports` of `package.json` instead of legacy `typesVersions` to provide the definition files",
+      "type": "none"
+    }
+  ],
+  "packageName": "typespec-vscode"
+}

docs/extending-typespec/basics.md

@@ -226,13 +226,13 @@ export const MyTestLibrary = createTestLibrary({
   // ...
   "main": "dist/src/index.js",
   "exports": {
-    ".": "./dist/src/index.js",
-    "./testing": "./dist/src/testing/index.js"
-  },
-  "typesVersions": {
-    "*": {
-      "*": ["./dist/src/index.d.ts"],
-      "testing": ["./dist/src/testing/index.d.ts"]
+    ".": {
+      "default": "./dist/src/index.js",
+      "types": "./dist/src/index.d.ts"
+    },
+    "./testing": {
+      "default": "./dist/src/testing/index.js",
+      "types": "./dist/src/testing/index.d.ts"
     }
   }
 }

packages/best-practices/package.json

@@ -4,7 +4,7 @@
   "author": "Microsoft Corporation",
   "description": "TypeSpec linter rules to enforce best practices.",
   "homepage": "https://microsoft.github.io/typespec",
-  "readme": "https://github.com/microsoft/typespec/blob/master/README.md",
+  "readme": "https://github.com/microsoft/typespec/blob/main/README.md",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/bundler/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@typespec/bundler",
-  "version": "0.1.0-alpha.0",
+  "version": "0.1.0-alpha.1",
   "author": "Microsoft Corporation",
   "description": "Package to bundle a typespec library.",
   "homepage": "https://microsoft.github.io/typespec",
-  "readme": "https://github.com/microsoft/typespec/blob/master/README.md",
+  "readme": "https://github.com/microsoft/typespec/blob/main/README.md",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/bundler/src/bundler.ts

@@ -18,7 +18,12 @@ export interface TypeSpecBundleDefinition {
   path: string;
   main: string;
   packageJson: PackageJson;
-  exports: Record<string, string>;
+  exports: Record<string, string | ExportData>;
+}
+
+export interface ExportData {
+  default: string;
+  types?: string;
 }
 
 export interface TypeSpecBundle {
@@ -148,7 +153,10 @@ async function createRollupConfig(definition: TypeSpecBundleDefinition): Promise
 
   const extraEntry = Object.fromEntries(
     Object.entries(definition.exports).map(([key, value]) => {
-      return [key.replace("./", ""), normalizePath(resolve(libraryPath, value))];
+      return [
+        key.replace("./", ""),
+        normalizePath(resolve(libraryPath, getExportEntryPoint(value))),
+      ];
     })
   );
   return {
@@ -195,15 +203,19 @@ async function generateTypeSpecBundle(
     files: output
       .filter((x): x is OutputChunk => "code" in x)
       .map((chunk) => {
+        const entry = definition.exports[basename(chunk.fileName)];
         return {
           filename: chunk.fileName,
           content: chunk.code,
-          export: definition.exports[basename(chunk.fileName)],
+          export: entry ? getExportEntryPoint(entry) : undefined,
         };
       }),
   };
 }
 
+function getExportEntryPoint(value: string | ExportData) {
+  return typeof value === "string" ? value : value.default;
+}
 async function readLibraryPackageJson(path: string): Promise<PackageJson> {
   const file = await readFile(join(path, "package.json"));
   return JSON.parse(file.toString());