pqb 0.4.6 → 0.4.8

package/dist/index.js

@@ -70,6 +70,9 @@ class ColumnType {
     this.parseItem = fn;
     return this;
   }
+  as(_) {
+    return this;
+  }
   toSQL() {
     return this.dataType;
   }
@@ -119,33 +122,6 @@ class ColumnType {
   }
 }
 
-const raw = (...args) => {
-  if (typeof args[0] === "string") {
-    return {
-      __raw: args[0],
-      __values: args.slice(1)
-    };
-  } else {
-    return {
-      __column: args[0],
-      __raw: args[1],
-      __values: args.slice(2)
-    };
-  }
-};
-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 singleQuoteRegex = /'/g;
 const doubleQuoteRegex = /"/g;
 const quoteValue$1 = (value) => {
@@ -184,6 +160,23 @@ 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) => {
@@ -1963,6 +1956,14 @@ class DateBaseColumn extends ColumnType {
     this.data = {};
     this.operators = Operators.date;
   }
+  asNumber() {
+    return this.encode((input) => new Date(input)).parse(
+      Date.parse
+    );
+  }
+  asDate() {
+    return this.parse((input) => new Date(input));
+  }
 }
 assignMethodsToClass(DateBaseColumn, dateTypeMethods);
 class DateColumn extends DateBaseColumn {
@@ -4188,8 +4189,9 @@ const handleSelect = (q) => {
     q.query.select = ["*"];
   }
 };
-const processCreateItem = (item, rowIndex, ctx, columns, columnsMap) => {
+const processCreateItem = (item, rowIndex, ctx, columns, encoders, columnsMap, shape) => {
   Object.keys(item).forEach((key) => {
+    var _a;
     if (ctx.relations[key]) {
       if (ctx.relations[key].type === "belongsTo") {
         const foreignKey = ctx.relations[key].options.foreignKey;
@@ -4214,8 +4216,9 @@ const processCreateItem = (item, rowIndex, ctx, columns, columnsMap) => {
           item[key]
         ]);
       }
-    } else if (columnsMap[key] === void 0) {
+    } else if (columnsMap[key] === void 0 && (shape[key] || shape === anyShape)) {
       columnsMap[key] = columns.length;
+      encoders[key] = (_a = shape[key]) == null ? void 0 : _a.encodeFn;
       columns.push(key);
     }
   });
@@ -4242,30 +4245,37 @@ const getManyReturnType = (q) => {
     return "rowCount";
   }
 };
+const mapColumnValues = (columns, encoders, data) => {
+  return columns.map(
+    (key) => encoders[key] ? encoders[key](data[key]) : data[key]
+  );
+};
 const handleOneData = (q, data, ctx) => {
   const columns = [];
+  const encoders = {};
   const columnsMap = {};
   const defaults = q.query.defaults;
   if (defaults) {
     data = __spreadValues$4(__spreadValues$4({}, defaults), data);
   }
-  processCreateItem(data, 0, ctx, columns, columnsMap);
-  const values = [columns.map((key) => data[key])];
+  processCreateItem(data, 0, ctx, columns, encoders, columnsMap, q.shape);
+  const values = [mapColumnValues(columns, encoders, data)];
   return { columns, values };
 };
 const handleManyData = (q, data, ctx) => {
   const columns = [];
+  const encoders = {};
   const columnsMap = {};
   const defaults = q.query.defaults;
   if (defaults) {
     data = data.map((item) => __spreadValues$4(__spreadValues$4({}, defaults), item));
   }
   data.forEach((item, i) => {
-    processCreateItem(item, i, ctx, columns, columnsMap);
+    processCreateItem(item, i, ctx, columns, encoders, columnsMap, q.shape);
   });
   const values = Array(data.length);
   data.forEach((item, i) => {
-    values[i] = columns.map((key) => item[key]);
+    values[i] = mapColumnValues(columns, encoders, item);
   });
   return { columns, values };
 };
