@etsoo/react 1.8.9 → 1.8.11

package/__tests__/GridLoader.ts

@@ -0,0 +1,55 @@
+import { DataTypes } from "@etsoo/shared";
+import {
+  GridDataGetData,
+  GridTemplateType
+} from "../src/components/GridLoader";
+
+const template = {
+  keyword: "string",
+  deviceId: "number",
+  creationStart: "date",
+  creationEnd: "date"
+} as const satisfies DataTypes.BasicTemplate;
+
+test("Tests for GridTemplateType", () => {
+  const data: GridTemplateType<typeof template> = {
+    keyword: "test",
+    deviceId: 1,
+    creationStart: new Date()
+  };
+
+  expect(data.keyword).toBe("test");
+  expect(data.deviceId).toBe(1);
+});
+
+test("Tests for GridDataGetData with keeping source", () => {
+  const data = {
+    keyword: "test",
+    deviceId: 1,
+    creationStart: "2024/12/06",
+    other: false
+  };
+
+  const result = GridDataGetData(data, template, true);
+
+  expect(result.keyword).toBe("test");
+  expect(result.deviceId).toBe(1);
+  expect(result.creationStart).toBeInstanceOf(Date);
+  expect((result as any).other).toBe(false);
+});
+
+test("Tests for GridDataGetData without keeping source", () => {
+  const data = {
+    keyword: "test",
+    deviceId: 1,
+    creationStart: "2024/12/06",
+    other: false
+  };
+
+  const result = GridDataGetData(data, template, false);
+
+  expect(result.keyword).toBe("test");
+  expect(result.deviceId).toBe(1);
+  expect(result.creationStart).toBeInstanceOf(Date);
+  expect((result as any).other).toBeUndefined();
+});

package/lib/components/GridLoader.d.ts

@@ -14,18 +14,28 @@ export declare const GridSizeGet: (size: GridSize, input: number) => number;
  * Grid data type
  */
 export type GridData = FormData | DataTypes.StringRecord;
+/**
+ * Grid template type
+ */
+export type GridTemplateType<T> = DataTypes.BasicTemplateType<{
+    [k in keyof T]: T[k] extends "date" ? "date" | "string" : T[k] extends DataTypes.BasicNames ? T[k] : never;
+}>;
 /**
  * Grid data get with format
  * @param data Data
+ * @param template Template
+ * @param keepSource Keep source data
  * @returns Json data
  */
-export declare function GridDataGet<F extends DataTypes.BasicTemplate>(props: GridLoadDataProps, template?: F): GridJsonData & DataTypes.BasicTemplateType<F>;
+export declare function GridDataGet<const T>(props: GridLoadDataProps, template?: T, keepSource?: boolean): GridJsonData & GridTemplateType<T>;
 /**
  * Grid data get with format
  * @param data Data
+ * @param template Template
+ * @param keepSource Keep source data
  * @returns Json data
  */
-export declare function GridDataGetData<F extends DataTypes.BasicTemplate>(data?: GridData, template?: F): DataTypes.BasicTemplateType<F>;
+export declare function GridDataGetData<const T>(data?: GridData, template?: T, keepSource?: boolean): GridTemplateType<T>;
 /**
  * Grid Json data
  */

package/lib/components/GridLoader.js

@@ -12,25 +12,32 @@ export const GridSizeGet = (size, input) => {
 /**
  * Grid data get with format
  * @param data Data
+ * @param template Template
+ * @param keepSource Keep source data
  * @returns Json data
  */
-export function GridDataGet(props, template) {
+export function GridDataGet(props, template, keepSource) {
     // Destruct
     const { data, ...rest } = props;
     // DomUtils.dataAs(data, template);
-    return { ...GridDataGetData(data, template), ...rest };
+    return { ...GridDataGetData(data, template, keepSource), ...rest };
 }
 /**
  * Grid data get with format
  * @param data Data
+ * @param template Template
+ * @param keepSource Keep source data
  * @returns Json data
  */
-export function GridDataGetData(data, template) {
+export function GridDataGetData(data, template, keepSource) {
     // Clear form empty value
     if (data instanceof FormData) {
         DomUtils.clearFormData(data);
     }
     // Conditions
-    const conditions = data == null ? {} : DomUtils.dataAs(data, template ?? {}, true); // Set keepSource to true to hold form data, even they are invisible from the conditions
+    // Set keepSource to true to hold form data, even they are invisible from the conditions
+    const conditions = data == null
+        ? {}
+        : DomUtils.dataAs(data, template, keepSource);
     return conditions;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/react",
-  "version": "1.8.9",
+  "version": "1.8.11",
   "description": "TypeScript ReactJs UI Independent Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/components/GridLoader.ts

@@ -21,41 +21,61 @@ export const GridSizeGet = (size: GridSize, input: number) => {
  */
 export type GridData = FormData | DataTypes.StringRecord;
 
+/**
+ * Grid template type
+ */
+export type GridTemplateType<T> = DataTypes.BasicTemplateType<{
+  [k in keyof T]: T[k] extends "date"
+    ? "date" | "string"
+    : T[k] extends DataTypes.BasicNames
+    ? T[k]
+    : never;
+}>;
+
 /**
  * Grid data get with format
  * @param data Data
+ * @param template Template
+ * @param keepSource Keep source data
  * @returns Json data
  */
-export function GridDataGet<F extends DataTypes.BasicTemplate>(
+export function GridDataGet<const T>(
   props: GridLoadDataProps,
-  template?: F
-): GridJsonData & DataTypes.BasicTemplateType<F> {
+  template?: T,
+  keepSource?: boolean
+): GridJsonData & GridTemplateType<T> {
   // Destruct
   const { data, ...rest } = props;
 
   // DomUtils.dataAs(data, template);
-  return { ...GridDataGetData(data, template), ...rest };
+  return { ...GridDataGetData<T>(data, template, keepSource), ...rest };
 }
 
 /**
  * Grid data get with format
  * @param data Data
+ * @param template Template
+ * @param keepSource Keep source data
  * @returns Json data
  */
-export function GridDataGetData<F extends DataTypes.BasicTemplate>(
+export function GridDataGetData<const T>(
   data?: GridData,
-  template?: F
-): DataTypes.BasicTemplateType<F> {
+  template?: T,
+  keepSource?: boolean
+): GridTemplateType<T> {
   // Clear form empty value
   if (data instanceof FormData) {
     DomUtils.clearFormData(data);
   }
 
   // Conditions
-  const conditions: DataTypes.BasicTemplateType<F> =
-    data == null ? {} : DomUtils.dataAs(data, template ?? {}, true); // Set keepSource to true to hold form data, even they are invisible from the conditions
+  // Set keepSource to true to hold form data, even they are invisible from the conditions
+  const conditions =
+    data == null
+      ? {}
+      : DomUtils.dataAs(data, template as DataTypes.BasicTemplate, keepSource);
 
-  return conditions;
+  return conditions as any;
 }
 
 /**