rado 1.0.1 → 1.0.2

package/dist/core/Dialect.js

@@ -2,7 +2,7 @@
 import {
   getQuery,
   getSql,
-  hasSql
+  hasQuery
 } from "./Internal.js";
 var Dialect = class {
   #createEmitter;
@@ -10,13 +10,13 @@ var Dialect = class {
     this.#createEmitter = createEmitter;
   }
   emit = (input) => {
-    const sql = hasSql(input) ? getSql(input) : getQuery(input);
+    const sql = hasQuery(input) ? getQuery(input) : getSql(input);
     const emitter = new this.#createEmitter();
     sql.emitTo(emitter);
     return emitter;
   };
   inline = (input) => {
-    const sql = hasSql(input) ? getSql(input) : getQuery(input);
+    const sql = hasQuery(input) ? getQuery(input) : getSql(input);
     const emitter = new this.#createEmitter();
     sql.inlineValues().emitTo(emitter);
     return emitter.sql;

package/dist/core/query/Select.d.ts

@@ -1,4 +1,4 @@
-import { type HasSelection, type HasSql, type HasTable, type HasTarget, internalData, internalQuery, internalSelection } from '../Internal.js';
+import { internalData, internalQuery, internalSelection, internalSql, type HasSelection, type HasSql, type HasTable, type HasTarget } from '../Internal.js';
 import type { QueryMeta } from '../MetaData.js';
 import type { Query } from '../Query.js';
 import { type IsNullable, type MakeNullable, type Selection, type SelectionRecord, type SelectionRow } from '../Selection.js';
@@ -43,10 +43,11 @@ export declare class Select<Input, Meta extends QueryMeta = QueryMeta> extends U
     offset(offset: UserInput<number>): Select<Input, Meta>;
     get [internalSelection](): Selection;
     get [internalQuery](): Sql;
+    get [internalSql](): Sql<SelectionRow<Input>>;
 }
 export type SubQuery<Input> = Input & HasTarget;
-export interface SelectBase<Input, Meta extends QueryMeta = QueryMeta> extends UnionBase<Input, Meta>, HasSelection {
-    where(where: HasSql<boolean>): Select<Input, Meta>;
+export interface SelectBase<Input, Meta extends QueryMeta = QueryMeta> extends UnionBase<Input, Meta>, HasSelection, HasSql<SelectionRow<Input>> {
+    where(...where: Array<HasSql<boolean> | undefined>): Select<Input, Meta>;
     groupBy(...exprs: Array<HasSql>): Select<Input, Meta>;
     having(having: HasSql<boolean>): Select<Input, Meta>;
     orderBy(...exprs: Array<HasSql>): Select<Input, Meta>;
@@ -58,7 +59,7 @@ export interface WithoutSelection<Meta extends QueryMeta> {
     from<Definition extends TableDefinition, Name extends string>(from: Table<Definition, Name>): AllFrom<TableFields<Definition>, Meta, Record<Name, TableFields<Definition>>>;
     from<Input>(from: SubQuery<Input>): SelectionFrom<Input, Meta>;
 }
-export interface WithSelection<Input, Meta extends QueryMeta> extends Query<SelectionRow<Input>, Meta> {
+export interface WithSelection<Input, Meta extends QueryMeta> extends Query<SelectionRow<Input>, Meta>, HasSql<SelectionRow<Input>> {
     from<Definition extends TableDefinition, Name extends string>(from: Table<Definition, Name>): SelectionFrom<Input, Meta>;
     from(from: SubQuery<unknown>): SelectionFrom<Input, Meta>;
     from(target: HasSql): Select<Input, Meta>;

package/dist/core/query/Select.js

@@ -11,6 +11,7 @@ import {
   internalData,
   internalQuery,
   internalSelection,
+  internalSql,
   internalTarget
 } from "../Internal.js";
 import {
@@ -132,6 +133,9 @@ var Select = class _Select extends UnionBase {
   get [internalQuery]() {
     return sql.chunk("emitSelect", getData(this));
   }
+  get [internalSql]() {
+    return sql`(${getQuery(this)})`;
+  }
 };
 export {
   Select

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "license": "MIT",
   "type": "module",
   "scripts": {