@bgord/bun 1.2.8 → 1.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgord/bun",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "license": "MIT",
   "type": "module",
   "author": "Bartosz Gordon",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@axiomhq/winston": "1.3.1",
-    "@bgord/tools": "1.1.13",
+    "@bgord/tools": "1.1.16",
     "@hono/ua-blocker": "0.1.20",
     "better-auth": "1.4.5",
     "croner": "9.1.0",

package/readme.md

@@ -151,7 +151,6 @@ src/
 ├── mailer-smtp.adapter.ts
 ├── mailer.port.ts
 ├── mailer.vo.ts
-├── markdown-generator-marked.adapter.ts
 ├── markdown-generator-noop.adapter.ts
 ├── markdown-generator.port.ts
 ├── memory-consumption.service.ts

package/src/encryption-key.vo.ts

@@ -5,7 +5,8 @@ export const EncryptionKeyError = {
   InvalidHex: "encryption.key.invalid.hex",
 } as const;
 
-const CHARS_WHITELIST = /^[0-9a-fA-F]{64}$/;
+// 64 hex chars allowed
+const CHARS_WHITELIST = /^[a-fA-F0-9]{64}$/;
 
 export const EncryptionKey = z
   .string(EncryptionKeyError.Type)

package/src/event-store-like.types.ts

@@ -1,5 +1,7 @@
+import type * as tools from "@bgord/tools";
+
 export type EventStoreLike<E extends { name: string }> = {
   save(events: E[]): Promise<unknown>;
 
-  saveAfter(events: E[], delay: { ms: number }): Promise<unknown>;
+  saveAfter(events: E[], offset: tools.Duration): Promise<unknown>;
 };

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

@@ -4,11 +4,12 @@ import { ZipFile } from "yazl";
 import { FileDraft } from "./file-draft.service";
 
 export class FileDraftZip extends FileDraft {
-  private readonly parts: FileDraft[];
-
-  constructor(config: { filename: tools.Filename; parts: FileDraft[] }) {
-    super({ filename: config.filename, mime: tools.MIMES.text });
-    this.parts = config.parts;
+  constructor(
+    basename: tools.BasenameType,
+    private readonly parts: FileDraft[],
+  ) {
+    super(basename, tools.MIMES.zip);
+    this.parts = parts;
   }
 
   // @ts-expect-error
@@ -17,7 +18,7 @@ export class FileDraftZip extends FileDraft {
     const chunks: Buffer[] = [];
 
     for (const part of this.parts) {
-      zip.addReadStream((await part.create()) as Readable, part.config.filename.get());
+      zip.addReadStream((await part.create()) as Readable, part.filename.get());
     }
     zip.end();
 

package/src/file-draft.service.ts

@@ -1,15 +1,19 @@
 import type { ReadableStream } from "node:stream/web";
-import type * as tools from "@bgord/tools";
+import * as tools from "@bgord/tools";
 
 export type DraftBody = BodyInit | NodeJS.ReadableStream | ReadableStream;
 
 export abstract class FileDraft {
-  constructor(readonly config: { filename: tools.Filename; mime: tools.Mime }) {}
+  readonly filename: tools.Filename;
+
+  constructor(basename: tools.BasenameType, mime: tools.Mime) {
+    this.filename = tools.Filename.fromPartsSafe(basename, mime.toExtension());
+  }
 
   getHeaders(): Headers {
     return new Headers({
-      "Content-Type": this.config.mime.toString(),
-      "Content-Disposition": `attachment; filename="${this.config.filename.get()}"`,
+      "Content-Type": this.filename.getMime().toString(),
+      "Content-Disposition": `attachment; filename="${this.filename.get()}"`,
     });
   }
 
@@ -24,6 +28,6 @@ export abstract class FileDraft {
   async toAttachment() {
     const body = await this.create();
 
-    return { filename: this.config.filename, content: body, contentType: this.config.mime.toString() };
+    return { filename: this.filename, content: body, contentType: this.filename.getMime().toString() };
   }
 }

package/src/index.ts

@@ -128,7 +128,7 @@ export * from "./mailer-noop.adapter";
 export * from "./mailer-smtp.adapter";
 export * from "./mailer-smtp-with-logger.adapter";
 export * from "./markdown-generator.port";
-export * from "./markdown-generator-marked.adapter";
+// export * from "./markdown-generator-marked.adapter"; # release candidate
 export * from "./markdown-generator-noop.adapter";
 export * from "./memory-consumption.service";
 export * as History from "./modules/history";

package/dist/markdown-generator-marked.adapter.d.ts

@@ -1,7 +0,0 @@
-import type { MarkdownGeneratorPort } from "./markdown-generator.port";
-export declare class MarkdownGeneratorMarkedAdapter implements MarkdownGeneratorPort {
-    private readonly instance;
-    constructor();
-    generate(content: string): Promise<string>;
-}
-//# sourceMappingURL=markdown-generator-marked.adapter.d.ts.map

package/dist/markdown-generator-marked.adapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"markdown-generator-marked.adapter.d.ts","sourceRoot":"","sources":["../src/markdown-generator-marked.adapter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAEvE,qBAAa,8BAA+B,YAAW,qBAAqB;IAC1E,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;;IAM5B,QAAQ,CAAC,OAAO,EAAE,MAAM;CAG/B"}

package/dist/markdown-generator-marked.adapter.js

@@ -1,12 +0,0 @@
-import DOMPurify from "isomorphic-dompurify";
-import { Marked } from "marked";
-export class MarkdownGeneratorMarkedAdapter {
-    instance;
-    constructor() {
-        this.instance = new Marked();
-    }
-    async generate(content) {
-        return DOMPurify.sanitize(await this.instance.parse(content));
-    }
-}
-//# sourceMappingURL=markdown-generator-marked.adapter.js.map

package/dist/markdown-generator-marked.adapter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"markdown-generator-marked.adapter.js","sourceRoot":"","sources":["../src/markdown-generator-marked.adapter.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,MAAM,OAAO,8BAA8B;IACxB,QAAQ,CAAS;IAElC;QACE,IAAI,CAAC,QAAQ,GAAG,IAAI,MAAM,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAe;QAC5B,OAAO,SAAS,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAChE,CAAC;CACF"}

package/src/markdown-generator-marked.adapter.ts

@@ -1,15 +0,0 @@
-import DOMPurify from "isomorphic-dompurify";
-import { Marked } from "marked";
-import type { MarkdownGeneratorPort } from "./markdown-generator.port";
-
-export class MarkdownGeneratorMarkedAdapter implements MarkdownGeneratorPort {
-  private readonly instance: Marked;
-
-  constructor() {
-    this.instance = new Marked();
-  }
-
-  async generate(content: string) {
-    return DOMPurify.sanitize(await this.instance.parse(content));
-  }
-}