typespec-vscode 0.56.0-dev.1 → 0.56.0

package/dist/src/extension.cjs

@@ -21792,7 +21792,6 @@ async function restartTypeSpecServer() {
     }
 }
 async function launchLanguageClient(context) {
-    var _a, _b, _c, _d;
     const exe = await resolveTypeSpecServer(context);
     const options = {
         synchronize: {
@@ -21819,8 +21818,8 @@ async function launchLanguageClient(context) {
     }
     catch (e) {
         if (typeof e === "string" && e.startsWith("Launching server using command")) {
-            const workspaceFolder = (_d = (_c = (_b = (_a = require$$0$1.workspace.workspaceFolders) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.uri) === null || _c === void 0 ? void 0 : _c.fsPath) !== null && _d !== void 0 ? _d : "";
-            client === null || client === void 0 ? void 0 : client.error([
+            const workspaceFolder = require$$0$1.workspace.workspaceFolders?.[0]?.uri?.fsPath ?? "";
+            client?.error([
                 `TypeSpec server executable was not found: '${exe.command}' is not found. Make sure either:`,
                 ` - TypeSpec is installed locally at the root of this workspace ("${workspaceFolder}") or in a parent directory.`,
                 " - TypeSpec is installed globally with `npm install -g @typespec/compiler'.",
@@ -21834,7 +21833,6 @@ async function launchLanguageClient(context) {
     }
 }
 async function resolveTypeSpecServer(context) {
-    var _a, _b, _c, _d, _e;
     const nodeOptions = process.env.TYPESPEC_SERVER_NODE_OPTIONS;
     const args = ["--stdio"];
     // In development mode (F5 launch from source), resolve to locally built server.js.
@@ -21842,7 +21840,7 @@ async function resolveTypeSpecServer(context) {
         const script = context.asAbsolutePath("../compiler/entrypoints/server.js");
         // we use CLI instead of NODE_OPTIONS environment variable in this case
         // because --nolazy is not supported by NODE_OPTIONS.
-        const options = (_a = nodeOptions === null || nodeOptions === void 0 ? void 0 : nodeOptions.split(" ").filter((o) => o)) !== null && _a !== void 0 ? _a : [];
+        const options = nodeOptions?.split(" ").filter((o) => o) ?? [];
         return { command: "node", args: [...options, script, ...args] };
     }
     const options = {
@@ -21857,7 +21855,7 @@ async function resolveTypeSpecServer(context) {
     if (serverPath && typeof serverPath !== "string") {
         throw new Error("VS Code configuration option 'typespec.tsp-server.path' must be a string");
     }
-    const workspaceFolder = (_e = (_d = (_c = (_b = require$$0$1.workspace.workspaceFolders) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.uri) === null || _d === void 0 ? void 0 : _d.fsPath) !== null && _e !== void 0 ? _e : "";
+    const workspaceFolder = require$$0$1.workspace.workspaceFolders?.[0]?.uri?.fsPath ?? "";
     // Default to tsp-server on PATH, which would come from `npm install -g
     // @typespec/compiler` in a vanilla setup.
     if (!serverPath) {
@@ -21919,25 +21917,25 @@ async function isFile$1(path) {
     }
 }
 async function deactivate() {
-    await (client === null || client === void 0 ? void 0 : client.stop());
+    await client?.stop();
 }
 /**
  * Resolve some of the VSCode variables.
  * Simpler aLternative until https://github.com/microsoft/vscode/issues/46471 is supported.
  */
 class VSCodeVariableResolver {
+    variables;
+    static VARIABLE_REGEXP = /\$\{(.*?)\}/g;
     constructor(variables) {
         this.variables = variables;
     }
     resolve(value) {
         const replaced = value.replace(VSCodeVariableResolver.VARIABLE_REGEXP, (match, variable) => {
-            var _a;
-            return (_a = this.variables[variable]) !== null && _a !== void 0 ? _a : match;
+            return this.variables[variable] ?? match;
         });
         return replaced;
     }
 }
-VSCodeVariableResolver.VARIABLE_REGEXP = /\$\{(.*?)\}/g;
 
 // Forked from https://github.com/microsoft/TypeScript/blob/663b19fe4a7c4d4ddaa61aedadd28da06acd27b6/src/compiler/path.ts
 /**
@@ -22258,6 +22256,7 @@ function normalizeSlashes(path) {
 }
 
 class ResolveModuleError extends Error {
+    code;
     constructor(code, message) {
         super(message);
         this.code = code;
@@ -22334,7 +22333,6 @@ async function resolveModule(host, name, options) {
         return undefined;
     }
     async function loadAsDirectory(directory, mustBePackage) {
-        var _a;
         const pkgFile = resolvePath(directory, "package.json");
         if (await isFile(host, pkgFile)) {
             const pkg = await readPackage(host, pkgFile);
@@ -22343,7 +22341,7 @@ async function resolveModule(host, name, options) {
         if (mustBePackage) {
             return undefined;
         }
-        for (const file of (_a = options.directoryIndexFiles) !== null && _a !== void 0 ? _a : defaultDirectoryIndexFiles) {
+        for (const file of options.directoryIndexFiles ?? defaultDirectoryIndexFiles) {
             const resolvedFile = await loadAsFile(joinPaths(directory, file));
             if (resolvedFile) {
                 return resolvedFile;
@@ -22352,7 +22350,6 @@ async function resolveModule(host, name, options) {
         return undefined;
     }
     async function loadPackage(directory, pkg) {
-        var _a;
         const mainFile = options.resolveMain ? options.resolveMain(pkg) : pkg.main;
         if (typeof mainFile !== "string") {
             throw new TypeError(`package "${pkg.name}" main must be a string but was '${mainFile}'`);
@@ -22360,7 +22357,7 @@ async function resolveModule(host, name, options) {
         const mainFullPath = resolvePath(directory, mainFile);
         let loaded;
         try {
-            loaded = (_a = (await loadAsFile(mainFullPath))) !== null && _a !== void 0 ? _a : (await loadAsDirectory(mainFullPath));
+            loaded = (await loadAsFile(mainFullPath)) ?? (await loadAsDirectory(mainFullPath));
         }
         catch (e) {
             throw new Error(`Cannot find module '${mainFullPath}'. Please verify that the package.json has a valid "main" entry`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespec-vscode",
-  "version": "0.56.0-dev.1",
+  "version": "0.56.0",
   "author": "Microsoft Corporation",
   "description": "TypeSpec language support for VS Code",
   "homepage": "https://typespec.io",
@@ -25,7 +25,7 @@
   "type": "module",
   "main": "./dist/src/extension.cjs",
   "engines": {
-    "vscode": "^1.87.0"
+    "vscode": "^1.88.0"
   },
   "activationEvents": [
     "onLanguage:typespec",
@@ -116,21 +116,19 @@
     "@rollup/plugin-node-resolve": "~15.2.3",
     "@rollup/plugin-typescript": "~11.1.6",
     "@types/node": "~18.11.19",
-    "@types/vscode": "~1.87.0",
-    "@typespec/compiler": "~0.55.0 || >=0.56.0-dev <0.56.0",
-    "@typespec/internal-build-utils": "~0.55.0 || >=0.56.0-dev <0.56.0",
-    "@vitest/coverage-v8": "^1.4.0",
-    "@vitest/ui": "^1.4.0",
-    "@vscode/vsce": "~2.24.0",
+    "@types/vscode": "~1.88.0",
+    "@vitest/coverage-v8": "^1.5.0",
+    "@vitest/ui": "^1.5.0",
+    "@vscode/vsce": "~2.25.0",
     "c8": "^9.1.0",
     "rimraf": "~5.0.5",
-    "rollup": "~4.13.2",
-    "typescript": "~5.4.3",
-    "vitest": "^1.4.0",
-    "vscode-languageclient": "~9.0.1"
+    "rollup": "~4.14.3",
+    "typescript": "~5.4.5",
+    "vitest": "^1.5.0",
+    "vscode-languageclient": "~9.0.1",
+    "@typespec/compiler": "~0.56.0",
+    "@typespec/internal-build-utils": "~0.56.0"
   },
-  "dependencies": {},
-  "peerDependencies": {},
   "scripts": {
     "clean": "rimraf ./dist ./temp",
     "build": "npm run compile && npm run copy-tmlanguage && npm run generate-language-configuration && npm run generate-third-party-notices && npm run package-vsix",