atomic-fns 0.3.3 → 0.3.4

package/core/operators/index.ts

@@ -66,7 +66,7 @@ export function compare(x, y): number {
  * @returns {boolean} `true` if `x` and `y` are equal or `false` otherwise.
  */
 export function eq(x, y) {
-  return x === y || call(x, 'eq', y) != null
+  return Object.is(x, y) || call(x, 'eq', y) != null
 }
 
 /**
@@ -245,10 +245,11 @@ export function shallowEqual(obj, other) {
  * @param other
  * @returns `true` if the objects are considered equal.
  */
-export function deepEqual(obj, other, checker = eq) {
+export function deepEqual(obj, other, checker = eq, seen = new WeakSet()) {
   if (checker(obj, other)) return true
-
   if (!obj || !other) return false
+  if (obj.prototype !== other.prototype) return false
+  if (seen.has(obj) && seen.has(other)) return false
 
   if (Array.isArray(obj)) {
     // compare the arrays
@@ -259,18 +260,45 @@ export function deepEqual(obj, other, checker = eq) {
         return false
       }
     }
+
     return true
-  } else if (isObject(obj)) {
-    // compare the object keys
+  }
+
+  if (obj instanceof Set) {
+    if (obj.size !== other.size) return false
+    for (const value of obj.values()) {
+      if (!other.has(value)) return false
+    }
+    return true
+  }
+
+  if (obj instanceof Map) {
+    // compare keys and values
+    if (obj.size !== other.size) return false
+    seen.add(obj)
+    seen.add(other)
+    for (const key of obj.keys()) {
+      if (!other.has(key)) return false
+      if (!deepEqual(obj.get(key), other.get(key), checker, seen)) {
+        return false
+      }
+    }
+    return true
+  }
+
+  if (isObject(obj)) {
+    // compare the object own enumerable keys
     const objKeys = Object.keys(obj)
     const otherKeys = Object.keys(other)
 
     if (objKeys.length !== otherKeys.length) return false
 
+    seen.add(obj)
+    seen.add(other)
     for (const key of objKeys) {
       if (
         !Object.prototype.hasOwnProperty.call(other, key) ||
-        !deepEqual(obj[key], other[key], checker)
+        !deepEqual(obj[key], other[key], checker, seen)
       ) {
         return false
       }

package/package.json

@@ -1,12 +1,22 @@
 {
   "name": "atomic-fns",
   "description": "Like Lodash, but for ESNext and with types. Stop shipping code built for browsers from 2015.",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "main": "core/index.js",
   "type": "module",
   "types": "core/index.d.ts",
   "module": "core/index.js",
   "sideEffects": false,
+  "scripts": {
+    "prepublishOnly": "npm test",
+    "test": "NODE_OPTIONS=--loader=ts-node/esm jasmine --config=jasmine.json",
+    "tsc": "tsc -p ./tsconfig.xo.json --declaration",
+    "tsc:w": "tsc -p ./tsconfig.xo.json --declaration --watch",
+    "lint": "eslint core/**/*.ts",
+    "lint:fix": "eslint core/**/*.ts --fix",
+    "build": "npm run lint:fix && npm run tsc && npm run docs",
+    "docs": "typedoc"
+  },
   "devDependencies": {
     "@types/jasmine": "^4.3.0",
     "@typescript-eslint/eslint-plugin": "^5.39.0",
@@ -27,16 +37,6 @@
     "typedoc": "^0.23.16",
     "typescript": "^4.8.4"
   },
-  "scripts": {
-    "prepublishOnly": "npm test",
-    "test": "NODE_OPTIONS=--loader=ts-node/esm jasmine --config=jasmine.json",
-    "tsc": "tsc -p ./tsconfig.xo.json --declaration",
-    "tsc:w": "tsc -p ./tsconfig.xo.json --declaration --watch",
-    "lint": "eslint core/**/*.ts",
-    "lint:fix": "eslint core/**/*.ts --fix",
-    "build": "npm run lint:fix && npm run tsc && npm run docs",
-    "docs": "typedoc"
-  },
   "lint-staged": {
     "*.ts": "eslint --fix"
   },

package/tests/globals.spec.ts

@@ -12,11 +12,11 @@ import {
   hex,
   isArray,
   isArrayLike,
-  isAsync,
+  isAsyncFunction,
   isBigint,
   isBool,
   isEmpty,
-  isFunc,
+  isFunction,
   isNaN,
   isNull,
   isNumber,
@@ -114,15 +114,15 @@ describe('globals', () => {
     assert(!isArrayLike(''))
   })
 
-  it('isFunc', () => {
-    assert(isFunc(_))
-    assert(!isFunc([]))
+  it('isFunction', () => {
+    assert(isFunction(_))
+    assert(!isFunction([]))
   })
 
-  it('isAsync', () => {
-    assert(isAsync(async function () {}))
-    assert(isAsync(async () => {}))
-    assert(!isAsync(_))
+  it('isAsyncFunction', () => {
+    assert(isAsyncFunction(async function () {}))
+    assert(isAsyncFunction(async () => {}))
+    assert(!isAsyncFunction(_))
   })
 
   it('isNaN', () => {

package/tsconfig.json

@@ -110,6 +110,7 @@
       "./core/collections/index.ts",
       "./core/datetime/index.ts",
       "./core/functools/index.ts",
+      "./core/i18n/index.ts",
       "./core/itertools/index.ts",
       "./core/math/index.ts",
       "./core/operators/index.ts",
@@ -122,4 +123,4 @@
     "excludeExternals": true,
     "excludePrivate": true,
   }
-}
+}

package/core/datetime/index.d.ts

@@ -1,45 +0,0 @@
-/**
- * This module includes classes and functions to work with Date types.
- *
- * @module Date
- */
-export declare const MINUTE_SECONDS = 60;
-export declare const HOUR_SECONDS: number;
-export declare const DAY_SECONDS: number;
-export declare const WEEK_SECONDS: number;
-export declare const MILLISECONDS = 1000;
-export declare const MINUTE_MILLISECONDS: number;
-export declare const HOUR_MILLISECONDS: number;
-export declare const DAY_MILLISECONDS: number;
-export declare const WEEK_MILLISECONDS: number;
-export declare const MS = "millisecond";
-export declare const S = "second";
-export declare const MIN = "minute";
-export declare const H = "hour";
-export declare const D = "day";
-export declare const W = "week";
-export declare const M = "month";
-export declare const Q = "quarter";
-export declare const Y = "year";
-export declare const DATE = "date";
-export declare const FORMAT_DEFAULT = "YYYY-MM-DDTHH:mm:ssZ";
-export declare const INVALID_DATE_STRING = "Invalid Date";
-export declare const REGEX_PARSE: RegExp;
-export declare const REGEX_FORMAT: RegExp;
-export declare const now: number;
-export declare type DatetimeOptions = {
-    year: number;
-    month?: number;
-    day?: number;
-    hour?: number;
-    minute?: number;
-    second?: number;
-    millisecond?: number;
-    locale?: string;
-    utc?: boolean;
-};
-export declare class Datetime {
-    #private;
-    constructor(opts?: string | number | Date | DatetimeOptions);
-    format(locale?: string, opts?: Intl.DateTimeFormatOptions): string;
-}

package/core/datetime/index.js

@@ -1,71 +0,0 @@
-/**
- * This module includes classes and functions to work with Date types.
- *
- * @module Date
- */
-import { get } from '../globals';
-// Constants
-export const MINUTE_SECONDS = 60;
-export const HOUR_SECONDS = MINUTE_SECONDS * 60;
-export const DAY_SECONDS = HOUR_SECONDS * 24;
-export const WEEK_SECONDS = DAY_SECONDS * 7;
-export const MILLISECONDS = 1e3;
-export const MINUTE_MILLISECONDS = MINUTE_SECONDS * MILLISECONDS;
-export const HOUR_MILLISECONDS = HOUR_SECONDS * MILLISECONDS;
-export const DAY_MILLISECONDS = DAY_SECONDS * MILLISECONDS;
-export const WEEK_MILLISECONDS = WEEK_SECONDS * MILLISECONDS;
-// English locales
-export const MS = 'millisecond';
-export const S = 'second';
-export const MIN = 'minute';
-export const H = 'hour';
-export const D = 'day';
-export const W = 'week';
-export const M = 'month';
-export const Q = 'quarter';
-export const Y = 'year';
-export const DATE = 'date';
-export const FORMAT_DEFAULT = 'YYYY-MM-DDTHH:mm:ssZ';
-export const INVALID_DATE_STRING = 'Invalid Date';
-// regex
-export const REGEX_PARSE = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/;
-export const REGEX_FORMAT = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g;
-export const now = new Date().getTime();
-function parseDate(date) {
-    if (date === null)
-        return new Date(NaN);
-    if (!date)
-        return new Date();
-    if (date instanceof Date)
-        return new Date(date);
-    const utc = date.utc;
-    if (typeof date === 'string' && !/Z$/i.test(date)) {
-        const d = date.match(REGEX_PARSE);
-        if (d) {
-            const m = d[2] - 1 || 0;
-            const ms = (d[7] || '0').slice(0, 3);
-            if (utc) {
-                return new Date(Date.UTC(d[1], m, d[3] || 1, d[4] || 0, d[5] || 0, d[6] || 0, ms));
-            }
-            return new Date(d[1], m, d[3] || 1, d[4] || 0, d[5] || 0, d[6] || 0, ms);
-        }
-    }
-    return new Date(date);
-}
-export class Datetime {
-    #date = new Date(); // defaults to now
-    #UTC = false; // use current locale by default
-    constructor(opts) {
-        this.#date = parseDate(opts);
-        this.#UTC = get('utc', opts, false);
-        // this.init()
-    }
-    // Display
-    // Format
-    format(locale, opts) {
-        if (opts && opts.timeZone === undefined && this.#UTC) {
-            opts.timeZone = 'utc';
-        }
-        return this.#date.toLocaleDateString(locale, opts);
-    }
-}

package/core/datetime/index.ts

@@ -1,128 +0,0 @@
-/**
- * This module includes classes and functions to work with Date types.
- *
- * @module Date
- */
-
-import { get } from '../globals'
-
-// Constants
-export const MINUTE_SECONDS = 60
-export const HOUR_SECONDS = MINUTE_SECONDS * 60
-export const DAY_SECONDS = HOUR_SECONDS * 24
-export const WEEK_SECONDS = DAY_SECONDS * 7
-
-export const MILLISECONDS = 1e3
-export const MINUTE_MILLISECONDS = MINUTE_SECONDS * MILLISECONDS
-export const HOUR_MILLISECONDS = HOUR_SECONDS * MILLISECONDS
-export const DAY_MILLISECONDS = DAY_SECONDS * MILLISECONDS
-export const WEEK_MILLISECONDS = WEEK_SECONDS * MILLISECONDS
-
-// English locales
-export const MS = 'millisecond'
-export const S = 'second'
-export const MIN = 'minute'
-export const H = 'hour'
-export const D = 'day'
-export const W = 'week'
-export const M = 'month'
-export const Q = 'quarter'
-export const Y = 'year'
-export const DATE = 'date'
-
-export const FORMAT_DEFAULT = 'YYYY-MM-DDTHH:mm:ssZ'
-
-export const INVALID_DATE_STRING = 'Invalid Date'
-
-// regex
-export const REGEX_PARSE =
-  /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/
-export const REGEX_FORMAT =
-  /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g
-
-export const now = new Date().getTime()
-
-export type DatetimeOptions = {
-  year: number
-  month?: number
-  day?: number
-  hour?: number
-  minute?: number
-  second?: number
-  millisecond?: number
-  locale?: string
-  utc?: boolean
-}
-
-function parseDate(date) {
-  if (date === null) return new Date(NaN)
-  if (!date) return new Date()
-  if (date instanceof Date) return new Date(date)
-  const utc = date.utc
-  if (typeof date === 'string' && !/Z$/i.test(date)) {
-    const d = date.match(REGEX_PARSE) as any
-    if (d) {
-      const m = d[2] - 1 || 0
-      const ms = (d[7] || '0').slice(0, 3)
-      if (utc) {
-        return new Date(Date.UTC(d[1], m, d[3] || 1, d[4] || 0, d[5] || 0, d[6] || 0, ms))
-      }
-      return new Date(d[1], m, d[3] || 1, d[4] || 0, d[5] || 0, d[6] || 0, ms)
-    }
-  }
-  return new Date(date)
-}
-
-export class Datetime {
-  #date = new Date() // defaults to now
-  #UTC = false // use current locale by default
-
-  constructor(opts?: string | number | Date | DatetimeOptions) {
-    this.#date = parseDate(opts)
-    this.#UTC = get('utc', opts, false)
-    // this.init()
-  }
-
-  // Display
-  // Format
-  format(locale?: string, opts?: Intl.DateTimeFormatOptions) {
-    if (opts && opts.timeZone === undefined && this.#UTC) {
-      opts.timeZone = 'utc'
-    }
-    return this.#date.toLocaleDateString(locale, opts)
-  }
-
-  // Time from now
-  // Time from X
-  // Difference
-
-  // Parsing
-  // Parse String + Date Format
-  // Parse String + Time Format
-  // Parse String + Format + locale
-
-  // Getter/Setters
-  // Hour/Minute/Second/Millis
-  // Day of Month
-  // Day of Week
-  // Day of Year
-  // Week of Year
-  // Days in Month
-  // Weeks in Year
-  // max of two dates
-  // min of two dates
-
-  // Manipulate
-  // Add
-  // Subtract
-  // Start of Time
-  // End of Time
-
-  // Query
-  // Is Before
-  // Is Same
-  // Is After
-  // Is Between
-  // Is Leap Year
-  // Is a Date
-}