@@ -4766,7 +4776,7 @@ class Json {
   _json() {
     const q = this._wrap(this.__model.clone());
     q._getOptional(
-      raw(
+      this.raw(
         queryTypeWithLimitOne[this.query.returnType] ? `row_to_json("t".*)` : `COALESCE(json_agg(row_to_json("t".*)), '[]')`
       )
     );
@@ -5137,7 +5147,7 @@ class Update {
     const data = args[0];
     const set = __spreadValues$1({}, data);
     pushQueryValue(this, "updateData", set);
-    const relations = this.relations;
+    const { relations, shape } = this;
     const prependRelations = {};
     const appendRelations = {};
     const originalReturnType = query.returnType || "all";
@@ -5155,6 +5165,12 @@ class Update {
           }
           appendRelations[key] = data[key];
         }
+      } else if (!shape[key] && shape !== anyShape) {
+        delete set[key];
+      } else {
+        const encode = shape[key].encodeFn;
+        if (encode)
+          set[key] = encode(set[key]);
       }
     }
     const state = {};
@@ -5381,6 +5397,23 @@ class QueryUpsert {
   }
 }
 
+class RawMethods {
+  raw(...args) {
+    if (typeof args[0] === "string") {
+      return {
+        __raw: args[0],
+        __values: args.slice(1)
+      };
+    } else {
+      return {
+        __column: args[0](this.columnTypes),
+        __raw: args[1],
+        __values: args.slice(2)
+      };
+    }
+  }
+}
+
 class QueryMethods {
   all() {
     return this.clone()._all();
@@ -5500,7 +5533,7 @@ class QueryMethods {
   _wrap(query, as) {
     const sql = this.toSql();
     return query.as(as != null ? as : "t")._from(
-      raw(`(${sql.text})`, ...sql.values)
+      this.raw(`(${sql.text})`, ...sql.values)
     );
   }
   order(...args) {
@@ -5527,7 +5560,7 @@ class QueryMethods {
     return this.clone()._exists();
   }
   _exists() {
-    const q = this._getOptional(raw("true"));
+    const q = this._getOptional(this.raw("true"));
     q.query.notFoundDefault = false;
     q.query.coalesceValue = false;
     return q;
@@ -5570,7 +5603,8 @@ applyMixins(QueryMethods, [
   QueryCallbacks,
   QueryUpsert,
   QueryGet,
-  MergeQueryMethods
+  MergeQueryMethods,
+  RawMethods
 ]);
 
 var __defProp = Object.defineProperty;
@@ -5601,12 +5635,14 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
+const anyShape = {};
 class Db {
-  constructor(adapter, queryBuilder, table = void 0, shape = {}, options) {
+  constructor(adapter, queryBuilder, table = void 0, shape = anyShape, columnTypes, options) {
     this.adapter = adapter;
     this.queryBuilder = queryBuilder;
     this.table = table;
     this.shape = shape;
+    this.columnTypes = columnTypes;
     this.whereQueryBuilder = WhereQueryBuilder;
     this.onQueryBuilder = OnQueryBuilder;
     this.__model = this;
@@ -5681,6 +5717,7 @@ const createDb = (_a) => {
     void 0,
     void 0,
     {},
+    ct,
     commonOptions
   );
   qb.queryBuilder = qb;
@@ -5691,6 +5728,7 @@ const createDb = (_a) => {
         qb,
         table,
         typeof shape === "function" ? getColumnTypes(ct, shape) : shape,
+        ct,
         __spreadValues(__spreadValues({}, commonOptions), options2)
       );
     },
@@ -5770,6 +5808,7 @@ exports.QueryGet = QueryGet;
 exports.QueryLog = QueryLog;
 exports.QueryMethods = QueryMethods;
 exports.QueryUpsert = QueryUpsert;
+exports.RawMethods = RawMethods;
 exports.RealColumn = RealColumn;
 exports.Select = Select;
 exports.SerialColumn = SerialColumn;
@@ -5806,6 +5845,7 @@ exports.addWhere = addWhere;
 exports.addWhereIn = addWhereIn;
 exports.addWhereNot = addWhereNot;
 exports.aggregate1FunctionNames = aggregate1FunctionNames;
+exports.anyShape = anyShape;
 exports.applyMixins = applyMixins;
 exports.array = array;
 exports.arrayToEnum = arrayToEnum;