@fgv/ts-utils - npm Package Compare versions

Comparing version 0.1.0 to 0.1.3

package.json

 {
   "name": "@fgv/ts-utils",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "Assorted Typescript Utilities",
@@ -5,0 +5,0 @@ "main": "index.js",

rangeOf.d.ts

@@ -6,2 +6,12 @@ import { Result } from './result';
 }
+export interface RangeOfFormats {
+    minOnly: string;
+    maxOnly: string;
+    minMax: string;
+}
+export declare const DEFAULT_RANGEOF_FORMATS: {
+    minOnly: string;
+    maxOnly: string;
+    minMax: string;
+};
 export declare class RangeOf<T> implements RangeOfProperties<T> {
@@ -12,2 +22,3 @@ readonly min?: T;
     static createRange<T>(init?: RangeOfProperties<T>): Result<RangeOf<T>>;
+    static propertiesToString<T>(range: RangeOfProperties<T>, formats?: RangeOfFormats, emptyValue?: T): string | undefined;
     protected static _defaultCompare<T>(t1: T, t2: T): 'less' | 'equal' | 'greater';
@@ -17,3 +28,5 @@ check(t: T): 'less' | 'included' | 'greater';
     findTransition(t: T): T | undefined;
+    toFormattedProperties(format: (value: T) => string | undefined): RangeOfProperties<string>;
+    format(format: (value: T) => string | undefined, formats?: RangeOfFormats): string | undefined;
     protected _compare(t1: T, t2: T): 'less' | 'equal' | 'greater';
 }

rangeOf.js

@@ -23,5 +23,15 @@ "use strict";
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RangeOf = void 0;
+exports.RangeOf = exports.DEFAULT_RANGEOF_FORMATS = void 0;
 const result_1 = require("./result");
