@cardsgame/utils - npm Package Compare versions

Comparing version 0.10.0 to 0.11.0

lib/arrays.js

@@ -18,5 +18,6 @@ "use strict";
 };
-var __spread = (this && this.__spread) || function () {
-    for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
-    return ar;
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 };
@@ -28,15 +29,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
-exports.compare = function (arrayA, arrayB) {
+var compare = function (arrayA, arrayB) {
     return arrayA.length === arrayB.length && arrayA.every(function (a) { return arrayB.includes(a); });
 };
+exports.compare = compare;
 /**
  * Function for `array.sort()`.
  */
-exports.sortAlphabetically = function (a, b) {
+var sortAlphabetically = function (a, b) {
     return a < b ? -1 : a > b ? 1 : 0;
 };
+exports.sortAlphabetically = sortAlphabetically;
 /**
  * Function for `array.sort()`.
  */
-exports.sortAlphaNumerically = function (a, b) {
+var sortAlphaNumerically = function (a, b) {
     var numA = parseInt(a) || false;
@@ -49,7 +52,8 @@ var numB = parseInt(b) || false;
 };
+exports.sortAlphaNumerically = sortAlphaNumerically;
 /**
  * Returns new array with items shuffled around.
  */
-exports.shuffle = function (array) {
-    var res = __spread(array);
+var shuffle = function (array) {
+    var res = __spreadArray([], __read(array));
     for (var i = res.length - 1; i > 0; i--) {
@@ -63,2 +67,3 @@ var j = Math.floor(Math.random() * (i + 1));
 };
+exports.shuffle = shuffle;
 /**
@@ -69,3 +74,4 @@ * Returns an array which holds `count` items, each being the index
  */
-exports.arrayWith = function (count) { return __spread(Array(count).keys()); };
+var arrayWith = function (count) { return __spreadArray([], __read(Array(count).keys())); };
+exports.arrayWith = arrayWith;
 /**
@@ -72,0 +78,0 @@ * Grabs you most common "propKey" in your collection of `T`,

lib/index.d.ts

 export * from "./arrays";
+export * from "./entities";
 export * from "./logs";
-export * from "./mapSchema";
 export * from "./numbers";
@@ -5,0 +5,0 @@ export * from "./objects";

lib/index.js

@@ -10,8 +10,8 @@ "use strict";
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    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("./arrays"), exports);
+__exportStar(require("./entities"), exports);
 __exportStar(require("./logs"), exports);
-__exportStar(require("./mapSchema"), exports);
 __exportStar(require("./numbers"), exports);
@@ -18,0 +18,0 @@ __exportStar(require("./objects"), exports);

lib/logs.d.ts

 import Chalk from "chalk";
-export declare const IS_CHROME: boolean;
+/**
+ * Ditch chrome dev node debugging. It was an adventure,
+ * but cli logs are enough.
+ * @deprecated
+ */
+export declare const IS_SERVER_DEBUGGER_CHROME: boolean;
 export declare const chalk: Chalk.Chalk;
@@ -12,3 +17,3 @@ export declare enum LogLevels {
 }
-export declare let logs: {
+export declare const logs: {
     error: (...args: any[]) => void;
@@ -15,0 +20,0 @@ warn: (...args: any[]) => void;

lib/logs.js

@@ -18,5 +18,6 @@ "use strict";
 };
-var __spread = (this && this.__spread) || function () {
-    for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
-    return ar;
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 };
@@ -27,9 +28,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Logs = exports.logs = exports.LogLevels = exports.chalk = exports.IS_CHROME = void 0;
+exports.Logs = exports.logs = exports.LogLevels = exports.chalk = exports.IS_SERVER_DEBUGGER_CHROME = void 0;
 var chalk_1 = __importDefault(require("chalk"));
 var utils_1 = require("./utils");
 var isBrowser = new Function("try {return this===window;}catch(e){ return false;}")();
-exports.IS_CHROME = process ? Boolean(process.env.LOGS_CHROME) : false;
+/**
+ * Ditch chrome dev node debugging. It was an adventure,
+ * but cli logs are enough.
+ * @deprecated
+ */
+exports.IS_SERVER_DEBUGGER_CHROME = (function () {
+    try {
+        return process ? Boolean(process.env.LOGS_CHROME) : false;
+    }
+    catch (e) {
+        return false;
+    }
+})();
 exports.chalk = new chalk_1.default.Instance({
-    level: isBrowser ? 0 : exports.IS_CHROME ? 0 : 1,
+    level: isBrowser ? 0 : exports.IS_SERVER_DEBUGGER_CHROME ? 0 : 1,
 });
@@ -79,3 +92,3 @@ var LogLevels;
 var syntaxHighlight = function (arg) {
-    if (exports.IS_CHROME) {
+    if (exports.IS_SERVER_DEBUGGER_CHROME) {
         return arg;
@@ -102,4 +115,5 @@ }
 }
+var logsPreExport;
 if (isBrowser) {
-    exports.logs = {
+    logsPreExport = {
         verbose: console.debug.bind(window.console),
@@ -115,4 +129,4 @@ notice: console.log.bind(window.console),
 }
-else if (!exports.IS_CHROME) {
-    exports.logs = {
+else if (!exports.IS_SERVER_DEBUGGER_CHROME) {
+    logsPreExport = {
         verbose: function () {
@@ -123,6 +137,6 @@ var args = [];
             }
-            console.debug.apply(console, __spread([
+            console.debug.apply(console, __spreadArray([
                 _getIndent(),
                 "\t"
-            ], args.map(function (arg) { return exports.chalk.gray(arg); })));
+            ], __read(args.map(function (arg) { return exports.chalk.gray(arg); }))));
         },
@@ -135,6 +149,6 @@ notice: function (first) {
             if (args.length > 0) {
-                console.log.apply(console, __spread([
+                console.log.apply(console, __spreadArray([
                     _getIndent(),
                     first + ":"
-                ], args.map(syntaxHighlight)));
+                ], __read(args.map(syntaxHighlight))));
             }
@@ -150,5 +164,5 @@ else {
             }
-            console.info.apply(console, __spread([
+            console.info.apply(console, __spreadArray([
                 _getIndent() + exports.chalk.bgBlue.black(" " + first + " ")
-            ], args.map(syntaxHighlight)));
+            ], __read(args.map(syntaxHighlight))));
         },
@@ -160,5 +174,5 @@ warn: function (first) {
             }
-            console.warn.apply(console, __spread([
+            console.warn.apply(console, __spreadArray([
                 _getIndent() + exports.chalk.bgYellow.black(" " + first + " ")
-            ], args.map(syntaxHighlight)));
+            ], __read(args.map(syntaxHighlight))));
         },
@@ -170,5 +184,5 @@ error: function (first) {
             }
-            console.error.apply(console, __spread([
+            console.error.apply(console, __spreadArray([
                 _getIndent() + exports.chalk.bgRed(" " + first + " ")
-            ], args.map(syntaxHighlight)));
+            ], __read(args.map(syntaxHighlight))));
         },
@@ -180,3 +194,3 @@ group: function (first) {
             }
-            exports.logs.notice.apply(exports.logs, __spread(["\u250D\u2501" + first], args));
+            logsPreExport.notice.apply(logsPreExport, __spreadArray(["\u250D\u2501" + first], __read(args)));
             _indentLevel++;
@@ -189,3 +203,3 @@ },
             }
-            exports.logs.notice.apply(exports.logs, __spread(["\u250D\u2501" + first], args));
+            logsPreExport.notice.apply(logsPreExport, __spreadArray(["\u250D\u2501" + first], __read(args)));
             _indentLevel++;
@@ -200,3 +214,3 @@ },
             _indentLevel = Math.max(_indentLevel - 1, 0);
-            exports.logs.notice.apply(exports.logs, __spread(["\u2515\u2501" + first], args));
+            logsPreExport.notice.apply(logsPreExport, __spreadArray(["\u2515\u2501" + first], __read(args)));
         },
@@ -210,3 +224,3 @@ };
     };
-    exports.logs = {
+    logsPreExport = {
         verbose: console.debug.bind(console),
@@ -219,6 +233,6 @@ notice: console.log.bind(console),
             }
-            return console.info.apply(console, __spread([
+            return console.info.apply(console, __spreadArray([
                 "%c " + first + " ",
                 styles_1.common + styles_1.info
-            ], args.map(syntaxHighlight)));
+            ], __read(args.map(syntaxHighlight))));
         },
@@ -265,16 +279,17 @@ warn: console.warn.bind(console),
 if (logLevel < LogLevels.error) {
-    exports.logs.error = utils_1.noop;
+    logsPreExport.error = utils_1.noop;
 }
 if (logLevel < LogLevels.warn) {
-    exports.logs.warn = utils_1.noop;
+    logsPreExport.warn = utils_1.noop;
 }
 if (logLevel < LogLevels.info) {
-    exports.logs.info = utils_1.noop;
+    logsPreExport.info = utils_1.noop;
 }
 if (logLevel < LogLevels.notice) {
-    exports.logs.notice = utils_1.noop;
+    logsPreExport.notice = utils_1.noop;
 }
 if (logLevel < LogLevels.verbose) {
-    exports.logs.verbose = utils_1.noop;
+    logsPreExport.verbose = utils_1.noop;
 }
+exports.logs = logsPreExport;
 var Logs = /** @class */ (function () {
@@ -304,5 +319,5 @@ function Logs(name, enabled, options) {
                     }
-                    console.error.apply(console, __spread([
+                    console.error.apply(console, __spreadArray([
                         style(getIndent() + exports.chalk.bgRed(" " + first + " "))
-                    ], args.map(syntaxHighlight)));
+                    ], __read(args.map(syntaxHighlight))));
                 };
@@ -317,5 +332,5 @@ this["warn"] =
                     }
-                    console.warn.apply(console, __spread([
+                    console.warn.apply(console, __spreadArray([
                         style(getIndent() + exports.chalk.bgYellow.black(" " + first + " "))
-                    ], args.map(syntaxHighlight)));
+                    ], __read(args.map(syntaxHighlight))));
                 };
@@ -330,5 +345,5 @@ this["info"] =
                     }
-                    console.info.apply(console, __spread([
+                    console.info.apply(console, __spreadArray([
                         style(getIndent() + exports.chalk.bgBlue.black(" " + first + " "))
-                    ], args.map(syntaxHighlight)));
+                    ], __read(args.map(syntaxHighlight))));
                 };
@@ -344,5 +359,5 @@ this["notice"] =
                     if (args.length > 0) {
-                        console.log.apply(console, __spread([
+                        console.log.apply(console, __spreadArray([
                             style(getIndent(), first + ":")
-                        ], args.map(syntaxHighlight)));
+                        ], __read(args.map(syntaxHighlight))));
                     }
@@ -362,5 +377,5 @@ else {
                     }
-                    console.debug.apply(console, __spread([
+                    console.debug.apply(console, __spreadArray([
                         style(getIndent() + "\t")
-                    ], args.map(function (arg) { return exports.chalk.gray(arg); })));
+                    ], __read(args.map(function (arg) { return exports.chalk.gray(arg); }))));
                 };
