@bgord/bun 1.9.2 → 1.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgord/bun",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "license": "MIT",
   "type": "module",
   "author": "Bartosz Gordon",
@@ -32,7 +32,6 @@
     "knip": "5.81.0",
     "lefthook": "2.0.15",
     "lockfile-lint": "4.14.1",
-    "lru-cache": "11.2.4",
     "only-allow": "1.2.2",
     "sharp": "0.34.5",
     "shellcheck": "4.1.0",
@@ -40,8 +39,8 @@
     "zod": "4.3.5"
   },
   "dependencies": {
-    "@bgord/tools": "1.2.22",
-    "better-auth": "1.4.13",
+    "@bgord/tools": "1.3.6",
+    "better-auth": "1.4.14",
     "croner": "9.1.0",
     "csv": "6.4.1",
     "hcaptcha": "0.2.0",
@@ -53,16 +52,12 @@
     "yazl": "3.3.1"
   },
   "peerDependencies": {
-    "lru-cache": "11.2.4",
     "zod": "4.3.5",
     "sharp": "0.34.5"
   },
   "peerDependenciesMeta": {
     "sharp": {
       "optional": true
-    },
-    "lru-cache": {
-      "optional": true
     }
   }
 }

package/readme.md

@@ -39,7 +39,6 @@ src/
 ├── build-info-repository-package-json.strategy.ts
 ├── build-info-repository.strategy.ts
 ├── cache-file.service.ts
-├── cache-repository-lru-cache.adapter.ts
 ├── cache-repository-node-cache.adapter.ts
 ├── cache-repository-noop.adapter.ts
 ├── cache-repository.port.ts

package/src/file-draft-zip.service.ts

@@ -8,7 +8,7 @@ export class FileDraftZip extends FileDraft {
     basename: tools.BasenameType,
     private readonly parts: FileDraft[],
   ) {
-    super(basename, tools.MIMES.zip);
+    super(basename, tools.Extension.parse("zip"), tools.Mimes.zip.mime);
     this.parts = parts;
   }
 

package/src/file-draft.service.ts

