@thisisagile/easy 12.1.10 → 12.2.1

package/dist/http/CacheControl.d.ts

@@ -1,17 +1,29 @@
 export declare class CacheControl {
-    private age;
-    private stale?;
     readonly enabled: boolean;
-    private constructor();
+    protected constructor(enabled?: boolean);
+    protected _maxAge?: number;
+    protected _sharedMaxAge?: number;
+    protected _noCache?: boolean;
+    protected _mustRevalidate?: boolean;
+    protected _private?: boolean;
+    protected _public?: boolean;
+    protected _immutable?: boolean;
+    protected _staleWhileRevalidate?: number;
     static disabled: () => CacheControl;
     static OneSecond: () => CacheControl;
     static fiveSeconds: () => CacheControl;
     static tenSeconds: () => CacheControl;
     static thirtySeconds: () => CacheControl;
     static sixtySeconds: () => CacheControl;
-    static custom: (maxAge: number, staleWhileRevalidate?: number) => CacheControl;
-    maxAge: (a: number) => this;
-    staleWhileRevalidate: (s?: number) => this;
+    static custom: (maxAge?: number, staleWhileRevalidate?: number) => CacheControl;
+    readonly maxAge: (a?: number) => this;
+    readonly sharedMaxAge: (a?: number) => this;
+    readonly noCache: (a?: boolean) => this;
+    readonly mustRevalidate: (a?: boolean) => this;
+    readonly private: (a?: boolean) => this;
+    readonly public: (a?: boolean) => this;
+    readonly immutable: (a?: boolean) => this;
+    readonly staleWhileRevalidate: (a?: number) => this;
     value: () => string;
     name: string;
 }

package/dist/http/CacheControl.js

