@powfix/core-js 0.13.38 → 0.13.39

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

@@ -1,2 +1,2 @@
 export * from './HookUtils';
-export * from './SequelizeUtils';
+export { SequelizeUtils } from './sequelize-utils';

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

@@ -14,5 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SequelizeUtils = void 0;
 __exportStar(require("./HookUtils"), exports);
-__exportStar(require("./SequelizeUtils"), exports);
+var sequelize_utils_1 = require("./sequelize-utils");
+Object.defineProperty(exports, "SequelizeUtils", { enumerable: true, get: function () { return sequelize_utils_1.SequelizeUtils; } });

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

@@ -0,0 +1,9 @@
+import { ModelAttributeColumnOptions, WhereOptions } from "sequelize";
+import { Model, NonKnownUuidStringKeys, UuidColumnOptionsBase, UuidColumnOptionsForModel } from "./types";
+export declare class SequelizeUtils {
+    static decimal2Number(value: any): number | null | undefined;
+    static buildPrimaryUuidColumn: () => Partial<ModelAttributeColumnOptions>;
+    static buildUuidColumn<T extends Model, AdditionalKeys extends NonKnownUuidStringKeys<T> = never>(options: UuidColumnOptionsForModel<T, AdditionalKeys>): Partial<ModelAttributeColumnOptions>;
+    static buildUuidColumn(options: UuidColumnOptionsBase): Partial<ModelAttributeColumnOptions>;
+    static getNullableArrayFilter<T = undefined>(arr: (null | any)[]): WhereOptions<T>;
+}

package/dist/src/utils/nodejs/{SequelizeUtils.js → sequelize-utils/SequelizeUtils.js}

@@ -13,8 +13,8 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SequelizeUtils = void 0;
 const sequelize_1 = require("sequelize");
-const UuidUtils_1 = require("../UuidUtils");
-const constants_1 = require("../../constants");
+const UuidUtils_1 = require("../../UuidUtils");
+const constants_1 = require("../../../constants");
 class SequelizeUtils {
     static decimal2Number(value) {
         if (value === null || value === undefined) {
@@ -26,7 +26,7 @@ class SequelizeUtils {
         }
         return parsed;
     }
-    static getUuidColumn(options) {
+    static buildUuidColumn(options) {
         const { columnName } = options, overrideOptions = __rest(options, ["columnName"]);
         if (overrideOptions.allowNull) {
             return Object.assign({ type: "binary(16)", get() {
@@ -66,16 +66,10 @@ class SequelizeUtils {
     }
 }
 exports.SequelizeUtils = SequelizeUtils;
-SequelizeUtils.getPrimaryUuidColumn = () => ({
-    type: "binary(16)",
+SequelizeUtils.buildPrimaryUuidColumn = () => (Object.assign({}, SequelizeUtils.buildUuidColumn({
+    columnName: "uuid",
     allowNull: false,
     primaryKey: true,
     unique: true,
     defaultValue: () => UuidUtils_1.UuidUtils.toBuffer(UuidUtils_1.UuidUtils.v4()),
-    get() {
-        return UuidUtils_1.UuidUtils.toString(this.getDataValue("uuid"));
-    },
-    set(uuid) {
-        this.setDataValue("uuid", UuidUtils_1.UuidUtils.toBuffer(uuid));
-    }
-});
+})));

package/dist/src/utils/nodejs/sequelize-utils/index.d.ts

@@ -0,0 +1 @@
+export { SequelizeUtils } from './SequelizeUtils';

package/dist/src/utils/nodejs/sequelize-utils/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SequelizeUtils = void 0;
+var SequelizeUtils_1 = require("./SequelizeUtils");
+Object.defineProperty(exports, "SequelizeUtils", { enumerable: true, get: function () { return SequelizeUtils_1.SequelizeUtils; } });

package/dist/src/utils/nodejs/sequelize-utils/types.d.ts

@@ -0,0 +1,16 @@
+import { ModelAttributeColumnOptions } from "sequelize";
+export type Model = Record<string, any> | undefined;
+export type ExtractUuidKeys<T extends Model> = {
+    [Property in keyof T]: Property extends `${string}Uuid` | 'uuid' ? Property : never;
+}[keyof T];
+export type ExtractStringKeys<T extends Model> = {
+    [Property in keyof T]: string extends T[Property] ? Property : never;
+}[keyof T];
+export type ConcreteUuidKeys<T extends Model> = ExtractUuidKeys<T>;
+export type NonKnownUuidStringKeys<T extends Model> = Exclude<ExtractStringKeys<T>, ConcreteUuidKeys<T>> & string;
+export interface UuidColumnOptionsBase extends Omit<ModelAttributeColumnOptions, 'type'> {
+    columnName: string;
+}
+export interface UuidColumnOptionsForModel<T extends Model, AdditionalKeys extends string> extends Omit<ModelAttributeColumnOptions, 'type'> {
+    columnName: ConcreteUuidKeys<T> | AdditionalKeys;
+}

package/dist/src/utils/nodejs/sequelize-utils/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

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

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

@@ -1,23 +0,0 @@
-import { ModelAttributeColumnOptions, WhereOptions } from "sequelize";
-type Model = Record<string, any> | undefined;
-type GetIncludeKeyPatterns<T extends Model> = T extends {
-    _id: string;
-} ? `${string}Uuid` | 'uuid' : `${string}Uuid`;
-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 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 {};