@@ -6,13 +6,17 @@ export type DraftBody = BodyInit | NodeJS.ReadableStream | ReadableStream;
 export abstract class FileDraft {
   readonly filename: tools.Filename;
 
-  constructor(basename: tools.BasenameType, mime: tools.Mime) {
-    this.filename = tools.Filename.fromPartsSafe(basename, mime.toExtension());
+  constructor(
+    basename: tools.BasenameType,
+    extension: tools.ExtensionType,
+    readonly mime: tools.Mime,
+  ) {
+    this.filename = tools.Filename.fromPartsSafe(basename, extension);
   }
 
   getHeaders(): Headers {
     return new Headers({
-      "Content-Type": this.filename.getMime().toString(),
+      "Content-Type": this.mime.toString(),
       "Content-Disposition": `attachment; filename="${this.filename.get()}"`,
     });
   }
@@ -28,6 +32,6 @@ export abstract class FileDraft {
   async toAttachment() {
     const body = await this.create();
 
-    return { filename: this.filename, content: body, contentType: this.filename.getMime().toString() };
+    return { filename: this.filename, content: body, contentType: this.mime.toString() };
   }
 }

package/src/file-uploader.middleware.ts

@@ -3,11 +3,9 @@ import { bodyLimit } from "hono/body-limit";
 import { createMiddleware } from "hono/factory";
 import { HTTPException } from "hono/http-exception";
 
-type FileUploaderConfigType = { mimeTypes: tools.Mime[]; maxFilesSize: tools.Size };
+type FileUploaderConfigType = { MimeRegistry: tools.MimeRegistry; maxFilesSize: tools.Size };
 
-export const FileUploaderInvalidMimeError = new HTTPException(400, {
-  message: "file.uploader.invalid.mime",
-});
+export const FileUploaderInvalidMimeError = new HTTPException(400, { message: "file.uploader.invalid.mime" });
 
 export const FileUploaderTooBigError = new HTTPException(400, { message: "file.uploader.too.big" });
 
@@ -28,8 +26,9 @@ export class FileUploader {
 
         if (!(file instanceof File)) throw FileUploaderInvalidMimeError;
 
-        const contentType = tools.Mime.fromString(file.type);
-        const accepted = config.mimeTypes.some((accepted) => accepted.isSatisfiedBy(contentType));
+        const mime = tools.Mime.fromString(file.type);
+
+        const accepted = config.MimeRegistry.hasMime(mime);
 
         if (!accepted) throw FileUploaderInvalidMimeError;
         return next();

package/src/hash-file-noop.adapter.ts

@@ -8,7 +8,7 @@ export class HashFileNoopAdapter implements HashFilePort {
       etag: Hash.fromString("0000000000000000000000000000000000000000000000000000000000000000"),
       size: tools.Size.fromBytes(10),
       lastModified: tools.Timestamp.fromNumber(1000),
-      mime: tools.MIMES.text,
+      mime: tools.Mimes.text.mime,
     };
   }
 }

package/src/hash-file-sha256-bun.adapter.ts

@@ -2,22 +2,26 @@ import * as tools from "@bgord/tools";
 import type { HashContentStrategy } from "./hash-content.strategy";
 import type { HashFilePort } from "./hash-file.port";
 
-type Dependencies = { HashContent: HashContentStrategy };
+type Dependencies = { HashContent: HashContentStrategy; MimeRegistry: tools.MimeRegistry };
 
 export class HashFileSha256BunAdapter implements HashFilePort {
   constructor(private readonly deps: Dependencies) {}
 
   async hash(path: tools.FilePathAbsolute | tools.FilePathRelative) {
-    const file = Bun.file(path.get());
     const extension = path.getFilename().getExtension();
 
+    const mime = this.deps.MimeRegistry.fromExtension(extension);
+
+    if (!mime) throw new Error(tools.MimeRegistryError.MimeNotFound);
+
+    const file = Bun.file(path.get());
     const arrayBuffer = await file.arrayBuffer();
 
     return {
       etag: await this.deps.HashContent.hash(await file.text()),
       size: tools.Size.fromBytes(arrayBuffer.byteLength),
       lastModified: tools.Timestamp.fromNumber(file.lastModified),
-      mime: tools.Mime.fromExtension(extension),
+      mime,
     };
   }
 }

package/src/image-info-sharp.adapter.ts

@@ -1,7 +1,11 @@
 import * as tools from "@bgord/tools";
 import type { ImageInfoPort } from "./image-info.port";
 
+type Dependencies = { MimeRegistry: tools.MimeRegistry };
+
 export class ImageInfoSharpAdapter implements ImageInfoPort {
+  constructor(private readonly deps: Dependencies) {}
+
   private async load() {
     const name = "sha" + "rp"; // Bun does not resolve dynamic imports with a dynamic name
     return (await import(name)).default;
@@ -17,10 +21,15 @@ export class ImageInfoSharpAdapter implements ImageInfoPort {
 
     const metadata = await pipeline.metadata();
 
+    const extension = tools.Extension.parse(metadata.format);
+    const mime = this.deps.MimeRegistry.fromExtension(extension);
+
+    if (!mime) throw new Error(tools.MimeRegistryError.MimeNotFound);
+
     return {
       width: tools.ImageWidth.parse(metadata.width),
       height: tools.ImageHeight.parse(metadata.height),
-      mime: tools.Mime.fromExtension(tools.Extension.parse(metadata.format)),
+      mime,
       size: tools.Size.fromBytes(Bun.file(path).size),
     };
   }

package/src/index.ts

@@ -14,7 +14,6 @@ export * from "./build-info-repository-noop.strategy";
 export * from "./build-info-repository-package-json.strategy";
 export * from "./cache-file.service";
 export * from "./cache-repository.port";
-export * from "./cache-repository-lru-cache.adapter";
 export * from "./cache-repository-node-cache.adapter";
 export * from "./cache-repository-noop.adapter";
 export * from "./cache-resolver.strategy";

package/src/remote-file-storage-noop.adapter.ts

@@ -32,7 +32,7 @@ export class RemoteFileStorageNoopAdapter implements RemoteFileStoragePort {
       etag: Hash.fromString("0000000000000000000000000000000000000000000000000000000000000000"),
       size: tools.Size.fromBytes(10),
       lastModified: this.deps.Clock.now(),
-      mime: tools.MIMES.text,
+      mime: tools.Mimes.text.mime,
     };
   }
 

package/dist/cache-repository-lru-cache.adapter.d.ts

@@ -1,17 +0,0 @@
-import type { CacheRepositoryPort, CacheRepositoryTtlType } from "./cache-repository.port";
-import type { Hash } from "./hash.vo";
-export declare const CacheRepositoryLruCacheAdapterError: {
-    MissingDependency: string;
-};
-export declare class CacheRepositoryLruCacheAdapter implements CacheRepositoryPort {
-    private readonly store;
-    private constructor();
-    static build(config: CacheRepositoryTtlType): Promise<CacheRepositoryLruCacheAdapter>;
-    private static resolve;
-    static import(): Promise<typeof import("lru-cache")>;
-    get<T>(subject: Hash): Promise<T | null>;
-    set<T>(subject: Hash, value: T): Promise<void>;
-    delete(subject: Hash): Promise<void>;
-    flush(): Promise<void>;
-}
-//# sourceMappingURL=cache-repository-lru-cache.adapter.d.ts.map

package/dist/cache-repository-lru-cache.adapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cache-repository-lru-cache.adapter.d.ts","sourceRoot":"","sources":["../src/cache-repository-lru-cache.adapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAC3F,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGtC,eAAO,MAAM,mCAAmC;;CAE/C,CAAC;AAEF,qBAAa,8BAA+B,YAAW,mBAAmB;IACxE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA+B;IAErD,OAAO;WAIM,KAAK,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,8BAA8B,CAAC;mBAYtE,OAAO;WAUf,MAAM;IAIb,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAIxC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,MAAM,CAAC,OAAO,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}

package/dist/cache-repository-lru-cache.adapter.js

@@ -1,43 +0,0 @@
-export const CacheRepositoryLruCacheAdapterError = {
-    MissingDependency: "cache.repository.lru.cache.adapter.error.missing.dependency",
-};
-export class CacheRepositoryLruCacheAdapter {
-    store;
-    constructor(store) {
-        this.store = store;
-    }
-    static async build(config) {
-        const library = await CacheRepositoryLruCacheAdapter.resolve();
-        const store = new library({
-            max: 100_000,
-            ttl: config.type === "finite" ? config.ttl.ms : undefined,
-            ttlAutopurge: true,
-        });
-        return new CacheRepositoryLruCacheAdapter(store);
-    }
-    static async resolve() {
-        try {
-            const library = await CacheRepositoryLruCacheAdapter.import();
-            return library.LRUCache;
-        }
-        catch {
-            throw new Error(CacheRepositoryLruCacheAdapterError.MissingDependency);
-        }
-    }
-    static async import() {
-        return import("lru-cache");
-    }
-    async get(subject) {
-        return this.store.get(subject.get()) ?? null;
-    }
-    async set(subject, value) {
-        this.store.set(subject.get(), value);
-    }
-    async delete(subject) {
-        this.store.delete(subject.get());
-    }
-    async flush() {
-        this.store.clear();
-    }
-}
-//# sourceMappingURL=cache-repository-lru-cache.adapter.js.map

package/dist/cache-repository-lru-cache.adapter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cache-repository-lru-cache.adapter.js","sourceRoot":"","sources":["../src/cache-repository-lru-cache.adapter.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,mCAAmC,GAAG;IACjD,iBAAiB,EAAE,6DAA6D;CACjF,CAAC;AAEF,MAAM,OAAO,8BAA8B;IACxB,KAAK,CAA+B;IAErD,YAAoB,KAAmC;QACrD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAA8B;QAC/C,MAAM,OAAO,GAAG,MAAM,8BAA8B,CAAC,OAAO,EAAE,CAAC;QAE/D,MAAM,KAAK,GAAG,IAAI,OAAO,CAAqB;YAC5C,GAAG,EAAE,OAAO;YACZ,GAAG,EAAE,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;YACzD,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,OAAO,IAAI,8BAA8B,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,OAAO;QAC1B,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,8BAA8B,CAAC,MAAM,EAAE,CAAC;YAE9D,OAAO,OAAO,CAAC,QAAQ,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,iBAAiB,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM;QACjB,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,GAAG,CAAI,OAAa;QACxB,OAAQ,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAO,IAAI,IAAI,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,GAAG,CAAI,OAAa,EAAE,KAAQ;QAClC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAa;QACxB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACF"}

package/src/cache-repository-lru-cache.adapter.ts

@@ -1,58 +0,0 @@
-import type { LRUCache } from "lru-cache";
-import type { CacheRepositoryPort, CacheRepositoryTtlType } from "./cache-repository.port";
-import type { Hash } from "./hash.vo";
-import type { HashValueType } from "./hash-value.vo";
-
-export const CacheRepositoryLruCacheAdapterError = {
-  MissingDependency: "cache.repository.lru.cache.adapter.error.missing.dependency",
-};
-
-export class CacheRepositoryLruCacheAdapter implements CacheRepositoryPort {
-  private readonly store: LRUCache<HashValueType, any>;
-
-  private constructor(store: LRUCache<HashValueType, any>) {
-    this.store = store;
-  }
-
-  static async build(config: CacheRepositoryTtlType): Promise<CacheRepositoryLruCacheAdapter> {
-    const library = await CacheRepositoryLruCacheAdapter.resolve();
-
-    const store = new library<HashValueType, any>({
-      max: 100_000,
-      ttl: config.type === "finite" ? config.ttl.ms : undefined,
-      ttlAutopurge: true,
-    });
-
-    return new CacheRepositoryLruCacheAdapter(store);
-  }
-
-  private static async resolve() {
-    try {
-      const library = await CacheRepositoryLruCacheAdapter.import();
-
-      return library.LRUCache;
-    } catch {
-      throw new Error(CacheRepositoryLruCacheAdapterError.MissingDependency);
-    }
-  }
-
-  static async import() {
-    return import("lru-cache");
-  }
-
-  async get<T>(subject: Hash): Promise<T | null> {
-    return (this.store.get(subject.get()) as T) ?? null;
-  }
-
-  async set<T>(subject: Hash, value: T): Promise<void> {
-    this.store.set(subject.get(), value);
-  }
-
-  async delete(subject: Hash): Promise<void> {
-    this.store.delete(subject.get());
-  }
-
-  async flush(): Promise<void> {
-    this.store.clear();
-  }
-}