@provis/provis-common-be-module 1.5.0 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -18,4 +18,5 @@ import loopBackward from "./loopBackward";
18
18
  import searchValue from "./searchValue";
19
19
  import readExcel from "./readExcel";
20
20
  import generateHashString from "./generateHashString";
21
- export { addDateTime, amountDescription, axiosGet, axiosPost, axiosPut, compareDiffObj, convertCurrencySymbol, convertDateTimeFormat, convertObjToNumber, convertToCurrency, filterObj, generateRelationId, getCurrentDate, getDiffValue, getObjByKeys, loop, loopBackward, searchValue, readExcel, generateHashString, };
21
+ import mergeObj from "./mergeObj";
22
+ export { addDateTime, amountDescription, axiosGet, axiosPost, axiosPut, compareDiffObj, convertCurrencySymbol, convertDateTimeFormat, convertObjToNumber, convertToCurrency, filterObj, generateRelationId, getCurrentDate, getDiffValue, getObjByKeys, loop, loopBackward, searchValue, readExcel, generateHashString, mergeObj, };
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.generateHashString = exports.readExcel = exports.searchValue = exports.loopBackward = exports.loop = exports.getObjByKeys = exports.getDiffValue = exports.getCurrentDate = exports.generateRelationId = exports.filterObj = exports.convertToCurrency = exports.convertObjToNumber = exports.convertDateTimeFormat = exports.convertCurrencySymbol = exports.compareDiffObj = exports.axiosPut = exports.axiosPost = exports.axiosGet = exports.amountDescription = exports.addDateTime = void 0;
3
+ exports.mergeObj = exports.generateHashString = exports.readExcel = exports.searchValue = exports.loopBackward = exports.loop = exports.getObjByKeys = exports.getDiffValue = exports.getCurrentDate = exports.generateRelationId = exports.filterObj = exports.convertToCurrency = exports.convertObjToNumber = exports.convertDateTimeFormat = exports.convertCurrencySymbol = exports.compareDiffObj = exports.axiosPut = exports.axiosPost = exports.axiosGet = exports.amountDescription = exports.addDateTime = void 0;
4
4
  const addDateTime_1 = require("./addDateTime");
5
5
  exports.addDateTime = addDateTime_1.default;
6
6
  const amountDescription_1 = require("./amountDescription");
@@ -41,3 +41,5 @@ const readExcel_1 = require("./readExcel");
41
41
  exports.readExcel = readExcel_1.default;
42
42
  const generateHashString_1 = require("./generateHashString");
43
43
  exports.generateHashString = generateHashString_1.default;
44
+ const mergeObj_1 = require("./mergeObj");
45
+ exports.mergeObj = mergeObj_1.default;
@@ -0,0 +1,2 @@
1
+ declare const _default: (obj1: any, obj2: any) => any;
2
+ export default _default;
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.default = (obj1, obj2) => {
4
+ const merged = Object.assign({}, obj1);
5
+ for (const key in obj2) {
6
+ if (merged[key]) {
7
+ // Combine arrays if the key exists in both objects
8
+ merged[key] = merged[key].concat(obj2[key]);
9
+ }
10
+ else {
11
+ // Add the new key and its value
12
+ merged[key] = obj2[key];
13
+ }
14
+ }
15
+ return merged;
16
+ };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@provis/provis-common-be-module",
3
- "version": "1.5.0",
3
+ "version": "1.6.0",
4
4
  "description": "This common module for Provis internal backend use lib",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {