Fix minor compile errors

.github/workflows/release.yml

@@ -14,12 +14,11 @@ jobs:
       - run: |
           msg="${{ github.event.release.tag_name }}"
           echo "VERSION=${msg:1}" >> $GITHUB_ENV
-      - run: the install
-      - run: the build src
-      - run: the compile build/result --platform=linux                 && mv a.out cli-core-linux        && sleep 1
-      - run: the compile build/result --platform=macos   --arch=arm64  && mv a.out cli-core-macos-arm64  && sleep 1
-      - run: the compile build/result --platform=macos   --arch=x86_64 && mv a.out cli-core-macos-x86_64 && sleep 1
-      - run: the compile build/result --platform=windows               && mv a.out cli-core-windows      && sleep 1
+      - run: build.out install
+      - run: build.out compile build/result --platform=linux                 && mv a.out cli-core-linux        && sleep 1
+      - run: build.out compile build/result --platform=macos   --arch=arm64  && mv a.out cli-core-macos-arm64  && sleep 1
+      - run: build.out compile build/result --platform=macos   --arch=x86_64 && mv a.out cli-core-macos-x86_64 && sleep 1
+      - run: build.out compile build/result --platform=windows               && mv a.out cli-core-windows      && sleep 1
       - uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}

.github/workflows/test.yml

@@ -20,8 +20,7 @@ jobs:
       - run: sudo apt-get update
       - run: sudo apt-get install valgrind
       - run: the install
-      - run: the build src
-      - run: the compile build/result && mv a.out b.out
+      - run: build.out compile build/result && mv a.out b.out
       - run: valgrind ./b.out -h
       - run: valgrind ./b.out -v
       - run: valgrind ./b.out build test

package.yml

@@ -8,4 +8,4 @@ packages:
   the/parser: 0.3.2
   the/testing: 0.3.0
   the/yaml: 0.3.0
-  the/zip: 0.1.4
+  the/zip: 0.1.5

src/command

