jsql-neo 5.4.2 → 5.5.0

package/lib/date-types.js

@@ -1,183 +1,183 @@
-// © Vexify 2026 All Rights Reserved.
-/**
- * JSQL Date Types — DATE / DATETIME / TIMESTAMP 类型处理
- */
-
-const { createError } = require('./errors');
-
-/**
- * 验证并规范化日期类型值
- * @param {*} value - 输入值
- * @param {string} type - 'date' | 'datetime' | 'timestamp'
- * @param {string} fieldName - 字段名（用于错误提示）
- * @returns {*} 规范化后的值
- */
-function validateDateType(value, type, fieldName) {
-    if (value === null || value === undefined) return value;
-
-    switch (type) {
-        case 'date':
-            return validateDate(value, fieldName);
-        case 'datetime':
-            return validateDateTime(value, fieldName);
-        case 'timestamp':
-            return validateTimestamp(value, fieldName);
-        case 'time':
-            return validateTime(value, fieldName);
-        default:
-            return value;
-    }
-}
-
-// ============================================================
-// DATE: YYYY-MM-DD
-// ============================================================
-
-function validateDate(value, fieldName) {
-    if (value instanceof Date) {
-        return value.toISOString().slice(0, 10);
-    }
-    if (typeof value === 'number') {
-        // Unix timestamp → date
-        return new Date(value * 1000).toISOString().slice(0, 10);
-    }
-    if (typeof value === 'string') {
-        const d = parseDateString(value);
-        if (d) return d.toISOString().slice(0, 10);
-    }
-    throw createError('ER_INVALID_DATE', fieldName, String(value));
-}
-
-function parseDateString(str) {
-    // YYYY-MM-DD
-    let m = str.match(/^(\d{4})-(\d{2})-(\d{2})$/);
-    if (m) {
-        const d = new Date(parseInt(m[1]), parseInt(m[2]) - 1, parseInt(m[3]));
-        if (d.getFullYear() === parseInt(m[1])) return d;
-    }
-    // YYYY/MM/DD
-    m = str.match(/^(\d{4})\/(\d{2})\/(\d{2})$/);
-    if (m) {
-        const d = new Date(parseInt(m[1]), parseInt(m[2]) - 1, parseInt(m[3]));
-        if (d.getFullYear() === parseInt(m[1])) return d;
-    }
-    // MM/DD/YYYY
-    m = str.match(/^(\d{2})\/(\d{2})\/(\d{4})$/);
-    if (m) {
-        const d = new Date(parseInt(m[3]), parseInt(m[1]) - 1, parseInt(m[2]));
-        if (d.getFullYear() === parseInt(m[3])) return d;
-    }
-    // Try native parse
-    const d = new Date(str);
-    if (!isNaN(d.getTime())) return d;
-    return null;
-}
-
-// ============================================================
-// DATETIME: YYYY-MM-DD HH:MM:SS
-// ============================================================
-
-function validateDateTime(value, fieldName) {
-    if (value instanceof Date) {
-        return value.toISOString().replace('T', ' ').slice(0, 19);
-    }
-    if (typeof value === 'number') {
-        return new Date(value * 1000).toISOString().replace('T', ' ').slice(0, 19);
-    }
-    if (typeof value === 'string') {
-        // ISO format: 2024-01-15T10:30:00.000Z
-        const isoMatch = value.match(/^(\d{4}-\d{2}-\d{2})T(\d{2}:\d{2}:\d{2})/);
-        if (isoMatch) {
-            return isoMatch[1] + ' ' + isoMatch[2];
-        }
-        // MySQL format: YYYY-MM-DD HH:MM:SS
-        const myMatch = value.match(/^(\d{4}-\d{2}-\d{2}) (\d{2}:\d{2}:\d{2})$/);
-        if (myMatch) {
-            const d = new Date(value.replace(' ', 'T') + 'Z');
-            if (!isNaN(d.getTime())) return value;
-        }
-        const d = new Date(value);
-        if (!isNaN(d.getTime())) {
-            return d.toISOString().replace('T', ' ').slice(0, 19);
-        }
-    }
-    throw createError('ER_INVALID_DATE', fieldName, String(value));
-}
-
-// ============================================================
-// TIMESTAMP: Unix 时间戳（秒）
-// ============================================================
-
-function validateTimestamp(value, fieldName) {
-    if (value instanceof Date) {
-        return Math.floor(value.getTime() / 1000);
-    }
-    if (typeof value === 'number') {
-        // 自动检测毫秒时间戳
-        if (value > 1e12) return Math.floor(value / 1000);
-        return value;
-    }
-    if (typeof value === 'string') {
-        const d = new Date(value);
-        if (!isNaN(d.getTime())) {
-            return Math.floor(d.getTime() / 1000);
-        }
-        const n = parseInt(value, 10);
-        if (!isNaN(n)) {
-            if (n > 1e12) return Math.floor(n / 1000);
-            return n;
-        }
-    }
-    throw createError('ER_INVALID_DATE', fieldName, String(value));
-}
-
-// ============================================================
-// TIME: HH:MM:SS
-// ============================================================
-
-function validateTime(value, fieldName) {
-    if (typeof value === 'string') {
-        const m = value.match(/^(\d{2}):(\d{2}):(\d{2})$/);
-        if (m) {
-            const h = parseInt(m[1]), min = parseInt(m[2]), sec = parseInt(m[3]);
-            if (h >= 0 && h < 24 && min >= 0 && min < 60 && sec >= 0 && sec < 60) {
-                return value;
-            }
-        }
-        // 负时间: -HH:MM:SS
-        const neg = value.match(/^-(\d{2}):(\d{2}):(\d{2})$/);
-        if (neg) return value;
-    }
-    throw createError('ER_INVALID_DATE', fieldName, String(value));
-}
-
-// ============================================================
-// 类型转换辅助
-// ============================================================
-
-function now(type = 'datetime') {
-    const d = new Date();
-    switch (type) {
-        case 'date': return d.toISOString().slice(0, 10);
-        case 'timestamp': return Math.floor(d.getTime() / 1000);
-        case 'time': return d.toISOString().slice(11, 19);
-        default: return d.toISOString().replace('T', ' ').slice(0, 19);
-    }
-}
-
-function formatDate(value, format = 'YYYY-MM-DD') {
-    if (!value) return value;
-    const d = value instanceof Date ? value : new Date(value);
-    if (isNaN(d.getTime())) return String(value);
-
-    const pad = n => String(n).padStart(2, '0');
-    return format
-        .replace('YYYY', d.getFullYear())
-        .replace('MM', pad(d.getMonth() + 1))
-        .replace('DD', pad(d.getDate()))
-        .replace('HH', pad(d.getHours()))
-        .replace('mm', pad(d.getMinutes()))
-        .replace('ss', pad(d.getSeconds()));
-}
-
+// © Vexify 2026 All Rights Reserved.
+/**
+ * JSQL Date Types — DATE / DATETIME / TIMESTAMP 类型处理
+ */
+
+const { createError } = require('./errors');
+
+/**
+ * 验证并规范化日期类型值
+ * @param {*} value - 输入值
+ * @param {string} type - 'date' | 'datetime' | 'timestamp'
+ * @param {string} fieldName - 字段名（用于错误提示）
+ * @returns {*} 规范化后的值
+ */
+function validateDateType(value, type, fieldName) {
+    if (value === null || value === undefined) return value;
+
+    switch (type) {
+        case 'date':
+            return validateDate(value, fieldName);
+        case 'datetime':
+            return validateDateTime(value, fieldName);
+        case 'timestamp':
+            return validateTimestamp(value, fieldName);
+        case 'time':
+            return validateTime(value, fieldName);
+        default:
+            return value;
+    }
+}
+
+// ============================================================
+// DATE: YYYY-MM-DD
+// ============================================================
+
+function validateDate(value, fieldName) {
+    if (value instanceof Date) {
+        return value.toISOString().slice(0, 10);
+    }
+    if (typeof value === 'number') {
+        // Unix timestamp → date
+        return new Date(value * 1000).toISOString().slice(0, 10);
+    }
+    if (typeof value === 'string') {
+        const d = parseDateString(value);
+        if (d) return d.toISOString().slice(0, 10);
+    }
+    throw createError('ER_INVALID_DATE', fieldName, String(value));
+}
+
+function parseDateString(str) {
+    // YYYY-MM-DD
+    let m = str.match(/^(\d{4})-(\d{2})-(\d{2})$/);
+    if (m) {
+        const d = new Date(parseInt(m[1]), parseInt(m[2]) - 1, parseInt(m[3]));
+        if (d.getFullYear() === parseInt(m[1])) return d;
+    }
+    // YYYY/MM/DD
+    m = str.match(/^(\d{4})\/(\d{2})\/(\d{2})$/);
+    if (m) {
+        const d = new Date(parseInt(m[1]), parseInt(m[2]) - 1, parseInt(m[3]));
+        if (d.getFullYear() === parseInt(m[1])) return d;
+    }
+    // MM/DD/YYYY
+    m = str.match(/^(\d{2})\/(\d{2})\/(\d{4})$/);
+    if (m) {
+        const d = new Date(parseInt(m[3]), parseInt(m[1]) - 1, parseInt(m[2]));
+        if (d.getFullYear() === parseInt(m[3])) return d;
+    }
+    // Try native parse
+    const d = new Date(str);
+    if (!isNaN(d.getTime())) return d;
+    return null;
+}
+
+// ============================================================
+// DATETIME: YYYY-MM-DD HH:MM:SS
+// ============================================================
+
+function validateDateTime(value, fieldName) {
+    if (value instanceof Date) {
+        return value.toISOString().replace('T', ' ').slice(0, 19);
+    }
+    if (typeof value === 'number') {
+        return new Date(value * 1000).toISOString().replace('T', ' ').slice(0, 19);
+    }
+    if (typeof value === 'string') {
+        // ISO format: 2024-01-15T10:30:00.000Z
+        const isoMatch = value.match(/^(\d{4}-\d{2}-\d{2})T(\d{2}:\d{2}:\d{2})/);
+        if (isoMatch) {
+            return isoMatch[1] + ' ' + isoMatch[2];
+        }
+        // MySQL format: YYYY-MM-DD HH:MM:SS
+        const myMatch = value.match(/^(\d{4}-\d{2}-\d{2}) (\d{2}:\d{2}:\d{2})$/);
+        if (myMatch) {
+            const d = new Date(value.replace(' ', 'T') + 'Z');
+            if (!isNaN(d.getTime())) return value;
+        }
+        const d = new Date(value);
+        if (!isNaN(d.getTime())) {
+            return d.toISOString().replace('T', ' ').slice(0, 19);
+        }
+    }
+    throw createError('ER_INVALID_DATE', fieldName, String(value));
+}
+
+// ============================================================
+// TIMESTAMP: Unix 时间戳（秒）
+// ============================================================
+
+function validateTimestamp(value, fieldName) {
+    if (value instanceof Date) {
+        return Math.floor(value.getTime() / 1000);
+    }
+    if (typeof value === 'number') {
+        // 自动检测毫秒时间戳
+        if (value > 1e12) return Math.floor(value / 1000);
+        return value;
+    }
+    if (typeof value === 'string') {
+        const d = new Date(value);
+        if (!isNaN(d.getTime())) {
+            return Math.floor(d.getTime() / 1000);
+        }
+        const n = parseInt(value, 10);
+        if (!isNaN(n)) {
+            if (n > 1e12) return Math.floor(n / 1000);
+            return n;
+        }
+    }
+    throw createError('ER_INVALID_DATE', fieldName, String(value));
+}
+
+// ============================================================
+// TIME: HH:MM:SS
+// ============================================================
+
+function validateTime(value, fieldName) {
+    if (typeof value === 'string') {
+        const m = value.match(/^(\d{2}):(\d{2}):(\d{2})$/);
+        if (m) {
+            const h = parseInt(m[1]), min = parseInt(m[2]), sec = parseInt(m[3]);
+            if (h >= 0 && h < 24 && min >= 0 && min < 60 && sec >= 0 && sec < 60) {
+                return value;
+            }
+        }
+        // 负时间: -HH:MM:SS
+        const neg = value.match(/^-(\d{2}):(\d{2}):(\d{2})$/);
+        if (neg) return value;
+    }
+    throw createError('ER_INVALID_DATE', fieldName, String(value));
+}
+
+// ============================================================
+// 类型转换辅助
+// ============================================================
+
+function now(type = 'datetime') {
+    const d = new Date();
+    switch (type) {
+        case 'date': return d.toISOString().slice(0, 10);
+        case 'timestamp': return Math.floor(d.getTime() / 1000);
+        case 'time': return d.toISOString().slice(11, 19);
+        default: return d.toISOString().replace('T', ' ').slice(0, 19);
+    }
+}
+
+function formatDate(value, format = 'YYYY-MM-DD') {
+    if (!value) return value;
+    const d = value instanceof Date ? value : new Date(value);
+    if (isNaN(d.getTime())) return String(value);
+
+    const pad = n => String(n).padStart(2, '0');
+    return format
+        .replace('YYYY', d.getFullYear())
+        .replace('MM', pad(d.getMonth() + 1))
+        .replace('DD', pad(d.getDate()))
+        .replace('HH', pad(d.getHours()))
+        .replace('mm', pad(d.getMinutes()))
+        .replace('ss', pad(d.getSeconds()));
+}
+
 module.exports = { validateDateType, now, formatDate };