+const mustache_1 = __importDefault(require("mustache"));
+;
+exports.DEFAULT_RANGEOF_FORMATS = {
+    minOnly: '{{min}}-',
+    maxOnly: '-{{max}}',
+    minMax: '{{min}}-{{max}}',
+};
 class RangeOf {
@@ -39,2 +49,17 @@ constructor(min, max) {
     }
+    static propertiesToString(range, formats, emptyValue) {
+        formats = formats !== null && formats !== void 0 ? formats : exports.DEFAULT_RANGEOF_FORMATS;
+        if ((range.min !== undefined) && (range.min !== emptyValue)) {
+            if ((range.max !== undefined) && (range.max !== emptyValue)) {
+                return mustache_1.default.render(formats.minMax, range);
+            }
+            else {
+                return mustache_1.default.render(formats.minOnly, range);
+            }
+        }
+        else if ((range.max !== undefined) && (range.max !== emptyValue)) {
+            return mustache_1.default.render(formats.maxOnly, range);
+        }
+        return undefined;
+    }
     static _defaultCompare(t1, t2) {
@@ -70,2 +95,11 @@ if (t1 < t2) {
     }
+    toFormattedProperties(format) {
+        return {
+            min: (this.min !== undefined) ? format(this.min) : undefined,
+            max: (this.max !== undefined) ? format(this.max) : undefined,
+        };
+    }
+    format(format, formats) {
+        return RangeOf.propertiesToString(this.toFormattedProperties(format), formats);
+    }
     _compare(t1, t2) {
@@ -76,2 +110,2 @@ return RangeOf._defaultCompare(t1, t2);
 exports.RangeOf = RangeOf;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmFuZ2VPZi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9yYW5nZU9mLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FvQkc7OztBQUVILHFDQUFpRDtBQU9qRCxNQUFhLE9BQU87SUFJaEIsWUFBbUIsR0FBTyxFQUFFLEdBQU87UUFDL0IsSUFBSSxDQUFDLENBQUMsR0FBRyxLQUFLLFNBQVMsQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLFNBQVMsQ0FBQyxDQUFDO1lBQzVDLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxLQUFLLFNBQVMsRUFBRTtZQUN2QyxNQUFNLElBQUksS0FBSyxDQUFDLG9CQUFvQixJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxlQUFlLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQ2pHO1FBQ0QsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztJQUNuQixDQUFDO0lBRU0sTUFBTSxDQUFDLFdBQVcsQ0FBSSxJQUEyQjtRQUNwRCxPQUFPLHNCQUFhLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxPQUFPLENBQUksSUFBSSxhQUFKLElBQUksdUJBQUosSUFBSSxDQUFFLEdBQUcsRUFBRSxJQUFJLGFBQUosSUFBSSx1QkFBSixJQUFJLENBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQztJQUNyRSxDQUFDO0lBRVMsTUFBTSxDQUFDLGVBQWUsQ0FBSSxFQUFLLEVBQUUsRUFBSztRQUM1QyxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUU7WUFDVCxPQUFPLE1BQU0sQ0FBQztTQUNqQjthQUNJLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRTtZQUNkLE9BQU8sU0FBUyxDQUFDO1NBQ3BCO1FBQ0QsT0FBTyxPQUFPLENBQUM7SUFDbkIsQ0FBQztJQUVNLEtBQUssQ0FBQyxDQUFJO1FBQ2IsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEtBQUssU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssTUFBTSxDQUFDLEVBQUU7WUFDckUsT0FBTyxNQUFNLENBQUM7U0FDakI7UUFDRCxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsS0FBSyxTQUFTLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxNQUFNLENBQUMsRUFBRTtZQUNyRSxPQUFPLFNBQVMsQ0FBQztTQUNwQjtRQUNELE9BQU8sVUFBVSxDQUFDO0lBQ3RCLENBQUM7SUFFTSxRQUFRLENBQUMsQ0FBSTtRQUNoQixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssVUFBVSxDQUFDO0lBQ3hDLENBQUM7SUFFTSxjQUFjLENBQUMsQ0FBSTtRQUN0QixRQUFRLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUU7WUFDbkIsS0FBSyxNQUFNO2dCQUNQLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQztZQUNwQixLQUFLLFVBQVU7Z0JBQ1gsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDO1NBQ3ZCO1FBQ0QsT0FBTyxTQUFTLENBQUM7SUFDckIsQ0FBQztJQUVTLFFBQVEsQ0FBQyxFQUFLLEVBQUUsRUFBSztRQUMzQixPQUFPLE9BQU8sQ0FBQyxlQUFlLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQzNDLENBQUM7Q0FDSjtBQXRERCwwQkFzREMiLCJzb3VyY2VzQ29udGVudCI6WyIvKlxuICogQ29weXJpZ2h0IChjKSAyMDIwIEVyaWsgRm9ydHVuZVxuICpcbiAqIFBlcm1pc3Npb24gaXMgaGVyZWJ5IGdyYW50ZWQsIGZyZWUgb2YgY2hhcmdlLCB0byBhbnkgcGVyc29uIG9idGFpbmluZyBhIGNvcHlcbiAqIG9mIHRoaXMgc29mdHdhcmUgYW5kIGFzc29jaWF0ZWQgZG9jdW1lbnRhdGlvbiBmaWxlcyAodGhlIFwiU29mdHdhcmVcIiksIHRvIGRlYWxcbiAqIGluIHRoZSBTb2Z0d2FyZSB3aXRob3V0IHJlc3RyaWN0aW9uLCBpbmNsdWRpbmcgd2l0aG91dCBsaW1pdGF0aW9uIHRoZSByaWdodHNcbiAqIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBtZXJnZSwgcHVibGlzaCwgZGlzdHJpYnV0ZSwgc3VibGljZW5zZSwgYW5kL29yIHNlbGxcbiAqIGNvcGllcyBvZiB0aGUgU29mdHdhcmUsIGFuZCB0byBwZXJtaXQgcGVyc29ucyB0byB3aG9tIHRoZSBTb2Z0d2FyZSBpc1xuICogZnVybmlzaGVkIHRvIGRvIHNvLCBzdWJqZWN0IHRvIHRoZSBmb2xsb3dpbmcgY29uZGl0aW9uczpcbiAqXG4gKiBUaGUgYWJvdmUgY29weXJpZ2h0IG5vdGljZSBhbmQgdGhpcyBwZXJtaXNzaW9uIG5vdGljZSBzaGFsbCBiZSBpbmNsdWRlZCBpbiBhbGxcbiAqIGNvcGllcyBvciBzdWJzdGFudGlhbCBwb3J0aW9ucyBvZiB0aGUgU29mdHdhcmUuXG4gKlxuICogVEhFIFNPRlRXQVJFIElTIFBST1ZJREVEIFwiQVMgSVNcIiwgV0lUSE9VVCBXQVJSQU5UWSBPRiBBTlkgS0lORCwgRVhQUkVTUyBPUlxuICogSU1QTElFRCwgSU5DTFVESU5HIEJVVCBOT1QgTElNSVRFRCBUTyBUSEUgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFksXG4gKiBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBTkQgTk9OSU5GUklOR0VNRU5ULiBJTiBOTyBFVkVOVCBTSEFMTCBUSEVcbiAqIEFVVEhPUlMgT1IgQ09QWVJJR0hUIEhPTERFUlMgQkUgTElBQkxFIEZPUiBBTlkgQ0xBSU0sIERBTUFHRVMgT1IgT1RIRVJcbiAqIExJQUJJTElUWSwgV0hFVEhFUiBJTiBBTiBBQ1RJT04gT0YgQ09OVFJBQ1QsIFRPUlQgT1IgT1RIRVJXSVNFLCBBUklTSU5HIEZST00sXG4gKiBPVVQgT0YgT1IgSU4gQ09OTkVDVElPTiBXSVRIIFRIRSBTT0ZUV0FSRSBPUiBUSEUgVVNFIE9SIE9USEVSIERFQUxJTkdTIElOIFRIRVxuICogU09GVFdBUkUuXG4gKi9cblxuaW1wb3J0IHsgUmVzdWx0LCBjYXB0dXJlUmVzdWx0IH0gZnJvbSAnLi9yZXN1bHQnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFJhbmdlT2ZQcm9wZXJ0aWVzPFQ+IHtcbiAgICByZWFkb25seSBtaW4/OiBUO1xuICAgIHJlYWRvbmx5IG1heD86IFQ7XG59XG5cbmV4cG9ydCBjbGFzcyBSYW5nZU9mPFQ+IGltcGxlbWVudHMgUmFuZ2VPZlByb3BlcnRpZXM8VD4ge1xuICAgIHB1YmxpYyByZWFkb25seSBtaW4/OiBUO1xuICAgIHB1YmxpYyByZWFkb25seSBtYXg/OiBUO1xuXG4gICAgcHVibGljIGNvbnN0cnVjdG9yKG1pbj86IFQsIG1heD86IFQpIHtcbiAgICAgICAgaWYgKCgobWluICE9PSB1bmRlZmluZWQpICYmIChtYXggIT09IHVuZGVmaW5lZCkpICYmXG4gICAgICAgICAgICB0aGlzLl9jb21wYXJlKG1pbiwgbWF4KSA9PT0gJ2dyZWF0ZXInKSB7XG4gICAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoYEludmVydGVkIHJhbmdlIC0gJHtKU09OLnN0cmluZ2lmeShtaW4pfSBtdXN0IGJlIDw9ICR7SlNPTi5zdHJpbmdpZnkobWF4KX0uYCk7XG4gICAgICAgIH1cbiAgICAgICAgdGhpcy5taW4gPSBtaW47XG4gICAgICAgIHRoaXMubWF4ID0gbWF4O1xuICAgIH1cblxuICAgIHB1YmxpYyBzdGF0aWMgY3JlYXRlUmFuZ2U8VD4oaW5pdD86IFJhbmdlT2ZQcm9wZXJ0aWVzPFQ+KTogUmVzdWx0PFJhbmdlT2Y8VD4+IHtcbiAgICAgICAgcmV0dXJuIGNhcHR1cmVSZXN1bHQoKCkgPT4gbmV3IFJhbmdlT2Y8VD4oaW5pdD8ubWluLCBpbml0Py5tYXgpKTtcbiAgICB9XG5cbiAgICBwcm90ZWN0ZWQgc3RhdGljIF9kZWZhdWx0Q29tcGFyZTxUPih0MTogVCwgdDI6IFQpOiAnbGVzcyd8J2VxdWFsJ3wnZ3JlYXRlcicge1xuICAgICAgICBpZiAodDEgPCB0Mikge1xuICAgICAgICAgICAgcmV0dXJuICdsZXNzJztcbiAgICAgICAgfVxuICAgICAgICBlbHNlIGlmICh0MSA+IHQyKSB7XG4gICAgICAgICAgICByZXR1cm4gJ2dyZWF0ZXInO1xuICAgICAgICB9XG4gICAgICAgIHJldHVybiAnZXF1YWwnO1xuICAgIH1cblxuICAgIHB1YmxpYyBjaGVjayh0OiBUKTogJ2xlc3MnfCdpbmNsdWRlZCd8J2dyZWF0ZXInIHtcbiAgICAgICAgaWYgKCh0aGlzLm1pbiAhPT0gdW5kZWZpbmVkKSAmJiAodGhpcy5fY29tcGFyZSh0LCB0aGlzLm1pbikgPT09ICdsZXNzJykpIHtcbiAgICAgICAgICAgIHJldHVybiAnbGVzcyc7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKCh0aGlzLm1heCAhPT0gdW5kZWZpbmVkKSAmJiAodGhpcy5fY29tcGFyZSh0LCB0aGlzLm1heCkgIT09ICdsZXNzJykpIHtcbiAgICAgICAgICAgIHJldHVybiAnZ3JlYXRlcic7XG4gICAgICAgIH1cbiAgICAgICAgcmV0dXJuICdpbmNsdWRlZCc7XG4gICAgfVxuXG4gICAgcHVibGljIGluY2x1ZGVzKHQ6IFQpOiBib29sZWFuIHtcbiAgICAgICAgcmV0dXJuIHRoaXMuY2hlY2sodCkgPT09ICdpbmNsdWRlZCc7XG4gICAgfVxuXG4gICAgcHVibGljIGZpbmRUcmFuc2l0aW9uKHQ6IFQpOiBUfHVuZGVmaW5lZCB7XG4gICAgICAgIHN3aXRjaCAodGhpcy5jaGVjayh0KSkge1xuICAgICAgICAgICAgY2FzZSAnbGVzcyc6XG4gICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMubWluO1xuICAgICAgICAgICAgY2FzZSAnaW5jbHVkZWQnOlxuICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLm1heDtcbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gdW5kZWZpbmVkO1xuICAgIH1cblxuICAgIHByb3RlY3RlZCBfY29tcGFyZSh0MTogVCwgdDI6IFQpOiAnbGVzcyd8J2VxdWFsJ3wnZ3JlYXRlcicge1xuICAgICAgICByZXR1cm4gUmFuZ2VPZi5fZGVmYXVsdENvbXBhcmUodDEsIHQyKTtcbiAgICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rangeOf.js","sourceRoot":"","sources":["../src/rangeOf.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (c) 2020 Erik Fortune\n *\n * Permission is hereby granted, free of charge, to any person obtaining a copy\n * of this software and associated documentation files (the \"Software\"), to deal\n * in the Software without restriction, including without limitation the rights\n * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n * copies of the Software, and to permit persons to whom the Software is\n * furnished to do so, subject to the following conditions:\n *\n * The above copyright notice and this permission notice shall be included in all\n * copies or substantial portions of the Software.\n *\n * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n * SOFTWARE.\n */\n\nimport { Result, captureResult } from './result';\nimport Mustache from 'mustache';\n\nexport interface RangeOfProperties<T> {\n    readonly min?: T;\n    readonly max?: T;\n}\n\nexport interface RangeOfFormats {\n    minOnly: string;\n    maxOnly: string;\n    minMax: string;\n};\n\nexport const DEFAULT_RANGEOF_FORMATS = {\n    minOnly: '{{min}}-',\n    maxOnly: '-{{max}}',\n    minMax: '{{min}}-{{max}}',\n};\n\nexport class RangeOf<T> implements RangeOfProperties<T> {\n    public readonly min?: T;\n    public readonly max?: T;\n\n    public constructor(min?: T, max?: T) {\n        if (((min !== undefined) && (max !== undefined)) &&\n            this._compare(min, max) === 'greater') {\n            throw new Error(`Inverted range - ${JSON.stringify(min)} must be <= ${JSON.stringify(max)}.`);\n        }\n        this.min = min;\n        this.max = max;\n    }\n\n    public static createRange<T>(init?: RangeOfProperties<T>): Result<RangeOf<T>> {\n        return captureResult(() => new RangeOf<T>(init?.min, init?.max));\n    }\n\n    public static propertiesToString<T>(range: RangeOfProperties<T>, formats?: RangeOfFormats, emptyValue?: T): string|undefined {\n        formats = formats ?? DEFAULT_RANGEOF_FORMATS;\n        if ((range.min !== undefined) && (range.min !== emptyValue)) {\n            if ((range.max !== undefined) && (range.max !== emptyValue)) {\n                return Mustache.render(formats.minMax, range);\n            }\n            else {\n                return Mustache.render(formats.minOnly, range);\n            }\n        }\n        else if ((range.max !== undefined) && (range.max !== emptyValue)) {\n            return Mustache.render(formats.maxOnly, range);\n        }\n        return undefined;\n    }\n\n    protected static _defaultCompare<T>(t1: T, t2: T): 'less'|'equal'|'greater' {\n        if (t1 < t2) {\n            return 'less';\n        }\n        else if (t1 > t2) {\n            return 'greater';\n        }\n        return 'equal';\n    }\n\n    public check(t: T): 'less'|'included'|'greater' {\n        if ((this.min !== undefined) && (this._compare(t, this.min) === 'less')) {\n            return 'less';\n        }\n        if ((this.max !== undefined) && (this._compare(t, this.max) !== 'less')) {\n            return 'greater';\n        }\n        return 'included';\n    }\n\n    public includes(t: T): boolean {\n        return this.check(t) === 'included';\n    }\n\n    public findTransition(t: T): T|undefined {\n        switch (this.check(t)) {\n            case 'less':\n                return this.min;\n            case 'included':\n                return this.max;\n        }\n        return undefined;\n    }\n\n    public toFormattedProperties(format: (value: T) => string|undefined): RangeOfProperties<string> {\n        return {\n            min: (this.min !== undefined) ? format(this.min) : undefined,\n            max: (this.max !== undefined) ? format(this.max) : undefined,\n        };\n    }\n\n    public format(format: (value: T) => string|undefined, formats?: RangeOfFormats): string|undefined {\n        return RangeOf.propertiesToString(this.toFormattedProperties(format), formats);\n    }\n\n    protected _compare(t1: T, t2: T): 'less'|'equal'|'greater' {\n        return RangeOf._defaultCompare(t1, t2);\n    }\n}\n"]}

No alert changes

Improved metrics

Total package byte prevSize

178467

increased by3.16%

Lines of code

1646

increased by2.94%

No dependency changes