@typespec/compiler 0.65.0-dev.1 → 0.65.0-dev.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/compiler",
-  "version": "0.65.0-dev.1",
+  "version": "0.65.0-dev.11",
   "description": "TypeSpec Compiler Preview",
   "author": "Microsoft Corporation",
   "license": "MIT",
@@ -45,6 +45,10 @@
     "./experimental": {
       "types": "./dist/src/experimental/index.d.ts",
       "default": "./dist/src/experimental/index.js"
+    },
+    "./experimental/typekit": {
+      "types": "./dist/src/experimental/typekit/index.d.ts",
+      "default": "./dist/src/experimental/typekit/index.js"
     }
   },
   "browser": {
@@ -66,40 +70,40 @@
     "!dist/test/**"
   ],
   "dependencies": {
-    "@babel/code-frame": "~7.25.7",
+    "@babel/code-frame": "~7.26.2",
     "ajv": "~8.17.1",
     "change-case": "~5.4.4",
     "globby": "~14.0.2",
     "mustache": "~4.2.0",
     "picocolors": "~1.1.1",
-    "prettier": "~3.3.3",
+    "prettier": "~3.4.2",
     "prompts": "~2.4.2",
     "semver": "^7.6.3",
     "temporal-polyfill": "^0.2.5",
     "vscode-languageserver": "~9.0.1",
     "vscode-languageserver-textdocument": "~1.0.12",
-    "yaml": "~2.5.1",
+    "yaml": "~2.7.0",
     "yargs": "~17.7.2"
   },
   "devDependencies": {
     "@types/babel__code-frame": "~7.0.6",
     "@types/mustache": "~4.2.5",
-    "@types/node": "~22.7.9",
+    "@types/node": "~22.10.10",
     "@types/prompts": "~2.4.9",
     "@types/semver": "^7.5.8",
     "@types/yargs": "~17.0.33",
     "@typespec/internal-build-utils": "~0.64.0 || >=0.65.0-dev <0.65.0",
-    "@vitest/coverage-v8": "^2.1.5",
-    "@vitest/ui": "^2.1.2",
-    "c8": "^10.1.2",
+    "@vitest/coverage-v8": "^3.0.4",
+    "@vitest/ui": "^3.0.3",
+    "c8": "^10.1.3",
     "grammarkdown": "~3.3.2",
     "rimraf": "~6.0.1",
     "source-map-support": "~0.5.21",
     "tmlanguage-generator": "~0.5.10 || >=0.6.0-dev <0.6.0",
-    "typescript": "~5.6.3",
-    "vitest": "^2.1.5",
+    "typescript": "~5.7.3",
+    "vitest": "^3.0.4",
     "vscode-oniguruma": "~2.0.1",
-    "vscode-textmate": "~9.1.0"
+    "vscode-textmate": "~9.2.0"
   },
   "peerDependencies": {},
   "scripts": {

package/templates/__snapshots__/rest/.gitignore

@@ -0,0 +1,9 @@
+# MacOS
+.DS_Store
+
+# Default TypeSpec output
+tsp-output/
+dist/
+
+# Dependency directories
+node_modules/

package/templates/__snapshots__/rest/main.tsp

@@ -0,0 +1,40 @@
+import "@typespec/http";
+
+using TypeSpec.Http;
+@service({
+  title: "Widget Service",
+})
+namespace DemoService;
+
+model Widget {
+  @visibility("read", "update")
+  @path
+  id: string;
+
+  weight: int32;
+  color: "red" | "blue";
+}
+
+@error
+model Error {
+  code: int32;
+  message: string;
+}
+
+@route("/widgets")
+@tag("Widgets")
+interface Widgets {
+  /** List widgets */
+  @get list(): Widget[] | Error;
+  /** Read widgets */
+  @get read(@path id: string): Widget | Error;
+  /** Create a widget */
+  @post create(...Widget): Widget | Error;
+  /** Update a widget */
+  @patch update(...Widget): Widget | Error;
+  /** Delete a widget */
+  @delete delete(@path id: string): void | Error;
+
+  /** Analyze a widget */
+  @route("{id}/analyze") @post analyze(@path id: string): string | Error;
+}

package/templates/__snapshots__/rest/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "rest",
+  "version": "0.1.0",
+  "type": "module",
+  "peerDependencies": {
+    "@typespec/compiler": "latest",
+    "@typespec/http": "latest",
+    "@typespec/rest": "latest",
+    "@typespec/openapi": "latest",
+    "@typespec/openapi3": "latest"
+  },
+  "devDependencies": {
+    "@typespec/compiler": "latest",
+    "@typespec/http": "latest",
+    "@typespec/rest": "latest",
+    "@typespec/openapi": "latest",
+    "@typespec/openapi3": "latest"
+  },
+  "private": true
+}

package/templates/__snapshots__/rest/tspconfig.yaml

