build: fix blazebuild scripts

onesoft-sudo · Jun 3, 2024 · f0ac5d5 · f0ac5d5
1 parent 7230148
commit f0ac5d5
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 43 deletions.
diff --git a/blaze/wrapper/blaze_wrapper.mjs b/blaze/wrapper/blaze_wrapper.mjs
@@ -79,7 +79,7 @@ function getProperty(name, def) {
 
 function determineIndexFile() {
     const blazeSrcPath = getProperty("blaze.srcpath", "build_src");
-    return path.resolve(PROJECT_DIR, blazeSrcPath, "src/main/typescript/index.ts");
+    return path.resolve(PROJECT_DIR, blazeSrcPath, "src/main/typescript/cli.ts");
 }
 
 

diff --git a/blazebuild/package.json b/blazebuild/package.json
@@ -1,7 +1,7 @@
 {
   "name": "blazebuild",
-  "main": "src/main/typescript/exports.ts",
-  "module": "src/main/typescript/exports.ts",
+  "main": "src/main/typescript/index.ts",
+  "module": "src/main/typescript/index.ts",
   "type": "module",
   "devDependencies": {
     "@types/bun": "latest",

diff --git a/blazebuild/src/main/typescript/cli.ts b/blazebuild/src/main/typescript/cli.ts
@@ -0,0 +1,12 @@
+import "reflect-metadata";
+
+import Blaze from "./core/Blaze";
+
+async function main() {
+    const blaze = Blaze.getInstance();
+    await blaze.boot();
+    await blaze.run();
+    await blaze.cacheManager.saveCache();
+}
+
+await main();
diff --git a/blazebuild/src/main/typescript/exports.ts b/blazebuild/src/main/typescript/exports.ts
diff --git a/blazebuild/src/main/typescript/index.ts b/blazebuild/src/main/typescript/index.ts
@@ -1,12 +1,28 @@
+import "./types/build";
 import "reflect-metadata";
 
-import Blaze from "./core/Blaze";
+import AbstractTask from "./tasks/AbstractTask";
+import { Task } from "./tasks/Task";
+import { TaskAction } from "./tasks/TaskAction";
+import { TaskDependencyGenerator } from "./tasks/TaskDependencyGenerator";
+import { TaskInputGenerator } from "./tasks/TaskInputGenerator";
+import { TaskOutputGenerator } from "./tasks/TaskOutputGenerator";
+import IO from "./io/IO";
+import { files, glob } from "./utils/glob";
 
-async function main() {
-    const blaze = Blaze.getInstance();
-    await blaze.boot();
-    await blaze.run();
-    await blaze.cacheManager.saveCache();
-}
+export {
+    AbstractTask,
+    Task,
+    TaskAction,
+    TaskDependencyGenerator,
+    TaskInputGenerator,
+    TaskOutputGenerator,
+    files,
+    glob,
+    IO
+};
 
-await main();
+export * from "./types/file";
+export * from "./types/project";
+export * from "./types/task";
+export * from "./types/utils";
diff --git a/blazebuild/src/main/typescript/project/ProjectManager.ts b/blazebuild/src/main/typescript/project/ProjectManager.ts
@@ -1,5 +1,5 @@
 import Manager from "../core/Manager";
-import type { ProjectProperties } from "../exports";
+import type { ProjectProperties } from "../types/project";
 
 class ProjectManager extends Manager {
     private _properties: Partial<ProjectProperties> = {

diff --git a/blazew b/blazew
@@ -252,22 +252,21 @@ if [ "$node" == "node" ]; then
     cmd="npm"
 fi
 
-file="$blaze_srcpath/build/out/main/typescript/index.js"
+file="$blaze_srcpath/build/out/main/typescript/cli.js"
 if [ ! -z "$has_bun" ] || [ $setup_done -eq 1 ] || [ -x "$bun" ]; then
     cmd=$bun
     has_bun=1
-    file="$blaze_srcpath/src/main/typescript/index.ts"
+    file="$blaze_srcpath/src/main/typescript/cli.ts"
 fi
 
 blaze_cmd() {
     node_path=$(dirname "$node")
-    final_path=$(readlink -f $node_path)
+    final_path=$(readlink -f "$node_path")
     wrapper=$(readlink -f "$projectdir/blaze/wrapper/blaze_wrapper.mjs")
 
     if [ -z "$has_bun" ]; then
         print "1;31" "error  " "Bun not found. Please install Bun to use BlazeBuild."
         exit 1
-        export PATH="$final_path":$PATH:"$final_path" && bash -c "exec -a \"$argv_0\" $node $wrapper $file --- $*"
     else
         export PATH="$final_path":$PATH:"$final_path" && bash -c "exec -a \"$argv_0\" $cmd $wrapper $file --- $*"
     fi
@@ -318,4 +317,5 @@ if [ $argsetup -eq 1 ]; then
     exit 0
 fi
 
+# shellcheck disable=SC2068
 blaze_cmd $@
diff --git a/build_src/src/main/typescript/tasks/RunTask.ts b/build_src/src/main/typescript/tasks/RunTask.ts
@@ -1,5 +1,4 @@
-import { AbstractTask, Task, TaskAction } from "blazebuild";
-import IO from "blazebuild/src/main/typescript/io/IO";
+import { AbstractTask, Task, TaskAction, IO } from "blazebuild";
 import { spawnSync } from "child_process";
 
 @Task({