pepka 1.12.3 → 1.13.0

package/dist/bundle.cjs

@@ -69,8 +69,7 @@ function curry3(fn) {
 }
 
 const length = (s) => s.length;
-const typed_arr_re = /^(.*?)(8|16|32|64)(Clamped)?Array$/;
-const is_typed_arr = (t) => typed_arr_re.test(t);
+const is_typed_arr = (x) => ArrayBuffer.isView(x);
 /** @param start string | any[] @param s string | any[] */
 const startsWithWith = (comparator) => curry2((start, s) => {
     const len_start = length(start);
@@ -144,20 +143,32 @@ const type = (s) => {
 const typeIs = curry2((t, s) => type(s) === t);
 const eq = curry2((a, b) => a === b);
 const equals = curry2((a, b) => {
+    if (a === b)
+        return true;
     const typea = type(a);
-    if (eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || is_typed_arr(typea))) {
+    const ta = is_typed_arr(a);
+    if (eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || ta)) {
+        if (ta) {
+            if (typea === 'Buffer')
+                return a.equals(b);
+            const len = length(a);
+            if (len !== length(b))
+                return false;
+            for (let i = 0; i < len; i++)
+                if (a[i] !== b[i])
+                    return false;
+            return true;
+        }
         if (isNull(a) || isNull(b))
             return eq(a, b);
-        if (eq(a, b))
-            return true;
         for (const v of [a, b])
             for (const k in v)
-                if (!((eq(v, b)) && (k in a)) &&
-                    !((eq(v, a)) && (k in b) && equals(a[k], b[k])))
+                if (!(v === b && (k in a)) &&
+                    !(v === a && (k in b) && equals(a[k], b[k])))
                     return false;
         return true;
     }
-    return eq(a, b);
+    return false;
 });
 const includes = curry2((s, ss) => {
     if (isStr(ss))
@@ -571,7 +582,7 @@ const clone = (s, shallow = false) => {
         case 'Symbol':
             return s;
         default:
-            return is_typed_arr(t) ? s.constructor.from(s) : s;
+            return is_typed_arr(s) ? s.constructor.from(s) : s;
     }
 };
 const cloneShallow = (s) => clone(s, true);

package/dist/bundle.mjs

@@ -67,8 +67,7 @@ function curry3(fn) {
 }
 
 const length = (s) => s.length;
-const typed_arr_re = /^(.*?)(8|16|32|64)(Clamped)?Array$/;
-const is_typed_arr = (t) => typed_arr_re.test(t);
+const is_typed_arr = (x) => ArrayBuffer.isView(x);
 /** @param start string | any[] @param s string | any[] */
 const startsWithWith = (comparator) => curry2((start, s) => {
     const len_start = length(start);
@@ -142,20 +141,32 @@ const type = (s) => {
 const typeIs = curry2((t, s) => type(s) === t);
 const eq = curry2((a, b) => a === b);
 const equals = curry2((a, b) => {
+    if (a === b)
+        return true;
     const typea = type(a);
-    if (eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || is_typed_arr(typea))) {
+    const ta = is_typed_arr(a);
+    if (eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || ta)) {
+        if (ta) {
+            if (typea === 'Buffer')
+                return a.equals(b);
+            const len = length(a);
+            if (len !== length(b))
+                return false;
+            for (let i = 0; i < len; i++)
+                if (a[i] !== b[i])
+                    return false;
+            return true;
+        }
         if (isNull(a) || isNull(b))
             return eq(a, b);
-        if (eq(a, b))
-            return true;
         for (const v of [a, b])
             for (const k in v)
-                if (!((eq(v, b)) && (k in a)) &&
-                    !((eq(v, a)) && (k in b) && equals(a[k], b[k])))
+                if (!(v === b && (k in a)) &&
+                    !(v === a && (k in b) && equals(a[k], b[k])))
                     return false;
         return true;
     }
-    return eq(a, b);
+    return false;
 });
 const includes = curry2((s, ss) => {
     if (isStr(ss))
@@ -569,7 +580,7 @@ const clone = (s, shallow = false) => {
         case 'Symbol':
             return s;
         default:
-            return is_typed_arr(t) ? s.constructor.from(s) : s;
+            return is_typed_arr(s) ? s.constructor.from(s) : s;
     }
 };
 const cloneShallow = (s) => clone(s, true);

package/package.json

@@ -42,7 +42,7 @@
     "prod": "npm run gentypes && npm run prod:es && npm run prod:cjs",
     "all": "npm run dev && npm run prod"
   },
-  "version": "1.12.3",
+  "version": "1.13.0",
   "devDependencies": {
     "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-node-resolve": "^16.0.3",

package/src/common.ts

@@ -1,5 +1,5 @@
 import { curry2 } from "./curry"
-import { is_typed_arr } from "./internal"
+import { is_typed_arr, length } from "./internal"
 import { isNull, isStr, to } from "./utils"
 const {isNaN} = Number
 
@@ -21,19 +21,26 @@ export const typeIs = curry2((t: string, s: any) => type(s)===t)
 
 export const eq = curry2((a: any, b: any) => a===b)
 export const equals = curry2((a: any, b: any) => {
+  if(a===b) return true
   const typea = type(a)
-  if(eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || is_typed_arr(typea))) {
+  const ta = is_typed_arr(a)
+  if(eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || ta)) {
+    if(ta) {
+      if(typea==='Buffer') return (a as Buffer).equals(b)
+      const len = length(a as any)
+      if(len!==length(b)) return false
+      for(let i=0; i<len; i++) if(a[i]!==b[i]) return false
+      return true
+    }
     if(isNull(a) || isNull(b)) return eq(a, b)
-    if(eq(a, b)) return true
-    for(const v of [a, b])
-      for(const k in v)
-        if(
-          !((eq(v, b)) && (k in a)) &&
-          !((eq(v, a)) && (k in b) && equals(a[k], b[k]))
-        ) return false
+    for(const v of [a, b]) for(const k in v)
+      if(
+        !(v===b && (k in a)) &&
+        !(v===a && (k in b) && equals(a[k], b[k]))
+      ) return false
     return true
   }
-  return eq(a, b)
+  return false
 })
 export const includes = curry2(
   <T>(s: T, ss: T[]) => {
@@ -49,3 +56,4 @@ export const identity = <T extends any>(s: T) => s
 export const trim = (s: string) => s.trim()
 
 export { length } from './internal'
+

package/src/internal.ts

@@ -2,8 +2,7 @@ import { curry2 } from "./curry"
 import { AnyArray, StrLen } from "./internal_types"
 
 export const length = <T extends AnyArray | string>(s: T): T extends string ? StrLen<T> : T['length'] => s.length as any
-const typed_arr_re = /^(.*?)(8|16|32|64)(Clamped)?Array$/
-export const is_typed_arr = (t: string) => typed_arr_re.test(t)
+export const is_typed_arr = (x: any) => ArrayBuffer.isView(x)
 /** @param start string | any[] @param s string | any[] */
 export const startsWithWith = (comparator: (x: any, y: any)=>boolean) => curry2(
   (start: any[] | string, s: any[] | string) => {

package/src/safe.ts

@@ -301,7 +301,7 @@ export const clone = <T extends any>(s: T, shallow = false): T => {
     case 'Boolean': case 'Symbol':
       return s
     default:
-      return is_typed_arr(t) ? (s as any).constructor.from(s) : s
+      return is_typed_arr(s) ? (s as any).constructor.from(s) : s
   }
 }
 export const cloneShallow = (s: any) => clone(s, true)