rado 0.3.4 → 0.3.6

package/dist/lib/Formatter.js

@@ -489,11 +489,11 @@ class Formatter {
     return stmt;
   }
   formatLimit(ctx, { limit, offset, singleResult }) {
-    const { stmt, forceInline } = ctx;
+    const { stmt } = ctx;
     if (!limit && !offset && !singleResult)
       return stmt;
     stmt.addLine("LIMIT").space();
-    this.formatValue(ctx, singleResult ? 1 : limit);
+    this.formatValue(ctx, (singleResult ? 1 : limit) || -1);
     if (offset && offset > 0) {
       stmt.add("OFFSET").space();
       this.formatValue(ctx, offset);

package/package.json

@@ -1,74 +1,74 @@
-{
-  "name": "rado",
-  "version": "0.3.4",
-  "license": "MIT",
-  "type": "module",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": "./dist/index.js",
-    "./*": "./dist/*.js",
-    "./driver/bun:sqlite": "./dist/driver/bun-sqlite.js"
-  },
-  "typesVersions": {
-    "*": {
-      "driver/*": [
-        "dist/driver/*.d.ts"
-      ],
-      "lib/*": [
-        "dist/lib/*.d.ts"
-      ],
-      "driver/bun:sqlite": [
-        "dist/driver/bun-sqlite.d.ts"
-      ],
-      "define/*": [
-        "dist/define/*.d.ts"
-      ],
-      "sqlite/*": [
-        "dist/sqlite/*.d.ts"
-      ],
-      "sqlite": [
-        "dist/sqlite.d.ts"
-      ],
-      "util/*": [
-        "dist/util/*.d.ts"
-      ]
-    }
-  },
-  "files": [
-    "dist"
-  ],
-  "sideEffects": false,
-  "scripts": {
-    "build": "tsc -p tsconfig.build.json && tsx build.ts",
-    "test": "tsx test",
-    "test:bun": "bun test/index.ts --driver=bun:sqlite",
-    "profile": "cross-env PROFILE=true tsx build.ts && cd bin && (rimraf CPU*.cpuprofile || true) && node --cpu-prof --cpu-prof-interval=100 test && speedscope CPU*.cpuprofile",
-    "prepublishOnly": "tsc -p tsconfig.build.json && tsx build.ts"
-  },
-  "devDependencies": {
-    "@types/better-sqlite3": "^5.4.1",
-    "@types/glob": "^8.0.0",
-    "@types/sql.js": "^1.4.2",
-    "better-sqlite3": "^7.5.1",
-    "bun-types": "^0.5.0",
-    "cross-env": "^7.0.3",
-    "esbuild": "^0.17.10",
-    "glob": "^8.0.3",
-    "rimraf": "^4.1.2",
-    "sade": "^1.8.1",
-    "speedscope": "^1.15.0",
-    "sql.js": "^1.8.0",
-    "sqlite3": "^5.1.6",
-    "tsx": "^3.12.3",
-    "typescript": "beta",
-    "uvu": "^0.5.6"
-  },
-  "volta": {
-    "node": "18.12.1"
-  },
-  "packageManager": "yarn@3.3.1",
-  "resolutions": {
-    "esbuild": "0.17.10"
-  }
-}
+{
+  "name": "rado",
+  "version": "0.3.6",
+  "license": "MIT",
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": "./dist/index.js",
+    "./*": "./dist/*.js",
+    "./driver/bun:sqlite": "./dist/driver/bun-sqlite.js"
+  },
+  "typesVersions": {
+    "*": {
+      "driver/*": [
+        "dist/driver/*.d.ts"
+      ],
+      "lib/*": [
+        "dist/lib/*.d.ts"
+      ],
+      "driver/bun:sqlite": [
+        "dist/driver/bun-sqlite.d.ts"
+      ],
+      "define/*": [
+        "dist/define/*.d.ts"
+      ],
+      "sqlite/*": [
+        "dist/sqlite/*.d.ts"
+      ],
+      "sqlite": [
+        "dist/sqlite.d.ts"
+      ],
+      "util/*": [
+        "dist/util/*.d.ts"
+      ]
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "sideEffects": false,
+  "scripts": {
+    "build": "tsc -p tsconfig.build.json && tsx build.ts",
+    "test": "tsx test",
+    "test:bun": "bun test/index.ts --driver=bun:sqlite",
+    "profile": "cross-env PROFILE=true tsx build.ts && cd bin && (rimraf CPU*.cpuprofile || true) && node --cpu-prof --cpu-prof-interval=100 test && speedscope CPU*.cpuprofile",
+    "prepublishOnly": "tsc -p tsconfig.build.json && tsx build.ts"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "^5.4.1",
+    "@types/glob": "^8.0.0",
+    "@types/sql.js": "^1.4.2",
+    "better-sqlite3": "^7.5.1",
+    "bun-types": "^0.5.0",
+    "cross-env": "^7.0.3",
+    "esbuild": "^0.17.10",
+    "glob": "^8.0.3",
+    "rimraf": "^4.1.2",
+    "sade": "^1.8.1",
+    "speedscope": "^1.15.0",
+    "sql.js": "^1.8.0",
+    "sqlite3": "^5.1.6",
+    "tsx": "^3.12.3",
+    "typescript": "beta",
+    "uvu": "^0.5.6"
+  },
+  "volta": {
+    "node": "18.12.1"
+  },
+  "packageManager": "yarn@3.3.1",
+  "resolutions": {
+    "esbuild": "0.17.10"
+  }
+}

package/dist/define/CTE.d.ts

@@ -1,2 +0,0 @@
-import { Query, QueryData } from './Query';
-export declare function makeRecursiveUnion<T extends Query<any>>(initial: QueryData.Select, createUnion: (target: any) => T, operator: QueryData.UnionOperation): QueryData.Select;

package/dist/define/CTE.js

@@ -1,51 +0,0 @@
-// src/define/CTE.ts
-import { Expr, ExprData, ExprType } from "./Expr.js";
-import { Query, QueryData } from "./Query.js";
-import { virtualTable } from "./Table.js";
-import { Target, TargetType } from "./Target.js";
-var { keys, create, fromEntries } = Object;
-function columnsOf(expr) {
-  switch (expr.type) {
-    case ExprType.Record:
-      return keys(expr.fields);
-    case ExprType.Row:
-      switch (expr.target.type) {
-        case TargetType.Table:
-          return keys(expr.target.table.columns);
-        default:
-          throw new Error("Could not retrieve CTE columns");
-      }
-    default:
-      throw new Error("Could not retrieve CTE columns");
-  }
-}
-function makeRecursiveUnion(initial, createUnion, operator) {
-  let name;
-  const alias = new Proxy(create(null), {
-    get(_, key) {
-      name = key;
-      return virtualTable(name);
-    }
-  });
-  const right = createUnion(alias)[Query.Data];
-  if (!name)
-    throw new TypeError("No CTE name provided");
-  const cte = alias[name];
-  const cols = columnsOf(initial.selection);
-  const selection = new ExprData.Record(
-    fromEntries(cols.map((col) => [col, cte[col][Expr.Data]]))
-  );
-  const union = new QueryData.Union({
-    a: initial,
-    operator,
-    b: right
-  });
-  const from = new Target.CTE(name, union);
-  return new QueryData.Select({
-    selection,
-    from
-  });
-}
-export {
-  makeRecursiveUnion
-};

package/dist/define/Cursor.d.ts

@@ -1,108 +0,0 @@
-import { Driver } from '../lib/Driver';
-import { CompileOptions } from '../lib/Formatter';
-import { EV, Expr } from './Expr';
-import { OrderBy } from './OrderBy';
-import { Query } from './Query';
-import { Selection } from './Selection';
-import { Table, TableData } from './Table';
-declare const QUERY: unique symbol;
-export declare class Cursor<T> {
-    [Selection.CursorType]: () => T;
-    [QUERY]: Query<T>;
-    static Query: typeof QUERY;
-    constructor(query: Query<T>);
-    static all(strings: TemplateStringsArray, ...params: Array<any>): Cursor<any>;
-    next<T>(cursor: Cursor<T>): Cursor<T>;
-    on(driver: Driver.Sync): T;
-    on(driver: Driver.Async): Promise<T>;
-    toSql(driver: Driver, options?: CompileOptions): string;
-    toJSON(): Query<T>;
-}
-export declare namespace Cursor {
-    class Delete extends Cursor<{
-        rowsAffected: number;
-    }> {
-        query(): Query.Delete;
-        where(...where: Array<EV<boolean>>): Delete;
-        take(limit: number | undefined): Delete;
-        skip(offset: number | undefined): Delete;
-    }
-    class Update<Definition> extends Cursor<{
-        rowsAffected: number;
-    }> {
-        [QUERY]: Query.Update;
-        set(set: Table.Update<Definition>): Update<Definition>;
-        where(...where: Array<EV<boolean>>): Update<Definition>;
-        take(limit: number | undefined): Update<Definition>;
-        skip(offset: number | undefined): Update<Definition>;
-    }
-    class InsertValuesReturning<T> extends Cursor<T> {
-    }
-    class Inserted extends Cursor<{
-        rowsAffected: number;
-    }> {
-        [QUERY]: Query.Insert;
-        constructor(query: Query.Insert);
-        returning<X extends Selection>(selection: X): InsertValuesReturning<Selection.Infer<X>>;
-    }
-    class Insert<Definition> {
-        protected into: TableData;
-        constructor(into: TableData);
-        selection(query: Cursor.SelectMultiple<Table.Select<Definition>>): Inserted;
-        values(...data: Array<Table.Insert<Definition>>): Inserted;
-    }
-    class CreateTable extends Cursor<void> {
-        protected table: TableData;
-        constructor(table: TableData);
-    }
-    class Batch<T = void> extends Cursor<T> {
-        protected queries: Array<Query>;
-        [QUERY]: Query.Batch;
-        constructor(queries: Array<Query>);
-        next<T>(cursor: Cursor<T>): Cursor<T>;
-    }
-    class SelectMultiple<Row> extends Cursor<Array<Row>> {
-        [QUERY]: Query.Select;
-        constructor(query: Query.Select);
-        leftJoin<C>(that: Table<C> | TableSelect<C>, ...on: Array<EV<boolean>>): SelectMultiple<Row>;
-        innerJoin<C>(that: Table<C> | TableSelect<C>, ...on: Array<EV<boolean>>): SelectMultiple<Row>;
-        select<X extends Selection>(selection: X): SelectMultiple<Selection.Infer<X>>;
-        count(): SelectSingle<number>;
-        orderBy(...orderBy: Array<Expr<any> | OrderBy>): SelectMultiple<Row>;
-        groupBy(...groupBy: Array<Expr<any>>): SelectMultiple<Row>;
-        first(): SelectSingle<Row | undefined>;
-        sure(): SelectSingle<Row>;
-        where(...where: Array<EV<boolean>>): SelectMultiple<Row>;
-        take(limit: number | undefined): SelectMultiple<Row>;
-        skip(offset: number | undefined): SelectMultiple<Row>;
-        [Expr.ToExpr](): Expr<Row>;
-    }
-    class TableSelect<Definition> extends SelectMultiple<Table.Select<Definition>> {
-        protected table: TableData;
-        [QUERY]: Query.Select;
-        constructor(table: TableData, conditions?: Array<EV<boolean>>);
-        as(alias: string): Table<Definition>;
-        create(): CreateTable;
-        insertSelect(query: SelectMultiple<Table.Insert<Definition>>): Inserted;
-        insertOne(record: Table.Insert<Definition>): Cursor<Table.Select<Definition>>;
-        insertAll(data: Array<Table.Insert<Definition>>): Inserted;
-        set(data: Table.Update<Definition>): Update<Definition>;
-        delete(): Delete;
-        get(name: string): Expr<any>;
-    }
-    class SelectSingle<Row> extends Cursor<Row> {
-        [QUERY]: Query.Select;
-        constructor(query: Query.Select);
-        leftJoin<C>(that: Table<C> | TableSelect<C>, ...on: Array<EV<boolean>>): SelectSingle<Row>;
-        innerJoin<C>(that: Table<C> | TableSelect<C>, ...on: Array<EV<boolean>>): SelectSingle<Row>;
-        select<X extends Selection>(selection: X): SelectSingle<Selection.Infer<X>>;
-        orderBy(...orderBy: Array<OrderBy>): SelectSingle<Row>;
-        groupBy(...groupBy: Array<Expr<any>>): SelectSingle<Row>;
-        where(...where: Array<EV<boolean>>): SelectSingle<Row>;
-        take(limit: number | undefined): SelectSingle<Row>;
-        skip(offset: number | undefined): SelectSingle<Row>;
-        all(): SelectMultiple<Row>;
-        [Expr.ToExpr](): Expr<Row>;
-    }
-}
-export {};

package/dist/define/Cursor.js

@@ -1,338 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-
-// src/define/Cursor.ts
-import { Expr, ExprData } from "./Expr.js";
-import { Functions } from "./Functions.js";
-import { Query } from "./Query.js";
-import { Schema } from "./Schema.js";
-import { Selection } from "./Selection.js";
-import { Table, createTable } from "./Table.js";
-import { Target } from "./Target.js";
-var QUERY = Symbol("Cursor.Query");
-var _Cursor = class {
-  [(Selection.CursorType, QUERY)];
-  constructor(query) {
-    this[QUERY] = query;
-  }
-  static all(strings, ...params) {
-    return new _Cursor(Query.Raw({ expectedReturn: "rows", strings, params }));
-  }
-  next(cursor) {
-    return new _Cursor(
-      Query.Batch({
-        queries: [this[QUERY], cursor[QUERY]]
-      })
-    );
-  }
-  on(driver) {
-    return driver.executeQuery(this[QUERY]);
-  }
-  toSql(driver, options = { forceInline: true }) {
-    return driver.formatter.compile(this[QUERY], options).sql;
-  }
-  toJSON() {
-    return this[QUERY];
-  }
-};
-var Cursor = _Cursor;
-__publicField(Cursor, "Query", QUERY);
-function addWhere(query, where) {
-  const conditions = where.slice();
-  if (query.where)
-    conditions.push(new Expr(query.where));
-  return {
-    ...query,
-    where: Expr.and(...conditions)[Expr.Data]
-  };
-}
-((Cursor2) => {
-  class Delete extends Cursor2 {
-    query() {
-      return super[QUERY];
-    }
-    where(...where) {
-      return new Delete(addWhere(this[QUERY], where));
-    }
-    take(limit) {
-      return new Delete({ ...this[QUERY], limit });
-    }
-    skip(offset) {
-      return new Delete({ ...this[QUERY], offset });
-    }
-  }
-  Cursor2.Delete = Delete;
-  const _Update = class extends Cursor2 {
-    set(set) {
-      return new _Update({ ...this[QUERY], set });
-    }
-    where(...where) {
-      return new _Update(addWhere(this[QUERY], where));
-    }
-    take(limit) {
-      return new _Update({ ...this[QUERY], limit });
-    }
-    skip(offset) {
-      return new _Update({ ...this[QUERY], offset });
-    }
-  };
-  let Update = _Update;
-  QUERY;
-  Cursor2.Update = Update;
-  class InsertValuesReturning extends Cursor2 {
-  }
-  Cursor2.InsertValuesReturning = InsertValuesReturning;
-  class Inserted extends Cursor2 {
-    constructor(query) {
-      super(query);
-    }
-    returning(selection) {
-      return new InsertValuesReturning(
-        Query.Insert({ ...this[QUERY], selection: ExprData.create(selection) })
-      );
-    }
-  }
-  QUERY;
-  Cursor2.Inserted = Inserted;
-  class Insert {
-    constructor(into) {
-      this.into = into;
-    }
-    selection(query) {
-      return new Inserted(Query.Insert({ into: this.into, select: query[QUERY] }));
-    }
-    values(...data) {
-      return new Inserted(Query.Insert({ into: this.into, data }));
-    }
-  }
-  Cursor2.Insert = Insert;
-  class CreateTable extends Cursor2 {
-    constructor(table) {
-      super(Schema.create(table));
-      this.table = table;
-    }
-  }
-  Cursor2.CreateTable = CreateTable;
-  class Batch extends Cursor2 {
-    constructor(queries) {
-      super(Query.Batch({ queries }));
-      this.queries = queries;
-    }
-    next(cursor) {
-      return new Cursor2(
-        Query.Batch({
-          queries: [...this[QUERY].queries, cursor[QUERY]]
-        })
-      );
-    }
-  }
-  QUERY;
-  Cursor2.Batch = Batch;
-  function joinTarget(joinType, query, to, on) {
-    const toQuery = to instanceof Cursor2 ? to[QUERY] : void 0;
-    const target = toQuery ? toQuery.from : Target.Table(to[Table.Data]);
-    if (!query.from || !target)
-      throw new Error("No from clause");
-    const conditions = [...on];
-    if (toQuery) {
-      const where = toQuery.where;
-      if (where)
-        conditions.push(new Expr(where));
-    }
-    return Target.Join(
-      query.from,
-      target,
-      joinType,
-      Expr.and(...conditions)[Expr.Data]
-    );
-  }
-  class SelectMultiple extends Cursor2 {
-    constructor(query) {
-      super(query);
-    }
-    leftJoin(that, ...on) {
-      const query = this[QUERY];
-      return new SelectMultiple({
-        ...query,
-        from: joinTarget("left", query, that, on)
-      });
-    }
-    innerJoin(that, ...on) {
-      const query = this[QUERY];
-      return new SelectMultiple({
-        ...query,
-        from: joinTarget("inner", query, that, on)
-      });
-    }
-    select(selection) {
-      return new SelectMultiple({
-        ...this[QUERY],
-        selection: ExprData.create(selection)
-      });
-    }
-    count() {
-      return new SelectSingle({
-        ...this[QUERY],
-        selection: Functions.count()[Expr.Data],
-        singleResult: true
-      });
-    }
-    orderBy(...orderBy) {
-      return new SelectMultiple({
-        ...this[QUERY],
-        orderBy: orderBy.map((e) => {
-          return Expr.isExpr(e) ? e.asc() : e;
-        })
-      });
-    }
-    groupBy(...groupBy) {
-      return new SelectMultiple({
-        ...this[QUERY],
-        groupBy: groupBy.map(ExprData.create)
-      });
-    }
-    first() {
-      return new SelectSingle({ ...this[QUERY], singleResult: true });
-    }
-    sure() {
-      return new SelectSingle({
-        ...this[QUERY],
-        singleResult: true,
-        validate: true
-      });
-    }
-    where(...where) {
-      return new SelectMultiple(addWhere(this[QUERY], where));
-    }
-    take(limit) {
-      return new SelectMultiple({ ...this[QUERY], limit });
-    }
-    skip(offset) {
-      return new SelectMultiple({ ...this[QUERY], offset });
-    }
-    [(QUERY, Expr.ToExpr)]() {
-      return new Expr(ExprData.Query(this[QUERY]));
-    }
-  }
-  Cursor2.SelectMultiple = SelectMultiple;
-  class TableSelect extends SelectMultiple {
-    constructor(table, conditions = []) {
-      const target = Target.Table(table);
-      super(
-        Query.Select({
-          from: target,
-          selection: ExprData.Row(target),
-          where: Expr.and(...conditions)[Expr.Data]
-        })
-      );
-      this.table = table;
-    }
-    as(alias) {
-      return createTable({ ...this.table, alias });
-    }
-    create() {
-      return new Cursor2.CreateTable(this.table);
-    }
-    insertSelect(query) {
-      return new Cursor2.Inserted(
-        Query.Insert({ into: this.table, select: query[QUERY] })
-      );
-    }
-    insertOne(record) {
-      return new Cursor2(
-        Query.Insert({
-          into: this.table,
-          data: [record],
-          selection: ExprData.Row(Target.Table(this.table)),
-          singleResult: true
-        })
-      );
-    }
-    insertAll(data) {
-      return new Cursor2.Insert(this.table).values(...data);
-    }
-    set(data) {
-      return new Cursor2.Update(
-        Query.Update({
-          table: this.table,
-          where: this[QUERY].where
-        })
-      ).set(data);
-    }
-    delete() {
-      return new Cursor2.Delete(
-        Query.Delete({
-          table: this.table,
-          where: this[QUERY].where
-        })
-      );
-    }
-    get(name) {
-      return new Expr(
-        ExprData.Field(ExprData.Row(Target.Table(this.table)), name)
-      );
-    }
-  }
-  QUERY;
-  Cursor2.TableSelect = TableSelect;
-  class SelectSingle extends Cursor2 {
-    constructor(query) {
-      super(query);
-    }
-    leftJoin(that, ...on) {
-      const query = this[QUERY];
-      return new SelectSingle({
-        ...query,
-        from: joinTarget("left", query, that, on)
-      });
-    }
-    innerJoin(that, ...on) {
-      const query = this[QUERY];
-      return new SelectSingle({
-        ...query,
-        from: joinTarget("inner", query, that, on)
-      });
-    }
-    select(selection) {
-      return new SelectSingle({
-        ...this[QUERY],
-        selection: ExprData.create(selection)
-      });
-    }
-    orderBy(...orderBy) {
-      return new SelectSingle({
-        ...this[QUERY],
-        orderBy
-      });
-    }
-    groupBy(...groupBy) {
-      return new SelectSingle({
-        ...this[QUERY],
-        groupBy: groupBy.map(ExprData.create)
-      });
-    }
-    where(...where) {
-      return new SelectSingle(addWhere(this[QUERY], where));
-    }
-    take(limit) {
-      return new SelectSingle({ ...this[QUERY], limit });
-    }
-    skip(offset) {
-      return new SelectSingle({ ...this[QUERY], offset });
-    }
-    all() {
-      return new SelectMultiple({ ...this[QUERY], singleResult: false });
-    }
-    [(QUERY, Expr.ToExpr)]() {
-      return new Expr(ExprData.Query(this[QUERY]));
-    }
-  }
-  Cursor2.SelectSingle = SelectSingle;
-})(Cursor || (Cursor = {}));
-export {
-  Cursor
-};

package/dist/define/Update.d.ts

@@ -1,4 +0,0 @@
-import type { EV } from './Expr';
-export type Update<Row> = Partial<{
-    [K in keyof Row]: EV<Row[K]>;
-}>;

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

@@ -1,7 +0,0 @@
-import { Query, QueryData } from '../Query.js';
-export declare class Batch<T = void> extends Query<T> {
-    protected queries: Array<QueryData>;
-    [Query.Data]: QueryData.Batch;
-    constructor(queries: Array<QueryData>);
-    next<T>(cursor: Query<T>): Query<T>;
-}