Fix: wrong paths generated for @local/@preview packages (#30)

fenjalien · Oct 17, 2023 · faee30b · faee30b
1 parent 17f4473
commit faee30b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/compiler/src/lib.rs b/compiler/src/lib.rs
@@ -201,7 +201,7 @@ impl SystemWorld {
                     .js_request_data
                     .call1(
                         &JsValue::NULL,
-                        &format!("@{}/{}-{}", spec.namespace, spec.name, spec.version).into(),
+                        &format!("@{}/{}/{}", spec.namespace, spec.name, spec.version).into(),
                     )
                     .map_err(f)?
                     .as_string()

diff --git a/src/main.ts b/src/main.ts
@@ -185,12 +185,12 @@ export default class TypstPlugin extends Plugin {
         spec = spec.slice(1)
         let subdir = "/typst/packages/" + spec
 
-        let dir = normalizePath(this.getDataDir() + subdir)
+        let dir = require('path').normalize(this.getDataDir() + subdir)
         if (this.fs.existsSync(dir)) {
             return dir
         }
 
-        dir = normalizePath(this.getCacheDir() + subdir)
+        dir = require('path').normalize(this.getCacheDir() + subdir)
 
         if (this.fs.existsSync(dir)) {
             return dir