pqb 0.9.0 → 0.9.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # pqb
 
+## 0.9.2
+
+### Patch Changes
+
+- Improve pulling db structure
+
+## 0.9.1
+
+### Patch Changes
+
+- Add command for pulling database structure into a migration
+
 ## 0.9.0
 
 ### Minor Changes

package/dist/index.esm.js

@@ -1,169 +1,5 @@
 import { types, Pool, DatabaseError } from 'pg';
 
-var __defProp$r = Object.defineProperty;
-var __defProps$k = Object.defineProperties;
-var __getOwnPropDescs$k = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
-var __hasOwnProp$s = Object.prototype.hasOwnProperty;
-var __propIsEnum$s = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$r = (obj, key, value) => key in obj ? __defProp$r(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$r = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$s.call(b, prop))
-      __defNormalProp$r(a, prop, b[prop]);
-  if (__getOwnPropSymbols$s)
-    for (var prop of __getOwnPropSymbols$s(b)) {
-      if (__propIsEnum$s.call(b, prop))
-        __defNormalProp$r(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$k = (a, b) => __defProps$k(a, __getOwnPropDescs$k(b));
-const addColumnData = (q, key, value) => {
-  const cloned = Object.create(q);
-  cloned.data = __spreadProps$k(__spreadValues$r({}, q.data), { [key]: value });
-  return cloned;
-};
-const pushColumnData = (q, key, value) => {
-  const arr = q.data[key];
-  return addColumnData(
-    q,
-    key,
-    arr ? [...arr, value] : [value]
-  );
-};
-const instantiateColumn = (klass, params) => {
-  const column = new klass();
-  Object.assign(column.data, params);
-  return column;
-};
-class ColumnType {
-  constructor() {
-    this.data = {};
-    this.isPrimaryKey = false;
-    this.isHidden = false;
-    this.hasDefault = false;
-    this.chain = [];
-  }
-  primaryKey() {
-    const cloned = Object.create(this);
-    return Object.assign(cloned, { isPrimaryKey: true });
-  }
-  foreignKey(fnOrTable, column, options = {}) {
-    const item = typeof fnOrTable === "string" ? __spreadValues$r({ table: fnOrTable, columns: [column] }, options) : __spreadValues$r({ fn: fnOrTable, columns: [column] }, options);
-    return pushColumnData(this, "foreignKeys", item);
-  }
-  hidden() {
-    return Object.assign(Object.create(this), { isHidden: true });
-  }
-  nullable() {
-    return addColumnData(
-      this,
-      "isNullable",
-      true
-    );
-  }
-  encode(fn) {
-    return Object.assign(Object.create(this), {
-      encodeFn: fn
-    });
-  }
-  parse(fn) {
-    return Object.assign(Object.create(this), {
-      parseFn: fn,
-      parseItem: fn
-    });
-  }
-  as(column) {
-    return addColumnData(this, "as", column);
-  }
-  toSQL() {
-    return this.dataType;
-  }
-  default(value) {
-    return addColumnData(this, "default", value);
-  }
-  index(options = {}) {
-    return pushColumnData(this, "indexes", options);
-  }
-  unique(options = {}) {
-    return pushColumnData(this, "indexes", __spreadProps$k(__spreadValues$r({}, options), { unique: true }));
-  }
-  comment(comment) {
-    return addColumnData(this, "comment", comment);
-  }
-  validationDefault(value) {
-    return addColumnData(this, "validationDefault", value);
-  }
-  compression(compression) {
-    return addColumnData(this, "compression", compression);
-  }
-  collate(collate) {
-    return addColumnData(this, "collate", collate);
-  }
-  modifyQuery(cb) {
-    return addColumnData(this, "modifyQuery", cb);
-  }
-  transform(fn) {
-    const cloned = Object.create(this);
-    cloned.chain = [...this.chain, ["transform", fn]];
-    return cloned;
-  }
-  to(fn, type) {
-    const cloned = Object.create(this);
-    cloned.chain = [...this.chain, ["to", fn, type], ...cloned.chain];
-    return cloned;
-  }
-  refine(check) {
-    const cloned = Object.create(this);
-    cloned.chain = [...this.chain, ["refine", check]];
-    return cloned;
-  }
-  superRefine(check) {
-    const cloned = Object.create(this);
-    cloned.chain = [...this.chain, ["superRefine", check]];
-    return cloned;
-  }
-}
-
-const singleQuoteRegex = /'/g;
-const doubleQuoteRegex = /"/g;
-const quoteValue$1 = (value) => {
-  const type = typeof value;
-  if (type === "number")
-    return String(value);
-  else if (type === "string")
-    return `"${value.replace(doubleQuoteRegex, '\\"').replace(singleQuoteRegex, "''")}"`;
-  else if (type === "boolean")
-    return value ? "true" : "false";
-  else if (value instanceof Date)
-    return `"${value.toISOString()}"`;
-  else if (Array.isArray(value))
-    return quoteArray(value);
-  else if (type === null || type === void 0)
-    return "NULL";
-  else
-    return `"${JSON.stringify(value).replace(doubleQuoteRegex, '\\"').replace(singleQuoteRegex, "''")}"`;
-};
-const quoteArray = (array) => `'{${array.map(quoteValue$1).join(",")}}'`;
-const quote = (value) => {
-  const type = typeof value;
-  if (type === "number")
-    return `${value}`;
-  else if (type === "string")
-    return `'${value.replace(singleQuoteRegex, "''")}'`;
-  else if (type === "boolean")
-    return value ? "true" : "false";
-  else if (value instanceof Date)
-    return `'${value.toISOString()}'`;
-  else if (Array.isArray(value))
-    return quoteArray(value);
-  else if (value === null || value === void 0)
-    return "NULL";
-  else
-    return `'${JSON.stringify(value).replace(singleQuoteRegex, "''")}'`;
-};
-
 const defaultsKey = Symbol("defaults");
 const queryTypeWithLimitOne = {
   one: true,
@@ -171,6 +7,29 @@ const queryTypeWithLimitOne = {
 };
 const isQueryReturnsAll = (q) => !q.query.returnType || q.query.returnType === "all";
 
+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}`;
+};
+
 const pushDistinctSql = (ctx, distinct, quotedAs) => {
   ctx.sql.push("DISTINCT");
   if (distinct.length) {
@@ -523,29 +382,29 @@ const pushIn = (ands, prefix, quotedAs, values, arg) => {
   );
 };
 
-var __defProp$q = Object.defineProperty;
-var __defProps$j = Object.defineProperties;
-var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
-var __hasOwnProp$r = Object.prototype.hasOwnProperty;
-var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$q = (obj, key, value) => key in obj ? __defProp$q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$q = (a, b) => {
+var __defProp$r = Object.defineProperty;
+var __defProps$k = Object.defineProperties;
+var __getOwnPropDescs$k = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
+var __hasOwnProp$s = Object.prototype.hasOwnProperty;
+var __propIsEnum$s = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$r = (obj, key, value) => key in obj ? __defProp$r(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$r = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$r.call(b, prop))
-      __defNormalProp$q(a, prop, b[prop]);
-  if (__getOwnPropSymbols$r)
-    for (var prop of __getOwnPropSymbols$r(b)) {
-      if (__propIsEnum$r.call(b, prop))
-        __defNormalProp$q(a, prop, b[prop]);
+    if (__hasOwnProp$s.call(b, prop))
+      __defNormalProp$r(a, prop, b[prop]);
+  if (__getOwnPropSymbols$s)
+    for (var prop of __getOwnPropSymbols$s(b)) {
+      if (__propIsEnum$s.call(b, prop))
+        __defNormalProp$r(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
+var __spreadProps$k = (a, b) => __defProps$k(a, __getOwnPropDescs$k(b));
 const aggregateToSql = (ctx, table, item, quotedAs) => {
   var _a;
   const sql = [`${item.function}(`];
-  ctx = __spreadProps$j(__spreadValues$q({}, ctx), { sql });
+  ctx = __spreadProps$k(__spreadValues$r({}, ctx), { sql });
   const options = item.options || EMPTY_OBJECT;
   if (options.distinct && !options.withinGroup)
     sql.push("DISTINCT ");
@@ -642,6 +501,44 @@ class UnhandledTypeError extends PormInternalError {
   }
 }
 
+const singleQuoteRegex = /'/g;
+const doubleQuoteRegex = /"/g;
+const quoteValue$1 = (value) => {
+  const type = typeof value;
+  if (type === "number")
+    return String(value);
+  else if (type === "string")
+    return `"${value.replace(doubleQuoteRegex, '\\"').replace(singleQuoteRegex, "''")}"`;
+  else if (type === "boolean")
+    return value ? "true" : "false";
+  else if (value instanceof Date)
+    return `"${value.toISOString()}"`;
+  else if (Array.isArray(value))
+    return quoteArray(value);
+  else if (type === null || type === void 0)
+    return "NULL";
+  else
+    return `"${JSON.stringify(value).replace(doubleQuoteRegex, '\\"').replace(singleQuoteRegex, "''")}"`;
+};
+const quoteArray = (array) => `'{${array.map(quoteValue$1).join(",")}}'`;
+const quote = (value) => {
+  const type = typeof value;
+  if (type === "number")
+    return `${value}`;
+  else if (type === "string")
+    return `'${value.replace(singleQuoteRegex, "''")}'`;
+  else if (type === "boolean")
+    return value ? "true" : "false";
+  else if (value instanceof Date)
+    return `'${value.toISOString()}'`;
+  else if (Array.isArray(value))
+    return quoteArray(value);
+  else if (value === null || value === void 0)
+    return "NULL";
+  else
+    return `'${JSON.stringify(value).replace(singleQuoteRegex, "''")}'`;
+};
+
 const relationQueryKey = Symbol("relationQuery");
 const isRequiredRelationKey = Symbol("isRequiredRelation");
 
@@ -1363,19 +1260,19 @@ const cloneQueryArrays = (q) => {
   }
 };
 
-var __defProp$p = Object.defineProperty;
-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) => {
+var __defProp$q = Object.defineProperty;
+var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
+var __hasOwnProp$r = Object.prototype.hasOwnProperty;
+var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$q = (obj, key, value) => key in obj ? __defProp$q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$q = (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]);
+    if (__hasOwnProp$r.call(b, prop))
+      __defNormalProp$q(a, prop, b[prop]);
+  if (__getOwnPropSymbols$r)
+    for (var prop of __getOwnPropSymbols$r(b)) {
+      if (__propIsEnum$r.call(b, prop))
+        __defNormalProp$q(a, prop, b[prop]);
     }
   return a;
 };
