rado 0.3.2 → 0.3.3

package/dist/driver/bun-sqlite.js

@@ -1,5 +1,4 @@
-import { QueryData } from "../define/Query.js";
-import { SelectFirst } from "../define/query/Select.js";
+import { QueryData, SelectFirst } from "../define/Query.js";
 import { Driver } from "../lib/Driver.js";
 import { SqliteFormatter } from "../sqlite/SqliteFormatter.js";
 import { SqliteSchema } from "../sqlite/SqliteSchema.js";

package/dist/index.d.ts

@@ -14,14 +14,6 @@ export * from './define/Sql.js';
 export * from './define/Table.js';
 export * from './define/Target.js';
 export * from './define/VirtualTable.js';
-export * from './define/query/Batch.js';
-export * from './define/query/CreateTable.js';
-export * from './define/query/Delete.js';
-export * from './define/query/Insert.js';
-export * from './define/query/Select.js';
-export * from './define/query/TableSelect.js';
-export * from './define/query/Union.js';
-export * from './define/query/Update.js';
 export type { Driver, DriverOptions } from './lib/Driver.js';
 export type { FormatContext, Formatter } from './lib/Formatter.js';
 export type { Sanitizer } from './lib/Sanitizer.js';

package/dist/index.js

@@ -11,12 +11,4 @@ export * from "./define/Sql.js";
 export * from "./define/Table.js";
 export * from "./define/Target.js";
 export * from "./define/VirtualTable.js";
-export * from "./define/query/Batch.js";
-export * from "./define/query/CreateTable.js";
-export * from "./define/query/Delete.js";
-export * from "./define/query/Insert.js";
-export * from "./define/query/Select.js";
-export * from "./define/query/TableSelect.js";
-export * from "./define/query/Union.js";
-export * from "./define/query/Update.js";
 export * from "./lib/SqlError.js";

package/dist/lib/Driver.d.ts

@@ -1,8 +1,7 @@
 import { Expr } from '../define/Expr.js';
-import { Query, QueryData } from '../define/Query.js';
+import { Query, QueryData, Select } from '../define/Query.js';
 import { SchemaInstructions } from '../define/Schema.js';
 import { Table } from '../define/Table.js';
-import { Select } from '../define/query/Select.js';
 import { Callable } from '../util/Callable.js';
 import { Formatter } from './Formatter.js';
 import { Statement } from './Statement.js';

package/package.json

