Dev

CHANGELOG.md

@@ -1,7 +1,7 @@
 ## Changelog
 
-### [v2.1.0](https://github.com/panates/jsopen-objects/compare/v2.0.2...v2.1.0) - 
+### [v2.1.1](https://github.com/panates/jsopen-objects/compare/v2.1.0...v2.1.1) - 
 
-#### 🚀 New Features
+#### 🪲 Fixes
 
-- feat: Added `updateErrorMessage` helper method @Eray Hanoğlu 
+- fix: Fixed "keepExisting" with "deep" option do not overwrite existing @Eray Hanoğlu 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jsopen/objects",
   "description": "Helper utilities for working with JavaScript objects and arrays",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "author": "Panates",
   "license": "MIT",
   "private": true,
@@ -32,15 +32,12 @@
   },
   "scripts": {
     "compile": "tsc --noEmit",
+    "prebuild": "npm run clean:build && npm run lint",
+    "build": "tsc -b tsconfig-build.json",
+    "postbuild": "node ./support/postbuild.cjs && rimraf build/*.tsbuildinfo",
     "clean": "npm run clean:src && npm run clean:dist",
-    "clean:dist": "rimraf build coverage",
+    "clean:build": "rimraf build *.tsbuildinfo",
     "clean:src": "ts-cleanup -s src --all | ts-cleanup -s test",
-    "prebuild": "npm run clean:dist && npm run lint",
-    "build": "npm run build:cjs && npm run build:esm",
-    "build:cjs": "tsc -b tsconfig-build-cjs.json && cp support/package.cjs.json ./build/cjs/package.json",
-    "build:esm": "tsc -b tsconfig-build-esm.json && cp support/package.esm.json ./build/esm/package.json",
-    "postbuild": "npm run postbuild:copyfiles && node ./support/postbuild.cjs",
-    "postbuild:copyfiles": "cp LICENSE README.md CHANGELOG.md ./build",
     "lint": "eslint . --max-warnings=0",
     "lint:fix": "eslint . --max-warnings=0 --fix",
     "format": "prettier . --write --log-level=warn",
@@ -52,23 +49,15 @@
     "version": "auto-changelog -p --starting-version v4.0.0 && git add CHANGELOG.md"
   },
   "type": "module",
+  "module": "./index.js",
+  "types": "./index.d.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./types/index.d.ts",
-        "default": "./esm/index.js"
-      },
-      "require": {
-        "types": "./types/index.d.cts",
-        "default": "./cjs/index.js"
-      },
-      "default": "./esm/index.js"
+      "types": "./index.d.ts",
+      "default": "./index.js"
     },
     "./package.json": "./package.json"
   },
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./types/index.d.ts",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"
   ],
@@ -79,14 +68,6 @@
   "engines": {
     "node": ">= 16.0"
   },
