@adep/cli 0.1.9 → 0.1.10

package/dist/index.js

@@ -1687,6 +1687,7 @@ function stripQuotes(raw) {
   const t = raw.trim();
   if (/^'.*'$/.test(t)) return t.slice(1, -1);
   if (/^".*"$/.test(t)) return t.slice(1, -1);
+  if (/^NULL$/i.test(t)) return null;
   return t;
 }
 function parseCreateTable(ddl) {
@@ -1707,50 +1708,109 @@ function parseCreateTable(ddl) {
   }
   return { name, columns };
 }
-function parseWhereClauses(whereRaw, cursor) {
-  const clauses = [];
-  for (const part of whereRaw.split(/\s+AND\s+/i)) {
-    const t = part.trim();
-    if (t.length === 0) continue;
-    if (/\bIS\s+NULL\b/i.test(t)) {
-      const col2 = ident(t.split(/\s+IS\s+NULL\b/i)[0] ?? "");
-      clauses.push({ column: col2, operator: "IS NULL", value: null, list: false });
-      continue;
-    }
-    if (/\bIS\s+NOT\s+NULL\b/i.test(t)) {
-      const col2 = ident(t.split(/\s+IS\s+NOT\s+NULL\b/i)[0] ?? "");
-      clauses.push({ column: col2, operator: "IS NOT NULL", value: null, list: false });
-      continue;
-    }
-    const opMatch = /^\s*((?:"[^"]+")|([A-Za-z_][A-Za-z0-9_]*))\s*(=|!=|>=|<=|>|<|like|in|not\s+in)\s*(.+)$/i.exec(
-      t
-    );
-    if (opMatch === null) continue;
-    const col = ident(opMatch[1] ?? "");
-    const op = (opMatch[3] ?? opMatch[2] ?? "").toLowerCase();
-    const rhs = (opMatch[4] ?? "").trim();
-    if (op === "in" || op === "not in") {
-      const inner = rhs.replace(/^\(|\)$/g, "");
-      const items = splitListItems(inner);
-      const list = items.map((item) => {
-        if (item.trim() === "?") return cursor.take();
-        return stripQuotes(item);
-      });
-      clauses.push({ column: col, operator: op, value: list, list: true });
+function splitTopLevel2(raw, token) {
+  const parts = [];
+  let depth = 0;
+  let inQuote = false;
+  let buffer = "";
+  const n = raw.length;
+  const isTokenAt = (i) => {
+    const word = raw.slice(i, i + token.length);
+    if (word.toUpperCase() !== token) return false;
+    const before = i === 0 ? "" : raw[i - 1] ?? "";
+    const after = raw[i + token.length] ?? "";
+    return !/[A-Za-z0-9_.]/.test(before) && !/[A-Za-z0-9_.]/.test(after);
+  };
+  for (let i = 0; i < n; i += 1) {
+    const ch = raw[i] ?? "";
+    if (ch === "'") {
+      if (inQuote && raw[i + 1] === "'") {
+        buffer += ch + (raw[i + 1] ?? "");
+        i += 1;
+        continue;
+      }
+      inQuote = !inQuote;
+      buffer += ch;
       continue;
     }
-    let value;
-    if (rhs === "?") {
-      value = cursor.take();
+    if (!inQuote && ch === "(") depth += 1;
+    else if (!inQuote && ch === ")") depth -= 1;
+    if (!inQuote && depth === 0 && isTokenAt(i)) {
+      parts.push(buffer);
+      buffer = "";
+      i += token.length - 1;
     } else {
-      value = stripQuotes(rhs);
+      buffer += ch;
     }
-    clauses.push({ column: col, operator: op, value, list: false });
   }
-  return clauses;
+  parts.push(buffer);
+  return parts;
 }
-function matchWhere(clauses, row) {
-  return clauses.every((c) => matchValue(row[c.column], c));
+function unqualifyColumn(raw) {
+  const t = raw.trim();
+  const dot = t.lastIndexOf(".");
+  if (dot > 0 && /^[A-Za-z_][A-Za-z0-9_]*\./.test(t)) return t.slice(dot + 1);
+  return t;
+}
+function parseLeftJoins(tail) {
+  const joins = [];
+  const re = /LEFT\s+JOIN\s+((?:"[^"]+")|([A-Za-z_][A-Za-z0-9_]*))\s+([A-Za-z_][A-Za-z0-9_]*)\s+ON\s+([A-Za-z_][A-Za-z0-9_.]*)\s*=\s*([A-Za-z_][A-Za-z0-9_.]*)/gi;
+  let m;
+  while ((m = re.exec(tail)) !== null) {
+    joins.push({
+      table: ident(m[1] ?? ""),
+      alias: m[3] ?? "",
+      leftCol: unqualifyColumn(m[4] ?? ""),
+      rightCol: unqualifyColumn(m[5] ?? "")
+    });
+  }
+  return joins;
+}
+function parseWhereClauses(whereRaw, cursor) {
+  const parseAndGroup = (andRaw) => {
+    const clauses = [];
+    for (const part of splitTopLevel2(andRaw, "AND")) {
+      const t = part.trim();
+      if (t.length === 0) continue;
+      if (/\bIS\s+NULL\b/i.test(t)) {
+        clauses.push({ column: unqualifyColumn(ident(t.split(/\s+IS\s+NULL\b/i)[0] ?? "")), operator: "IS NULL", value: null, list: false });
+        continue;
+      }
+      if (/\bIS\s+NOT\s+NULL\b/i.test(t)) {
+        clauses.push({ column: unqualifyColumn(ident(t.split(/\s+IS\s+NOT\s+NULL\b/i)[0] ?? "")), operator: "IS NOT NULL", value: null, list: false });
+        continue;
+      }
+      const opMatch = /^\s*((?:"[^"]+")|([A-Za-z_][A-Za-z0-9_.]*))\s*(=|!=|>=|<=|>|<|like|in|not\s+in)\s*(.+)$/i.exec(
+        t
+      );
+      if (opMatch === null) continue;
+      const col = unqualifyColumn(ident(opMatch[1] ?? ""));
+      const op = (opMatch[3] ?? opMatch[2] ?? "").toLowerCase();
+      const rhs = (opMatch[4] ?? "").trim();
+      if (op === "in" || op === "not in") {
+        const inner = rhs.replace(/^\(|\)$/g, "");
+        const items = splitListItems(inner);
+        const list = items.map((item) => {
+          if (item.trim() === "?") return cursor.take();
+          return stripQuotes(item);
+        });
+        clauses.push({ column: col, operator: op, value: list, list: true });
+        continue;
+      }
+      let value;
+      if (rhs === "?") {
+        value = cursor.take();
+      } else {
+        value = stripQuotes(rhs);
+      }
+      clauses.push({ column: col, operator: op, value, list: false });
+    }
+    return clauses;
+  };
+  return splitTopLevel2(whereRaw, "OR").map((group) => group.trim()).filter((group) => group.length > 0).map(parseAndGroup);
+}
+function matchWhere(groups, row) {
+  return groups.some((clauses) => clauses.every((c) => matchValue(row[c.column], c)));
 }
 function splitListItems(inner) {
   const items = [];
@@ -1770,6 +1830,153 @@ function splitListItems(inner) {
   items.push(buffer);
   return items;
 }
+function resolveSetValue(value, existing, row) {
+  if (value instanceof ExcludedRef) return row[value.column];
+  if (value instanceof ColumnRef) return existing[value.column];
+  if (value instanceof ExprRef) return evalArithmetic(value.source, existing, row);
+  return value;
+}
+function evalArithmetic(src, existing, row) {
+  const num = (v) => {
+    const n2 = Number(v);
+    return Number.isFinite(n2) ? n2 : 0;
+  };
+  let i = 0;
+  const n = src.length;
+  const skip = () => {
+    while (i < n && /\s/.test(src[i] ?? "")) i += 1;
+  };
+  const peek = () => {
+    skip();
+    return i < n ? src[i] ?? "" : null;
+  };
+  const parseIdent = () => {
+    skip();
+    const m = /^([A-Za-z_][A-Za-z0-9_]*)/.exec(src.slice(i));
+    if (m === null) return null;
+    i += (m[1] ?? "").length;
+    skip();
+    let col = ident(m[1] ?? "");
+    let excluded = false;
+    if (src[i] === ".") {
+      const m2 = /^\.([A-Za-z_][A-Za-z0-9_]*)/.exec(src.slice(i));
+      if (m2 !== null) {
+        i += (m2[0] ?? "").length;
+        if (col.toLowerCase() === "excluded") excluded = true;
+        col = ident(m2[1] ?? "");
+      }
+    }
+    return { col, excluded };
+  };
+  const parseFactor = () => {
+    const ch = peek();
+    if (ch === "(") {
+      i += 1;
+      const v = parseExpr();
+      skip();
+      if (src[i] === ")") i += 1;
+      return v;
+    }
+    const numMatch = /^(\d+(?:\.\d+)?)/.exec(src.slice(i));
+    if (numMatch !== null) {
+      i += (numMatch[1] ?? "").length;
+      return Number(numMatch[1]);
+    }
+    const id = parseIdent();
+    if (id !== null) {
+      const v = id.excluded ? row[id.col] : existing[id.col];
+      return num(v);
+    }
+    return 0;
+  };
+  const parseTerm = () => {
+    let v = parseFactor();
+    for (; ; ) {
+      const ch = peek();
+      if (ch !== "*" && ch !== "/") return v;
+      i += 1;
+      const rhs = parseFactor();
+      v = ch === "*" ? v * rhs : rhs === 0 ? v : v / rhs;
+    }
+  };
+  const parseExpr = () => {
+    let v = parseTerm();
+    for (; ; ) {
+      const ch = peek();
+      if (ch !== "+" && ch !== "-") return v;
+      i += 1;
+      const rhs = parseTerm();
+      v = ch === "+" ? v + rhs : v - rhs;
+    }
+  };
+  return parseExpr();
+}
+function splitInsertTuples(body) {
+  const tuples = [];
+  let i = 0;
+  const n = body.length;
+  while (i < n) {
+    while (i < n && (body[i] === " " || body[i] === "	" || body[i] === "\n" || body[i] === "\r" || body[i] === ",")) {
+      i += 1;
+    }
+    if (i >= n) break;
+    if (body[i] !== "(") {
+      return { tuples, conflict: body.slice(i).trim() };
+    }
+    let depth = 0;
+    let j = i;
+    for (; j < n; j += 1) {
+      if (body[j] === "(") depth += 1;
+      else if (body[j] === ")") {
+        depth -= 1;
+        if (depth === 0) break;
+      }
+    }
+    if (j >= n) return { tuples, conflict: null };
+    tuples.push(body.slice(i + 1, j));
+    i = j + 1;
+  }
+  return { tuples, conflict: null };
+}
+function parseConflictClause(clause, cursor, fallbackCols) {
+  const m = /^ON\s+CONFLICT(?:\s*\(([^)]*)\))?\s+DO\s+(UPDATE\s+SET\s+([\s\S]+)|NOTHING\s*)$/i.exec(
+    clause.trim()
+  );
+  if (m === null) {
+    throw new SimDbError("DB_UNSAFE_OP", `\u65E0\u6CD5\u89E3\u6790 ON CONFLICT \u5B50\u53E5\uFF1A${clause.trim().slice(0, 60)}\u2026`);
+  }
+  const colsRaw = m[1];
+  const cols = colsRaw === void 0 ? fallbackCols : colsRaw.split(",").map(ident);
+  if (cols.length === 0) throw new SimDbError("DB_UNSAFE_OP", "ON CONFLICT \u51B2\u7A81\u5217\u4E3A\u7A7A");
+  const action = m[2] ?? "";
+  if (/^NOTHING/i.test(action)) return { cols, sets: [] };
+  const setRaw = m[3] ?? "";
+  const sets = splitListItems(setRaw).map((part) => {
+    const eq = /^([A-Za-z_][A-Za-z0-9_]*)\s*=\s*([\s\S]+)$/i.exec(part.trim());
+    if (eq === null) {
+      throw new SimDbError("DB_UNSAFE_OP", `\u65E0\u6CD5\u89E3\u6790 SET \u8D4B\u503C\uFF1A${part.trim().slice(0, 60)}\u2026`);
+    }
+    const col = ident(eq[1] ?? "");
+    const rhs = (eq[2] ?? "").trim();
+    let value;
+    if (rhs === "?") {
+      value = cursor.take();
+    } else {
+      const ex = /^excluded\.([A-Za-z_][A-Za-z0-9_]*)$/i.exec(rhs);
+      if (ex !== null) {
+        value = new ExcludedRef(ident(ex[1] ?? ""));
+      } else if (/^([A-Za-z_][A-Za-z0-9_]*)$/.test(rhs) && !/^NULL$/i.test(rhs)) {
+        value = new ColumnRef(ident(rhs));
+      } else if (/^'.*'$/.test(rhs) || /^".*"$/.test(rhs) || /^NULL$/i.test(rhs)) {
+        value = stripQuotes(rhs);
+      } else {
+        value = new ExprRef(rhs);
+      }
+    }
+    return { col, value };
+  });
+  return { cols, sets };
+}
 function matchValue(value, clause) {
   const op = clause.operator;
   if (op === "IS NULL") return value === null || value === void 0;
@@ -1819,6 +2026,15 @@ function indexAfter(start, matches, tail) {
   const end = candidates.length === 0 ? -1 : Math.min(...candidates);
   return end === -1 ? tail.length : end;
 }
+function parseSelectItem(raw) {
+  const t = raw.trim();
+  const as = /\s+AS\s+([A-Za-z_][A-Za-z0-9_]*)$/i.exec(t);
+  let name = as === null ? t : t.slice(0, as.index).trim();
+  if (unqualifyColumn(name) === "*") return { name: "", qualified: "", alias: "", star: true };
+  const qualified = /^[A-Za-z_][A-Za-z0-9_]*\.[A-Za-z_][A-Za-z0-9_]*$/.test(name) ? ident(name) : "";
+  const plain = unqualifyColumn(ident(name));
+  return { name: plain, qualified, alias: as === null ? plain : ident(as[1] ?? ""), star: false };
+}
 function project(rows, selectRaw) {
   if (/^count\s*\(\s*\*/i.test(selectRaw) || /^count\s*\(\s*1\)/i.test(selectRaw)) {
     const alias = selectRaw.match(/\bAS\s+([A-Za-z_][A-Za-z0-9_]*)/i)?.[1] ?? "n";
@@ -1829,14 +2045,25 @@ function project(rows, selectRaw) {
     return [{ [constMatch[2]]: Number(constMatch[1]) }];
   }
   if (selectRaw.trim() === "*") return rows;
-  const cols = selectRaw.split(",").map((s) => ident(s.trim()));
+  const items = selectRaw.split(",").map(parseSelectItem);
+  const valueOf = (row, item) => item.qualified !== "" && row[item.qualified] !== void 0 ? row[item.qualified] : row[item.name];
+  if (items.some((item) => item.star)) {
+    return rows.map((row) => {
+      const out = { ...row };
+      for (const item of items) {
+        if (item.star) continue;
+        out[item.alias] = valueOf(row, item);
+      }
+      return out;
+    });
+  }
   return rows.map((row) => {
     const out = {};
-    for (const col of cols) out[col] = row[col];
+    for (const item of items) out[item.alias] = valueOf(row, item);
     return out;
   });
 }
-var SimDbError, ParamCursor, SimSqlEngine;
+var SimDbError, ParamCursor, ExcludedRef, ColumnRef, ExprRef, SimSqlEngine;
 var init_sql_engine = __esm({
   "packages/runtime/src/sim/sql-engine.ts"() {
     "use strict";
@@ -1858,6 +2085,21 @@ var init_sql_engine = __esm({
         return v ?? null;
       }
     };
+    ExcludedRef = class {
+      constructor(column) {
+        this.column = column;
+      }
+    };
+    ColumnRef = class {
+      constructor(column) {
+        this.column = column;
+      }
+    };
+    ExprRef = class {
+      constructor(source) {
+        this.source = source;
+      }
+    };
     SimSqlEngine = class {
       tables = {};
       storage;
@@ -1967,16 +2209,36 @@ var init_sql_engine = __esm({
         const valueBody = match[4].trim();
         const cursor = new ParamCursor(params);
         const table = this.ensureTable(tableName);
+        const { tuples, conflict } = splitInsertTuples(valueBody);
+        if (tuples.length === 0) throw new SimDbError("DB_UNSAFE_OP", "INSERT \u7F3A\u5C11 VALUES \u5143\u7EC4");
+        const conflictSpec = conflict === null ? null : parseConflictClause(
+          conflict,
+          cursor,
+          table.columns.filter((c) => c.primaryKey).map((c) => c.name)
+        );
         let inserted = 0;
-        for (const group of splitListItems(valueBody)) {
-          const inner = group.trim().replace(/^\(|\)$/g, "");
-          const values = splitListItems(inner).map(
+        for (const tuple of tuples) {
+          const values = splitListItems(tuple).map(
             (item) => item.trim() === "?" ? cursor.take() : stripQuotes(item)
           );
           const row = {};
           cols.forEach((col, i) => {
             row[col] = values[i] ?? null;
           });
+          if (conflictSpec !== null) {
+            const existing = table.rows.find(
+              (r) => conflictSpec.cols.every((c) => r[c] === row[c])
+            );
+            if (existing !== void 0) {
+              const oldRow = { ...existing };
+              for (const set of conflictSpec.sets) {
+                existing[set.col] = resolveSetValue(set.value, oldRow, row);
+              }
+              inserted += 1;
+              void this.persist();
+              continue;
+            }
+          }
           this.applyAutoincrement(table, row);
           table.rows.push(row);
           inserted += 1;
@@ -2045,6 +2307,20 @@ var init_sql_engine = __esm({
           return project(this.catalog(), selectRaw);
         }
         const table = this.ensureTable(tableName);
+        let rows = table.rows;
+        const joins = parseLeftJoins(tail);
+        if (joins.length > 0) {
+          rows = table.rows.map((row) => {
+            const merged = { ...row };
+            for (const j of joins) {
+              const joined = this.tables[j.table]?.rows.find((jr) => jr[j.leftCol] === merged[j.rightCol]);
+              if (joined !== void 0) {
+                for (const [k, v] of Object.entries(joined)) merged[`${j.alias}.${k}`] = v;
+              }
+            }
+            return merged;
+          });
+        }
         const whereMatch = /\bWHERE\b/i.exec(tail);
         const orderMatch = /\bORDER\s+BY\b/i.exec(tail);
         const limitMatch = /\bLIMIT\b/i.exec(tail);
@@ -2053,7 +2329,6 @@ var init_sql_engine = __esm({
           whereMatch.index + whereMatch[0].length,
           indexAfter(whereMatch.index, [orderMatch, limitMatch, offsetMatch], tail)
         );
-        let rows = table.rows;
         if (whereRaw.trim().length > 0) {
           const clauses = parseWhereClauses(whereRaw, cursor);
           rows = rows.filter((row) => matchWhere(clauses, row));
@@ -2063,9 +2338,9 @@ var init_sql_engine = __esm({
             orderMatch.index + orderMatch[0].length,
             indexAfter(orderMatch.index, [limitMatch, offsetMatch], tail)
           );
-          const oc = /^\s*((?:"[^"]+")|([A-Za-z_][A-Za-z0-9_]*))\s+(asc|desc)/i.exec(orderRaw);
+          const oc = /^\s*((?:"[^"]+")|([A-Za-z_][A-Za-z0-9_.]*))\s+(asc|desc)/i.exec(orderRaw);
           if (oc !== null) {
-            const col = ident(oc[1]);
+            const col = unqualifyColumn(ident(oc[1]));
             const dir = oc[3].toLowerCase();
             rows = [...rows].toSorted((a, b) => {
               const av = a[col];
@@ -4364,6 +4639,7 @@ function createBearerUserResolver(issuer) {
 }
 async function collectFunctions(dir) {
   const files = {};
+  const isRuntimeSource = (name) => (name.endsWith(".ts") || name.endsWith(".js")) && !name.endsWith(".d.ts") && !name.endsWith(".test.ts");
   const walk = async (sub, prefix) => {
     let entries;
     try {
@@ -4376,7 +4652,7 @@ async function collectFunctions(dir) {
       const full = join10(sub, entry.name);
       if (entry.isDirectory()) {
         await walk(full, rel);
-      } else if (entry.isFile() && entry.name.endsWith(".ts")) {
+      } else if (entry.isFile() && isRuntimeSource(entry.name)) {
         files[rel] = await readFile7(full, "utf8");
       }
     }
@@ -4983,22 +5259,29 @@ function splitSqlStatements(source) {
   let inQuote = false;
   const lines = source.split("\n");
   for (const rawLine of lines) {
-    const line = rawLine.trim();
-    if (line.length === 0) continue;
-    if (line.startsWith("--")) continue;
-    for (let i = 0; i < line.length; i++) {
-      const ch = line[i];
-      if (ch === "'") {
-        if (inQuote && line[i + 1] === "'") {
-          buffer += ch + line[i + 1];
-          i++;
-          continue;
+    const trimmed = rawLine.trim();
+    if (trimmed.length === 0 || trimmed.startsWith("--")) continue;
+    for (let i = 0; i < rawLine.length; i++) {
+      const ch = rawLine[i];
+      if (inQuote) {
+        if (ch === "'") {
+          if (rawLine[i + 1] === "'") {
+            buffer += ch + rawLine[i + 1];
+            i++;
+            continue;
+          }
+          inQuote = false;
         }
-        inQuote = !inQuote;
         buffer += ch;
         continue;
       }
-      if (ch === ";" && !inQuote) {
+      if (ch === "'") {
+        inQuote = true;
+        buffer += ch;
+        continue;
+      }
+      if (ch === "-" && rawLine[i + 1] === "-") break;
+      if (ch === ";") {
         const statement = buffer.trim();
         if (statement.length > 0) statements.push(statement);
         buffer = "";
@@ -5532,7 +5815,8 @@ async function collectShared(functionsDir) {
         await walk(join13(dir, entry.name));
         continue;
       }
-      if (!entry.name.endsWith(".ts") || entry.name.endsWith(".test.ts")) continue;
+      const isRuntimeSource = (entry.name.endsWith(".ts") || entry.name.endsWith(".js")) && !entry.name.endsWith(".d.ts") && !entry.name.endsWith(".test.ts");
+      if (!isRuntimeSource) continue;
       const full = join13(dir, entry.name);
       const rel = relative3(sharedDir, full).split(sep).join("/");
       files[`_shared/${rel}`] = await readFile11(full, "utf8");
@@ -5643,7 +5927,7 @@ var init_frontend_draft = __esm({
   "shared/frontend-draft.ts"() {
     "use strict";
     FRONTEND_DRAFT_FILE_PATH_PATTERN = /^[a-zA-Z0-9._][a-zA-Z0-9._/-]*$/;
-    FRONTEND_DRAFT_MAX_TOTAL_SOURCE_BYTES = 256 * 1024;
+    FRONTEND_DRAFT_MAX_TOTAL_SOURCE_BYTES = 512 * 1024;
     FRONTEND_DRAFT_MAX_FILES = 100;
   }
 });

package/dist/vite.js

@@ -1138,6 +1138,7 @@ function stripQuotes(raw) {
   const t = raw.trim();
   if (/^'.*'$/.test(t)) return t.slice(1, -1);
   if (/^".*"$/.test(t)) return t.slice(1, -1);
+  if (/^NULL$/i.test(t)) return null;
   return t;
 }
 function parseCreateTable(ddl) {
@@ -1158,50 +1159,109 @@ function parseCreateTable(ddl) {
   }
   return { name, columns };
 }
-function parseWhereClauses(whereRaw, cursor) {
-  const clauses = [];
-  for (const part of whereRaw.split(/\s+AND\s+/i)) {
-    const t = part.trim();
-    if (t.length === 0) continue;
-    if (/\bIS\s+NULL\b/i.test(t)) {
-      const col2 = ident(t.split(/\s+IS\s+NULL\b/i)[0] ?? "");
-      clauses.push({ column: col2, operator: "IS NULL", value: null, list: false });
-      continue;
-    }
-    if (/\bIS\s+NOT\s+NULL\b/i.test(t)) {
-      const col2 = ident(t.split(/\s+IS\s+NOT\s+NULL\b/i)[0] ?? "");
-      clauses.push({ column: col2, operator: "IS NOT NULL", value: null, list: false });
-      continue;
-    }
-    const opMatch = /^\s*((?:"[^"]+")|([A-Za-z_][A-Za-z0-9_]*))\s*(=|!=|>=|<=|>|<|like|in|not\s+in)\s*(.+)$/i.exec(
-      t
-    );
-    if (opMatch === null) continue;
-    const col = ident(opMatch[1] ?? "");
-    const op = (opMatch[3] ?? opMatch[2] ?? "").toLowerCase();
-    const rhs = (opMatch[4] ?? "").trim();
-    if (op === "in" || op === "not in") {
-      const inner = rhs.replace(/^\(|\)$/g, "");
-      const items = splitListItems(inner);
-      const list = items.map((item) => {
-        if (item.trim() === "?") return cursor.take();
-        return stripQuotes(item);
-      });
-      clauses.push({ column: col, operator: op, value: list, list: true });
+function splitTopLevel(raw, token) {
+  const parts = [];
+  let depth = 0;
+  let inQuote = false;
+  let buffer = "";
+  const n = raw.length;
+  const isTokenAt = (i) => {
+    const word = raw.slice(i, i + token.length);
+    if (word.toUpperCase() !== token) return false;
+    const before = i === 0 ? "" : raw[i - 1] ?? "";
+    const after = raw[i + token.length] ?? "";
+    return !/[A-Za-z0-9_.]/.test(before) && !/[A-Za-z0-9_.]/.test(after);
+  };
+  for (let i = 0; i < n; i += 1) {
+    const ch = raw[i] ?? "";
+    if (ch === "'") {
+      if (inQuote && raw[i + 1] === "'") {
+        buffer += ch + (raw[i + 1] ?? "");
+        i += 1;
+        continue;
+      }
+      inQuote = !inQuote;
+      buffer += ch;
       continue;
     }
-    let value;
-    if (rhs === "?") {
-      value = cursor.take();
+    if (!inQuote && ch === "(") depth += 1;
+    else if (!inQuote && ch === ")") depth -= 1;
+    if (!inQuote && depth === 0 && isTokenAt(i)) {
+      parts.push(buffer);
+      buffer = "";
+      i += token.length - 1;
     } else {
-      value = stripQuotes(rhs);
+      buffer += ch;
     }
-    clauses.push({ column: col, operator: op, value, list: false });
   }
-  return clauses;
+  parts.push(buffer);
+  return parts;
+}
+function unqualifyColumn(raw) {
+  const t = raw.trim();
+  const dot = t.lastIndexOf(".");
+  if (dot > 0 && /^[A-Za-z_][A-Za-z0-9_]*\./.test(t)) return t.slice(dot + 1);
+  return t;
+}
+function parseLeftJoins(tail) {
+  const joins = [];
+  const re = /LEFT\s+JOIN\s+((?:"[^"]+")|([A-Za-z_][A-Za-z0-9_]*))\s+([A-Za-z_][A-Za-z0-9_]*)\s+ON\s+([A-Za-z_][A-Za-z0-9_.]*)\s*=\s*([A-Za-z_][A-Za-z0-9_.]*)/gi;
+  let m;
+  while ((m = re.exec(tail)) !== null) {
+    joins.push({
+      table: ident(m[1] ?? ""),
+      alias: m[3] ?? "",
+      leftCol: unqualifyColumn(m[4] ?? ""),
+      rightCol: unqualifyColumn(m[5] ?? "")
+    });
+  }
+  return joins;
 }
-function matchWhere(clauses, row) {
-  return clauses.every((c) => matchValue(row[c.column], c));
+function parseWhereClauses(whereRaw, cursor) {
+  const parseAndGroup = (andRaw) => {
+    const clauses = [];
+    for (const part of splitTopLevel(andRaw, "AND")) {
+      const t = part.trim();
+      if (t.length === 0) continue;
+      if (/\bIS\s+NULL\b/i.test(t)) {
+        clauses.push({ column: unqualifyColumn(ident(t.split(/\s+IS\s+NULL\b/i)[0] ?? "")), operator: "IS NULL", value: null, list: false });
+        continue;
+      }
+      if (/\bIS\s+NOT\s+NULL\b/i.test(t)) {
+        clauses.push({ column: unqualifyColumn(ident(t.split(/\s+IS\s+NOT\s+NULL\b/i)[0] ?? "")), operator: "IS NOT NULL", value: null, list: false });
+        continue;
+      }
+      const opMatch = /^\s*((?:"[^"]+")|([A-Za-z_][A-Za-z0-9_.]*))\s*(=|!=|>=|<=|>|<|like|in|not\s+in)\s*(.+)$/i.exec(
+        t
+      );
+      if (opMatch === null) continue;
+      const col = unqualifyColumn(ident(opMatch[1] ?? ""));
+      const op = (opMatch[3] ?? opMatch[2] ?? "").toLowerCase();
+      const rhs = (opMatch[4] ?? "").trim();
+      if (op === "in" || op === "not in") {
+        const inner = rhs.replace(/^\(|\)$/g, "");
+        const items = splitListItems(inner);
+        const list = items.map((item) => {
+          if (item.trim() === "?") return cursor.take();
+          return stripQuotes(item);
+        });
+        clauses.push({ column: col, operator: op, value: list, list: true });
+        continue;
+      }
+      let value;
+      if (rhs === "?") {
+        value = cursor.take();
+      } else {
+        value = stripQuotes(rhs);
+      }
+      clauses.push({ column: col, operator: op, value, list: false });
+    }
+    return clauses;
+  };
+  return splitTopLevel(whereRaw, "OR").map((group) => group.trim()).filter((group) => group.length > 0).map(parseAndGroup);
+}
+function matchWhere(groups, row) {
+  return groups.some((clauses) => clauses.every((c) => matchValue(row[c.column], c)));
 }
 function splitListItems(inner) {
   const items = [];
@@ -1221,6 +1281,168 @@ function splitListItems(inner) {
   items.push(buffer);
   return items;
 }
+var ExcludedRef = class {
+  constructor(column) {
+    this.column = column;
+  }
+};
+var ColumnRef = class {
+  constructor(column) {
+    this.column = column;
+  }
+};
+var ExprRef = class {
+  constructor(source) {
+    this.source = source;
+  }
+};
+function resolveSetValue(value, existing, row) {
+  if (value instanceof ExcludedRef) return row[value.column];
+  if (value instanceof ColumnRef) return existing[value.column];
+  if (value instanceof ExprRef) return evalArithmetic(value.source, existing, row);
+  return value;
+}
+function evalArithmetic(src, existing, row) {
+  const num = (v) => {
+    const n2 = Number(v);
+    return Number.isFinite(n2) ? n2 : 0;
+  };
+  let i = 0;
+  const n = src.length;
+  const skip = () => {
+    while (i < n && /\s/.test(src[i] ?? "")) i += 1;
+  };
+  const peek = () => {
+    skip();
+    return i < n ? src[i] ?? "" : null;
+  };
+  const parseIdent = () => {
+    skip();
+    const m = /^([A-Za-z_][A-Za-z0-9_]*)/.exec(src.slice(i));
+    if (m === null) return null;
+    i += (m[1] ?? "").length;
+    skip();
+    let col = ident(m[1] ?? "");
+    let excluded = false;
+    if (src[i] === ".") {
+      const m2 = /^\.([A-Za-z_][A-Za-z0-9_]*)/.exec(src.slice(i));
+      if (m2 !== null) {
+        i += (m2[0] ?? "").length;
+        if (col.toLowerCase() === "excluded") excluded = true;
+        col = ident(m2[1] ?? "");
+      }
+    }
+    return { col, excluded };
+  };
+  const parseFactor = () => {
+    const ch = peek();
+    if (ch === "(") {
+      i += 1;
+      const v = parseExpr();
+      skip();
+      if (src[i] === ")") i += 1;
+      return v;
+    }
+    const numMatch = /^(\d+(?:\.\d+)?)/.exec(src.slice(i));
+    if (numMatch !== null) {
+      i += (numMatch[1] ?? "").length;
+      return Number(numMatch[1]);
+    }
+    const id = parseIdent();
+    if (id !== null) {
+      const v = id.excluded ? row[id.col] : existing[id.col];
+      return num(v);
+    }
+    return 0;
+  };
+  const parseTerm = () => {
+    let v = parseFactor();
+    for (; ; ) {
+      const ch = peek();
+      if (ch !== "*" && ch !== "/") return v;
+      i += 1;
+      const rhs = parseFactor();
+      v = ch === "*" ? v * rhs : rhs === 0 ? v : v / rhs;
+    }
+  };
+  const parseExpr = () => {
+    let v = parseTerm();
+    for (; ; ) {
+      const ch = peek();
+      if (ch !== "+" && ch !== "-") return v;
+      i += 1;
+      const rhs = parseTerm();
+      v = ch === "+" ? v + rhs : v - rhs;
+    }
+  };
+  return parseExpr();
+}
+function splitInsertTuples(body) {
+  const tuples = [];
+  let i = 0;
+  const n = body.length;
+  while (i < n) {
+    while (i < n && (body[i] === " " || body[i] === "	" || body[i] === "\n" || body[i] === "\r" || body[i] === ",")) {
+      i += 1;
+    }
+    if (i >= n) break;
+    if (body[i] !== "(") {
+      return { tuples, conflict: body.slice(i).trim() };
+    }
+    let depth = 0;
+    let j = i;
+    for (; j < n; j += 1) {
+      if (body[j] === "(") depth += 1;
+      else if (body[j] === ")") {
+        depth -= 1;
+        if (depth === 0) break;
+      }
+    }
+    if (j >= n) return { tuples, conflict: null };
+    tuples.push(body.slice(i + 1, j));
+    i = j + 1;
+  }
+  return { tuples, conflict: null };
+}
+function parseConflictClause(clause, cursor, fallbackCols) {
+  const m = /^ON\s+CONFLICT(?:\s*\(([^)]*)\))?\s+DO\s+(UPDATE\s+SET\s+([\s\S]+)|NOTHING\s*)$/i.exec(
+    clause.trim()
+  );
+  if (m === null) {
+    throw new SimDbError("DB_UNSAFE_OP", `\u65E0\u6CD5\u89E3\u6790 ON CONFLICT \u5B50\u53E5\uFF1A${clause.trim().slice(0, 60)}\u2026`);
+  }
+  const colsRaw = m[1];
+  const cols = colsRaw === void 0 ? fallbackCols : colsRaw.split(",").map(ident);
+  if (cols.length === 0) throw new SimDbError("DB_UNSAFE_OP", "ON CONFLICT \u51B2\u7A81\u5217\u4E3A\u7A7A");
+  const action = m[2] ?? "";
+  if (/^NOTHING/i.test(action)) return { cols, sets: [] };
+  const setRaw = m[3] ?? "";
+  const sets = splitListItems(setRaw).map((part) => {
+    const eq = /^([A-Za-z_][A-Za-z0-9_]*)\s*=\s*([\s\S]+)$/i.exec(part.trim());
+    if (eq === null) {
+      throw new SimDbError("DB_UNSAFE_OP", `\u65E0\u6CD5\u89E3\u6790 SET \u8D4B\u503C\uFF1A${part.trim().slice(0, 60)}\u2026`);
+    }
+    const col = ident(eq[1] ?? "");
+    const rhs = (eq[2] ?? "").trim();
+    let value;
+    if (rhs === "?") {
+      value = cursor.take();
+    } else {
+      const ex = /^excluded\.([A-Za-z_][A-Za-z0-9_]*)$/i.exec(rhs);
+      if (ex !== null) {
+        value = new ExcludedRef(ident(ex[1] ?? ""));
+      } else if (/^([A-Za-z_][A-Za-z0-9_]*)$/.test(rhs) && !/^NULL$/i.test(rhs)) {
+        value = new ColumnRef(ident(rhs));
+      } else if (/^'.*'$/.test(rhs) || /^".*"$/.test(rhs) || /^NULL$/i.test(rhs)) {
+        value = stripQuotes(rhs);
+      } else {
+        value = new ExprRef(rhs);
+      }
+    }
+    return { col, value };
+  });
+  return { cols, sets };
+}
 function matchValue(value, clause) {
   const op = clause.operator;
   if (op === "IS NULL") return value === null || value === void 0;
@@ -1374,16 +1596,36 @@ var SimSqlEngine = class {
     const valueBody = match[4].trim();
     const cursor = new ParamCursor(params);
     const table = this.ensureTable(tableName);
+    const { tuples, conflict } = splitInsertTuples(valueBody);
+    if (tuples.length === 0) throw new SimDbError("DB_UNSAFE_OP", "INSERT \u7F3A\u5C11 VALUES \u5143\u7EC4");
+    const conflictSpec = conflict === null ? null : parseConflictClause(
+      conflict,
+      cursor,
+      table.columns.filter((c) => c.primaryKey).map((c) => c.name)
+    );
     let inserted = 0;
-    for (const group of splitListItems(valueBody)) {
-      const inner = group.trim().replace(/^\(|\)$/g, "");
-      const values = splitListItems(inner).map(
+    for (const tuple of tuples) {
+      const values = splitListItems(tuple).map(
         (item) => item.trim() === "?" ? cursor.take() : stripQuotes(item)
       );
       const row = {};
       cols.forEach((col, i) => {
         row[col] = values[i] ?? null;
       });
+      if (conflictSpec !== null) {
+        const existing = table.rows.find(
+          (r) => conflictSpec.cols.every((c) => r[c] === row[c])
+        );
+        if (existing !== void 0) {
+          const oldRow = { ...existing };
+          for (const set of conflictSpec.sets) {
+            existing[set.col] = resolveSetValue(set.value, oldRow, row);
+          }
+          inserted += 1;
+          void this.persist();
+          continue;
+        }
+      }
       this.applyAutoincrement(table, row);
       table.rows.push(row);
       inserted += 1;
@@ -1452,6 +1694,20 @@ var SimSqlEngine = class {
       return project(this.catalog(), selectRaw);
     }
     const table = this.ensureTable(tableName);
+    let rows = table.rows;
+    const joins = parseLeftJoins(tail);
+    if (joins.length > 0) {
+      rows = table.rows.map((row) => {
+        const merged = { ...row };
+        for (const j of joins) {
+          const joined = this.tables[j.table]?.rows.find((jr) => jr[j.leftCol] === merged[j.rightCol]);
+          if (joined !== void 0) {
+            for (const [k, v] of Object.entries(joined)) merged[`${j.alias}.${k}`] = v;
+          }
+        }
+        return merged;
+      });
+    }
     const whereMatch = /\bWHERE\b/i.exec(tail);
     const orderMatch = /\bORDER\s+BY\b/i.exec(tail);
     const limitMatch = /\bLIMIT\b/i.exec(tail);
@@ -1460,7 +1716,6 @@ var SimSqlEngine = class {
       whereMatch.index + whereMatch[0].length,
       indexAfter(whereMatch.index, [orderMatch, limitMatch, offsetMatch], tail)
     );
-    let rows = table.rows;
     if (whereRaw.trim().length > 0) {
       const clauses = parseWhereClauses(whereRaw, cursor);
       rows = rows.filter((row) => matchWhere(clauses, row));
@@ -1470,9 +1725,9 @@ var SimSqlEngine = class {
         orderMatch.index + orderMatch[0].length,
         indexAfter(orderMatch.index, [limitMatch, offsetMatch], tail)
       );
-      const oc = /^\s*((?:"[^"]+")|([A-Za-z_][A-Za-z0-9_]*))\s+(asc|desc)/i.exec(orderRaw);
+      const oc = /^\s*((?:"[^"]+")|([A-Za-z_][A-Za-z0-9_.]*))\s+(asc|desc)/i.exec(orderRaw);
       if (oc !== null) {
-        const col = ident(oc[1]);
+        const col = unqualifyColumn(ident(oc[1]));
         const dir = oc[3].toLowerCase();
         rows = [...rows].toSorted((a, b) => {
           const av = a[col];
@@ -1517,6 +1772,15 @@ function indexAfter(start, matches, tail) {
   const end = candidates.length === 0 ? -1 : Math.min(...candidates);
   return end === -1 ? tail.length : end;
 }
+function parseSelectItem(raw) {
+  const t = raw.trim();
+  const as = /\s+AS\s+([A-Za-z_][A-Za-z0-9_]*)$/i.exec(t);
+  let name = as === null ? t : t.slice(0, as.index).trim();
+  if (unqualifyColumn(name) === "*") return { name: "", qualified: "", alias: "", star: true };
+  const qualified = /^[A-Za-z_][A-Za-z0-9_]*\.[A-Za-z_][A-Za-z0-9_]*$/.test(name) ? ident(name) : "";
+  const plain = unqualifyColumn(ident(name));
+  return { name: plain, qualified, alias: as === null ? plain : ident(as[1] ?? ""), star: false };
+}
 function project(rows, selectRaw) {
   if (/^count\s*\(\s*\*/i.test(selectRaw) || /^count\s*\(\s*1\)/i.test(selectRaw)) {
     const alias = selectRaw.match(/\bAS\s+([A-Za-z_][A-Za-z0-9_]*)/i)?.[1] ?? "n";
@@ -1527,10 +1791,21 @@ function project(rows, selectRaw) {
     return [{ [constMatch[2]]: Number(constMatch[1]) }];
   }
   if (selectRaw.trim() === "*") return rows;
-  const cols = selectRaw.split(",").map((s) => ident(s.trim()));
+  const items = selectRaw.split(",").map(parseSelectItem);
+  const valueOf = (row, item) => item.qualified !== "" && row[item.qualified] !== void 0 ? row[item.qualified] : row[item.name];
+  if (items.some((item) => item.star)) {
+    return rows.map((row) => {
+      const out = { ...row };
+      for (const item of items) {
+        if (item.star) continue;
+        out[item.alias] = valueOf(row, item);
+      }
+      return out;
+    });
+  }
   return rows.map((row) => {
     const out = {};
-    for (const col of cols) out[col] = row[col];
+    for (const item of items) out[item.alias] = valueOf(row, item);
     return out;
   });
 }
@@ -3710,6 +3985,7 @@ function createBearerUserResolver(issuer) {
 }
 async function collectFunctions(dir) {
   const files = {};
+  const isRuntimeSource = (name) => (name.endsWith(".ts") || name.endsWith(".js")) && !name.endsWith(".d.ts") && !name.endsWith(".test.ts");
   const walk = async (sub, prefix) => {
     let entries;
     try {
@@ -3722,7 +3998,7 @@ async function collectFunctions(dir) {
       const full = join8(sub, entry.name);
       if (entry.isDirectory()) {
         await walk(full, rel);
-      } else if (entry.isFile() && entry.name.endsWith(".ts")) {
+      } else if (entry.isFile() && isRuntimeSource(entry.name)) {
         files[rel] = await readFile5(full, "utf8");
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adep/cli",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "type": "module",
   "description": "`adep` 命令行工具包位：登录 / 初始化 / 本地调试 / 部署 / 数据库维护 / 云存储 / 静态托管 / 微前端组件（widget），实现见任务单 CLI-001 ~ CLI-003 与 FE-002；子路径 `@adep/cli/vite` 提供云函数 vite 插件（CLI-014）",
   "bin": {
@@ -21,10 +21,10 @@
     "commander": "14.0.2",
     "esbuild": "0.25.12",
     "@adep/cf-compat": "0.1.1",
-    "@adep/vite-plugin": "0.1.3"
+    "@adep/vite-plugin": "0.1.4"
   },
   "devDependencies": {
-    "@adep/runtime": "0.2.3",
+    "@adep/runtime": "0.2.4",
     "@adep/types": "0.2.3"
   },
   "scripts": {