pepka 1.11.1 → 1.12.1

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;

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;

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.1",
+  "version": "1.12.1",
   "devDependencies": {
     "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-node-resolve": "^16.0.3",

package/src/quick.ts

@@ -44,20 +44,22 @@ export const qmergeDeepX = mergeDeep(2)
 export const qmergeDeepAdd = mergeDeep(3)
 /** @param o1 <- o2 */
 export const qmergeShallow = curry2((o1: AnyObject, o2: AnyObject) => Object.assign(o1, o2))
-/** qmapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
+/** qmapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } removes a key when null. */
 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

@@ -430,7 +430,7 @@ export const mergeDeepAdd = curry2(
 */
 export const overProp = curry3(
   (prop: string, pipe: AnyFunc, data: any) =>
-    (prop in data) && assoc(prop, pipe(data[prop]), data)
+    prop in data ? assoc(prop, pipe(data[prop]), data) : data
 )
 /** mapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
 export const mapKeys = curry2(

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>