squirreling 0.9.2 → 0.9.3

package/src/types.d.ts

@@ -276,6 +276,22 @@ export type StringFunc =
   | 'RIGHT'
   | 'INSTR'
 
+export type SpatialFunc =
+  | 'ST_INTERSECTS'
+  | 'ST_CONTAINS'
+  | 'ST_CONTAINSPROPERLY'
+  | 'ST_WITHIN'
+  | 'ST_OVERLAPS'
+  | 'ST_TOUCHES'
+  | 'ST_EQUALS'
+  | 'ST_CROSSES'
+  | 'ST_COVERS'
+  | 'ST_COVEREDBY'
+  | 'ST_DWITHIN'
+  | 'ST_GEOMFROMTEXT'
+  | 'ST_MAKEENVELOPE'
+  | 'ST_ASTEXT'
+
 export interface StarColumn {
   kind: 'star'
   table?: string

package/src/validation.js

@@ -1,7 +1,7 @@
 import { ParseError } from './parseErrors.js'
 
 /**
- * @import { AggregateFunc, BinaryOp, ExprNode, FunctionNode, IntervalUnit, MathFunc, StringFunc, UserDefinedFunction } from './types.js'
+ * @import { AggregateFunc, BinaryOp, ExprNode, FunctionNode, IntervalUnit, MathFunc, SpatialFunc, StringFunc, UserDefinedFunction } from './types.js'
  * @param {string} name
  * @returns {name is AggregateFunc}
  */
@@ -79,6 +79,19 @@ export function isRegexpFunc(name) {
   return ['REGEXP_SUBSTR', 'REGEXP_REPLACE'].includes(name)
 }
 
+/**
+ * @param {string} name
+ * @returns {name is SpatialFunc}
+ */
+export function isSpatialFunc(name) {
+  return [
+    'ST_INTERSECTS', 'ST_CONTAINS', 'ST_CONTAINSPROPERLY', 'ST_WITHIN',
+    'ST_OVERLAPS', 'ST_TOUCHES', 'ST_EQUALS', 'ST_CROSSES',
+    'ST_COVERS', 'ST_COVEREDBY', 'ST_DWITHIN',
+    'ST_GEOMFROMTEXT', 'ST_MAKEENVELOPE', 'ST_ASTEXT',
+  ].includes(name)
+}
+
 /**
  * @param {string} name
  * @returns {name is MathFunc}
@@ -178,6 +191,12 @@ export const FUNCTION_ARG_COUNTS = {
   JSON_OBJECT: { min: 0 },
   JSON_ARRAYAGG: { min: 1, max: 1 },
 
+  // Array functions
+  ARRAY_LENGTH: { min: 1, max: 1 },
+  ARRAY_POSITION: { min: 2, max: 2 },
+  ARRAY_SORT: { min: 1, max: 1 },
+  CARDINALITY: { min: 1, max: 1 },
+
   // Conditional functions
   COALESCE: { min: 1 },
   NULLIF: { min: 2, max: 2 },
@@ -190,6 +209,22 @@ export const FUNCTION_ARG_COUNTS = {
   MAX: { min: 1, max: 1 },
   STDDEV_SAMP: { min: 1, max: 1 },
   STDDEV_POP: { min: 1, max: 1 },
+
+  // Spatial predicate functions
+  ST_INTERSECTS: { min: 2, max: 2 },
+  ST_CONTAINS: { min: 2, max: 2 },
+  ST_CONTAINSPROPERLY: { min: 2, max: 2 },
+  ST_WITHIN: { min: 2, max: 2 },
+  ST_OVERLAPS: { min: 2, max: 2 },
+  ST_TOUCHES: { min: 2, max: 2 },
+  ST_EQUALS: { min: 2, max: 2 },
+  ST_CROSSES: { min: 2, max: 2 },
+  ST_COVERS: { min: 2, max: 2 },
+  ST_COVEREDBY: { min: 2, max: 2 },
+  ST_DWITHIN: { min: 3, max: 3 },
+  ST_GEOMFROMTEXT: { min: 1, max: 1 },
+  ST_MAKEENVELOPE: { min: 4, max: 4 },
+  ST_ASTEXT: { min: 1, max: 1 },
 }
 
 /**
@@ -249,7 +284,8 @@ export function isKnownFunction(funcName, functions) {
     isAggregateFunc(funcName) ||
     isMathFunc(funcName) ||
     isStringFunc(funcName) ||
-    isRegexpFunc(funcName)
+    isRegexpFunc(funcName) ||
+    isSpatialFunc(funcName)
   ) {
     return true
   }
@@ -258,6 +294,7 @@ export function isKnownFunction(funcName, functions) {
   if ([
     'CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP',
     'JSON_VALUE', 'JSON_QUERY', 'JSON_OBJECT',
+    'ARRAY_LENGTH', 'ARRAY_POSITION', 'ARRAY_SORT', 'CARDINALITY',
     'COALESCE', 'NULLIF', 'CAST',
   ].includes(funcName)) {
     return true

package/src/validationErrors.js

@@ -68,6 +68,22 @@ export const FUNCTION_SIGNATURES = {
   MAX: 'expression',
   STDDEV_SAMP: 'expression',
   STDDEV_POP: 'expression',
+
+  // Spatial predicate functions
+  ST_INTERSECTS: 'geometry, geometry',
+  ST_CONTAINS: 'geometry, geometry',
+  ST_CONTAINSPROPERLY: 'geometry, geometry',
+  ST_WITHIN: 'geometry, geometry',
+  ST_OVERLAPS: 'geometry, geometry',
+  ST_TOUCHES: 'geometry, geometry',
+  ST_EQUALS: 'geometry, geometry',
+  ST_CROSSES: 'geometry, geometry',
+  ST_COVERS: 'geometry, geometry',
+  ST_COVEREDBY: 'geometry, geometry',
+  ST_DWITHIN: 'geometry, geometry, distance',
+  ST_GEOMFROMTEXT: 'wkt',
+  ST_MAKEENVELOPE: 'xmin, ymin, xmax, ymax',
+  ST_ASTEXT: 'geometry',
 }
 
 /**