autosync_backend2 1.2.52 → 1.2.56

package/dist/index.js

@@ -24919,17 +24919,7 @@ var require_tools = __commonJS((exports, module) => {
   } = require_symbols();
   var { isMainThread } = __require("worker_threads");
   var transport = require_transport();
-  var asJsonChan;
-  if (typeof diagChan.tracingChannel === "function") {
-    asJsonChan = diagChan.tracingChannel("pino_asJson");
-  } else {
-    asJsonChan = {
-      hasSubscribers: false,
-      traceSync(fn, store5, thisArg, ...args) {
-        return fn.call(thisArg, ...args);
-      }
-    };
-  }
+  var asJsonChan = diagChan.tracingChannel("pino_asJson");
   function noop2() {}
   function genLog(level, hook) {
     if (!hook)
@@ -25420,7 +25410,7 @@ var require_levels = __commonJS((exports, module) => {
 
 // node_modules/pino/lib/meta.js
 var require_meta = __commonJS((exports, module) => {
-  module.exports = { version: "9.14.0" };
+  module.exports = { version: "10.1.0" };
 });
 
 // node_modules/pino/lib/proto.js
@@ -25432,7 +25422,6 @@ var require_proto = __commonJS((exports, module) => {
     setLevelSym,
     getLevelSym,
     chindingsSym,
-    parsedChindingsSym,
     mixinSym,
     asJsonSym,
     writeSym,
@@ -25524,7 +25513,6 @@ var require_proto = __commonJS((exports, module) => {
         instance[formattersSym] = buildFormatters(formatters.level, resetChildingsFormatter, formatters.log);
       }
       instance[chindingsSym] = asChindings(instance, bindings2);
-      instance[setLevelSym](this.level);
       if (this.onChild !== noop2) {
         this.onChild(instance);
       }
@@ -25573,8 +25561,10 @@ var require_proto = __commonJS((exports, module) => {
       instance[msgPrefixSym] = (this[msgPrefixSym] || "") + options.msgPrefix;
     }
     instance[chindingsSym] = asChindings(instance, bindings2);
-    const childLevel = options.level || this.level;
-    instance[setLevelSym](childLevel);
+    if (options.level !== undefined && options.level !== this.level || options.hasOwnProperty("customLevels")) {
+      const childLevel = options.level || this.level;
+      instance[setLevelSym](childLevel);
+    }
     this.onChild(instance);
     return instance;
   }
@@ -25589,7 +25579,6 @@ var require_proto = __commonJS((exports, module) => {
   function setBindings(newBindings) {
     const chindings = asChindings(this, newBindings);
     this[chindingsSym] = chindings;
-    delete this[parsedChindingsSym];
   }
   function defaultMixinMergeStrategy(mergeObject, mixinObject) {
     return Object.assign(mixinObject, mergeObject);
@@ -100204,89 +100193,90 @@ var require_fast_decode_uri_component = __commonJS2((exports, module) => {
 });
 var require_dist = __commonJS2((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
-  exports.parse = parse2;
-  exports.serialize = serialize;
-  var cookieNameRegExp = /^[\u0021-\u003A\u003C\u003E-\u007E]+$/, cookieValueRegExp = /^[\u0021-\u003A\u003C-\u007E]*$/, domainValueRegExp = /^([.]?[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)([.][a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)*$/i, pathValueRegExp = /^[\u0020-\u003A\u003D-\u007E]*$/, __toString = Object.prototype.toString, NullObject = (() => {
+  exports.parseCookie = parseCookie;
+  exports.parse = parseCookie;
+  exports.stringifyCookie = stringifyCookie;
+  exports.stringifySetCookie = stringifySetCookie;
+  exports.serialize = stringifySetCookie;
+  exports.parseSetCookie = parseSetCookie;
+  exports.stringifySetCookie = stringifySetCookie;
+  exports.serialize = stringifySetCookie;
+  var cookieNameRegExp = /^[\u0021-\u003A\u003C\u003E-\u007E]+$/, cookieValueRegExp = /^[\u0021-\u003A\u003C-\u007E]*$/, domainValueRegExp = /^([.]?[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)([.][a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)*$/i, pathValueRegExp = /^[\u0020-\u003A\u003D-\u007E]*$/, maxAgeRegExp = /^-?\d+$/, __toString = Object.prototype.toString, NullObject = (() => {
     let C = function() {};
     return C.prototype = Object.create(null), C;
   })();
-  function parse2(str, options) {
+  function parseCookie(str, options) {
     let obj2 = new NullObject, len = str.length;
     if (len < 2)
       return obj2;
     let dec = options?.decode || decode2, index = 0;
     do {
-      let eqIdx = str.indexOf("=", index);
+      let eqIdx = eqIndex(str, index, len);
       if (eqIdx === -1)
         break;
-      let colonIdx = str.indexOf(";", index), endIdx = colonIdx === -1 ? len : colonIdx;
+      let endIdx = endIndex(str, index, len);
       if (eqIdx > endIdx) {
         index = str.lastIndexOf(";", eqIdx - 1) + 1;
         continue;
       }
-      let keyStartIdx = startIndex(str, index, eqIdx), keyEndIdx = endIndex(str, eqIdx, keyStartIdx), key = str.slice(keyStartIdx, keyEndIdx);
-      if (obj2[key] === undefined) {
-        let valStartIdx = startIndex(str, eqIdx + 1, endIdx), valEndIdx = endIndex(str, endIdx, valStartIdx), value = dec(str.slice(valStartIdx, valEndIdx));
-        obj2[key] = value;
-      }
+      let key = valueSlice(str, index, eqIdx);
+      if (obj2[key] === undefined)
+        obj2[key] = dec(valueSlice(str, eqIdx + 1, endIdx));
       index = endIdx + 1;
     } while (index < len);
     return obj2;
   }
-  function startIndex(str, index, max2) {
-    do {
-      let code = str.charCodeAt(index);
-      if (code !== 32 && code !== 9)
-        return index;
-    } while (++index < max2);
-    return max2;
-  }
-  function endIndex(str, index, min) {
-    while (index > min) {
-      let code = str.charCodeAt(--index);
-      if (code !== 32 && code !== 9)
-        return index + 1;
-    }
-    return min;
-  }
-  function serialize(name, val, options) {
-    let enc = options?.encode || encodeURIComponent;
-    if (!cookieNameRegExp.test(name))
-      throw TypeError(`argument name is invalid: ${name}`);
-    let value = enc(val);
+  function stringifyCookie(cookie, options) {
+    let enc = options?.encode || encodeURIComponent, cookieStrings = [];
+    for (let name of Object.keys(cookie)) {
+      let val = cookie[name];
+      if (val === undefined)
+        continue;
+      if (!cookieNameRegExp.test(name))
+        throw TypeError(`cookie name is invalid: ${name}`);
+      let value = enc(val);
+      if (!cookieValueRegExp.test(value))
+        throw TypeError(`cookie val is invalid: ${val}`);
+      cookieStrings.push(`${name}=${value}`);
+    }
+    return cookieStrings.join("; ");
+  }
+  function stringifySetCookie(_name, _val, _opts) {
+    let cookie = typeof _name === "object" ? _name : { ..._opts, name: _name, value: String(_val) }, enc = (typeof _val === "object" ? _val : _opts)?.encode || encodeURIComponent;
+    if (!cookieNameRegExp.test(cookie.name))
+      throw TypeError(`argument name is invalid: ${cookie.name}`);
+    let value = cookie.value ? enc(cookie.value) : "";
     if (!cookieValueRegExp.test(value))
-      throw TypeError(`argument val is invalid: ${val}`);
-    let str = name + "=" + value;
-    if (!options)
-      return str;
-    if (options.maxAge !== undefined) {
-      if (!Number.isInteger(options.maxAge))
-        throw TypeError(`option maxAge is invalid: ${options.maxAge}`);
-      str += "; Max-Age=" + options.maxAge;
-    }
-    if (options.domain) {
-      if (!domainValueRegExp.test(options.domain))
-        throw TypeError(`option domain is invalid: ${options.domain}`);
-      str += "; Domain=" + options.domain;
-    }
-    if (options.path) {
-      if (!pathValueRegExp.test(options.path))
-        throw TypeError(`option path is invalid: ${options.path}`);
-      str += "; Path=" + options.path;
-    }
-    if (options.expires) {
-      if (!isDate(options.expires) || !Number.isFinite(options.expires.valueOf()))
-        throw TypeError(`option expires is invalid: ${options.expires}`);
-      str += "; Expires=" + options.expires.toUTCString();
-    }
-    if (options.httpOnly)
+      throw TypeError(`argument val is invalid: ${cookie.value}`);
+    let str = cookie.name + "=" + value;
+    if (cookie.maxAge !== undefined) {
+      if (!Number.isInteger(cookie.maxAge))
+        throw TypeError(`option maxAge is invalid: ${cookie.maxAge}`);
+      str += "; Max-Age=" + cookie.maxAge;
+    }
+    if (cookie.domain) {
+      if (!domainValueRegExp.test(cookie.domain))
+        throw TypeError(`option domain is invalid: ${cookie.domain}`);
+      str += "; Domain=" + cookie.domain;
+    }
+    if (cookie.path) {
+      if (!pathValueRegExp.test(cookie.path))
+        throw TypeError(`option path is invalid: ${cookie.path}`);
+      str += "; Path=" + cookie.path;
+    }
+    if (cookie.expires) {
+      if (!isDate(cookie.expires) || !Number.isFinite(cookie.expires.valueOf()))
+        throw TypeError(`option expires is invalid: ${cookie.expires}`);
+      str += "; Expires=" + cookie.expires.toUTCString();
+    }
+    if (cookie.httpOnly)
       str += "; HttpOnly";
-    if (options.secure)
+    if (cookie.secure)
       str += "; Secure";
-    if (options.partitioned)
+    if (cookie.partitioned)
       str += "; Partitioned";
-    if (options.priority)
-      switch (typeof options.priority === "string" ? options.priority.toLowerCase() : undefined) {
+    if (cookie.priority)
+      switch (typeof cookie.priority === "string" ? cookie.priority.toLowerCase() : undefined) {
         case "low":
           str += "; Priority=Low";
           break;
@@ -100297,10 +100287,10 @@ var require_dist = __commonJS2((exports) => {
           str += "; Priority=High";
           break;
         default:
-          throw TypeError(`option priority is invalid: ${options.priority}`);
+          throw TypeError(`option priority is invalid: ${cookie.priority}`);
       }
-    if (options.sameSite)
-      switch (typeof options.sameSite === "string" ? options.sameSite.toLowerCase() : options.sameSite) {
+    if (cookie.sameSite)
+      switch (typeof cookie.sameSite === "string" ? cookie.sameSite.toLowerCase() : cookie.sameSite) {
         case true:
         case "strict":
           str += "; SameSite=Strict";
@@ -100312,10 +100302,83 @@ var require_dist = __commonJS2((exports) => {
           str += "; SameSite=None";
           break;
         default:
-          throw TypeError(`option sameSite is invalid: ${options.sameSite}`);
+          throw TypeError(`option sameSite is invalid: ${cookie.sameSite}`);
       }
     return str;
   }
+  function parseSetCookie(str, options) {
+    let dec = options?.decode || decode2, len = str.length, endIdx = endIndex(str, 0, len), eqIdx = eqIndex(str, 0, endIdx), setCookie = eqIdx === -1 ? { name: "", value: dec(valueSlice(str, 0, endIdx)) } : { name: valueSlice(str, 0, eqIdx), value: dec(valueSlice(str, eqIdx + 1, endIdx)) }, index = endIdx + 1;
+    while (index < len) {
+      let endIdx2 = endIndex(str, index, len), eqIdx2 = eqIndex(str, index, endIdx2), attr = eqIdx2 === -1 ? valueSlice(str, index, endIdx2) : valueSlice(str, index, eqIdx2), val = eqIdx2 === -1 ? undefined : valueSlice(str, eqIdx2 + 1, endIdx2);
+      switch (attr.toLowerCase()) {
+        case "httponly":
+          setCookie.httpOnly = true;
+          break;
+        case "secure":
+          setCookie.secure = true;
+          break;
+        case "partitioned":
+          setCookie.partitioned = true;
+          break;
+        case "domain":
+          setCookie.domain = val;
+          break;
+        case "path":
+          setCookie.path = val;
+          break;
+        case "max-age":
+          if (val && maxAgeRegExp.test(val))
+            setCookie.maxAge = Number(val);
+          break;
+        case "expires":
+          if (!val)
+            break;
+          let date2 = new Date(val);
+          if (Number.isFinite(date2.valueOf()))
+            setCookie.expires = date2;
+          break;
+        case "priority":
+          if (!val)
+            break;
+          let priority = val.toLowerCase();
+          if (priority === "low" || priority === "medium" || priority === "high")
+            setCookie.priority = priority;
+          break;
+        case "samesite":
+          if (!val)
+            break;
+          let sameSite = val.toLowerCase();
+          if (sameSite === "lax" || sameSite === "strict" || sameSite === "none")
+            setCookie.sameSite = sameSite;
+          break;
+      }
+      index = endIdx2 + 1;
+    }
+    return setCookie;
+  }
+  function endIndex(str, min, len) {
+    let index = str.indexOf(";", min);
+    return index === -1 ? len : index;
+  }
+  function eqIndex(str, min, max2) {
+    let index = str.indexOf("=", min);
+    return index < max2 ? index : -1;
+  }
+  function valueSlice(str, min, max2) {
+    let start = min, end = max2;
+    do {
+      let code = str.charCodeAt(start);
+      if (code !== 32 && code !== 9)
+        break;
+    } while (++start < end);
+    while (end > start) {
+      let code = str.charCodeAt(end - 1);
+      if (code !== 32 && code !== 9)
+        break;
+      end--;
+    }
+    return str.slice(start, end);
+  }
   function decode2(str) {
     if (str.indexOf("%") === -1)
       return str;
@@ -100608,7 +100671,7 @@ var mergeDeep = (target, source, options) => {
   if (!isObject(target) || !isObject(source))
     return target;
   for (let [key, value] of Object.entries(source)) {
-    if (skipKeys?.includes(key))
+    if (skipKeys?.includes(key) || ["__proto__", "constructor", "prototype"].includes(key))
       continue;
     if (mergeArray && Array.isArray(value)) {
       target[key] = Array.isArray(target[key]) ? [...target[key], ...value] : target[key] = value;
@@ -101093,7 +101156,10 @@ class InvalidCookieSignature extends Error {
 var mapValueError = (error) => {
   if (!error)
     return { summary: undefined };
-  let { message, path, value, type } = error, property = path.slice(1).replaceAll("/", "."), isRoot = path === "";
+  let { message, path, value, type } = error;
+  if (Array.isArray(path))
+    path = path[0];
+  let property = typeof path === "string" ? path.slice(1).replaceAll("/", ".") : "unknown", isRoot = path === "";
   switch (type) {
     case 42:
       return { ...error, summary: isRoot ? "Value should not be provided" : `Property '${property}' should not be provided` };
@@ -101140,6 +101206,9 @@ class ValidationError extends Error {
   code = "VALIDATION";
   status = 422;
   valueError;
+  get messageValue() {
+    return this.valueError;
+  }
   expected;
   customError;
   constructor(type, validator, value, allowUnsafeValidationDetails = false, errors) {
@@ -101197,11 +101266,11 @@ class ValidationError extends Error {
   toResponse(headers) {
     return new Response(this.message, { status: 400, headers: { ...headers, "content-type": "application/json" } });
   }
-  detail(message) {
+  detail(message, allowUnsafeValidatorDetails = this.allowUnsafeValidationDetails) {
     if (!this.customError)
       return this.message;
-    let validator = this.validator, value = this.value, expected = this.expected, errors = this.all;
-    return isProduction && !this.allowUnsafeValidationDetails ? { type: "validation", on: this.type, found: value, message } : { type: "validation", on: this.type, property: this.valueError?.path || "root", message, summary: mapValueError(this.valueError).summary, found: value, expected, errors };
+    let value = this.value, expected = this.expected, errors = this.all;
+    return isProduction && !allowUnsafeValidatorDetails ? { type: "validation", on: this.type, found: value, message } : { type: "validation", on: this.type, property: this.valueError?.path || "root", message, summary: mapValueError(this.valueError).summary, found: value, expected, errors };
   }
 }
 var tryParse = (v, schema) => {
@@ -101678,11 +101747,18 @@ t.ArrayBuffer = ElysiaType.ArrayBuffer;
 t.Uint8Array = ElysiaType.Uint8Array;
 var import_cookie = __toESM2(require_dist(), 1);
 var import_fast_decode_uri_component = __toESM2(require_fast_decode_uri_component(), 1);
+var hashString = (str) => {
+  let hash2 = 2166136261, len = str.length;
+  for (let i2 = 0;i2 < len; i2++)
+    hash2 ^= str.charCodeAt(i2), hash2 = Math.imul(hash2, 16777619);
+  return hash2 >>> 0;
+};
 
 class Cookie {
   name;
   jar;
   initial;
+  valueHash;
   constructor(name, jar, initial = {}) {
     this.name = name;
     this.jar = jar;
@@ -101694,7 +101770,7 @@ class Cookie {
   set cookie(jar) {
     if (!(this.name in this.jar))
       this.jar[this.name] = this.initial;
-    this.jar[this.name] = jar;
+    this.jar[this.name] = jar, this.valueHash = undefined;
   }
   get setCookie() {
     if (!(this.name in this.jar))
@@ -101708,7 +101784,25 @@ class Cookie {
     return this.cookie.value;
   }
   set value(value) {
-    this.setCookie.value = value;
+    let current = this.cookie.value;
+    if (current === value)
+      return;
+    if (typeof current === "object" && current !== null && typeof value === "object" && value !== null)
+      try {
+        let valueStr = JSON.stringify(value), newHash = hashString(valueStr);
+        if (this.valueHash !== undefined && this.valueHash !== newHash)
+          this.valueHash = newHash;
+        else {
+          if (JSON.stringify(current) === valueStr) {
+            this.valueHash = newHash;
+            return;
+          }
+          this.valueHash = newHash;
+        }
+      } catch {}
+    if (!(this.name in this.jar))
+      this.jar[this.name] = { ...this.initial };
+    this.jar[this.name].value = value;
   }
   get expires() {
     return this.cookie.expires;
@@ -102336,7 +102430,17 @@ var mapCompactResponse = (response, request) => {
       return new Response(response);
   }
 };
-var errorToResponse = (error, set2) => new Response(JSON.stringify({ name: error?.name, message: error?.message, cause: error?.cause }), { status: set2?.status !== 200 ? set2?.status ?? 500 : 500, headers: set2?.headers });
+var errorToResponse = (error, set2) => {
+  if (typeof error?.toResponse === "function") {
+    let raw = error.toResponse(), targetSet = set2 ?? { headers: {}, status: 200, redirect: "" }, apply = (resolved) => {
+      if (resolved instanceof Response)
+        targetSet.status = resolved.status;
+      return mapResponse(resolved, targetSet);
+    };
+    return typeof raw?.then === "function" ? raw.then(apply) : apply(raw);
+  }
+  return new Response(JSON.stringify({ name: error?.name, message: error?.message, cause: error?.cause }), { status: set2?.status !== 200 ? set2?.status ?? 500 : 500, headers: set2?.headers });
+};
 var createStaticHandler = (handle, hooks, setHeaders = {}) => {
   if (typeof handle === "function")
     return;
@@ -102389,10 +102493,7 @@ else c.body[key]=value}`;
   for (let key of Object.keys(app.decorator))
     decoratorsLiteral += `,'${key}':decorator['${key}']`;
   let standardHostname = app.config.handler?.standardHostname ?? true, hasTrace = !!app.event.trace?.length;
-  if (fnLiteral += `const u=r.url,s=u.indexOf('/',${standardHostname ? 11 : 7}),qi=u.indexOf('?',s+1)
-let p
-if(qi===-1)p=u.substring(s)
-else p=u.substring(s, qi)
+  if (fnLiteral += `const u=r.url,s=u.indexOf('/',${standardHostname ? 11 : 7}),qi=u.indexOf('?',s+1),p=u.substring(s,qi===-1?undefined:qi)
 `, hasTrace)
     fnLiteral += `const id=randomId()
 `;
@@ -102412,7 +102513,7 @@ return `;
   return findDynamicRoute += "}", { declare: hasErrorHook ? "" : `const error404Message=notFound.message.toString()
 const error404=new Response(error404Message,{status:404})
 `, code: findDynamicRoute };
-} }, composeError: { mapResponseContext: "", validationError: "return new Response(error.message,{headers:Object.assign({'content-type':'application/json'},set.headers),status:set.status})", unknownError: "return new Response(error.message,{headers:set.headers,status:error.status??set.status??500})" }, listen() {
+} }, composeError: { mapResponseContext: "", validationError: "set.headers['content-type']='application/json';return mapResponse(error.message,set)", unknownError: "set.status=error.status??set.status??500;return mapResponse(error.message,set)" }, listen() {
   return () => {
     throw Error("WebStandard does not support listen, you might want to export default Elysia.fetch instead");
   };
@@ -103027,7 +103128,17 @@ var mapCompactResponse2 = (response, request) => {
       return new Response(response);
   }
 };
-var errorToResponse2 = (error, set2) => new Response(JSON.stringify({ name: error?.name, message: error?.message, cause: error?.cause }), { status: set2?.status !== 200 ? set2?.status ?? 500 : 500, headers: set2?.headers });
+var errorToResponse2 = (error, set2) => {
+  if (typeof error?.toResponse === "function") {
+    let raw = error.toResponse(), targetSet = set2 ?? { headers: {}, status: 200, redirect: "" }, apply = (resolved) => {
+      if (resolved instanceof Response)
+        targetSet.status = resolved.status;
+      return mapResponse2(resolved, targetSet);
+    };
+    return typeof raw?.then === "function" ? raw.then(apply) : apply(raw);
+  }
+  return new Response(JSON.stringify({ name: error?.name, message: error?.message, cause: error?.cause }), { status: set2?.status !== 200 ? set2?.status ?? 500 : 500, headers: set2?.headers });
+};
 var createStaticHandler2 = (handle, hooks, setHeaders = {}) => {
   if (typeof handle === "function")
     return;
@@ -103091,9 +103202,9 @@ function parseQueryFromURL(input, startIndex = 0, array, object) {
       finalValue = valueSlice;
     }
     let currentValue = result[finalKey];
-    if (array?.[finalKey])
+    if (array && array?.[finalKey])
       if (finalValue.charCodeAt(0) === 91) {
-        if (object?.[finalKey])
+        if (object && object?.[finalKey])
           finalValue = JSON.parse(finalValue);
         else
           finalValue = finalValue.slice(1, -1).split(",");
@@ -103318,7 +103429,7 @@ var createTracer = (traceListener) => {
 };
 var Kind3 = Symbol.for("TypeBox.Kind");
 var Hint2 = Symbol.for("TypeBox.Hint");
-var isSpecialProperty = (name) => /(\ |-|\t|\n|\.)/.test(name) || !isNaN(+name[0]);
+var isSpecialProperty = (name) => /(\ |-|\t|\n|\.|\[|\]|\{|\})/.test(name) || !isNaN(+name[0]);
 var joinProperty = (v1, v2, isOptional = false) => {
   if (typeof v2 === "number")
     return `${v1}[${v2}]`;
@@ -103362,7 +103473,7 @@ var handleRecord = (schema, property, instruction) => {
   let v = `(()=>{const ar${i2}s=Object.keys(${property}),ar${i2}v={};for(let i=0;i<ar${i2}s.length;i++){const ar${i2}p=${property}[ar${i2}s[i]];ar${i2}v[ar${i2}s[i]]=${mirror(child, `ar${i2}p`, instruction)}`, optionals = instruction.optionalsInArray[i2 + 1];
   if (optionals)
     for (let oi = 0;oi < optionals.length; oi++) {
-      let target = `ar${i2}v[ar${i2}s[i]].${optionals[oi]}`;
+      let target = `ar${i2}v[ar${i2}s[i]]${optionals[oi]}`;
       v += `;if(${target}===undefined)delete ${target}`;
     }
   return v += `}return ar${i2}v})()`, v;
@@ -103422,7 +103533,7 @@ var handleUnion = (schemas, property, instruction) => {
       else
         return instruction.modules.Import(type.$ref);
     return type;
-  };
+  }, cleanThenCheck = "";
   for (let i2 = 0;i2 < schemas.length; i2++) {
     let type = unwrapRef(schemas[i2]);
     if (Array.isArray(type.anyOf))
@@ -103435,9 +103546,13 @@ var handleUnion = (schemas, property, instruction) => {
       else
         type.items = unwrapRef(type.items);
     typeChecks.push(TypeCompiler.Compile(type)), v += `if(d.unions[${ui}][${i2}].Check(${property})){return ${mirror(type, property, { ...instruction, recursion: instruction.recursion + 1, parentIsOptional: true })}}
+`, cleanThenCheck += (i2 ? "" : "let ") + "tmp=" + mirror(type, property, { ...instruction, recursion: instruction.recursion + 1, parentIsOptional: true }) + `
+if(d.unions[${ui}][${i2}].Check(tmp))return tmp
 `;
   }
-  return v += `return ${instruction.removeUnknownUnionType ? "undefined" : property}})()`, v;
+  if (cleanThenCheck)
+    v += cleanThenCheck;
+  return v += `return ${instruction.removeUnknownUnionType ? "undefined" : property}`, v + "})()";
 };
 var mirror = (schema, property, instruction) => {
   if (!schema)
@@ -103466,7 +103581,17 @@ var mirror = (schema, property, instruction) => {
         if (isOptional) {
           let index = instruction.array;
           if (property.startsWith("ar")) {
-            let refName = name.slice(name.indexOf(".") + 1), array = instruction.optionalsInArray;
+            let dotIndex = name.indexOf("."), refName;
+            if (dotIndex >= 0)
+              refName = name.slice(dotIndex);
+            else
+              refName = name.slice(property.length);
+            if (refName.startsWith("?."))
+              if (refName.charAt(2) === "[")
+                refName = refName.slice(2);
+              else
+                refName = refName.slice(1);
+            let array = instruction.optionalsInArray;
             if (array[index])
               array[index].push(refName);
             else
@@ -103482,18 +103607,19 @@ var mirror = (schema, property, instruction) => {
       v += "}";
       break;
     case "array":
-      if (schema.items.type !== "object" && schema.items.type !== "array")
+      if (schema.items.type !== "object" && schema.items.type !== "array") {
         if (Array.isArray(schema.items)) {
           v = handleTuple(schema.items, property, instruction);
           break;
-        } else if (isRoot)
+        } else if (isRoot && !Array.isArray(schema.items.anyOf))
           return "return v";
         else if (Kind3 in schema.items && schema.items.$ref && (schema.items[Kind3] === "Ref" || schema.items[Kind3] === "This"))
           v = mirror(deepClone(instruction.definitions[schema.items.$ref]), property, { ...instruction, parentIsOptional: true, recursion: instruction.recursion + 1 });
-        else {
+        else if (!Array.isArray(schema.items.anyOf)) {
           v = property;
           break;
         }
+      }
       let i2 = instruction.array;
       instruction.array++;
       let reference = property;
@@ -103505,7 +103631,7 @@ var mirror = (schema, property, instruction) => {
       let optionals = instruction.optionalsInArray[i2 + 1];
       if (optionals)
         for (let oi = 0;oi < optionals.length; oi++) {
-          let target = `ar${i2}v[i].${optionals[oi]}`;
+          let target = `ar${i2}v[i]${optionals[oi]}`;
           v += `;if(${target}===undefined)delete ${target}`;
         }
       if (v += "}", !isRoot)
@@ -104339,7 +104465,7 @@ var composeValidationFactory = ({ injectResponse = "", normalize = false, valida
   let code = injectResponse + `
 `;
   code += `if(${name} instanceof ElysiaCustomStatusResponse){c.set.status=${name}.code
-${name}=${name}.response}if(${name} instanceof Response === false)switch(c.set.status){`;
+${name}=${name}.response}if(${name} instanceof Response === false && typeof ${name}?.next !== 'function' && !(${name} instanceof ReadableStream))switch(c.set.status){`;
   for (let [status2, value] of Object.entries(validator.response)) {
     if (code += `
 case ${status2}:
@@ -104463,11 +104589,14 @@ return function(){return a}`)(handler);
       let secret = !cookieMeta.secrets ? undefined : typeof cookieMeta.secrets === "string" ? cookieMeta.secrets : cookieMeta.secrets[0];
       if (_encodeCookie += `const _setCookie = c.set.cookie
 if(_setCookie){`, cookieMeta.sign === true)
-        _encodeCookie += `for(const [key, cookie] of Object.entries(_setCookie)){c.set.cookie[key].value=await signCookie(cookie.value,'${secret}')}`;
-      else
+        _encodeCookie += `for(const [key, cookie] of Object.entries(_setCookie)){c.set.cookie[key].value=await signCookie(cookie.value,${!secret ? "undefined" : JSON.stringify(secret)})}`;
+      else {
+        if (typeof cookieMeta.sign === "string")
+          cookieMeta.sign = [cookieMeta.sign];
         for (let name of cookieMeta.sign)
-          _encodeCookie += `if(_setCookie['${name}']?.value)c.set.cookie['${name}'].value=await signCookie(_setCookie['${name}'].value,'${secret}')
+          _encodeCookie += `if(_setCookie[${JSON.stringify(name)}]?.value)c.set.cookie[${JSON.stringify(name)}].value=await signCookie(_setCookie[${JSON.stringify(name)}].value,${!secret ? "undefined" : JSON.stringify(secret)})
 `;
+      }
       _encodeCookie += `}
 `;
     }
@@ -104484,14 +104613,16 @@ if(_setCookie){`, cookieMeta.sign === true)
   if (fnLiteral += "try{", hasCookie) {
     let get = (name, defaultValue) => {
       let value = cookieMeta?.[name] ?? defaultValue;
+      if (value === undefined)
+        return "";
       if (!value)
         return typeof defaultValue === "string" ? `${name}:"${defaultValue}",` : `${name}:${defaultValue},`;
       if (typeof value === "string")
-        return `${name}:'${value}',`;
+        return `${name}:${JSON.stringify(value)},`;
       if (value instanceof Date)
         return `${name}: new Date(${value.getTime()}),`;
       return `${name}:${value},`;
-    }, options = cookieMeta ? `{secrets:${cookieMeta.secrets !== undefined ? typeof cookieMeta.secrets === "string" ? `'${cookieMeta.secrets}'` : "[" + cookieMeta.secrets.reduce((a, b) => a + `'${b}',`, "") + "]" : "undefined"},sign:${cookieMeta.sign === true ? true : cookieMeta.sign !== undefined ? "[" + cookieMeta.sign.reduce((a, b) => a + `'${b}',`, "") + "]" : "undefined"},` + get("domain") + get("expires") + get("httpOnly") + get("maxAge") + get("path", "/") + get("priority") + get("sameSite") + get("secure") + "}" : "undefined";
+    }, options = cookieMeta ? `{secrets:${cookieMeta.secrets !== undefined ? typeof cookieMeta.secrets === "string" ? JSON.stringify(cookieMeta.secrets) : "[" + cookieMeta.secrets.map((x2) => JSON.stringify(x2)).join(",") + "]" : "undefined"},sign:${cookieMeta.sign === true ? true : cookieMeta.sign !== undefined ? typeof cookieMeta.sign === "string" ? JSON.stringify(cookieMeta.sign) : "[" + cookieMeta.sign.map((x2) => JSON.stringify(x2)).join(",") + "]" : "undefined"},` + get("domain") + get("expires") + get("httpOnly") + get("maxAge") + get("path", "/") + get("priority") + get("sameSite") + get("secure") + "}" : "undefined";
     if (hasHeaders)
       fnLiteral += `
 c.cookie=await parseCookie(c.set,c.headers.cookie,${options})
@@ -104508,12 +104639,12 @@ c.cookie=await parseCookie(c.set,c.request.headers.get('cookie'),${options})
       if (Kind in schema && schema.properties)
         for (let [key, value] of Object.entries(schema.properties)) {
           if (hasElysiaMeta("ArrayQuery", value))
-            arrayProperties[key] = 1, hasArrayProperty = true;
+            arrayProperties[key] = true, hasArrayProperty = true;
           if (hasElysiaMeta("ObjectString", value))
-            objectProperties[key] = 1, hasObjectProperty = true;
+            objectProperties[key] = true, hasObjectProperty = true;
         }
     }
-    fnLiteral += `if(c.qi===-1){c.query=Object.create(null)}else{c.query=parseQueryFromURL(c.url,c.qi+1,${hasArrayProperty ? JSON.stringify(arrayProperties) : undefined},${hasObjectProperty ? JSON.stringify(objectProperties) : undefined})}`;
+    fnLiteral += `if(c.qi===-1){c.query=Object.create(null)}else{c.query=parseQueryFromURL(c.url,c.qi+1${hasArrayProperty ? "," + JSON.stringify(arrayProperties) : hasObjectProperty ? ",undefined" : ""}${hasObjectProperty ? "," + JSON.stringify(objectProperties) : ""})}`;
   }
   let isAsyncHandler = typeof handler === "function" && isAsync(handler), saveResponse = hasTrace || hooks.afterResponse?.length ? "c.response=c.responseValue= " : "", responseKeys = Object.keys(validator.response ?? {}), hasMultipleResponses = responseKeys.length > 1, hasSingle200 = responseKeys.length === 0 || responseKeys.length === 1 && responseKeys[0] === "200", maybeAsync = hasCookie || hasBody || isAsyncHandler || !!hooks.parse?.length || !!hooks.afterHandle?.some(isAsync) || !!hooks.beforeHandle?.some(isAsync) || !!hooks.transform?.some(isAsync) || !!hooks.mapResponse?.some(isAsync) || validator.body?.provider === "standard" || validator.headers?.provider === "standard" || validator.query?.provider === "standard" || validator.params?.provider === "standard" || validator.cookie?.provider === "standard" || Object.values(validator.response ?? {}).find((x2) => x2.provider === "standard"), maybeStream = (typeof handler === "function" ? isGenerator(handler) : false) || !!hooks.beforeHandle?.some(isGenerator) || !!hooks.afterHandle?.some(isGenerator) || !!hooks.transform?.some(isGenerator), hasSet = inference.cookie || inference.set || hasHeaders || hasTrace || hasMultipleResponses || !hasSingle200 || isHandleFn && hasDefaultHeaders || maybeStream, _afterResponse, afterResponse = (hasStream = true) => {
     if (_afterResponse !== undefined)
@@ -104544,7 +104675,7 @@ ${prefix}e.afterResponse[${i2}](c)
     if (!after)
       return `return ${response}`;
     return `const _res=${response}` + after + "return _res";
-  }, mapResponseContext = maybeStream || adapter.mapResponseContext ? `,${adapter.mapResponseContext}` : "";
+  }, mapResponseContext = maybeStream && adapter.mapResponseContext ? `,${adapter.mapResponseContext}` : "";
   if (hasTrace || inference.route)
     fnLiteral += `c.route=\`${path}\`
 `;
@@ -104913,7 +105044,7 @@ if(vac.issues){` + validation.validate("cookie", undefined, "vac.issues") + `}el
 `;
       else if (validator.body?.schema?.noValidate !== true) {
         if (fnLiteral += "if(validator.cookie.Check(cookieValue)===false){" + validation.validate("cookie", "cookieValue") + "}", validator.cookie.hasTransform)
-          fnLiteral += coerceTransformDecodeError("for(const [key,value] of Object.entries(validator.cookie.Decode(cookieValue))){c.cookie[key].value=value}", "cookie", allowUnsafeValidationDetails);
+          fnLiteral += coerceTransformDecodeError("for(const [key,value] of Object.entries(validator.cookie.Decode(cookieValue))){c.cookie[key].cookie.value = value}", "cookie", allowUnsafeValidationDetails);
       }
       if (validator.cookie.isOptional)
         fnLiteral += "}";
@@ -105174,7 +105305,7 @@ c.defs=definitions
   fnLiteral = init + fnLiteral + "}", init = "";
   try {
     return Function("hooks", `"use strict";
-` + fnLiteral)({ handler, hooks: lifeCycleToFn(hooks), validator: hasValidation ? validator : undefined, handleError: app.handleError, mapResponse: adapterHandler.mapResponse, mapCompactResponse: adapterHandler.mapCompactResponse, mapEarlyResponse: adapterHandler.mapEarlyResponse, isNotEmpty, utils: { parseQuery: hasBody ? parseQuery : undefined, parseQueryFromURL: hasQuery ? validator.query?.provider === "standard" ? parseQueryStandardSchema : parseQueryFromURL : undefined }, error: { ValidationError: hasValidation ? ValidationError : undefined, ParseError: hasBody ? ParseError2 : undefined }, fileType, schema: app.router.history, definitions: app.definitions.type, tee, ERROR_CODE, parseCookie: hasCookie ? parseCookie : undefined, signCookie: hasCookie ? signCookie : undefined, decodeURIComponent: hasQuery ? import_fast_decode_uri_component3.default : undefined, ElysiaCustomStatusResponse, ELYSIA_TRACE: hasTrace ? ELYSIA_TRACE : undefined, ELYSIA_REQUEST_ID: hasTrace ? ELYSIA_REQUEST_ID : undefined, getServer: inference.server ? () => app.getServer() : undefined, fileUnions: fileUnions.length ? fileUnions : undefined, TypeBoxError: hasValidation ? TypeBoxError : undefined, parser: app["~parser"], ...adapter.inject });
+` + fnLiteral)({ handler, hooks: lifeCycleToFn(hooks), validator: hasValidation ? validator : undefined, handleError: app.handleError, mapResponse: adapterHandler.mapResponse, mapCompactResponse: adapterHandler.mapCompactResponse, mapEarlyResponse: adapterHandler.mapEarlyResponse, isNotEmpty, utils: { parseQuery: hasBody ? parseQuery : undefined, parseQueryFromURL: hasQuery ? validator.query?.provider === "standard" ? parseQueryStandardSchema : parseQueryFromURL : undefined }, error: { ValidationError: hasValidation ? ValidationError : undefined, ParseError: hasBody ? ParseError2 : undefined }, fileType, schema: app.router.history, definitions: app.definitions.type, tee, ERROR_CODE, parseCookie: hasCookie ? parseCookie : undefined, signCookie: hasCookie ? signCookie : undefined, Cookie: hasCookie ? Cookie : undefined, decodeURIComponent: hasQuery ? import_fast_decode_uri_component3.default : undefined, ElysiaCustomStatusResponse, ELYSIA_TRACE: hasTrace ? ELYSIA_TRACE : undefined, ELYSIA_REQUEST_ID: hasTrace ? ELYSIA_REQUEST_ID : undefined, getServer: inference.server ? () => app.getServer() : undefined, fileUnions: fileUnions.length ? fileUnions : undefined, TypeBoxError: hasValidation ? TypeBoxError : undefined, parser: app["~parser"], ...adapter.inject });
   } catch (error) {
     let debugHooks = lifeCycleToFn(hooks);
     console.log("[Composer] failed to generate optimized handler"), console.log("---"), console.log({ handler: typeof handler === "function" ? handler.toString() : handler, instruction: fnLiteral, hooks: { ...debugHooks, transform: debugHooks?.transform?.map?.((x2) => x2.toString()), resolve: debugHooks?.resolve?.map?.((x2) => x2.toString()), beforeHandle: debugHooks?.beforeHandle?.map?.((x2) => x2.toString()), afterHandle: debugHooks?.afterHandle?.map?.((x2) => x2.toString()), mapResponse: debugHooks?.mapResponse?.map?.((x2) => x2.toString()), parse: debugHooks?.parse?.map?.((x2) => x2.toString()), error: debugHooks?.error?.map?.((x2) => x2.toString()), afterResponse: debugHooks?.afterResponse?.map?.((x2) => x2.toString()), stop: debugHooks?.stop?.map?.((x2) => x2.toString()) }, validator, definitions: app.definitions.type, error }), console.log("---"), process.exit(1);
@@ -105216,12 +105347,7 @@ var composeGeneralHandler = (app) => {
   if (findDynamicRoute += router.http.root.ALL ? `??router.find('ALL',p)
 ` : `
 `, isWebstandard)
-    findDynamicRoute += `if(r.method==='HEAD'){const route=router.find('GET',p)
-if(route){c.params=route.params
-const _res=route.store.handler?route.store.handler(c):route.store.compile()(c)
-if(_res)return getResponseLength(_res).then((length)=>{_res.headers.set('content-length', length)
-return new Response(null,{status:_res.status,statusText:_res.statusText,headers:_res.headers})
-})}}`;
+    findDynamicRoute += 'if(r.method==="HEAD"){const route=router.find("GET",p);if(route){c.params=route.params;const _res=route.store.handler?route.store.handler(c):route.store.compile()(c);if(_res)return Promise.resolve(_res).then((_res)=>{if(!_res.headers)_res.headers=new Headers();return getResponseLength(_res).then((length)=>{_res.headers.set("content-length", length);return new Response(null,{status:_res.status,statusText:_res.statusText,headers:_res.headers});})});}}';
   let afterResponse = `c.error=notFound
 `;
   if (app.event.afterResponse?.length && !app.event.error) {
@@ -105273,13 +105399,9 @@ return route.store.compile()(c)
 `;
     }
     if (isWebstandard && (("GET" in methods) || ("ALL" in methods)) && "HEAD" in methods === false)
-      switchMap += `case 'HEAD':const _ht=ht[${methods.GET ?? methods.ALL}].composed(c)
-if(typeof _ht === 'function') {return _ht.then(_res=>getResponseLength(_res).then((length)=>{_res.headers.set('content-length', length)
-return new Response(null,{status:_res.status,statusText:_res.statusText,headers:_res.headers})
-}))
-}else{return getResponseLength(_ht).then((length)=>{_ht.headers.set('content-length', length)
+      switchMap += `case 'HEAD':return Promise.resolve(ht[${methods.GET ?? methods.ALL}].composed(c)).then(_ht=>getResponseLength(_ht).then((length)=>{_ht.headers.set('content-length', length)
 return new Response(null,{status:_ht.status,statusText:_ht.statusText,headers:_ht.headers})
-})}
+}))
 `;
     for (let [method, index] of Object.entries(methods)) {
       if (method === "ALL" || method === "GET" || method === "WS")
@@ -105337,8 +105459,8 @@ map: switch(p){
 };
 var composeErrorHandler = (app) => {
   let hooks = app.event, fnLiteral = "", adapter = app["~adapter"].composeError, adapterVariables = adapter.inject ? Object.keys(adapter.inject).join(",") + "," : "", hasTrace = !!app.event.trace?.length;
-  if (fnLiteral += "const {mapResponse,ERROR_CODE,ElysiaCustomStatusResponse," + allocateIf("onError,", app.event.error) + allocateIf("afterResponse,", app.event.afterResponse) + allocateIf("trace,", app.event.trace) + allocateIf("onMapResponse,", app.event.mapResponse) + allocateIf("ELYSIA_TRACE,", hasTrace) + allocateIf("ELYSIA_REQUEST_ID,", hasTrace) + adapterVariables + `}=inject
-`, fnLiteral += `return ${app.event.error?.find(isAsync) || app.event.mapResponse?.find(isAsync) ? "async " : ""}function(context,error,skipGlobal){`, fnLiteral += "", hasTrace)
+  if (fnLiteral += "const {mapResponse,ERROR_CODE,ElysiaCustomStatusResponse,ValidationError,TransformDecodeError," + allocateIf("onError,", app.event.error) + allocateIf("afterResponse,", app.event.afterResponse) + allocateIf("trace,", app.event.trace) + allocateIf("onMapResponse,", app.event.mapResponse) + allocateIf("ELYSIA_TRACE,", hasTrace) + allocateIf("ELYSIA_REQUEST_ID,", hasTrace) + adapterVariables + `}=inject
+`, fnLiteral += "return async function(context,error,skipGlobal){", fnLiteral += "", hasTrace)
     fnLiteral += `const id=context[ELYSIA_REQUEST_ID]
 `;
   let report = createReport({ context: "context", trace: hooks.trace, addFn: (word) => {
@@ -105370,11 +105492,18 @@ if(error instanceof ElysiaCustomStatusResponse){set.status=error.status=error.co
 error.message=error.response}`, adapter.declare)
     fnLiteral += adapter.declare;
   let saveResponse = hasTrace || !!hooks.afterResponse?.length ? "context.response = " : "";
-  if (app.event.error)
+  if (fnLiteral += `if(typeof error?.toResponse==='function'&&!(error instanceof ValidationError)&&!(error instanceof TransformDecodeError)){try{let raw=error.toResponse()
+if(typeof raw?.then==='function')raw=await raw
+if(raw instanceof Response)set.status=raw.status
+context.response=context.responseValue=raw
+}catch(toResponseError){
+}
+}
+`, app.event.error)
     for (let i2 = 0;i2 < app.event.error.length; i2++) {
       let handler = app.event.error[i2], response = `${isAsync(handler) ? "await " : ""}onError[${i2}](context)
 `;
-      if (fnLiteral += "if(skipGlobal!==true){", hasReturn(handler)) {
+      if (fnLiteral += "if(skipGlobal!==true&&!context.response){", hasReturn(handler)) {
         fnLiteral += `_r=${response}
 if(_r!==undefined){if(_r instanceof Response){` + afterResponse() + `return mapResponse(_r,set${adapter.mapResponseContext})}if(_r instanceof ElysiaCustomStatusResponse){error.status=error.code
 error.message = error.response}if(set.status===200||!set.status)set.status=error.status
@@ -105391,14 +105520,12 @@ error.message = error.response}if(set.status===200||!set.status)set.status=error
         fnLiteral += response;
       fnLiteral += "}";
     }
-  fnLiteral += `if(error.constructor.name==="ValidationError"||error.constructor.name==="TransformDecodeError"){
+  fnLiteral += `if(error instanceof ValidationError||error instanceof TransformDecodeError){
 if(error.error)error=error.error
 set.status=error.status??422
 ` + afterResponse() + adapter.validationError + `
 }
-`, fnLiteral += "if(error instanceof Error){" + afterResponse() + `
-if(typeof error.toResponse==='function')return context.response=context.responseValue=error.toResponse()
-` + adapter.unknownError + `
+`, fnLiteral += "if(!context.response&&error instanceof Error){" + afterResponse() + adapter.unknownError + `
 }`;
   let mapResponseReporter = report("mapResponse", { total: hooks.mapResponse?.length, name: "context" });
   if (fnLiteral += `
@@ -105416,7 +105543,7 @@ if(mr!==undefined)error=context.response=context.responseValue=mr}`, endUnit();
 return mapResponse(${saveResponse}error,set${adapter.mapResponseContext})}`;
   let mapFn = (x2) => typeof x2 === "function" ? x2 : x2.fn;
   return Function("inject", `"use strict";
-` + fnLiteral)({ mapResponse: app["~adapter"].handler.mapResponse, ERROR_CODE, ElysiaCustomStatusResponse, onError: app.event.error?.map(mapFn), afterResponse: app.event.afterResponse?.map(mapFn), trace: app.event.trace?.map(mapFn), onMapResponse: app.event.mapResponse?.map(mapFn), ELYSIA_TRACE: hasTrace ? ELYSIA_TRACE : undefined, ELYSIA_REQUEST_ID: hasTrace ? ELYSIA_REQUEST_ID : undefined, ...adapter.inject });
+` + fnLiteral)({ mapResponse: app["~adapter"].handler.mapResponse, ERROR_CODE, ElysiaCustomStatusResponse, ValidationError, TransformDecodeError, onError: app.event.error?.map(mapFn), afterResponse: app.event.afterResponse?.map(mapFn), trace: app.event.trace?.map(mapFn), onMapResponse: app.event.mapResponse?.map(mapFn), ELYSIA_TRACE: hasTrace ? ELYSIA_TRACE : undefined, ELYSIA_REQUEST_ID: hasTrace ? ELYSIA_REQUEST_ID : undefined, ...adapter.inject });
 };
 var allocateIf2 = (value, condition) => condition ? value : "";
 var createContext = (app, route, inference, isInline = false) => {
@@ -105488,6 +105615,10 @@ var websocket = { open(ws) {
   ws.data.drain?.(ws);
 }, close(ws, code, reason) {
   ws.data.close?.(ws, code, reason);
+}, ping(ws) {
+  ws.data.ping?.(ws);
+}, pong(ws) {
+  ws.data.pong?.(ws);
 } };
 
 class ElysiaWS {
@@ -105586,7 +105717,7 @@ var createWSMessageParser = (parse2) => {
     return message;
   };
 };
-var createHandleWSResponse = (validateResponse) => {
+var createHandleWSResponse = (responseValidator) => {
   let handleWSResponse = (ws, data) => {
     if (data instanceof Promise)
       return data.then((data2) => handleWSResponse(ws, data2));
@@ -105594,9 +105725,9 @@ var createHandleWSResponse = (validateResponse) => {
       return ws.send(data.toString());
     if (data === undefined)
       return;
-    let send = (datum) => {
-      if (validateResponse?.Check(datum) === false)
-        return ws.send(new ValidationError("message", validateResponse, datum).message);
+    let validateResponse = responseValidator ? responseValidator.provider === "standard" ? (data2) => responseValidator.schema["~standard"].validate(data2).issues : (data2) => responseValidator.Check(data2) === false : undefined, send = (datum) => {
+      if (validateResponse && validateResponse(datum) === false)
+        return ws.send(new ValidationError("message", responseValidator, datum).message);
       if (typeof datum === "object")
         return ws.send(JSON.stringify(datum));
       ws.send(datum);
@@ -105607,8 +105738,8 @@ var createHandleWSResponse = (validateResponse) => {
     if (init instanceof Promise)
       return (async () => {
         let first = await init;
-        if (validateResponse?.Check(first) === false)
-          return ws.send(new ValidationError("message", validateResponse, first).message);
+        if (validateResponse && validateResponse(first))
+          return ws.send(new ValidationError("message", responseValidator, first).message);
         if (send(first.value), !first.done)
           for await (let datum of data)
             send(datum);
@@ -105776,10 +105907,10 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
   } else
     console.log("Elysia isn't running. Call `app.listen` to start the server.", Error().stack);
 }, ws(app, path, options) {
-  let { parse: parse2, body, response, ...rest } = options, validateMessage = getSchemaValidator(body, { modules: app.definitions.typebox, models: app.definitions.type, normalize: app.config.normalize }), validateResponse = getSchemaValidator(response, { modules: app.definitions.typebox, models: app.definitions.type, normalize: app.config.normalize });
+  let { parse: parse2, body, response, ...rest } = options, messageValidator = getSchemaValidator(body, { modules: app.definitions.typebox, models: app.definitions.type, normalize: app.config.normalize }), validateMessage = messageValidator ? messageValidator.provider === "standard" ? (data) => messageValidator.schema["~standard"].validate(data).issues : (data) => messageValidator.Check(data) === false : undefined, responseValidator = getSchemaValidator(response, { modules: app.definitions.typebox, models: app.definitions.type, normalize: app.config.normalize });
   app.route("WS", path, async (context) => {
     let server = context.server ?? app.server, { set: set2, path: path2, qi, headers, query, params } = context;
-    if (context.validator = validateResponse, options.upgrade) {
+    if (context.validator = responseValidator, options.upgrade) {
       if (typeof options.upgrade === "function") {
         let temp = options.upgrade(context);
         if (temp instanceof Promise)
@@ -105794,7 +105925,7 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
     }
     if (set2.headers["set-cookie"] && Array.isArray(set2.headers["set-cookie"]))
       set2.headers = parseSetCookies(new Headers(set2.headers), set2.headers["set-cookie"]);
-    let handleResponse3 = createHandleWSResponse(validateResponse), parseMessage = createWSMessageParser(parse2), _id;
+    let handleResponse3 = createHandleWSResponse(responseValidator), parseMessage = createWSMessageParser(parse2), _id;
     if (typeof options.beforeHandle === "function") {
       let result = options.beforeHandle(context);
       if (result instanceof Promise)
@@ -105813,7 +105944,7 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
       if (_id)
         return _id;
       return _id = randomId();
-    }, validator: validateResponse, ping(ws, data) {
+    }, validator: responseValidator, ping(ws, data) {
       options.ping?.(ws, data);
     }, pong(ws, data) {
       options.pong?.(ws, data);
@@ -105825,8 +105956,8 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
       }
     }, message: async (ws, _message) => {
       let message = await parseMessage(ws, _message);
-      if (validateMessage?.Check(message) === false) {
-        let validationError = new ValidationError("message", validateMessage, message);
+      if (validateMessage && validateMessage(message)) {
+        let validationError = new ValidationError("message", messageValidator, message);
         if (!hasCustomErrorHandlers)
           return void ws.send(validationError.message);
         return handleErrors(ws, validationError);
@@ -105850,7 +105981,7 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
       }
     } } }))
       return;
-    return set2.status = 400, "Expected a websocket connection";
+    return status(400, "Expected a websocket connection");
   }, { ...rest, websocket: options });
 } };
 var injectDefaultValues = (typeChecker, obj2) => {
@@ -105896,7 +106027,7 @@ var createDynamicHandler = (app) => {
             case "application/octet-stream":
               body = await request.arrayBuffer();
               break;
-            case "multipart/form-data":
+            case "multipart/form-data": {
               body = {};
               let form2 = await request.formData();
               for (let key of form2.keys()) {
@@ -105909,6 +106040,7 @@ var createDynamicHandler = (app) => {
                   body[key] = value;
               }
               break;
+            }
           }
         else {
           let contentType;
@@ -105940,7 +106072,7 @@ var createDynamicHandler = (app) => {
                       body = await request.arrayBuffer();
                       break;
                     case "formdata":
-                    case "multipart/form-data":
+                    case "multipart/form-data": {
                       body = {};
                       let form2 = await request.formData();
                       for (let key of form2.keys()) {
@@ -105953,7 +106085,8 @@ var createDynamicHandler = (app) => {
                           body[key] = value;
                       }
                       break;
-                    default:
+                    }
+                    default: {
                       let parser = app["~parser"][hook];
                       if (parser) {
                         let temp = parser(context, contentType);
@@ -105965,6 +106098,7 @@ var createDynamicHandler = (app) => {
                         }
                       }
                       break;
+                    }
                   }
                 else {
                   let temp = hook(context, contentType);
@@ -105990,7 +106124,7 @@ var createDynamicHandler = (app) => {
                 case "application/octet-stream":
                   body = await request.arrayBuffer();
                   break;
-                case "multipart/form-data":
+                case "multipart/form-data": {
                   body = {};
                   let form2 = await request.formData();
                   for (let key of form2.keys()) {
@@ -106003,6 +106137,7 @@ var createDynamicHandler = (app) => {
                       body[key] = value;
                   }
                   break;
+                }
               }
           }
         }
@@ -106184,7 +106319,16 @@ var createDynamicErrorHandler = (app) => {
   let { mapResponse: mapResponse3 } = app["~adapter"].handler;
   return async (context, error) => {
     let errorContext = Object.assign(context, { error, code: error.code });
-    if (errorContext.set = context.set, app.event.error)
+    if (errorContext.set = context.set, typeof error?.toResponse === "function" && !(error instanceof ValidationError) && !(error instanceof TransformDecodeError))
+      try {
+        let raw = error.toResponse();
+        if (typeof raw?.then === "function")
+          raw = await raw;
+        if (raw instanceof Response)
+          context.set.status = raw.status;
+        context.response = raw;
+      } catch (toResponseError) {}
+    if (!context.response && app.event.error)
       for (let i2 = 0;i2 < app.event.error.length; i2++) {
         let response = app.event.error[i2].fn(errorContext);
         if (response instanceof Promise)
@@ -106192,7 +106336,18 @@ var createDynamicErrorHandler = (app) => {
         if (response !== undefined && response !== null)
           return context.response = mapResponse3(response, context.set);
       }
-    return new Response(typeof error.cause === "string" ? error.cause : error.message, { headers: context.set.headers, status: error.status ?? 500 });
+    if (context.response) {
+      if (app.event.mapResponse)
+        for (let i2 = 0;i2 < app.event.mapResponse.length; i2++) {
+          let response = app.event.mapResponse[i2].fn(errorContext);
+          if (response instanceof Promise)
+            response = await response;
+          if (response !== undefined && response !== null)
+            context.response = response;
+        }
+      return mapResponse3(context.response, context.set);
+    }
+    return context.set.status = error.status ?? 500, mapResponse3(typeof error.cause === "string" ? error.cause : error.message, context.set);
   };
 };
 
@@ -106415,27 +106570,28 @@ class Elysia {
         this.router.response[path2] = nativeStaticHandler();
     };
     addResponsePath(path);
-    let _compiled, compile2 = () => {
-      if (_compiled)
-        return _compiled;
-      return _compiled = composeHandler({ app: this, path, method, hooks, validator: createValidator(), handler: typeof handle !== "function" && typeof adapter.createStaticHandler !== "function" ? () => handle : handle, allowMeta, inference: this.inference });
+    let compile2 = () => {
+      let compiled = composeHandler({ app: this, path, method, hooks, validator: createValidator(), handler: typeof handle !== "function" && typeof adapter.createStaticHandler !== "function" ? () => handle : handle, allowMeta, inference: this.inference });
+      if (this.router.history[index])
+        this.router.history[index].composed = compiled;
+      return compiled;
     }, oldIndex;
     if (`${method}_${path}` in this.routeTree)
       for (let i2 = 0;i2 < this.router.history.length; i2++) {
-        let route = this.router.history[i2];
-        if (route.path === path && route.method === method) {
+        let route2 = this.router.history[i2];
+        if (route2.path === path && route2.method === method) {
           oldIndex = i2;
           break;
         }
       }
     else
       this.routeTree[`${method}_${path}`] = this.router.history.length;
-    let index = oldIndex ?? this.router.history.length, mainHandler = shouldPrecompile ? compile2() : (ctx) => (this.router.history[index].composed = compile2())(ctx);
+    let index = oldIndex ?? this.router.history.length, route = this.router.history, mainHandler = shouldPrecompile ? compile2() : (ctx) => (route[index].composed = compile2())(ctx);
     if (oldIndex !== undefined)
       this.router.history[oldIndex] = Object.assign({ method, path, composed: mainHandler, compile: compile2, handler: handle, hooks }, standaloneValidators.length ? { standaloneValidators } : undefined, localHook.webSocket ? { websocket: localHook.websocket } : undefined);
     else
       this.router.history.push(Object.assign({ method, path, composed: mainHandler, compile: compile2, handler: handle, hooks }, localHook.webSocket ? { websocket: localHook.websocket } : undefined));
-    let handler = { handler: shouldPrecompile ? mainHandler : undefined, compile() {
+    let handler = { handler: shouldPrecompile ? route[index].composed : undefined, compile() {
       return this.handler = compile2();
     } }, staticRouter = this.router.static, isStaticPath = path.indexOf(":") === -1 && path.indexOf("*") === -1;
     if (method === "WS") {
@@ -106892,6 +107048,10 @@ class Elysia {
           insertStandaloneValidator(localHook, k2, value2), delete localHook[key];
           continue;
         }
+        if (k2 === "introspect") {
+          value2?.(localHook), delete localHook[key];
+          continue;
+        }
         if (k2 === "detail") {
           if (!localHook.detail)
             localHook.detail = {};
@@ -136264,7 +136424,7 @@ class WithSubquery extends Subquery {
 }
 
 // node_modules/drizzle-orm/version.js
-var version4 = "0.44.7";
+var version4 = "0.45.0";
 
 // node_modules/drizzle-orm/tracing.js
 var otel;
@@ -136897,6 +137057,8 @@ function mapResultRow(columns, row, joinsNotNullableMap) {
       decoder2 = field;
     } else if (is(field, SQL)) {
       decoder2 = field.decoder;
+    } else if (is(field, Subquery)) {
+      decoder2 = field._.sql.decoder;
     } else {
       decoder2 = field.sql.decoder;
     }
@@ -136937,7 +137099,7 @@ function orderSelectedFields(fields, pathPrefix) {
       return result;
     }
     const newPath = pathPrefix ? [...pathPrefix, name] : [name];
-    if (is(field, Column) || is(field, SQL) || is(field, SQL.Aliased)) {
+    if (is(field, Column) || is(field, SQL) || is(field, SQL.Aliased) || is(field, Subquery)) {
       result.push({ path: newPath, field });
     } else if (is(field, Table)) {
       result.push(...orderSelectedFields(field[Table.Symbol.Columns], newPath));
@@ -137321,7 +137483,9 @@ class PgDate extends PgColumn {
     return "date";
   }
   mapFromDriverValue(value) {
-    return new Date(value);
+    if (typeof value === "string")
+      return new Date(value);
+    return value;
   }
   mapToDriverValue(value) {
     return value.toISOString();
@@ -137343,6 +137507,11 @@ class PgDateString extends PgColumn {
   getSQLType() {
     return "date";
   }
+  mapFromDriverValue(value) {
+    if (typeof value === "string")
+      return value;
+    return value.toISOString().slice(0, -14);
+  }
 }
 function date7(a, b) {
   const { name, config: config5 } = getColumnNameAndConfig(a, b);
@@ -138085,9 +138254,11 @@ class PgTimestamp extends PgColumn {
     const precision = this.precision === undefined ? "" : ` (${this.precision})`;
     return `timestamp${precision}${this.withTimezone ? " with time zone" : ""}`;
   }
-  mapFromDriverValue = (value) => {
-    return new Date(this.withTimezone ? value : value + "+0000");
-  };
+  mapFromDriverValue(value) {
+    if (typeof value === "string")
+      return new Date(this.withTimezone ? value : value + "+0000");
+    return value;
+  }
   mapToDriverValue = (value) => {
     return value.toISOString();
   };
@@ -138118,6 +138289,17 @@ class PgTimestampString extends PgColumn {
     const precision = this.precision === undefined ? "" : `(${this.precision})`;
     return `timestamp${precision}${this.withTimezone ? " with time zone" : ""}`;
   }
+  mapFromDriverValue(value) {
+    if (typeof value === "string")
+      return value;
+    const shortened = value.toISOString().slice(0, -1).replace("T", " ");
+    if (this.withTimezone) {
+      const offset = value.getTimezoneOffset();
+      const sign = offset <= 0 ? "+" : "-";
+      return `${shortened}${sign}${Math.floor(Math.abs(offset) / 60).toString().padStart(2, "0")}`;
+    }
+    return shortened;
+  }
 }
 function timestamp(a, b = {}) {
   const { name, config: config5 } = getColumnNameAndConfig(a, b);
@@ -140160,7 +140342,8 @@ class PgDialect {
     const setSize = columnNames.length;
     return sql3.join(columnNames.flatMap((colName, i2) => {
       const col = tableColumns[colName];
-      const value = set2[colName] ?? sql3.param(col.onUpdateFn(), col);
+      const onUpdateFnResult = col.onUpdateFn?.();
+      const value = set2[colName] ?? (is(onUpdateFnResult, SQL) ? onUpdateFnResult : sql3.param(onUpdateFnResult, col));
       const res = sql3`${sql3.identifier(this.casing.getColumnCasing(col))} = ${value}`;
       if (i2 < setSize - 1) {
         return [res, sql3.raw(", ")];
@@ -140209,6 +140392,16 @@ class PgDialect {
         } else {
           chunk.push(field);
         }
+      } else if (is(field, Subquery)) {
+        const entries = Object.entries(field._.selectedFields);
+        if (entries.length === 1) {
+          const entry = entries[0][1];
+          const fieldDecoder = is(entry, SQL) ? entry.decoder : is(entry, Column) ? { mapFromDriverValue: (v) => entry.mapFromDriverValue(v) } : entry.sql.decoder;
+          if (fieldDecoder) {
+            field._.sql.decoder = fieldDecoder;
+          }
+        }
+        chunk.push(field);
       }
       if (i2 < columnsLen - 1) {
         chunk.push(sql3`, `);
@@ -142174,6 +142367,7 @@ class PgTransaction extends PgDatabase {
 
 // node_modules/drizzle-orm/node-postgres/session.js
 var { Pool: Pool2, types: types2 } = esm_default;
+var NativePool = esm_default.native ? esm_default.native.Pool : undefined;
 
 class NodePgPreparedQuery extends PgPreparedQuery {
   constructor(client, queryString, params, logger2, cache2, queryMetadata, cacheConfig, fields, name, _isResponseInArrayMode, customResultMapper) {
@@ -142331,7 +142525,7 @@ class NodePgSession extends PgSession {
     return new NodePgPreparedQuery(this.client, query.sql, query.params, this.logger, this.cache, queryMetadata, cacheConfig, fields, name, isResponseInArrayMode, customResultMapper);
   }
   async transaction(transaction, config5) {
-    const session = this.client instanceof Pool2 ? new NodePgSession(await this.client.connect(), this.dialect, this.schema, this.options) : this;
+    const session = this.client instanceof Pool2 || NativePool && this.client instanceof NativePool ? new NodePgSession(await this.client.connect(), this.dialect, this.schema, this.options) : this;
     const tx = new NodePgTransaction(this.dialect, session, this.schema);
     await tx.execute(sql3`begin${config5 ? sql3` ${tx.getTransactionConfigSQL(config5)}` : undefined}`);
     try {
@@ -142342,7 +142536,7 @@ class NodePgSession extends PgSession {
       await tx.execute(sql3`rollback`);
       throw error3;
     } finally {
-      if (this.client instanceof Pool2) {
+      if (this.client instanceof Pool2 || NativePool && this.client instanceof NativePool) {
         session.client.release();
       }
     }
@@ -142855,7 +143049,7 @@ var companyBillingPlanTable = companySchema.table("billing_plan", {
   companyId: uuid5().notNull(),
   billingPeriod: companyBillingPeriodEnum().notNull().default("MONTHLY"),
   basePrice: numeric({ mode: "number" }).notNull(),
-  pricePerCar: numeric({ mode: "number" }),
+  maxCarCount: integer2(),
   active: boolean4().notNull().default(true),
   note: text()
 });
@@ -142867,8 +143061,6 @@ var companyInvoiceTable = companySchema.table("invoice", {
   periodEnd: date7().notNull(),
   carCount: integer2().notNull(),
   basePrice: numeric({ mode: "number" }).notNull(),
-  carPrice: numeric({ mode: "number" }).notNull(),
-  totalPrice: numeric({ mode: "number" }).notNull(),
   status: companyInvoiceStatusEnum().notNull().default("PENDING"),
   issuedAt: timestamp({ withTimezone: true, mode: "string" }).notNull(),
   paidAt: timestamp({ withTimezone: true, mode: "string" }),
@@ -143431,7 +143623,7 @@ var db_default = db;
 var webCrypto = globalThis.crypto;
 var subtle = webCrypto.subtle;
 
-// node_modules/@upstash/redis/chunk-TAJI6TAE.mjs
+// node_modules/@upstash/redis/chunk-TBGBPMGD.mjs
 var __defProp6 = Object.defineProperty;
 var __export4 = (target, all) => {
   for (var name in all)
@@ -146238,7 +146430,7 @@ var Redis = class {
   zunion = (...args) => new ZUnionCommand(args, this.opts).exec(this.client);
   zunionstore = (...args) => new ZUnionStoreCommand(args, this.opts).exec(this.client);
 };
-var VERSION = "v1.35.6";
+var VERSION = "v1.35.7";
 
 // node_modules/@upstash/redis/nodejs.mjs
 if (typeof atob === "undefined") {
@@ -146273,7 +146465,7 @@ var Redis2 = class _Redis extends Redis {
     });
     super(client, {
       automaticDeserialization: configOrRequester.automaticDeserialization,
-      enableTelemetry: !process.env.UPSTASH_DISABLE_TELEMETRY,
+      enableTelemetry: configOrRequester.enableTelemetry ?? !process.env.UPSTASH_DISABLE_TELEMETRY,
       latencyLogging: configOrRequester.latencyLogging,
       enableAutoPipelining: configOrRequester.enableAutoPipelining
     });
@@ -147381,10 +147573,6 @@ var CompanyInvoiceLogic;
     if (!carCount || carCount === 0) {
       carCount = await CompanyInvoiceLogic.getCarCount(body.companyId);
     }
-    const basePrice = Number(billingPlan.basePrice);
-    const pricePerCar = billingPlan.pricePerCar ? Number(billingPlan.pricePerCar) : 0;
-    const carPrice = pricePerCar * Math.max(0, carCount - 1);
-    const totalPrice = basePrice + carPrice;
     const issuedAt = new Date;
     const dueAt = new Date(issuedAt);
     dueAt.setDate(dueAt.getDate() + 30);
@@ -147395,8 +147583,6 @@ var CompanyInvoiceLogic;
       periodStart: body.periodStart,
       periodEnd: periodEnd.toISOString().split("T")[0],
       carCount,
-      carPrice,
-      totalPrice,
       status: "PENDING",
       issuedAt: issuedAt.toISOString(),
       dueAt: dueAt.toISOString()
@@ -147481,13 +147667,12 @@ var CompanyInvoicePaymentLogic;
     }).from(companyInvoicePaymentTable).where(eq(companyInvoicePaymentTable.invoiceId, body.invoiceId));
     const totalPaid = paidAmountResult[0]?.totalPaid ?? 0;
     const newPaymentAmount = Number(body.amount);
-    const invoiceTotal = Number(invoice.totalPrice);
     const newTotalPaid = totalPaid + newPaymentAmount;
     const [payment] = await db_default.insert(companyInvoicePaymentTable).values({
       ...body,
       paidAt: body.paidAt || new Date().toISOString()
     }).returning();
-    if (newTotalPaid >= invoiceTotal) {
+    if (newTotalPaid >= invoice.basePrice) {
       await db_default.update(companyInvoiceTable).set({
         status: "PAID",
         paidAt: new Date().toISOString()
@@ -147956,7 +148141,7 @@ var WarehouseItemLogic;
     }
     const BATCH_SIZE = 1000;
     const currentItems = await db_default.select().from(warehouseItemTable).where(inArray(warehouseItemTable.productId, body.map((item) => item.productId)));
-    const newItems = body.filter((item) => !currentItems.map((i2) => i2.productId).includes(item.productId));
+    const newItems = body.filter((item) => currentItems.filter((i2) => i2.productId === item.productId && i2.warehouseId === item.warehouseId).length === 0);
     for (let i2 = 0;i2 < newItems.length; i2 += BATCH_SIZE) {
       const batch = newItems.slice(i2, i2 + BATCH_SIZE);
       const inserted = await db_default.insert(warehouseItemTable).values(batch).returning();
@@ -150277,9 +150462,10 @@ var normalizeRetryOptions = (retry2 = {}) => {
   if (retry2.statusCodes && !Array.isArray(retry2.statusCodes)) {
     throw new Error("retry.statusCodes must be an array");
   }
+  const normalizedRetry = Object.fromEntries(Object.entries(retry2).filter(([, value]) => value !== undefined));
   return {
     ...defaultRetryOptions,
-    ...retry2
+    ...normalizedRetry
   };
 };
 
@@ -150534,7 +150720,8 @@ class Ky {
         jitteredDelay = retryDelay;
       }
     }
-    return Math.min(this.#options.retry.backoffLimit, jitteredDelay);
+    const backoffLimit = this.#options.retry.backoffLimit ?? Number.POSITIVE_INFINITY;
+    return Math.min(backoffLimit, jitteredDelay);
   }
   async#calculateRetryDelay(error3) {
     this.#retryCount++;
@@ -155479,6 +155666,225 @@ var msRoutes = new Elysia({
 }).use(record_default);
 var ms_default = msRoutes;
 
+// src/routes/fleet/pm/plan/logic.ts
+var PmPlanLogic;
+((PmPlanLogic) => {
+  PmPlanLogic.select = async (query, user2) => {
+    const filter = and(eq(pmPlanTable.companyId, user2.companyId), softDeletedFilter(pmPlanTable));
+    const columns = getTableColumns(pmPlanTable);
+    const baseQuery = db_default.select({
+      ...columns,
+      totalCount: totalCountSql
+    }).from(pmPlanTable).where(filter).$dynamic();
+    const result = await pagination_helper_default(baseQuery, query.pagination);
+    return getPaginationContent(result, query.pagination.size);
+  };
+  PmPlanLogic.create = async (body, user2) => {
+    const [result] = await db_default.insert(pmPlanTable).values({
+      ...body,
+      companyId: user2.companyId
+    }).returning({
+      id: pmPlanTable.id
+    });
+    return result;
+  };
+  PmPlanLogic.update = async (id, body, user2) => {
+    await db_default.update(pmPlanTable).set({
+      ...body
+    }).where(and(eq(pmPlanTable.id, id), eq(pmPlanTable.companyId, user2.companyId)));
+  };
+  PmPlanLogic.remove = async (id, user2) => {
+    await db_default.update(pmPlanTable).set({
+      deletedAt: nowSql_helper_default
+    }).where(and(eq(pmPlanTable.id, id), eq(pmPlanTable.companyId, user2.companyId)));
+  };
+})(PmPlanLogic ||= {});
+var logic_default40 = PmPlanLogic;
+
+// src/routes/fleet/pm/plan/machine/logic.ts
+var PmPlanLogic2;
+((PmPlanLogic) => {
+  PmPlanLogic.select = async (query) => {
+    const filter = and(eq(pmPlanMachineTable.pmPlanId, query.pmPlanId), softDeletedFilter(pmPlanMachineTable));
+    const columns = getTableColumns(pmPlanMachineTable);
+    const baseQuery = db_default.select({
+      ...columns,
+      totalCount: totalCountSql
+    }).from(pmPlanMachineTable).where(filter).$dynamic();
+    const result = await pagination_helper_default(baseQuery, query.pagination);
+    return getPaginationContent(result, query.pagination.size);
+  };
+  PmPlanLogic.create = async (body, user2) => {
+    if (!user2.employeeId) {
+      return status("Bad Request", "\u0410\u0436\u0438\u043B\u0442\u043D\u044B \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u0448\u0430\u0430\u0440\u0434\u043B\u0430\u0433\u0430\u0442\u0430\u0439.");
+    }
+    await db_default.insert(pmPlanMachineTable).values({
+      ...body,
+      userCreatedId: user2.id,
+      employeeCreatedId: user2.employeeId
+    });
+  };
+  PmPlanLogic.createMany = async (body) => {
+    if (body.length === 0) {
+      return status("Bad Request", "\u041C\u0430\u0448\u0438\u043D\u044B \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u043E\u0440\u0443\u0443\u043B\u0430\u0445 \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u0431\u0430\u0439\u0445\u0433\u04AF\u0439 \u0431\u0430\u0439\u043D\u0430.");
+    }
+    const result = await db_default.insert(pmPlanMachineTable).values(body).returning();
+    return result;
+  };
+  PmPlanLogic.update = async (id, body) => {
+    await db_default.update(pmPlanMachineTable).set({
+      ...body
+    }).where(and(eq(pmPlanMachineTable.id, id)));
+  };
+  PmPlanLogic.remove = async (id) => {
+    await db_default.update(pmPlanMachineTable).set({
+      deletedAt: nowSql_helper_default
+    }).where(and(eq(pmPlanMachineTable.id, id)));
+  };
+})(PmPlanLogic2 ||= {});
+var logic_default41 = PmPlanLogic2;
+
+// src/routes/fleet/pm/plan/machine/model.ts
+var PmPlanMachineModel;
+((PmPlanMachineModel) => {
+  const createSchema = createInsertSchema2(pmPlanMachineTable);
+  const updateSchema = createUpdateSchema(pmPlanMachineTable);
+  PmPlanMachineModel.create = t.Omit(OmitBaseSchema(createSchema), [
+    "employeeCreatedId",
+    "userCreatedId"
+  ]);
+  PmPlanMachineModel.update = OmitBaseSchema(updateSchema);
+  PmPlanMachineModel.select = t.Composite([
+    PaginationSchema,
+    t.Object({
+      pmPlanId: t.String({ format: "uuid" })
+    })
+  ]);
+  PmPlanMachineModel.createMany = t.Array(OmitBaseSchema(createSchema));
+})(PmPlanMachineModel ||= {});
+var model_default40 = PmPlanMachineModel;
+
+// src/routes/fleet/pm/plan/machine/index.ts
+var machineRoutes2 = new Elysia({
+  prefix: "/machine",
+  tags: ["PmPlanMachine"]
+}).use(better_auth_default).guard({
+  auth: true
+}).get("/", async ({ query }) => logic_default41.select(query), {
+  query: model_default40.select
+}).post("/", async ({ body, user: user2 }) => logic_default41.create(body, user2), {
+  body: model_default40.create
+}).post("/many", async ({ body }) => logic_default41.createMany(body), {
+  body: model_default40.createMany
+}).guard({
+  params: IdSchema
+}).put("/:id", async ({ body, params: { id } }) => logic_default41.update(id, body), {
+  body: model_default40.update
+}).delete("/:id", async ({ params: { id } }) => logic_default41.remove(id));
+var machine_default2 = machineRoutes2;
+
+// src/routes/fleet/pm/plan/product/logic.ts
+var PmPlanProductLogic;
+((PmPlanProductLogic) => {
+  PmPlanProductLogic.select = async (query) => {
+    const filter = and(eq(pmPlanProductTable.pmPlanId, query.pmPlanId), softDeletedFilter(pmPlanProductTable));
+    const columns = getTableColumns(pmPlanProductTable);
+    const baseQuery = db_default.select({
+      ...columns,
+      totalCount: totalCountSql
+    }).from(pmPlanProductTable).where(filter).$dynamic();
+    const result = await pagination_helper_default(baseQuery, query.pagination);
+    return getPaginationContent(result, query.pagination.size);
+  };
+  PmPlanProductLogic.create = async (body) => {
+    await db_default.insert(pmPlanProductTable).values({
+      ...body
+    });
+  };
+  PmPlanProductLogic.createMany = async (body) => {
+    if (body.length === 0) {
+      return status("Bad Request", "\u0411\u04AF\u0442\u044D\u044D\u0433\u0434\u044D\u0445\u04AF\u04AF\u043D\u0438\u0439 \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u043E\u0440\u0443\u0443\u043B\u0430\u0445 \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u0431\u0430\u0439\u0445\u0433\u04AF\u0439 \u0431\u0430\u0439\u043D\u0430.");
+    }
+    const result = await db_default.insert(pmPlanProductTable).values(body).returning();
+    return result;
+  };
+  PmPlanProductLogic.update = async (id, body) => {
+    await db_default.update(pmPlanProductTable).set({
+      ...body
+    }).where(and(eq(pmPlanProductTable.id, id)));
+  };
+  PmPlanProductLogic.remove = async (id) => {
+    await db_default.update(pmPlanProductTable).set({
+      deletedAt: nowSql_helper_default
+    }).where(and(eq(pmPlanProductTable.id, id)));
+  };
+})(PmPlanProductLogic ||= {});
+var logic_default42 = PmPlanProductLogic;
+
+// src/routes/fleet/pm/plan/product/model.ts
+var PmPlanProductModel;
+((PmPlanProductModel) => {
+  const createSchema = createInsertSchema2(pmPlanProductTable);
+  const updateSchema = createUpdateSchema(pmPlanProductTable);
+  PmPlanProductModel.create = OmitBaseSchema(createSchema);
+  PmPlanProductModel.update = OmitBaseSchema(updateSchema);
+  PmPlanProductModel.select = t.Composite([
+    PaginationSchema,
+    t.Object({
+      pmPlanId: t.String({ format: "uuid" })
+    })
+  ]);
+  PmPlanProductModel.createMany = t.Array(OmitBaseSchema(createSchema));
+})(PmPlanProductModel ||= {});
+var model_default41 = PmPlanProductModel;
+
+// src/routes/fleet/pm/plan/product/index.ts
+var productRoutes5 = new Elysia({
+  prefix: "/product",
+  tags: ["PmPlanProduct"]
+}).use(better_auth_default).guard({
+  auth: true
+}).get("/", async ({ query }) => logic_default42.select(query), {
+  query: model_default41.select
+}).post("/", async ({ body }) => logic_default42.create(body), {
+  body: model_default41.create
+}).post("/many", async ({ body }) => logic_default42.createMany(body), {
+  body: model_default41.createMany
+}).guard({
+  params: IdSchema
+}).put("/:id", async ({ body, params: { id } }) => logic_default42.update(id, body), {
+  body: model_default41.update
+}).delete("/:id", async ({ params: { id } }) => logic_default42.remove(id));
+var product_default5 = productRoutes5;
+
+// src/routes/fleet/pm/plan/model.ts
+var PmPlanModel;
+((PmPlanModel) => {
+  const createSchema = createInsertSchema2(pmPlanTable);
+  const updateSchema = createUpdateSchema(pmPlanTable);
+  PmPlanModel.create = OmitBaseSchema(createSchema);
+  PmPlanModel.update = OmitBaseSchema(updateSchema);
+  PmPlanModel.select = t.Composite([PaginationSchema]);
+})(PmPlanModel ||= {});
+var model_default42 = PmPlanModel;
+
+// src/routes/fleet/pm/plan/index.ts
+var planRoutes = new Elysia({
+  prefix: "/plan",
+  tags: ["PmPlan"]
+}).use(better_auth_default).use(machine_default2).use(product_default5).guard({
+  userKind: "COMPANY_ADMIN"
+}).get("/", async ({ query, user: user2 }) => logic_default40.select(query, user2), {
+  query: model_default42.select
+}).post("/", async ({ body, user: user2 }) => logic_default40.create(body, user2), {
+  body: model_default42.create
+}).guard({
+  params: IdSchema
+}).put("/:id", async ({ body, params: { id }, user: user2 }) => logic_default40.update(id, body, user2), {
+  body: model_default42.update
+}).delete("/:id", async ({ params: { id }, user: user2 }) => logic_default40.remove(id, user2));
+var plan_default = planRoutes;
+
 // src/routes/fleet/pm/template/logic.ts
 var PmTemplateLogic;
 ((PmTemplateLogic) => {
@@ -155511,7 +155917,7 @@ var PmTemplateLogic;
     }).where(and(eq(pmTemplateTable.id, id), eq(pmTemplateTable.companyId, user2.companyId).if(user2.kind !== "ADMIN")));
   };
 })(PmTemplateLogic ||= {});
-var logic_default40 = PmTemplateLogic;
+var logic_default43 = PmTemplateLogic;
 
 // src/routes/fleet/pm/template/model.ts
 var PmTemplateModel;
@@ -155522,7 +155928,7 @@ var PmTemplateModel;
   PmTemplateModel.update = OmitBaseSchema(updateSchema);
   PmTemplateModel.select = t.Composite([PaginationSchema]);
 })(PmTemplateModel ||= {});
-var model_default40 = PmTemplateModel;
+var model_default43 = PmTemplateModel;
 
 // src/routes/fleet/pm/template/product/logic.ts
 var PmTemplateProductLogic;
@@ -155554,7 +155960,7 @@ var PmTemplateProductLogic;
     }).where(and(eq(pmTemplateProductTable.id, id)));
   };
 })(PmTemplateProductLogic ||= {});
-var logic_default41 = PmTemplateProductLogic;
+var logic_default44 = PmTemplateProductLogic;
 
 // src/routes/fleet/pm/template/product/model.ts
 var PmTemplateProductModel;
@@ -155570,46 +155976,46 @@ var PmTemplateProductModel;
     })
   ]);
 })(PmTemplateProductModel ||= {});
-var model_default41 = PmTemplateProductModel;
+var model_default44 = PmTemplateProductModel;
 
 // src/routes/fleet/pm/template/product/index.ts
-var productRoutes5 = new Elysia({
+var productRoutes6 = new Elysia({
   prefix: "/product",
   tags: ["PmTemplateProduct"]
 }).use(better_auth_default).guard({
   userKind: "COMPANY_ADMIN"
-}).get("/", async ({ query }) => logic_default41.select(query), {
-  query: model_default41.select
-}).post("/", async ({ body }) => logic_default41.create(body), {
-  body: model_default41.create
+}).get("/", async ({ query }) => logic_default44.select(query), {
+  query: model_default44.select
+}).post("/", async ({ body }) => logic_default44.create(body), {
+  body: model_default44.create
 }).guard({
   params: IdSchema
-}).put("/:id", async ({ body, params: { id } }) => logic_default41.update(id, body), {
-  body: model_default41.update
-}).delete("/:id", async ({ params: { id } }) => logic_default41.remove(id));
-var product_default5 = productRoutes5;
+}).put("/:id", async ({ body, params: { id } }) => logic_default44.update(id, body), {
+  body: model_default44.update
+}).delete("/:id", async ({ params: { id } }) => logic_default44.remove(id));
+var product_default6 = productRoutes6;
 
 // src/routes/fleet/pm/template/index.ts
 var templateRoutes2 = new Elysia({
   prefix: "/template",
   tags: ["PmTemplate"]
-}).use(better_auth_default).use(product_default5).guard({
+}).use(better_auth_default).use(product_default6).guard({
   userKind: "COMPANY_ADMIN"
-}).get("/", async ({ query, user: user2 }) => logic_default40.select(query, user2), {
-  query: model_default40.select
-}).post("/", async ({ body, user: user2 }) => logic_default40.create(body, user2), {
-  body: model_default40.create
+}).get("/", async ({ query, user: user2 }) => logic_default43.select(query, user2), {
+  query: model_default43.select
+}).post("/", async ({ body, user: user2 }) => logic_default43.create(body, user2), {
+  body: model_default43.create
 }).guard({
   params: IdSchema
-}).put("/:id", async ({ body, params: { id }, user: user2 }) => logic_default40.update(id, body, user2), {
-  body: model_default40.update
-}).delete("/:id", async ({ params: { id }, user: user2 }) => logic_default40.remove(id, user2));
+}).put("/:id", async ({ body, params: { id }, user: user2 }) => logic_default43.update(id, body, user2), {
+  body: model_default43.update
+}).delete("/:id", async ({ params: { id }, user: user2 }) => logic_default43.remove(id, user2));
 var template_default2 = templateRoutes2;
 
 // src/routes/fleet/pm/index.ts
 var pmRoutes = new Elysia({
   prefix: "/pm"
-}).use(template_default2);
+}).use(template_default2).use(plan_default);
 var pm_default = pmRoutes;
 
 // src/routes/fleet/index.ts
@@ -155647,7 +156053,7 @@ var UomCategoryLogic;
     }).where(and(eq(uomCategoryTable.id, id)));
   };
 })(UomCategoryLogic ||= {});
-var logic_default42 = UomCategoryLogic;
+var logic_default45 = UomCategoryLogic;
 
 // src/routes/uom/category/model.ts
 var UomCategoryModel;
@@ -155658,7 +156064,7 @@ var UomCategoryModel;
   UomCategoryModel.update = OmitBaseSchema(updateSchema);
   UomCategoryModel.select = t.Composite([PaginationSchema]);
 })(UomCategoryModel ||= {});
-var model_default42 = UomCategoryModel;
+var model_default45 = UomCategoryModel;
 
 // src/routes/uom/category/index.ts
 var categoryRoutes = new Elysia({
@@ -155666,15 +156072,15 @@ var categoryRoutes = new Elysia({
   tags: ["UomCategory"]
 }).use(better_auth_default).guard({
   auth: true
-}).get("/", async ({ query }) => logic_default42.select(query), {
-  query: model_default42.select
-}).post("/", async ({ body }) => logic_default42.create(body), {
-  body: model_default42.create
+}).get("/", async ({ query }) => logic_default45.select(query), {
+  query: model_default45.select
+}).post("/", async ({ body }) => logic_default45.create(body), {
+  body: model_default45.create
 }).guard({
   params: IdSchema
-}).put("/:id", async ({ body, params: { id } }) => logic_default42.update(id, body), {
-  body: model_default42.update
-}).delete("/:id", async ({ params: { id } }) => logic_default42.remove(id));
+}).put("/:id", async ({ body, params: { id } }) => logic_default45.update(id, body), {
+  body: model_default45.update
+}).delete("/:id", async ({ params: { id } }) => logic_default45.remove(id));
 var category_default = categoryRoutes;
 
 // src/routes/uom/conversion/logic.ts
@@ -155708,7 +156114,7 @@ var UomConversionLogic;
     }).where(and(eq(uomConversionTable.id, id)));
   };
 })(UomConversionLogic ||= {});
-var logic_default43 = UomConversionLogic;
+var logic_default46 = UomConversionLogic;
 
 // src/routes/uom/conversion/model.ts
 var UomConversionModel;
@@ -155725,7 +156131,7 @@ var UomConversionModel;
     })
   ]);
 })(UomConversionModel ||= {});
-var model_default43 = UomConversionModel;
+var model_default46 = UomConversionModel;
 
 // src/routes/uom/conversion/index.ts
 var conversionRoutes = new Elysia({
@@ -155733,15 +156139,15 @@ var conversionRoutes = new Elysia({
   tags: ["UomConversion"]
 }).use(better_auth_default).guard({
   auth: true
-}).get("/", async ({ query }) => logic_default43.select(query), {
-  query: model_default43.select
-}).post("/", async ({ body }) => logic_default43.create(body), {
-  body: model_default43.create
+}).get("/", async ({ query }) => logic_default46.select(query), {
+  query: model_default46.select
+}).post("/", async ({ body }) => logic_default46.create(body), {
+  body: model_default46.create
 }).guard({
   params: IdSchema
-}).put("/:id", async ({ body, params: { id } }) => logic_default43.update(id, body), {
-  body: model_default43.update
-}).delete("/:id", async ({ params: { id } }) => logic_default43.remove(id));
+}).put("/:id", async ({ body, params: { id } }) => logic_default46.update(id, body), {
+  body: model_default46.update
+}).delete("/:id", async ({ params: { id } }) => logic_default46.remove(id));
 var conversion_default = conversionRoutes;
 
 // src/routes/uom/logic.ts
@@ -155775,7 +156181,7 @@ var UomLogic;
     }).where(and(eq(uomTable.id, id)));
   };
 })(UomLogic ||= {});
-var logic_default44 = UomLogic;
+var logic_default47 = UomLogic;
 
 // src/routes/uom/model.ts
 var UomModel;
@@ -155791,27 +156197,23 @@ var UomModel;
     })
   ]);
 })(UomModel ||= {});
-var model_default44 = UomModel;
+var model_default47 = UomModel;
 
 // src/routes/uom/index.ts
 var uomSchemaRoutes = new Elysia({
   prefix: "/uom"
 }).use(better_auth_default).use(category_default).use(conversion_default).guard({
-  userKind: "ADMIN"
-}).get("/", async ({ query }) => logic_default44.select(query), {
-  query: model_default44.select,
-  tags: ["Uom"]
-}).post("/", async ({ body }) => logic_default44.create(body), {
-  body: model_default44.create,
+  userKind: "ADMIN",
   tags: ["Uom"]
+}).get("/", async ({ query }) => logic_default47.select(query), {
+  query: model_default47.select
+}).post("/", async ({ body }) => logic_default47.create(body), {
+  body: model_default47.create
 }).guard({
   params: IdSchema
-}).put("/:id", async ({ body, params: { id } }) => logic_default44.update(id, body), {
-  body: model_default44.update,
-  tags: ["Uom"]
-}).delete("/:id", async ({ params: { id } }) => logic_default44.remove(id), {
-  tags: ["Uom"]
-});
+}).put("/:id", async ({ body, params: { id } }) => logic_default47.update(id, body), {
+  body: model_default47.update
+}).delete("/:id", async ({ params: { id } }) => logic_default47.remove(id));
 var uom_default = uomSchemaRoutes;
 
 // src/routes/index.ts