@typespec/compiler 0.65.0-dev.6 → 0.65.0

package/dist/src/{experimental → utils}/state-accessor.d.ts

@@ -3,11 +3,9 @@ import type { Type } from "../core/types.js";
 type StateMapGetter<K extends Type, V> = (program: Program, type: K) => V | undefined;
 type StateMapSetter<K extends Type, V> = (program: Program, type: K, value: V) => void;
 type StateMapMapGetter<K extends Type, V> = (program: Program) => Map<K, V>;
-/** @experimental */
-export declare function unsafe_useStateMap<K extends Type, V>(key: symbol): [StateMapGetter<K, V>, StateMapSetter<K, V>, StateMapMapGetter<K, V>];
+export declare function useStateMap<K extends Type, V>(key: symbol): [StateMapGetter<K, V>, StateMapSetter<K, V>, StateMapMapGetter<K, V>];
 type StateSetGetter<K extends Type> = (program: Program, type: K) => boolean;
 type StateSetSetter<K extends Type> = (program: Program, type: K) => void;
-/** @experimental */
-export declare function unsafe_useStateSet<K extends Type>(key: symbol): [StateSetGetter<K>, StateSetSetter<K>];
+export declare function useStateSet<K extends Type>(key: symbol): [StateSetGetter<K>, StateSetSetter<K>];
 export {};
 //# sourceMappingURL=state-accessor.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"state-accessor.d.ts","sourceRoot":"","sources":["../../../src/utils/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,wBAAgB,WAAW,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,EAC3C,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,wBAAgB,WAAW,CAAC,CAAC,SAAS,IAAI,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAK/F"}

package/dist/src/{experimental → utils}/state-accessor.js

