@digitalwalletcorp/sql-builder 1.2.0 → 1.2.1

package/lib/abstract-syntax-tree.d.ts

@@ -0,0 +1,62 @@
+type Token = {
+    type: 'IDENTIFIER';
+    value: string;
+} | {
+    type: 'OPERATOR';
+    value: string;
+} | {
+    type: 'NUMBER';
+    value: number;
+} | {
+    type: 'BOOLEAN';
+    value: boolean;
+} | {
+    type: 'STRING';
+    value: string;
+} | {
+    type: 'NULL';
+    value: null;
+} | {
+    type: 'UNDEFINED';
+    value: undefined;
+} | {
+    type: 'PARENTHESIS';
+    value: '(' | ')';
+};
+/**
+ * SQLBuilderの条件文(*IF*)で指定された条件文字列を解析するためのAST。
+ * JavaScriptの文法をカバーするものではなく、SQLBuilderで利用可能な限定的な構文のみサポートする。
+ */
+export declare class AbstractSyntaxTree {
+    /**
+     * 与えられた条件文字列を構文解析し、entityに対する条件として成立するか評価する
+     *
+     * @param {string} condition "params != null && params.length > 10" のような条件
+     * @param {Record<string, any>} entity
+     * @returns {boolean}
+     */
+    evaluateCondition(condition: string, entity: Record<string, any>): boolean;
+    /**
+     * 与えられた条件文字列をトークンに分割する
+     *
+     * @param {string} condition
+     * @returns {Token[]}
+     */
+    tokenize(condition: string): Token[];
+    /**
+     * Shunting Yardアルゴリズムで構文を逆ポーランド記法(Reverse Polish Notation)に変換する
+     *
+     * @param {Token[]} tokens
+     * @returns {Token[]}
+     */
+    private shuntingYard;
+    /**
+     * 逆ポーランド記法(Reverse Polish Notation)のトークンを評価する
+     *
+     * @param {Token[]} rpnTokens
+     * @param {Record<string, any>} entity
+     * @returns {boolean}
+     */
+    private evaluateRpn;
+}
+export {};

package/lib/abstract-syntax-tree.js

