@vpmedia/simplify 1.17.0 → 1.19.0

package/README.md

@@ -1,6 +1,6 @@
 # @vpmedia/simplify
 
-[![npm version](https://badge.fury.io/js/@vpmedia%2Fsimplify.svg?v=1.17.0)](https://badge.fury.io/js/@vpmedia%2Fsimplify)
+[![npm version](https://badge.fury.io/js/@vpmedia%2Fsimplify.svg?v=1.19.0)](https://badge.fury.io/js/@vpmedia%2Fsimplify)
 [![Node.js CI](https://github.com/vpmedia/simplify/actions/workflows/ci.yml/badge.svg)](https://github.com/vpmedia/simplify/actions/workflows/ci.yml)
 
 @vpmedia/simplify TBD

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/simplify",
-  "version": "1.17.0",
+  "version": "1.19.0",
   "description": "@vpmedia/simplify",
   "author": "Andras Csizmadia <andras@vpmedia.hu> (www.vpmedia.hu)",
   "license": "MIT",
@@ -20,17 +20,17 @@
   "type": "module",
   "devDependencies": {
     "@babel/preset-env": "^7.26.9",
-    "@eslint/js": "^9.21.0",
+    "@eslint/js": "^9.23.0",
     "@jest/globals": "^29.7.0",
     "@types/jest": "^29.5.14",
-    "eslint": "^9.22.0",
-    "eslint-plugin-jsdoc": "^50.6.3",
-    "eslint-plugin-unicorn": "^57.0.0",
+    "eslint": "^9.24.0",
+    "eslint-plugin-jsdoc": "^50.6.9",
+    "eslint-plugin-unicorn": "^58.0.0",
     "globals": "^16.0.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "prettier": "^3.5.3",
-    "typescript": "^5.8.2"
+    "typescript": "^5.8.3"
   },
   "scripts": {
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests",

package/src/index.js

@@ -7,6 +7,7 @@ export * from './pagelifecycle/typedef.js';
 export * from './pagelifecycle/util.js';
 export { addLeadingZero } from './util/addLeadingZero.js';
 export { capitalize } from './util/capitalize.js';
+export { deepMerge } from './util/deepMerge.js';
 export { deg2rad } from './util/deg2rad.js';
 export { delayPromise } from './util/delayPromise.js';
 export { FetchError, fetchRetry, HTTP_0_ANY } from './util/fetchRetry.js';
@@ -19,5 +20,6 @@ export { purgeObject } from './util/purgeObject.js';
 export { addFloat, fixFloat, subFloat } from './util/safeFloat.js';
 export { sanitizeURLParam } from './util/sanitizeURLParam.js';
 export { saveAsFile } from './util/saveAsFile.js';
+export { serverDataToState } from './util/serverDataToState.js';
 export { setObjValueByPath } from './util/setObjValueByPath.js';
 export { underscoreToCamelCase } from './util/underscoreToCamelCase.js';

package/src/util/deepMerge.js

@@ -0,0 +1,23 @@
+/**
+ * TBD.
+ * @param {object} target - TBD.
+ * @param {object} source - TBD.
+ * @returns {object} TBD.
+ */
+export const deepMerge = (target, source) => {
+  if (typeof target !== 'object' || target === null) return source;
+  if (typeof source !== 'object' || source === null) return target;
+
+  for (const key of Object.keys(source)) {
+    if (typeof source[key] === 'object' && source[key] !== null) {
+      if (!target[key] || typeof target[key] !== 'object') {
+        target[key] = {};
+      }
+      deepMerge(target[key], source[key]);
+    } else {
+      target[key] = source[key];
+    }
+  }
+
+  return target;
+};

package/src/util/deepMerge.test.js

@@ -0,0 +1,25 @@
+import { deepMerge } from './deepMerge.js';
+
+describe('deepMerge', () => {
+  test('should override deep properties correctly', () => {
+    const defaultObj = { a: { b: 1, c: 2 }, d: 3 };
+    const overrideObj = { a: { b: 42 } };
+    const expectedResult = { a: { b: 42, c: 2 }, d: 3 };
+
+    expect(deepMerge({ ...defaultObj }, overrideObj)).toEqual(expectedResult);
+  });
+
+  test('should not modify the original target object', () => {
+    const target = { x: { y: 10 } };
+    const source = { x: { y: 20 } };
+    const copy = { ...target };
+
+    deepMerge(target, source);
+    expect(target).toEqual(copy);
+  });
+
+  test('should handle non-object values correctly', () => {
+    expect(deepMerge(null, { a: 1 })).toEqual({ a: 1 });
+    expect(deepMerge({ a: 1 }, null)).toEqual({ a: 1 });
+  });
+});

package/src/util/fetchRetry.js

@@ -1,4 +1,9 @@
-import { HTTP_401_UNAUTHORIZED, HTTP_403_FORBIDDEN, HTTP_405_METHOD_NOT_ALLOWED, HTTP_422_UNPROCESSABLE_ENTITY } from '../const/http_status.js';
+import {
+  HTTP_401_UNAUTHORIZED,
+  HTTP_403_FORBIDDEN,
+  HTTP_405_METHOD_NOT_ALLOWED,
+  HTTP_422_UNPROCESSABLE_ENTITY,
+} from '../const/http_status.js';
 import { Logger } from '../logging/Logger.js';
 import { delayPromise } from './delayPromise.js';
 

package/src/util/serverDataToState.js

@@ -0,0 +1,23 @@
+import { underscoreToCamelCase } from './underscoreToCamelCase.js';
+
+/**
+ * Maps server data to client data.
+ * @param {{}} data - The server input data.
+ * @returns {{}} The output data.
+ */
+export const serverDataToState = (data) => {
+  if (Array.isArray(data)) {
+    return data.map((entry) => serverDataToState(entry));
+  }
+
+  if (data !== null && typeof data === 'object') {
+    const result = {};
+    for (const [key, value] of Object.entries(data)) {
+      const clientKey = underscoreToCamelCase(key);
+      result[clientKey] = serverDataToState(value);
+    }
+    return result;
+  }
+
+  return data; // Return primitives as-is
+};

package/src/util/serverDataToState.test.js

@@ -0,0 +1,20 @@
+import { serverDataToState } from './serverDataToState.js';
+
+test('serverDataToState()', () => {
+  const state = serverDataToState({
+    my_array: [{ key_a: 'value1' }],
+    my_data: { key_a: 'value1' },
+    my_list: [1, 2, 3],
+    my_null: null,
+    my_number: 1000,
+    my_string: 'a',
+    my_var: 'test',
+  });
+  expect(state.myArray[0].keyA).toBe('value1');
+  expect(state.myData.keyA).toBe('value1');
+  expect(state.myList[0]).toBe(1);
+  expect(state.myNull).toBe(null);
+  expect(state.myNumber).toBe(1000);
+  expect(state.myString).toBe('a');
+  expect(state.myVar).toBe('test');
+});

package/types/index.d.ts

@@ -6,6 +6,7 @@ export * from "./pagelifecycle/util.js";
 export { Logger } from "./logging/Logger.js";
 export { addLeadingZero } from "./util/addLeadingZero.js";
 export { capitalize } from "./util/capitalize.js";
+export { deepMerge } from "./util/deepMerge.js";
 export { deg2rad } from "./util/deg2rad.js";
 export { delayPromise } from "./util/delayPromise.js";
 export { fixFloatPrecision } from "./util/fixFloatPrecision.js";
@@ -16,6 +17,7 @@ export { loadJSON } from "./util/loadJSON.js";
 export { purgeObject } from "./util/purgeObject.js";
 export { sanitizeURLParam } from "./util/sanitizeURLParam.js";
 export { saveAsFile } from "./util/saveAsFile.js";
+export { serverDataToState } from "./util/serverDataToState.js";
 export { setObjValueByPath } from "./util/setObjValueByPath.js";
 export { underscoreToCamelCase } from "./util/underscoreToCamelCase.js";
 export { FetchError, fetchRetry, HTTP_0_ANY } from "./util/fetchRetry.js";

package/types/util/deepMerge.d.ts

@@ -0,0 +1,2 @@
+export function deepMerge(target: object, source: object): object;
+//# sourceMappingURL=deepMerge.d.ts.map

package/types/util/deepMerge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deepMerge.d.ts","sourceRoot":"","sources":["../../src/util/deepMerge.js"],"names":[],"mappings":"AAMO,kCAJI,MAAM,UACN,MAAM,GACJ,MAAM,CAkBlB"}

package/types/util/fetchRetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchRetry.d.ts","sourceRoot":"","sources":["../../src/util/fetchRetry.js"],"names":[],"mappings":"AAMA,yBAA0B,CAAC,CAAC;AAE5B;IACE;;;;;;OAMG;IACH,qBALW,MAAM,YACN,MAAM,GAAG,GAAG,GAAG,OAAO,gBACtB,WAAW,YACX,QAAQ,EAQlB;IAHC,iCAAwB;IACxB,0BAAgC;IAChC,mBAAwB;CAE3B;AASM,qCALI,MAAM,GAAG,GAAG,GAAG,OAAO,iBACtB,WAAW,iBACX;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;CAAC,GAC5D,OAAO,CAAC,QAAQ,CAAC,CA2C7B"}
+{"version":3,"file":"fetchRetry.d.ts","sourceRoot":"","sources":["../../src/util/fetchRetry.js"],"names":[],"mappings":"AAWA,yBAA0B,CAAC,CAAC;AAE5B;IACE;;;;;;OAMG;IACH,qBALW,MAAM,YACN,MAAM,GAAG,GAAG,GAAG,OAAO,gBACtB,WAAW,YACX,QAAQ,EAQlB;IAHC,iCAAwB;IACxB,0BAAgC;IAChC,mBAAwB;CAE3B;AASM,qCALI,MAAM,GAAG,GAAG,GAAG,OAAO,iBACtB,WAAW,iBACX;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;CAAC,GAC5D,OAAO,CAAC,QAAQ,CAAC,CA2C7B"}

package/types/util/serverDataToState.d.ts

@@ -0,0 +1,2 @@
+export function serverDataToState(data: {}): {};
+//# sourceMappingURL=serverDataToState.d.ts.map

package/types/util/serverDataToState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serverDataToState.d.ts","sourceRoot":"","sources":["../../src/util/serverDataToState.js"],"names":[],"mappings":"AAOO,wCAHI,EAAE,GACA,EAAE,CAiBd"}