@@ -1,12 +1,10 @@
-/** @experimental */
-export function unsafe_useStateMap(key) {
+export function useStateMap(key) {
     const getter = (program, target) => program.stateMap(key).get(target);
     const setter = (program, target, value) => program.stateMap(key).set(target, value);
     const mapGetter = (program) => program.stateMap(key);
     return [getter, setter, mapGetter];
 }
-/** @experimental */
-export function unsafe_useStateSet(key) {
+export function useStateSet(key) {
     const getter = (program, target) => program.stateSet(key).has(target);
     const setter = (program, target) => program.stateSet(key).add(target);
     return [getter, setter];

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

@@ -0,0 +1 @@
+{"version":3,"file":"state-accessor.js","sourceRoot":"","sources":["../../../src/utils/state-accessor.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,WAAW,CACzB,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,MAAM,UAAU,WAAW,CAAiB,GAAW;IACrD,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/lib/std/projected-names.tsp

@@ -1,5 +1,5 @@
 // Set of projections consuming the @projectedName decorator
-#suppress "projections-are-experimental"
+#suppress "deprecated"
 projection op#target {
   to(targetName) {
     if hasProjectedName(self, targetName) {
@@ -13,7 +13,7 @@ projection op#target {
   }
 }
 
-#suppress "projections-are-experimental"
+#suppress "deprecated"
 projection interface#target {
   to(targetName) {
     if hasProjectedName(self, targetName) {
@@ -27,7 +27,7 @@ projection interface#target {
   }
 }
 
-#suppress "projections-are-experimental"
+#suppress "deprecated"
 projection model#target {
   to(targetName) {
     if hasProjectedName(self, targetName) {
@@ -53,7 +53,7 @@ projection model#target {
   }
 }
 
-#suppress "projections-are-experimental"
+#suppress "deprecated"
 projection enum#target {
   to(targetName) {
     if hasProjectedName(self, targetName) {
@@ -79,7 +79,7 @@ projection enum#target {
   }
 }
 
-#suppress "projections-are-experimental"
+#suppress "deprecated"
 projection union#target {
   to(targetName) {
     if hasProjectedName(self, targetName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/compiler",
-  "version": "0.65.0-dev.6",
+  "version": "0.65.0",
   "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": {
@@ -67,6 +71,7 @@
   ],
   "dependencies": {
     "@babel/code-frame": "~7.26.2",
+    "@npmcli/arborist": "^9.0.0",
     "ajv": "~8.17.1",
     "change-case": "~5.4.4",
     "globby": "~14.0.2",
@@ -85,23 +90,23 @@
     "@types/babel__code-frame": "~7.0.6",
     "@types/mustache": "~4.2.5",
     "@types/node": "~22.10.10",
+    "@types/npmcli__arborist": "^6.3.0",
     "@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": "^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.7.3",
-    "vitest": "^3.0.4",
+    "vitest": "^3.0.5",
     "vscode-oniguruma": "~2.0.1",
-    "vscode-textmate": "~9.2.0"
+    "vscode-textmate": "~9.2.0",
+    "tmlanguage-generator": "~0.5.11",
+    "@typespec/internal-build-utils": "~0.65.0"
   },
-  "peerDependencies": {},
   "scripts": {
     "clean": "rimraf ./dist ./temp",
     "build:init-templates-index": "tsx ./.scripts/build-init-templates.ts",

package/templates/__snapshots__/rest/main.tsp

@@ -7,34 +7,40 @@ using TypeSpec.Http;
 namespace DemoService;
 
 model Widget {
-  @visibility("read", "update")
-  @path
   id: string;
-
   weight: int32;
   color: "red" | "blue";
 }
 
+model WidgetList {
+  items: Widget[];
+}
+
 @error
 model Error {
   code: int32;
   message: string;
 }
 
+model AnalyzeResult {
+  id: string;
+  analysis: string;
+}
+
 @route("/widgets")
 @tag("Widgets")
 interface Widgets {
   /** List widgets */
-  @get list(): Widget[] | Error;
+  @get list(): WidgetList | Error;
   /** Read widgets */
   @get read(@path id: string): Widget | Error;
   /** Create a widget */
-  @post create(...Widget): Widget | Error;
+  @post create(@body body: Widget): Widget | Error;
   /** Update a widget */
-  @patch update(...Widget): Widget | Error;
+  @patch update(@path id: string, @body body: 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;
+  @route("{id}/analyze") @post analyze(@path id: string): AnalyzeResult | Error;
 }

package/templates/rest/main.tsp

@@ -7,34 +7,40 @@ using TypeSpec.Http;
 namespace DemoService;
 
 model Widget {
-  @visibility("read", "update")
-  @path
   id: string;
-
   weight: int32;
   color: "red" | "blue";
 }
 
+model WidgetList {
+  items: Widget[];
+}
+
 @error
 model Error {
   code: int32;
   message: string;
 }
 
+model AnalyzeResult {
+  id: string;
+  analysis: string;
+}
+
 @route("/widgets")
 @tag("Widgets")
 interface Widgets {
   /** List widgets */
-  @get list(): Widget[] | Error;
+  @get list(): WidgetList | Error;
   /** Read widgets */
   @get read(@path id: string): Widget | Error;
   /** Create a widget */
-  @post create(...Widget): Widget | Error;
+  @post create(@body body: Widget): Widget | Error;
   /** Update a widget */
-  @patch update(...Widget): Widget | Error;
+  @patch update(@path id: string, @body body: 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;
+  @route("{id}/analyze") @post analyze(@path id: string): AnalyzeResult | Error;
 }

package/templates/scaffolding.json

@@ -3,12 +3,12 @@
     "title": "Empty project",
     "description": "Create an empty project.",
     "libraries": [],
-    "compilerVersion": "0.64.0"
+    "compilerVersion": "0.65.0"
   },
   "rest": {
     "title": "Generic REST API",
     "description": "Create a project representing a generic REST API",
-    "compilerVersion": "0.64.0",
+    "compilerVersion": "0.65.0",
     "libraries": [
       "@typespec/http",
       "@typespec/rest",
@@ -34,7 +34,7 @@
           "emitter-output-dir": "{output-dir}/clients/java"
         }
       },
-      "@typespec/http-client-js": {
+      "@azure-tools/typespec-ts": {
         "description": "JavaScript Client emitter",
         "options": {
           "emitter-output-dir": "{output-dir}/clients/js"
@@ -49,10 +49,10 @@
       "@typespec/http-server-csharp": {
         "description": "CSharp server stubs",
         "options": {
-          "emitter-output-dir": "{output-dir}/server"
+          "emitter-output-dir": "{output-dir}/server/generated"
         }
       },
-      "@typespec/http-server-js": {
+      "@typespec/http-server-javascript": {
         "description": "Javascript server stubs",
         "options": {
           "emitter-output-dir": "{output-dir}/server"
@@ -69,7 +69,7 @@
   "library-ts": {
     "title": "TypeSpec Library (With TypeScript)",
     "description": "Create a new package to add decorators or linters to typespec.",
-    "compilerVersion": "0.64.0",
+    "compilerVersion": "0.65.0",
     "libraries": [],
     "files": [
       {
@@ -145,7 +145,7 @@
   "emitter-ts": {
     "title": "TypeSpec Emitter (With TypeScript)",
     "description": "Create a new package that will be emitting typespec",
-    "compilerVersion": "0.64.0",
+    "compilerVersion": "0.65.0",
     "libraries": [],
     "files": [
       {

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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"}