@@ -0,0 +1,347 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbstractSyntaxTree = void 0;
+const common = __importStar(require("./common"));
+// 演算子の優先順位と結合性 (より長い演算子を先に定義)
+const PRECEDENCE = {
+    '||': { precedence: 1, associativity: 'left' },
+    '&&': { precedence: 2, associativity: 'left' },
+    '==': { precedence: 3, associativity: 'left' },
+    '!=': { precedence: 3, associativity: 'left' },
+    '===': { precedence: 3, associativity: 'left' },
+    '!==': { precedence: 3, associativity: 'left' },
+    '<': { precedence: 4, associativity: 'left' },
+    '<=': { precedence: 4, associativity: 'left' },
+    '>': { precedence: 4, associativity: 'left' },
+    '>=': { precedence: 4, associativity: 'left' },
+    '!': { precedence: 5, associativity: 'right' } // 単項演算子は高優先度
+};
+/**
+ * SQLBuilderの条件文(*IF*)で指定された条件文字列を解析するためのAST。
+ * JavaScriptの文法をカバーするものではなく、SQLBuilderで利用可能な限定的な構文のみサポートする。
+ */
+class AbstractSyntaxTree {
+    /**
+     * 与えられた条件文字列を構文解析し、entityに対する条件として成立するか評価する
+     *
+     * @param {string} condition "params != null && params.length > 10" のような条件
+     * @param {Record<string, any>} entity
+     * @returns {boolean}
+     */
+    evaluateCondition(condition, entity) {
+        try {
+            const tokens = this.tokenize(condition); // トークン化
+            const rpnTokens = this.shuntingYard(tokens); // RPN変換
+            const result = this.evaluateRpn(rpnTokens, entity); // 評価
+            return result;
+        }
+        catch (error) {
+            console.error('Error evaluating condition:', condition, entity, error);
+            throw error;
+        }
+    }
+    /**
+     * 与えられた条件文字列をトークンに分割する
+     *
+     * @param {string} condition
+     * @returns {Token[]}
+     */
+    tokenize(condition) {
+        const tokens = [];
+        let i = 0;
+        while (i < condition.length) {
+            const char = condition[i];
+            // 空白をスキップ
+            if (/\s/.test(char)) {
+                i++;
+                continue;
+            }
+            // 演算子 (長いものからチェック)
+            // 3桁定義
+            const chunk3 = condition.substring(i, i + 3);
+            switch (chunk3) {
+                case '===':
+                case '!==':
+                    tokens.push({ type: 'OPERATOR', value: chunk3 });
+                    i += 3;
+                    continue;
+                default:
+            }
+            // 2桁定義
+            const chunk2 = condition.substring(i, i + 2);
+            switch (chunk2) {
+                case '==':
+                case '!=':
+                case '<=':
+                case '>=':
+                case '&&':
+                case '||':
+                    tokens.push({ type: 'OPERATOR', value: chunk2 });
+                    i += 2;
+                    continue;
+                default:
+            }
+            // 1桁定義
+            const chunk1 = char;
+            switch (chunk1) {
+                case '>':
+                case '<':
+                case '!':
+                case '=':
+                    tokens.push({ type: 'OPERATOR', value: chunk1 });
+                    i += 1;
+                    continue;
+                // case '.':
+                //   tokens.push({ type: 'IDENTIFIER', value: chunk1 }); // '.'も識別子の一部として扱う
+                //   i += 1;
+                //   continue;
+                case '(':
+                case ')':
+                    tokens.push({ type: 'PARENTHESIS', value: chunk1 });
+                    i += 1;
+                    continue;
+                default:
+            }
+            const reststring = condition.substring(i); // 現在のインデックスから末尾までの文字列
+            // 数値リテラル
+            const numMatch = reststring.match(/^-?\d+(\.\d+)?/);
+            if (numMatch) {
+                tokens.push({ type: 'NUMBER', value: parseFloat(numMatch[0]) });
+                i += numMatch[0].length;
+                continue;
+            }
+            // 文字列リテラル
+            switch (chunk1) {
+                case '\'':
+                case '"':
+                    const quote = chunk1;
+                    let j = i + 1;
+                    let strValue = '';
+                    while (j < condition.length && condition[j] !== quote) {
+                        // エスケープ文字の処理 (\' や \\) は必要に応じて追加
+                        if (condition[j] === '\\' && j + 1 < condition.length) {
+                            strValue += condition[j + 1];
+                            j += 2;
+                        }
+                        else {
+                            strValue += condition[j];
+                            j++;
+                        }
+                    }
+                    if (condition[j] === quote) {
+                        tokens.push({ type: 'STRING', value: strValue });
+                        i = j + 1;
+                        continue;
+                    }
+                    else {
+                        // クォートが閉じられていない
+                        throw new Error('Unterminated string literal');
+                    }
+                default:
+            }
+            // 識別子 (変数名, true, false, null, undefined, length)
+            const identMatch = reststring.match(/^[a-zA-Z_][a-zA-Z0-9_.]*/); // ドットを含む識別子
+            if (identMatch) {
+                const ident = identMatch[0];
+                switch (ident) {
+                    case 'true':
+                        tokens.push({ type: 'BOOLEAN', value: true });
+                        break;
+                    case 'false':
+                        tokens.push({ type: 'BOOLEAN', value: false });
+                        break;
+                    case 'null':
+                        tokens.push({ type: 'NULL', value: null });
+                        break;
+                    case 'undefined':
+                        tokens.push({ type: 'UNDEFINED', value: undefined });
+                        break;
+                    default:
+                        tokens.push({ type: 'IDENTIFIER', value: ident }); // プロパティ名
+                }
+                i += ident.length;
+                continue;
+            }
+            // 未知の文字
+            throw new Error(`Unexpected character in condition: ${char} at index ${i}`);
+        }
+        return tokens;
+    }
+    /**
+     * Shunting Yardアルゴリズムで構文を逆ポーランド記法(Reverse Polish Notation)に変換する
+     *
+     * @param {Token[]} tokens
+     * @returns {Token[]}
+     */
+    shuntingYard(tokens) {
+        const output = [];
+        const operatorStack = [];
+        for (const token of tokens) {
+            switch (token.type) {
+                case 'NUMBER':
+                case 'BOOLEAN':
+                case 'NULL':
+                case 'UNDEFINED':
+                case 'STRING':
+                case 'IDENTIFIER':
+                    output.push(token);
+                    break;
+                case 'OPERATOR':
+                    const op1 = token;
+                    while (operatorStack.length) {
+                        const op2 = operatorStack[operatorStack.length - 1];
+                        // 括弧内は処理しない
+                        if (op2.value === '(') {
+                            break;
+                        }
+                        // 優先順位のルールに従う
+                        if (PRECEDENCE[op1.value].associativity === 'left'
+                            && PRECEDENCE[op1.value].precedence <= PRECEDENCE[op2.value].precedence) {
+                            output.push(operatorStack.pop());
+                        }
+                        else {
+                            break;
+                        }
+                    }
+                    operatorStack.push(op1);
+                    break;
+                case 'PARENTHESIS':
+                    if (token.value === '(') {
+                        operatorStack.push(token);
+                    }
+                    else if (token.value === ')') {
+                        let foundLeftParen = false;
+                        while (operatorStack.length > 0) {
+                            const op = operatorStack.pop();
+                            if ('value' in op && op.value === '(') {
+                                foundLeftParen = true;
+                                break;
+                            }
+                            output.push(op);
+                        }
+                        if (!foundLeftParen) {
+                            throw new Error('Mismatched parentheses');
+                        }
+                    }
+                    break;
+                // default:
+            }
+        }
+        while (operatorStack.length) {
+            const op = operatorStack.pop();
+            if ('value' in op && (op.value === '(' || op.value === ')')) {
+                throw new Error('Mismatched parentheses');
+            }
+            output.push(op);
+        }
+        return output;
+    }
+    /**
+     * 逆ポーランド記法(Reverse Polish Notation)のトークンを評価する
+     *
+     * @param {Token[]} rpnTokens
+     * @param {Record<string, any>} entity
+     * @returns {boolean}
+     */
+    evaluateRpn(rpnTokens, entity) {
+        const stack = [];
+        for (const token of rpnTokens) {
+            switch (token.type) {
+                case 'NUMBER':
+                case 'BOOLEAN':
+                case 'STRING':
+                case 'NULL':
+                case 'UNDEFINED':
+                    stack.push(token.value);
+                    break;
+                case 'IDENTIFIER':
+                    stack.push(common.getProperty(entity, token.value));
+                    break;
+                case 'OPERATOR':
+                    // 単項演算子 '!'
+                    if (token.value === '!') {
+                        const operand = stack.pop();
+                        stack.push(!operand);
+                        break;
+                    }
+                    // 二項演算子
+                    const right = stack.pop();
+                    const left = stack.pop();
+                    switch (token.value) {
+                        case '==':
+                            stack.push(left == right);
+                            break;
+                        case '!=':
+                            stack.push(left != right);
+                            break;
+                        case '===':
+                            stack.push(left === right);
+                            break;
+                        case '!==':
+                            stack.push(left !== right);
+                            break;
+                        case '<':
+                            stack.push(left < right);
+                            break;
+                        case '<=':
+                            stack.push(left <= right);
+                            break;
+                        case '>':
+                            stack.push(left > right);
+                            break;
+                        case '>=':
+                            stack.push(left >= right);
+                            break;
+                        case '&&':
+                            stack.push(left && right);
+                            break;
+                        case '||':
+                            stack.push(left || right);
+                            break;
+                        default: throw new Error(`Unknown operator: ${token.value}`);
+                    }
+                    break;
+                // default:
+            }
+        }
+        if (stack.length !== 1) {
+            throw new Error('Invalid expression');
+        }
+        return !!stack[0];
+    }
+}
+exports.AbstractSyntaxTree = AbstractSyntaxTree;
+//# sourceMappingURL=abstract-syntax-tree.js.map

package/lib/abstract-syntax-tree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"abstract-syntax-tree.js","sourceRoot":"","sources":["../src/abstract-syntax-tree.ts"],"names":[],"mappings":"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"}

package/lib/common.d.ts