@@ -13,8 +13,6 @@ export fn command (compiler: str, action: str, path: str, outputPath: str, qs: s
 
   if !fs_existsSync(filePath) {
     throw error_NewError("File '" + filePath + "' does not exists")
-  } elif !fs_isFileSync(filePath) {
-    throw error_NewError("Path '" + filePath + "' is not a file")
   }
 
   if (action == "lex" || action == "parse") && compiler.empty {

src/compile

@@ -6,21 +6,19 @@
 import zip from "the/zip"
 
 export fn request (url: str, path: str) buffer_Buffer {
-  archivePath := path + ".zip"
-  zip(archivePath, path)
-
+  archivePath := path + path_SEP + "file.zip"
+  zip(archivePath, "*", cwd: path)
   data := fs_readFileSync(archivePath)
 
   headers := [
     request_Header{name: "authorization", value: "pELerETRaVeYHEne"},
-    request_Header{name: "content-type", value: "application/octet-stream"}
+    request_Header{name: "content-type", value: "application/zip"}
   ]
 
   mut req := request_open("POST", url, headers: headers, data: data)
   res := req.read()
   req.close()
 
-  fs_rmSync(path)
   fs_rmSync(archivePath)
 
   if res.status != 200 {

src/main

@@ -15,6 +15,7 @@ const VERSION_NUM := "0.13.3"
 const VERSION_NAME := "Enidora"
 
 main {
+  cwd := process_cwd()
   mut args := Args{lineLength: 70}
   defaultOutput := os_NAME == "Windows" ? "a.exe" : "a.out"
 
@@ -82,7 +83,7 @@ main {
       arg.command == "test"
     ) {
       action = arg.command
-      actionArgument = fs_isAbsoluteSync(arg.value) ? arg.value : process_cwd() + path_SEP + arg.value
+      actionArgument = fs_isAbsoluteSync(arg.value) ? arg.value : cwd + path_SEP + arg.value
     } elif (
       arg.command == "install" ||
       arg.command == "script" ||
@@ -103,7 +104,7 @@ main {
       paths := mapStr(arg.value.split(","), (it: str, idx: int) -> str { return it.trim() })
       excludePaths.merge(paths)
     } elif arg.option == "output" {
-      outputPath = fs_isAbsoluteSync(arg.value) ? arg.value : process_cwd() + path_SEP + arg.value
+      outputPath = fs_isAbsoluteSync(arg.value) ? arg.value : cwd + path_SEP + arg.value
     } elif arg.option == "platform" {
       platform = arg.value
     } elif arg.option == "run-args" {
@@ -123,12 +124,15 @@ main {
     process_exit(0)
   }
 
-  qs := "?v=" + version + "&p=" + platform + (arch.empty ? arch : "&a=" + arch)
+  mut qs := "?v=" + version
+  qs += "&p=" + platform
+  qs += (arch.empty ? arch : "&a=" + arch)
 
   if action == "compile" || action == "lex" || action == "parse" || action == "run" {
     commandAction := action == "run" ? "compile" : action
     mut runner := Runner_init(actionArgument, excludePaths)
-    command(compiler, commandAction, runner.inputPath, outputPath, qs)
+    qs += "&m=" + actionArgument.slice(cwd.len + path_SEP.len)
+    command(compiler, commandAction, runner.outputDir, outputPath, qs)
 
     if action == "run" {
       cmd := outputPath + (runArgs.empty ? "" : " " + runArgs)
@@ -137,7 +141,10 @@ main {
     }
 
     runner.deinit()
-    fs_rmSync(outputPath)
+
+    if action != "compile" {
+      fs_rmSync(outputPath)
+    }
   } elif action == "install" || action == "uninstall" || action == "update" {
     mut packager := Packager_init()
 
@@ -157,7 +164,7 @@ main {
 
     packager.deinit()
   } elif action == "script" {
-    packageYAMLPath := process_cwd() + path_SEP + "package.yml"
+    packageYAMLPath := cwd + path_SEP + "package.yml"
 
     if !fs_existsSync(packageYAMLPath) {
       throw error_NewError("File `package.yml` was not found")
@@ -183,7 +190,8 @@ main {
     }
   } elif action == "test" {
     mut tester := Tester_init(actionArgument, excludePaths)
-    command(compiler, "compile", tester.inputPath, tester.outputPath, qs)
+    qs += "&m=__the__main__"
+    command(compiler, "compile", tester.outputDir, tester.outputPath, qs)
 
     stdout := process_runSync(tester.outputPath)
     print(stdout.str(), terminator: "")

src/parser

@@ -36,11 +36,11 @@ export fn collectTestFunctionNames (path: str) str[] {
 }
 
 export fn collectUsedPaths (paths: str[]) str[] {
-  cwd := process_cwd()
   mut result: str[]
 
   loop i := 0; i < paths.len; i++ {
     file := parse(paths[i])
+    dir := path_dirname(paths[i])
     result.push(file.path)
 
     mut importPaths: str[]
@@ -55,7 +55,7 @@ export fn collectUsedPaths (paths: str[]) str[] {
       source := sourceLiteral.value
 
       if [".", "/"].contains(source.slice(0, 1)) {
-        sourcePath := fs_isAbsoluteSync(source) ? source : cwd + path_SEP + source
+        sourcePath := fs_isAbsoluteSync(source) ? source : dir + path_SEP + source
         importPaths.push(sourcePath)
       }
     })

src/runner

@@ -4,7 +4,7 @@
  */
 
 import collectUsedPaths from "./parser"
-import ensurePathDirectory, excludePaths, removeDirectorySync, scandirDeepSync from "./utils"
+import ensurePathDirectory, excludePaths, removeDirectorySync from "./utils"
 
 export obj Runner {
   cwd: str
@@ -35,6 +35,12 @@ export obj Runner {
 
     ensurePathDirectory(self.outputDir + self.targetPath.slice(cwdLen))
     fs_copyFileSync(self.targetPath, self.inputPath)
+
+    packageYamlPath := self.cwd + path_SEP + "package.yml"
+
+    if fs_existsSync(packageYamlPath) {
+      fs_copyFileSync(packageYamlPath, self.outputDir + path_SEP + "package.yml")
+    }
   }
 
   fn deinit (self: ref Self) {

src/tester

@@ -61,6 +61,12 @@ export obj Tester {
     mainContent := mainFileImports + os_EOL + mainFile
     self.outputPath = self.outputDir + path_SEP + "a." + (os_NAME == "Windows" ? "exe" : "out")
     fs_writeFileSync(self.inputPath, mainContent.toBuffer())
+
+    packageYamlPath := self.cwd + path_SEP + "package.yml"
+
+    if fs_existsSync(packageYamlPath) {
+      fs_copyFileSync(packageYamlPath, self.outputDir + path_SEP + "package.yml")
+    }
   }
 
   fn deinit (self: ref Self) {

src/utils

@@ -50,6 +50,21 @@ export fn removeDirectorySync (path: str) {
 }
 
 export fn scandirDeepSync (path: str) str[] {
-  // todo canonical needed
-  return []
+  files := fs_scandirSync(path)
+  filesLen := files.len
+  mut result: str[]
+
+  loop i := 0; i < filesLen; i++ {
+    file := files[i] as str
+    filePath := path + path_SEP + file
+    pathValid := !file.contains(".")
+
+    if pathValid && fs_isFileSync(filePath) {
+      result.push(filePath)
+    } elif pathValid && fs_isDirectorySync(filePath) {
+      result.merge(scandirDeepSync(filePath))
+    }
+  }
+
+  return result
 }