@@ -0,0 +1,16 @@
+# extends: ../tspconfig.yaml                    # Extend another config file
+# emit:                                         # Emitter name
+#   - "<emitter-name"
+# options:                                      # Emitter options
+#   <emitter-name>:
+#    "<option-name>": "<option-value>"
+# environment-variables:                        # Environment variables which can be used to interpolate emitter options
+#   <variable-name>:
+#     default: "<variable-default>"
+# parameters:                                   # Parameters which can be used to interpolate emitter options
+#   <param-name>:
+#     default: "<param-default>"
+# trace:                                        # Trace areas to enable tracing
+#  - "<trace-name>"
+# warn-as-error: true                           # Treat warnings as errors
+# output-dir: "{project-root}/_generated"       # Configure the base output directory for all emitters

package/templates/rest/main.tsp

@@ -0,0 +1,40 @@
+import "@typespec/http";
+
+using TypeSpec.Http;
+@service({
+  title: "Widget Service",
+})
+namespace DemoService;
+
+model Widget {
+  @visibility("read", "update")
+  @path
+  id: string;
+
+  weight: int32;
+  color: "red" | "blue";
+}
+
+@error
+model Error {
+  code: int32;
+  message: string;
+}
+
+@route("/widgets")
+@tag("Widgets")
+interface Widgets {
+  /** List widgets */
+  @get list(): Widget[] | Error;
+  /** Read widgets */
+  @get read(@path id: string): Widget | Error;
+  /** Create a widget */
+  @post create(...Widget): Widget | Error;
+  /** Update a widget */
+  @patch update(...Widget): Widget | Error;
+  /** Delete a widget */
+  @delete delete(@path id: string): void | Error;
+
+  /** Analyze a widget */
+  @route("{id}/analyze") @post analyze(@path id: string): string | Error;
+}

package/templates/scaffolding.json

@@ -12,13 +12,59 @@
     "libraries": [
       "@typespec/http",
       "@typespec/rest",
+      "@typespec/openapi",
       "@typespec/openapi3"
     ],