@@ -0,0 +1,8 @@
+/**
+ * entityで指定したオブジェクトからドットで連結されたプロパティキーに該当する値を取得する
+ *
+ * @param {Record<string, any>} entity
+ * @param {string} property
+ * @returns {any}
+ */
+export declare function getProperty(entity: Record<string, any>, property: string): any;

package/lib/common.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProperty = getProperty;
+/**
+ * entityで指定したオブジェクトからドットで連結されたプロパティキーに該当する値を取得する
+ *
+ * @param {Record<string, any>} entity
+ * @param {string} property
+ * @returns {any}
+ */
+function getProperty(entity, property) {
+    const propertyPath = property.split('.');
+    let value = entity;
+    for (const prop of propertyPath) {
+        if (value && value.hasOwnProperty(prop)) {
+            value = value[prop];
+        }
+        else {
+            return undefined;
+        }
+    }
+    return value;
+}
+//# sourceMappingURL=common.js.map

package/lib/common.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":";;AAOA,kCAWC;AAlBD;;;;;;GAMG;AACH,SAAgB,WAAW,CAAC,MAA2B,EAAE,QAAgB;IACvE,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,KAAK,GAAG,MAAM,CAAC;IACnB,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;QAChC,IAAI,KAAK,IAAI,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;YACxC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/lib/sql-builder.d.ts

@@ -1,3 +1,17 @@
+/**
+ * PostgreSQL: $1, $2... 配列
+ * MySQL: ? 配列
+ * SQLite: ?, $name, :name 配列またはオブジェクト
+ * SQL Server: ?, `@name` 配列またはオブジェクト
+ * Oracle: :name オブジェクト
+ *
+ * 以下をサポートする
+ * ・$1, $2 (postgres)
+ * ・? (mysql) SQLite, SQL Serverもこれで代替可能
+ * ・:name (oracle) SQLiteもこれで代替可能
+ */
+type BindType = 'postgres' | 'mysql' | 'oracle';
+type BindParameterType<T extends 'postgres' | 'mysql' | 'oracle'> = T extends 'postgres' ? any[] : T extends 'mysql' ? any[] : Record<string, any>;
 /**
  * 動的SQLを生成する
  *
@@ -49,6 +63,16 @@ export declare class SQLBuilder {
      * @returns {string}
      */
     generateSQL(template: string, entity: Record<string, any>): string;
+    /**
+     * 指定したテンプレートにエンティティの値をバインド可能なプレースホルダー付きSQLを生成し、
+     * バインドパラメータと共にタプル型で返却する
+     *
+     * @param {string} template
+     * @param {Record<string, any>} entity
+     * @param {BindType} bindType
+     * @returns {[string, BindParameterType<T>]}
+     */
+    generateParameterizedSQL<T extends BindType>(template: string, entity: Record<string, any>, bindType: T): [string, BindParameterType<T>];
     /**
      * テンプレートに含まれるタグ構成を解析してコンテキストを返す
      *
@@ -63,6 +87,10 @@ export declare class SQLBuilder {
      * @param {string} template
      * @param {Record<string, any>} entity
      * @param {TagContext[]} tagContexts
+     * @param {*} [options]
+     *   ├ bindType BindType
+     *   ├ bindIndex number
+     *   ├ bindParams BindParameterType<T>
      * @returns {string}
      */
     private parse;
@@ -84,6 +112,7 @@ export declare class SQLBuilder {
     private evaluateCondition;
     /**
      * entityからparamで指定した値を文字列で取得する
+     * entityの値がstringの場合、SQLインジェクションの危険のある文字はエスケープする
      *
      * * 返却する値が配列の場合は丸括弧で括り、各項目をカンマで区切る
      *   ('a', 'b', 'c')
@@ -100,4 +129,14 @@ export declare class SQLBuilder {
      * @returns {string}
      */
     private extractValue;
+    /**
+     * SQLインジェクション対策
+     * * シングルクォートのエスケープ
+     * * バックスラッシュのエスケープ
+     *
+     * @param {string} str
+     * @returns {string}
+     */
+    private escape;
 }
+export {};

package/lib/sql-builder.js

@@ -1,6 +1,41 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLBuilder = void 0;
+const common = __importStar(require("./common"));
+const abstract_syntax_tree_1 = require("./abstract-syntax-tree");
 /**
  * 動的SQLを生成する
  *
@@ -65,6 +100,44 @@ class SQLBuilder {
         const result = this.parse(pos, template, entity, tagContexts);
         return result;
     }
+    /**
+     * 指定したテンプレートにエンティティの値をバインド可能なプレースホルダー付きSQLを生成し、
+     * バインドパラメータと共にタプル型で返却する
+     *
+     * @param {string} template
+     * @param {Record<string, any>} entity
+     * @param {BindType} bindType
+     * @returns {[string, BindParameterType<T>]}
+     */
+    generateParameterizedSQL(template, entity, bindType) {
+        let bindParams;
+        switch (bindType) {
+            case 'postgres':
+            case 'mysql':
+                bindParams = [];
+                break;
+            case 'oracle':
+                bindParams = {};
+                break;
+            default:
+                throw new Error(`Unsupported bind type: ${bindType}`);
+        }
+        /**
+         * 「\/* *\/」で囲まれたすべての箇所を抽出
+         */
+        const allMatchers = template.match(this.REGEX_TAG_PATTERN);
+        if (!allMatchers) {
+            return [template, bindParams];
+        }
+        const tagContexts = this.createTagContexts(template);
+        const pos = { index: 0 };
+        const result = this.parse(pos, template, entity, tagContexts, {
+            bindType: bindType,
+            bindIndex: 1,
+            bindParams: bindParams
+        });
+        return [result, bindParams];
+    }
     /**
      * テンプレートに含まれるタグ構成を解析してコンテキストを返す
      *
@@ -76,56 +149,55 @@ class SQLBuilder {
         /**
          * 「\/* *\/」で囲まれたすべての箇所を抽出
          */
-        const rootMatcher = template.match(this.REGEX_TAG_PATTERN);
+        const matches = template.matchAll(this.REGEX_TAG_PATTERN);
         // まず最初にREGEX_TAG_PATTERNで解析した情報をそのままフラットにTagContextの配列に格納
         let pos = 0;
         const tagContexts = [];