package/lib/errors.js

@@ -1,90 +1,90 @@
-// © Vexify 2026 All Rights Reserved.
-/**
- * JSQL Error Codes — MySQL 风格错误码体系
- */
-
-class JSQL_Error extends Error {
-    constructor(code, message, details = {}) {
-        super(message);
-        this.name = 'JSQL_Error';
-        this.code = code;
-        this.details = details;
-        this.timestamp = new Date().toISOString();
-    }
-
-    toJSON() {
-        return {
-            error: true,
-            code: this.code,
-            message: this.message,
-            details: this.details,
-            timestamp: this.timestamp
-        };
-    }
-}
-
-// MySQL 兼容错误码
-const ErrorCodes = {
-    // 表/库操作
-    ER_TABLE_EXISTS:          { code: 1050,  msg: "Table '%s' already exists" },
-    ER_NO_SUCH_TABLE:         { code: 1146,  msg: "Table '%s' doesn't exist" },
-    ER_DB_CREATE_EXISTS:      { code: 1007,  msg: "Can't create database '%s'; database exists" },
-
-    // 列操作
-    ER_DUP_FIELDNAME:         { code: 1060,  msg: "Duplicate column name '%s'" },
-    ER_BAD_FIELD_ERROR:       { code: 1054,  msg: "Unknown column '%s' in '%s'" },
-    ER_CANT_DROP_FIELD:       { code: 1091,  msg: "Can't DROP '%s'; check that column exists" },
-
-    // 约束
-    ER_DUP_ENTRY:             { code: 1062,  msg: "Duplicate entry '%s' for key '%s'" },
-    ER_NO_DEFAULT_FOR_FIELD:  { code: 1364,  msg: "Field '%s' doesn't have a default value" },
-    ER_BAD_NULL_ERROR:        { code: 1048,  msg: "Column '%s' cannot be null" },
-    ER_CHECK_CONSTRAINT:      { code: 3819,  msg: "Check constraint '%s' is violated" },
-    ER_NO_REFERENCED_ROW:     { code: 1216,  msg: "Cannot add or update: foreign key constraint fails" },
-    ER_ROW_IS_REFERENCED:     { code: 1217,  msg: "Cannot delete or update: a foreign key constraint fails" },
-
-    // 数据类型
-    ER_TRUNCATED_WRONG_VALUE: { code: 1292,  msg: "Truncated incorrect %s value: '%s'" },
-    ER_INVALID_DATE:          { code: 1292,  msg: "Incorrect date value: '%s'" },
-    ER_DATA_TOO_LONG:         { code: 1406,  msg: "Data too long for column '%s'" },
-    ER_OUT_OF_RANGE:          { code: 1264,  msg: "Out of range value for column '%s'" },
-
-    // 事务
-    ER_TRANSACTION_ACTIVE:    { code: 1568,  msg: "Transaction already in progress" },
-    ER_NO_TRANSACTION:        { code: 1569,  msg: "No transaction in progress" },
-
-    // 其他
-    ER_NOT_SUPPORTED:         { code: 1235,  msg: "This version doesn't yet support '%s'" },
-    ER_PARSE_ERROR:           { code: 1064,  msg: "You have an error in your syntax: %s" },
-    ER_LOCK_WAIT_TIMEOUT:     { code: 1205,  msg: "Lock wait timeout exceeded; try restarting transaction" },
-    ER_FILE_NOT_FOUND:        { code: 1017,  msg: "Can't find file: '%s'" },
-    ER_VIEW_EXISTS:           { code: 1050,  msg: "View '%s' already exists" },
-    ER_TRIGGER_EXISTS:        { code: 1359,  msg: "Trigger '%s' already exists" },
-    ER_TRIGGER_NOT_FOUND:     { code: 1360,  msg: "Trigger '%s' does not exist" },
-    ER_PLUGIN_ERR:            { code: 1125,  msg: "Plugin error: %s" },
-    ER_PLUGIN_ABORT:          { code: 1125,  msg: "Operation aborted by plugin: %s" },
-    ER_TABLE_EXISTS_ERROR:    { code: 1050,  msg: "Table '%s' already exists" },
-    ER_BAD_TABLE_NAME:        { code: 1058,  msg: "Invalid table name '%s'" },
-    ER_BAD_REGEX:             { code: 1258,  msg: "Unsafe regular expression rejected: %s" },
-    ER_DBATTACH_EXISTS:       { code: 1007,  msg: "Database '%s' already attached" },
-    ER_DBATTACH_NOT_FOUND:    { code: 1049,  msg: "Attached database '%s' not found" },
-};
-
-/**
- * 创建错误
- */
-function createError(codeKey, ...args) {
-    const template = ErrorCodes[codeKey];
-    if (!template) {
-        return new JSQL_Error('UNKNOWN', `Unknown error: ${codeKey}`, { codeKey, args });
-    }
-
-    let msg = template.msg;
-    for (let i = 0; i < args.length; i++) {
-        msg = msg.replace('%s', String(args[i]));
-    }
-
-    return new JSQL_Error(template.code, msg, { args });
-}
-
+// © Vexify 2026 All Rights Reserved.
+/**
+ * JSQL Error Codes — MySQL 风格错误码体系
+ */
+
+class JSQL_Error extends Error {
+    constructor(code, message, details = {}) {
+        super(message);
+        this.name = 'JSQL_Error';
+        this.code = code;
+        this.details = details;
+        this.timestamp = new Date().toISOString();
+    }
+
+    toJSON() {
+        return {
+            error: true,
+            code: this.code,
+            message: this.message,
+            details: this.details,
+            timestamp: this.timestamp
+        };
+    }
+}
+
+// MySQL 兼容错误码
+const ErrorCodes = {
+    // 表/库操作
+    ER_TABLE_EXISTS:          { code: 1050,  msg: "Table '%s' already exists" },
+    ER_NO_SUCH_TABLE:         { code: 1146,  msg: "Table '%s' doesn't exist" },
+    ER_DB_CREATE_EXISTS:      { code: 1007,  msg: "Can't create database '%s'; database exists" },
+
+    // 列操作
+    ER_DUP_FIELDNAME:         { code: 1060,  msg: "Duplicate column name '%s'" },
+    ER_BAD_FIELD_ERROR:       { code: 1054,  msg: "Unknown column '%s' in '%s'" },
+    ER_CANT_DROP_FIELD:       { code: 1091,  msg: "Can't DROP '%s'; check that column exists" },
+
+    // 约束
+    ER_DUP_ENTRY:             { code: 1062,  msg: "Duplicate entry '%s' for key '%s'" },
+    ER_NO_DEFAULT_FOR_FIELD:  { code: 1364,  msg: "Field '%s' doesn't have a default value" },
+    ER_BAD_NULL_ERROR:        { code: 1048,  msg: "Column '%s' cannot be null" },
+    ER_CHECK_CONSTRAINT:      { code: 3819,  msg: "Check constraint '%s' is violated" },
+    ER_NO_REFERENCED_ROW:     { code: 1216,  msg: "Cannot add or update: foreign key constraint fails" },
+    ER_ROW_IS_REFERENCED:     { code: 1217,  msg: "Cannot delete or update: a foreign key constraint fails" },
+
+    // 数据类型
+    ER_TRUNCATED_WRONG_VALUE: { code: 1292,  msg: "Truncated incorrect %s value: '%s'" },
+    ER_INVALID_DATE:          { code: 1292,  msg: "Incorrect date value: '%s'" },
+    ER_DATA_TOO_LONG:         { code: 1406,  msg: "Data too long for column '%s'" },
+    ER_OUT_OF_RANGE:          { code: 1264,  msg: "Out of range value for column '%s'" },
+
+    // 事务
+    ER_TRANSACTION_ACTIVE:    { code: 1568,  msg: "Transaction already in progress" },
+    ER_NO_TRANSACTION:        { code: 1569,  msg: "No transaction in progress" },
+
+    // 其他
+    ER_NOT_SUPPORTED:         { code: 1235,  msg: "This version doesn't yet support '%s'" },
+    ER_PARSE_ERROR:           { code: 1064,  msg: "You have an error in your syntax: %s" },
+    ER_LOCK_WAIT_TIMEOUT:     { code: 1205,  msg: "Lock wait timeout exceeded; try restarting transaction" },
+    ER_FILE_NOT_FOUND:        { code: 1017,  msg: "Can't find file: '%s'" },
+    ER_VIEW_EXISTS:           { code: 1050,  msg: "View '%s' already exists" },
+    ER_TRIGGER_EXISTS:        { code: 1359,  msg: "Trigger '%s' already exists" },
+    ER_TRIGGER_NOT_FOUND:     { code: 1360,  msg: "Trigger '%s' does not exist" },
+    ER_PLUGIN_ERR:            { code: 1125,  msg: "Plugin error: %s" },
+    ER_PLUGIN_ABORT:          { code: 1125,  msg: "Operation aborted by plugin: %s" },
+    ER_TABLE_EXISTS_ERROR:    { code: 1050,  msg: "Table '%s' already exists" },
+    ER_BAD_TABLE_NAME:        { code: 1058,  msg: "Invalid table name '%s'" },
+    ER_BAD_REGEX:             { code: 1258,  msg: "Unsafe regular expression rejected: %s" },
+    ER_DBATTACH_EXISTS:       { code: 1007,  msg: "Database '%s' already attached" },
+    ER_DBATTACH_NOT_FOUND:    { code: 1049,  msg: "Attached database '%s' not found" },
+};
+
+/**
+ * 创建错误
+ */
+function createError(codeKey, ...args) {
+    const template = ErrorCodes[codeKey];
+    if (!template) {
+        return new JSQL_Error('UNKNOWN', `Unknown error: ${codeKey}`, { codeKey, args });
+    }
+
+    let msg = template.msg;
+    for (let i = 0; i < args.length; i++) {
+        msg = msg.replace('%s', String(args[i]));
+    }
+
+    return new JSQL_Error(template.code, msg, { args });
+}
+
 module.exports = { JSQL_Error, ErrorCodes, createError };