pg-mvc-service 2.0.99 → 2.0.100

package/dist/models/SqlUtils/WhereExpression.js

@@ -375,17 +375,24 @@ class WhereExpression {
      */
     static makeSqlNormalizeCharVariants(expression, replaceOption) {
         var _a;
-        if (replaceOption.numeric === true) {
+        if (replaceOption === true) {
+            replaceOption = {
+                halfToFull: true,
+                hiraganaToKatakana: true,
+                numeric: true
+            };
+        }
+        if ((replaceOption === null || replaceOption === void 0 ? void 0 : replaceOption.numeric) === true) {
             replaceOption.numeric = {
                 japanese: true
             };
         }
         const objs = {};
-        if (replaceOption.hiraganaToKatakana === true) {
+        if ((replaceOption === null || replaceOption === void 0 ? void 0 : replaceOption.hiraganaToKatakana) === true) {
             objs['あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをんゔがぎぐげござじずぜぞだぢづでどばびぶべぼぱぴぷぺぽぁぃぅぇぉゃゅょっー、。・「」゛゜']
                 = 'アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲンヴガギグゲゴザジズゼゾダヂヅデドバビブベボパピプペポァィゥェォャュョッー、。・「」゛゜';
         }
-        if (((_a = replaceOption.numeric) === null || _a === void 0 ? void 0 : _a.japanese) === true) {
+        if (((_a = replaceOption === null || replaceOption === void 0 ? void 0 : replaceOption.numeric) === null || _a === void 0 ? void 0 : _a.japanese) === true) {
             objs['零〇'] = '00';
             objs['一壱弌'] = '111';
             objs['二弐'] = '22';
@@ -397,7 +404,7 @@ class WhereExpression {
             objs['八捌'] = '88';
             objs['九玖'] = '99';
         }
-        if (replaceOption.halfToFull === true) {
+        if ((replaceOption === null || replaceOption === void 0 ? void 0 : replaceOption.halfToFull) === true) {
             objs['０１２３４５６７８９'] = '0123456789';
             objs['アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲンヴガギグゲゴザジズゼゾダヂヅデドバビブベボパピプペポァィゥェォャュョッー、。・「」゛゜']
                 = 'ｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜｦﾝｳﾞｶﾞｷﾞｸﾞｹﾞｺﾞｻﾞｼﾞｽﾞｾﾞｿﾞﾀﾞﾁﾞﾂﾞﾃﾞﾄﾞﾊﾊﾋﾞﾌﾞﾍﾞﾎﾞﾊﾟﾋﾟﾌﾟﾍﾟﾎﾟｧｨｩｪｫｬｭｮｯｰ､｡･｢｣ ﾞ ﾟ';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-mvc-service",
-  "version": "2.0.99",
+  "version": "2.0.100",
   "description": "",
   "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
   "bugs": {

package/src/models/SqlUtils/WhereExpression.ts

@@ -405,23 +405,31 @@ export default class WhereExpression {
      * @param {string} columnName Column name
      * @returns SQL statement
      */
-    public static makeSqlNormalizeCharVariants(expression: string, replaceOption: {
+    public static makeSqlNormalizeCharVariants(expression: string, replaceOption?: true | {
         halfToFull?: boolean; hiraganaToKatakana?: boolean; 
         numeric?: true | { japanese?: boolean; }
     }) {
-        if (replaceOption.numeric === true) {
+        if (replaceOption === true) {
+            replaceOption = {
+                halfToFull: true,
+                hiraganaToKatakana: true,
+                numeric: true
+            }
+        }
+
+        if (replaceOption?.numeric === true) {
             replaceOption.numeric = {
                 japanese: true
             }
         }
 
         const objs: { [key: string]: string } = {}
-        if (replaceOption.hiraganaToKatakana === true) {
+        if (replaceOption?.hiraganaToKatakana === true) {
             objs['あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをんゔがぎぐげござじずぜぞだぢづでどばびぶべぼぱぴぷぺぽぁぃぅぇぉゃゅょっー、。・「」゛゜']
                 = 'アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲンヴガギグゲゴザジズゼゾダヂヅデドバビブベボパピプペポァィゥェォャュョッー、。・「」゛゜';
         }
 
-        if (replaceOption.numeric?.japanese === true) {
+        if (replaceOption?.numeric?.japanese === true) {
             objs['零〇'] = '00';
             objs['一壱弌'] = '111';
             objs['二弐'] = '22';
@@ -434,7 +442,7 @@ export default class WhereExpression {
             objs['九玖'] = '99';
         }
 
-        if (replaceOption.halfToFull === true) {
+        if (replaceOption?.halfToFull === true) {
             objs['０１２３４５６７８９'] = '0123456789';
             objs['アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲンヴガギグゲゴザジズゼゾダヂヅデドバビブベボパピプペポァィゥェォャュョッー、。・「」゛゜'] 
                 = 'ｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜｦﾝｳﾞｶﾞｷﾞｸﾞｹﾞｺﾞｻﾞｼﾞｽﾞｾﾞｿﾞﾀﾞﾁﾞﾂﾞﾃﾞﾄﾞﾊﾊﾋﾞﾌﾞﾍﾞﾎﾞﾊﾟﾋﾟﾌﾟﾍﾟﾎﾟｧｨｩｪｫｬｭｮｯｰ､｡･｢｣ ﾞ ﾟ';