@digitalwalletcorp/sql-builder 1.1.0 → 1.2.1

package/README.md

@@ -234,6 +234,49 @@ Parameters: [ 123, 'project_a', 'project_b' ]
 | Bind Variable | `/*variable*/` | Binds a value from the `entity`. It automatically formats values: strings are quoted (`'value'`), numbers are left as is (`123`), and arrays are turned into comma-separated lists in parentheses (`('a','b',123)`). |
 | END | `/*END*/` | Marks the end of an `IF`, `BEGIN`, or `FOR` block. |
 
+---
+### 💡 Supported Property Paths
+
+For `/*variable*/` (Bind Variable) tags and the `collection` part of `/*FOR item:collection*/` tags, you can specify a path to access properties within the `entity` object.
+
+* **Syntax:** `propertyName`, `nested.property`.
+* **Supported:** Direct property access (e.g., `user.id`, `order.items.length`).
+* **Unsupported:** Function calls (e.g., `user.name.trim()`, `order.items.map(...)`) or any complex JavaScript expressions.
+
+**Example:**
+
+* **Valid Expression:** `/*userId*/` (accesses `entity.userId` as simple property)
+* **Valid Expression:** `/*items*/` (accesses `entity.items` as array)
+* **Invalid Expression:** `/*userId.slice(0, 10)*/` (Function call)
+* **Invalid Expression:** `/*items.filter(...)*/` (Function call)
+
+---
+
+### 💡 Supported `IF` Condition Syntax
+
+The `condition` inside an `/*IF ...*/` tag is evaluated as a JavaScript expression against the `entity` object. To ensure security and maintain simplicity, only a **limited subset of JavaScript syntax** is supported.
+
+**Supported Operations:**
+
+* **Entity Property Access:** You can reference properties from the `entity` object (e.g., `propertyName`, `nested.property`).
+* **Object Property Access:** Access the `length`, `size` or other property of object (e.g., `String.length`, `Array.length`, `Set.size`, `Map.size`).
+* **Comparison Operators:** `==`, `!=`, `===`, `!==`, `<`, `<=`, `>`, `>=`
+* **Logical Operators:** `&&` (AND), `||` (OR), `!` (NOT)
+* **Literals:** Numbers (`123`, `0.5`), Booleans (`true`, `false`), `null`, `undefined`, and string literals (`'value'`, `"value"`).
+* **Parentheses:** `()` for grouping expressions.
+
+**Unsupported Operations (and will cause an error if used):**
+
+* **Function Calls:** You **cannot** call functions on properties (e.g., `user.name.startsWith('A')`, `array.map(...)`).
+
+**Example:**
+
+* **Valid Condition:** `user.age > 18 && user.name.length > 0 && user.id != null`
+* **Invalid Condition:** `user.name.startsWith('A')` (Function call)
+* **Invalid Condition:** `user.role = 'admin'` (Assignment)
+
+---
+
 ## 📜 License
 
 This project is licensed under the MIT License. See the [LICENSE](https://opensource.org/licenses/MIT) file for details.

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 {};