on-zero 0.4.3 → 0.4.4

package/dist/cjs/helpers/getAuth.native.js

@@ -5,20 +5,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var getAuth_exports = {};
 __export(getAuth_exports, {
@@ -26,15 +28,23 @@ __export(getAuth_exports, {
   getAuth: () => getAuth
 });
 module.exports = __toCommonJS(getAuth_exports);
-var import_state = require("../state.native.js"),
-  import_mutatorContext = require("./mutatorContext.native.js"),
-  import_queryContext = require("./queryContext.native.js");
+var import_state = require("../state.native.js");
+var import_mutatorContext = require("./mutatorContext.native.js");
+var import_queryContext = require("./queryContext.native.js");
 function ensureAuth() {
   var auth = getAuth();
-  if (!auth) throw new Error("Not authenticated");
+  if (!auth) {
+    throw new Error("Not authenticated");
+  }
   return auth;
 }
 function getAuth() {
-  return (0, import_mutatorContext.isInZeroMutation)() ? (0, import_mutatorContext.mutatorContext)().authData : (0, import_queryContext.isInQueryContext)() ? (0, import_queryContext.queryAuthData)() : (0, import_state.getAuthData)();
+  if ((0, import_mutatorContext.isInZeroMutation)()) {
+    return (0, import_mutatorContext.mutatorContext)().authData;
+  }
+  if ((0, import_queryContext.isInQueryContext)()) {
+    return (0, import_queryContext.queryAuthData)();
+  }
+  return (0, import_state.getAuthData)();
 }
 //# sourceMappingURL=getAuth.native.js.map

package/dist/cjs/helpers/getAuth.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","getAuth_exports","__export","ensureAuth","getAuth","module","exports","import_state","require","import_mutatorContext","import_queryContext","auth","Error","isInZeroMutation","mutatorContext","authData","isInQueryContext","queryAuthData","getAuthData"],"sources":["../../../src/helpers/getAuth.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,eAAA;AAAAC,QAAA,CAAAD,eAAA;EAAAE,UAAA,EAAAA,CAAA,KAAAA,UAAA;EAAAC,OAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAV,YAA4B,CAAAK,eAC5B;AAKO,IAAAM,YAAS,GAAAC,OAAuB;EAAAC,qBAAA,GAAAD,OAAA;EAAAE,mBAAA,GAAAF,OAAA;AACrC,SAAML,UAAOA,CAAA;EACb,IAAIQ,IAAC,GAAAP,OAAA;EACH,KAAAO,IAAM,EAER,MAAO,IAAAC,KAAA;EACT,OAAAD,IAAA;AAEO;AACL,SAAAP,OAAIA,CAAA;EAQN,WAAAK,qBAAA,CAAAI,gBAAA,UAAAJ,qBAAA,CAAAK,cAAA,IAAAC,QAAA,OAAAL,mBAAA,CAAAM,gBAAA,UAAAN,mBAAA,CAAAO,aAAA,UAAAV,YAAA,CAAAW,WAAA","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","getAuth_exports","__export","ensureAuth","getAuth","module","exports","import_state","require","import_mutatorContext","import_queryContext","auth","Error","isInZeroMutation","mutatorContext","authData","isInQueryContext","queryAuthData","getAuthData"],"sources":["../../../src/helpers/getAuth.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,eAAA;AAAAC,QAAA,CAAAD,eAAA;EAAAE,UAAA,EAAAA,CAAA,KAAAA,UAAA;EAAAC,OAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAV,YAA4B,CAAAK,eAAA;AAC5B,IAAAM,YAAA,GAAAC,OAAA,qBAAiD;AACjD,IAAAC,qBAAA,GAAgDD,OAAA;AAIzC,IAAAE,mBAAgC,GAAAF,OAAA;AACrC,SAAML,UAAOA,CAAA;EACb,IAAIQ,IAAC,GAAMP,OAAA;EACT,KAAAO,IAAM;IACR,UAAAC,KAAA;EACA;EACF,OAAAD,IAAA;AAEO;AACL,SAAAP,OAAIA,CAAA;EACF,QAAAK,qBAAO,CAAAI,gBAAA,KAAe;IACxB,WAAAJ,qBAAA,CAAAK,cAAA,IAAAC,QAAA;EACA;EACE,QAAAL,mBAAO,CAAAM,gBAAA,KAAc;IACvB,WAAAN,mBAAA,CAAAO,aAAA;EAEA;EACF,WAAAV,YAAA,CAAAW,WAAA","ignoreList":[]}

package/dist/cjs/helpers/mutatorContext.cjs

@@ -3,20 +3,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var mutatorContext_exports = {};
 __export(mutatorContext_exports, {
@@ -28,11 +30,13 @@ __export(mutatorContext_exports, {
 });
 module.exports = __toCommonJS(mutatorContext_exports);
 var import_helpers = require("@take-out/helpers");
-const asyncContext = (0, import_helpers.createAsyncContext)(),
-  authScopeContext = (0, import_helpers.createAsyncContext)();
+const asyncContext = (0, import_helpers.createAsyncContext)();
+const authScopeContext = (0, import_helpers.createAsyncContext)();
 function mutatorContext() {
   const currentContext = asyncContext.get();
-  if (!currentContext) throw new Error("mutatorContext must be called within a mutator");
+  if (!currentContext) {
+    throw new Error("mutatorContext must be called within a mutator");
+  }
   return currentContext;
 }
 function isInZeroMutation() {
@@ -42,7 +46,10 @@ function runWithContext(context, fn) {
   return asyncContext.run(context, fn);
 }
 function getScopedAuthData() {
-  return isInZeroMutation() ? mutatorContext().authData : authScopeContext.get() ?? void 0;
+  if (isInZeroMutation()) {
+    return mutatorContext().authData;
+  }
+  return authScopeContext.get() ?? void 0;
 }
 function runWithAuthScope(authData, fn) {
   return authScopeContext.run(authData, fn);

package/dist/cjs/helpers/mutatorContext.native.js

@@ -5,20 +5,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var mutatorContext_exports = {};
 __export(mutatorContext_exports, {
@@ -29,12 +31,14 @@ __export(mutatorContext_exports, {
   runWithContext: () => runWithContext
 });
 module.exports = __toCommonJS(mutatorContext_exports);
-var import_helpers = require("@take-out/helpers"),
-  asyncContext = (0, import_helpers.createAsyncContext)(),
-  authScopeContext = (0, import_helpers.createAsyncContext)();
+var import_helpers = require("@take-out/helpers");
+var asyncContext = (0, import_helpers.createAsyncContext)();
+var authScopeContext = (0, import_helpers.createAsyncContext)();
 function mutatorContext() {
   var currentContext = asyncContext.get();
-  if (!currentContext) throw new Error("mutatorContext must be called within a mutator");
+  if (!currentContext) {
+    throw new Error("mutatorContext must be called within a mutator");
+  }
   return currentContext;
 }
 function isInZeroMutation() {
@@ -44,7 +48,9 @@ function runWithContext(context, fn) {
   return asyncContext.run(context, fn);
 }
 function getScopedAuthData() {
-  if (isInZeroMutation()) return mutatorContext().authData;
+  if (isInZeroMutation()) {
+    return mutatorContext().authData;
+  }
   var _authScopeContext_get;
   return (_authScopeContext_get = authScopeContext.get()) !== null && _authScopeContext_get !== void 0 ? _authScopeContext_get : void 0;
 }

package/dist/cjs/helpers/mutatorContext.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","mutatorContext_exports","__export","getScopedAuthData","isInZeroMutation","mutatorContext","runWithAuthScope","runWithContext","module","exports","import_helpers","require","asyncContext","createAsyncContext","authScopeContext","currentContext","get","Error","context","fn","run","authData","_authScopeContext_get"],"sources":["../../../src/helpers/mutatorContext.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,sBAAA;AAAAC,QAAA,CAAAD,sBAAA;EAAAE,iBAAA,EAAAA,CAAA,KAAAA,iBAAA;EAAAC,gBAAA,EAAAA,CAAA,KAAAA,gBAAA;EAAAC,cAAA,EAAAA,CAAA,KAAAA,cAAA;EAAAC,gBAAA,EAAAA,CAAA,KAAAA,gBAAA;EAAAC,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAb,YAAmC,CAAAK,sBAAA;AAInC,IAAAS,cAAM,GAAAC,OAAe;EAAAC,YAGf,OAAAF,cAAA,CAAAG,kBAAmB;EAAAC,gBAAoC,OAAAJ,cAAA,CAAAG,kBAAA;AAEtD,SAASR,eAAA,EAAiC;EAC/C,IAAAU,cAAM,GAAAH,YAAiB,CAAAI,GAAa;EACpC,IAAI,CAACD,cAAA,EACH,MAAM,IAAIE,KAAA,CAAM,gDAAgD;EAGlE,OAAOF,cAAA;AACT;AAEO,SAASX,iBAAA,EAAmB;EACjC,OAAO,CAAC,CAACQ,YAAA,CAAaI,GAAA,CAAI;AAC5B;AAEO,SAAST,eACdW,OAAA,EACAC,EAAA,EACY;EACZ,OAAOP,YAAA,CAAaQ,GAAA,CAAIF,OAAA,EAASC,EAAE;AACrC;AAGO,SAAShB,kBAAA,EAAiD;EAC/D,IAAAC,gBAAI,IAIN,OAAAC,cAAA,GAAAgB,QAAA;EAEO,IAAAC,qBACL;EAGA,OAAO,CAAAA,qBAAqB,GAAAR,gBAAY,CAAAE,GAAA,gBAAAM,qBAAA,cAAAA,qBAAA;AAC1C","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","mutatorContext_exports","__export","getScopedAuthData","isInZeroMutation","mutatorContext","runWithAuthScope","runWithContext","module","exports","import_helpers","require","asyncContext","createAsyncContext","authScopeContext","currentContext","get","Error","context","fn","run","authData","_authScopeContext_get"],"sources":["../../../src/helpers/mutatorContext.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,sBAAA;AAAAC,QAAA,CAAAD,sBAAA;EAAAE,iBAAA,EAAAA,CAAA,KAAAA,iBAAA;EAAAC,gBAAA,EAAAA,CAAA,KAAAA,gBAAA;EAAAC,cAAA,EAAAA,CAAA,KAAAA,cAAA;EAAAC,gBAAA,EAAAA,CAAA,KAAAA,gBAAA;EAAAC,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAb,YAAmC,CAAAK,sBAAA;AAInC,IAAAS,cAAM,GAAAC,OAAe;AAGrB,IAAAC,YAAM,OAAAF,cAAmB,CAAAG,kBAAA;AAElB,IAAAC,gBAAS,OAAiCJ,cAAA,CAAAG,kBAAA;AAC/C,SAAMR,eAAA,EAAiB;EACvB,IAAIU,cAAC,GAAgBH,YAAA,CAAAI,GAAA;EACnB,KAAAD,cAAgB;IAClB,UAAAE,KAAA;EAEA;EACF,OAAAF,cAAA;AAEO;AACL,SAAOX,gBAAeA,CAAA,EAAI;EAC5B,SAAAQ,YAAA,CAAAI,GAAA;AAEO;AAIL,SAAOT,cAAaA,CAAAW,OAAI,EAAAC,EAAS,EAAE;EACrC,OAAAP,YAAA,CAAAQ,GAAA,CAAAF,OAAA,EAAAC,EAAA;AAGO;AACL,SAAIhB,iBAAoBA,CAAA;EACtB,IAAAC,gBAAO,IAAe;IACxB,OAAAC,cAAA,GAAAgB,QAAA;EACA;EACF,IAAAC,qBAAA;EAEO,OAAS,CAAAA,qBACd,GAAAR,gBAEY,CAAAE,GAAA,gBAAAM,qBAAA,cAAAA,qBAAA;AACZ;AACF,SAAAhB,iBAAAe,QAAA,EAAAF,EAAA","ignoreList":[]}

package/dist/cjs/helpers/prettyFormatZeroQuery.cjs

@@ -3,20 +3,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var prettyFormatZeroQuery_exports = {};
 __export(prettyFormatZeroQuery_exports, {
@@ -25,83 +27,126 @@ __export(prettyFormatZeroQuery_exports, {
 module.exports = __toCommonJS(prettyFormatZeroQuery_exports);
 var import_helpers = require("@take-out/helpers");
 const prettyFormatZeroQuery = (query, mode = "full") => {
-    const astObject = query._completeAst?.();
-    return astObject ? mode === "minimal" ? prettyFormatMinimal(astObject) : prettyFormatFull(astObject) : "";
-  },
-  prettyFormatFull = (astObject, indent = 0) => {
-    if (!astObject || !astObject.table) return "";
-    const spaces = "  ".repeat(indent);
-    let query = astObject.table,
-      hasChainedMethods = !1;
-    if (astObject.where) {
-      const whereClause = formatWhere(astObject.where);
-      hasChainedMethods ? query += `
-${spaces}  ${whereClause}` : (query += whereClause, hasChainedMethods = !0);
-    }
-    if (astObject.limit) {
-      const limitClause = `.limit(${astObject.limit})`;
-      hasChainedMethods ? query += `
-${spaces}  ${limitClause}` : (query += limitClause, hasChainedMethods = !0);
-    }
-    if (astObject.orderBy && astObject.orderBy.length > 0) {
-      const orderByClause = `.orderBy(${astObject.orderBy.map(([field, direction]) => `${field}, ${direction}`).join(", ")})`;
-      hasChainedMethods ? query += `
-${spaces}  ${orderByClause}` : (query += orderByClause, hasChainedMethods = !0);
+  const astObject = query["_completeAst"]?.();
+  if (!astObject) return "";
+  if (mode === "minimal") {
+    return prettyFormatMinimal(astObject);
+  }
+  return prettyFormatFull(astObject);
+};
+const prettyFormatFull = (astObject, indent = 0) => {
+  if (!astObject || !astObject.table) return "";
+  const spaces = "  ".repeat(indent);
+  let query = astObject.table;
+  let hasChainedMethods = false;
+  if (astObject.where) {
+    const whereClause = formatWhere(astObject.where);
+    if (hasChainedMethods) {
+      query += `
+${spaces}  ${whereClause}`;
+    } else {
+      query += whereClause;
+      hasChainedMethods = true;
     }
-    if (astObject.related && astObject.related.length > 0) {
-      astObject.related.forEach(rel => {
-        if (rel.subquery) {
-          const alias = rel.subquery.alias || rel.subquery.table,
-            subQuery = prettyFormatFull(rel.subquery, indent + 1);
-          query += `
-${spaces}  .related(${alias}, q => q.${subQuery}`;
-        }
-      });
-      const closingParens = ")".repeat(astObject.related.length);
+  }
+  if (astObject.limit) {
+    const limitClause = `.limit(${astObject.limit})`;
+    if (hasChainedMethods) {
       query += `
-${spaces}${closingParens}`;
+${spaces}  ${limitClause}`;
+    } else {
+      query += limitClause;
+      hasChainedMethods = true;
     }
-    return query;
-  },
-  prettyFormatMinimal = astObject => {
-    if (!astObject || !astObject.table) return "";
-    let query = astObject.table;
-    if (astObject.where && (query += formatWhere(astObject.where).replace(".where(", "(")), astObject.related && astObject.related.length > 0) {
-      const subQueries = collectSubQueryTables(astObject.related),
-        count = subQueries.length,
-        tableNames = subQueries.join(", ");
-      query += ` (+${count}: ${(0, import_helpers.ellipsis)(tableNames, 30)})`;
+  }
+  if (astObject.orderBy && astObject.orderBy.length > 0) {
+    const orderClauses = astObject.orderBy.map(([field, direction]) => `${field}, ${direction}`).join(", ");
+    const orderByClause = `.orderBy(${orderClauses})`;
+    if (hasChainedMethods) {
+      query += `
+${spaces}  ${orderByClause}`;
+    } else {
+      query += orderByClause;
+      hasChainedMethods = true;
     }
-    return query;
-  },
-  collectSubQueryTables = related => {
-    const tables = [];
-    return related.forEach(rel => {
+  }
+  if (astObject.related && astObject.related.length > 0) {
+    astObject.related.forEach(rel => {
       if (rel.subquery) {
-        const tableName = rel.subquery.alias || rel.subquery.table;
-        tables.push(tableName), rel.subquery.related && rel.subquery.related.length > 0 && tables.push(...collectSubQueryTables(rel.subquery.related));
+        const alias = rel.subquery.alias || rel.subquery.table;
+        const subQuery = prettyFormatFull(rel.subquery, indent + 1);
+        query += `
+${spaces}  .related(${alias}, q => q.${subQuery}`;
+      }
+    });
+    const closingParens = ")".repeat(astObject.related.length);
+    query += `
+${spaces}${closingParens}`;
+  }
+  return query;
+};
+const prettyFormatMinimal = astObject => {
+  if (!astObject || !astObject.table) return "";
+  let query = astObject.table;
+  if (astObject.where) {
+    query += formatWhere(astObject.where).replace(".where(", "(");
+  }
+  if (astObject.related && astObject.related.length > 0) {
+    const subQueries = collectSubQueryTables(astObject.related);
+    const count = subQueries.length;
+    const tableNames = subQueries.join(", ");
+    query += ` (+${count}: ${(0, import_helpers.ellipsis)(tableNames, 30)})`;
+  }
+  return query;
+};
+const collectSubQueryTables = related => {
+  const tables = [];
+  related.forEach(rel => {
+    if (rel.subquery) {
+      const tableName = rel.subquery.alias || rel.subquery.table;
+      tables.push(tableName);
+      if (rel.subquery.related && rel.subquery.related.length > 0) {
+        tables.push(...collectSubQueryTables(rel.subquery.related));
       }
-    }), tables;
-  },
-  formatWhere = where => {
-    if (!where) return "";
-    if (where.type === "simple") {
-      const column = where.left?.name || where.left,
-        value = where.right?.value !== void 0 ? where.right.value : where.right,
-        op = where.op || "=";
-      return column === "id" && op === "=" && (typeof value == "string" || typeof value == "number") ? `(${value})` : op === "=" ? `.where(${column}, ${value})` : `.where(${column}, ${op}, ${value})`;
     }
-    if (where.type === "and" && where.conditions) {
-      let result = "";
-      return where.conditions.forEach((condition, index) => {
-        index === 0 ? result += formatWhere(condition) : result += `.and(${formatWhere(condition).slice(1)})`;
-      }), result;
+  });
+  return tables;
+};
+const formatWhere = where => {
+  if (!where) return "";
+  if (where.type === "simple") {
+    const column = where.left?.name || where.left;
+    const value = where.right?.value !== void 0 ? where.right.value : where.right;
+    const op = where.op || "=";
+    if (column === "id" && op === "=" && (typeof value === "string" || typeof value === "number")) {
+      return `(${value})`;
     }
-    if (where.type === "or" && where.conditions) {
-      let result = "";
-      return where.conditions.forEach((condition, index) => {
-        index === 0 ? result += formatWhere(condition) : result += `.or(${formatWhere(condition).slice(1)})`;
-      }), result;
+    if (op === "=") {
+      return `.where(${column}, ${value})`;
     }
-    return "";
-  };
+    return `.where(${column}, ${op}, ${value})`;
+  }
+  if (where.type === "and" && where.conditions) {
+    let result = "";
+    where.conditions.forEach((condition, index) => {
+      if (index === 0) {
+        result += formatWhere(condition);
+      } else {
+        result += `.and(${formatWhere(condition).slice(1)})`;
+      }
+    });
+    return result;
+  }
+  if (where.type === "or" && where.conditions) {
+    let result = "";
+    where.conditions.forEach((condition, index) => {
+      if (index === 0) {
+        result += formatWhere(condition);
+      } else {
+        result += `.or(${formatWhere(condition).slice(1)})`;
+      }
+    });
+    return result;
+  }
+  return "";
+};