squel 6.0.6 → 6.1.0

package/dist/esm/index.js

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "squel",
-  version: "6.0.6",
+  version: "6.1.0",
   description: "SQL query string builder",
   keywords: [
     "sql",
@@ -289,7 +289,7 @@ function _buildSquel(flavour = null) {
       const customHandler = getValueHandler(value, this.options.valueHandlers, cls.globalValueHandlers);
       if (customHandler) {
         value = customHandler(value, asParam, formattingOptions);
-        if (value && value.rawNesting) {
+        if (value?.rawNesting) {
           return { formatted: true, rawNesting: true, value: value.value };
         }
       }
@@ -340,7 +340,7 @@ function _buildSquel(flavour = null) {
     }
     _applyNestingFormatting(str, nesting = true) {
       if (str && typeof str === "string" && nesting && !this.options.rawNesting) {
-        let alreadyHasBrackets = str.charAt(0) === "(" && str.charAt(str.length - 1) === ")";
+        let alreadyHasBrackets = str.startsWith("(") && str.endsWith(")");
         if (alreadyHasBrackets) {
           let idx = 0;
           let open = 1;
@@ -489,7 +489,7 @@ function _buildSquel(flavour = null) {
         name = this._sanitizeField(fieldName);
       }
       this._fieldName = name;
-      this.options = _extend(Object.assign({}, cls.DefaultQueryBuilderOptions), options);
+      this.options = _extend({ ...cls.DefaultQueryBuilderOptions }, options);
       this._cases = [];
     }
     when(expression, ...values) {
@@ -539,7 +539,7 @@ function _buildSquel(flavour = null) {
       let obj = this;
       while (obj) {
         for (const prop of Object.getOwnPropertyNames(obj)) {
-          if (prop !== "constructor" && typeof obj[prop] === "function" && prop.charAt(0) !== "_" && !cls.Block.prototype[prop]) {
+          if (prop !== "constructor" && typeof obj[prop] === "function" && !prop.startsWith("_") && !cls.Block.prototype[prop]) {
             ret[prop] = obj[prop];
           }
         }
@@ -705,7 +705,7 @@ function _buildSquel(flavour = null) {
       }
       if (!totalStr.length) {
         const fromTableBlock = queryBuilder?.getBlock(cls.FromTableBlock);
-        if (fromTableBlock && fromTableBlock._hasTable()) {
+        if (fromTableBlock?._hasTable()) {
           totalStr = "*";
         }
       }
@@ -1177,7 +1177,7 @@ function _buildSquel(flavour = null) {
       return new this.constructor(this.options, blockClones);
     }
     getBlock(blockType) {
-      return this.blocks.filter((b) => b instanceof blockType)[0];
+      return this.blocks.find((b) => b instanceof blockType);
     }
   };
   cls.Select = class extends cls.QueryBuilder {
@@ -1457,6 +1457,14 @@ squel.flavours.postgres = (_squel) => {
       };
     }
   };
+  cls.UsingBlock = class extends cls.AbstractTableBlock {
+    constructor(options) {
+      super({ ...options, prefix: "USING" });
+    }
+    using(table, alias = null) {
+      this._table(table, alias);
+    }
+  };
   cls.DistinctOnBlock = class extends cls.Block {
     _useDistinct = false;
     _distinctFields;
@@ -1539,6 +1547,7 @@ squel.flavours.postgres = (_squel) => {
         new cls.StringBlock(options, "DELETE"),
         new cls.TargetTableBlock(options),
         new cls.FromTableBlock({ ...options, singleTable: true }),
+        new cls.UsingBlock(options),
         new cls.JoinBlock(options),
         new cls.WhereBlock(options),
         new cls.OrderByBlock(options),
@@ -1551,6 +1560,10 @@ squel.flavours.postgres = (_squel) => {
 };
 
 // src/mssql.ts
+var _limit = function(max) {
+  max = this._sanitizeLimitOffset(max);
+  this._parent._limits = max;
+};
 squel.flavours.mssql = (_squel) => {
   const cls = _squel.cls;
   cls.DefaultQueryBuilderOptions.replaceSingleQuotes = true;
@@ -1571,10 +1584,6 @@ squel.flavours.mssql = (_squel) => {
       super(options);
       this._limits = null;
       this._offsets = null;
-      const _limit = function(max) {
-        max = this._sanitizeLimitOffset(max);
-        this._parent._limits = max;
-      };
       this.ParentBlock = class extends cls.Block {
         _parent;
         constructor(parent) {
@@ -1781,4 +1790,4 @@ export {
   src_default as default
 };
 
-//# debugId=3E1ABD59B2EE635A64756E2164756E21
+//# debugId=1734B424D7A11C2364756E2164756E21