neoorm 0.7.4 → 0.8.0

package/dist/plugins/builtin.js

@@ -1,3 +1,4 @@
+import { parseDbJsonValue } from "../runtime/parse-db-json.js";
 import { createColumnBuilder, createTimestampColumnBuilder, } from "../schema/column.js";
 import { jsonWhereOperators } from "./json/operators.js";
 function scalarTsType(col, base) {
@@ -14,11 +15,11 @@ function formatJsonDefault(col, value, dialect) {
     }
     return `'${json}'::${cast}`;
 }
-function parseJsonValue(dbValue) {
-    if (typeof dbValue === "string") {
-        return JSON.parse(dbValue);
-    }
-    return dbValue;
+function parseJsonValue(dbValue, col) {
+    return parseDbJsonValue(dbValue, {
+        columnTsName: col.tsName,
+        columnSqlName: col.sqlName,
+    });
 }
 function decimalSqlType(col) {
     const precision = col.typeOptions?.precision;
@@ -190,9 +191,7 @@ const timestampType = {
             return value;
         if (value instanceof Date)
             return value;
-        return dialect?.name === "sqlite"
-            ? new Date(value)
-            : value;
+        return dialect?.name === "sqlite" ? new Date(value) : value;
     },
     deserializeValue(_col, dbValue) {
         if (dbValue === null || dbValue === undefined)
@@ -251,8 +250,8 @@ const jsonType = {
         return scalarTsType(col, "unknown");
     },
     formatDefault: formatJsonDefault,
-    deserializeValue(_col, dbValue) {
-        return parseJsonValue(dbValue);
+    deserializeValue(col, dbValue) {
+        return parseJsonValue(dbValue, col);
     },
     introspect(pgDataType) {
         return pgDataType === "json";
@@ -277,8 +276,8 @@ const jsonbType = {
         return scalarTsType(col, "unknown");
     },
     formatDefault: formatJsonDefault,
-    deserializeValue(_col, dbValue) {
-        return parseJsonValue(dbValue);
+    deserializeValue(col, dbValue) {
+        return parseJsonValue(dbValue, col);
     },
     introspect(pgDataType) {
         return pgDataType === "jsonb";
@@ -416,12 +415,12 @@ const textArrayType = {
             return JSON.stringify(value);
         return value;
     },
-    deserializeValue(_col, dbValue) {
+    deserializeValue(col, dbValue) {
         if (dbValue === null || dbValue === undefined)
             return dbValue;
         if (Array.isArray(dbValue))
             return dbValue;
-        return parseJsonValue(dbValue);
+        return parseJsonValue(dbValue, col);
     },
     introspect(pgDataType, udtName) {
         return pgDataType === "ARRAY" && udtName === "_text";
@@ -451,12 +450,12 @@ const intArrayType = {
             return JSON.stringify(value);
         return value;
     },
-    deserializeValue(_col, dbValue) {
+    deserializeValue(col, dbValue) {
         if (dbValue === null || dbValue === undefined)
             return dbValue;
         if (Array.isArray(dbValue))
             return dbValue;
-        return parseJsonValue(dbValue);
+        return parseJsonValue(dbValue, col);
     },
     introspect(pgDataType, udtName) {
         return pgDataType === "ARRAY" && udtName === "_int4";

package/dist/plugins/builtin.js.map

@@ -1 +1 @@
-{"version":3,"file":"builtin.js","sourceRoot":"","sources":["../../src/plugins/builtin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builtin.js","sourceRoot":"","sources":["../../src/plugins/builtin.ts"],"names":[],"mappings":"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"}

package/dist/plugins/json/operators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operators.d.ts","sourceRoot":"","sources":["../../../src/plugins/json/operators.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAqBvD,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CA6DlE,CAAC"}
+{"version":3,"file":"operators.d.ts","sourceRoot":"","sources":["../../../src/plugins/json/operators.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AA+KvD,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAMlE,CAAC"}

package/dist/plugins/json/operators.js

@@ -13,49 +13,52 @@ function escapeArrayElement(segment) {
     }
     return `"${segment.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
 }
-export const jsonWhereOperators = {
-    jsonContains: {
-        compile(sqlCol, value, col, startParamIndex) {
-            const cast = jsonbCol(sqlCol, col);
+function sqliteJsonPath(segments) {
+    let path = "$";
+    for (const segment of segments) {
+        if (/^\d+$/.test(segment)) {
+            path += `[${segment}]`;
+            continue;
+        }
+        if (/^[A-Za-z_][A-Za-z0-9_]*$/.test(segment)) {
+            path += `.${segment}`;
+            continue;
+        }
+        path += `."${segment.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+    }
+    return path;
+}
+function sqliteContainsSql(targetExpr, paramIndex) {
+    return `json(json_patch(${targetExpr}, $${paramIndex})) = json(${targetExpr})`;
+}
+function sqliteKeyMatchSql(columnExpr, paramRef) {
+    return `CASE json_type(${columnExpr}) WHEN 'object' THEN "_jk".key = ${paramRef} ELSE "_jk".value = ${paramRef} END`;
+}
+function compilePostgres(op, sqlCol, value, col, startParamIndex) {
+    const cast = jsonbCol(sqlCol, col);
+    switch (op) {
+        case "jsonContains":
             return {
                 sql: `${cast} @> $${startParamIndex}::jsonb`,
                 params: [jsonParam(value)],
             };
-        },
-    },
-    hasKey: {
-        compile(sqlCol, value, col, startParamIndex) {
-            const cast = jsonbCol(sqlCol, col);
+        case "hasKey":
             return {
                 sql: `${cast} ? $${startParamIndex}`,
                 params: [value],
             };
-        },
-    },
-    hasAnyKeys: {
-        compile(sqlCol, value, col, startParamIndex) {
-            const cast = jsonbCol(sqlCol, col);
+        case "hasAnyKeys":
             return {
                 sql: `${cast} ?| $${startParamIndex}`,
                 params: [value],
             };
-        },
-    },
-    hasAllKeys: {
-        compile(sqlCol, value, col, startParamIndex) {
-            const cast = jsonbCol(sqlCol, col);
+        case "hasAllKeys":
             return {
                 sql: `${cast} ?& $${startParamIndex}`,
                 params: [value],
             };
-        },
-    },
-    path: {
-        compile(sqlCol, value, col, startParamIndex) {
-            const cast = jsonbCol(sqlCol, col);
+        case "path": {
             const spec = value;
-            // The path is bound as a parameter (Postgres array-literal text) so
-            // attacker-controlled segments can never break out of the SQL.
             const pathLit = pgPath(spec.segments);
             const pathParam = `$${startParamIndex}`;
             if (spec.jsonContains !== undefined) {
@@ -68,7 +71,77 @@ export const jsonWhereOperators = {
                 sql: `${cast} #>> ${pathParam} = $${startParamIndex + 1}`,
                 params: [pathLit, spec.equals],
             };
+        }
+        default: {
+            const _exhaustive = op;
+            return _exhaustive;
+        }
+    }
+}
+function compileSqlite(op, sqlCol, value, startParamIndex) {
+    switch (op) {
+        case "jsonContains":
+            return {
+                sql: sqliteContainsSql(sqlCol, startParamIndex),
+                params: [jsonParam(value)],
+            };
+        case "hasKey": {
+            const keyMatch = sqliteKeyMatchSql(sqlCol, `$${startParamIndex}`);
+            return {
+                sql: `EXISTS (SELECT 1 FROM json_each(${sqlCol}) AS "_jk" WHERE ${keyMatch})`,
+                params: [value],
+            };
+        }
+        case "hasAnyKeys": {
+            const keyMatch = sqliteKeyMatchSql(sqlCol, `"_nk".value`);
+            return {
+                sql: `EXISTS (SELECT 1 FROM json_each(${sqlCol}) AS "_jk" JOIN json_each($${startParamIndex}) AS "_nk" ON ${keyMatch})`,
+                params: [value],
+            };
+        }
+        case "hasAllKeys": {
+            const keyMatch = sqliteKeyMatchSql(sqlCol, `"_nk".value`);
+            return {
+                sql: `NOT EXISTS (SELECT 1 FROM json_each($${startParamIndex}) AS "_nk" WHERE NOT EXISTS (SELECT 1 FROM json_each(${sqlCol}) AS "_jk" WHERE ${keyMatch}))`,
+                params: [value],
+            };
+        }
+        case "path": {
+            const spec = value;
+            const pathLit = sqliteJsonPath(spec.segments);
+            if (spec.jsonContains !== undefined) {
+                // SQLite binds each `?` once; extract in a subquery so `$path` is not repeated.
+                return {
+                    sql: `EXISTS (SELECT 1 FROM (SELECT json_extract(${sqlCol}, $${startParamIndex}) AS "_jv") AS "_jp" WHERE ${sqliteContainsSql(`"_jp"."_jv"`, startParamIndex + 1)})`,
+                    params: [pathLit, jsonParam(spec.jsonContains)],
+                };
+            }
+            return {
+                sql: `json_extract(${sqlCol}, $${startParamIndex}) = $${startParamIndex + 1}`,
+                params: [pathLit, spec.equals],
+            };
+        }
+        default: {
+            const _exhaustive = op;
+            return _exhaustive;
+        }
+    }
+}
+function jsonOperator(op) {
+    return {
+        compile(sqlCol, value, col, startParamIndex, dialect) {
+            if (dialect.name === "sqlite") {
+                return compileSqlite(op, sqlCol, value, startParamIndex);
+            }
+            return compilePostgres(op, sqlCol, value, col, startParamIndex);
         },
-    },
+    };
+}
+export const jsonWhereOperators = {
+    jsonContains: jsonOperator("jsonContains"),
+    hasKey: jsonOperator("hasKey"),
+    hasAnyKeys: jsonOperator("hasAnyKeys"),
+    hasAllKeys: jsonOperator("hasAllKeys"),
+    path: jsonOperator("path"),
 };
 //# sourceMappingURL=operators.js.map

package/dist/plugins/json/operators.js.map

@@ -1 +1 @@
-{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../../src/plugins/json/operators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../../src/plugins/json/operators.ts"],"names":[],"mappings":"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"}

package/dist/plugins/postgis/columns.d.ts

@@ -9,10 +9,23 @@ export type GeoJsonPolygon = {
     coordinates: number[][][];
 };
 export type GeoJsonGeometry = GeoJsonPoint | GeoJsonPolygon | Record<string, unknown>;
-export type GeometryOptions = {
-    subtype?: string;
-    srid?: number;
+declare const SPATIAL_BASE_TYPES: readonly ["Geometry", "Point", "LineString", "Polygon", "MultiPoint", "MultiLineString", "MultiPolygon", "GeometryCollection", "CircularString", "CompoundCurve", "CurvePolygon", "MultiCurve", "MultiSurface", "PolyhedralSurface", "Triangle", "TIN"];
+declare const SPATIAL_DIMENSIONS: readonly ["", "Z", "M", "ZM"];
+type SpatialBaseType = (typeof SPATIAL_BASE_TYPES)[number];
+type SpatialDimension = (typeof SPATIAL_DIMENSIONS)[number];
+/** Canonical PostGIS geometry type, including optional Z/M/ZM. */
+export type SpatialSubtype = `${SpatialBaseType}${SpatialDimension}`;
+export declare const SPATIAL_SUBTYPES: readonly SpatialSubtype[];
+type SpatialOptionsWithoutSrid = {
+    subtype?: SpatialSubtype;
+    srid?: never;
+};
+type SpatialOptionsWithSrid = {
+    subtype: SpatialSubtype;
+    srid: number;
 };
+/** PostGIS `geometry` options. `srid` requires a whitelisted `subtype`. */
+export type GeometryOptions = SpatialOptionsWithoutSrid | SpatialOptionsWithSrid;
 export type GeographyOptions = GeometryOptions;
 export type PointOptions = {
     srid?: number;
@@ -24,6 +37,7 @@ export declare const pointType: ColumnTypePlugin;
 export declare function geometry(options?: GeometryOptions): import("../../schema/column.js").ColumnBuilder<unknown, ColumnMeta>;
 /** PostGIS `geography` column. */
 export declare function geography(options?: GeographyOptions): import("../../schema/column.js").ColumnBuilder<unknown, ColumnMeta>;
-/** PostGIS `geometry(Point)` column with default SRID 4326. */
+/** PostGIS `geometry(Point,4326)` column with default SRID 4326. */
 export declare function point(options?: PointOptions): import("../../schema/column.js").ColumnBuilder<unknown, ColumnMeta>;
+export {};
 //# sourceMappingURL=columns.d.ts.map

package/dist/plugins/postgis/columns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"columns.d.ts","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAIpD,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACzD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC5B,IAAI,EAAE,SAAS,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,eAAe,GACxB,YAAY,GACZ,cAAc,GACd,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE3B,MAAM,MAAM,eAAe,GAAG;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,eAAe,CAAC;AAE/C,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAyFF,eAAO,MAAM,YAAY,kBAAkD,CAAC;AAC5E,eAAO,MAAM,aAAa,kBAAoD,CAAC;AAC/E,eAAO,MAAM,SAAS,kBAGpB,CAAC;AAEH,6EAA6E;AAC7E,wBAAgB,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,uEAIjD;AAED,kCAAkC;AAClC,wBAAgB,SAAS,CAAC,OAAO,CAAC,EAAE,gBAAgB,uEAInD;AAED,+DAA+D;AAC/D,wBAAgB,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,uEAI3C"}
+{"version":3,"file":"columns.d.ts","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAIpD,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACzD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC5B,IAAI,EAAE,SAAS,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,eAAe,GACxB,YAAY,GACZ,cAAc,GACd,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE3B,QAAA,MAAM,kBAAkB,YACvB,UAAU,EACV,OAAO,EACP,YAAY,EACZ,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,oBAAoB,EACpB,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,YAAY,EACZ,cAAc,EACd,mBAAmB,EACnB,UAAU,EACV,KAAK,CACI,CAAC;AAEX,QAAA,MAAM,kBAAkB,YAAI,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAU,CAAC;AAEzD,KAAK,eAAe,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAC3D,KAAK,gBAAgB,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5D,kEAAkE;AAClE,MAAM,MAAM,cAAc,GAAG,GAAG,eAAe,GAAG,gBAAgB,EAAE,CAAC;AAErE,eAAO,MAAM,gBAAgB,EAAE,SAAS,cAAc,EAGpD,CAAC;AAMH,KAAK,yBAAyB,GAAG;IAChC,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,IAAI,CAAC,EAAE,KAAK,CAAC;CACb,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC7B,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,2EAA2E;AAC3E,MAAM,MAAM,eAAe,GACxB,yBAAyB,GACzB,sBAAsB,CAAC;AAE1B,MAAM,MAAM,gBAAgB,GAAG,eAAe,CAAC;AAE/C,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAmJF,eAAO,MAAM,YAAY,kBAAkD,CAAC;AAC5E,eAAO,MAAM,aAAa,kBAAoD,CAAC;AAC/E,eAAO,MAAM,SAAS,kBAGpB,CAAC;AAEH,6EAA6E;AAC7E,wBAAgB,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,uEAIjD;AAED,kCAAkC;AAClC,wBAAgB,SAAS,CAAC,OAAO,CAAC,EAAE,gBAAgB,uEAInD;AAED,oEAAoE;AACpE,wBAAgB,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,uEAI3C"}

package/dist/plugins/postgis/columns.js

@@ -1,18 +1,73 @@
+import { schemaError } from "../../runtime/error-builders.js";
+import { SchemaErrorCode } from "../../runtime/error-codes.js";
 import { createColumnBuilder } from "../../schema/column.js";
 import { geoJsonFromValue, geoJsonToParam } from "./geojson.js";
 import { postgisWhereOperators } from "./operators.js";
+const SPATIAL_BASE_TYPES = [
+    "Geometry",
+    "Point",
+    "LineString",
+    "Polygon",
+    "MultiPoint",
+    "MultiLineString",
+    "MultiPolygon",
+    "GeometryCollection",
+    "CircularString",
+    "CompoundCurve",
+    "CurvePolygon",
+    "MultiCurve",
+    "MultiSurface",
+    "PolyhedralSurface",
+    "Triangle",
+    "TIN",
+];
+const SPATIAL_DIMENSIONS = ["", "Z", "M", "ZM"];
+export const SPATIAL_SUBTYPES = SPATIAL_BASE_TYPES.flatMap((base) => SPATIAL_DIMENSIONS.map((dim) => `${base}${dim}`));
+const SPATIAL_SUBTYPE_BY_LOWER = new Map(SPATIAL_SUBTYPES.map((subtype) => [subtype.toLowerCase(), subtype]));
+function resolveSpatialSubtype(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (typeof value !== "string" || value.length === 0) {
+        throw schemaError(SchemaErrorCode.invalid_column, `PostGIS subtype must be a geometry type such as Point or Geometry, received ${JSON.stringify(value)}`);
+    }
+    const canonical = SPATIAL_SUBTYPE_BY_LOWER.get(value.toLowerCase());
+    if (canonical === undefined) {
+        throw schemaError(SchemaErrorCode.invalid_column, `Invalid PostGIS subtype "${value}". Use a type such as Point, LineString, Polygon, MultiPolygon, or Geometry, optionally with Z, M, or ZM (e.g. PointZ).`);
+    }
+    return canonical;
+}
+function resolveSpatialSrid(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (typeof value !== "number" || !Number.isInteger(value)) {
+        throw schemaError(SchemaErrorCode.invalid_column, `PostGIS srid must be an integer, received ${JSON.stringify(value)}`);
+    }
+    return value;
+}
+function resolveSpatialOptions(base, options) {
+    const subtype = resolveSpatialSubtype(options?.subtype);
+    const srid = resolveSpatialSrid(options?.srid);
+    if (srid !== undefined && subtype === undefined) {
+        throw schemaError(SchemaErrorCode.invalid_column, `PostGIS ${base} columns with srid require a subtype. Valid typmod is ${base}(Point,4326), not ${base}(${srid}).`, {}, [
+            `Use ${base}({ subtype: "Point", srid: ${srid} })`,
+            `Use subtype: "Geometry" to set SRID without constraining the type`,
+        ]);
+    }
+    return {
+        ...(subtype !== undefined ? { subtype } : {}),
+        ...(srid !== undefined ? { srid } : {}),
+    };
+}
 function spatialSqlType(base, options) {
-    const subtype = options?.subtype;
-    const srid = options?.srid;
-    if (subtype && srid !== undefined) {
+    const { subtype, srid } = resolveSpatialOptions(base, options);
+    if (subtype !== undefined && srid !== undefined) {
         return `${base}(${subtype},${srid})`;
     }
-    if (subtype) {
+    if (subtype !== undefined) {
         return `${base}(${subtype})`;
     }
-    if (srid !== undefined) {
-        return `${base}(${srid})`;
-    }
     return base;
 }
 function spatialSelectExpression(col) {
@@ -20,7 +75,7 @@ function spatialSelectExpression(col) {
     return `ST_AsGeoJSON(${sqlName})::json AS ${sqlName}`;
 }
 function spatialWriteExpression(col, paramIndex) {
-    const srid = col.typeOptions?.["srid"] ?? 4326;
+    const srid = resolveSpatialSrid(col.typeOptions?.srid) ?? 4326;
     return `ST_SetSRID(ST_GeomFromGeoJSON($${paramIndex}::json), ${srid})`;
 }
 function createSpatialTypePlugin(kind, base, defaultOptions) {
@@ -28,13 +83,17 @@ function createSpatialTypePlugin(kind, base, defaultOptions) {
         kind,
         createBuilder(options) {
             const merged = { ...defaultOptions, ...options };
+            if (kind === "point") {
+                merged.subtype = "Point";
+            }
+            const typeOptions = resolveSpatialOptions(base, merged);
             return createColumnBuilder({
                 kind,
                 nullable: true,
                 unique: false,
                 primary: false,
                 defaultNow: false,
-                typeOptions: merged,
+                typeOptions,
             });
         },
         columnType(col) {
@@ -78,7 +137,7 @@ export function geometry(options) {
 export function geography(options) {
     return geographyType.createBuilder(options);
 }
-/** PostGIS `geometry(Point)` column with default SRID 4326. */
+/** PostGIS `geometry(Point,4326)` column with default SRID 4326. */
 export function point(options) {
     return pointType.createBuilder(options);
 }

package/dist/plugins/postgis/columns.js.map

@@ -1 +1 @@
-{"version":3,"file":"columns.js","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"columns.js","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.ts"],"names":[],"mappings":"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"}

package/dist/plugins/postgis/columns.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=columns.test.d.ts.map

package/dist/plugins/postgis/columns.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"columns.test.d.ts","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.test.ts"],"names":[],"mappings":""}

package/dist/plugins/postgis/columns.test.js

@@ -0,0 +1,67 @@
+import { describe, expect, it } from "vitest";
+import { NeoOrmSchemaError } from "../../runtime/errors.js";
+import { geography, geographyType, geometry, geometryType, point, pointType, } from "./columns.js";
+function spatialColumn(kind, typeOptions) {
+    return {
+        tsName: "location",
+        sqlName: "location",
+        kind,
+        nullable: true,
+        unique: false,
+        primary: false,
+        defaultNow: false,
+        ...(typeOptions !== undefined ? { typeOptions } : {}),
+    };
+}
+describe("PostGIS spatial SQL types", () => {
+    it("emits unconstrained geometry with no options", () => {
+        expect(geometryType.columnType(spatialColumn("geometry"))).toBe("geometry");
+        expect(geometry()._meta.typeOptions).toEqual({});
+    });
+    it("emits subtype-only typmod", () => {
+        expect(geometryType.columnType(spatialColumn("geometry", { subtype: "Polygon" }))).toBe("geometry(Polygon)");
+    });
+    it("emits canonical subtype and srid typmod", () => {
+        expect(geometryType.columnType(spatialColumn("geometry", { subtype: "point", srid: 4326 }))).toBe("geometry(Point,4326)");
+        expect(geographyType.columnType(spatialColumn("geography", {
+            subtype: "Geometry",
+            srid: 4326,
+        }))).toBe("geography(Geometry,4326)");
+    });
+    it("emits PointZ and rejects unknown subtypes", () => {
+        expect(geometryType.columnType(spatialColumn("geometry", { subtype: "PointZ", srid: 4326 }))).toBe("geometry(PointZ,4326)");
+        expect(() => geometryType.columnType(spatialColumn("geometry", {
+            subtype: "Point);DROP TABLE t;--",
+            srid: 4326,
+        }))).toThrow(/Invalid PostGIS subtype/);
+    });
+    it("rejects srid without subtype instead of geometry(4326)", () => {
+        expect(() => geometryType.columnType(spatialColumn("geometry", { srid: 4326 }))).toThrow(/geometry\(Point,4326\), not geometry\(4326\)/);
+        expect(() => geometryType.createBuilder({ srid: 4326 })).toThrow(NeoOrmSchemaError);
+        expect(() => geometryType.createBuilder({ srid: 4326 })).toThrow(/srid require a subtype/);
+    });
+    it("rejects a non-integer srid", () => {
+        expect(() => geometryType.columnType(spatialColumn("geometry", { subtype: "Point", srid: 4326.5 }))).toThrow(/srid must be an integer/);
+    });
+    it("point() always uses geometry(Point) with default srid 4326", () => {
+        expect(point()._meta.typeOptions).toEqual({
+            subtype: "Point",
+            srid: 4326,
+        });
+        expect(point({ srid: 3857 })._meta.typeOptions).toEqual({
+            subtype: "Point",
+            srid: 3857,
+        });
+        expect(pointType.columnType(spatialColumn("point", { subtype: "Point", srid: 4326 }))).toBe("geometry(Point,4326)");
+    });
+    it("stores canonical options on geometry() and geography()", () => {
+        expect(geometryType.createBuilder({
+            subtype: "LINESTRING",
+            srid: 4326,
+        })._meta.typeOptions).toEqual({ subtype: "LineString", srid: 4326 });
+        expect(geography({ subtype: "Point" })._meta.typeOptions).toEqual({
+            subtype: "Point",
+        });
+    });
+});
+//# sourceMappingURL=columns.test.js.map

package/dist/plugins/postgis/columns.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"columns.test.js","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.test.ts"],"names":[],"mappings":"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"}

package/dist/plugins/postgis/index.d.ts

@@ -1,4 +1,6 @@
-export type { GeographyOptions, GeoJsonGeometry, GeoJsonPoint, GeoJsonPolygon, GeometryOptions, PointOptions, } from "./columns.js";
-export { geography, geometry, point } from "./columns.js";
+import "./where-types.js";
+export type { GeographyOptions, GeoJsonGeometry, GeoJsonPoint, GeoJsonPolygon, GeometryOptions, PointOptions, SpatialSubtype, } from "./columns.js";
+export { geography, geometry, point, SPATIAL_SUBTYPES } from "./columns.js";
 export { postgisPlugin } from "./plugin.js";
+export type { PostgisWhereOperators } from "./where-types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/plugins/postgis/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/postgis/index.ts"],"names":[],"mappings":"AAGA,YAAY,EACX,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,cAAc,EACd,eAAe,EACf,YAAY,GACZ,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/postgis/index.ts"],"names":[],"mappings":"AAEA,OAAO,kBAAkB,CAAC;AAE1B,YAAY,EACX,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,cAAc,EACd,eAAe,EACf,YAAY,EACZ,cAAc,GACd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,YAAY,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/plugins/postgis/index.js

@@ -1,6 +1,7 @@
 import { registerPlugin } from "../registry.js";
 import { postgisPlugin } from "./plugin.js";
-export { geography, geometry, point } from "./columns.js";
+import "./where-types.js";
+export { geography, geometry, point, SPATIAL_SUBTYPES } from "./columns.js";
 export { postgisPlugin } from "./plugin.js";
 registerPlugin(postgisPlugin);
 //# sourceMappingURL=index.js.map

package/dist/plugins/postgis/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/postgis/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAW5C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,cAAc,CAAC,aAAa,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/postgis/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,kBAAkB,CAAC;AAW1B,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,cAAc,CAAC,aAAa,CAAC,CAAC"}