squirreling 0.10.2 → 0.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squirreling",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "Squirreling Async SQL Engine",
   "author": "Hyperparam",
   "homepage": "https://hyperparam.app",

package/src/index.d.ts

@@ -76,6 +76,8 @@ export function tokenizeSql(sql: string): Token[]
  */
 export function collect<T>(asyncGen: AsyncGenerator<AsyncRow>): Promise<Record<string, SqlPrimitive>[]>
 
+export function asyncRow(row: Record<string, SqlPrimitive>, columns: string[]): AsyncRow
+
 export function cachedDataSource(source: AsyncDataSource): AsyncDataSource
 
 /**

package/src/index.js

@@ -3,5 +3,5 @@ export { parseSql } from './parse/parse.js'
 export { planSql } from './plan/plan.js'
 export { tokenizeSql } from './parse/tokenize.js'
 export { collect } from './execute/utils.js'
-export { cachedDataSource } from './backend/dataSource.js'
+export { asyncRow, cachedDataSource } from './backend/dataSource.js'
 export { derivedAlias } from './expression/alias.js'

package/src/spatial/bbox.js

@@ -1,11 +1,11 @@
 /**
- * @import { BBox, SimpleGeometry } from './geometry.js'
+ * @import { BoundingBox, SimpleGeometry } from './geometry.js'
  */
 
 export const EPSILON = 1e-10
 export const EPSILON_SQ = EPSILON * EPSILON
 
-/** @type {WeakMap<SimpleGeometry, BBox>} */
+/** @type {WeakMap<SimpleGeometry, BoundingBox>} */
 const bboxCache = new WeakMap()
 
 /**
@@ -26,7 +26,7 @@ export function bboxOverlap(a, b) {
  * Results are cached per geometry object.
  *
  * @param {SimpleGeometry} geom
- * @returns {BBox}
+ * @returns {BoundingBox}
  */
 export function bbox(geom) {
   let b = bboxCache.get(geom)

package/src/spatial/geometry.d.ts

@@ -15,7 +15,7 @@ export type Geometry =
  */
 export type SimpleGeometry = Point | LineString | Polygon
 
-export interface BBox {
+export interface BoundingBox {
   minX: number
   minY: number
   maxX: number

package/src/spatial/index.d.ts

@@ -0,0 +1,6 @@
+import type { BoundingBox, Geometry, SimpleGeometry } from './geometry.js'
+
+export function decompose(geom: Geometry): SimpleGeometry[]
+export function bbox(geom: SimpleGeometry): BoundingBox
+export function bboxOverlap(a: SimpleGeometry, b: SimpleGeometry): boolean
+export function parseWkt(wkt: string): Geometry | null

package/src/spatial/index.js

@@ -0,0 +1,3 @@
+export { decompose } from './spatial.js'
+export { bbox, bboxOverlap } from './bbox.js'
+export { parseWkt } from './wkt.js'

package/src/spatial/spatial.js

@@ -68,6 +68,25 @@ export function evaluateSpatialFunc({ funcName, args }) {
   }
 }
 
+/**
+ * Decompose Multi* and GeometryCollection into simple geometries.
+ *
+ * @param {Geometry} geom
+ * @returns {SimpleGeometry[]}
+ */
+export function decompose(geom) {
+  if (geom.type === 'MultiPoint') {
+    return geom.coordinates.map(c => ({ type: 'Point', coordinates: c }))
+  } else if (geom.type === 'MultiLineString') {
+    return geom.coordinates.map(c => ({ type: 'LineString', coordinates: c }))
+  } else if (geom.type === 'MultiPolygon') {
+    return geom.coordinates.map(c => ({ type: 'Polygon', coordinates: c }))
+  } else if (geom.type === 'GeometryCollection') {
+    return geom.geometries.flatMap(decompose)
+  }
+  return [geom]
+}
+
 /**
  * Normalize a geometry value. Accepts GeoJSON objects.
  * Returns null if the value is not a valid geometry.
@@ -90,10 +109,6 @@ function toGeometry(val) {
   return null
 }
 
-// ============================================================================
-// Minimum distance between geometries
-// ============================================================================
-
 /**
  * Get all line segments from a geometry.
  *
@@ -165,35 +180,6 @@ function stDWithin(a, b, distance) {
   return false
 }
 
-// ============================================================================
-// Spatial predicate dispatch - decompose to primitive type pairs
-// ============================================================================
-
-/**
- * Decompose Multi* and GeometryCollection into simple geometries.
- *
- * @param {Geometry} geom
- * @returns {SimpleGeometry[]}
- */
-function decompose(geom) {
-  switch (geom.type) {
-  case 'MultiPoint':
-    return geom.coordinates.map(c => ({ type: 'Point', coordinates: c }))
-  case 'MultiLineString':
-    return geom.coordinates.map(c => ({ type: 'LineString', coordinates: c }))
-  case 'MultiPolygon':
-    return geom.coordinates.map(c => ({ type: 'Polygon', coordinates: c }))
-  case 'GeometryCollection':
-    return geom.geometries.flatMap(decompose)
-  default:
-    return [geom]
-  }
-}
-
-// ============================================================================
-// ST_Contains
-// ============================================================================
-
 /**
  * @param {SimpleGeometry[]} a
  * @param {SimpleGeometry[]} b
@@ -204,10 +190,6 @@ function stContains(a, b) {
   return b.every(pb => a.some(pa => pairContainment(pa, pb) !== 'OUTSIDE'))
 }
 
-// ============================================================================
-// ST_ContainsProperly
-// ============================================================================
-
 /**
  * @param {SimpleGeometry[]} a
  * @param {SimpleGeometry[]} b
@@ -218,10 +200,6 @@ function stContainsProperly(a, b) {
   return b.every(pb => a.some(pa => pairContainment(pa, pb) === 'INSIDE'))
 }
 
-// ============================================================================
-// ST_Touches
-// ============================================================================
-
 /**
  * @param {SimpleGeometry[]} a
  * @param {SimpleGeometry[]} b
@@ -239,10 +217,6 @@ function stTouches(a, b) {
   return intersects
 }
 
-// ============================================================================
-// ST_Overlaps
-// ============================================================================
-
 /**
  * @param {SimpleGeometry[]} a
  * @param {SimpleGeometry[]} b
@@ -281,10 +255,6 @@ function geometryDimension(parts) {
   return max
 }
 
-// ============================================================================
-// ST_Equals
-// ============================================================================
-
 /**
  * @param {SimpleGeometry[]} a
  * @param {SimpleGeometry[]} b
@@ -310,10 +280,6 @@ function stEquals(a, b) {
   return true
 }
 
-// ============================================================================
-// ST_Crosses
-// ============================================================================
-
 /**
  * @param {SimpleGeometry[]} a
  * @param {SimpleGeometry[]} b