pg-mvc-service 2.0.0 → 2.0.2

package/dist/clients/StringClient.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StringClient = void 0;
 const crypto_1 = require("crypto");
+const StringUtil_1 = __importDefault(require("../Utils/StringUtil"));
 class StringClient {
     constructor() { }
     generateUUIDv7() {
@@ -10,5 +14,8 @@ class StringClient {
         const randomHex = (0, crypto_1.randomBytes)(8).toString('hex');
         return `${timeHex.slice(0, 8)}-${timeHex.slice(8, 12)}-7${timeHex.slice(13, 16)}-${randomHex.slice(0, 4)}-${randomHex.slice(4)}`;
     }
+    isUUID(value) {
+        return StringUtil_1.default.isUUID(value);
+    }
 }
 exports.StringClient = StringClient;

package/dist/models/SqlUtils/SelectExpression.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const StringUtil_1 = __importDefault(require("../Utils/StringUtil"));
+const StringUtil_1 = __importDefault(require("../../Utils/StringUtil"));
 class SelectExpression {
     /**
      * 指定されたカラム情報と関数を使用して、SQLのSELECT文を作成します。

package/dist/models/SqlUtils/ValidateValueUtil.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const DateTimeUtil_1 = __importDefault(require("../Utils/DateTimeUtil"));
-const StringUtil_1 = __importDefault(require("../Utils/StringUtil"));
+const DateTimeUtil_1 = __importDefault(require("../../Utils/DateTimeUtil"));
+const StringUtil_1 = __importDefault(require("../../Utils/StringUtil"));
 class ValidateValueUtil {
     static validateId(columns, id) {
         if ('id' in columns === false) {

package/dist/models/TableDoc.js

@@ -266,7 +266,7 @@ td:nth-child(11) {
                     <td>${((_d = column.comment) !== null && _d !== void 0 ? _d : '').replace('\n', '<br>')}</td>
                     <td>
                         ${column.attribute === "primary" ? `` : `
-                        <button onclick="${addFuncName}()">Copy add column</button>
+                        <button onclick="${addFuncName}()">Copy add column</button><br>
                         <button onclick="${dropFuncName}()">Copy drop column</button>
                         `}
                     </td>

package/dist/models/TableModel.js

@@ -60,7 +60,12 @@ class TableModel {
     get createSqlFromJoinWhere() {
         let sql = ` FROM ${this.TableName} as "${this.TableAlias}"`;
         for (const join of this.joinConditions) {
-            sql += join.type === 'left' ? ' LEFT OUTER JOIN' : ' INNER JOIN';
+            const joins = {
+                inner: ' INNER JOIN',
+                left: ' LEFT OUTER JOIN',
+                full: ' FULL OUTER JOIN',
+            };
+            sql += joins[join.type];
             sql += ` ${join.model.TableName} as "${join.model.TableAlias}" ON `;
             const query = WhereExpression_1.default.createCondition(join.conditions, this, this.vars.length + 1);
             sql += query.expression;

package/dist/reqestResponse/ReqResType.js

@@ -114,19 +114,6 @@ class ReqResType {
                 return false;
         }
     }
-    /**
-     * Validates if the given value is a valid UUID
-     * 与えられた値が有効なUUIDであるかどうかを検証します
-     * @param value - The value to be validated, 検証する値
-     * @returns {boolean} - Whether the value is a valid UUID, 値が有効なUUIDであるかどうか
-     */
-    isUUID(value) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-        const pattern = new RegExp('^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$');
-        return pattern.test(value);
-    }
     /**
      * 値がメールアドレス形式であるかどうかを検証します
      * Validates if the given value is in the format of an email address

package/dist/reqestResponse/RequestType.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestType = void 0;
 const ReqResType_1 = __importDefault(require("./ReqResType"));
 const Exception_1 = require("../exceptions/Exception");
+const StringUtil_1 = __importDefault(require("../Utils/StringUtil"));
 class RequestType extends ReqResType_1.default {
     constructor() {
         super(...arguments);
@@ -525,7 +526,7 @@ class RequestType extends ReqResType_1.default {
                 }
             case 'uuid':
             case 'uuid?':
-                if (this.isUUID(value)) {
+                if (StringUtil_1.default.isUUID(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "UUID_21" : "UUID_91", keys, value);

package/dist/reqestResponse/ResponseType.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResponseType = void 0;
+const StringUtil_1 = __importDefault(require("../Utils/StringUtil"));
 const ReqResType_1 = __importDefault(require("./ReqResType"));
 class ResponseType extends ReqResType_1.default {
     constructor() {
@@ -203,7 +204,7 @@ class ResponseType extends ReqResType_1.default {
                 }
             case 'uuid':
             case 'uuid?':
-                if (this.isUUID(value)) {
+                if (StringUtil_1.default.isUUID(value)) {
                     return value;
                 }
                 return undefined;

package/package.json

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

package/src/clients/StringClient.ts

@@ -1,4 +1,5 @@
 import { randomBytes } from 'crypto';
+import StringUtil from '../Utils/StringUtil';
 
 export class StringClient {
     constructor() { }
@@ -11,4 +12,8 @@ export class StringClient {
     
         return `${timeHex.slice(0, 8)}-${timeHex.slice(8, 12)}-7${timeHex.slice(13, 16)}-${randomHex.slice(0, 4)}-${randomHex.slice(4)}`;
     }
+
+    public isUUID(value: any) {
+        return StringUtil.isUUID(value);
+    }
 }

package/src/models/SqlUtils/SelectExpression.ts

@@ -1,6 +1,6 @@
 import { TableModel } from "../TableModel";
 import { TAggregateFuncType, TColumnInfo, TKeyFormat } from "../Type";
-import StringUtil from "../Utils/StringUtil";
+import StringUtil from "../../Utils/StringUtil";
 
 export default class SelectExpression {
 

package/src/models/SqlUtils/ValidateValueUtil.ts

@@ -1,6 +1,6 @@
 import { TColumn, TColumnArrayType, TColumnType } from "../Type";
-import DateTimeUtil from "../Utils/DateTimeUtil";
-import StringUtil from "../Utils/StringUtil";
+import DateTimeUtil from "../../Utils/DateTimeUtil";
+import StringUtil from "../../Utils/StringUtil";
 
 export default class ValidateValueUtil {
     

package/src/models/TableDoc.ts

@@ -271,7 +271,7 @@ td:nth-child(11) {
                     <td>${(column.comment ?? '').replace('\n', '<br>')}</td>
                     <td>
                         ${column.attribute === "primary" ? `` : `
-                        <button onclick="${addFuncName}()">Copy add column</button>
+                        <button onclick="${addFuncName}()">Copy add column</button><br>
                         <button onclick="${dropFuncName}()">Copy drop column</button>
                         `}
                     </td>

package/src/models/TableModel.ts

@@ -70,7 +70,7 @@ export class TableModel {
 
     private selectExpressions: Array<string> = [];
     private joinConditions: Array<{
-        type: 'inner' | 'left',
+        type: 'inner' | 'left' | 'full',
         model: TableModel,
         conditions: Array<TNestedCondition>
     }> = [];
@@ -83,7 +83,12 @@ export class TableModel {
         let sql = ` FROM ${this.TableName} as "${this.TableAlias}"`;
 
         for (const join of this.joinConditions) {
-            sql += join.type === 'left' ? ' LEFT OUTER JOIN' : ' INNER JOIN';
+            const joins = {
+                inner: ' INNER JOIN',
+                left: ' LEFT OUTER JOIN',
+                full: ' FULL OUTER JOIN',
+            }
+            sql += joins[join.type];
             sql += ` ${join.model.TableName} as "${join.model.TableAlias}" ON `;
             const query = WhereExpression.createCondition(join.conditions, this, this.vars.length + 1);
             sql += query.expression;
@@ -248,7 +253,7 @@ export class TableModel {
      * @param joinBaseModel 結合する対象のBaseModelインスタンスを指定します。
      * @param conditions 結合条件を指定します。条件はオブジェクトまたは文字列で指定できます。
      */
-    public join(joinType: 'left' | 'inner', joinModel: TableModel, conditions: Array<TNestedCondition>): void {
+    public join(joinType: 'left' | 'inner' | 'full', joinModel: TableModel, conditions: Array<TNestedCondition>): void {
         this.joinConditions.push({type: joinType, model: joinModel, conditions: conditions});
     }
 

package/src/reqestResponse/ReqResType.ts

@@ -151,21 +151,6 @@ export default class ReqResType {
         }
     }
 
-    /**
-     * Validates if the given value is a valid UUID
-     * 与えられた値が有効なUUIDであるかどうかを検証します
-     * @param value - The value to be validated, 検証する値
-     * @returns {boolean} - Whether the value is a valid UUID, 値が有効なUUIDであるかどうか
-     */
-    protected isUUID(value: any) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-
-        const pattern = new RegExp('^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$');
-        return pattern.test(value);
-    }
-
     /**
      * 値がメールアドレス形式であるかどうかを検証します
      * Validates if the given value is in the format of an email address

package/src/reqestResponse/RequestType.ts

@@ -1,6 +1,7 @@
 import { Request } from 'express';
 import ReqResType, { EnumType, PrimitiveType, PropertyType } from "./ReqResType";
 import { InputErrorException } from '../exceptions/Exception';
+import StringUtil from '../Utils/StringUtil';
 
 // エラーメッセージの型定義
 export interface ErrorMessageType {
@@ -568,7 +569,7 @@ export class RequestType extends ReqResType {
                 }
             case 'uuid':
             case 'uuid?':
-                if (this.isUUID(value)) {
+                if (StringUtil.isUUID(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "UUID_21" : "UUID_91", keys, value);

package/src/reqestResponse/ResponseType.ts

@@ -1,3 +1,4 @@
+import StringUtil from "../Utils/StringUtil";
 import ReqResType from "./ReqResType";
 
 export class ResponseType extends ReqResType {
@@ -219,7 +220,7 @@ export class ResponseType extends ReqResType {
                 }
             case 'uuid':
             case 'uuid?':
-                if (this.isUUID(value)) {
+                if (StringUtil.isUUID(value)) {
                     return value;
                 }
                 return undefined;