Merge compiler 0.59.1 hotfix back into main (#4176)

microsoft · Aug 13, 2024 · a279784 · a279784
1 parent b9e465b
commit a279784
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 30 deletions.
diff --git a/packages/compiler/CHANGELOG.md b/packages/compiler/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log - @typespec/compiler
 
+## 0.59.1
+
+### Bug Fixes
+
+- [#4173](https://github.com/microsoft/typespec/pull/4173) Fix: Revert `unix-style` warning that was preventing windows path via the CLI as well
+
+
 ## 0.59.0
 
 ### Bug Fixes

diff --git a/packages/compiler/package.json b/packages/compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typespec/compiler",
-  "version": "0.59.0",
+  "version": "0.59.1",
   "description": "TypeSpec Compiler Preview",
   "author": "Microsoft Corporation",
   "license": "MIT",

diff --git a/packages/compiler/src/config/config-loader.ts b/packages/compiler/src/config/config-loader.ts
@@ -260,13 +260,13 @@ function validatePathAbsolute(
       target: target === NoTarget ? target : getLocationInYamlScript(target.file, target.path),
     });
   }
-  if (path.includes("\\")) {
-    return createDiagnostic({
-      code: "path-unix-style",
-      format: { path },
-      target: target === NoTarget ? target : getLocationInYamlScript(target.file, target.path),
-    });
-  }
+  // if (path.includes("\\")) {
+  //   return createDiagnostic({
+  //     code: "path-unix-style",
+  //     format: { path },
+  //     target: target === NoTarget ? target : getLocationInYamlScript(target.file, target.path),
+  //   });
+  // }
 
   return undefined;
 }
diff --git a/packages/compiler/src/core/schema-validator.ts b/packages/compiler/src/core/schema-validator.ts
@@ -22,9 +22,9 @@ function absolutePathStatus(path: string): "valid" | "not-absolute" | "windows-s
   if (path.startsWith(".") || !isPathAbsolute(path)) {
     return "not-absolute";
   }
-  if (path.includes("\\")) {
-    return "windows-style";
-  }
+  // if (path.includes("\\")) {
+  //   return "windows-style";
+  // }
   return "valid";
 }
 
@@ -75,20 +75,11 @@ function ajvErrorToDiagnostic(
   const tspTarget = resolveTarget(error, target);
   if (error.params.format === "absolute-path") {
     const value = getErrorValue(obj, error) as any;
-    const status = absolutePathStatus(value);
-    if (status === "windows-style") {
-      return createDiagnostic({
-        code: "path-unix-style",
-        format: { path: value },
-        target: tspTarget,
-      });
-    } else {
-      return createDiagnostic({
-        code: "config-path-absolute",
-        format: { path: value },
-        target: tspTarget,
-      });
-    }
+    return createDiagnostic({
+      code: "config-path-absolute",
+      format: { path: value },
+      target: tspTarget,
+    });
   }
 
   const messageLines = [`Schema violation: ${error.message} (${error.instancePath || "/"})`];

diff --git a/packages/compiler/templates/scaffolding.json b/packages/compiler/templates/scaffolding.json
@@ -3,12 +3,12 @@
     "title": "Empty project",
     "description": "Create an empty project.",
     "libraries": [],
-    "compilerVersion": "0.59.0"
+    "compilerVersion": "0.59.1"
   },
   "rest": {
     "title": "Generic REST API",
     "description": "Create a project representing a generic REST API",
-    "compilerVersion": "0.59.0",
+    "compilerVersion": "0.59.1",
     "libraries": [
       "@typespec/http",
       "@typespec/rest",
@@ -23,7 +23,7 @@
   "library-ts": {
     "title": "TypeSpec Library (With TypeScript)",
     "description": "Create a new package to add decorators or linters to typespec.",
-    "compilerVersion": "0.59.0",
+    "compilerVersion": "0.59.1",
     "libraries": [],
     "files": [
       {
@@ -99,7 +99,7 @@
   "emitter-ts": {
     "title": "TypeSpec Emitter (With TypeScript)",
     "description": "Create a new package that will be emitting typespec",
-    "compilerVersion": "0.59.0",
+    "compilerVersion": "0.59.1",
     "libraries": [],
     "files": [
       {

diff --git a/packages/compiler/test/core/emitter-options.test.ts b/packages/compiler/test/core/emitter-options.test.ts
@@ -118,7 +118,8 @@ describe("compiler: emitter options", () => {
       });
     });
 
-    it("emit diagnostic if passing windows style path", async () => {
+    // This was disabled due to making it impossible to use windows path via the cli https://github.com/microsoft/typespec/pull/4173
+    it.skip("emit diagnostic if passing windows style path", async () => {
       const diagnostics = await diagnoseEmitterOptions({
         "asset-dir": "C:\\abc\\def",
       });