befly 3.15.8 → 3.15.10

package/dist/befly.js

@@ -8246,7 +8246,7 @@ function formatValuePreview(value) {
 }
 var RESERVED_FIELDS = ["id", "created_at", "updated_at", "deleted_at", "state"];
 var RESERVED_FIELD_SET = new Set(RESERVED_FIELDS);
-var FIELD_TYPES = ["string", "number", "text", "array_string", "array_text", "array_number_string", "array_number_text"];
+var FIELD_TYPES = ["string", "number", "text", "datetime", "array_string", "array_text", "array_number_string", "array_number_text"];
 var FIELD_TYPE_SET = new Set(FIELD_TYPES);
 var ALLOWED_FIELD_PROPERTIES = ["name", "type", "min", "max", "default", "detail", "index", "unique", "nullable", "unsigned", "regexp"];
 var ALLOWED_FIELD_PROPERTY_SET = new Set(ALLOWED_FIELD_PROPERTIES);
@@ -8389,6 +8389,23 @@ async function checkTable(tables, config2) {
             Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A ${field.type} \u7C7B\u578B\uFF0C\u4E0D\u652F\u6301\u552F\u4E00\u7EA6\u675F\uFF08unique=true \u65E0\u6548\uFF09`);
             hasError = true;
           }
+        } else if (field.type === "datetime") {
+          if (field.min !== undefined && field.min !== null) {
+            Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A datetime \u7C7B\u578B\uFF0Cmin \u5FC5\u987B\u4E3A null\uFF0C\u5F53\u524D\u4E3A "${field.min}"`);
+            hasError = true;
+          }
+          if (field.max !== undefined && field.max !== null) {
+            Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A datetime \u7C7B\u578B\uFF0Cmax \u5FC5\u987B\u4E3A null\uFF0C\u5F53\u524D\u4E3A "${field.max}"`);
+            hasError = true;
+          }
+          if (field.default !== undefined && field.default !== null) {
+            Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A datetime \u7C7B\u578B\uFF0C\u9ED8\u8BA4\u503C\u5FC5\u987B\u4E3A null\uFF08\u5982\u9700\u5F53\u524D\u65F6\u95F4\uFF0C\u8BF7\u5728\u4E1A\u52A1\u5199\u5165\u65F6\u8D4B\u503C\uFF09\u3002\u5F53\u524D\u4E3A ${formatValuePreview(field.default)}`);
+            hasError = true;
+          }
+          if (field.unsigned !== undefined) {
+            Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A datetime \u7C7B\u578B\uFF0C\u4E0D\u5141\u8BB8\u8BBE\u7F6E unsigned`);
+            hasError = true;
+          }
         } else if (field.type === "string" || field.type === "array_string" || field.type === "array_number_string") {
           if (field.max === undefined || field.max === null || typeof field.max !== "number") {
             Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A ${field.type} \u7C7B\u578B\uFF0C` + `\u5FC5\u987B\u8BBE\u7F6E max \u4E14\u7C7B\u578B\u4E3A\u6570\u5B57\uFF1B\u5176\u4E2D array_*_string \u7684 max \u8868\u793A\u5355\u4E2A\u5143\u7D20\u957F\u5EA6\uFF0C\u5F53\u524D\u4E3A "${field.max}"`);