-    "config": {
-      "emit": [
-        "@typespec/openapi3"
-      ]
-    }
+    "emitters": {
+      "@typespec/openapi3": {
+        "selected": true,
+        "options": {
+          "emitter-output-dir": "{output-dir}/schema"
+        }
+      },
+      "@typespec/http-client-csharp": {
+        "description": "CSharp Client emitter",
+        "options": {
+          "emitter-output-dir": "{output-dir}/clients/csharp"
+        }
+      },
+      "@typespec/http-client-java": {
+        "description": "Java Client emitter",
+        "options": {
+          "emitter-output-dir": "{output-dir}/clients/java"
+        }
+      },
+      "@typespec/http-client-js": {
+        "description": "JavaScript Client emitter",
+        "options": {
+          "emitter-output-dir": "{output-dir}/clients/js"
+        }
+      },
+      "@typespec/http-client-python": {
+        "description": "Python Client emitter",
+        "options": {
+          "emitter-output-dir": "{output-dir}/clients/python"
+        }
+      },
+      "@typespec/http-server-csharp": {
+        "description": "CSharp server stubs",
+        "options": {
+          "emitter-output-dir": "{output-dir}/server"
+        }
+      },
+      "@typespec/http-server-js": {
+        "description": "Javascript server stubs",
+        "options": {
+          "emitter-output-dir": "{output-dir}/server"
+        }
+      }
+    },
+    "files": [
+      {
+        "path": "rest/main.tsp",
+        "destination": "main.tsp"
+      }
+    ]
   },
   "library-ts": {
     "title": "TypeSpec Library (With TypeScript)",

package/dist/src/core/compiler-code-fixes/model-to-object-literal.codefix.d.ts

@@ -1,6 +0,0 @@
-import type { ModelExpressionNode } from "../types.js";
-/**
- * Quick fix that convert a model expression to an object value.
- */
-export declare function createModelToObjectValueCodeFix(node: ModelExpressionNode): import("../types.js").CodeFix;
-//# sourceMappingURL=model-to-object-literal.codefix.d.ts.map

package/dist/src/core/compiler-code-fixes/model-to-object-literal.codefix.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"model-to-object-literal.codefix.d.ts","sourceRoot":"","sources":["../../../../src/core/compiler-code-fixes/model-to-object-literal.codefix.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvD;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,mBAAmB,iCASxE"}

package/dist/src/core/compiler-code-fixes/model-to-object-literal.codefix.js

@@ -1,15 +0,0 @@
-import { defineCodeFix, getSourceLocation } from "../diagnostics.js";
-/**
- * Quick fix that convert a model expression to an object value.
- */
-export function createModelToObjectValueCodeFix(node) {
-    return defineCodeFix({
-        id: "model-to-object-value",
-        label: `Convert to an object value \`#{}\``,
-        fix: (context) => {
-            const location = getSourceLocation(node);
-            return context.prependText(location, "#");
-        },
-    });
-}
-//# sourceMappingURL=model-to-object-literal.codefix.js.map

package/dist/src/core/compiler-code-fixes/model-to-object-literal.codefix.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"model-to-object-literal.codefix.js","sourceRoot":"","sources":["../../../../src/core/compiler-code-fixes/model-to-object-literal.codefix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGrE;;GAEG;AACH,MAAM,UAAU,+BAA+B,CAAC,IAAyB;IACvE,OAAO,aAAa,CAAC;QACnB,EAAE,EAAE,uBAAuB;QAC3B,KAAK,EAAE,oCAAoC;QAC3C,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE;YACf,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACzC,OAAO,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}

package/dist/src/core/compiler-code-fixes/tuple-to-array-value.codefix.d.ts

@@ -1,6 +0,0 @@
-import type { TupleExpressionNode } from "../types.js";
-/**
- * Quick fix that convert a tuple to an array value.
- */
-export declare function createTupleToArrayValueCodeFix(node: TupleExpressionNode): import("../types.js").CodeFix;
-//# sourceMappingURL=tuple-to-array-value.codefix.d.ts.map

package/dist/src/core/compiler-code-fixes/tuple-to-array-value.codefix.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tuple-to-array-value.codefix.d.ts","sourceRoot":"","sources":["../../../../src/core/compiler-code-fixes/tuple-to-array-value.codefix.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvD;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,mBAAmB,iCASvE"}

package/dist/src/core/compiler-code-fixes/tuple-to-array-value.codefix.js

@@ -1,15 +0,0 @@
-import { defineCodeFix, getSourceLocation } from "../diagnostics.js";
-/**
- * Quick fix that convert a tuple to an array value.
- */
-export function createTupleToArrayValueCodeFix(node) {
-    return defineCodeFix({
-        id: "tuple-to-array-value",
-        label: `Convert to an array value \`#[]\``,
-        fix: (context) => {
-            const location = getSourceLocation(node);
-            return context.prependText(location, "#");
-        },
-    });
-}
-//# sourceMappingURL=tuple-to-array-value.codefix.js.map

package/dist/src/core/compiler-code-fixes/tuple-to-array-value.codefix.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tuple-to-array-value.codefix.js","sourceRoot":"","sources":["../../../../src/core/compiler-code-fixes/tuple-to-array-value.codefix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGrE;;GAEG;AACH,MAAM,UAAU,8BAA8B,CAAC,IAAyB;IACtE,OAAO,aAAa,CAAC;QACnB,EAAE,EAAE,sBAAsB;QAC1B,KAAK,EAAE,mCAAmC;QAC1C,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE;YACf,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACzC,OAAO,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}

package/dist/src/experimental/state-accessor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"state-accessor.d.ts","sourceRoot":"","sources":["../../../src/experimental/state-accessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,KAAK,cAAc,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;AACtF,KAAK,cAAc,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;AACvF,KAAK,iBAAiB,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE5E,oBAAoB;AACpB,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,EAClD,GAAG,EAAE,MAAM,GACV,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAMvE;AAED,KAAK,cAAc,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC;AAC7E,KAAK,cAAc,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;AAE1E,oBAAoB;AACpB,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,IAAI,EAC/C,GAAG,EAAE,MAAM,GACV,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAKxC"}

package/dist/src/experimental/state-accessor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"state-accessor.js","sourceRoot":"","sources":["../../../src/experimental/state-accessor.ts"],"names":[],"mappings":"AAOA,oBAAoB;AACpB,MAAM,UAAU,kBAAkB,CAChC,GAAW;IAEX,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,MAAS,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAClF,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,MAAS,EAAE,KAAQ,EAAE,EAAE,CACvD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9D,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,SAAgB,CAAC,CAAC;AAC5C,CAAC;AAKD,oBAAoB;AACpB,MAAM,UAAU,kBAAkB,CAChC,GAAW;IAEX,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,MAAS,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAClF,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,MAAS,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAElF,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC1B,CAAC"}

package/dist/src/server/emitter-provider.d.ts

@@ -1,22 +0,0 @@
-import { NpmPackage, NpmPackageProvider } from "./npm-package-provider.js";
-export declare class EmitterProvider {
-    private npmPackageProvider;
-    private isEmitterPackageCache;
-    constructor(npmPackageProvider: NpmPackageProvider);
-    /**
-     *
-     * @param startFolder folder starts to search for package.json with emitters defined as dependencies
-     * @returns
-     */
-    listEmitters(startFolder: string): Promise<Record<string, NpmPackage>>;
-    /**
-     *
-     * @param startFolder folder starts to search for package.json with emitters defined as dependencies
-     * @param emitterName
-     * @returns
-     */
-    getEmitter(startFolder: string, emitterName: string): Promise<NpmPackage | undefined>;
-    private isEmitter;
-    private getEmitterFromDep;
-}
-//# sourceMappingURL=emitter-provider.d.ts.map

package/dist/src/server/emitter-provider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"emitter-provider.d.ts","sourceRoot":"","sources":["../../../src/server/emitter-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE3E,qBAAa,eAAe;IAEd,OAAO,CAAC,kBAAkB;IADtC,OAAO,CAAC,qBAAqB,CAA8B;gBACvC,kBAAkB,EAAE,kBAAkB;IAE1D;;;;OAIG;IACG,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAsB5E;;;;;OAKG;IACG,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;YAQ7E,SAAS;YAwBT,iBAAiB;CAQhC"}

package/dist/src/server/emitter-provider.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"emitter-provider.js","sourceRoot":"","sources":["../../../src/server/emitter-provider.ts"],"names":[],"mappings":"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"}