-  "files": [
-    "cjs/",
-    "esm/",
-    "types/",
-    "LICENSE",
-    "README.md",
-    "CHANGELOG.md"
-  ],
   "keywords": [
     "object",
     "util",

src/merge.ts

@@ -110,8 +110,24 @@ export function merge(
       ) {
         continue;
       }
+      _goDeep = !!(
+        deep &&
+        typeof srcVal === 'object' &&
+        (!isBuiltIn(srcVal) || Array.isArray(srcVal))
+      );
+      if (_goDeep) {
+        if (deepFn)
+          _goDeep = deepFn(srcVal, {
+            key,
+            source,
+            target,
+            path: parentPath + (parentPath ? '.' : '') + String(key),
+          });
+        else
+          _goDeep = deepFull || isPlainObject(srcVal) || Array.isArray(srcVal);
+      }
 
-      if (keepExisting && hasOwnProperty.call(target, key)) {
+      if (!_goDeep && keepExisting && hasOwnProperty.call(target, key)) {
         if (!keepExistingFn) continue;
         if (
           keepExistingFn(srcVal, {
@@ -145,59 +161,42 @@ export function merge(
         continue;
       }
 
-      if (
-        deep &&
-        typeof srcVal === 'object' &&
-        (!isBuiltIn(srcVal) || Array.isArray(srcVal))
-      ) {
-        _goDeep =
-          (deepFn &&
-            deepFn(srcVal, {
-              key,
-              source,
-              target,
-              path: parentPath + (parentPath ? '.' : '') + String(key),
-            })) ||
-          (!deepFn &&
-            (deepFull || isPlainObject(srcVal) || Array.isArray(srcVal)));
-        if (_goDeep) {
-          /** Array */
-          if (Array.isArray(srcVal)) {
-            if (
-              Array.isArray(target[key]) &&
-              (mergeArrays ||
-                mergeArraysFn?.(srcVal, {
-                  key,
-                  source,
-                  target,
-                  path: parentPath + (parentPath ? '.' : '') + String(key),
-                }))
-            ) {
-              target[key] = _arrayClone(
-                target[key],
-                parentPath + (parentPath ? '.' : '') + String(key),
-              );
-            } else target[key] = [];
-
-            target[key].push(
-              ..._arrayClone(
-                srcVal,
-                parentPath + (parentPath ? '.' : '') + String(key),
-              ),
-            );
-            if (mergeArraysUnique)
-              target[key] = Array.from(new Set(target[key]));
-            continue;
-          } else {
-            /** Object */
-            if (!isObject(target[key])) target[key] = {};
-            _merge(
+      if (_goDeep) {
+        /** Array */
+        if (Array.isArray(srcVal)) {
+          if (
+            Array.isArray(target[key]) &&
+            (mergeArrays ||
+              mergeArraysFn?.(srcVal, {
+                key,
+                source,
+                target,
+                path: parentPath + (parentPath ? '.' : '') + String(key),
+              }))
+          ) {
+            target[key] = _arrayClone(
               target[key],
-              srcVal,
               parentPath + (parentPath ? '.' : '') + String(key),
             );
-            continue;
-          }
+          } else target[key] = [];
+
+          target[key].push(
+            ..._arrayClone(
+              srcVal,
+              parentPath + (parentPath ? '.' : '') + String(key),
+            ),
+          );
+          if (mergeArraysUnique) target[key] = Array.from(new Set(target[key]));
+          continue;
+        } else {
+          /** Object */
+          if (!isObject(target[key])) target[key] = {};
+          _merge(
+            target[key],
+            srcVal,
+            parentPath + (parentPath ? '.' : '') + String(key),
+          );
+          continue;
         }
       }
 

support/postbuild.cjs

@@ -1,23 +1,38 @@
 const fs = require('node:fs');
 const path = require('node:path');
 
-function clearPackageJson() {
-  const targetPath = path.resolve(__dirname, '../build');
-
+function postBuild() {
+  const projectRoot = process.cwd();
   const json = JSON.parse(
-    fs.readFileSync(path.resolve(__dirname, '../package.json'), 'utf-8'),
+    fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf-8'),
   );
+
+  const buildDir = path.join(projectRoot, 'build');
+  if (!fs.existsSync(buildDir)) throw new Error('Build directory not found');
+
+  json.type = 'module';
   delete json.private;
   delete json.scripts;
   delete json.devDependencies;
+
   fs.writeFileSync(
-    path.resolve(targetPath, 'package.json'),
+    path.resolve(buildDir, 'package.json'),
     JSON.stringify(json, undefined, 2),
+    'utf-8',
   );
   fs.copyFileSync(
-    path.resolve(targetPath, './types/index.d.ts'),
-    path.resolve(targetPath, './types/index.d.cts'),
+    path.resolve('./README.md'),
+    path.resolve(buildDir, 'README.md'),
   );
+  fs.copyFileSync(path.resolve('./LICENSE'), path.resolve(buildDir, 'LICENSE'));
+
+  /** Update version */
+  const constantsFile = path.resolve(buildDir, 'constants.js');
+  if (fs.existsSync(constantsFile)) {
+    let content = fs.readFileSync(constantsFile, 'utf8');
+    content = content.replace(`version = '1'`, `version = '${json.version}'`);
+    fs.writeFileSync(constantsFile, content, 'utf-8');
+  }
 }
 
-clearPackageJson();
+postBuild();

tsconfig-base.json

@@ -2,6 +2,11 @@
   "extends": "@panates/tsconfig/node.json",
   "compilerOptions": {
     "types": ["node"],
-    "esModuleInterop": true
+    "sourceMap": true,
+    "moduleResolution": "nodenext",
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "module": "NodeNext",
+    "target": "ESNext"
   }
 }

tsconfig-build-esm.json → tsconfig-build.json

@@ -4,8 +4,7 @@
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "declaration": true,
-    "outDir": "build/esm",
-    "declarationDir": "build/types"
+    "outDir": "build",
   },
   "include": ["src"]
 }

tsconfig.json

@@ -1,9 +1,7 @@
 {
   "extends": "./tsconfig-base.json",
   "compilerOptions": {
-    "types": ["node"],
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext"
+    "types": ["node"]
   },
   "include": ["src"],
   "exclude": ["node_modules", "build"]