@bgord/bun 1.8.0 → 1.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgord/bun",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "license": "MIT",
   "type": "module",
   "author": "Bartosz Gordon",
@@ -29,7 +29,7 @@
     "@types/nodemailer": "7.0.4",
     "@types/yazl": "3.3.0",
     "cspell": "9.4.0",
-    "knip": "5.79.0",
+    "knip": "5.80.0",
     "lefthook": "2.0.13",
     "lockfile-lint": "4.14.1",
     "lru-cache": "11.2.4",

package/src/invariant-error-handler.service.ts

@@ -1,21 +1,22 @@
-import type { Invariant } from "./invariant.service";
+import type { ContentfulStatusCode } from "hono/utils/http-status";
+import { type Invariant, InvariantFailureKind } from "./invariant.service";
 
 type BaseInvariantType = Invariant<any>;
 type InvariantMessageType = BaseInvariantType["message"];
-type InvariantCodeType = BaseInvariantType["code"];
-type ErrorResponseTupleType = [{ message: InvariantMessageType; _known: true }, InvariantCodeType];
+type ErrorResponseTupleType = [{ message: InvariantMessageType; _known: true }, ContentfulStatusCode];
 
 export class InvariantErrorHandler {
-  error: BaseInvariantType | undefined = undefined;
-
-  constructor(private readonly invariants: BaseInvariantType[]) {}
-
-  detect(error: unknown) {
-    this.error = this.invariants.find((invariant) => error instanceof invariant.error);
-    return this;
+  static detect(invariants: BaseInvariantType[], error: unknown): BaseInvariantType | undefined {
+    return invariants.find((invariant) => error instanceof invariant.error);
   }
 
   static respond(error: BaseInvariantType): ErrorResponseTupleType {
-    return [{ message: error.message, _known: true }, error.code];
+    const code: Record<InvariantFailureKind, ContentfulStatusCode> = {
+      [InvariantFailureKind.forbidden]: 403,
+      [InvariantFailureKind.not_found]: 404,
+      [InvariantFailureKind.precondition]: 400,
+    };
+
+    return [{ message: error.message, _known: true }, code[error.kind]];
   }
 }

package/src/invariant.service.ts

@@ -1,26 +1,27 @@
 import type { Constructor } from "@bgord/tools";
-import type { ContentfulStatusCode } from "hono/utils/http-status";
 
 type BaseInvariantConfig = Record<string, unknown>;
 
+export enum InvariantFailureKind {
+  forbidden = "forbidden",
+  precondition = "precondition",
+  not_found = "not_found",
+}
+
 export abstract class Invariant<T extends BaseInvariantConfig> {
-  abstract fails(config: T): boolean;
+  abstract passes(config: T): boolean;
 
   abstract error: Constructor<Error>;
 
   abstract message: string;
 
-  abstract code: ContentfulStatusCode;
+  abstract kind: InvariantFailureKind;
 
   throw() {
     throw new this.error();
   }
 
-  perform(config: T) {
-    if (this.fails(config)) this.throw();
-  }
-
-  passes(config: T) {
-    return !this.fails(config);
+  enforce(config: T) {
+    if (!this.passes(config)) this.throw();
   }
 }

package/src/modules/preferences/command-handlers/handleSetUserLanguageCommand.ts

@@ -24,7 +24,7 @@ export const handleSetUserLanguageCommand =
     const candidate = supported.ensure(command.payload.language);
     const current = await deps.UserLanguageQuery.get(command.payload.userId);
 
-    if (Invariants.UserLanguageHasChanged.fails({ current, candidate: command.payload.language })) return;
+    if (!Invariants.UserLanguageHasChanged.passes({ current, candidate: command.payload.language })) return;
 
     const event = Events.UserLanguageSetEvent.parse({
       ...createEventEnvelope(`preferences_${command.payload.userId}`, deps),

package/src/modules/preferences/invariants/user-language-has-changed.ts

@@ -1,6 +1,5 @@
 import type * as tools from "@bgord/tools";
-import type { ContentfulStatusCode } from "hono/utils/http-status";
-import { Invariant } from "../../../invariant.service";
+import { Invariant, InvariantFailureKind } from "../../../invariant.service";
 
 class UserLanguageHasChangedError extends Error {
   constructor() {
@@ -15,13 +14,13 @@ type UserLanguageHasChangedConfigType = {
 };
 
 class UserLanguageHasChangedFactory extends Invariant<UserLanguageHasChangedConfigType> {
-  fails(config: UserLanguageHasChangedConfigType) {
-    return config.current === config.candidate;
+  passes(config: UserLanguageHasChangedConfigType) {
+    return config.current !== config.candidate;
   }
 
-  message = "UserLanguageHasChanged";
+  message = "user.language.has.changed";
+  kind = InvariantFailureKind.precondition;
   error = UserLanguageHasChangedError;
-  code = 403 as ContentfulStatusCode;
 }
 
 export const UserLanguageHasChanged = new UserLanguageHasChangedFactory();

package/src/setup.service.ts

@@ -19,13 +19,11 @@ import { MaintenanceMode, type MaintenanceModeConfigType } from "./maintenance-m
 import { TimeZoneOffset } from "./time-zone-offset.middleware";
 import { WeakETagExtractor } from "./weak-etag-extractor.middleware";
 
-export const BODY_LIMIT_MAX_SIZE = tools.Size.fromKb(128).toBytes();
-
 type SetupOverridesType = {
   cors?: Parameters<typeof cors>[0];
-  secureHeaders?: Parameters<typeof secureHeaders>[0];
   httpLogger?: HttpLoggerOptions;
   maintenanceMode?: MaintenanceModeConfigType;
+  BODY_LIMIT_MAX_SIZE?: tools.Size;
 };
 
 type Dependencies = {
@@ -38,32 +36,33 @@ type Dependencies = {
 
 export class Setup {
   static essentials(deps: Dependencies, overrides?: SetupOverridesType) {
-    // Stryker disable all
-    const corsOptions = overrides?.cors ?? { origin: "*" };
-    // Stryker restore all
-    const secureHeadersOptions = { crossOriginResourcePolicy: "cross-origin", ...overrides?.secureHeaders };
+    const BODY_LIMIT_MAX_SIZE = overrides?.BODY_LIMIT_MAX_SIZE ?? tools.Size.fromKb(128);
 
     return [
       MaintenanceMode.build(overrides?.maintenanceMode),
-      secureHeaders(secureHeadersOptions),
-      // Stryker disable all
-      bodyLimit({ maxSize: BODY_LIMIT_MAX_SIZE }),
-      // Stryker restore all
+      secureHeaders({
+        crossOriginResourcePolicy: "same-origin",
+        contentSecurityPolicy: {
+          defaultSrc: ["'none'"],
+          scriptSrc: ["'self'"],
+          styleSrc: ["'self'"],
+          imgSrc: ["'self'"],
+        },
+      }),
+      bodyLimit({ maxSize: BODY_LIMIT_MAX_SIZE.toBytes() }),
       ApiVersion.build({ Clock: deps.Clock, FileReaderJson: deps.FileReaderJson }),
-      cors(corsOptions),
-      // Stryker disable all
+      cors(overrides?.cors),
       languageDetector({
         supportedLanguages: Object.keys(deps.I18n.supportedLanguages),
         fallbackLanguage: deps.I18n.defaultLanguage,
+        // Stryker disable all
         caches: false,
+        // Stryker restore all
       }),
-      // Stryker restore all
       requestId({
         limitLength: 36,
         headerName: "x-correlation-id",
-        // Stryker disable all
         generator: () => deps.IdProvider.generate(),
-        // Stryker restore all
       }),
       TimeZoneOffset.attach,
       Context.attach,