@thisisagile/easy 12.7.9 → 12.7.14

package/dist/http/CacheControl.d.ts

@@ -1,22 +1,16 @@
-import { CacheAge } from "./CacheAge";
+import { CacheAge } from '../types';
 export declare class CacheControl {
     readonly enabled: boolean;
-    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;
+    private directives;
+    name: string;
+    protected constructor(enabled?: boolean, directives?: Record<string, boolean | CacheAge | undefined>);
     static disabled: () => CacheControl;
     static OneSecond: () => CacheControl;
     static fiveSeconds: () => CacheControl;
     static tenSeconds: () => CacheControl;
     static thirtySeconds: () => CacheControl;
     static sixtySeconds: () => CacheControl;
-    static custom: (maxAge?: CacheAge, staleWhileRevalidate?: number) => CacheControl;
+    static custom: (maxAge?: CacheAge, staleWhileRevalidate?: CacheAge) => CacheControl;
     readonly maxAge: (ca?: CacheAge) => this;
     readonly sharedMaxAge: (ca?: CacheAge) => this;
     readonly noCache: (a?: boolean) => this;
@@ -24,7 +18,7 @@ export declare class CacheControl {
     readonly private: (a?: boolean) => this;
     readonly public: (a?: boolean) => this;
     readonly immutable: (a?: boolean) => this;
-    readonly staleWhileRevalidate: (a?: number) => this;
+    readonly staleWhileRevalidate: (ca?: CacheAge) => this;
     value: () => string;
-    name: string;
+    toString(): string;
 }

package/dist/http/CacheControl.js

@@ -2,55 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CacheControl = void 0;
 const types_1 = require("../types");
-const CacheAge_1 = require("./CacheAge");
+const utils_1 = require("../utils");
 class CacheControl {
-    constructor(enabled = true) {
+    constructor(enabled = true, directives = {}) {
         this.enabled = enabled;
-        this.maxAge = (ca) => {
-            this._maxAge = ca ? CacheAge_1.cacheAge.toSeconds(ca) : ca;
-            return this;
-        };
-        this.sharedMaxAge = (ca) => {
-            this._sharedMaxAge = ca ? CacheAge_1.cacheAge.toSeconds(ca) : ca;
-            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 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.directives = directives;
         this.name = 'Cache-Control';
+        this.maxAge = (ca) => (0, types_1.on)(this, t => t.directives['max-age'] = ca);
+        this.sharedMaxAge = (ca) => (0, types_1.on)(this, t => t.directives['s-maxage'] = ca);
+        this.noCache = (a) => (0, types_1.on)(this, t => t.directives['no-cache'] = a);
+        this.mustRevalidate = (a) => (0, types_1.on)(this, t => t.directives['must-revalidate'] = a);
+        this.private = (a) => (0, types_1.on)(this, t => t.directives['private'] = a);
+        this.public = (a) => (0, types_1.on)(this, t => t.directives['public'] = a);
+        this.immutable = (a) => (0, types_1.on)(this, t => t.directives['immutable'] = a);
+        this.staleWhileRevalidate = (ca) => (0, types_1.on)(this, t => t.directives['stale-while-revalidate'] = ca);
+        this.value = () => this.toString();
+    }
+    toString() {
+        return (0, types_1.meta)(this.directives).entries().mapDefined(([k, v]) => (0, utils_1.ifDefined)(v, (0, types_1.isNumber)(v) ? `${k}=${types_1.cacheAge.toSeconds(v)}` : k)).join(',');
     }
 }
 exports.CacheControl = CacheControl;

package/dist/http/CacheControl.js.map

@@ -1 +1 @@
-{"version":3,"file":"CacheControl.js","sourceRoot":"","sources":["../../src/http/CacheControl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CacheControl.js","sourceRoot":"","sources":["../../src/http/CacheControl.ts"],"names":[],"mappings":"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"}

package/dist/http/index.d.ts

@@ -1,4 +1,3 @@
-export * from './CacheAge';
 export * from './CacheControl';
 export * from './ContentType';
 export * from './HttpHeader';

package/dist/http/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./CacheAge"), exports);
 __exportStar(require("./CacheControl"), exports);
 __exportStar(require("./ContentType"), exports);
 __exportStar(require("./HttpHeader"), exports);

package/dist/http/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/http/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA2B;AAC3B,iDAA+B;AAC/B,gDAA8B;AAC9B,+CAA6B;AAC7B,+CAA6B;AAC7B,6CAA2B;AAC3B,oDAAkC;AAClC,4CAA0B;AAC1B,mDAAiC;AACjC,oDAAkC;AAClC,6CAA2B;AAC3B,+CAA6B;AAC7B,yCAAuB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/http/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,gDAA8B;AAC9B,+CAA6B;AAC7B,+CAA6B;AAC7B,6CAA2B;AAC3B,oDAAkC;AAClC,4CAA0B;AAC1B,mDAAiC;AACjC,oDAAkC;AAClC,6CAA2B;AAC3B,+CAA6B;AAC7B,yCAAuB"}

package/dist/{http → types}/CacheAge.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cacheAge = void 0;
-const types_1 = require("../types");
-const ageNumber = (s) => (0, types_1.asNumber)(s.replace(/[a-z]/g, ''));
+const index_1 = require("./index");
+const ageNumber = (s) => (0, index_1.asNumber)(s.replace(/[a-z]/g, ''));
 exports.cacheAge = {
-    toMilliseconds: (ca) => (0, types_1.choose)((0, types_1.asString)(ca))
+    toMilliseconds: (ca) => (0, index_1.choose)((0, index_1.asString)(ca))
         .case(c => c.endsWith('ms'), c => ageNumber(c))
         .case(c => c.endsWith('s'), c => ageNumber(c) * 1000)
         .case(c => c.endsWith('m'), c => ageNumber(c) * 60 * 1000)
         .case(c => c.endsWith('h'), c => ageNumber(c) * 3600 * 1000)
         .case(c => c.endsWith('d'), c => ageNumber(c) * 24 * 3600 * 1000)
         .else(ca),
-    toSeconds: (ca) => (0, types_1.choose)((0, types_1.asString)(ca))
+    toSeconds: (ca) => (0, index_1.choose)((0, index_1.asString)(ca))
         .case(c => c.endsWith('ms'), c => ageNumber(c) / 1000)
         .case(c => c.endsWith('s'), c => ageNumber(c))
         .case(c => c.endsWith('m'), c => ageNumber(c) * 60)

package/dist/types/CacheAge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CacheAge.js","sourceRoot":"","sources":["../../src/types/CacheAge.ts"],"names":[],"mappings":";;;AAAA,mCAAmD;AAInD,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAE9D,QAAA,QAAQ,GAAG;IACpB,cAAc,EAAE,CAAC,EAAY,EAAU,EAAE,CACrC,IAAA,cAAM,EAAC,IAAA,gBAAQ,EAAC,EAAE,CAAC,CAAC;SACf,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EACrB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CACpB;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAC3B;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAChC;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,CAClC;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CACvC;SACA,IAAI,CAAC,EAAY,CAAC;IAE3B,SAAS,EAAE,CAAC,EAAY,EAAU,EAAE,CAChC,IAAA,cAAM,EAAC,IAAA,gBAAQ,EAAC,EAAE,CAAC,CAAC;SACf,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EACrB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAC3B;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CACpB;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,CACzB;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAC3B;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAChC;SACA,IAAI,CAAC,EAAY,CAAC;CAC9B,CAAA"}

package/dist/types/Constructor.d.ts

@@ -6,3 +6,4 @@ export declare type Construct<T> = Get<T> | Constructor<T>;
 export declare const isConstructor: <T>(c?: unknown) => c is Constructor<T>;
 export declare const ofConstruct: <T>(c: Construct<T>, ...args: unknown[]) => T;
 export declare const toName: (subject?: unknown, postfix?: string) => string;
+export declare const on: <T>(t: T, f: (t: T) => unknown) => T;

package/dist/types/Constructor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toName = exports.ofConstruct = exports.isConstructor = void 0;
+exports.on = exports.toName = exports.ofConstruct = exports.isConstructor = void 0;
 const Func_1 = require("./Func");
 const Is_1 = require("./Is");
 const isConstructor = (c) => ((0, Is_1.isDefined)(c) && (0, Func_1.isFunc)(c) && c.prototype && c.prototype.constructor) === c;
@@ -9,4 +9,9 @@ const ofConstruct = (c, ...args) => ((0, exports.isConstructor)(c) ? new c(...ar
 exports.ofConstruct = ofConstruct;
 const toName = (subject, postfix = '') => subject?.constructor?.name?.replace(postfix, '').toLowerCase() ?? '';
 exports.toName = toName;
+const on = (t, f) => {
+    f(t);
+    return t;
+};
+exports.on = on;
 //# sourceMappingURL=Constructor.js.map

package/dist/types/Constructor.js.map

@@ -1 +1 @@
-{"version":3,"file":"Constructor.js","sourceRoot":"","sources":["../../src/types/Constructor.ts"],"names":[],"mappings":";;;AACA,iCAAgC;AAChC,6BAAiC;AAM1B,MAAM,aAAa,GAAG,CAAI,CAAW,EAAuB,EAAE,CAAC,CAAC,IAAA,cAAS,EAAC,CAAC,CAAC,IAAI,IAAA,aAAM,EAAa,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAAjJ,QAAA,aAAa,iBAAoI;AAEvJ,MAAM,WAAW,GAAG,CAAI,CAAe,EAAE,GAAG,IAAe,EAAK,EAAE,CAAC,CAAC,IAAA,qBAAa,EAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,aAAM,EAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAA7I,QAAA,WAAW,eAAkI;AAEnJ,MAAM,MAAM,GAAG,CAAC,OAAiB,EAAE,OAAO,GAAG,EAAE,EAAU,EAAE,CAAE,OAAe,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC;AAApI,QAAA,MAAM,UAA8H"}
+{"version":3,"file":"Constructor.js","sourceRoot":"","sources":["../../src/types/Constructor.ts"],"names":[],"mappings":";;;AACA,iCAAgC;AAChC,6BAAiC;AAM1B,MAAM,aAAa,GAAG,CAAI,CAAW,EAAuB,EAAE,CAAC,CAAC,IAAA,cAAS,EAAC,CAAC,CAAC,IAAI,IAAA,aAAM,EAAa,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAAjJ,QAAA,aAAa,iBAAoI;AAEvJ,MAAM,WAAW,GAAG,CAAI,CAAe,EAAE,GAAG,IAAe,EAAK,EAAE,CAAC,CAAC,IAAA,qBAAa,EAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,aAAM,EAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAA7I,QAAA,WAAW,eAAkI;AAEnJ,MAAM,MAAM,GAAG,CAAC,OAAiB,EAAE,OAAO,GAAG,EAAE,EAAU,EAAE,CAAE,OAAe,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC;AAApI,QAAA,MAAM,UAA8H;AAE1I,MAAM,EAAE,GAAG,CAAI,CAAI,EAAE,CAAoB,EAAK,EAAE;IACnD,CAAC,CAAC,CAAC,CAAC,CAAC;IACL,OAAO,CAAC,CAAC;AACb,CAAC,CAAC;AAHW,QAAA,EAAE,MAGb"}

package/dist/types/index.d.ts

@@ -1,5 +1,6 @@
 export * from './Array';
 export * from './Builder';
+export * from './CacheAge';
 export * from './Case';
 export * from './Constructor';
 export * from './Context';

package/dist/types/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Array"), exports);
 __exportStar(require("./Builder"), exports);
+__exportStar(require("./CacheAge"), exports);
 __exportStar(require("./Case"), exports);
 __exportStar(require("./Constructor"), exports);
 __exportStar(require("./Context"), exports);

package/dist/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,yCAAuB;AACvB,gDAA8B;AAC9B,4CAA0B;AAC1B,yCAAuB;AACvB,gDAA8B;AAC9B,8CAA4B;AAC5B,yCAAuB;AACvB,4CAA0B;AAC1B,wCAAsB;AACtB,uCAAqB;AACrB,6CAA2B;AAC3B,uCAAqB;AACrB,wCAAsB;AACtB,2CAAyB;AACzB,4CAA0B;AAC1B,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,yCAAuB;AACvB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,wCAAsB;AACtB,6CAA2B;AAC3B,yCAAuB;AACvB,6CAA2B;AAC3B,wCAAsB;AACtB,0CAAwB;AACxB,wCAAsB;AACtB,yCAAuB;AACvB,gDAA8B;AAC9B,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,6CAA2B;AAC3B,yCAAuB;AACvB,gDAA8B;AAC9B,4CAA0B;AAC1B,yCAAuB;AACvB,gDAA8B;AAC9B,8CAA4B;AAC5B,yCAAuB;AACvB,4CAA0B;AAC1B,wCAAsB;AACtB,uCAAqB;AACrB,6CAA2B;AAC3B,uCAAqB;AACrB,wCAAsB;AACtB,2CAAyB;AACzB,4CAA0B;AAC1B,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,yCAAuB;AACvB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,wCAAsB;AACtB,6CAA2B;AAC3B,yCAAuB;AACvB,6CAA2B;AAC3B,wCAAsB;AACtB,0CAAwB;AACxB,wCAAsB;AACtB,yCAAuB;AACvB,gDAA8B;AAC9B,0CAAwB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "12.7.9",
+  "version": "12.7.14",
   "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.7.9",
+    "@thisisagile/easy-test": "12.7.14",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^8.5.9",
     "@types/luxon": "3.0.2",

package/src/http/CacheControl.ts

@@ -1,78 +1,45 @@
-import { isDefined } from '../types';
-import {cacheAge, CacheAge} from "./CacheAge";
+import {cacheAge, CacheAge, isNumber, meta, on} from '../types';
+import {ifDefined} from "../utils";
 
 export class CacheControl {
-  protected constructor(readonly enabled = true) {}
-
-  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?: CacheAge, staleWhileRevalidate?: number) => new CacheControl().maxAge(maxAge).staleWhileRevalidate(staleWhileRevalidate);
-
-  readonly maxAge = (ca?: CacheAge): this => {
-    this._maxAge = ca ? cacheAge.toSeconds(ca) : ca;
-    return this;
-  };
-
-  readonly sharedMaxAge = (ca?: CacheAge): this => {
-    this._sharedMaxAge = ca ? cacheAge.toSeconds(ca) : ca;
-    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;
-  };
-
-  readonly immutable = (a?: boolean): this => {
-    this._immutable = a;
-    return this;
-  };
-
-  readonly staleWhileRevalidate = (a?: number): this => {
-    this._staleWhileRevalidate = a;
-    return this;
-  };
-
-  value = (): string => {
-    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';
+    name = 'Cache-Control';
+
+    protected constructor(readonly enabled = true, private directives: Record<string, boolean | CacheAge | undefined> = {}) {
+    }
+
+    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?: CacheAge, staleWhileRevalidate?: CacheAge) => new CacheControl().maxAge(maxAge).staleWhileRevalidate(staleWhileRevalidate);
+
+    readonly maxAge = (ca?: CacheAge): this => on(this, t => t.directives['max-age'] = ca);
+
+    readonly sharedMaxAge = (ca?: CacheAge): this => on(this, t => t.directives['s-maxage'] = ca);
+
+    readonly noCache = (a?: boolean): this => on(this, t => t.directives['no-cache'] = a);
+
+    readonly mustRevalidate = (a?: boolean): this => on(this, t => t.directives['must-revalidate'] = a);
+
+    readonly private = (a?: boolean): this => on(this, t => t.directives['private'] = a);
+
+    readonly public = (a?: boolean): this => on(this, t => t.directives['public'] = a);
+
+    readonly immutable = (a?: boolean): this => on(this, t => t.directives['immutable'] = a);
+
+    readonly staleWhileRevalidate = (ca?: CacheAge): this => on(this, t => t.directives['stale-while-revalidate'] = ca);
+
+    value = (): string => this.toString();
+
+    toString(): string {
+        return meta(this.directives).entries().mapDefined(([k, v]) => ifDefined(v, isNumber(v) ? `${k}=${cacheAge.toSeconds(v)}` : k)).join(',');
+    }
 }

package/src/http/index.ts

@@ -1,4 +1,3 @@
-export * from './CacheAge';
 export * from './CacheControl';
 export * from './ContentType';
 export * from './HttpHeader';

package/src/{http → types}/CacheAge.ts

@@ -1,4 +1,4 @@
-import {asNumber, asString, choose} from "../types";
+import {asNumber, asString, choose} from "./index";
 
 export type CacheAge = `${number}${'ms' | 's' | 'm' | 'h' | 'd'}` | number;
 

package/src/types/Constructor.ts

@@ -11,3 +11,8 @@ export const isConstructor = <T>(c?: unknown): c is Constructor<T> => (isDefined
 export const ofConstruct = <T>(c: Construct<T>, ...args: unknown[]): T => (isConstructor<T>(c) ? new c(...args) : isFunc<T, unknown>(c) ? c(...args) : c);
 
 export const toName = (subject?: unknown, postfix = ''): string => (subject as any)?.constructor?.name?.replace(postfix, '').toLowerCase() ?? '';
+
+export const on = <T>(t: T, f: (t: T) => unknown): T => {
+    f(t);
+    return t;
+};

package/src/types/index.ts

@@ -1,5 +1,6 @@
 export * from './Array';
 export * from './Builder';
+export * from './CacheAge';
 export * from './Case';
 export * from './Constructor';
 export * from './Context';

package/dist/http/CacheAge.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CacheAge.js","sourceRoot":"","sources":["../../src/http/CacheAge.ts"],"names":[],"mappings":";;;AAAA,oCAAoD;AAIpD,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAE9D,QAAA,QAAQ,GAAG;IACpB,cAAc,EAAE,CAAC,EAAY,EAAU,EAAE,CACrC,IAAA,cAAM,EAAC,IAAA,gBAAQ,EAAC,EAAE,CAAC,CAAC;SACf,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EACrB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CACpB;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAC3B;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAChC;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,CAClC;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CACvC;SACA,IAAI,CAAC,EAAY,CAAC;IAE3B,SAAS,EAAE,CAAC,EAAY,EAAU,EAAE,CAChC,IAAA,cAAM,EAAC,IAAA,gBAAQ,EAAC,EAAE,CAAC,CAAC;SACf,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EACrB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAC3B;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CACpB;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,CACzB;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAC3B;SACA,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAChC;SACA,IAAI,CAAC,EAAY,CAAC;CAC9B,CAAA"}