self import lib

15 files changed, 39 insertions, 18 deletions

diff --git a/build.zig b/build.zig
index 366613a..c31450c 100644
--- a/build.zig
+++ b/build.zig
@@ -15,6 +15,7 @@ pub fn build(b: *std.Build) void {
     });
 
     mod.addOptions("config", opts);
+    mod.addImport("memora", mod);
 
     const exe = b.addExecutable(.{
         .name = "memora",
diff --git a/src/routes/context.zig b/src/context.zig
index 7c0ca4e..54ece18 100644
--- a/src/routes/context.zig
+++ b/src/context.zig
@@ -1,5 +1,7 @@
 const std = @import("std");
-const Storage = @import("../storage/root.zig");
+
+const memora = @import("memora");
+const Storage = memora.Storage;
 
 const Self = @This();
 
diff --git a/src/root.zig b/src/root.zig
index c5ea36e..81dcdb2 100644
--- a/src/root.zig
+++ b/src/root.zig
@@ -6,3 +6,4 @@ pub const routes = @import("routes/root.zig");
 
 pub const Server = @import("server.zig");
 pub const Storage = @import("storage/root.zig");
+pub const Context = @import("context.zig");
diff --git a/src/routes/api/auth/first-login.zig b/src/routes/api/auth/first-login.zig
index 34f04d8..523fdf4 100644
--- a/src/routes/api/auth/first-login.zig
+++ b/src/routes/api/auth/first-login.zig
@@ -1,5 +1,7 @@
 const std = @import("std");
-const Context = @import("../../context.zig");
+
+const memora = @import("memora");
+const Context = memora.Context;
 
 pub const access = .everyone;
 
diff --git a/src/routes/api/auth/login.zig b/src/routes/api/auth/login.zig
index 76efcf4..d7ee5cb 100644
--- a/src/routes/api/auth/login.zig
+++ b/src/routes/api/auth/login.zig
@@ -1,7 +1,8 @@
 const std = @import("std");
 
-const Context = @import("../../context.zig");
-const Storage = @import("../../../storage/root.zig");
+const memora = @import("memora");
+const Context = memora.Context;
+const Storage = memora.Storage;
 
 const Body = struct {
     user: []const u8,
diff --git a/src/routes/api/image/list.zig b/src/routes/api/image/list.zig
index ee7a648..d305276 100644
--- a/src/routes/api/image/list.zig
+++ b/src/routes/api/image/list.zig
@@ -1,6 +1,7 @@
 const std = @import("std");
-const Context = @import("../../context.zig");
-const Storage = @import("../../../storage/root.zig");
+const memora = @import("memora");
+const Context = memora.Context;
+const Storage = memora.Storage;
 
 pub const access = .users;
 
diff --git a/src/routes/api/image/load.zig b/src/routes/api/image/load.zig
index 1bafb11..51c0e26 100644
--- a/src/routes/api/image/load.zig
+++ b/src/routes/api/image/load.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
-const Context = @import("../../context.zig");
-const Storage = @import("../../../storage/root.zig");
+
+const memora = @import("memora");
+const Context = memora.Context;
+const Storage = memora.Storage;
 
 pub const access = .users;
 
diff --git a/src/routes/api/image/upload.zig b/src/routes/api/image/upload.zig
index 3aa2ea6..bbdd47c 100644
--- a/src/routes/api/image/upload.zig
+++ b/src/routes/api/image/upload.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
-const Context = @import("../../context.zig");
-const Storage = @import("../../../storage/root.zig");
+
+const memora = @import("memora");
+const Context = memora.Context;
+const Storage = memora.Storage;
 
 const log = std.log.scoped(.image_upload);
 
diff --git a/src/routes/api/session/current.zig b/src/routes/api/session/current.zig
index 31c8476..e86c115 100644
--- a/src/routes/api/session/current.zig
+++ b/src/routes/api/session/current.zig
@@ -1,5 +1,7 @@
 const std = @import("std");
-const Context = @import("../../context.zig");
+
+const memora = @import("memora");
+const Context = memora.Context;
 
 pub const access = .users;
 
diff --git a/src/routes/api/session/drop.zig b/src/routes/api/session/drop.zig
index eacf8ce..4b193e0 100644
--- a/src/routes/api/session/drop.zig
+++ b/src/routes/api/session/drop.zig
@@ -1,4 +1,5 @@
-const Context = @import("../../context.zig");
+const memora = @import("memora");
+const Context = memora.Context;
 
 pub const access = .users;
 
diff --git a/src/routes/api/session/is-valid.zig b/src/routes/api/session/is-valid.zig
index 4ea4f1a..8cf6794 100644
--- a/src/routes/api/session/is-valid.zig
+++ b/src/routes/api/session/is-valid.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
 const config = @import("config");
-const Context = @import("../../context.zig");
+
+const memora = @import("memora");
+const Context = memora.Context;
 
 pub const access = .everyone;
 
diff --git a/src/routes/api/session/renew.zig b/src/routes/api/session/renew.zig
index 7dfa491..c13e27e 100644
--- a/src/routes/api/session/renew.zig
+++ b/src/routes/api/session/renew.zig
@@ -1,4 +1,5 @@
-const Context = @import("../../context.zig");
+const memora = @import("memora");
+const Context = memora.Context;
 
 pub const access = .users;
 
diff --git a/src/routes/handler-info.zig b/src/routes/handler-info.zig
index 94d0491..e8c9dfb 100644
--- a/src/routes/handler-info.zig
+++ b/src/routes/handler-info.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
-const Context = @import("context.zig");
-const Storage = @import("../storage/root.zig");
+
+const memora = @import("memora");
+const Context = memora.Context;
+const Storage = memora.Storage;
 
 const config = @import("config");
 
diff --git a/src/routes/root.zig b/src/routes/root.zig
index 878b9f2..c438893 100644
--- a/src/routes/root.zig
+++ b/src/routes/root.zig
@@ -2,7 +2,6 @@ const std = @import("std");
 
 pub const HandlerInfo = @import("handler-info.zig");
 
-pub const Context = @import("context.zig");
 pub const api = @import("api/root.zig");
 pub const static: HandlerInfo = .from_type(@import("static.zig"));
 
diff --git a/src/routes/static.zig b/src/routes/static.zig
index 8719cc9..ef7d493 100644
--- a/src/routes/static.zig
+++ b/src/routes/static.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
 const mime = @import("../mime.zig");
-const Context = @import("context.zig");
+
+const memora = @import("memora");
+const Context = memora.Context;
 
 const log = std.log.scoped(.fallback);