rado 0.2.43 → 0.2.44

package/dist/define/query/Delete.d.ts

@@ -1,4 +1,5 @@
 import { EV } from '../Expr.js';
+import { OrderBy } from '../OrderBy.js';
 import { Query, QueryData } from '../Query.js';
 export declare class Delete extends Query<{
     rowsAffected: number;
@@ -6,6 +7,7 @@ export declare class Delete extends Query<{
     [Query.Data]: QueryData.Delete;
     constructor(query: QueryData.Delete);
     where(...where: Array<EV<boolean>>): Delete;
+    orderBy(...orderBy: Array<OrderBy>): Delete;
     take(limit: number | undefined): Delete;
     skip(offset: number | undefined): Delete;
 }

package/dist/define/query/Delete.js

@@ -6,6 +6,9 @@ class Delete extends Query {
   where(...where) {
     return new Delete(this.addWhere(where));
   }
+  orderBy(...orderBy) {
+    return new Delete(this[Query.Data].with({ orderBy }));
+  }
   take(limit) {
     return new Delete(this[Query.Data].with({ limit }));
   }

package/dist/lib/Formatter.js

@@ -177,15 +177,15 @@ class Formatter {
         this.formatValue({ ...ctx, formatAsInsert: true }, input);
     }
     this.formatWhere(ctx, query.where);
+    this.formatOrderBy(ctx, query.orderBy);
     this.formatLimit(ctx, query);
     return stmt;
   }
   formatDelete(ctx, query) {
     const { stmt } = ctx;
     stmt.add("DELETE FROM").addIdentifier(query.table.name);
-    stmt.space();
     this.formatWhere(ctx, query.where);
-    stmt.space();
+    this.formatOrderBy(ctx, query.orderBy);
     this.formatLimit(ctx, query);
     return stmt;
   }

package/dist/lib/Statement.d.ts

@@ -49,7 +49,7 @@ export declare class Statement {
     /**
      * Adds a newline
      */
-    newline(): this;
+    newline(spaceRequired?: boolean): this;
     /**
      * Adds an identifier, applies escaping
      */

package/dist/lib/Statement.js

@@ -66,9 +66,12 @@ class Statement {
   /**
    * Adds a newline
    */
-  newline() {
+  newline(spaceRequired = true) {
     if (this.options.skipNewlines)
-      return this;
+      if (spaceRequired)
+        return this.space();
+      else
+        return this;
     return this.raw(NEWLINE + this.currentIndent);
   }
   /**
@@ -113,13 +116,13 @@ class Statement {
    * Opens a parenthesis and indents the next line
    */
   openParenthesis() {
-    return this.raw("(").indent().newline();
+    return this.raw("(").indent().newline(false);
   }
   /**
    * Closes a parenthesis and dedents the next line
    */
   closeParenthesis() {
-    return this.dedent().newline().raw(")");
+    return this.dedent().newline(false).raw(")");
   }
   /**
    * Adds parenthesis on start and end, and a seperator to the output on
@@ -138,7 +141,7 @@ class Statement {
   *separate(parts, separator = SEPARATE) {
     for (let i = 0; i < parts.length; i++) {
       if (i > 0)
-        this.raw(separator).newline();
+        this.raw(separator).newline(false);
       yield parts[i];
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.2.43",
+  "version": "0.2.44",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",