pqb 0.7.11 → 0.7.12

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # pqb
 
+## 0.7.12
+
+### Patch Changes
+
+- Improve usability of raw SQL
+
 ## 0.7.11
 
 ### Patch Changes

package/dist/index.d.ts

@@ -4,12 +4,12 @@ declare type AliasOrTable<T extends Pick<Query, 'tableAlias' | 'table'>> = T['ta
 declare type StringKey<K extends PropertyKey> = Exclude<K, symbol | number>;
 declare type RawExpression<C extends ColumnType = ColumnType> = {
     __raw: string;
-    __values: unknown[];
+    __values?: Record<string, unknown> | false;
     __column: C;
 };
-declare const raw: (sql: string, ...values: unknown[]) => RawExpression;
+declare const raw: (sql: string, values?: Record<string, unknown> | false) => RawExpression;
 declare const isRaw: (obj: object) => obj is RawExpression<ColumnType<unknown, Operators, unknown>>;
-declare const getRaw: (raw: RawExpression, values: unknown[]) => string;
+declare const getRaw: (raw: RawExpression, valuesArray: unknown[]) => string;
 declare const getRawSql: (raw: RawExpression) => string;
 declare type Expression<T extends Query = Query, C extends ColumnType = ColumnType> = StringKey<keyof T['selectable']> | RawExpression<C>;
 declare type ExpressionOfType<T extends Query, C extends ColumnType, Type> = {
@@ -1356,7 +1356,7 @@ declare class MergeQueryMethods {
     _merge<T extends Query, Q extends Query>(this: T, q: Q): MergeQuery<T, Q>;
 }
 
-declare type RawArgs<CT extends ColumnTypesBase, C extends ColumnType> = [column: (types: CT) => C, sql: string, ...values: unknown[]] | [sql: string, ...values: unknown[]];
+declare type RawArgs<CT extends ColumnTypesBase, C extends ColumnType> = [column: (types: CT) => C, sql: string, values?: Record<string, unknown>] | [sql: string, values?: Record<string, unknown>];
 declare class RawMethods {
     raw<T extends Query, C extends ColumnType>(this: T, ...args: RawArgs<T['columnTypes'], C>): RawExpression<C>;
 }
@@ -1900,11 +1900,11 @@ declare const Operators: {
         not: Fn<unknown> & {
             type: unknown;
         };
-        in: Fn<Query | unknown[] | RawExpression<ColumnType<unknown, Operators, unknown>>> & {
-            type: Query | unknown[] | RawExpression<ColumnType<unknown, Operators, unknown>>;
+        in: Fn<Query | RawExpression<ColumnType<unknown, Operators, unknown>> | unknown[]> & {
+            type: Query | RawExpression<ColumnType<unknown, Operators, unknown>> | unknown[];
         };
-        notIn: Fn<Query | unknown[] | RawExpression<ColumnType<unknown, Operators, unknown>>> & {
-            type: Query | unknown[] | RawExpression<ColumnType<unknown, Operators, unknown>>;
+        notIn: Fn<Query | RawExpression<ColumnType<unknown, Operators, unknown>> | unknown[]> & {
+            type: Query | RawExpression<ColumnType<unknown, Operators, unknown>> | unknown[];
         };
     };
     array: {
@@ -4195,11 +4195,11 @@ declare class JSONColumn<Type extends JSONTypeAny = JSONTypeAny> extends ColumnT
         not: ((key: string, value: unknown, values: unknown[]) => string) & {
             type: unknown;
         };
-        in: ((key: string, value: Query | unknown[] | RawExpression<ColumnType<unknown, Operators, unknown>>, values: unknown[]) => string) & {
-            type: Query | unknown[] | RawExpression<ColumnType<unknown, Operators, unknown>>;
+        in: ((key: string, value: Query | RawExpression<ColumnType<unknown, Operators, unknown>> | unknown[], values: unknown[]) => string) & {
+            type: Query | RawExpression<ColumnType<unknown, Operators, unknown>> | unknown[];
         };
-        notIn: ((key: string, value: Query | unknown[] | RawExpression<ColumnType<unknown, Operators, unknown>>, values: unknown[]) => string) & {
-            type: Query | unknown[] | RawExpression<ColumnType<unknown, Operators, unknown>>;
+        notIn: ((key: string, value: Query | RawExpression<ColumnType<unknown, Operators, unknown>> | unknown[], values: unknown[]) => string) & {
+            type: Query | RawExpression<ColumnType<unknown, Operators, unknown>> | unknown[];
         };
     };
     data: ColumnData & {

package/dist/index.esm.js

@@ -156,181 +156,6 @@ const quote = (value) => {
     return `'${JSON.stringify(value).replace(singleQuoteRegex, "''")}'`;
 };
 
-const raw = (sql, ...values) => ({
-  __raw: sql,
-  __values: values
-});
-const isRaw = (obj) => "__raw" in obj;
-const getRaw = (raw2, values) => {
-  values.push(...raw2.__values);
-  return raw2.__raw;
-};
-const getRawSql = (raw2) => {
-  return raw2.__raw;
-};
-const EMPTY_OBJECT = {};
-const getQueryParsers = (q) => {
-  return q.query.parsers || q.columnsParsers;
-};
-
-const q = (sql) => `"${sql}"`;
-const qc = (column, quotedAs) => quotedAs ? `${quotedAs}.${q(column)}` : column;
-const quoteFullColumn = (fullColumn, quotedAs) => {
-  const index = fullColumn.indexOf(".");
-  if (index !== -1) {
-    return `${q(fullColumn.slice(0, index))}.${q(fullColumn.slice(index + 1))}`;
-  } else if (quotedAs) {
-    return `${quotedAs}.${q(fullColumn)}`;
-  } else {
-    return q(fullColumn);
-  }
-};
-const expressionToSql = (expr, values, quotedAs) => {
-  return typeof expr === "object" && isRaw(expr) ? getRaw(expr, values) : quoteFullColumn(expr, quotedAs);
-};
-const quoteSchemaAndTable = (schema, table) => {
-  return schema ? `${q(schema)}.${q(table)}` : q(table);
-};
-const addValue = (values, value) => {
-  values.push(value);
-  return `$${values.length}`;
-};
-
-var __defProp$p = Object.defineProperty;
-var __defProps$j = Object.defineProperties;
-var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
-var __hasOwnProp$q = Object.prototype.hasOwnProperty;
-var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$p = (obj, key, value) => key in obj ? __defProp$p(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$p = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$q.call(b, prop))
-      __defNormalProp$p(a, prop, b[prop]);
-  if (__getOwnPropSymbols$q)
-    for (var prop of __getOwnPropSymbols$q(b)) {
-      if (__propIsEnum$q.call(b, prop))
-        __defNormalProp$p(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
-const createOperator = (fn) => {
-  return Object.assign(fn, { type: void 0 });
-};
-const quoteValue = (arg, values, jsonArray) => {
-  if (arg && typeof arg === "object") {
-    if (!jsonArray && Array.isArray(arg)) {
-      return `(${arg.map((value) => addValue(values, value)).join(", ")})`;
-    }
-    if ("toSql" in arg) {
-      const sql = arg.toSql({ values });
-      return `(${sql.text})`;
-    }
-    if (isRaw(arg)) {
-      return getRaw(arg, values);
-    }
-  }
-  return addValue(values, arg);
-};
-const all = {
-  equals: () => createOperator(
-    (key, value, values) => value === null ? `${key} IS NULL` : `${key} = ${quoteValue(value, values)}`
-  ),
-  not: () => createOperator(
-    (key, value, values) => value === null ? `${key} IS NOT NULL` : `${key} <> ${quoteValue(value, values)}`
-  ),
-  in: () => createOperator(
-    (key, value, values) => `${key} IN ${quoteValue(value, values)}`
-  ),
-  notIn: () => createOperator(
-    (key, value, values) => `NOT ${key} IN ${quoteValue(value, values)}`
-  ),
-  lt: () => createOperator(
-    (key, value, values) => `${key} < ${quoteValue(value, values)}`
-  ),
-  lte: () => createOperator(
-    (key, value, values) => `${key} <= ${quoteValue(value, values)}`
-  ),
-  gt: () => createOperator(
-    (key, value, values) => `${key} > ${quoteValue(value, values)}`
-  ),
-  gte: () => createOperator(
-    (key, value, values) => `${key} >= ${quoteValue(value, values)}`
-  ),
-  contains: () => createOperator(
-    (key, value, values) => `${key} ILIKE '%' || ${quoteValue(value, values)} || '%'`
-  ),
-  containsSensitive: () => createOperator(
-    (key, value, values) => `${key} LIKE '%' || ${quoteValue(value, values)} || '%'`
-  ),
-  startsWith: () => createOperator(
-    (key, value, values) => `${key} ILIKE ${quoteValue(value, values)} || '%'`
-  ),
-  startsWithSensitive: () => createOperator(
-    (key, value, values) => `${key} LIKE ${quoteValue(value, values)} || '%'`
-  ),
-  endsWith: () => createOperator(
-    (key, value, values) => `${key} ILIKE '%' || ${quoteValue(value, values)}`
-  ),
-  endsWithSensitive: () => createOperator(
-    (key, value, values) => `${key} LIKE '%' || ${quoteValue(value, values)}`
-  ),
-  between: () => createOperator(
-    (key, [from, to], values) => `${key} BETWEEN ${quoteValue(from, values)} AND ${quoteValue(
-      to,
-      values
-    )}`
-  ),
-  jsonPath: () => createOperator(
-    (key, [path, op, value], values) => `jsonb_path_query_first(${key}, ${quote(
-      path
-    )}) #>> '{}' ${op} ${quoteValue(value, values, true)}`
-  ),
-  jsonSupersetOf: () => createOperator(
-    (key, value, values) => `${key} @> ${quoteValue(value, values, true)}`
-  ),
-  jsonSubsetOf: () => createOperator(
-    (key, value, values) => `${key} <@ ${quoteValue(value, values, true)}`
-  )
-};
-const base = () => ({
-  equals: all.equals(),
-  not: all.not(),
-  in: all.in(),
-  notIn: all.notIn()
-});
-const numeric = () => __spreadProps$j(__spreadValues$p({}, base()), {
-  lt: all.lt(),
-  lte: all.lte(),
-  gt: all.gt(),
-  gte: all.gte(),
-  between: all.between()
-});
-const text$1 = () => __spreadProps$j(__spreadValues$p({}, base()), {
-  contains: all.contains(),
-  containsSensitive: all.containsSensitive(),
-  startsWith: all.startsWith(),
-  startsWithSensitive: all.startsWithSensitive(),
-  endsWith: all.endsWith(),
-  endsWithSensitive: all.endsWithSensitive()
-});
-const json = () => __spreadProps$j(__spreadValues$p({}, base()), {
-  jsonPath: all.jsonPath(),
-  jsonSupersetOf: all.jsonSupersetOf(),
-  jsonSubsetOf: all.jsonSubsetOf()
-});
-const Operators = {
-  any: base(),
-  boolean: base(),
-  number: numeric(),
-  date: numeric(),
-  time: numeric(),
-  text: text$1(),
-  json: json(),
-  array: base()
-};
-
 const defaultsKey = Symbol("defaults");
 const queryTypeWithLimitOne = {
   one: true,
@@ -690,29 +515,29 @@ const pushIn = (ands, prefix, quotedAs, values, arg) => {
   );
 };
 
-var __defProp$o = Object.defineProperty;
-var __defProps$i = Object.defineProperties;
-var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$p = Object.getOwnPropertySymbols;
-var __hasOwnProp$p = Object.prototype.hasOwnProperty;
-var __propIsEnum$p = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$o = (obj, key, value) => key in obj ? __defProp$o(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$o = (a, b) => {
+var __defProp$p = Object.defineProperty;
+var __defProps$j = Object.defineProperties;
+var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
+var __hasOwnProp$q = Object.prototype.hasOwnProperty;
+var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$p = (obj, key, value) => key in obj ? __defProp$p(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$p = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$p.call(b, prop))
-      __defNormalProp$o(a, prop, b[prop]);
-  if (__getOwnPropSymbols$p)
-    for (var prop of __getOwnPropSymbols$p(b)) {
-      if (__propIsEnum$p.call(b, prop))
-        __defNormalProp$o(a, prop, b[prop]);
+    if (__hasOwnProp$q.call(b, prop))
+      __defNormalProp$p(a, prop, b[prop]);
+  if (__getOwnPropSymbols$q)
+    for (var prop of __getOwnPropSymbols$q(b)) {
+      if (__propIsEnum$q.call(b, prop))
+        __defNormalProp$p(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
+var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
 const aggregateToSql = (ctx, model, item, quotedAs) => {
   var _a;
   const sql = [`${item.function}(`];
-  ctx = __spreadProps$i(__spreadValues$o({}, ctx), { sql });
+  ctx = __spreadProps$j(__spreadValues$p({}, ctx), { sql });
   const options = item.options || EMPTY_OBJECT;
   if (options.distinct && !options.withinGroup)
     sql.push("DISTINCT ");
@@ -1153,7 +978,7 @@ const pushInsertSql = (ctx, model, query, quotedAs) => {
     pushQueryValue(
       q2,
       "select",
-      isRaw(query.values) ? query.values : raw(encodeRow(ctx, query.values[0]))
+      isRaw(query.values) ? query.values : raw(encodeRow(ctx, query.values[0]), false)
     );
     ctx.sql.push(makeSql(q2, { values: ctx.values }).text);
   } else {
@@ -1530,19 +1355,19 @@ const cloneQueryArrays = (q) => {
   }
 };
 
-var __defProp$n = Object.defineProperty;
-var __getOwnPropSymbols$o = Object.getOwnPropertySymbols;
-var __hasOwnProp$o = Object.prototype.hasOwnProperty;
-var __propIsEnum$o = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$n = (obj, key, value) => key in obj ? __defProp$n(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$n = (a, b) => {
+var __defProp$o = Object.defineProperty;
+var __getOwnPropSymbols$p = Object.getOwnPropertySymbols;
+var __hasOwnProp$p = Object.prototype.hasOwnProperty;
+var __propIsEnum$p = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$o = (obj, key, value) => key in obj ? __defProp$o(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$o = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$o.call(b, prop))
-      __defNormalProp$n(a, prop, b[prop]);
-  if (__getOwnPropSymbols$o)
-    for (var prop of __getOwnPropSymbols$o(b)) {
-      if (__propIsEnum$o.call(b, prop))
-        __defNormalProp$n(a, prop, b[prop]);
+    if (__hasOwnProp$p.call(b, prop))
+      __defNormalProp$o(a, prop, b[prop]);
+  if (__getOwnPropSymbols$p)
+    for (var prop of __getOwnPropSymbols$p(b)) {
+      if (__propIsEnum$p.call(b, prop))
+        __defNormalProp$o(a, prop, b[prop]);
     }
   return a;
 };
@@ -1561,7 +1386,7 @@ const joinTruthy = (...strings) => {
   return strings.filter((string) => string).join("");
 };
 const getClonedQueryData = (query) => {
-  const cloned = __spreadValues$n({}, query);
+  const cloned = __spreadValues$o({}, query);
   delete cloned[toSqlCacheKey];
   cloneQueryArrays(cloned);
   return cloned;
@@ -1591,6 +1416,206 @@ const pushOrNewArray = (arr, value) => {
   }
 };
 
+const raw = (sql, values) => ({
+  __raw: sql,
+  __values: values
+});
+const isRaw = (obj) => "__raw" in obj;
+const keys = [];
+const getRaw = (raw2, valuesArray) => {
+  if (raw2.__values === false) {
+    return raw2.__raw;
+  }
+  const arr = raw2.__raw.split("'");
+  const values = raw2.__values || emptyObject;
+  const len = arr.length;
+  keys.length = 0;
+  for (let i = 0; i < len; i += 2) {
+    arr[i] = arr[i].replace(/\$(\w+)/g, (_, key) => {
+      const value = values[key];
+      if (value === void 0) {
+        throw new Error(`Query variable \`${key}\` is not provided`);
+      }
+      keys.push(key);
+      valuesArray.push(value);
+      return `$${valuesArray.length}`;
+    });
+  }
+  if (keys.length > 0 && keys.length < Object.keys(values).length) {
+    for (const key in values) {
+      if (!keys.includes(key)) {
+        throw new Error(`Query variable \`${key}\` is unused`);
+      }
+    }
+  }
+  return arr.join("'");
+};
+const getRawSql = (raw2) => {
+  return raw2.__raw;
+};
+const EMPTY_OBJECT = {};
+const getQueryParsers = (q) => {
+  return q.query.parsers || q.columnsParsers;
+};
+
+const q = (sql) => `"${sql}"`;
+const qc = (column, quotedAs) => quotedAs ? `${quotedAs}.${q(column)}` : column;
+const quoteFullColumn = (fullColumn, quotedAs) => {
+  const index = fullColumn.indexOf(".");
+  if (index !== -1) {
+    return `${q(fullColumn.slice(0, index))}.${q(fullColumn.slice(index + 1))}`;
+  } else if (quotedAs) {
+    return `${quotedAs}.${q(fullColumn)}`;
+  } else {
+    return q(fullColumn);
+  }
+};
+const expressionToSql = (expr, values, quotedAs) => {
+  return typeof expr === "object" && isRaw(expr) ? getRaw(expr, values) : quoteFullColumn(expr, quotedAs);
+};
+const quoteSchemaAndTable = (schema, table) => {
+  return schema ? `${q(schema)}.${q(table)}` : q(table);
+};
+const addValue = (values, value) => {
+  values.push(value);
+  return `$${values.length}`;
+};
+
+var __defProp$n = Object.defineProperty;
+var __defProps$i = Object.defineProperties;
+var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$o = Object.getOwnPropertySymbols;
+var __hasOwnProp$o = Object.prototype.hasOwnProperty;
+var __propIsEnum$o = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$n = (obj, key, value) => key in obj ? __defProp$n(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$n = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$o.call(b, prop))
+      __defNormalProp$n(a, prop, b[prop]);
+  if (__getOwnPropSymbols$o)
+    for (var prop of __getOwnPropSymbols$o(b)) {
+      if (__propIsEnum$o.call(b, prop))
+        __defNormalProp$n(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
+const createOperator = (fn) => {
+  return Object.assign(fn, { type: void 0 });
+};
+const quoteValue = (arg, values, jsonArray) => {
+  if (arg && typeof arg === "object") {
+    if (!jsonArray && Array.isArray(arg)) {
+      return `(${arg.map((value) => addValue(values, value)).join(", ")})`;
+    }
+    if ("toSql" in arg) {
+      const sql = arg.toSql({ values });
+      return `(${sql.text})`;
+    }
+    if (isRaw(arg)) {
+      return getRaw(arg, values);
+    }
+  }
+  return addValue(values, arg);
+};
+const all = {
+  equals: () => createOperator(
+    (key, value, values) => value === null ? `${key} IS NULL` : `${key} = ${quoteValue(value, values)}`
+  ),
+  not: () => createOperator(
+    (key, value, values) => value === null ? `${key} IS NOT NULL` : `${key} <> ${quoteValue(value, values)}`
+  ),
+  in: () => createOperator(
+    (key, value, values) => `${key} IN ${quoteValue(value, values)}`
+  ),
+  notIn: () => createOperator(
+    (key, value, values) => `NOT ${key} IN ${quoteValue(value, values)}`
+  ),
+  lt: () => createOperator(
+    (key, value, values) => `${key} < ${quoteValue(value, values)}`
+  ),
+  lte: () => createOperator(
+    (key, value, values) => `${key} <= ${quoteValue(value, values)}`
+  ),
+  gt: () => createOperator(
+    (key, value, values) => `${key} > ${quoteValue(value, values)}`
+  ),
+  gte: () => createOperator(
+    (key, value, values) => `${key} >= ${quoteValue(value, values)}`
+  ),
+  contains: () => createOperator(
+    (key, value, values) => `${key} ILIKE '%' || ${quoteValue(value, values)} || '%'`
+  ),
+  containsSensitive: () => createOperator(
+    (key, value, values) => `${key} LIKE '%' || ${quoteValue(value, values)} || '%'`
+  ),
+  startsWith: () => createOperator(
+    (key, value, values) => `${key} ILIKE ${quoteValue(value, values)} || '%'`
+  ),
+  startsWithSensitive: () => createOperator(
+    (key, value, values) => `${key} LIKE ${quoteValue(value, values)} || '%'`
+  ),
+  endsWith: () => createOperator(
+    (key, value, values) => `${key} ILIKE '%' || ${quoteValue(value, values)}`
+  ),
+  endsWithSensitive: () => createOperator(
+    (key, value, values) => `${key} LIKE '%' || ${quoteValue(value, values)}`
+  ),
+  between: () => createOperator(
+    (key, [from, to], values) => `${key} BETWEEN ${quoteValue(from, values)} AND ${quoteValue(
+      to,
+      values
+    )}`
+  ),
+  jsonPath: () => createOperator(
+    (key, [path, op, value], values) => `jsonb_path_query_first(${key}, ${quote(
+      path
+    )}) #>> '{}' ${op} ${quoteValue(value, values, true)}`
+  ),
+  jsonSupersetOf: () => createOperator(
+    (key, value, values) => `${key} @> ${quoteValue(value, values, true)}`
+  ),
+  jsonSubsetOf: () => createOperator(
+    (key, value, values) => `${key} <@ ${quoteValue(value, values, true)}`
+  )
+};
+const base = () => ({
+  equals: all.equals(),
+  not: all.not(),
+  in: all.in(),
+  notIn: all.notIn()
+});
+const numeric = () => __spreadProps$i(__spreadValues$n({}, base()), {
+  lt: all.lt(),
+  lte: all.lte(),
+  gt: all.gt(),
+  gte: all.gte(),
+  between: all.between()
+});
+const text$1 = () => __spreadProps$i(__spreadValues$n({}, base()), {
+  contains: all.contains(),
+  containsSensitive: all.containsSensitive(),
+  startsWith: all.startsWith(),
+  startsWithSensitive: all.startsWithSensitive(),
+  endsWith: all.endsWith(),
+  endsWithSensitive: all.endsWithSensitive()
+});
+const json = () => __spreadProps$i(__spreadValues$n({}, base()), {
+  jsonPath: all.jsonPath(),
+  jsonSupersetOf: all.jsonSupersetOf(),
+  jsonSubsetOf: all.jsonSubsetOf()
+});
+const Operators = {
+  any: base(),
+  boolean: base(),
+  number: numeric(),
+  date: numeric(),
+  time: numeric(),
+  text: text$1(),
+  json: json(),
+  array: base()
+};
+
 const cloneInstance = (instance) => {
   return Object.assign(
     Object.create(Object.getPrototypeOf(instance)),
@@ -5503,13 +5528,13 @@ class RawMethods {
     if (typeof args[0] === "string") {
       return {
         __raw: args[0],
-        __values: args.slice(1)
+        __values: args[1]
       };
     } else {
       return {
         __column: args[0](this.columnTypes),
         __raw: args[1],
-        __values: args.slice(2)
+        __values: args[2]
       };
     }
   }