@@ -10025,6 +10042,7 @@ class SyncTable {
     return {
       number: "BIGINT",
       string: "VARCHAR",
+      datetime: "DATETIME",
       text: "MEDIUMTEXT",
       array_string: "VARCHAR",
       array_text: "MEDIUMTEXT",
@@ -10080,6 +10098,8 @@ class SyncTable {
         return 0;
       case "string":
         return "";
+      case "datetime":
+        return "null";
       case "array_string":
       case "array_number_string":
         return "[]";
@@ -10103,6 +10123,18 @@ class SyncTable {
         return ` DEFAULT '${escaped}'`;
       }
     }
+    if (fieldType === "datetime") {
+      if (typeof actualDefault === "string") {
+        const trimmed = actualDefault.trim();
+        if (/^current_timestamp(\(\s*\d+\s*\)|\(\s*\))?$/i.test(trimmed)) {
+          const normalized = trimmed.toUpperCase().replace(/\(\s*\)/g, "");
+          return ` DEFAULT ${normalized}`;
+        }
+        const escaped = trimmed.replace(/'/g, "''");
+        return ` DEFAULT '${escaped}'`;
+      }
+      return "";
+    }
     return "";
   }
   static buildIndexClause(indexName, fieldName, action) {
@@ -10169,6 +10201,7 @@ class SyncTable {
   static stripAlgorithmAndLock(stmt) {
     let sql = String(stmt);
     sql = sql.replace(/\bALGORITHM\s*=\s*(INPLACE|INSTANT|COPY)\b\s*,?\s*/gi, "").replace(/\bLOCK\s*=\s*(NONE|SHARED|EXCLUSIVE)\b\s*,?\s*/gi, "");
+    sql = sql.replace(/^\s*(ALTER\s+TABLE\s+(?:`[^`]+`|[a-zA-Z_][a-zA-Z0-9_]*))\s*,\s*/i, "$1 ");
     sql = sql.replace(/,\s*,/g, ", ").replace(/,\s*$/g, "").replace(/\s{2,}/g, " ").trim();
     return sql;
   }
@@ -10235,6 +10268,9 @@ class SyncTable {
     if (cBase === "char" && nBase === "varchar" || cBase === "varchar" && nBase === "char") {
       return true;
     }
+    if (cBase === "datetime" && nBase === "bigint" || cBase === "bigint" && nBase === "datetime") {
+      return false;
+    }
     return false;
   }
   static compareFieldDefinition(existingColumn, fieldDef) {
@@ -10382,12 +10418,12 @@ class SyncTable {
     const clauses = [...plan.addClauses, ...plan.modifyClauses];
     if (clauses.length > 0) {
       const tableQuoted = SyncTable.quoteIdentifier(tableName);
-      const stmt = `ALTER TABLE ${tableQuoted} ALGORITHM=INSTANT, LOCK=NONE, ${clauses.join(", ")}`;
+      const stmt = `ALTER TABLE ${tableQuoted} ALGORITHM=INSTANT, ${clauses.join(", ")}`;
       await SyncTable.executeDDLSafely(db, stmt);
     }
     if (plan.defaultClauses.length > 0) {
       const tableQuoted = SyncTable.quoteIdentifier(tableName);
-      const stmt = `ALTER TABLE ${tableQuoted} ALGORITHM=INSTANT, LOCK=NONE, ${plan.defaultClauses.join(", ")}`;
+      const stmt = `ALTER TABLE ${tableQuoted} ALGORITHM=INSTANT, ${plan.defaultClauses.join(", ")}`;
       await SyncTable.executeDDLSafely(db, stmt);
     }
     if (createIndexActions.length > 0) {
@@ -10461,7 +10497,12 @@ class SyncTable {
             const typeMapping = SyncTable.getTypeMapping();
             const expectedType = typeMapping[fieldDef.type]?.toLowerCase() || "";
             if (!SyncTable.isCompatibleTypeChange(currentType, expectedType)) {
-              const errorMsg = [`\u7981\u6B62\u5B57\u6BB5\u7C7B\u578B\u53D8\u66F4: ${tableName}.${dbFieldName}`, `\u5F53\u524D\u7C7B\u578B: ${typeChange?.current}`, `\u76EE\u6807\u7C7B\u578B: ${typeChange?.expected}`, "\u8BF4\u660E: \u4EC5\u5141\u8BB8\u5BBD\u5316\u578B\u53D8\u66F4\uFF08\u5982 INT->BIGINT, VARCHAR->TEXT\uFF09\uFF0C\u4EE5\u53CA CHAR/VARCHAR \u4E92\u8F6C\uFF1B\u5176\u4ED6\u7C7B\u578B\u53D8\u66F4\u9700\u8981\u624B\u52A8\u5904\u7406"].join(`
+              const errorMsg = [
+                `\u7981\u6B62\u5B57\u6BB5\u7C7B\u578B\u53D8\u66F4: ${tableName}.${dbFieldName}`,
+                `\u5F53\u524D\u7C7B\u578B: ${typeChange?.current}`,
+                `\u76EE\u6807\u7C7B\u578B: ${typeChange?.expected}`,
+                "\u8BF4\u660E: \u4EC5\u5141\u8BB8\u5BBD\u5316\u578B\u53D8\u66F4\uFF08\u5982 INT->BIGINT, VARCHAR->TEXT\uFF09\uFF0C\u4EE5\u53CA CHAR/VARCHAR \u4E92\u8F6C\uFF1BDATETIME \u4E0E BIGINT \u4E0D\u5141\u8BB8\u4E92\u8F6C\uFF08\u9700\u8981\u624B\u52A8\u8FC1\u79FB\u6570\u636E\uFF09"
+              ].join(`
 `);
               throw new Error(errorMsg);
             }
@@ -12485,6 +12526,15 @@ class Validator {
       case "string":
       case "text":
         return typeof value === "string" ? { value, error: null } : { value: null, error: "\u5FC5\u987B\u662F\u5B57\u7B26\u4E32" };
+      case "datetime":
+        if (typeof value !== "string") {
+          return { value: null, error: "\u5FC5\u987B\u662F\u65F6\u95F4\u5B57\u7B26\u4E32" };
+        }
+        const trimmed = value.trim();
+        if (/^\d{4}-\d{2}-\d{2}$/.test(trimmed)) {
+          return { value: `${trimmed} 00:00:00`, error: null };
+        }
+        return { value: trimmed, error: null };
       case "array_string":
       case "array_text":
         return Array.isArray(value) ? { value, error: null } : { value: null, error: "\u5FC5\u987B\u662F\u6570\u7EC4" };
@@ -12532,6 +12582,43 @@ class Validator {
         if (regex && !this.testRegex(regex, value))
           return "\u683C\u5F0F\u4E0D\u6B63\u786E";
         break;
+      case "datetime": {
+        if (typeof value !== "string")
+          return "\u5FC5\u987B\u662F\u65F6\u95F4\u5B57\u7B26\u4E32";
+        if (!/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(value))
+          return "\u683C\u5F0F\u4E0D\u6B63\u786E";
+        const [datePart, timePart] = value.split(" ");
+        if (typeof datePart !== "string" || typeof timePart !== "string")
+          return "\u683C\u5F0F\u4E0D\u6B63\u786E";
+        const [yStr, mStr, dStr] = datePart.split("-");
+        const [hhStr, mmStr, ssStr] = timePart.split(":");
+        const year = Number(yStr);
+        const month = Number(mStr);
+        const day = Number(dStr);
+        const hh = Number(hhStr);
+        const mm = Number(mmStr);
+        const ss = Number(ssStr);
+        if (!Number.isInteger(year) || year < 1000 || year > 9999)
+          return "\u683C\u5F0F\u4E0D\u6B63\u786E";
+        if (!Number.isInteger(month) || month < 1 || month > 12)
+          return "\u683C\u5F0F\u4E0D\u6B63\u786E";
+        if (!Number.isInteger(day) || day < 1)
+          return "\u683C\u5F0F\u4E0D\u6B63\u786E";
+        if (!Number.isInteger(hh) || hh < 0 || hh > 23)
+          return "\u683C\u5F0F\u4E0D\u6B63\u786E";
+        if (!Number.isInteger(mm) || mm < 0 || mm > 59)
+          return "\u683C\u5F0F\u4E0D\u6B63\u786E";
+        if (!Number.isInteger(ss) || ss < 0 || ss > 59)
+          return "\u683C\u5F0F\u4E0D\u6B63\u786E";
+        const isLeap = year % 4 === 0 && year % 100 !== 0 || year % 400 === 0;
+        const daysInMonth = [31, isLeap ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+        const maxDay = daysInMonth[month - 1] ?? 0;
+        if (day > maxDay)
+          return "\u683C\u5F0F\u4E0D\u6B63\u786E";
+        if (regex && !this.testRegex(regex, value))
+          return "\u683C\u5F0F\u4E0D\u6B63\u786E";
+        break;
+      }
       case "array_string":
       case "array_text":
       case "array_number_string":
@@ -12589,6 +12676,8 @@ class Validator {
     switch (type.toLowerCase()) {
       case "number":
         return 0;
+      case "datetime":
+        return null;
       case "array_string":
       case "array_text":
       case "array_number_string":