@@ -1,74 +1,74 @@
-{
-  "name": "rado",
-  "version": "0.3.2",
-  "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.3",
+  "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/Cursor.d.ts

@@ -1,85 +0,0 @@
-import { Driver } from '../lib/Driver';
-import { EV, Expr } from './Expr';
-import { OrderBy } from './OrderBy';
-import { Query } from './Query';
-import { Schema } from './Schema';
-import { Selection } from './Selection';
-import { Table } from './Table';
-import { Update as UpdateSet } from './Update';
-export declare class Cursor<T> {
-    [Selection.__cursorType](): T;
-    constructor(query: Query<T>);
-    static all(strings: TemplateStringsArray, ...params: Array<any>): Cursor<any>;
-    query(): Query<T>;
-    on(driver: Driver.Sync): T;
-    on(driver: Driver.Async): Promise<T>;
-    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<T> extends Cursor<{
-        rowsAffected: number;
-    }> {
-        query(): Query.Update;
-        set(set: UpdateSet<T>): Update<T>;
-        where(...where: Array<EV<boolean>>): Update<T>;
-        take(limit: number | undefined): Update<T>;
-        skip(offset: number | undefined): Update<T>;
-    }
-    class InsertValuesReturning<T> extends Cursor<T> {
-    }
-    class InsertValues extends Cursor<{
-        rowsAffected: number;
-    }> {
-        query(): Query.Insert;
-        returning<X extends Selection>(selection: X): InsertValuesReturning<Selection.Infer<X>>;
-    }
-    class Insert<T> {
-        protected into: Schema;
-        constructor(into: Schema);
-        values(...data: Array<Table.Insert<T>>): InsertValues;
-    }
-    class CreateTable extends Cursor<void> {
-        protected table: Schema;
-        constructor(table: Schema);
-    }
-    class Batch<T = void> extends Cursor<T> {
-        protected queries: Array<Query>;
-        constructor(queries: Array<Query>);
-    }
-    class SelectMultiple<T> extends Cursor<Array<T>> {
-        query(): Query.Select;
-        leftJoin<C>(that: Table<C>, ...on: Array<EV<boolean>>): SelectMultiple<T>;
-        innerJoin<C>(that: Table<C>, ...on: Array<EV<boolean>>): SelectMultiple<T>;
-        select<X extends Selection>(selection: X): SelectMultiple<Selection.Infer<X>>;
-        count(): SelectSingle<number>;
-        orderBy(...orderBy: Array<Expr<any> | OrderBy>): SelectMultiple<T>;
-        groupBy(...groupBy: Array<Expr<any>>): SelectMultiple<T>;
-        first(): SelectSingle<T | undefined>;
-        sure(): SelectSingle<T>;
-        where(...where: Array<EV<boolean>>): SelectMultiple<T>;
-        take(limit: number | undefined): SelectMultiple<T>;
-        skip(offset: number | undefined): SelectMultiple<T>;
-        toExpr(): Expr<T>;
-    }
-    class SelectSingle<T> extends Cursor<T> {
-        query(): Query.Select;
-        leftJoin<C>(that: Table<C>, ...on: Array<EV<boolean>>): SelectSingle<T>;
-        innerJoin<C>(that: Table<C>, ...on: Array<EV<boolean>>): SelectSingle<T>;
-        select<X extends Selection>(selection: X): SelectSingle<Selection.Infer<X>>;
-        orderBy(...orderBy: Array<OrderBy>): SelectSingle<T>;
-        groupBy(...groupBy: Array<Expr<any>>): SelectSingle<T>;
-        where(...where: Array<EV<boolean>>): SelectSingle<T>;
-        take(limit: number | undefined): SelectSingle<T>;
-        skip(offset: number | undefined): SelectSingle<T>;
-        all(): SelectMultiple<T>;
-        toExpr(): Expr<T>;
-    }
-}

package/dist/define/Cursor.js

@@ -1,256 +0,0 @@
-// 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 { Target } from "./Target.js";
-var Cursor = class {
-  [Selection.__cursorType]() {
-    throw "assert";
-  }
-  constructor(query) {
-    Object.defineProperty(this, "query", {
-      enumerable: false,
-      value: () => query
-    });
-  }
-  static all(strings, ...params) {
-    return new Cursor(Query.Raw({ expectedReturn: "rows", strings, params }));
-  }
-  query() {
-    throw new Error("Not implemented");
-  }
-  on(driver) {
-    return driver.executeQuery(this.query());
-  }
-  toJSON() {
-    return this.query();
-  }
-};
-function addWhere(query, where) {
-  const conditions = where.slice();
-  if (query.where)
-    conditions.push(query.where);
-  return {
-    ...query,
-    where: Expr.and(...conditions).expr
-  };
-}
-((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;
-  class Update extends Cursor2 {
-    query() {
-      return super.query();
-    }
-    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 });
-    }
-  }
-  Cursor2.Update = Update;
-  class InsertValuesReturning extends Cursor2 {
-  }
-  Cursor2.InsertValuesReturning = InsertValuesReturning;
-  class InsertValues extends Cursor2 {
-    query() {
-      return super.query();
-    }
-    returning(selection) {
-      return new InsertValuesReturning(
-        Query.Insert({ ...this.query(), selection: ExprData.create(selection) })
-      );
-    }
-  }
-  Cursor2.InsertValues = InsertValues;
-  class Insert {
-    constructor(into) {
-      this.into = into;
-    }
-    values(...data) {
-      return new InsertValues(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;
-    }
-  }
-  Cursor2.Batch = Batch;
-  class SelectMultiple extends Cursor2 {
-    query() {
-      return super.query();
-    }
-    leftJoin(that, ...on) {
-      const query = this.query();
-      return new SelectMultiple({
-        ...query,
-        from: Target.Join(
-          query.from,
-          Target.Table(that.schema()),
-          "left",
-          Expr.and(...on).expr
-        )
-      });
-    }
-    innerJoin(that, ...on) {
-      const query = this.query();
-      return new SelectMultiple({
-        ...query,
-        from: Target.Join(
-          query.from,
-          Target.Table(that.schema()),
-          "inner",
-          Expr.and(...on).expr
-        )
-      });
-    }
-    select(selection) {
-      return new SelectMultiple({
-        ...this.query(),
-        selection: ExprData.create(selection)
-      });
-    }
-    count() {
-      return new SelectSingle({
-        ...this.query(),
-        selection: Functions.count().expr,
-        singleResult: true
-      });
-    }
-    orderBy(...orderBy) {
-      return new SelectMultiple({
-        ...this.query(),
-        orderBy: orderBy.map((e) => {
-          return e instanceof Expr ? 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 });
-    }
-    toExpr() {
-      return new Expr(ExprData.Query(this.query()));
-    }
-  }
-  Cursor2.SelectMultiple = SelectMultiple;
-  class SelectSingle extends Cursor2 {
-    query() {
-      return super.query();
-    }
-    leftJoin(that, ...on) {
-      const query = this.query();
-      return new SelectSingle({
-        ...query,
-        from: Target.Join(
-          query.from,
-          Target.Table(that.schema()),
-          "left",
-          Expr.and(...on).expr
-        )
-      });
-    }
-    innerJoin(that, ...on) {
-      const query = this.query();
-      return new SelectSingle({
-        ...query,
-        from: Target.Join(
-          query.from,
-          Target.Table(that.schema()),
-          "inner",
-          Expr.and(...on).expr
-        )
-      });
-    }
-    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 });
-    }
-    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>;
-}