-        if (rootMatcher) {
-            for (const matchContent of rootMatcher) {
-                const index = template.indexOf(matchContent, pos);
-                pos = index + 1;
-                const tagContext = {
-                    type: null,
-                    match: matchContent,
-                    contents: '',
-                    startIndex: index,
-                    endIndex: index + matchContent.length,
-                    sub: [],
-                    parent: null,
-                    status: 0
-                };
-                switch (true) {
-                    case matchContent === '/*BEGIN*/': {
-                        tagContext.type = 'BEGIN';
-                        break;
-                    }
-                    case matchContent.startsWith('/*IF'): {
-                        tagContext.type = 'IF';
-                        const contentMatcher = matchContent.match(/^\/\*IF\s+(.*?)\*\/$/);
-                        tagContext.contents = contentMatcher && contentMatcher[1] || '';
-                        break;
-                    }
-                    case matchContent.startsWith('/*FOR'): {
-                        tagContext.type = 'FOR';
-                        const contentMatcher = matchContent.match(/^\/\*FOR\s+(.*?)\*\/$/);
-                        tagContext.contents = contentMatcher && contentMatcher[1] || '';
-                        break;
-                    }
-                    case matchContent === '/*END*/': {
-                        tagContext.type = 'END';
-                        break;
-                    }
-                    default: {
-                        tagContext.type = 'BIND';
-                        const contentMatcher = matchContent.match(/\/\*(.*?)\*\//);
-                        tagContext.contents = contentMatcher && contentMatcher[1] || '';
-                        // ダミー値の終了位置をendIndexに設定
-                        const dummyEndIndex = this.getDummyParamEndIndex(template, tagContext);
-                        tagContext.endIndex = dummyEndIndex;
-                    }
+        for (const match of matches) {
+            const matchContent = match[0];
+            const index = match.index;
+            pos = index + 1;
+            const tagContext = {
+                type: 'BIND', // ダミーの初期値。後続処理で適切なタイプに変更する。
+                match: matchContent,
+                contents: '',
+                startIndex: index,
+                endIndex: index + matchContent.length,
+                sub: [],
+                parent: null,
+                status: 0
+            };
+            switch (true) {
+                case matchContent === '/*BEGIN*/': {
+                    tagContext.type = 'BEGIN';
+                    break;
+                }
+                case matchContent.startsWith('/*IF'): {
+                    tagContext.type = 'IF';
+                    const contentMatcher = matchContent.match(/^\/\*IF\s+(.*?)\*\/$/);
+                    tagContext.contents = contentMatcher && contentMatcher[1] || '';
+                    break;
+                }
+                case matchContent.startsWith('/*FOR'): {
+                    tagContext.type = 'FOR';
+                    const contentMatcher = matchContent.match(/^\/\*FOR\s+(.*?)\*\/$/);
+                    tagContext.contents = contentMatcher && contentMatcher[1] || '';
+                    break;
+                }
+                case matchContent === '/*END*/': {
+                    tagContext.type = 'END';
+                    break;
+                }
+                default: {
+                    tagContext.type = 'BIND';
+                    const contentMatcher = matchContent.match(/\/\*(.*?)\*\//);
+                    tagContext.contents = contentMatcher && contentMatcher[1] || '';
+                    // ダミー値の終了位置をendIndexに設定
+                    const dummyEndIndex = this.getDummyParamEndIndex(template, tagContext);
+                    tagContext.endIndex = dummyEndIndex;
                 }
-                tagContexts.push(tagContext);
             }
+            tagContexts.push(tagContext);
         }
         // できあがったTagContextの配列から、BEGEN、IFの場合は次の対応するENDが出てくるまでをsubに入れ直して構造化し、
         // 以下のような構造の変更する
@@ -191,9 +263,13 @@ class SQLBuilder {
      * @param {string} template
      * @param {Record<string, any>} entity
      * @param {TagContext[]} tagContexts
+     * @param {*} [options]
+     *   ├ bindType BindType
+     *   ├ bindIndex number
+     *   ├ bindParams BindParameterType<T>
      * @returns {string}
      */
-    parse(pos, template, entity, tagContexts) {
+    parse(pos, template, entity, tagContexts, options) {
         let result = '';
         for (const tagContext of tagContexts) {
             switch (tagContext.type) {
@@ -201,7 +277,7 @@ class SQLBuilder {
                     result += template.substring(pos.index, tagContext.startIndex);
                     pos.index = tagContext.endIndex;
                     // BEGINのときは無条件にsubに対して再帰呼び出し
-                    result += this.parse(pos, template, entity, tagContext.sub);
+                    result += this.parse(pos, template, entity, tagContext.sub, options);
                     break;
                 }
                 case 'IF': {
@@ -210,7 +286,7 @@ class SQLBuilder {
                     if (this.evaluateCondition(tagContext.contents, entity)) {
                         // IF条件が成立する場合はsubに対して再帰呼び出し
                         tagContext.status = 10;
-                        result += this.parse(pos, template, entity, tagContext.sub);
+                        result += this.parse(pos, template, entity, tagContext.sub, options);
                     }
                     else {
                         // IF条件が成立しない場合は再帰呼び出しせず、subのENDタグのendIndexをposに設定
@@ -229,7 +305,10 @@ class SQLBuilder {
                         for (const value of array) {
                             // 再帰呼び出しによりposが進むので、ループのたびにposを戻す必要がある
                             pos.index = tagContext.endIndex;
-                            result += this.parse(pos, template, { [bindName]: value }, tagContext.sub);
+                            result += this.parse(pos, template, {
+                                ...entity,
+                                [bindName]: value
+                            }, tagContext.sub, options);
                             // FORループするときは各行で改行する
                             result += '\n';
                         }
@@ -256,13 +335,71 @@ class SQLBuilder {
                 case 'BIND': {
                     result += template.substring(pos.index, tagContext.startIndex);
                     pos.index = tagContext.endIndex;
-                    const value = this.extractValue(tagContext.contents, entity);
-                    result += value == null ? '' : String(value);
+                    const value = common.getProperty(entity, tagContext.contents);
+                    switch (options?.bindType) {
+                        case 'postgres': {
+                            // PostgreSQL形式の場合、$Nでバインドパラメータを展開
+                            if (Array.isArray(value)) {
+                                const placeholders = [];
+                                for (const item of value) {
+                                    placeholders.push(`$${options.bindIndex++}`);
+                                    options.bindParams.push(item);
+                                }
+                                result += `(${placeholders.join(',')})`; // IN ($1,$2,$3)
+                            }
+                            else {
+                                result += `$${options.bindIndex++}`;
+                                options.bindParams.push(value);
+                            }
+                            break;
+                        }
+                        case 'mysql': {
+                            // MySQL形式の場合、?でバインドパラメータを展開
+                            if (Array.isArray(value)) {
+                                const placeholders = [];
+                                for (const item of value) {
+                                    placeholders.push('?');
+                                    options.bindParams.push(item);
+                                }
+                                result += `(${placeholders.join(',')})`; // IN (?,?,?)
+                            }
+                            else {
+                                result += '?';
+                                options.bindParams.push(value);
+                            }
+                            break;
+                        }
+                        case 'oracle': {
+                            // Oracle形式の場合、名前付きバインドでバインドパラメータを展開
+                            if (Array.isArray(value)) {
+                                const placeholders = [];
+                                for (let i = 0; i < value.length; i++) {
+                                    // 名前付きバインドで配列の場合は名前が重複する可能性があるので枝番を付与
+                                    const paramName = `${tagContext.contents}_${i}`; // :projectNames_0, :projectNames_1
+                                    placeholders.push(`:${paramName}`);
+                                    options.bindParams[paramName] = value[i];
+                                }
+                                result += `(${placeholders.join(',')})`; // IN (:p_0,:p_1,:p3)
+                            }
+                            else {
+                                result += `:${tagContext.contents}`;
+                                options.bindParams[tagContext.contents] = value;
+                            }
+                            break;
+                        }
+                        default: {
+                            // generateSQLの場合
+                            const escapedValue = this.extractValue(tagContext.contents, entity);
+                            result += escapedValue ?? '';
+                        }
+                    }
                     break;
                 }
                 default:
             }
         }
+        // 最後に余った部分を追加する
+        result += template.substring(pos.index);
         return result;
     }
     /**
@@ -346,15 +483,9 @@ class SQLBuilder {
      */
     evaluateCondition(condition, entity) {
         try {
-            const evaluate = new Function('entity', `
-        with (entity) {
-          try {
-            return ${condition};
-          } catch(error) {
-            return false;
-          }
-        }`);
-            return !!evaluate(entity);
+            const ast = new abstract_syntax_tree_1.AbstractSyntaxTree();
+            const result = ast.evaluateCondition(condition, entity);
+            return result;
         }
         catch (error) {
             console.warn('Error evaluating condition:', condition, entity, error);
@@ -363,6 +494,7 @@ class SQLBuilder {
     }
     /**
      * entityからparamで指定した値を文字列で取得する
+     * entityの値がstringの場合、SQLインジェクションの危険のある文字はエスケープする
      *
      * * 返却する値が配列の場合は丸括弧で括り、各項目をカンマで区切る
      *   ('a', 'b', 'c')
@@ -380,16 +512,7 @@ class SQLBuilder {
      */
     extractValue(property, entity, options) {
         try {
-            const propertyPath = property.split('.');
-            let value = entity;
-            for (const prop of propertyPath) {
-                if (value && value.hasOwnProperty(prop)) {
-                    value = value[prop];
-                }
-                else {
-                    return undefined;
-                }
-            }
+            const value = common.getProperty(entity, property);
             let result = '';
             switch (options?.responseType) {
                 case 'array':
@@ -398,10 +521,10 @@ class SQLBuilder {
                 default:
                     // string
                     if (Array.isArray(value)) {
-                        result = `(${value.map(v => typeof v === 'string' ? `'${v}'` : v).join(',')})`;
+                        result = `(${value.map(v => typeof v === 'string' ? `'${this.escape(v)}'` : v).join(',')})`;
                     }
                     else {
-                        result = typeof value === 'string' ? `'${value}'` : value;
+                        result = typeof value === 'string' ? `'${this.escape(value)}'` : value;
                     }
                     return result;
             }
@@ -411,6 +534,20 @@ class SQLBuilder {
             return undefined;
         }
     }
+    /**
+     * SQLインジェクション対策
+     * * シングルクォートのエスケープ
+     * * バックスラッシュのエスケープ
+     *
+     * @param {string} str
+     * @returns {string}
+     */
+    escape(str) {
+        let escapedString = str;
+        escapedString = escapedString.replace(/'/g, '\'\'');
+        escapedString = escapedString.replace(/\\/g, '\\\\');
+        return escapedString;
+    }
 }
 exports.SQLBuilder = SQLBuilder;
 //# sourceMappingURL=sql-builder.js.map

package/lib/sql-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"sql-builder.js","sourceRoot":"","sources":["../src/sql-builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sql-builder.js","sourceRoot":"","sources":["../src/sql-builder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAmC;AACnC,iEAA4D;AA8C5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAa,UAAU;IAEb,iBAAiB,GAAG,gBAAgB,CAAC;IAE7C;IACA,CAAC;IAED;;;;;;OAMG;IACI,WAAW,CAAC,QAAgB,EAAE,MAA2B;QAC9D;;WAEG;QACH,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC3D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,GAAG,GAAgB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;QAC9D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;;;;OAQG;IACI,wBAAwB,CAAqB,QAAgB,EAAE,MAA2B,EAAE,QAAW;QAE5G,IAAI,UAAgC,CAAC;QACrC,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,UAAU,CAAC;YAChB,KAAK,OAAO;gBACV,UAAU,GAAG,EAAqC,CAAC;gBACnD,MAAM;YACR,KAAK,QAAQ;gBACX,UAAU,GAAG,EAA0B,CAAC;gBACxC,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED;;WAEG;QACH,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC3D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,GAAG,GAAgB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;YAC5D,QAAQ,EAAE,QAAQ;YAClB,SAAS,EAAE,CAAC;YACZ,UAAU,EAAE,UAAU;SACvB,CAAC,CAAC;QACH,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACK,iBAAiB,CAAC,QAAgB;QACxC,oDAAoD;QACpD;;WAEG;QACH,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAE1D,0DAA0D;QAC1D,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,MAAM,WAAW,GAAiB,EAAE,CAAC;QACrC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YAC1B,GAAG,GAAG,KAAK,GAAG,CAAC,CAAC;YAChB,MAAM,UAAU,GAAe;gBAC7B,IAAI,EAAE,MAAM,EAAE,4BAA4B;gBAC1C,KAAK,EAAE,YAAY;gBACnB,QAAQ,EAAE,EAAE;gBACZ,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK,GAAG,YAAY,CAAC,MAAM;gBACrC,GAAG,EAAE,EAAE;gBACP,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,CAAC;aACV,CAAC;YACF,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,YAAY,KAAK,WAAW,CAAC,CAAC,CAAC;oBAClC,UAAU,CAAC,IAAI,GAAG,OAAO,CAAC;oBAC1B,MAAM;gBACR,CAAC;gBACD,KAAK,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBACrC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC;oBACvB,MAAM,cAAc,GAAG,YAAY,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;oBAClE,UAAU,CAAC,QAAQ,GAAG,cAAc,IAAI,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBAChE,MAAM;gBACR,CAAC;gBACD,KAAK,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBACtC,UAAU,CAAC,IAAI,GAAG,KAAK,CAAC;oBACxB,MAAM,cAAc,GAAG,YAAY,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;oBACnE,UAAU,CAAC,QAAQ,GAAG,cAAc,IAAI,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBAChE,MAAM;gBACR,CAAC;gBACD,KAAK,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC;oBAChC,UAAU,CAAC,IAAI,GAAG,KAAK,CAAC;oBACxB,MAAM;gBACR,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;oBACR,UAAU,CAAC,IAAI,GAAG,MAAM,CAAC;oBACzB,MAAM,cAAc,GAAG,YAAY,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;oBAC3D,UAAU,CAAC,QAAQ,GAAG,cAAc,IAAI,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBAChE,wBAAwB;oBACxB,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;oBACvE,UAAU,CAAC,QAAQ,GAAG,aAAa,CAAC;gBACtC,CAAC;YACH,CAAC;YACD,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC/B,CAAC;QAED,oEAAoE;QACpE,gBAAgB;QAChB;;;;;;;;;;WAUG;QACH,MAAM,iBAAiB,GAAiB,EAAE,CAAC;QAC3C,MAAM,cAAc,GAAiB,EAAE,CAAC;QACxC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,OAAO,CAAC;gBACb,KAAK,IAAI,CAAC;gBACV,KAAK,KAAK,CAAC,CAAC,CAAC;oBACX,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBACzE,IAAI,gBAAgB,EAAE,CAAC;wBACrB,SAAS;wBACT,UAAU,CAAC,MAAM,GAAG,gBAAgB,CAAC;wBACrC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACxC,CAAC;yBAAM,CAAC;wBACN,cAAc;wBACd,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAClC,CAAC;oBACD,sBAAsB;oBACtB,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACnC,MAAM;gBACR,CAAC;gBACD,KAAK,KAAK,CAAC,CAAC,CAAC;oBACX,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,EAAG,CAAC;oBAClD,sCAAsC;oBACtC,UAAU,CAAC,MAAM,GAAG,gBAAgB,CAAC;oBACrC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACtC,MAAM;gBACR,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;oBACR,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBACzE,IAAI,gBAAgB,EAAE,CAAC;wBACrB,SAAS;wBACT,UAAU,CAAC,MAAM,GAAG,gBAAgB,CAAC;wBACrC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACxC,CAAC;yBAAM,CAAC;wBACN,cAAc;wBACd,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAClC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;IAED;;;;;;;;;;;;OAYG;IACK,KAAK,CAAqB,GAAgB,EAAE,QAAgB,EAAE,MAA2B,EAAE,WAAyB,EAAE,OAI7H;QACC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,OAAO,CAAC,CAAC,CAAC;oBACb,MAAM,IAAI,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;oBAC/D,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC;oBAChC,6BAA6B;oBAC7B,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;oBACrE,MAAM;gBACR,CAAC;gBACD,KAAK,IAAI,CAAC,CAAC,CAAC;oBACV,MAAM,IAAI,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;oBAC/D,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC;oBAChC,IAAI,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;wBACxD,4BAA4B;wBAC5B,UAAU,CAAC,MAAM,GAAG,EAAE,CAAC;wBACvB,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;oBACvE,CAAC;yBAAM,CAAC;wBACN,kDAAkD;wBAClD,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;wBAChE,GAAG,CAAC,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC;oBACrC,CAAC;oBACD,MAAM;gBACR,CAAC;gBACD,KAAK,KAAK,CAAC,CAAC,CAAC;oBACX,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;oBACrF,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,EAAE;wBACtD,YAAY,EAAE,OAAO;qBACtB,CAAC,CAAC;oBACH,IAAI,KAAK,EAAE,CAAC;wBACV,MAAM,IAAI,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;wBAC/D,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE,CAAC;4BAC1B,uCAAuC;4BACvC,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC;4BAChC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE;gCAClC,GAAG,MAAM;gCACT,CAAC,QAAQ,CAAC,EAAE,KAAK;6BAClB,EAAE,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;4BAC5B,qBAAqB;4BACrB,MAAM,IAAI,IAAI,CAAC;wBACjB,CAAC;oBACH,CAAC;oBACD,MAAM;gBACR,CAAC;gBACD,KAAK,KAAK,CAAC,CAAC,CAAC;oBACX,kDAAkD;oBAClD,QAAQ,IAAI,EAAE,CAAC;wBACb,oDAAoD;wBACpD,KAAK,UAAU,CAAC,MAAM,EAAE,IAAI,KAAK,OAAO;+BACnC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC;+BAClD,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC;wBAC1E,uCAAuC;wBACvC,KAAK,UAAU,CAAC,MAAM,EAAE,IAAI,KAAK,IAAI,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,KAAK,EAAE;4BACtE,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC;4BAChC,OAAO,EAAE,CAAC;wBACZ,QAAQ;oBACV,CAAC;oBACD,MAAM,IAAI,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;oBAC/D,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC;oBAChC,OAAO,MAAM,CAAC;gBAChB,CAAC;gBACD,KAAK,MAAM,CAAC,CAAC,CAAC;oBACZ,MAAM,IAAI,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;oBAC/D,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC;oBAChC,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;oBAC9D,QAAQ,OAAO,EAAE,QAAQ,EAAE,CAAC;wBAC1B,KAAK,UAAU,CAAC,CAAC,CAAC;4BAChB,kCAAkC;4BAClC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gCACzB,MAAM,YAAY,GAAa,EAAE,CAAC;gCAClC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oCACzB,YAAY,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;oCAC5C,OAAO,CAAC,UAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gCAC3C,CAAC;gCACD,MAAM,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,gBAAgB;4BAC3D,CAAC;iCAAM,CAAC;gCACN,MAAM,IAAI,IAAI,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;gCACnC,OAAO,CAAC,UAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BAC5C,CAAC;4BACD,MAAM;wBACR,CAAC;wBACD,KAAK,OAAO,CAAC,CAAC,CAAC;4BACb,4BAA4B;4BAC5B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gCACzB,MAAM,YAAY,GAAa,EAAE,CAAC;gCAClC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oCACzB,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oCACtB,OAAO,CAAC,UAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gCAC3C,CAAC;gCACD,MAAM,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,aAAa;4BACxD,CAAC;iCAAM,CAAC;gCACN,MAAM,IAAI,GAAG,CAAC;gCACb,OAAO,CAAC,UAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BAC5C,CAAC;4BACD,MAAM;wBACR,CAAC;wBACD,KAAK,QAAQ,CAAC,CAAC,CAAC;4BACd,oCAAoC;4BACpC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gCACzB,MAAM,YAAY,GAAa,EAAE,CAAC;gCAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oCACtC,sCAAsC;oCACtC,MAAM,SAAS,GAAG,GAAG,UAAU,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC,CAAC,mCAAmC;oCACpF,YAAY,CAAC,IAAI,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC;oCAClC,OAAO,CAAC,UAAkC,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gCACpE,CAAC;gCACD,MAAM,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,qBAAqB;4BAChE,CAAC;iCAAM,CAAC;gCACN,MAAM,IAAI,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;gCACnC,OAAO,CAAC,UAAkC,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;4BAC3E,CAAC;4BACD,MAAM;wBACR,CAAC;wBACD,OAAO,CAAC,CAAC,CAAC;4BACR,iBAAiB;4BACjB,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;4BACpE,MAAM,IAAI,YAAY,IAAI,EAAE,CAAC;wBAC/B,CAAC;oBACH,CAAC;oBACD,MAAM;gBACR,CAAC;gBACD,QAAQ;YACV,CAAC;QACH,CAAC;QAED,gBAAgB;QAChB,MAAM,IAAI,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;;OAMG;IACK,qBAAqB,CAAC,QAAgB,EAAE,UAAsB;QACpE,IAAI,UAAU,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,CAAC,IAAI,qCAAqC,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,KAAK,GAAa,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7C,KAAK,IAAI,CAAC,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3D,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACnB,IAAI,OAAO,EAAE,CAAC;gBACZ,SAAS;gBACT,QAAQ,IAAI,EAAE,CAAC;oBACb,KAAK,CAAC,KAAK,GAAG;wBACZ,QAAQ;wBACR,OAAO,CAAC,GAAG,CAAC,CAAC;oBACf,KAAK,CAAC,KAAK,IAAI;wBACb,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;oBACzC,QAAQ;gBACV,CAAC;YACH,CAAC;iBAAM,IAAI,MAAM,EAAE,CAAC;gBAClB,UAAU;gBACV,QAAQ,IAAI,EAAE,CAAC;oBACb,KAAK,CAAC,KAAK,IAAI;wBACb,SAAS;wBACT,OAAO,CAAC,GAAG,CAAC,CAAC;oBACf,KAAK,CAAC,KAAK,IAAI;wBACb,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;oBAC3C,QAAQ;gBACV,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,QAAQ,IAAI,EAAE,CAAC;oBACb,KAAK,CAAC,KAAK,IAAI;wBACb,SAAS;wBACT,MAAM,GAAG,IAAI,CAAC;wBACd,MAAM;oBACR,KAAK,CAAC,KAAK,GAAG;wBACZ,QAAQ;wBACR,OAAO,GAAG,IAAI,CAAC;wBACf,MAAM;oBACR,KAAK,CAAC,KAAK,GAAG;wBACZ,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;oBACzC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG;wBAC7C,SAAS;wBACT,OAAO,CAAC,GAAG,CAAC,CAAC;oBACf,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG;wBAC7C,QAAQ;wBACR,OAAO,CAAC,GAAG,CAAC,CAAC;oBACf,KAAK,CAAC,KAAK,IAAI;wBACb,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;4BACnC,OAAO;4BACP,OAAO,CAAC,GAAG,CAAC,CAAC;wBACf,CAAC;wBACD,KAAK;wBACL,OAAO,CAAC,CAAC;oBACX,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI;wBAC1B,OAAO;wBACP,OAAO,CAAC,CAAC;oBACX,QAAQ;gBACV,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC,MAAM,CAAC;IACzB,CAAC;IAED;;;;;;OAMG;IACK,iBAAiB,CAAC,SAAiB,EAAE,MAA2B;QACtE,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,yCAAkB,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,GAAG,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACxD,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,6BAA6B,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YACtE,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACK,YAAY,CAAqD,QAAgB,EAAE,MAA2B,EAAE,OAEvH;QACC,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACnD,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,QAAQ,OAAO,EAAE,YAAY,EAAE,CAAC;gBAC9B,KAAK,OAAO,CAAC;gBACb,KAAK,QAAQ;oBACX,OAAO,KAA4B,CAAC;gBACtC;oBACE,SAAS;oBACT,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;wBACzB,MAAM,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;oBAC9F,CAAC;yBAAM,CAAC;wBACN,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;oBACzE,CAAC;oBACD,OAAO,MAA6B,CAAC;YACzC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YAChE,OAAO,SAAgC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACK,MAAM,CAAC,GAAW;QACxB,IAAI,aAAa,GAAG,GAAG,CAAC;QACxB,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACpD,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrD,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAreD,gCAqeC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalwalletcorp/sql-builder",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "This is a library for building SQL",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -9,7 +9,8 @@
     "version:patch": "npm version patch",
     "version:minor": "npm version minor",
     "version:major": "npm version major",
-    "pack": "rm -rf dest && mkdir -p dest && npm pack --pack-destination=dest",
+    "prepack": "rm -rf lib && npm run build",
+    "pack": "npm pack --pack-destination=dest",
     "publish:npm": "bash ../bin/publish.sh",
     "test:unit": "NODE_OPTIONS=--max-old-space-size=2048 npx jest --runInBand --logHeapUsage --detectOpenHandles --forceExit --errorOnDeprecated --coverage --silent --unhandled-rejections=strict"
   },

package/src/abstract-syntax-tree.ts

@@ -5,13 +5,11 @@ type Token =
   | { type: 'OPERATOR'; value: string }   // 例: >, &&, ===, !=
   | { type: 'NUMBER'; value: number }     // 例: 100.123
   | { type: 'BOOLEAN'; value: boolean }   // 例: true, false
-  | { type: 'NULL' }
-  | { type: 'UNDEFINED' }
   | { type: 'STRING'; value: string }     // 例: 'abc'
+  | { type: 'NULL'; value: null }
+  | { type: 'UNDEFINED', value: undefined }
   | { type: 'PARENTHESIS'; value: '(' | ')' };
 
-type RpnToken = Token | { type: 'MEMBER_ACCESS_PART', value: string };
-
 // 演算子の優先順位と結合性 (より長い演算子を先に定義)
 const PRECEDENCE: {
   [op: string]: {
@@ -52,7 +50,7 @@ export class AbstractSyntaxTree {
       const result = this.evaluateRpn(rpnTokens, entity); // 評価
       return result;
     } catch (error) {
-      console.warn('Error evaluating condition:', condition, entity, error);
+      console.error('Error evaluating condition:', condition, entity, error);
       throw error;
     }
   }
@@ -170,10 +168,10 @@ export class AbstractSyntaxTree {
             tokens.push({ type: 'BOOLEAN', value: false });
             break;
           case 'null':
-            tokens.push({ type: 'NULL' });
+            tokens.push({ type: 'NULL', value: null });
             break;
           case 'undefined':
-            tokens.push({ type: 'UNDEFINED' });
+            tokens.push({ type: 'UNDEFINED', value: undefined });
             break;
           default:
             tokens.push({ type: 'IDENTIFIER', value: ident }); // プロパティ名
@@ -192,31 +190,26 @@ export class AbstractSyntaxTree {
    * Shunting Yardアルゴリズムで構文を逆ポーランド記法(Reverse Polish Notation)に変換する
    *
    * @param {Token[]} tokens
-   * @returns {RpnToken[]}
+   * @returns {Token[]}
    */
-  private shuntingYard(tokens: Token[]): RpnToken[] {
-    const output: RpnToken[] = [];
-    const operatorStack: Token[] = [];
+  private shuntingYard(tokens: Token[]): Token[] {
+    const output: Token[] = [];
+    const operatorStack: (Token & { value: string })[] = [];
 
     for (const token of tokens) {
-      const type = token.type;
-      switch (type) {
+      switch (token.type) {
         case 'NUMBER':
         case 'BOOLEAN':
         case 'NULL':
         case 'UNDEFINED':
         case 'STRING':
-          output.push(token);
-          break;
         case 'IDENTIFIER':
-          // 識別子（プロパティパスの可能性）をそのまま出力
           output.push(token);
           break;
         case 'OPERATOR':
           const op1 = token;
           while (operatorStack.length) {
-            // TODO: 型キャストが必要になるので、Geniericsを強化する
-            const op2 = operatorStack[operatorStack.length - 1] as { type: string, value: string };
+            const op2 = operatorStack[operatorStack.length - 1];
 
             // 括弧内は処理しない
             if (op2.value === '(') {
@@ -224,11 +217,8 @@ export class AbstractSyntaxTree {
             }
 
             // 優先順位のルールに従う
-            if (
-              (PRECEDENCE[op1.value].associativity === 'left' && PRECEDENCE[op1.value].precedence <= PRECEDENCE[op2.value].precedence)
-              // ||
-              // (PRECEDENCE[op1.value].associativity === 'right' && PRECEDENCE[op1.value].precedence < PRECEDENCE[op2.value].precedence)
-            ) {
+            if (PRECEDENCE[op1.value].associativity === 'left'
+                && PRECEDENCE[op1.value].precedence <= PRECEDENCE[op2.value].precedence) {
               output.push(operatorStack.pop()!);
             } else {
               break;
@@ -254,8 +244,7 @@ export class AbstractSyntaxTree {
             }
           }
           break;
-        default:
-          throw new Error(`Unexpected token type: ${type}`);
+        // default:
       }
     }
 
@@ -273,24 +262,21 @@ export class AbstractSyntaxTree {
   /**
    * 逆ポーランド記法(Reverse Polish Notation)のトークンを評価する
    *
-   * @param {RpnToken[]} rpnTokens
+   * @param {Token[]} rpnTokens
    * @param {Record<string, any>} entity
    * @returns {boolean}
    */
-  private evaluateRpn(rpnTokens: RpnToken[], entity: Record<string, any>): boolean {
+  private evaluateRpn(rpnTokens: Token[], entity: Record<string, any>): boolean {
     const stack: any[] = [];
 
     for (const token of rpnTokens) {
-      const type = token.type;
-      switch (type) {
+      switch (token.type) {
         case 'NUMBER':
         case 'BOOLEAN':
+        case 'STRING':
         case 'NULL':
         case 'UNDEFINED':
-        case 'STRING':
-          if ('value' in token) {
-            stack.push(token.value);
-          }
+          stack.push(token.value);
           break;
         case 'IDENTIFIER':
           stack.push(common.getProperty(entity, token.value));
@@ -321,8 +307,7 @@ export class AbstractSyntaxTree {
             default: throw new Error(`Unknown operator: ${token.value}`);
           }
           break;
-        default:
-          throw new Error(`Unexpected token type in RPN: ${type}`);
+        // default:
       }
     }