graphile-postgis 2.9.7 → 2.9.9

package/esm/plugins/codec.js

@@ -1,5 +1,7 @@
 import 'graphile-build-pg';
 import sql from 'pg-sql2';
+import { GIS_SUBTYPE_NAME } from '../constants';
+import { getGISTypeDetails } from '../utils';
 /**
  * Map from PostGIS uppercase geometry type names (from geometrytype()) to
  * our mixed-case format used by resolveType lookups.
@@ -45,6 +47,11 @@ const GIS_TYPE_NORMALIZE = {
 function normalizeGisType(raw) {
     return GIS_TYPE_NORMALIZE[raw] ?? raw;
 }
+function getGeometrySubtypeName(typmod) {
+    const { subtype } = getGISTypeDetails(typmod);
+    const subtypeName = GIS_SUBTYPE_NAME[subtype];
+    return subtypeName && subtypeName !== 'Geometry' ? subtypeName : null;
+}
 /**
  * Build a codec for a PostGIS geometry or geography type.
  *
@@ -168,6 +175,39 @@ export const PostgisCodecPlugin = {
                     event.pgCodec = buildGisCodec('geography', typeNamespace.nspname, type._id, serviceName);
                     return;
                 }
+            },
+            /**
+             * Annotate geometry/geography attributes with their subtype (Point,
+             * Polygon, LineString, etc.) decoded from the PostgreSQL type modifier.
+             *
+             * The atttypmod encodes subtype + SRID + Z/M flags. We decode it with
+             * getGISTypeDetails() and store the human-readable subtype name on
+             * attribute.extensions.geometrySubtype so the _meta plugin can expose it.
+             */
+            async pgCodecs_attribute(_info, event) {
+                const { pgAttribute, attribute } = event;
+                const codecName = attribute.codec?.name;
+                if (codecName !== 'geometry' && codecName !== 'geography') {
+                    return;
+                }
+                const typmod = pgAttribute.atttypmod;
+                // atttypmod of -1 or null means no modifier (unconstrained geometry)
+                if (typmod == null || typmod === -1) {
+                    return;
+                }
+                try {
+                    const subtypeName = getGeometrySubtypeName(typmod);
+                    if (subtypeName) {
+                        if (!attribute.extensions) {
+                            attribute.extensions = {};
+                        }
+                        attribute.extensions.geometrySubtype = subtypeName;
+                    }
+                }
+                catch {
+                    // If the modifier can't be decoded, silently skip — the column
+                    // will still work, just without subtype info in _meta.
+                }
             }
         }
     }

package/esm/plugins/detect-extension.js

@@ -41,7 +41,7 @@ export const PostgisExtensionDetectionPlugin = {
                 }
                 // PostGIS is detected when at least one of geometry or geography
                 // codecs is present. Some databases use only geography columns
-                // (e.g. use_geography: true in DataPostGIS), so PostGraphile may
+                // (e.g. use_geography: true in SearchSpatial), so PostGraphile may
                 // introspect geography but not geometry.
                 if (!geometryCodec && !geographyCodec) {
                     return build;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-postgis",
-  "version": "2.9.7",
+  "version": "2.9.9",
   "description": "PostGIS support for PostGraphile v5",
   "author": "Constructive <developers@constructive.io>",
   "homepage": "https://github.com/constructive-io/constructive",
@@ -46,7 +46,7 @@
     "graphile-build": "5.0.0",
     "graphile-build-pg": "5.0.0",
     "graphile-config": "1.0.0",
-    "graphile-connection-filter": "^1.3.6",
+    "graphile-connection-filter": "^1.3.7",
     "graphql": "16.13.0",
     "pg-sql2": "5.0.0",
     "postgraphile": "5.0.0"
@@ -59,9 +59,9 @@
   "devDependencies": {
     "@types/geojson": "^7946.0.14",
     "@types/node": "^22.19.11",
-    "graphile-test": "^4.7.6",
+    "graphile-test": "^4.7.7",
     "makage": "^0.3.0",
-    "pgsql-test": "^4.7.6"
+    "pgsql-test": "^4.7.7"
   },
-  "gitHead": "0b7edbd088ca9661503c5038134ee15311eac027"
+  "gitHead": "d1cfd698f829c6fae346a5004f735acd44519bb7"
 }

package/plugins/codec.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgisCodecPlugin = void 0;
 require("graphile-build-pg");
 const pg_sql2_1 = __importDefault(require("pg-sql2"));
+const constants_1 = require("../constants");
+const utils_1 = require("../utils");
 /**
  * Map from PostGIS uppercase geometry type names (from geometrytype()) to
  * our mixed-case format used by resolveType lookups.
@@ -51,6 +53,11 @@ const GIS_TYPE_NORMALIZE = {
 function normalizeGisType(raw) {
     return GIS_TYPE_NORMALIZE[raw] ?? raw;
 }
+function getGeometrySubtypeName(typmod) {
+    const { subtype } = (0, utils_1.getGISTypeDetails)(typmod);
+    const subtypeName = constants_1.GIS_SUBTYPE_NAME[subtype];
+    return subtypeName && subtypeName !== 'Geometry' ? subtypeName : null;
+}
 /**
  * Build a codec for a PostGIS geometry or geography type.
  *
@@ -174,6 +181,39 @@ exports.PostgisCodecPlugin = {
                     event.pgCodec = buildGisCodec('geography', typeNamespace.nspname, type._id, serviceName);
                     return;
                 }
+            },
+            /**
+             * Annotate geometry/geography attributes with their subtype (Point,
+             * Polygon, LineString, etc.) decoded from the PostgreSQL type modifier.
+             *
+             * The atttypmod encodes subtype + SRID + Z/M flags. We decode it with
+             * getGISTypeDetails() and store the human-readable subtype name on
+             * attribute.extensions.geometrySubtype so the _meta plugin can expose it.
+             */
+            async pgCodecs_attribute(_info, event) {
+                const { pgAttribute, attribute } = event;
+                const codecName = attribute.codec?.name;
+                if (codecName !== 'geometry' && codecName !== 'geography') {
+                    return;
+                }
+                const typmod = pgAttribute.atttypmod;
+                // atttypmod of -1 or null means no modifier (unconstrained geometry)
+                if (typmod == null || typmod === -1) {
+                    return;
+                }
+                try {
+                    const subtypeName = getGeometrySubtypeName(typmod);
+                    if (subtypeName) {
+                        if (!attribute.extensions) {
+                            attribute.extensions = {};
+                        }
+                        attribute.extensions.geometrySubtype = subtypeName;
+                    }
+                }
+                catch {
+                    // If the modifier can't be decoded, silently skip — the column
+                    // will still work, just without subtype info in _meta.
+                }
             }
         }
     }

package/plugins/detect-extension.js

@@ -44,7 +44,7 @@ exports.PostgisExtensionDetectionPlugin = {
                 }
                 // PostGIS is detected when at least one of geometry or geography
                 // codecs is present. Some databases use only geography columns
-                // (e.g. use_geography: true in DataPostGIS), so PostGraphile may
+                // (e.g. use_geography: true in SearchSpatial), so PostGraphile may
                 // introspect geography but not geometry.
                 if (!geometryCodec && !geographyCodec) {
                     return build;