@@ -3,27 +3,57 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CacheControl = void 0;
 const types_1 = require("../types");
 class CacheControl {
-    constructor(age = 1, stale, enabled = true) {
-        this.age = age;
-        this.stale = stale;
+    constructor(enabled = true) {
         this.enabled = enabled;
         this.maxAge = (a) => {
-            this.age = Math.abs(a);
+            this._maxAge = a;
             return this;
         };
-        this.staleWhileRevalidate = (s) => {
-            this.stale = (0, types_1.isDefined)(s) ? Math.abs(s) : undefined;
+        this.sharedMaxAge = (a) => {
+            this._sharedMaxAge = a;
+            return this;
+        };
+        this.noCache = (a) => {
+            this._noCache = a;
+            return this;
+        };
+        this.mustRevalidate = (a) => {
+            this._mustRevalidate = a;
+            return this;
+        };
+        this.private = (a) => {
+            this._private = a;
+            return this;
+        };
+        this.public = (a) => {
+            this._public = a;
+            return this;
+        };
+        this.immutable = (a) => {
+            this._immutable = a;
+            return this;
+        };
+        this.staleWhileRevalidate = (a) => {
+            this._staleWhileRevalidate = a;
             return this;
         };
         this.value = () => {
-            const swr = (0, types_1.isDefined)(this.stale) ? `, stale-while-revalidate=${this.stale}` : '';
-            return this.enabled ? `max-age=${this.age}${swr}` : '';
+            const directives = [];
+            (0, types_1.isDefined)(this._maxAge) && directives.push(`max-age=${this._maxAge}`);
+            (0, types_1.isDefined)(this._sharedMaxAge) && directives.push(`s-maxage=${this._sharedMaxAge}`);
+            this._noCache === true && directives.push(`no-cache`);
+            this._mustRevalidate === true && directives.push(`must-revalidate`);
+            this._private === true && directives.push(`private`);
+            this._public === true && directives.push(`public`);
+            this._immutable === true && directives.push(`immutable`);
+            (0, types_1.isDefined)(this._staleWhileRevalidate) && directives.push(`stale-while-revalidate=${this._staleWhileRevalidate}`);
+            return directives.join(',');
         };
         this.name = 'Cache-Control';
     }
 }
 exports.CacheControl = CacheControl;
-CacheControl.disabled = () => new CacheControl(0, 0, false);
+CacheControl.disabled = () => new CacheControl(false);
 CacheControl.OneSecond = () => new CacheControl().maxAge(1).staleWhileRevalidate(1);
 CacheControl.fiveSeconds = () => new CacheControl().maxAge(5).staleWhileRevalidate(5);
 CacheControl.tenSeconds = () => new CacheControl().maxAge(10).staleWhileRevalidate(10);

package/dist/http/CacheControl.js.map

@@ -1 +1 @@
-{"version":3,"file":"CacheControl.js","sourceRoot":"","sources":["../../src/http/CacheControl.ts"],"names":[],"mappings":";;;AAAA,oCAAqC;AAErC,MAAa,YAAY;IACvB,YAA4B,MAAc,CAAC,EAAU,KAAc,EAAW,UAAU,IAAI;QAAhE,QAAG,GAAH,GAAG,CAAY;QAAU,UAAK,GAAL,KAAK,CAAS;QAAW,YAAO,GAAP,OAAO,CAAO;QAU5F,WAAM,GAAG,CAAC,CAAS,EAAQ,EAAE;YAC3B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACvB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,yBAAoB,GAAG,CAAC,CAAU,EAAQ,EAAE;YAC1C,IAAI,CAAC,KAAK,GAAG,IAAA,iBAAS,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACpD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,UAAK,GAAG,GAAW,EAAE;YACnB,MAAM,GAAG,GAAG,IAAA,iBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,4BAA4B,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClF,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,CAAC,CAAC;QAEF,SAAI,GAAG,eAAe,CAAC;IAzBwE,CAAC;;AADlG,oCA2BC;AAxBQ,qBAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;AAC/C,sBAAS,GAAG,GAAG,EAAE,CAAC,IAAI,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;AACvE,wBAAW,GAAG,GAAG,EAAE,CAAC,IAAI,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;AACzE,uBAAU,GAAG,GAAG,EAAE,CAAC,IAAI,YAAY,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;AAC1E,0BAAa,GAAG,GAAG,EAAE,CAAC,IAAI,YAAY,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;AAC7E,yBAAY,GAAG,GAAG,EAAE,CAAC,IAAI,YAAY,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;AAC5E,mBAAM,GAAG,CAAC,MAAc,EAAE,oBAA6B,EAAE,EAAE,CAAC,IAAI,YAAY,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"CacheControl.js","sourceRoot":"","sources":["../../src/http/CacheControl.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "12.1.10",
+  "version": "12.2.1",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@thisisagile/easy-test": "12.1.10",
+    "@thisisagile/easy-test": "12.2.1",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^8.5.9",
     "@types/luxon": "3.0.0",

package/src/http/CacheControl.ts

@@ -1,29 +1,76 @@
 import { isDefined } from '../types';
 
 export class CacheControl {
-  private constructor(private age: number = 1, private stale?: number, readonly enabled = true) {}
+  protected constructor(readonly enabled = true) {}
 
-  static disabled = () => new CacheControl(0, 0, false);
+  protected _maxAge?: number;
+  protected _sharedMaxAge?: number;
+  protected _noCache?: boolean;
+  protected _mustRevalidate?: boolean;
+  protected _private?: boolean;
+  protected _public?: boolean;
+  protected _immutable?: boolean;
+  protected _staleWhileRevalidate?: number;
+
+  static disabled = () => new CacheControl(false);
   static OneSecond = () => new CacheControl().maxAge(1).staleWhileRevalidate(1);
   static fiveSeconds = () => new CacheControl().maxAge(5).staleWhileRevalidate(5);
   static tenSeconds = () => new CacheControl().maxAge(10).staleWhileRevalidate(10);
   static thirtySeconds = () => new CacheControl().maxAge(30).staleWhileRevalidate(30);
   static sixtySeconds = () => new CacheControl().maxAge(60).staleWhileRevalidate(60);
-  static custom = (maxAge: number, staleWhileRevalidate?: number) => new CacheControl().maxAge(maxAge).staleWhileRevalidate(staleWhileRevalidate);
+  static custom = (maxAge?: number, staleWhileRevalidate?: number) => new CacheControl().maxAge(maxAge).staleWhileRevalidate(staleWhileRevalidate);
+
+  readonly maxAge = (a?: number): this => {
+    this._maxAge = a;
+    return this;
+  };
+
+  readonly sharedMaxAge = (a?: number): this => {
+    this._sharedMaxAge = a;
+    return this;
+  };
+
+  readonly noCache = (a?: boolean): this => {
+    this._noCache = a;
+    return this;
+  };
+
+  readonly mustRevalidate = (a?: boolean): this => {
+    this._mustRevalidate = a;
+    return this;
+  };
+
+  readonly private = (a?: boolean): this => {
+    this._private = a;
+    return this;
+  };
+
+  readonly public = (a?: boolean): this => {
+    this._public = a;
+    return this;
+  };
 
-  maxAge = (a: number): this => {
-    this.age = Math.abs(a);
+  readonly immutable = (a?: boolean): this => {
+    this._immutable = a;
     return this;
   };
 
-  staleWhileRevalidate = (s?: number): this => {
-    this.stale = isDefined(s) ? Math.abs(s) : undefined;
+  readonly staleWhileRevalidate = (a?: number): this => {
+    this._staleWhileRevalidate = a;
     return this;
   };
 
   value = (): string => {
-    const swr = isDefined(this.stale) ? `, stale-while-revalidate=${this.stale}` : '';
-    return this.enabled ? `max-age=${this.age}${swr}` : '';
+    const directives: string[] = [];
+    isDefined(this._maxAge) && directives.push(`max-age=${this._maxAge}`);
+    isDefined(this._sharedMaxAge) && directives.push(`s-maxage=${this._sharedMaxAge}`);
+    this._noCache === true && directives.push(`no-cache`);
+    this._mustRevalidate === true && directives.push(`must-revalidate`);
+    this._private === true && directives.push(`private`);
+    this._public === true && directives.push(`public`);
+    this._immutable === true && directives.push(`immutable`);
+    isDefined(this._staleWhileRevalidate) && directives.push(`stale-while-revalidate=${this._staleWhileRevalidate}`);
+    return directives.join(',');
   };
 
   name = 'Cache-Control';