package/dist/define/query/Batch.js

@@ -1,17 +0,0 @@
-import { Query, QueryData } from "../Query.js";
-class Batch extends Query {
-  constructor(queries) {
-    super(new QueryData.Batch({ queries }));
-    this.queries = queries;
-  }
-  next(cursor) {
-    return new Query(
-      new QueryData.Batch({
-        queries: [...this[Query.Data].queries, cursor[Query.Data]]
-      })
-    );
-  }
-}
-export {
-  Batch
-};

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

@@ -1,6 +0,0 @@
-import { Query } from '../Query.js';
-import { TableData } from '../Table.js';
-export declare class CreateTable extends Query<void> {
-    protected table: TableData;
-    constructor(table: TableData);
-}

package/dist/define/query/CreateTable.js

@@ -1,11 +0,0 @@
-import { Query } from "../Query.js";
-import { Schema } from "../Schema.js";
-class CreateTable extends Query {
-  constructor(table) {
-    super(Schema.create(table));
-    this.table = table;
-  }
-}
-export {
-  CreateTable
-};

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

@@ -1,13 +0,0 @@
-import { EV } from '../Expr.js';
-import { OrderBy } from '../OrderBy.js';
-import { Query, QueryData } from '../Query.js';
-export declare class Delete extends Query<{
-    rowsAffected: number;
-}> {
-    [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

@@ -1,21 +0,0 @@
-import { Query } from "../Query.js";
-class Delete extends Query {
-  constructor(query) {
-    super(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 }));
-  }
-  skip(offset) {
-    return new Delete(this[Query.Data].with({ offset }));
-  }
-}
-export {
-  Delete
-};

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

@@ -1,22 +0,0 @@
-import { Query, QueryData } from '../Query.js';
-import { Selection } from '../Selection.js';
-import { Table, TableData } from '../Table.js';
-import { Select } from './Select.js';
-export declare class Insert<T = {
-    rowsAffected: number;
-}> extends Query<T> {
-    [Query.Data]: QueryData.Insert;
-    constructor(query: QueryData.Insert);
-    returning<X extends Selection>(selection: X): Insert<Array<Selection.Infer<X>>>;
-}
-export declare class InsertOne<T> extends Query<T> {
-    [Query.Data]: QueryData.Insert;
-    constructor(query: QueryData.Insert);
-    returning<X extends Selection>(selection: X): Insert<Selection.Infer<X>>;
-}
-export declare class InsertInto<Definition> {
-    protected into: TableData;
-    constructor(into: TableData);
-    selection(query: Select<Table.Select<Definition>>): Insert;
-    values(...data: Array<Table.Insert<Definition>>): Insert;
-}