feat: jqValidateForm에 Values Type 지정

hwe/ts/util/convertFormData.ts

@@ -3,7 +3,7 @@ import { isArray, isString, isNumber, isBoolean } from "lodash";
 export function convertFormData(values: Record<string, null|number[]|string[]|boolean[]|number|string|boolean>): FormData{
     const formData = new FormData();
 
-    const simpleConv = (v: unknown):string=>{
+    const simpleConv = (v: unknown, key: string):string=>{
         if(isString(v)){
             return v;
         }
@@ -16,19 +16,19 @@ export function convertFormData(values: Record<string, null|number[]|string[]|bo
         if(v===null){
             return '';
         }
-        throw new TypeError('지원하지 않는 formData Type');
+        throw new TypeError(`지원하지 않는 formData Type: ${key}`);
     }
 
     for(const [key, value] of Object.entries(values)){
         if(isArray(value)){
             const arrKey = `${key}[]`;
             for(const subValue of value){
-                formData.append(arrKey, simpleConv(subValue));
+                formData.append(arrKey, simpleConv(subValue, key));
             }
             continue;
         }
 
-        formData.append(key, simpleConv(value));
+        formData.append(key, simpleConv(value, key));
     }
 
     return formData;

hwe/ts/util/jqValidateForm.ts

@@ -1,4 +1,4 @@
-import Schema, { Rules, Values } from "async-validator";
+import Schema, { Rule, Values } from "async-validator";
 import { isArray } from "lodash";
 import { mergeKVArray } from "./mergeKVArray";
 import $ from 'jquery';
@@ -8,10 +8,17 @@ type Option = {
     postParse?: (values:Record<string, string | string[]>, $target?: JQuery<HTMLElement>)=>[Record<string, string | string[]>, Map<string, string>]
 }
 
-export class JQValidateForm {
+type DefaultFormDataType = Record<string, null|number[]|string[]|boolean[]|number|string|boolean>;
+
+export type NamedRules<T extends Record<string, unknown>> = {
+    [v in keyof T]: Rule
+}
+
+export class JQValidateForm<TypedValue extends Values = DefaultFormDataType> {
+
     public readonly validator: Schema;
     public readonly inputs: JQuery<HTMLElement>;
-    constructor(public readonly target: JQuery<HTMLElement>, public readonly rule: Rules, public readonly option?:Option) {
+    constructor(public readonly target: JQuery<HTMLElement>, public readonly rule: NamedRules<TypedValue>, public readonly option?:Option) {
         this.validator = new Schema(rule);
         this.inputs = target.find(':input');
     }
@@ -29,7 +36,7 @@ export class JQValidateForm {
         return this;
     }
 
-    public async validate(): Promise<undefined | Values> {
+    public async validate(): Promise<undefined | TypedValue> {
         if(this.option?.preParse !== undefined){
             this.option.preParse(this.target);
         }
@@ -106,6 +113,6 @@ export class JQValidateForm {
         }
         this.clearErrMsg();
         this.inputs.addClass('is-valid');
-        return validateResult;
+        return validateResult as TypedValue;
     }
 }

hwe/ts/util/mb_strimwidth.ts

@@ -0,0 +1,31 @@
+import { mb_strwidth } from "./mb_strwidth";
+
+/**
+ * mb_strimwidth
+ * @param String
+ * @param int
+ * @param int
+ * @param String
+ * @return String
+ * @see http://www.php.net/manual/function.mb-strimwidth.php
+ */
+export function mb_strimwidth(str: string, start: number, width: number, trimmarker = ''): string {
+    const trimmakerWidth = mb_strwidth(trimmarker);
+    const l = str.length;
+    let trimmedLength = 0;
+    const trimmedStr: string[] = [];
+    for (let i = start; i < l; i++) {
+        const c = str.charAt(i);
+        const charWidth = mb_strwidth(c);
+        const next = str.charAt(i + 1);
+        const nextWidth = mb_strwidth(next);
+
+        trimmedLength += charWidth;
+        trimmedStr.push(c);
+        if (trimmedLength + trimmakerWidth + nextWidth > width) {
+            trimmedStr.push(trimmarker);
+            break;
+        }
+    }
+    return trimmedStr.join('');
+}

hwe/ts/util/mb_strwidth.ts

@@ -0,0 +1,25 @@
+//TODO: X-Requested-With 믿지 말자.
+//https://gist.github.com/demouth/3217440
+/**
+ * mb_strwidth
+ * @see http://php.net/manual/function.mb-strwidth.php
+ */
+export function mb_strwidth(str: string): number {
+    const l = str.length;
+    let length = 0;
+    for (let i = 0; i < l; i++) {
+        const c = str.charCodeAt(i);
+        if (0x0000 <= c && c <= 0x0019) {
+            length += 0;
+        } else if (0x0020 <= c && c <= 0x1FFF) {
+            length += 1;
+        } else if (0x2000 <= c && c <= 0xFF60) {
+            length += 2;
+        } else if (0xFF61 <= c && c <= 0xFF9F) {
+            length += 1;
+        } else if (0xFFA0 <= c) {
+            length += 2;
+        }
+    }
+    return length;
+}