From 1de319400d09c866d408ea8b67d4109a37e735dd Mon Sep 17 00:00:00 2001
From: Rizky <rizky05@gmail.com>
Date: Wed, 7 Feb 2024 19:15:02 +0700
Subject: [PATCH] wip fix

---
 pkgs/core/index.ts     | 8 +-------
 pkgs/core/utils/dir.ts | 5 +++++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/core/index.ts b/pkgs/core/index.ts
index 5101cc3b..3770d4a6 100644
--- a/pkgs/core/index.ts
+++ b/pkgs/core/index.ts
@@ -13,7 +13,6 @@ import { createId } from "@paralleldrive/cuid2";
 import { prepareApiRoutes } from "./server/api/api-scan";
 import { writeAsync } from "fs-jetpack";
 import { dir } from "dir";
-import { join } from "path";
 import { watchApiRoutes } from "./server/api/api-watch";
 // import "../docker-prep";
 
@@ -31,13 +30,8 @@ if (!g.Y) {
   await createLogger();
   g._api = {};
   g.mode = process.argv.includes("dev") ? "dev" : "prod";
-  Object.defineProperty(g, "datadir", {
-    get: function () {
-      return join(process.cwd(), g.mode === "prod" ? "../data" : "data");
-    },
-  });
+  g.datadir = dir.path(g.mode === "prod" ? "../data" : "data", false);
   console.log("DataDir", g.datadir);
-  
   g.port = parseInt(process.env.PORT || "4550");
 
   g.log.info(g.mode === "dev" ? "DEVELOPMENT" : "PRODUCTION");
diff --git a/pkgs/core/utils/dir.ts b/pkgs/core/utils/dir.ts
index 1ab29937..d0564cf1 100644
--- a/pkgs/core/utils/dir.ts
+++ b/pkgs/core/utils/dir.ts
@@ -3,6 +3,11 @@ import { join } from "path";
 export const dir = {
   path: (path: string, safe?: boolean) => {
     if (safe === false) return join(process.cwd(), path);
+
+    if (path.startsWith(process.cwd())) {
+      return path;
+    }
+    
     const final_path = path
       .split("/")
       .filter((e) => e !== "..")