fix import relative path (#271)

* fix import relative path

* bump to 0.7.6

rust/candid/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "candid"
-version = "0.7.5"
+version = "0.7.6"
 edition = "2018"
 authors = ["DFINITY Team"]
 description = "Candid is an interface description language (IDL) for interacting with canisters running on the Internet Computer."

rust/candid/src/parser/typing.rs

@@ -384,6 +384,10 @@ fn check_file_(file: &Path, is_pretty: bool) -> Result<(TypeEnv, Option<Type>)>
         file.parent().unwrap().to_path_buf()
     } else {
         std::env::current_dir()?
+            .join(file)
+            .parent()
+            .unwrap()
+            .to_path_buf()
     };
     let prog = std::fs::read_to_string(&file)
         .map_err(|_| Error::msg(format!("Cannot open {:?}", file)))?;

rust/candid/tests/assets/example.did

@@ -1,4 +1,6 @@
 import "recursion.did";
+import "import/a.did";
+import "import/b/b.did";
 type my_type = principal;
 type List = opt record { head: int; tail: List };
 type f = func (List, func (int32) -> (int64)) -> (opt List);
@@ -13,5 +15,6 @@ service server : {
   g : (my_type, List, opt List, nested) -> (int, broker) query;
   h : (vec opt text, variant { A: nat; B: opt text }, opt List) -> (record { id: nat; 0x2a: record {} });
   i : f;
+  x : (a,b) -> (opt a, opt b);
 }
 

rust/candid/tests/assets/import/a.did

@@ -0,0 +1,2 @@
+import "b/b.did";
+type a = variant {a;b:b};

rust/candid/tests/assets/import/b/b.did

@@ -0,0 +1 @@
+type b = record { int;nat };

rust/candid/tests/assets/ok/example.d.ts

@@ -2,6 +2,9 @@ import type { Principal } from '@dfinity/principal';
 export type A = B;
 export type B = [] | [A];
 export type List = [] | [{ 'head' : bigint, 'tail' : List }];
+export type a = { 'a' : null } |
+  { 'b' : b };
+export type b = [bigint, bigint];
 export interface broker { 'find' : (arg_0: string) => Promise<Principal> }
 export type f = (arg_0: List, arg_1: [Principal, string]) => Promise<
     [] | [List]
@@ -48,4 +51,5 @@ export interface _SERVICE {
       arg_2: [] | [List],
     ) => Promise<{ _42_ : {}, 'id' : bigint }>,
   'i' : f,
+  'x' : (arg_0: a, arg_1: b) => Promise<[[] | [a], [] | [b]]>,
 }

rust/candid/tests/assets/ok/example.did

@@ -1,6 +1,8 @@
 type A = B;
 type B = opt A;
 type List = opt record { head : int; tail : List };
+type a = variant { a; b : b };
+type b = record { int; nat };
 type broker = service {
   find : (text) -> (service { current : () -> (nat32); up : () -> () });
 };
@@ -31,4 +33,5 @@ service : {
       record { 42 : record {}; id : nat },
     );
   i : f;
+  x : (a, b) -> (opt a, opt b);
 }

rust/candid/tests/assets/ok/example.js

@@ -36,6 +36,8 @@ export const idlFactory = ({ IDL }) => {
       [IDL.Opt(List)],
       [],
     );
+  const b = IDL.Tuple(IDL.Int, IDL.Nat);
+  const a = IDL.Variant({ 'a' : IDL.Null, 'b' : b });
   return IDL.Service({
     'f' : IDL.Func(
         [list, IDL.Vec(IDL.Nat8), IDL.Opt(IDL.Bool)],
@@ -57,6 +59,7 @@ export const idlFactory = ({ IDL }) => {
         [],
       ),
     'i' : f,
+    'x' : IDL.Func([a, b], [IDL.Opt(a), IDL.Opt(b)], []),
   });
 };
 export const init = ({ IDL }) => { return []; };

rust/candid/tests/assets/ok/example.mo

@@ -5,6 +5,8 @@ module {
   public type A = B;
   public type B = ?A;
   public type List = ?{ head : Int; tail : List };
+  public type a = { #a; #b : b };
+  public type b = (Int, Nat);
   public type broker = actor {
     find : shared Text -> async actor {
         current : shared () -> async Nat32;
@@ -39,5 +41,6 @@ module {
         id : Nat;
       };
     i : f;
+    x : shared (a, b) -> async (?a, ?b);
   }
 }