Abstracts package API like dune (#47)

* Abstracts package API like dune * Windows: unnecessary Sys.path_sep * Look for entrypoint in Index.re first
esy · Sep 20, 2019 · ffd36e6 · ffd36e6
1 parent bb6658c
commit ffd36e6
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 12 deletions.
diff --git a/e2e-tests/pesy-configure-test-projects/pesy-npm-lib-entry/executable/PesyNpmApp.re b/e2e-tests/pesy-configure-test-projects/pesy-npm-lib-entry/executable/PesyNpmApp.re
@@ -1 +1 @@
-Util.Util.foo();
+Util.foo();
diff --git a/e2e-tests/pesy-configure-test-projects/pesy-npm-lib-entry/test/TestPesyNpm.re b/e2e-tests/pesy-configure-test-projects/pesy-npm-lib-entry/test/TestPesyNpm.re
@@ -1,3 +1,3 @@
-Util.Util.foo();
+Util.foo();
 /* Bar.bar() from util.foo.bar is not available here */
 print_endline("Add Your Test Cases Here");
diff --git a/e2e-tests/pesy-configure-test-projects/pesy-npm-relative/executable/PesyNpmApp.re b/e2e-tests/pesy-configure-test-projects/pesy-npm-relative/executable/PesyNpmApp.re
@@ -1,2 +1,2 @@
 Library.Util.foo();
-Bar.Bar.bar();
+Bar.bar();
diff --git a/e2e-tests/pesy-configure-test-projects/pesy-npm-scoped/executable/PesyNpmApp.re b/e2e-tests/pesy-configure-test-projects/pesy-npm-scoped/executable/PesyNpmApp.re
@@ -1,2 +1,2 @@
 Library.Util.foo();
-Bar.Bar.bar();
+Bar.bar();
diff --git a/e2e-tests/pesy-configure-test-projects/pesy-npm/executable/PesyNpmApp.re b/e2e-tests/pesy-configure-test-projects/pesy-npm/executable/PesyNpmApp.re
@@ -1,2 +1,2 @@
 Library.Util.foo();
-Bar.Bar.bar();
+Bar.bar();
diff --git a/...-projects/pesy-npm/library/foo/bar/Bar.re → ...rojects/pesy-npm/library/foo/bar/Index.re b/...-projects/pesy-npm/library/foo/bar/Bar.re → ...rojects/pesy-npm/library/foo/bar/Index.re
diff --git a/lib/PesyConf.re b/lib/PesyConf.re
@@ -76,7 +76,9 @@ let resolveRelativePath = path => {
     };
   };
 
-  String.concat(separator, resolve(revParts, 0, []));
+  let dirSepChar = Filename.dir_sep.[0];
+  (path.[0] == dirSepChar ? Filename.dir_sep : "")
+  ++ String.concat(separator, resolve(revParts, 0, []));
 };
 
 /* let%expect_test _ = { */
@@ -398,12 +400,77 @@ let toPesyConf = (projectPath: string, json: JSON.t): t => {
                      };
 
                    PesyModule.Alias.create(
-                     ~alias=
-                       sprintf(
-                         "module %s = %s;",
-                         importedNamespace,
-                         exportedNamespace,
-                       ),
+                     ~alias={
+                       switch (
+                         List.fold_left(
+                           (accExt, ext) =>
+                             List.fold_left(
+                               (accEntry, entry) => {
+                                 switch (accEntry) {
+                                 | Some(x) => Some(x)
+                                 | None =>
+                                   if (findIndex(libraryAsPath, rootName) != 0) {
+                                     Some(
+                                       sprintf(
+                                         "module %s = %s;",
+                                         importedNamespace,
+                                         exportedNamespace,
+                                       ),
+                                     );
+                                   } else {
+                                     let stripRootName =
+                                       Str.global_replace(
+                                         Str.regexp(rootName ++ "/"),
+                                         "",
+                                       );
+                                     let basePathToRequirePkg =
+                                       libraryAsPath
+                                       |> stripRootName
+                                       |> (x => Path.(projectPath / x))
+                                       |> resolveRelativePath;
+                                     if (Sys.file_exists(
+                                           Path.(basePathToRequirePkg / entry)
+                                           ++ ext,
+                                         )
+                                         || Sys.file_exists(
+                                              Path.(
+                                                basePathToRequirePkg
+                                                / String.lowercase_ascii(
+                                                    entry,
+                                                  )
+                                              )
+                                              ++ ext,
+                                            )) {
+                                       Some(
+                                         sprintf(
+                                           "module %s = %s.%s;",
+                                           importedNamespace,
+                                           exportedNamespace,
+                                           entry,
+                                         ),
+                                       );
+                                     } else {
+                                       None;
+                                     };
+                                   }
+                                 }
+                               },
+                               accExt,
+                               ["Index", importedNamespace] /* If it finds, Index.re, it doesn't look for Bar.re */
+                             ),
+                           None,
+                           [".re", ".ml"],
+                         )
+                       ) {
+                       | Some(x) => x
+                       | None =>
+                         sprintf(
+                           "module %s = %s;",
+                           importedNamespace,
+                           exportedNamespace,
+                         )
+                       };
+                     },
                      ~library=pathToOCamlLibName(libraryAsPath),
                      ~originalNamespace=importedNamespace,
                    );