pqb 0.40.5 → 0.40.7

package/dist/index.mjs

@@ -809,7 +809,7 @@ const columnCode = (type, ctx, key, code, data = type.data, skip) => {
     addCode(code, ".nullable()");
   if (type.encodeFn && type.encodeFn !== (skip == null ? void 0 : skip.encodeFn))
     addCode(code, `.encode(${type.encodeFn.toString()})`);
-  if (type.parseFn && !("hideFromCode" in type.parseFn))
+  if (type.parseFn && type.parseFn !== (skip == null ? void 0 : skip.parseFn) && !("hideFromCode" in type.parseFn))
     addCode(code, `.parse(${type.parseFn.toString()})`);
   if (data.as)
     addCode(code, `.as(${data.as.toCode(ctx, key)})`);
@@ -1262,7 +1262,7 @@ class CircleColumn extends ColumnType {
 }
 class MoneyColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema());
+    super(schema, schema.number());
     this.dataType = "money";
     this.operators = Operators.number;
     this.parseFn = Object.assign(
@@ -1472,6 +1472,7 @@ class CitextColumn extends TextBaseColumn {
   constructor(schema) {
     super(schema, schema.stringSchema());
     this.dataType = "citext";
+    this.data.extension = "citext";
   }
   toCode(ctx, key) {
     return textColumnToCode(this, ctx, key);
@@ -3177,7 +3178,8 @@ const defaultSchemaConfig = {
   citext: () => new CitextColumn(defaultSchemaConfig),
   date: () => new DateColumn(defaultSchemaConfig),
   timestampNoTZ: (precision) => new TimestampColumn(defaultSchemaConfig, precision),
-  timestamp: (precision) => new TimestampTZColumn(defaultSchemaConfig, precision)
+  timestamp: (precision) => new TimestampTZColumn(defaultSchemaConfig, precision),
+  geographyPointSchema: noop
 };
 
 const escape = (value, migration, nested) => {
@@ -3191,7 +3193,7 @@ const escape = (value, migration, nested) => {
   else if (value instanceof Date)
     return `'${value.toISOString()}'`;
   else if (Array.isArray(value))
-    return migration && nested && !value.length ? "" : (migration ? "{" : nested ? "[" : "ARRAY[") + value.map((el) => escape(el, migration, true)).join(",") + (migration ? "}" : "]");
+    return migration && nested && !value.length ? "" : (migration ? nested ? "{" : "'{" : nested ? "[" : "ARRAY[") + value.map((el) => escape(el, migration, true)).join(",") + (migration ? nested ? "}" : "}'" : "]");
   else if (value === null || value === void 0)
     return "NULL";
   else
@@ -6142,7 +6144,7 @@ const joinSubQuery = (q, sub) => {
 };
 
 class CustomTypeColumn extends ColumnType {
-  constructor(schema, dataType) {
+  constructor(schema, dataType, extension) {
     super(
       schema,
       schema.unknown(),
@@ -6152,6 +6154,7 @@ class CustomTypeColumn extends ColumnType {
     this.dataType = dataType;
     this.operators = Operators.any;
     this.data.isOfCustomType = true;
+    this.data.extension = extension;
   }
   toCode(ctx, key) {
     return columnCode(this, ctx, key, `type(${singleQuote(this.dataType)})`);
@@ -6174,6 +6177,108 @@ class DomainColumn extends CustomTypeColumn {
   }
 }
 
+const defaultSrid = 4326;
+class PostgisGeographyPointColumn extends ColumnType {
+  constructor(schema) {
+    super(schema, schema.geographyPointSchema());
+    this.dataType = "geography(Point)";
+    this.operators = Operators.any;
+  }
+  static isDefaultPoint(typmod) {
+    return typmodType(typmod) === "Point" && typmodSrid(typmod) === defaultSrid;
+  }
+  parseFn(input) {
+    if (!input)
+      return null;
+    const bytes = new Uint8Array(20);
+    for (let i = 0; i < 40; i += 2) {
+      bytes[i / 2] = parseInt(input.slice(10 + i, 12 + i), 16);
+    }
+    const view = new DataView(bytes.buffer);
+    const srid = view.getUint32(0, true);
+    const lon = view.getFloat64(4, true);
+    const lat = view.getFloat64(12, true);
+    return srid === defaultSrid ? { lon, lat } : {
+      lon,
+      lat,
+      srid
+    };
+  }
+  encodeFn({ srid = defaultSrid, lon, lat }) {
+    const arr = new Uint8Array(25);
+    const view = new DataView(arr.buffer);
+    view.setInt8(0, 1);
+    view.setInt8(1, 1);
+    view.setInt8(4, 32);
+    view.setUint32(5, srid, true);
+    view.setFloat64(9, lon, true);
+    view.setFloat64(17, lat, true);
+    return uint8ArrToHex(arr);
+  }
+  toCode(ctx, key) {
+    return columnCode(this, ctx, key, `geography.point()`, this.data, {
+      encodeFn: PostgisGeographyPointColumn.prototype.encodeFn,
+      parseFn: PostgisGeographyPointColumn.prototype.parseFn
+    });
+  }
+}
+const typmodGetType = (typmod) => (typmod & 252) >> 2;
+const lwtypeName = (type) => [
+  "Unknown",
+  "Point",
+  "LineString",
+  "Polygon",
+  "MultiPoint",
+  "MultiLineString",
+  "MultiPolygon",
+  "GeometryCollection",
+  "CircularString",
+  "CompoundCurve",
+  "CurvePolygon",
+  "MultiCurve",
+  "MultiSurface",
+  "PolyhedralSurface",
+  "Triangle",
+  "Tin"
+][type] || "Invalid type";
+const typmodGetZ = (typmod) => (typmod & 2) >> 1;
+const typmodGetM = (typmod) => typmod & 1;
+const typmodType = (typmod) => {
+  const type = typmodGetType(typmod);
+  let s = "";
+  if (typmod < 0 || type === 0) {
+    s += "Geometry";
+  } else {
+    s += lwtypeName(type);
+  }
+  if (typmod >= 0 && typmodGetZ(typmod))
+    s += "Z";
+  if (typmod >= 0 && typmodGetM(typmod))
+    s += "M";
+  return s;
+};
+const typmodSrid = (typmod) => {
+  return typmod < 0 ? 0 : (typmod & 268435200) - (typmod & 268435456) >> 8;
+};
+const postgisTypmodToSql = (typmod) => {
+  const srid = typmodSrid(typmod);
+  return typmodType(typmod) + (srid === defaultSrid ? "" : ", " + srid);
+};
+let byteToHex;
+function uint8ArrToHex(arr) {
+  if (!byteToHex) {
+    byteToHex = [];
+    for (let n = 0; n <= 255; ++n) {
+      const hexOctet = n.toString(16).padStart(2, "0");
+      byteToHex.push(hexOctet);
+    }
+  }
+  const hexOctets = [];
+  for (let i = 0; i < arr.length; ++i)
+    hexOctets.push(byteToHex[arr[i]]);
+  return hexOctets.join("");
+}
+
 var __defProp$8 = Object.defineProperty;
 var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
 var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
@@ -6302,6 +6407,11 @@ const makeColumnTypes = (schema) => {
     },
     domain(dataType) {
       return new DomainColumn(schema, dataType);
+    },
+    geography: {
+      point() {
+        return new PostgisGeographyPointColumn(schema);
+      }
     }
   }, makeTimestampsHelpers(makeRegexToFindInSql));
 };
@@ -6383,7 +6493,8 @@ const makeColumnsByType = (schema) => {
     serial: t.serial,
     bigserial: t.bigSerial,
     // requires citext extension
-    citext: t.citext
+    citext: t.citext,
+    geographyDefaultPoint: t.geography.point
   };
 };
 
@@ -12992,5 +13103,5 @@ function copyTableData(query, arg) {
   return q;
 }
 
-export { Adapter, AfterCommitError, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, QueryBase, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _afterCommitError, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql$1 as rollbackSql, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
+export { Adapter, AfterCommitError, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryBase, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _afterCommitError, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql$1 as rollbackSql, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
 //# sourceMappingURL=index.mjs.map