pepka 1.11.0 → 1.12.0

package/dist/bundle.cjs

@@ -210,15 +210,19 @@ const qmergeDeepAdd = mergeDeep$1(3);
 const qmergeShallow = curry2((o1, o2) => Object.assign(o1, o2));
 /** qmapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
 const qmapKeys = curry2((keyMap, o) => {
-    let k, mapped, newKey, newValue;
+    let k, mapped, newKey, newValue, swap = {}, inswap;
     for (k in keyMap)
         if (k in o) {
             mapped = keyMap[k];
             [newKey, newValue] = isFunc(mapped)
                 ? mapped(o[k], k, o)
                 : [mapped, o[k]];
-            o[isNil(newKey) ? k : newKey] = newValue;
-            if (k !== newKey)
+            if (newKey in keyMap)
+                swap[newKey] = o[newKey];
+            inswap = k in swap;
+            if (!isNil(newKey))
+                o[newKey] = inswap ? swap[k] : newValue;
+            if (!inswap && k !== newKey)
                 delete o[k];
         }
     return o;
@@ -350,7 +354,7 @@ const quniq = (xs) => {
 const qpush = qappend;
 
 const { assign } = Object;
-// TODO: over, lensProp, reduceAsync, propsEq is up to 20x slow due to deep equals.
+// TODO: over, reduceAsync, propsEq is up to 20x slow due to deep equals.
 const take = (argN) => (...args) => args[argN];
 const ifElse = curry((cond, pipeYes, pipeNo, s) => cond(s) ? pipeYes(s) : pipeNo(s));
 const when = curry3((cond, pipe, s) => ifElse(cond, pipe, identity, s));
@@ -636,8 +640,13 @@ const mergeShallow = curry2((o1, o2) => assign({}, o1, o2));
 const mergeDeep = curry2((a, b) => qmergeDeep(clone(a), b));
 const mergeDeepX = curry2((a, b) => qmergeDeepX(clone(a), b));
 const mergeDeepAdd = curry2((a, b) => qmergeDeepAdd(clone(a), b));
-/** @param prop string @param pipe(data[prop]) @param data any @returns data with prop over pipe. */
-const overProp = curry3((prop, pipe, data) => assoc(prop, pipe(data[prop]), data));
+/**
+ * @param prop string
+ * @param pipe(data[prop])
+ * @param data any
+ * @returns data with prop over pipe.
+*/
+const overProp = curry3((prop, pipe, data) => (prop in data) && assoc(prop, pipe(data[prop]), data));
 /** mapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
 const mapKeys = curry2((keyMap, o) => qmapKeys(keyMap, assign({}, o)));
 const zip = curry2((a, b) => map((s, i) => [s, b[i]], a));
@@ -659,6 +668,7 @@ const push = append;
 const some = any;
 const weakEq = eq;
 const uniqBy = uniqWith;
+const propLens = overProp;
 
 /** One promise waits for another. */
 const forEachSerial = (() => {
@@ -893,6 +903,7 @@ exports.pickBy = pickBy;
 exports.prepend = prepend;
 exports.prop = prop;
 exports.propEq = propEq;
+exports.propLens = propLens;
 exports.propsEq = propsEq;
 exports.push = push;
 exports.qappend = qappend;

package/dist/bundle.d.ts

@@ -715,7 +715,12 @@ export declare const mergeDeepAdd: {
 	(a: AnyObject): (b: AnyObject) => AnyObject;
 	(a: AnyObject, b: AnyObject): AnyObject;
 };
-/** @param prop string @param pipe(data[prop]) @param data any @returns data with prop over pipe. */
+/**
+ * @param prop string
+ * @param pipe(data[prop])
+ * @param data any
+ * @returns data with prop over pipe.
+*/
 export declare const overProp: (...args: AnyArgs) => any;
 /** mapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
 export declare const mapKeys: {
@@ -779,6 +784,7 @@ export declare const uniqBy: {
 	(a: (x: any, y: any) => boolean): (b: any[]) => any;
 	(a: (x: any, y: any) => boolean, b: any[]): any;
 };
+export declare const propLens: (...args: AnyArgs) => any;
 type StrTmpl = ((data: AnyObject) => string);
 /** Supports ecrans: '\\{"json": {yes} \\}'
   @returns getTmpl('one{meme}two')({meme: 42}) -> one42two */

package/dist/bundle.mjs

@@ -208,15 +208,19 @@ const qmergeDeepAdd = mergeDeep$1(3);
 const qmergeShallow = curry2((o1, o2) => Object.assign(o1, o2));
 /** qmapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
 const qmapKeys = curry2((keyMap, o) => {
-    let k, mapped, newKey, newValue;
+    let k, mapped, newKey, newValue, swap = {}, inswap;
     for (k in keyMap)
         if (k in o) {
             mapped = keyMap[k];
             [newKey, newValue] = isFunc(mapped)
                 ? mapped(o[k], k, o)
                 : [mapped, o[k]];
-            o[isNil(newKey) ? k : newKey] = newValue;
-            if (k !== newKey)
+            if (newKey in keyMap)
+                swap[newKey] = o[newKey];
+            inswap = k in swap;
+            if (!isNil(newKey))
+                o[newKey] = inswap ? swap[k] : newValue;
+            if (!inswap && k !== newKey)
                 delete o[k];
         }
     return o;
@@ -348,7 +352,7 @@ const quniq = (xs) => {
 const qpush = qappend;
 
 const { assign } = Object;
-// TODO: over, lensProp, reduceAsync, propsEq is up to 20x slow due to deep equals.
+// TODO: over, reduceAsync, propsEq is up to 20x slow due to deep equals.
 const take = (argN) => (...args) => args[argN];
 const ifElse = curry((cond, pipeYes, pipeNo, s) => cond(s) ? pipeYes(s) : pipeNo(s));
 const when = curry3((cond, pipe, s) => ifElse(cond, pipe, identity, s));
@@ -634,8 +638,13 @@ const mergeShallow = curry2((o1, o2) => assign({}, o1, o2));
 const mergeDeep = curry2((a, b) => qmergeDeep(clone(a), b));
 const mergeDeepX = curry2((a, b) => qmergeDeepX(clone(a), b));
 const mergeDeepAdd = curry2((a, b) => qmergeDeepAdd(clone(a), b));
-/** @param prop string @param pipe(data[prop]) @param data any @returns data with prop over pipe. */
-const overProp = curry3((prop, pipe, data) => assoc(prop, pipe(data[prop]), data));
+/**
+ * @param prop string
+ * @param pipe(data[prop])
+ * @param data any
+ * @returns data with prop over pipe.
+*/
+const overProp = curry3((prop, pipe, data) => (prop in data) && assoc(prop, pipe(data[prop]), data));
 /** mapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
 const mapKeys = curry2((keyMap, o) => qmapKeys(keyMap, assign({}, o)));
 const zip = curry2((a, b) => map((s, i) => [s, b[i]], a));
@@ -657,6 +666,7 @@ const push = append;
 const some = any;
 const weakEq = eq;
 const uniqBy = uniqWith;
+const propLens = overProp;
 
 /** One promise waits for another. */
 const forEachSerial = (() => {
@@ -798,4 +808,4 @@ const wait = (time) => new QPromise((ff) => setTimeout(ff, time), (timeout) => c
 // TODO: possibly introduce a second argument limiting unfolding.
 const uncurry = (fn) => (...args) => qreduce(((fn, arg) => fn ? fn(arg) : fn), fn, args);
 
-export { F, QPromise, T, __, add, all, allPass, always, any, anyPass, append, assoc, assocPath, bind, both, callFrom, callWith, clone, cloneShallow, complement, compose, composeAsync, concat, cond, curry, curry2, curry3, debounce, diff, divide, echo, empty, eq, equals, explore, filter, find, findIndex, flat, flatShallow, flatTo, flip, forEach, forEachParallel, forEachSerial, freeze, freezeShallow, fromPairs, genBy, getTmpl, gt, gte, head, identity, ifElse, includes, indexOf, intersection, isEmpty, isNil, join, keys, last, length, lt, lte, map, mapKeys, mapObj, memoize, mergeDeep, mergeDeepAdd, mergeDeepX, mergeShallow, mirror, multiply, noop, not, notf, nth, omit, once, overProp, path, pathEq, pathExists, pathOr, pathsEq, pick, pickBy, prepend, prop, propEq, propsEq, push, qappend, qassoc, qassocPath, qempty, qfilter, qfilterAsync, qfreeze, qfreezeShallow, qmap, qmapKeys, qmapObj, qmergeDeep, qmergeDeepAdd, qmergeDeepX, qmergeShallow, qomit, qoverProp, qpick, qprepend, qpush, qreduce, qreverse, qslice, qsort, quniq, qwaitAll, range, reduce, reflect, replace, reverse, sizeof, slice, some, sort, split, startsWith, startsWithShallow, subtract, symbol, tail, take, tap, test, throttle, toLower, toPairs, toUpper, trim, type, typeIs, uncurry, uniq, uniqBy, uniqWith, values, wait, waitAll, waitTap, weakEq, when, zip, zipObj, zipWith };
+export { F, QPromise, T, __, add, all, allPass, always, any, anyPass, append, assoc, assocPath, bind, both, callFrom, callWith, clone, cloneShallow, complement, compose, composeAsync, concat, cond, curry, curry2, curry3, debounce, diff, divide, echo, empty, eq, equals, explore, filter, find, findIndex, flat, flatShallow, flatTo, flip, forEach, forEachParallel, forEachSerial, freeze, freezeShallow, fromPairs, genBy, getTmpl, gt, gte, head, identity, ifElse, includes, indexOf, intersection, isEmpty, isNil, join, keys, last, length, lt, lte, map, mapKeys, mapObj, memoize, mergeDeep, mergeDeepAdd, mergeDeepX, mergeShallow, mirror, multiply, noop, not, notf, nth, omit, once, overProp, path, pathEq, pathExists, pathOr, pathsEq, pick, pickBy, prepend, prop, propEq, propLens, propsEq, push, qappend, qassoc, qassocPath, qempty, qfilter, qfilterAsync, qfreeze, qfreezeShallow, qmap, qmapKeys, qmapObj, qmergeDeep, qmergeDeepAdd, qmergeDeepX, qmergeShallow, qomit, qoverProp, qpick, qprepend, qpush, qreduce, qreverse, qslice, qsort, quniq, qwaitAll, range, reduce, reflect, replace, reverse, sizeof, slice, some, sort, split, startsWith, startsWithShallow, subtract, symbol, tail, take, tap, test, throttle, toLower, toPairs, toUpper, trim, type, typeIs, uncurry, uniq, uniqBy, uniqWith, values, wait, waitAll, waitTap, weakEq, when, zip, zipObj, zipWith };

package/package.json

@@ -36,12 +36,13 @@
     "lint": "tslint src/*.ts",
     "gentypes": "dts-bundle-generator --no-check --export-referenced-types=false -o dist/bundle.d.ts src/index.ts",
     "dev": "cross-env NODE_ENV=development BUILD=es rollup -c",
+    "watch": "nodemon --watch src 'npm run dev'",
     "prod:cjs": "cross-env NODE_ENV=production BUILD=cjs rollup -c",
     "prod:es": "cross-env NODE_ENV=production BUILD=es rollup -c",
     "prod": "npm run gentypes && npm run prod:es && npm run prod:cjs",
     "all": "npm run dev && npm run prod"
   },
-  "version": "1.11.0",
+  "version": "1.12.0",
   "devDependencies": {
     "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-node-resolve": "^16.0.3",

package/src/quick.ts

@@ -50,14 +50,16 @@ export const qmapKeys = curry2(
     keyMap: {[oldKey: string]: string | AnyFunc},
     o: AnyObject
   ) => {
-    let k: string, mapped: string | AnyFunc, newKey: string, newValue: any
+    let k: string, mapped: string | AnyFunc, newKey: string, newValue: any, swap: AnyObject = {}, inswap: boolean
     for(k in keyMap) if(k in o) {
       mapped = keyMap[k]
       ;[newKey, newValue] = isFunc(mapped)
         ? (mapped as AnyFunc)(o[k], k, o)
         : [mapped, o[k]]
-      o[isNil(newKey) ? k : newKey] = newValue
-      if(k !== newKey) delete o[k]
+      if(newKey in keyMap) swap[newKey] = o[newKey]
+      inswap = k in swap
+      if(!isNil(newKey)) o[newKey] = inswap ? swap[k] : newValue
+      if(!inswap && k !== newKey) delete o[k]
     }
     return o
   }

package/src/safe.ts

@@ -6,7 +6,7 @@ import { qappend, qfilter, qfreeze, qfreezeShallow, qmapKeys, qmapObj, qmergeDee
 import { AnyFunc, AnyObject, Composed, Cond, Reducer } from './types'
 import { inf, isArray, isFunc, isNil, isNum, isObj, undef } from './utils'
 const {assign} = Object
-// TODO: over, lensProp, reduceAsync, propsEq is up to 20x slow due to deep equals.
+// TODO: over, reduceAsync, propsEq is up to 20x slow due to deep equals.
 
 export const take = (argN: number) => (...args: any[]) => args[argN]
 export const ifElse = curry(
@@ -422,10 +422,15 @@ export const mergeDeepX = curry2(
 export const mergeDeepAdd = curry2(
   (a: AnyObject, b: AnyObject) => qmergeDeepAdd(clone(a), b) as AnyObject
 )
-/** @param prop string @param pipe(data[prop]) @param data any @returns data with prop over pipe. */
+/**
+ * @param prop string
+ * @param pipe(data[prop])
+ * @param data any
+ * @returns data with prop over pipe.
+*/
 export const overProp = curry3(
   (prop: string, pipe: AnyFunc, data: any) =>
-    assoc(prop, pipe(data[prop]), data)
+    (prop in data) && assoc(prop, pipe(data[prop]), data)
 )
 /** mapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
 export const mapKeys = curry2(
@@ -465,4 +470,5 @@ export const notf = complement
 export const push = append
 export const some = any
 export const weakEq = eq
-export const uniqBy = uniqWith
+export const uniqBy = uniqWith
+export const propLens = overProp

package/test/workbench.html

@@ -3,6 +3,7 @@
 <html>
   <head>
     <title>pepka's workbench</title>
+    <style>html { background: black }</style>
   </head>
   <body>
     <script src="../dist/bundle.dev.js"></script>