@etsoo/shared 1.1.73 → 1.1.75

package/__tests__/DateUtils.ts

@@ -63,8 +63,14 @@ test('Tests for formatForInput', () => {
     const result3 = DateUtils.formatForInput(d, false);
     expect(result3).toBe('2021-06-06T20:08');
 
+    const result31 = DateUtils.formatForInput(d, 'date');
+    expect(result31).toBe('2021-06-06');
+
     const result4 = DateUtils.formatForInput(d, true);
     expect(result4).toBe('2021-06-06T20:08:45');
+
+    const result41 = DateUtils.formatForInput(d, 'datetime-local');
+    expect(result41).toBe('2021-06-06T20:08:45');
 });
 
 test('Tests for substract', () => {

package/__tests__/Utils.ts

@@ -56,7 +56,8 @@ test('Tests for getDataChanges', () => {
         amount: '',
         enabled: true,
         value: undefined,
-        ids: [1, 2]
+        ids: [1, 2],
+        data: { d1: 1, d2: false, d3: 1.2, d4: 'Hello' }
     };
     const initData = {
         id: 1,
@@ -66,7 +67,8 @@ test('Tests for getDataChanges', () => {
         price: 6,
         amount: 0,
         enabled: true,
-        ids: [1, 2]
+        ids: [1, 2],
+        data: { d1: 1, d3: 1.2, d4: 'Hello', d2: false }
     };
     const fields = Utils.getDataChanges(input, initData);
     expect(fields).toStrictEqual(['gender', 'brand', 'amount']);

package/lib/cjs/DataTypes.js

@@ -96,8 +96,11 @@ var DataTypes;
         }
         // Target type
         const targetType = getBasicNameByValue(target, false);
-        if (targetType == null)
+        if (targetType == null) {
+            if (typeof input === typeof target)
+                return input;
             return undefined;
+        }
         return convertByType(input, targetType);
     }
     DataTypes.convert = convert;

package/lib/cjs/DateUtils.d.ts

@@ -47,9 +47,9 @@ export declare namespace DateUtils {
     /**
      * Format to 'yyyy-MM-dd' or 'yyyy-MM-ddThh:mm:ss, especially used for date input min/max property
      * @param date Input date
-     * @param hasSecond 'undefined' for date only, 'false' for hour:minute only
+     * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
-    function formatForInput(date?: Date | string | null, hasSecond?: boolean): string;
+    function formatForInput(date?: Date | string | null, hasSecondOrType?: boolean | string): string;
     /**
      * Get month's days
      * @param year Year

package/lib/cjs/DateUtils.js

@@ -94,14 +94,19 @@ var DateUtils;
     /**
      * Format to 'yyyy-MM-dd' or 'yyyy-MM-ddThh:mm:ss, especially used for date input min/max property
      * @param date Input date
-     * @param hasSecond 'undefined' for date only, 'false' for hour:minute only
+     * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
-    function formatForInput(date, hasSecond) {
+    function formatForInput(date, hasSecondOrType) {
         // Parse string as date
         if (typeof date === 'string')
             date = new Date(date);
         // Default is now
         date !== null && date !== void 0 ? date : (date = new Date());
+        const hasSecond = typeof hasSecondOrType === 'string'
+            ? hasSecondOrType === 'date'
+                ? undefined
+                : true
+            : hasSecondOrType;
         // Parts
         const parts = [
             date.getFullYear(),

package/lib/cjs/Utils.js

@@ -8,9 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = void 0;
 const DataTypes_1 = require("./DataTypes");
+const lodash_isequal_1 = __importDefault(require("lodash.isequal"));
 String.prototype.format = function (...parameters) {
     let template = this;
     parameters.forEach((value, index) => {
@@ -139,9 +143,9 @@ var Utils;
                 return true;
             return v1 === v2;
         }
-        // For array and object
+        // For date, array and object
         if (typeof v1 === 'object')
-            return JSON.stringify(v1) === JSON.stringify(v2);
+            return (0, lodash_isequal_1.default)(v1, v2);
         // 1 and '1' case
         if (strict === 0)
             return v1 == v2;

package/lib/mjs/DataTypes.js

@@ -93,8 +93,11 @@ export var DataTypes;
         }
         // Target type
         const targetType = getBasicNameByValue(target, false);
-        if (targetType == null)
+        if (targetType == null) {
+            if (typeof input === typeof target)
+                return input;
             return undefined;
+        }
         return convertByType(input, targetType);
     }
     DataTypes.convert = convert;

package/lib/mjs/DateUtils.d.ts

@@ -47,9 +47,9 @@ export declare namespace DateUtils {
     /**
      * Format to 'yyyy-MM-dd' or 'yyyy-MM-ddThh:mm:ss, especially used for date input min/max property
      * @param date Input date
-     * @param hasSecond 'undefined' for date only, 'false' for hour:minute only
+     * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
-    function formatForInput(date?: Date | string | null, hasSecond?: boolean): string;
+    function formatForInput(date?: Date | string | null, hasSecondOrType?: boolean | string): string;
     /**
      * Get month's days
      * @param year Year

package/lib/mjs/DateUtils.js

@@ -91,14 +91,19 @@ export var DateUtils;
     /**
      * Format to 'yyyy-MM-dd' or 'yyyy-MM-ddThh:mm:ss, especially used for date input min/max property
      * @param date Input date
-     * @param hasSecond 'undefined' for date only, 'false' for hour:minute only
+     * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
-    function formatForInput(date, hasSecond) {
+    function formatForInput(date, hasSecondOrType) {
         // Parse string as date
         if (typeof date === 'string')
             date = new Date(date);
         // Default is now
         date !== null && date !== void 0 ? date : (date = new Date());
+        const hasSecond = typeof hasSecondOrType === 'string'
+            ? hasSecondOrType === 'date'
+                ? undefined
+                : true
+            : hasSecondOrType;
         // Parts
         const parts = [
             date.getFullYear(),

package/lib/mjs/Utils.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { DataTypes } from './DataTypes';
+import isEqual from 'lodash.isequal';
 String.prototype.format = function (...parameters) {
     let template = this;
     parameters.forEach((value, index) => {
@@ -136,9 +137,9 @@ export var Utils;
                 return true;
             return v1 === v2;
         }
-        // For array and object
+        // For date, array and object
         if (typeof v1 === 'object')
-            return JSON.stringify(v1) === JSON.stringify(v2);
+            return isEqual(v1, v2);
         // 1 and '1' case
         if (strict === 0)
             return v1 == v2;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.73",
+    "version": "1.1.75",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -55,14 +55,18 @@
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "devDependencies": {
         "@types/jest": "^29.2.2",
+        "@types/lodash.isequal": "^4.5.6",
         "@typescript-eslint/eslint-plugin": "^5.42.1",
         "@typescript-eslint/parser": "^5.42.1",
         "eslint": "^8.27.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
-        "jest": "^29.3.0",
-        "jest-environment-jsdom": "^29.3.0",
+        "jest": "^29.3.1",
+        "jest-environment-jsdom": "^29.3.1",
         "ts-jest": "^29.0.3",
         "typescript": "^4.8.4"
+    },
+    "dependencies": {
+        "lodash.isequal": "^4.5.0"
     }
 }

package/src/DataTypes.ts

@@ -340,8 +340,11 @@ export namespace DataTypes {
 
         // Target type
         const targetType = getBasicNameByValue(target, false);
-        if (targetType == null) return undefined;
-        return <any>convertByType(input, targetType);
+        if (targetType == null) {
+            if (typeof input === typeof target) return <T>input;
+            return undefined;
+        }
+        return <T>convertByType(input, targetType);
     }
 
     /**

package/src/DateUtils.ts

@@ -147,11 +147,11 @@ export namespace DateUtils {
     /**
      * Format to 'yyyy-MM-dd' or 'yyyy-MM-ddThh:mm:ss, especially used for date input min/max property
      * @param date Input date
-     * @param hasSecond 'undefined' for date only, 'false' for hour:minute only
+     * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
     export function formatForInput(
         date?: Date | string | null,
-        hasSecond?: boolean
+        hasSecondOrType?: boolean | string
     ) {
         // Parse string as date
         if (typeof date === 'string') date = new Date(date);
@@ -159,6 +159,13 @@ export namespace DateUtils {
         // Default is now
         date ??= new Date();
 
+        const hasSecond =
+            typeof hasSecondOrType === 'string'
+                ? hasSecondOrType === 'date'
+                    ? undefined
+                    : true
+                : hasSecondOrType;
+
         // Parts
         const parts = [
             date.getFullYear(),

package/src/Utils.ts

@@ -1,4 +1,5 @@
 import { DataTypes } from './DataTypes';
+import isEqual from 'lodash.isequal';
 
 declare global {
     interface String {
@@ -200,9 +201,8 @@ export namespace Utils {
             return v1 === v2;
         }
 
-        // For array and object
-        if (typeof v1 === 'object')
-            return JSON.stringify(v1) === JSON.stringify(v2);
+        // For date, array and object
+        if (typeof v1 === 'object') return isEqual(v1, v2);
 
         // 1 and '1' case
         if (strict === 0) return v1 == v2;