@@ -374,3 +389,3 @@ this["group"] = !this.enabled
                 }
-                notice.apply(void 0, __spread(["\u250D\u2501" + first], args));
+                notice.apply(void 0, __spreadArray(["\u250D\u2501" + first], __read(args)));
                 indentLevel++;
@@ -385,3 +400,3 @@ };
                 }
-                notice.apply(void 0, __spread(["\u250D\u2501" + first], args));
+                notice.apply(void 0, __spreadArray(["\u250D\u2501" + first], __read(args)));
                 indentLevel++;
@@ -398,3 +413,3 @@ };
                 indentLevel = Math.max(indentLevel - 1, 0);
-                notice.apply(void 0, __spread(["\u2515\u2501" + first], args));
+                notice.apply(void 0, __spreadArray(["\u2515\u2501" + first], __read(args)));
             };
@@ -401,0 +416,0 @@ };

lib/numbers.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decimal = exports.px2cm = exports.cm2px = exports.deg2rad = exports.rad2deg = exports.wrap = exports.limit = void 0;
-exports.limit = function (val, min, max) {
+var limit = function (val, min, max) {
     if (min === void 0) { min = 0; }
@@ -9,8 +9,10 @@ if (max === void 0) { max = 1; }
 };
+exports.limit = limit;
 // TODO: maybe allow negative values as min?
-exports.wrap = function (val, max) {
+var wrap = function (val, max) {
     if (max === void 0) { max = 1; }
     return ((val % max) + max) % max;
 };
-exports.rad2deg = function (angle) {
+exports.wrap = wrap;
+var rad2deg = function (angle) {
     //  discuss at: http://locutus.io/php/rad2deg/
@@ -23,3 +25,4 @@ // original by: Enrique Gonzalez
 };
-exports.deg2rad = function (angle) {
+exports.rad2deg = rad2deg;
+var deg2rad = function (angle) {
     //  discuss at: http://locutus.io/php/deg2rad/
@@ -32,8 +35,11 @@ // original by: Enrique Gonzalez
 };
-exports.cm2px = function (value) { return value * 11.5; };
-exports.px2cm = function (value) { return value / 11.5; };
+exports.deg2rad = deg2rad;
+var cm2px = function (value) { return value * 11.5; };
+exports.cm2px = cm2px;
+var px2cm = function (value) { return value / 11.5; };
+exports.px2cm = px2cm;
 /**
  * Limits the number of digits "after comma"
  */
-exports.decimal = function (value, maxZeroes) {
+var decimal = function (value, maxZeroes) {
     if (maxZeroes === void 0) { maxZeroes = 2; }
@@ -43,2 +49,3 @@ var pow = Math.pow(10, maxZeroes);
 };
+exports.decimal = decimal;
 //# sourceMappingURL=numbers.js.map

lib/objects.d.ts

 export declare const deepClone: (value: unknown) => any;
 /**
- * @returns an object without provided `keys`
+ * @returns new object without provided `keys`
  */
 export declare const omit: (object: Record<string, any>, keys: string[]) => Record<string, any>;
+/**
+ * Resolves target object/property given source object and path.
+ */
+export declare const resolve: (sourceObject: Record<string, any>, path: (string | number)[] | string, separator?: string) => any;

lib/objects.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.omit = exports.deepClone = void 0;
-exports.deepClone = function (value) {
+exports.resolve = exports.omit = exports.deepClone = void 0;
+var deepClone = function (value) {
     if (typeof value === "function") {
@@ -20,6 +20,7 @@ return value;
 };
+exports.deepClone = deepClone;
 /**
- * @returns an object without provided `keys`
+ * @returns new object without provided `keys`
  */
-exports.omit = function (object, keys) {
+var omit = function (object, keys) {
     return Object.keys(object)
@@ -32,2 +33,12 @@ .filter(function (key) { return !keys.includes(key); })
 };
+exports.omit = omit;
+/**
+ * Resolves target object/property given source object and path.
+ */
+var resolve = function (sourceObject, path, separator) {
+    if (separator === void 0) { separator = "."; }
+    var properties = Array.isArray(path) ? path : path.split(separator);
+    return properties.reduce(function (prev, curr) { return prev && prev[curr]; }, sourceObject);
+};
+exports.resolve = resolve;
 //# sourceMappingURL=objects.js.map

lib/random.js

@@ -7,3 +7,3 @@ "use strict";
  */
-exports.randomFloat = function (min, max) {
+var randomFloat = function (min, max) {
     if (min === void 0) { min = 0; }
@@ -13,6 +13,7 @@ if (max === void 0) { max = 1; }
 };
+exports.randomFloat = randomFloat;
 /**
  * Random number without the rest
  */
-exports.randomInt = function (min, max) {
+var randomInt = function (min, max) {
     if (min === void 0) { min = 0; }
@@ -22,2 +23,3 @@ if (max === void 0) { max = 1; }
 };
+exports.randomInt = randomInt;
 //# sourceMappingURL=random.js.map

lib/strings.d.ts

@@ -0,4 +1,16 @@
+/**
+ * Trim long string with nice ell…
+ */
 export declare const trim: (string?: string, maxLength?: number) => string;
+/**
+ * For now it's just 3 random letters
+ */
 export declare const randomName: () => string;
+/**
+ * Convert string to "camelCase"
+ */
 export declare const camelCase: (str?: string) => string;
+/**
+ * Convert string to "SentenceCase" (first letter capital)
+ */
 export declare const sentenceCase: (str?: string) => string;

lib/strings.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sentenceCase = exports.camelCase = exports.randomName = exports.trim = void 0;
-exports.trim = function (string, maxLength) {
+/**
+ * Trim long string with nice ell…
+ */
+var trim = function (string, maxLength) {
     if (string === void 0) { string = ""; }
@@ -13,3 +16,7 @@ if (maxLength === void 0) { maxLength = 7; }
 };
-exports.randomName = function () {
+exports.trim = trim;
+/**
+ * For now it's just 3 random letters
+ */
+var randomName = function () {
     var randomLetter = function () {
@@ -20,3 +27,7 @@ return String.fromCharCode(Math.random() * (90 - 65) + 65);
 };
-exports.camelCase = function (str) {
+exports.randomName = randomName;
+/**
+ * Convert string to "camelCase"
+ */
+var camelCase = function (str) {
     if (str === void 0) { str = ""; }
@@ -28,3 +39,7 @@ return str
 };
-exports.sentenceCase = function (str) {
+exports.camelCase = camelCase;
+/**
+ * Convert string to "SentenceCase" (first letter capital)
+ */
+var sentenceCase = function (str) {
     if (str === void 0) { str = ""; }
@@ -35,2 +50,3 @@ return str
 };
+exports.sentenceCase = sentenceCase;
 //# sourceMappingURL=strings.js.map

lib/utils.d.ts

@@ -12,3 +12,3 @@ /// <reference types="@cardsgame/types" />
  */
-export declare const compose: (value: unknown, ...functions: ((...args: any[]) => any)[]) => any;
+export declare const compose: <T>(value: unknown, ...functions: ((...args: any[]) => any)[]) => T;
 /**
@@ -25,7 +25,10 @@ * Executes function multiple times
 export declare const timeout: (ms: number) => Promise<unknown>;
+export declare const isMap: (thing: unknown) => thing is Map<any, any>;
+export declare const isSet: (thing: unknown) => thing is Set<any>;
 /**
  * Check if a `thing` is just a literal object (using typeof), and not Array or anything else.
+ * @deprecated never used and there are probably better ways of doing that
  * @param thing
  */
-export declare const isObject: (thing: unknown) => boolean;
+export declare const isObject: (thing: unknown) => thing is Record<any, any>;
 export declare function applyMixins(derivedCtor: AnyClass, baseCtors: any[]): void;

lib/utils.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyMixins = exports.isObject = exports.timeout = exports.times = exports.compose = exports.noop = exports.def = void 0;
+exports.applyMixins = exports.isObject = exports.isSet = exports.isMap = exports.timeout = exports.times = exports.compose = exports.noop = exports.def = void 0;
 /**
  * Returns first, *defined* value
  */
-exports.def = function () {
+var def = function () {
     var values = [];
@@ -14,3 +14,5 @@ for (var _i = 0; _i < arguments.length; _i++) {
 };
-exports.noop = function () { };
+exports.def = def;
+var noop = function () { };
+exports.noop = noop;
 /**
@@ -21,3 +23,3 @@ * Calls each function with the current argument
  */
-exports.compose = function (value) {
+var compose = function (value) {
     var functions = [];
@@ -39,2 +41,3 @@ for (var _i = 1; _i < arguments.length; _i++) {
 };
+exports.compose = compose;
 /**
@@ -45,5 +48,6 @@ * Executes function multiple times
  */
-exports.times = function (length, func) {
+var times = function (length, func) {
     Array.from({ length: length }, func);
 };
+exports.times = times;
 /**
@@ -53,14 +57,38 @@ * Simple delay of execution. Use like this: `await timeout(50)`
  */
-exports.timeout = function (ms) {
+var timeout = function (ms) {
     return new Promise(function (resolve) { return setTimeout(resolve, ms); });
 };
+exports.timeout = timeout;
+var isMap = function (thing) {
+    try {
+        // throws if o is not an object or has no [[MapData]]
+        Map.prototype.has.call(thing);
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+};
+exports.isMap = isMap;
+var isSet = function (thing) {
+    try {
+        // throws if o is not an object or has no [[SetData]]
+        Set.prototype.has.call(thing);
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+};
+exports.isSet = isSet;
 /**
  * Check if a `thing` is just a literal object (using typeof), and not Array or anything else.
+ * @deprecated never used and there are probably better ways of doing that
  * @param thing
  */
-exports.isObject = function (thing) {
+var isObject = function (thing) {
     if (typeof thing !== "object") {
         return false;
     }
-    if (Array.isArray(thing)) {
+    if (Array.isArray(thing) || exports.isMap(thing) || exports.isSet(thing)) {
         return false;
@@ -70,2 +98,3 @@ }
 };
+exports.isObject = isObject;
 function applyMixins(derivedCtor, baseCtors) {
@@ -72,0 +101,0 @@ baseCtors.forEach(function (baseCtor) {

package.json

 {
   "name": "@cardsgame/utils",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "",
@@ -26,10 +26,9 @@ "author": "Darek Greenly (https://darekgreenly.com)",
   "dependencies": {
-    "@cardsgame/types": "^0.10.0",
-    "@colyseus/schema": "^0.5.41",
+    "@cardsgame/types": "^0.11.0",
     "chalk": "^4.1.0"
   },
   "devDependencies": {
-    "@types/node": "^14.0.27"
+    "@types/node": "^14.14.6"
   },
-  "gitHead": "daec45f96f8990acb76077b575c092ac719d778d"
+  "gitHead": "233b849950af0d5d62ef28974d011d164fad109e"
 }

No alert changes

Improved metrics

Total package byte prevSize

63079

increased by4.91%

Dependency count

2

decreased by-33.33%

Lines of code

994

increased by8.99%

Dependency changes

• + Added@cardsgame/types@0.11.0(transitive)

• - Removed@colyseus/schema@^0.5.41

• - Removed@cardsgame/types@0.10.0(transitive)

• - Removed@colyseus/schema@0.5.41(transitive)

• Updated@cardsgame/types@^0.11.0