@wrongstack/plugins 0.148.0 → 0.155.0

package/dist/index.js

@@ -2,7 +2,7 @@ import { execFileSync, execSync } from 'child_process';
 import { watch, existsSync, readdirSync, readFileSync } from 'fs';
 import * as path from 'path';
 import { isAbsolute, join } from 'path';
-import { expectDefined } from '@wrongstack/core';
+import { expectDefined, deepMerge as deepMerge$1 } from '@wrongstack/core';
 import { lookup } from 'dns/promises';
 import { isIPv4, isIPv6 } from 'net';
 
@@ -1773,32 +1773,7 @@ function validateJsonSchema(data, schema) {
   return { valid: errors.length === 0, errors };
 }
 function deepMerge(base, patch, conflictResolution = "prefer-patch") {
-  if (typeof base !== "object" || base === null || typeof patch !== "object" || patch === null) {
-    return conflictResolution === "prefer-patch" ? patch : base;
-  }
-  if (Array.isArray(base) && Array.isArray(patch)) {
-    return conflictResolution === "prefer-patch" ? patch : base;
-  }
-  const result = {};
-  const baseObj = base;
-  const patchObj = patch;
-  const allKeys = /* @__PURE__ */ new Set([...Object.keys(baseObj), ...Object.keys(patchObj)]);
-  for (const key of allKeys) {
-    const baseVal = baseObj[key];
-    const patchVal = patchObj[key];
-    if (key in baseObj && key in patchObj) {
-      if (typeof baseVal === "object" && baseVal !== null && typeof patchVal === "object" && patchVal !== null && !Array.isArray(baseVal) && !Array.isArray(patchVal)) {
-        result[key] = deepMerge(baseVal, patchVal, conflictResolution);
-      } else {
-        result[key] = conflictResolution === "prefer-patch" ? patchVal : baseVal;
-      }
-    } else if (key in baseObj) {
-      result[key] = baseVal;
-    } else {
-      result[key] = patchVal;
-    }
-  }
-  return result;
+  return deepMerge$1(base, patch, { conflictResolution });
 }
 var plugin7 = {
   name: "json-path",

package/dist/json-path.js

@@ -1,4 +1,4 @@
-import { expectDefined } from '@wrongstack/core';
+import { expectDefined, deepMerge as deepMerge$1 } from '@wrongstack/core';
 
 // src/json-path/index.ts
 var API_VERSION = "^0.1.10";
@@ -142,32 +142,7 @@ function validateJsonSchema(data, schema) {
   return { valid: errors.length === 0, errors };
 }
 function deepMerge(base, patch, conflictResolution = "prefer-patch") {
-  if (typeof base !== "object" || base === null || typeof patch !== "object" || patch === null) {
-    return conflictResolution === "prefer-patch" ? patch : base;
-  }
-  if (Array.isArray(base) && Array.isArray(patch)) {
-    return conflictResolution === "prefer-patch" ? patch : base;
-  }
-  const result = {};
-  const baseObj = base;
-  const patchObj = patch;
-  const allKeys = /* @__PURE__ */ new Set([...Object.keys(baseObj), ...Object.keys(patchObj)]);
-  for (const key of allKeys) {
-    const baseVal = baseObj[key];
-    const patchVal = patchObj[key];
-    if (key in baseObj && key in patchObj) {
-      if (typeof baseVal === "object" && baseVal !== null && typeof patchVal === "object" && patchVal !== null && !Array.isArray(baseVal) && !Array.isArray(patchVal)) {
-        result[key] = deepMerge(baseVal, patchVal, conflictResolution);
-      } else {
-        result[key] = conflictResolution === "prefer-patch" ? patchVal : baseVal;
-      }
-    } else if (key in baseObj) {
-      result[key] = baseVal;
-    } else {
-      result[key] = patchVal;
-    }
-  }
-  return result;
+  return deepMerge$1(base, patch, { conflictResolution });
 }
 var plugin = {
   name: "json-path",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/plugins",
-  "version": "0.148.0",
+  "version": "0.155.0",
   "description": "Official WrongStack plugin collection — auto-doc, git-autocommit, shell-check, cost-tracker, file-watcher, web-search, json-path, cron, template-engine, semver-bump",
   "license": "MIT",
   "author": "ECOSTACK TECHNOLOGY OÜ",
@@ -63,7 +63,7 @@
     "vitest": "^4.1.8"
   },
   "dependencies": {
-    "@wrongstack/core": "0.148.0"
+    "@wrongstack/core": "0.155.0"
   },
   "scripts": {
     "build": "tsup",