miqro 7.2.1 → 7.2.3

package/build/lib.cjs

@@ -640,12 +640,6 @@ var init_lib = __esm({
         }
       }
       parse(arg, options, name = "") {
-        if (typeof options === "string") {
-          options = {
-            type: options,
-            required: true
-          };
-        }
         const baseOption = typeof options === "string" ? {
           type: options,
           required: true
@@ -706,7 +700,7 @@ function ReadBuffer(options) {
     limit = parseInt(limitS, 10);
     timeout = parseInt(timeoutS, 10);
   }
-  return async function ReadBuffer2(req, res) {
+  return async function ReadBuffer3(req, res) {
     return new Promise((resolve24, reject) => {
       try {
         const readTimeout = setTimeout(() => {
@@ -780,7 +774,7 @@ function URLEncodedParser(options) {
   const readBuffer = ReadBuffer({
     limit
   });
-  return async function URLEncodedParser2(req, res) {
+  return async function URLEncodedParser3(req, res) {
     try {
       const isType = req.body === void 0 && req.headers["content-type"] ? req.headers["content-type"].toLocaleLowerCase().indexOf(type.toLocaleLowerCase()) !== -1 : false;
       if (isType && !req.buffer) {
@@ -828,7 +822,7 @@ function JSONParser(options) {
   const readBuffer = ReadBuffer({
     limit
   });
-  return async function JSONParser2(req, res) {
+  return async function JSONParser3(req, res) {
     try {
       const isType = req.body === void 0 && req.headers["content-type"] ? req.headers["content-type"].toLocaleLowerCase().indexOf(type.toLocaleLowerCase()) !== -1 : false;
       if (isType && !req.buffer) {
@@ -872,7 +866,7 @@ function TextParser(options) {
   const readBuffer = ReadBuffer({
     limit
   });
-  return async function TextParser2(req, res) {
+  return async function TextParser3(req, res) {
     try {
       const isType = req.body === void 0 && req.headers["content-type"] ? req.headers["content-type"].toLocaleLowerCase().indexOf(type.toLocaleLowerCase()) !== -1 : false;
       if (isType && !req.buffer) {
@@ -1103,7 +1097,7 @@ var init_body_parser = __esm({
         origins = origins[0];
       }
       const validate = options && options.validate ? options && options.validate : isOriginAllowed;
-      return async function CORS2(req, res) {
+      return async function CORS3(req, res) {
         if (!origins || origins === "*") {
           res.setHeader("Access-Control-Allow-Origin", "*");
           res.addVaryHeader("Origin");
@@ -1206,7 +1200,7 @@ function SessionHandler(config) {
   const tokenLocation = config.options.tokenLocation;
   const tokenLocationName = config.options.tokenLocationName;
   const setCookieOptions = config.options.setCookieOptions;
-  return async function SessionHandler2(req, res) {
+  return async function SessionHandler3(req, res) {
     try {
       const tlN = typeof tokenLocationName === "string" ? tokenLocationName : tokenLocationName ? await tokenLocationName(req) : "";
       let token = null;
@@ -1352,6 +1346,9 @@ var init_session = __esm({
 function isMinimalRouter(obj) {
   return typeof obj === "object" && typeof obj.run === "function" && typeof obj.getJSONDoc === "function";
 }
+function defineRoute(route) {
+  return route;
+}
 function pathPartTokenize(token) {
   const isWild = token.value[0] === ":";
   const optional = token.value[token.value.length - 1] === "?";
@@ -6797,7 +6794,7 @@ var init_read_api = __esm({
     import_node_path21 = require("node:path");
     init_scan_api();
     init_constants_server();
-    read_api_default = {
+    read_api_default = defineRoute({
       method: "POST",
       path: "/read",
       description: "admin editor file read endpoint",
@@ -6822,7 +6819,7 @@ var init_read_api = __esm({
           path
         });
       }
-    };
+    });
   }
 });
 
@@ -6899,7 +6896,7 @@ var init_rename_api = __esm({
     import_node_fs21 = require("node:fs");
     init_read_api();
     import_node_path23 = require("node:path");
-    rename_api_default = {
+    rename_api_default = defineRoute({
       middleware: [JSONParser()],
       method: "POST",
       description: "admin editor file rename endpoint",
@@ -6923,7 +6920,7 @@ var init_rename_api = __esm({
           message: "OK"
         });
       }
-    };
+    });
   }
 });
 
@@ -6941,7 +6938,7 @@ var init_delete_api = __esm({
     init_lib3();
     import_node_fs22 = require("node:fs");
     init_read_api();
-    delete_api_default = {
+    delete_api_default = defineRoute({
       description: "admin editor file deletion endpoint",
       method: "POST",
       path: "/delete",
@@ -6964,7 +6961,7 @@ var init_delete_api = __esm({
           message: "OK"
         });
       }
-    };
+    });
   }
 });
 
@@ -7145,6 +7142,7 @@ __export(lib_exports3, {
   appendAPIModule: () => appendAPIModule,
   createLogProviderOptions: () => createLogProviderOptions,
   createServerInterface: () => createServerInterface,
+  defineRoute: () => defineRoute2,
   jsx: () => lib_exports,
   jsx2HTML: () => jsx2HTML,
   jwt: () => jwt,
@@ -8881,22 +8879,25 @@ function HTMLEncode(str) {
 function AttributeEncode(str) {
   return str.replaceAll('"', """);
 }
+var containerMap = /* @__PURE__ */ new WeakMap();
+var originalChildNodesMap = /* @__PURE__ */ new WeakMap();
 function runtimeDefine(runtime, tagName, component, options) {
-  let container = null;
-  let originalChildNodes = [];
   runtime.customElementMap[tagName] = class extends SSRHTMLElement {
     constructor() {
       super(tagName, runtime);
-      container = runtime.createContainer(this, {
+      const container = runtime.createContainer(this, {
         shadowInit: options?.shadowInit,
         runtimeOptions: options?.runtimeOptions
       });
+      containerMap.set(this, container);
     }
     connectedCallback() {
+      const container = containerMap.get(this);
       if (!container) {
         throw new Error("cannot find container!");
       }
       this.reCalculateOriginalChildren();
+      const originalChildNodes = originalChildNodesMap.get(this);
       const props = {};
       const self = this;
       for (const name of self.getAttributeNames()) {
@@ -8906,12 +8907,18 @@ function runtimeDefine(runtime, tagName, component, options) {
       container.render(createElement(component, props, originalChildNodes));
     }
     disconnectedCallback() {
+      const container = containerMap.get(this);
       if (!container) {
         throw new Error("cannot find container!");
       }
       container.disconnect();
     }
     attributeChangedCallback() {
+      const container = containerMap.get(this);
+      const originalChildNodes = originalChildNodesMap.get(this);
+      if (!container || !originalChildNodesMap.has(this)) {
+        return;
+      }
       if (!container) {
         throw new Error("cannot find container!");
       }
@@ -8924,13 +8931,22 @@ function runtimeDefine(runtime, tagName, component, options) {
       container.render(createElement(component, props, originalChildNodes));
     }
     reCalculateOriginalChildren() {
-      originalChildNodes = [];
+      if (originalChildNodesMap.has(this)) {
+        return;
+      }
+      const originalChildNodes = [];
+      if (!originalChildNodes) {
+        return;
+      }
       const self = this;
       for (let i = 0; i < self.childNodes.length; i++) {
         const node = self.childNodes[i];
-        node.remove();
         originalChildNodes.push(node);
       }
+      for (const o of originalChildNodes) {
+        o.remove();
+      }
+      originalChildNodesMap.set(this, originalChildNodes);
     }
     getProps() {
       const props = {};
@@ -9825,7 +9841,7 @@ function sqlite3ExecutorPrepare(args) {
       const where = getWhereStatement(q);
       const returing = q._returning.length === 0 ? "*" : q._returning.join(",");
       const whereSQL = where.sql !== "" ? ` WHERE ${where.sql}` : "";
-      const sql = `DELETE FROM ${q._table}${whereSQL}${getOrderBy(q._orderBy)}${getLimit(q._limitBy, q._offsetBy)} RETURNING ${returing}`;
+      const sql = `DELETE FROM "${q._table}"${whereSQL}${getOrderBy(q._orderBy)}${getLimit(q._limitBy, q._offsetBy)} RETURNING ${returing}`;
       return {
         sql,
         values: where.values
@@ -9833,22 +9849,22 @@ function sqlite3ExecutorPrepare(args) {
     }
     case "create-database": {
       const q = args;
-      const sql = `CREATE DATABASE ${q._dbName}`;
+      const sql = `CREATE DATABASE "${q._dbName}"`;
       return sql;
     }
     case "create-table": {
       const q = args;
-      const sql = `CREATE TABLE${q._ignoreDuplicate ? " IF NOT EXISTS" : ""} ${q._table}${getCreateTableColumns(q._definition)}`;
+      const sql = `CREATE TABLE${q._ignoreDuplicate ? " IF NOT EXISTS" : ""} "${q._table}"${getCreateTableColumns(q._definition)}`;
       return sql;
     }
     case "drop-database": {
       const q = args;
-      const sql = `DROP DATABASE${q._ignoreDuplicate ? " IF EXISTS" : ""} ${q._dbName}`;
+      const sql = `DROP DATABASE${q._ignoreDuplicate ? " IF EXISTS" : ""} "${q._dbName}"`;
       return sql;
     }
     case "drop-table": {
       const q = args;
-      const sql = `DROP TABLE${q._ignoreDuplicate ? " IF EXISTS" : ""} ${q._table}`;
+      const sql = `DROP TABLE${q._ignoreDuplicate ? " IF EXISTS" : ""} "${q._table}"`;
       return sql;
     }
     case "alter-table": {
@@ -9867,17 +9883,17 @@ function sqlite3ExecutorPrepare(args) {
               throw new Error("unsupported alter action add without definition");
             }
             alters.push({
-              sql: `ALTER TABLE ${q._table} ADD COLUMN ${getCreateTableColumn(l._column, l._definition, [])}`
+              sql: `ALTER TABLE "${q._table}" ADD COLUMN ${getCreateTableColumn(l._column, l._definition, [])}`
             });
             break;
           case "drop":
             alters.push({
-              sql: `ALTER TABLE ${q._table} DROP COLUMN ${l._column}`
+              sql: `ALTER TABLE "${q._table}" DROP COLUMN "${l._column}"`
             });
             break;
           case "rename":
             alters.push({
-              sql: `ALTER TABLE ${q._table} RENAME COLUMN ${l._column} TO ${l._newName}`
+              sql: `ALTER TABLE "${q._table}" RENAME COLUMN "${l._column}" TO "${l._newName}"`
             });
             break;
           default:
@@ -9890,7 +9906,7 @@ function sqlite3ExecutorPrepare(args) {
       const q = args;
       const rows = getInsertValues(q._columns, q._values);
       const returing = q._returning.length === 0 ? "*" : q._returning.join(",");
-      const sql = `INSERT${q._ignoreDuplicate ? " OR IGNORE" : ""} INTO ${q._table}${getInsertColumns(q._columns)}${rows.sql} RETURNING ${returing}`;
+      const sql = `INSERT${q._ignoreDuplicate ? " OR IGNORE" : ""} INTO "${q._table}"${getInsertColumns(q._columns)}${rows.sql} RETURNING ${returing}`;
       return [{
         sql,
         values: rows.values
@@ -9901,7 +9917,7 @@ function sqlite3ExecutorPrepare(args) {
       const isSelect = args._type === "select";
       const q = isSelect ? args : args;
       const where = getWhereStatement(q);
-      const columnsSQL = isSelect ? `SELECT ${renderNameAS(q._columns)}` : "SELECT count(*) as count";
+      const columnsSQL = isSelect ? `SELECT ${renderNameAS(q._columns, void 0, '"')}` : "SELECT count(*) as count";
       const whereSQL = where.sql !== "" ? ` WHERE ${where.sql}` : "";
       const fromSQL = ` FROM ${renderNameAS(q._selectFrom)}`;
       const join15 = q._joins.map((j) => getJoin(j));
@@ -9927,8 +9943,8 @@ function sqlite3ExecutorPrepare(args) {
       const returing = q._returning.length === 0 ? "*" : q._returning.join(",");
       const where = getWhereStatement(q);
       const whereSQL = where.sql !== "" ? ` WHERE ${where.sql}` : "";
-      const setSQL = ` SET ${q._sets.map((set) => `${set.column}=?`)}`;
-      const sql = `UPDATE ${q._table}${setSQL}${whereSQL}${getOrderBy(q._orderBy)}${getLimit(q._limitBy, q._offsetBy)} RETURNING ${returing}`;
+      const setSQL = ` SET ${q._sets.map((set) => `${renderColumn(set.column)}=?`)}`;
+      const sql = `UPDATE "${q._table}"${setSQL}${whereSQL}${getOrderBy(q._orderBy)}${getLimit(q._limitBy, q._offsetBy)} RETURNING ${returing}`;
       return [{
         sql,
         values: q._sets.map((set) => set.value).concat(where.values)
@@ -10097,23 +10113,23 @@ function getCreateTableColumn(columnName, def, primaryKeyColumns) {
   const autoIncrement = `${def.autoIncrement !== void 0 && def.autoIncrement === true ? ` AUTOINCREMENT` : ""}`;
   switch (def.type) {
     case "datetime":
-      return `${columnName} DATETIME${primaryKey}${notNull}${defaultValue}${autoIncrement}`;
+      return `"${columnName}" DATETIME${primaryKey}${notNull}${defaultValue}${autoIncrement}`;
     case "boolean":
-      return `${columnName} TINYINT${primaryKey}${notNull}${defaultValue}${autoIncrement}`;
+      return `"${columnName}" TINYINT${primaryKey}${notNull}${defaultValue}${autoIncrement}`;
     case "json":
     case "string":
-      return `${columnName} TEXT${primaryKey}${notNull}${defaultValue}${autoIncrement}`;
+      return `"${columnName}" TEXT${primaryKey}${notNull}${defaultValue}${autoIncrement}`;
     case "real":
-      return `${columnName} REAL${primaryKey}${notNull}${defaultValue}${autoIncrement}`;
+      return `"${columnName}" REAL${primaryKey}${notNull}${defaultValue}${autoIncrement}`;
     case "bigint":
     case "integer":
-      return `${columnName} INTEGER${primaryKey}${notNull}${defaultValue}${autoIncrement}`;
+      return `"${columnName}" INTEGER${primaryKey}${notNull}${defaultValue}${autoIncrement}`;
     default:
       throw new Error("unsupported type " + def.type);
   }
 }
 function getInsertColumns(columns) {
-  return `(${columns.join(",")})`;
+  return `(${columns.map((c) => renderColumn(c)).join(",")})`;
 }
 function getInsertValues(columns, values) {
   let args = [];
@@ -10125,21 +10141,21 @@ function getInsertValues(columns, values) {
     values: args
   };
 }
-function renderNameAS(input, join15 = ", ") {
+function renderNameAS(input, join15 = ", ", wrapper = '"') {
   const list = input instanceof Array ? input : [input];
-  return list.map((i) => typeof i === "string" ? i : `${i.name} AS ${i.as}`).join(join15);
+  return list.map((i) => typeof i === "string" ? `${renderColumn(i, wrapper)}` : `${renderColumn(i.name, wrapper)} AS ${renderColumn(i.as, wrapper)}`).join(join15);
 }
-function getGroupBy(groupBy) {
-  return groupBy.length > 0 ? ` GROUP BY ${groupBy.join(",")}` : "";
+function getGroupBy(groupBy, wrapper = '"') {
+  return groupBy.length > 0 ? ` GROUP BY ${groupBy.map((g) => renderColumn(g, wrapper)).join(",")}` : "";
 }
-function getOrderBy(orderBy) {
-  return orderBy.length > 0 ? ` ORDER BY ${orderBy.map((o) => `${o.column} ${o.mode}`).join(",")}` : "";
+function getOrderBy(orderBy, wrapper = '"') {
+  return orderBy.length > 0 ? ` ORDER BY ${orderBy.map((o) => `${renderColumn(o.column, wrapper)} ${o.mode}`).join(",")}` : "";
 }
 function getLimit(limit, offsetBy) {
   return `${limit !== void 0 ? ` LIMIT ${limit}` : ""}${offsetBy ? ` OFFSET ${offsetBy}` : ""}`;
 }
-function renderColumn(column) {
-  return column;
+function renderColumn(column, wrapper = '"') {
+  return `${column.split(".").map((c) => `${wrapper}${c}${wrapper}`).join(".")}`;
 }
 function mergePrepareArgs(to, merge, concatOperator = " AND ") {
   return (merge instanceof Array ? merge : [merge]).reduce((current, value) => {
@@ -10209,6 +10225,77 @@ var TableSchemaSchema = {
   dictType: "ColumnDefinition"
 };
 
+// node_modules/@miqro/query/build/executors/transform.js
+function sqliteTransformInput(value) {
+  if (value === null || value === void 0)
+    return value;
+  switch (typeof value) {
+    case "boolean":
+      return value ? 1 : 0;
+    case "bigint":
+      return value.toString();
+    case "object":
+      if (value instanceof Date)
+        return value.toISOString();
+      return JSON.stringify(value);
+    default:
+      return value;
+  }
+}
+function sqliteTransformOutput(type, value) {
+  if (value === null || value === void 0)
+    return value;
+  switch (type) {
+    case "boolean":
+      return value === 1 || value === "1" || value === "true" || value === true ? true : false;
+    case "datetime":
+      return value instanceof Date ? value : new Date(value);
+    case "bigint":
+      return BigInt(value);
+    case "real":
+    case "integer": {
+      const f = parseFloat(value);
+      return isNaN(f) ? null : f;
+    }
+    case "json":
+      return typeof value === "string" ? JSON.parse(value) : value;
+    case "string":
+      return value;
+    default:
+      return value;
+  }
+}
+function pgTransformInput(value) {
+  if (value === null || value === void 0)
+    return value;
+  switch (typeof value) {
+    case "bigint":
+      return value.toString();
+    case "object":
+      if (value instanceof Date)
+        return value;
+      return JSON.stringify(value);
+    default:
+      return value;
+  }
+}
+function pgTransformOutput(type, value) {
+  if (value === null || value === void 0)
+    return value;
+  switch (type) {
+    case "integer":
+      return parseInt(value, 10);
+    case "datetime":
+      return value instanceof Date ? value : new Date(value);
+    case "bigint":
+      return BigInt(value);
+    case "json":
+      return typeof value === "string" ? JSON.parse(value) : value;
+    default:
+      return value;
+  }
+}
+
 // node_modules/@miqro/query/build/executors/sqlite3/lib.js
 var SQLITE_CONFIG_SCHEMA = {
   type: "object",
@@ -10229,6 +10316,8 @@ async function sqlite3Executor(config) {
       await driver.close();
     },
     prepare: sqlite3ExecutorPrepare,
+    transformInput: sqliteTransformInput,
+    transformOutput: sqliteTransformOutput,
     query: async function sqlite3Executor2(sql, values) {
       return new Promise((resolve24, reject) => {
         const st = driver.prepare(sql, values, function(error2) {
@@ -10278,18 +10367,20 @@ async function postgresExecutor(config) {
     disconnect: async function postgresExecutorDisconnect() {
       await driver.end();
     },
+    transformInput: pgTransformInput,
+    transformOutput: pgTransformOutput,
     prepare: function postgresExecutorPrepare(args) {
       switch (args._type) {
         case "create-table": {
           const q = args;
-          const sql = `CREATE TABLE${q._ignoreDuplicate ? " IF NOT EXISTS" : ""} ${q._table}${getCreateTableColumns2(q._definition)}`;
+          const sql = `CREATE TABLE${q._ignoreDuplicate ? " IF NOT EXISTS" : ""} "${q._table}"${getCreateTableColumns2(q._definition)}`;
           return sql;
         }
         case "insert": {
           const q = args;
           const rows = getInsertValues(q._columns, q._values);
           const returing = q._returning.length === 0 ? "*" : q._returning.join(",");
-          const sql = `INSERT INTO ${q._table}${getInsertColumns(q._columns)}${rows.sql} ${q._ignoreDuplicate ? "ON CONFLICT DO NOTHING " : ""}RETURNING ${returing}`;
+          const sql = `INSERT INTO "${q._table}"${getInsertColumns(q._columns)}${rows.sql} ${q._ignoreDuplicate ? "ON CONFLICT DO NOTHING " : ""}RETURNING ${returing}`;
           return {
             sql,
             values: rows.values
@@ -10300,7 +10391,7 @@ async function postgresExecutor(config) {
           let alters = [];
           if (q._renameTable) {
             alters.push({
-              sql: `ALTER TABLE ${q._table} RENAME TO ?`,
+              sql: `ALTER TABLE "${q._table}" RENAME TO "?"`,
               values: [q._renameTable]
             });
           }
@@ -10311,17 +10402,17 @@ async function postgresExecutor(config) {
                   throw new Error("unsupported alter action add without definition");
                 }
                 alters.push({
-                  sql: `ALTER TABLE ${q._table} ADD COLUMN ${getCreateTableColumn2(l._column, l._definition, [])}`
+                  sql: `ALTER TABLE "${q._table}" ADD COLUMN ${getCreateTableColumn2(l._column, l._definition, [])}`
                 });
                 break;
               case "drop":
                 alters.push({
-                  sql: `ALTER TABLE ${q._table} DROP COLUMN ${l._column}`
+                  sql: `ALTER TABLE "${q._table}" DROP COLUMN "${l._column}"`
                 });
                 break;
               case "rename":
                 alters.push({
-                  sql: `ALTER TABLE ${q._table} RENAME COLUMN ${l._column} TO ${l._newName}`
+                  sql: `ALTER TABLE "${q._table}" RENAME COLUMN "${l._column}" TO "${l._newName}"`
                 });
                 break;
               default:
@@ -10359,22 +10450,22 @@ function getCreateTableColumn2(columnName, def, primaryKeyColumns) {
   const notNull = `${def.allowNull == false ? " NOT NULL" : ""}`;
   const defaultValue = `${def.defaultValue !== void 0 ? ` DEFAULT '${def.defaultValue}'` : ""}`;
   if (def.autoIncrement) {
-    return `${columnName} BIGSERIAL${primaryKey}`;
+    return `"${columnName}" BIGSERIAL${primaryKey}`;
   }
   switch (def.type) {
     case "datetime":
-      return `${columnName} TIMESTAMP${primaryKey}${notNull}${defaultValue}`;
+      return `"${columnName}" TIMESTAMP${primaryKey}${notNull}${defaultValue}`;
     case "boolean":
-      return `${columnName} BOOLEAN${primaryKey}${notNull}${defaultValue}`;
+      return `"${columnName}" BOOLEAN${primaryKey}${notNull}${defaultValue}`;
     case "real":
-      return `${columnName} REAL${primaryKey}${notNull}${defaultValue}`;
+      return `"${columnName}" REAL${primaryKey}${notNull}${defaultValue}`;
     case "json":
     case "string":
-      return `${columnName} TEXT${primaryKey}${notNull}${defaultValue}`;
+      return `"${columnName}" TEXT${primaryKey}${notNull}${defaultValue}`;
     case "bigint":
-      return `${columnName} bigint${primaryKey}${notNull}${defaultValue}`;
+      return `"${columnName}" bigint${primaryKey}${notNull}${defaultValue}`;
     case "integer":
-      return `${columnName} INTEGER${primaryKey}${notNull}${defaultValue}`;
+      return `"${columnName}" INTEGER${primaryKey}${notNull}${defaultValue}`;
     default:
       throw new Error("unsupported type " + def.type);
   }
@@ -10401,6 +10492,15 @@ function tokens2Postgres(inSql, values) {
 }
 
 // node_modules/@miqro/query/build/query/utils.js
+function applyTransformInput(executor, stmts) {
+  const ti = executor.transformInput.bind(executor);
+  const list = stmts instanceof Array ? stmts : typeof stmts === "string" ? [] : [stmts];
+  for (const stmt of list) {
+    if (stmt.values) {
+      stmt.values = stmt.values.map(ti);
+    }
+  }
+}
 function getStatements(stmts) {
   if (stmts instanceof Array) {
     return stmts;
@@ -10567,7 +10667,7 @@ var AlterTable = class _AlterTable {
 
 // node_modules/@miqro/query/build/query/insert.js
 var Insert = class _Insert {
-  constructor(db, _table) {
+  constructor(db, _table, schema) {
     this.db = db;
     this._table = _table;
     this._type = "insert";
@@ -10575,6 +10675,7 @@ var Insert = class _Insert {
     this._returning = [];
     this._values = [];
     this._ignoreDuplicate = false;
+    this._schema = schema;
   }
   value(value) {
     this._values = this._values.concat(value);
@@ -10583,7 +10684,7 @@ var Insert = class _Insert {
   values(value) {
     return this.value(value);
   }
-  returning(column) {
+  returning(...column) {
     this._returning = this._returning.concat(column);
     return this;
   }
@@ -10598,14 +10699,23 @@ var Insert = class _Insert {
     return getStatements(this.db.getExecutor().prepare(this));
   }
   async yield(logger) {
-    return runStatements(this.db, this.db.getExecutor().prepare(this), logger);
+    const executor = this.db.getExecutor();
+    const ti = executor.transformInput.bind(executor);
+    this._values = this._values.map((row) => {
+      const out = {};
+      for (const key of Object.keys(row)) {
+        out[key] = ti(row[key]);
+      }
+      return out;
+    });
+    return runStatements(this.db, executor.prepare(this), logger);
   }
   ignoreDuplicates(ignore = true) {
     this._ignoreDuplicate = ignore;
     return this;
   }
   clone() {
-    const ret = new _Insert(this.db, this._table);
+    const ret = new _Insert(this.db, this._table, this._schema);
     ret._columns = structuredClone(this._columns);
     ret._values = structuredClone(this._values);
     ret._returning = structuredClone(this._returning);
@@ -10615,11 +10725,19 @@ var Insert = class _Insert {
 };
 
 // node_modules/@miqro/query/build/executors/where.js
-var Where = class {
+var Where = class _Where {
   constructor() {
     this._orderBy = [];
     this._filters = [];
   }
+  clone() {
+    const ret = new _Where();
+    ret._filters = structuredClone(this._filters);
+    ret._orderBy = structuredClone(this._orderBy);
+    ret._limitBy = this._limitBy;
+    ret._offsetBy = this._offsetBy;
+    return ret;
+  }
   order(column, mode) {
     this._orderBy.push({ column, mode });
     return this;
@@ -10747,9 +10865,167 @@ var Where = class {
   }
 };
 
+// node_modules/@miqro/query/build/query/include.js
+function getPrimaryKey(schema) {
+  for (const [key, def] of Object.entries(schema)) {
+    if (def.primaryKey)
+      return key;
+  }
+  return "id";
+}
+function transformOutputRow(transformOutput, schema, row) {
+  const out = {};
+  for (const key of Object.keys(row)) {
+    const def = schema[key];
+    out[key] = def ? transformOutput(def.type, row[key]) : row[key];
+  }
+  return out;
+}
+function _classifyRecursive(filters, assocNames, assocFilters) {
+  const rootFilters = [];
+  for (const filter of filters) {
+    if (filter._column !== void 0) {
+      const dot = filter._column.indexOf(".");
+      if (dot !== -1) {
+        const prefix = filter._column.substring(0, dot);
+        if (assocNames.has(prefix)) {
+          assocFilters.get(prefix).push({
+            ...filter,
+            _column: filter._column.substring(dot + 1)
+          });
+          continue;
+        }
+      }
+      rootFilters.push(filter);
+    } else if (filter._where !== void 0) {
+      const nestedList = Array.isArray(filter._where) ? filter._where : [filter._where];
+      const rebuiltList = nestedList.map((w) => ({
+        ...w,
+        _filters: _classifyRecursive(w._filters, assocNames, assocFilters)
+      })).filter((w) => w._filters.length > 0);
+      if (rebuiltList.length > 0) {
+        rootFilters.push({
+          ...filter,
+          _where: Array.isArray(filter._where) ? rebuiltList : rebuiltList[0]
+        });
+      }
+    } else {
+      rootFilters.push(filter);
+    }
+  }
+  return rootFilters;
+}
+function classifyFilters(filters, include) {
+  const assocNames = new Set(include);
+  const assocFilters = /* @__PURE__ */ new Map();
+  for (const name of include)
+    assocFilters.set(name, []);
+  const rootFilters = _classifyRecursive(filters, assocNames, assocFilters);
+  return { rootFilters, assocFilters };
+}
+async function yieldWithInclude(db, schema, assocMap, include, filters, orderBy, limitBy, offsetBy, rootTable, rootColumns, logger) {
+  const { rootFilters, assocFilters } = classifyFilters(filters, include);
+  const pk = getPrimaryKey(schema);
+  const cols = rootColumns.includes(pk) ? rootColumns : [...rootColumns, pk];
+  const assocNames = new Set(include);
+  const rootOrderBy = orderBy.filter((o) => {
+    const dot = o.column.indexOf(".");
+    return dot === -1 || !assocNames.has(o.column.substring(0, dot));
+  });
+  const rootSelect = db.select().from(rootTable);
+  for (const col of cols)
+    rootSelect.column(col);
+  for (const f of rootFilters)
+    rootSelect._filters.push(f);
+  for (const o of rootOrderBy)
+    rootSelect._orderBy.push(o);
+  if (limitBy !== void 0)
+    rootSelect._limitBy = limitBy;
+  if (offsetBy !== void 0)
+    rootSelect._offsetBy = offsetBy;
+  const executor = db.getExecutor();
+  const rootStmts = executor.prepare(rootSelect);
+  applyTransformInput(executor, rootStmts);
+  const rootRaw = await runStatements(db, rootStmts, logger);
+  if (rootRaw.length === 0)
+    return [];
+  const transformedRoots = rootRaw.map((row) => transformOutputRow(executor.transformOutput, schema, row));
+  const rootPKs = transformedRoots.map((r) => r[pk]);
+  const assocResults = await Promise.all(include.map(async (assocName) => {
+    const assocDef = assocMap.get(assocName);
+    if (!assocDef)
+      throw new Error(`unknown association: ${assocName}`);
+    const assocModel = assocDef.model();
+    const assocSchema = assocModel.schema;
+    const assocTable = assocModel.tableName;
+    const extraFilters = assocFilters.get(assocName) ?? [];
+    const fk = assocDef.foreignKey;
+    const lk = assocDef.localKey ?? "id";
+    let inColumn;
+    let inValues;
+    if (assocDef.type === "belongsTo") {
+      inColumn = lk;
+      inValues = [...new Set(transformedRoots.map((r) => r[fk]).filter((v) => v != null))];
+    } else {
+      inColumn = fk;
+      inValues = rootPKs;
+    }
+    if (inValues.length === 0) {
+      return { assocName, assocDef, rows: [], hadFilters: extraFilters.length > 0 };
+    }
+    const assocSelect = db.select().from(assocTable);
+    for (const col of Object.keys(assocSchema))
+      assocSelect.column(col);
+    assocSelect._filters.push({ _type: "in", _column: inColumn, _value: inValues });
+    for (const f of extraFilters)
+      assocSelect._filters.push(f);
+    const stmts = executor.prepare(assocSelect);
+    applyTransformInput(executor, stmts);
+    const raw = await runStatements(db, stmts, logger);
+    const rows = raw.map((row) => transformOutputRow(executor.transformOutput, assocSchema, row));
+    return { assocName, assocDef, rows, hadFilters: extraFilters.length > 0 };
+  }));
+  const result = [];
+  for (const root of transformedRoots) {
+    const pkVal = root[pk];
+    const instance = { ...root };
+    let excluded = false;
+    for (const { assocName, assocDef, rows, hadFilters } of assocResults) {
+      const fk = assocDef.foreignKey;
+      const lk = assocDef.localKey ?? "id";
+      if (assocDef.type === "hasMany") {
+        const matched = rows.filter((r) => r[fk] === pkVal);
+        if (hadFilters && matched.length === 0) {
+          excluded = true;
+          break;
+        }
+        instance[assocName] = matched;
+      } else if (assocDef.type === "hasOne") {
+        const matched = rows.find((r) => r[fk] === pkVal);
+        if (hadFilters && matched === void 0) {
+          excluded = true;
+          break;
+        }
+        instance[assocName] = matched ?? null;
+      } else {
+        const localKeyVal = root[fk];
+        const matched = rows.find((r) => r[lk] === localKeyVal);
+        if (hadFilters && matched === void 0) {
+          excluded = true;
+          break;
+        }
+        instance[assocName] = matched ?? null;
+      }
+    }
+    if (!excluded)
+      result.push(instance);
+  }
+  return result;
+}
+
 // node_modules/@miqro/query/build/query/select.js
 var Select = class _Select extends Where {
-  constructor(db) {
+  constructor(db, schema, associations) {
     super();
     this.db = db;
     this._type = "select";
@@ -10758,12 +11034,20 @@ var Select = class _Select extends Where {
     this._groupBy = [];
     this._joins = [];
     this._orderBy = [];
+    this._schema = schema;
+    if (associations) {
+      this._assocMap = new Map(Object.entries(associations));
+    }
+  }
+  include(...names) {
+    this._include = names;
+    return this;
   }
   prepare() {
     return getStatements(this.db.getExecutor().prepare(this));
   }
   clone() {
-    const ret = new _Select(this.db);
+    const ret = new _Select(this.db, this._schema);
     ret._filters = structuredClone(this._filters);
     ret._columns = structuredClone(this._columns);
     ret._groupBy = structuredClone(this._groupBy);
@@ -10772,10 +11056,29 @@ var Select = class _Select extends Where {
     ret._joins = structuredClone(this._joins);
     ret._limitBy = this._limitBy;
     ret._offsetBy = this._offsetBy;
+    ret._assocMap = this._assocMap;
+    ret._include = this._include ? [...this._include] : void 0;
     return ret;
   }
   async yield(logger) {
-    return runStatements(this.db, this.db.getExecutor().prepare(this), logger);
+    if (this._include && this._include.length > 0 && this._schema && this._assocMap) {
+      return this._yieldWithInclude(logger);
+    }
+    const executor = this.db.getExecutor();
+    const stmts = executor.prepare(this);
+    applyTransformInput(executor, stmts);
+    const rows = await runStatements(this.db, stmts, logger);
+    if (this._schema) {
+      const schema = this._schema;
+      return rows.map((row) => transformOutputRow(executor.transformOutput, schema, row));
+    }
+    return rows;
+  }
+  async _yieldWithInclude(logger) {
+    const schema = this._schema;
+    const rootTable = this._selectFrom.length > 0 ? typeof this._selectFrom[0] === "string" ? this._selectFrom[0] : this._selectFrom[0].name : "";
+    const rootColumns = this._columns.length > 0 ? this._columns.filter((c) => typeof c === "string") : Object.keys(schema);
+    return yieldWithInclude(this.db, schema, this._assocMap, this._include, this._filters, this._orderBy, this._limitBy, this._offsetBy, rootTable, rootColumns, logger);
   }
   column(column) {
     if (column instanceof Array) {
@@ -10785,8 +11088,9 @@ var Select = class _Select extends Where {
     }
     return this;
   }
-  columns(column) {
-    return this.column(column);
+  columns(...cols) {
+    this._columns = cols;
+    return this;
   }
   from(from) {
     if (from instanceof Array) {
@@ -10863,7 +11167,10 @@ var Count = class _Count extends Where {
     return getStatements(this.db.getExecutor().prepare(this));
   }
   async yield(logger) {
-    return parseCountResult(await runStatements(this.db, this.db.getExecutor().prepare(this), logger));
+    const executor = this.db.getExecutor();
+    const stmts = executor.prepare(this);
+    applyTransformInput(executor, stmts);
+    return parseCountResult(await runStatements(this.db, stmts, logger));
   }
 };
 async function parseCountResult(rows) {
@@ -10874,22 +11181,30 @@ async function parseCountResult(rows) {
 
 // node_modules/@miqro/query/build/query/update.js
 var Update = class _Update extends Where {
-  constructor(db, _table) {
+  constructor(db, _table, schema) {
     super();
     this.db = db;
     this._table = _table;
     this._type = "update";
     this._sets = [];
     this._returning = [];
+    this._schema = schema;
   }
   prepare() {
     return getStatements(this.db.getExecutor().prepare(this));
   }
   async yield(logger) {
-    return runStatements(this.db, this.db.getExecutor().prepare(this), logger);
+    const executor = this.db.getExecutor();
+    const ti = executor.transformInput.bind(executor);
+    for (const s of this._sets) {
+      s.value = ti(s.value);
+    }
+    const stmts = executor.prepare(this);
+    applyTransformInput(executor, stmts);
+    return runStatements(this.db, stmts, logger);
   }
   clone() {
-    const ret = new _Update(this.db, this._table);
+    const ret = new _Update(this.db, this._table, this._schema);
     ret._filters = structuredClone(this._filters);
     ret._orderBy = structuredClone(this._orderBy);
     ret._sets = structuredClone(this._sets);
@@ -10898,36 +11213,37 @@ var Update = class _Update extends Where {
     ret._offsetBy = this._offsetBy;
     return ret;
   }
-  returning(column) {
+  returning(...column) {
     this._returning = this._returning.concat(column);
     return this;
   }
   set(column, value) {
-    this._sets.push({
-      column,
-      value
-    });
+    this._sets.push({ column, value });
     return this;
   }
 };
 
 // node_modules/@miqro/query/build/query/delete.js
 var Delete = class _Delete extends Where {
-  constructor(db, _table) {
+  constructor(db, _table, schema) {
     super();
     this.db = db;
     this._table = _table;
     this._type = "delete";
     this._returning = [];
+    this._schema = schema;
   }
   prepare() {
     return getStatements(this.db.getExecutor().prepare(this));
   }
   async yield(logger) {
-    return runStatements(this.db, this.db.getExecutor().prepare(this), logger);
+    const executor = this.db.getExecutor();
+    const stmts = executor.prepare(this);
+    applyTransformInput(executor, stmts);
+    return runStatements(this.db, stmts, logger);
   }
   clone() {
-    const ret = new _Delete(this.db, this._table);
+    const ret = new _Delete(this.db, this._table, this._schema);
     ret._filters = structuredClone(this._filters);
     ret._orderBy = structuredClone(this._orderBy);
     ret._returning = structuredClone(this._returning);
@@ -10935,7 +11251,7 @@ var Delete = class _Delete extends Where {
     ret._offsetBy = this._offsetBy;
     return ret;
   }
-  returning(column) {
+  returning(...column) {
     this._returning = this._returning.concat(column);
     return this;
   }
@@ -10966,74 +11282,8 @@ var DropDatabase = class _DropDatabase {
   }
 };
 
-// node_modules/@miqro/query/build/executors/sqlite3-cli/lib.js
-var import_child_process = require("child_process");
-var SQLITE_CONFIG_SCHEMA2 = {
-  type: "object",
-  mode: "remove_extra",
-  properties: {
-    storage: "string"
-  }
-};
-async function sqlite3CLIExecutor(config) {
-  const databaseOptions = parser2.parse(config, SQLITE_CONFIG_SCHEMA2);
-  if (!databaseOptions) {
-    throw new Error("config not valid");
-  }
-  (config.logger ? config.logger : console).error(`sqlite3-cli is affected by sql injection. do not use! only for testing!`);
-  return {
-    // we just use the sqlite3Executor prepare function
-    prepare: sqlite3ExecutorPrepare,
-    disconnect: async function sqlite3ExecutorDisconnect() {
-    },
-    query: async function sqlite3Executor2(sql, values) {
-      return new Promise((resolve24, reject) => {
-        try {
-          let i = 0;
-          const raw = sql.replaceAll("?", (sub) => {
-            const value = values ? values[i] : void 0;
-            if (value === void 0) {
-              throw new Error("cannot convert query");
-            }
-            i++;
-            return `'${value}'`;
-          });
-          if (values && i !== values.length) {
-            throw new Error("cannot convert query");
-          }
-          (0, import_child_process.exec)(`sqlite3 -json "${databaseOptions.storage}" "${raw}"`, (error2, stdout, stderr) => {
-            try {
-              if (error2) {
-                if (stderr) {
-                  reject(new Error(stderr));
-                } else {
-                  reject(error2);
-                }
-              } else {
-                if (stderr) {
-                  reject(new Error(stderr));
-                } else {
-                  if (stdout) {
-                    resolve24(JSON.parse(stdout));
-                  } else {
-                    resolve24([]);
-                  }
-                }
-              }
-            } catch (e2) {
-              reject(e2);
-            }
-          });
-        } catch (e) {
-          reject(e);
-        }
-      });
-    }
-  };
-}
-
 // node_modules/@miqro/query/build/executors/sqlite-native/lib.js
-var SQLITE_CONFIG_SCHEMA3 = {
+var SQLITE_CONFIG_SCHEMA2 = {
   type: "object",
   mode: "remove_extra",
   properties: {
@@ -11041,7 +11291,7 @@ var SQLITE_CONFIG_SCHEMA3 = {
   }
 };
 async function nativeSqlite(config) {
-  const databaseOptions = parser2.parse(config, SQLITE_CONFIG_SCHEMA3);
+  const databaseOptions = parser2.parse(config, SQLITE_CONFIG_SCHEMA2);
   if (!databaseOptions) {
     throw new Error("config not valid");
   }
@@ -11050,6 +11300,8 @@ async function nativeSqlite(config) {
   return {
     // we just use the sqlite3Executor prepare function
     prepare: sqlite3ExecutorPrepare,
+    transformInput: sqliteTransformInput,
+    transformOutput: sqliteTransformOutput,
     disconnect: async function sqlite3ExecutorDisconnect() {
       return driver.close();
     },
@@ -11072,13 +11324,15 @@ async function nativeSqlite(config) {
           }
           const stmt = driver.prepare(sql);
           stmt.setReadBigInts(true);
-          if (values && values.length > 0) {
-            const ret = stmt.all(...values);
-            resolve24(ret);
-          } else {
-            const ret = stmt.all();
-            resolve24(ret);
-          }
+          const ret = values && values.length > 0 ? stmt.all(...values) : stmt.all();
+          resolve24(ret.map((row) => {
+            const out = {};
+            for (const key of Object.keys(row)) {
+              const v = row[key];
+              out[key] = typeof v === "bigint" && v >= Number.MIN_SAFE_INTEGER && v <= Number.MAX_SAFE_INTEGER ? Number(v) : typeof v === "number" ? Number(v) : v;
+            }
+            return out;
+          }));
         } catch (e) {
           reject(e);
         }
@@ -11169,20 +11423,20 @@ var Database = class {
   alterTable(table, inTransaction) {
     return new AlterTable(this, table, inTransaction);
   }
-  insert(table) {
-    return new Insert(this, table);
+  insert(table, schema) {
+    return new Insert(this, table, schema);
   }
-  select() {
-    return new Select(this);
+  select(schema, associations) {
+    return new Select(this, schema, associations);
   }
   count() {
     return new Count(this);
   }
-  update(table) {
-    return new Update(this, table);
+  update(table, schema) {
+    return new Update(this, table, schema);
   }
-  delete(table) {
-    return new Delete(this, table);
+  delete(table, schema) {
+    return new Delete(this, table, schema);
   }
   where() {
     return new Where();
@@ -11192,14 +11446,17 @@ async function getExecutor(config) {
   switch (config.dialect) {
     case "node:sqlite":
       return await nativeSqlite(config);
-    case "sqlite3-cli":
-      return await sqlite3CLIExecutor(config);
     case "pg":
       return await postgresExecutor(config);
     case "sqlite3":
       return await sqlite3Executor(config);
     default:
       if (config.executor) {
+        const e = config.executor;
+        if (!e.transformInput)
+          e.transformInput = (v) => v;
+        if (!e.transformOutput)
+          e.transformOutput = (_type, v) => v;
         return config.executor;
       }
       throw new Error("dialect [" + config.dialect + "] not defined");
@@ -11348,6 +11605,11 @@ var down = {
   folder: downMigrationFolder
 };
 
+// src/types.ts
+function defineRoute2(route) {
+  return defineRoute(route);
+}
+
 // src/services/utils/cluster-ws.ts
 init_lib3();
 var ClusterWebSocketServer2MessageType = "$$$$ClusterWebSocketServer2Message$$$$$";
@@ -11390,7 +11652,7 @@ var ClusterWebSocketServer2 = class extends WebSocketServer {
             clientUUID: req.uuid
           });
         }
-        this.logger?.log("[%s] new web socket connection from (%s)", req.uuid, req.req.socket.remoteAddress);
+        this.logger?.debug("[%s] new web socket connection from (%s)", req.uuid, req.req.socket.remoteAddress);
         if (options.onConnection) {
           options.onConnection(req);
         }
@@ -11405,7 +11667,7 @@ var ClusterWebSocketServer2 = class extends WebSocketServer {
             clientUUID: req.uuid
           });
         }
-        this.logger?.log("[%s] [%s] web socket disconnection from (%s)", req.uuid, this.path, req.req.socket.remoteAddress);
+        this.logger?.debug("[%s] [%s] web socket disconnection from (%s)", req.uuid, this.path, req.req.socket.remoteAddress);
         if (options.onDisconnect) {
           options.onDisconnect(req);
         }
@@ -11467,6 +11729,9 @@ var ClusterWebSocketServer2 = class extends WebSocketServer {
     };
     this.connect();
   }
+  name;
+  path;
+  logger;
   remoteClients = /* @__PURE__ */ new Set();
   listener;
   connect() {
@@ -11594,6 +11859,8 @@ var ClusterCache = class {
     };
     this.connect();
   }
+  name;
+  logger;
   localCache = /* @__PURE__ */ new Map();
   //private logger: Logger;
   listener;
@@ -11753,6 +12020,8 @@ var LocalCache = class {
     this.name = name;
     this.logger = logger;
   }
+  name;
+  logger;
   localCache = /* @__PURE__ */ new Map();
   dispose() {
   }
@@ -13264,7 +13533,7 @@ async function runMigrations(db) {
   await migration.init(db);
 ${serviceMigrations.map((file) => {
     const name = `${file.substring(0, file.length - (0, import_node_path14.extname)(file).length)}`;
-    return `  await migration.up.module(db, "${file}", (await require("../${(0, import_node_path14.relative)(service, "")}/${service}/migration/${name}.cjs")).default)`;
+    return `  await migration.up.module(db, (await require("../${(0, import_node_path14.relative)(service, "")}/${service}/migration/${name}.cjs")).default.name ?? "${file}", (await require("../${(0, import_node_path14.relative)(service, "")}/${service}/migration/${name}.cjs")).default)`;
   }).join("\n")}
 }
 module.exports = {
@@ -13276,7 +13545,7 @@ async function runMigrations(db) {
   await migration.init(db);
 ${serviceMigrations.reverse().map((file) => {
     const name = `${file.substring(0, file.length - (0, import_node_path14.extname)(file).length)}`;
-    return `  await migration.down.module(db, "${file}", (await require("../${(0, import_node_path14.relative)(service, "")}/${service}/migration/${name}.cjs")).default)`;
+    return `  await migration.down.module(db, (await require("../${(0, import_node_path14.relative)(service, "")}/${service}/migration/${name}.cjs")).default.name ?? "${file}", (await require("../${(0, import_node_path14.relative)(service, "")}/${service}/migration/${name}.cjs")).default)`;
   }).join("\n")}
 }
 module.exports = {
@@ -17604,6 +17873,7 @@ var JSX2 = {
   appendAPIModule,
   createLogProviderOptions,
   createServerInterface,
+  defineRoute,
   jsx,
   jsx2HTML,
   jwt,