@powfix/core-js 0.13.27 → 0.13.29

package/dist/src/utils/nodejs/SequelizeUtils.d.ts

@@ -1,38 +1,23 @@
 import { ModelAttributeColumnOptions, WhereOptions } from "sequelize";
-interface UuidColumnOptions<Model> extends Omit<ModelAttributeColumnOptions, 'type'> {
-    columnName: Model extends undefined ? string : UuidKeys<Model>;
-}
-type GetIncludeKeyPatterns<Model> = Model extends {
+type Model = Record<string, any> | undefined;
+type GetIncludeKeyPatterns<T extends Model> = T extends {
     _id: string;
 } ? `${string}Uuid` | 'uuid' : `${string}Uuid`;
-/**
- * Extracts keys from a type `Model` that end with "Uuid".
- * It also includes any keys provided in the optional type `CustomKeys`.
- * @template Model The type to extract keys from.
- * @template CustomKeys An optional type representing additional keys to include. Defaults to `never`.
- */
-type ExtractUuidKeys<Model, CustomKeys = never> = {
-    [Property in keyof Model]: Property extends GetIncludeKeyPatterns<Model> ? Property : never;
-}[keyof Model] | CustomKeys;
-type ExtractAdditionalKeys<Model> = {
-    [Property in keyof Model]: Property extends GetIncludeKeyPatterns<Model> ? never : Model[Property] extends string | null ? Property : never;
-}[keyof Model];
-/**
- * Extracts all UUID-related keys from a `Model`, including those within related objects.
- * It first ensures all properties of the `Model` are required, then it flattens the UUID keys of related objects
- * using `InjectRelationKeys` and finally extracts the keys ending with "Uuid" using `ExtractKeys`.
- * It also includes any keys provided in the optional `AdditionalKeys` type.
- * @template Model The main model type.
- */
-export type UuidKeys<Model> = ExtractUuidKeys<Model>;
+type ExtractUuidKeys<T extends Model> = {
+    [Property in keyof T]: Property extends GetIncludeKeyPatterns<T> ? Property : never;
+}[keyof T];
+type ConcreteUuidKeys<T extends Record<string, any>> = ExtractUuidKeys<T>;
+interface UuidColumnOptionsBase extends Omit<ModelAttributeColumnOptions, 'type'> {
+    columnName: string;
+}
+interface UuidColumnOptionsForModel<T extends Record<string, any>> extends Omit<ModelAttributeColumnOptions, 'type'> {
+    columnName: ConcreteUuidKeys<T>;
+}
 export declare class SequelizeUtils {
     static decimal2Number(value: any): number | null | undefined;
     static getPrimaryUuidColumn: () => Partial<ModelAttributeColumnOptions>;
-    static getForeignUuidColumn: <Model = never, AdditionalKeys extends Exclude<ExtractAdditionalKeys<Model>, UuidKeys<Model>> = never>({ columnName, allowNull }: {
-        columnName: Model extends undefined ? string : (UuidKeys<Model> | AdditionalKeys);
-        allowNull: boolean;
-    }) => Partial<ModelAttributeColumnOptions>;
-    static getUuidColumn: <Model = undefined>({ columnName, ...overrideOptions }: UuidColumnOptions<Model>) => Partial<ModelAttributeColumnOptions>;
+    static getUuidColumn<T extends Record<string, any>>(options: UuidColumnOptionsForModel<T>): Partial<ModelAttributeColumnOptions>;
+    static getUuidColumn(options: UuidColumnOptionsBase): Partial<ModelAttributeColumnOptions>;
     static getNullableArrayFilter<T = undefined>(arr: (null | any)[]): WhereOptions<T>;
 }
 export {};

package/dist/src/utils/nodejs/SequelizeUtils.js

@@ -26,6 +26,29 @@ class SequelizeUtils {
         }
         return parsed;
     }
+    static getUuidColumn(options) {
+        const { columnName } = options, overrideOptions = __rest(options, ["columnName"]);
+        if (overrideOptions.allowNull) {
+            return Object.assign({ type: "binary(16)", get() {
+                    const value = this.getDataValue(columnName);
+                    if (value === null) {
+                        return value;
+                    }
+                    return UuidUtils_1.UuidUtils.toString(this.getDataValue(columnName));
+                },
+                set(uuid) {
+                    this.setDataValue(columnName, uuid === null ? null : UuidUtils_1.UuidUtils.toBuffer(uuid));
+                } }, overrideOptions);
+        }
+        else {
+            return Object.assign({ type: "binary(16)", get() {
+                    return UuidUtils_1.UuidUtils.toString(this.getDataValue(columnName));
+                },
+                set(uuid) {
+                    this.setDataValue(columnName, UuidUtils_1.UuidUtils.toBuffer(uuid));
+                } }, overrideOptions);
+        }
+    }
     static getNullableArrayFilter(arr) {
         return {
             [sequelize_1.Op.or]: arr.map(value => {
@@ -56,56 +79,3 @@ SequelizeUtils.getPrimaryUuidColumn = () => ({
         this.setDataValue("uuid", UuidUtils_1.UuidUtils.toBuffer(uuid));
     }
 });
-SequelizeUtils.getForeignUuidColumn = ({ columnName, allowNull }) => {
-    if (allowNull) {
-        return {
-            type: "binary(16)",
-            allowNull,
-            get() {
-                const value = this.getDataValue(columnName);
-                if (value === null) {
-                    return value;
-                }
-                return UuidUtils_1.UuidUtils.toString(this.getDataValue(columnName));
-            },
-            set(uuid) {
-                this.setDataValue(columnName, uuid === null ? null : UuidUtils_1.UuidUtils.toBuffer(uuid));
-            }
-        };
-    }
-    else {
-        return {
-            type: "binary(16)",
-            allowNull,
-            get() {
-                return UuidUtils_1.UuidUtils.toString(this.getDataValue(columnName));
-            },
-            set(uuid) {
-                this.setDataValue(columnName, UuidUtils_1.UuidUtils.toBuffer(uuid));
-            }
-        };
-    }
-};
-SequelizeUtils.getUuidColumn = (_a) => {
-    var { columnName } = _a, overrideOptions = __rest(_a, ["columnName"]);
-    if (overrideOptions.allowNull) {
-        return Object.assign({ type: "binary(16)", get() {
-                const value = this.getDataValue(columnName);
-                if (value === null) {
-                    return value;
-                }
-                return UuidUtils_1.UuidUtils.toString(this.getDataValue(columnName));
-            },
-            set(uuid) {
-                this.setDataValue(columnName, uuid === null ? null : UuidUtils_1.UuidUtils.toBuffer(uuid));
-            } }, overrideOptions);
-    }
-    else {
-        return Object.assign({ type: "binary(16)", get() {
-                return UuidUtils_1.UuidUtils.toString(this.getDataValue(columnName));
-            },
-            set(uuid) {
-                this.setDataValue(columnName, UuidUtils_1.UuidUtils.toBuffer(uuid));
-            } }, overrideOptions);
-    }
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powfix/core-js",
-  "version": "0.13.27",
+  "version": "0.13.29",
   "description": "core package",
   "author": "Kwon Kyung-Min <powfix@gmail.com>",
   "private": false,