@@ -1394,7 +1291,7 @@ const joinTruthy = (...strings) => {
   return strings.filter((string) => string).join("");
 };
 const getClonedQueryData = (query) => {
-  const cloned = __spreadValues$p({}, query);
+  const cloned = __spreadValues$q({}, query);
   delete cloned[toSqlCacheKey];
   cloneQueryArrays(cloned);
   return cloned;
@@ -1475,28 +1372,137 @@ 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);
-  }
+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;
 };
-const expressionToSql = (expr, values, quotedAs) => {
-  return typeof expr === "object" && isRaw(expr) ? getRaw(expr, values) : quoteFullColumn(expr, quotedAs);
+var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
+const addColumnData = (q, key, value) => {
+  const cloned = Object.create(q);
+  cloned.data = __spreadProps$j(__spreadValues$p({}, q.data), { [key]: value });
+  return cloned;
 };
-const quoteSchemaAndTable = (schema, table) => {
-  return schema ? `${q(schema)}.${q(table)}` : q(table);
+const pushColumnData = (q, key, value) => {
+  const arr = q.data[key];
+  return addColumnData(
+    q,
+    key,
+    arr ? [...arr, value] : [value]
+  );
 };
-const addValue = (values, value) => {
-  values.push(value);
-  return `$${values.length}`;
+const instantiateColumn = (klass, params) => {
+  const column = new klass();
+  let data;
+  if (params.default !== null && params.default !== void 0) {
+    data = __spreadProps$j(__spreadValues$p({}, params), { default: raw(params.default) });
+  } else {
+    data = params;
+  }
+  Object.assign(column.data, data);
+  return column;
 };
+class ColumnType {
+  constructor() {
+    this.data = {};
+    this.isPrimaryKey = false;
+    this.isHidden = false;
+    this.hasDefault = false;
+    this.chain = [];
+  }
+  primaryKey() {
+    const cloned = Object.create(this);
+    return Object.assign(cloned, { isPrimaryKey: true });
+  }
+  foreignKey(fnOrTable, column, options = {}) {
+    const item = typeof fnOrTable === "string" ? __spreadValues$p({ table: fnOrTable, columns: [column] }, options) : __spreadValues$p({ fn: fnOrTable, columns: [column] }, options);
+    return pushColumnData(this, "foreignKeys", item);
+  }
+  hidden() {
+    return Object.assign(Object.create(this), { isHidden: true });
+  }
+  nullable() {
+    return addColumnData(
+      this,
+      "isNullable",
+      true
+    );
+  }
+  encode(fn) {
+    return Object.assign(Object.create(this), {
+      encodeFn: fn
+    });
+  }
+  parse(fn) {
+    return Object.assign(Object.create(this), {
+      parseFn: fn,
+      parseItem: fn
+    });
+  }
+  as(column) {
+    return addColumnData(this, "as", column);
+  }
+  toSQL() {
+    return this.dataType;
+  }
+  default(value) {
+    return addColumnData(this, "default", value);
+  }
+  index(options = {}) {
+    return pushColumnData(this, "indexes", options);
+  }
+  unique(options = {}) {
+    return pushColumnData(this, "indexes", __spreadProps$j(__spreadValues$p({}, options), { unique: true }));
+  }
+  comment(comment) {
+    return addColumnData(this, "comment", comment);
+  }
+  validationDefault(value) {
+    return addColumnData(this, "validationDefault", value);
+  }
+  compression(compression) {
+    return addColumnData(this, "compression", compression);
+  }
+  collate(collate) {
+    return addColumnData(this, "collate", collate);
+  }
+  modifyQuery(cb) {
+    return addColumnData(this, "modifyQuery", cb);
+  }
+  transform(fn) {
+    const cloned = Object.create(this);
+    cloned.chain = [...this.chain, ["transform", fn]];
+    return cloned;
+  }
+  to(fn, type) {
+    const cloned = Object.create(this);
+    cloned.chain = [...this.chain, ["to", fn, type], ...cloned.chain];
+    return cloned;
+  }
+  refine(check) {
+    const cloned = Object.create(this);
+    cloned.chain = [...this.chain, ["refine", check]];
+    return cloned;
+  }
+  superRefine(check) {
+    const cloned = Object.create(this);
+    cloned.chain = [...this.chain, ["superRefine", check]];
+    return cloned;
+  }
+}
 
 var __defProp$o = Object.defineProperty;
 var __defProps$i = Object.defineProperties;
@@ -1848,18 +1854,21 @@ class DateTimeWithTimeZoneBaseClass extends DateTimeBaseClass {
     );
   }
 }
+const timestampToCode = (self, t) => {
+  const { dateTimePrecision: p } = self.data;
+  return columnCode(
+    self,
+    t,
+    `${t}.${self instanceof TimestampColumn ? "timestamp" : "timestampWithTimeZone"}(${p && p !== 6 ? p : ""})${dateDataToCode(self.data)}`
+  );
+};
 class TimestampColumn extends DateTimeBaseClass {
   constructor() {
     super(...arguments);
     this.dataType = "timestamp";
   }
   toCode(t) {
-    const { dateTimePrecision } = this.data;
-    return columnCode(
-      this,
-      t,
-      `${t}.timestamp(${dateTimePrecision || ""})${dateDataToCode(this.data)}`
-    );
+    return timestampToCode(this, t);
   }
 }
 class TimestampWithTimeZoneColumn extends DateTimeWithTimeZoneBaseClass {
@@ -1869,14 +1878,7 @@ class TimestampWithTimeZoneColumn extends DateTimeWithTimeZoneBaseClass {
     this.baseDataType = "timestamp";
   }
   toCode(t) {
-    const { dateTimePrecision } = this.data;
-    return columnCode(
-      this,
-      t,
-      `${t}.timestampWithTimeZone(${dateTimePrecision || ""})${dateDataToCode(
-        this.data
-      )}`
-    );
+    return timestampToCode(this, t);
   }
 }
 class TimeColumn extends DateTimeBaseClass {
@@ -2067,6 +2069,8 @@ const indexToCode = (index, t) => {
     const options = [];
     for (const key of optionsKeys) {
       const value = index.options[key];
+      if (value === null || value === void 0)
+        continue;
       options.push(
         `${key}: ${typeof value === "object" ? singleQuoteArray(value) : typeof value === "string" ? singleQuote(value) : value},`
       );
@@ -2178,8 +2182,6 @@ const columnIndexesToCode = (indexes) => {
         arr.push(`order: ${singleQuote(index.order)},`);
       if (index.name)
         arr.push(`name: ${singleQuote(index.name)},`);
-      if (index.unique)
-        arr.push(`unique: true,`);
       if (index.using)
         arr.push(`using: ${singleQuote(index.using)},`);
       if (index.include)
@@ -4101,7 +4103,10 @@ const columnsByType = {
   uuid: UUIDColumn,
   tsvector: TsVectorColumn,
   tsquery: TsQueryColumn,
-  jsonb: JSONColumn
+  jsonb: JSONColumn,
+  smallserial: SmallSerialColumn,
+  serial: SerialColumn,
+  bigserial: BigSerialColumn
 };
 
 var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;