@terascope/data-mate 2.24.0 → 2.25.1

package/dist/src/function-configs/date/subtractFromDate.js.map

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

package/dist/src/function-configs/date/toDailyDate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toDailyDate.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toDailyDate.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAE1B,eAAO,MAAM,iBAAiB,EAAE,oBA6D/B,CAAC"}
+{"version":3,"file":"toDailyDate.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toDailyDate.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAE1B,eAAO,MAAM,iBAAiB,EAAE,oBAwE/B,CAAC"}

package/dist/src/function-configs/date/toDailyDate.js

@@ -45,6 +45,17 @@ export const toDailyDateConfig = {
     create() {
         return trimISODateSegment(ISO8601DateSegment.daily);
     },
+    /**
+     * Runs as `date_trunc('day', x)`.
+     *
+     * Both sides truncate in UTC, whatever the host timezone.
+     *
+     * Only a `Date` column is handled; `String` and `Number` input is parsed by the UDF.
+    */
+    sql: {
+        types: [FieldType.Date],
+        expression: ({ value }) => `date_trunc('day', ${value})`,
+    },
     accepts: [
         FieldType.String,
         FieldType.Number,

package/dist/src/function-configs/date/toDailyDate.js.map

@@ -1 +1 @@
-{"version":3,"file":"toDailyDate.js","sourceRoot":"","sources":["../../../../src/function-configs/date/toDailyDate.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EAAE,SAAS,EAAE,kBAAkB,EAC5C,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EACmB,WAAW,EAAE,sBAAsB,EACzD,0BAA0B,EAC7B,MAAM,kBAAkB,CAAC;AAE1B,MAAM,CAAC,MAAM,iBAAiB,GAAyB;IACnD,IAAI,EAAE,aAAa;IACnB,IAAI,EAAE,sBAAsB,CAAC,eAAe;IAC5C,YAAY,EAAE,WAAW,CAAC,iBAAiB;IAC3C,QAAQ,EAAE,0BAA0B,CAAC,IAAI;IACzC,WAAW,EAAE,mDAAmD;IAChE,QAAQ,EAAE;QACN;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;QACD;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;QACD;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC;YAC1B,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;KACJ;IACD,MAAM;QACF,OAAO,kBAAkB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,EAAE;QACL,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,IAAI;KACjB;IACD,eAAe,EAAE,EAAE;IACnB,WAAW,CAAC,WAAW;QACnB,MAAM,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;QAErC,OAAO;YACH,YAAY,EAAE;gBACV,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,KAAK,EAAE,YAAY,CAAC,KAAK;gBACzB,IAAI,EAAE,SAAS,CAAC,IAAI;aACvB;SACJ,CAAC;IACN,CAAC;CACJ,CAAC"}
+{"version":3,"file":"toDailyDate.js","sourceRoot":"","sources":["../../../../src/function-configs/date/toDailyDate.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EAAE,SAAS,EAAE,kBAAkB,EAC5C,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EACmB,WAAW,EAAE,sBAAsB,EACzD,0BAA0B,EAC7B,MAAM,kBAAkB,CAAC;AAE1B,MAAM,CAAC,MAAM,iBAAiB,GAAyB;IACnD,IAAI,EAAE,aAAa;IACnB,IAAI,EAAE,sBAAsB,CAAC,eAAe;IAC5C,YAAY,EAAE,WAAW,CAAC,iBAAiB;IAC3C,QAAQ,EAAE,0BAA0B,CAAC,IAAI;IACzC,WAAW,EAAE,mDAAmD;IAChE,QAAQ,EAAE;QACN;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;QACD;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;QACD;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC;YAC1B,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;KACJ;IACD,MAAM;QACF,OAAO,kBAAkB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACxD,CAAC;IACD;;;;;;MAME;IACF,GAAG,EAAE;QACD,KAAK,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;QACvB,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,qBAAqB,KAAK,GAAG;KAC3D;IACD,OAAO,EAAE;QACL,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,IAAI;KACjB;IACD,eAAe,EAAE,EAAE;IACnB,WAAW,CAAC,WAAW;QACnB,MAAM,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;QAErC,OAAO;YACH,YAAY,EAAE;gBACV,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,KAAK,EAAE,YAAY,CAAC,KAAK;gBACzB,IAAI,EAAE,SAAS,CAAC,IAAI;aACvB;SACJ,CAAC;IACN,CAAC;CACJ,CAAC"}

package/dist/src/function-configs/date/toDate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toDate.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toDate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAa,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,UAAU;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;CAChC;AAED,eAAO,MAAM,YAAY,EAAE,oBAAoB,CAAC,UAAU,CA2HzD,CAAC"}
+{"version":3,"file":"toDate.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toDate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAa,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,UAAU;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;CAChC;AAED,eAAO,MAAM,YAAY,EAAE,oBAAoB,CAAC,UAAU,CA4IzD,CAAC"}

package/dist/src/function-configs/date/toDate.js

@@ -100,6 +100,23 @@ export const toDateConfig = {
             return parseDateValue(input, format, referenceDate);
         };
     },
+    sql: {
+        /**
+         * Returns a `Date` column unchanged. With no format, `parseDateValue` is
+         * `getTime(value)`, and `output_type` declares the field a Date, so the column's
+         * TIMESTAMP is already the result.
+         *
+         * Everything else keeps the UDF: the `epoch`/`seconds` formats call `toInteger` on the
+         * value, and String or Number columns need `getTime`'s loose parsing and the date-fns
+         * custom formats.
+        */
+        types: [FieldType.Date],
+        applies: ({ format }) => format == null
+            || format === DateFormat.iso_8601
+            || format === DateFormat.epoch_millis
+            || format === DateFormat.milliseconds,
+        expression: ({ value }) => value,
+    },
     accepts: [
         FieldType.String,
         FieldType.Number,

package/dist/src/function-configs/date/toDate.js.map

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

package/dist/src/function-configs/date/toHourlyDate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toHourlyDate.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toHourlyDate.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAE1B,eAAO,MAAM,kBAAkB,EAAE,oBAyEhC,CAAC"}
+{"version":3,"file":"toHourlyDate.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toHourlyDate.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAE1B,eAAO,MAAM,kBAAkB,EAAE,oBAoFhC,CAAC"}

package/dist/src/function-configs/date/toHourlyDate.js

@@ -57,6 +57,17 @@ export const toHourlyDateConfig = {
     create() {
         return trimISODateSegment(ISO8601DateSegment.hourly);
     },
+    /**
+     * Runs as `date_trunc('hour', x)`.
+     *
+     * Both sides truncate in UTC, whatever the host timezone.
+     *
+     * Only a `Date` column is handled; `String` and `Number` input is parsed by the UDF.
+    */
+    sql: {
+        types: [FieldType.Date],
+        expression: ({ value }) => `date_trunc('hour', ${value})`,
+    },
     accepts: [
         FieldType.String,
         FieldType.Number,

package/dist/src/function-configs/date/toHourlyDate.js.map

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

package/dist/src/function-configs/date/toMonthlyDate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toMonthlyDate.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toMonthlyDate.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAE1B,eAAO,MAAM,mBAAmB,EAAE,oBA6DjC,CAAC"}
+{"version":3,"file":"toMonthlyDate.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toMonthlyDate.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAE1B,eAAO,MAAM,mBAAmB,EAAE,oBAwEjC,CAAC"}

package/dist/src/function-configs/date/toMonthlyDate.js

@@ -45,6 +45,17 @@ export const toMonthlyDateConfig = {
     create() {
         return trimISODateSegment(ISO8601DateSegment.monthly);
     },
+    /**
+     * Runs as `date_trunc('month', x)`.
+     *
+     * Both sides truncate in UTC, whatever the host timezone.
+     *
+     * Only a `Date` column is handled; `String` and `Number` input is parsed by the UDF.
+    */
+    sql: {
+        types: [FieldType.Date],
+        expression: ({ value }) => `date_trunc('month', ${value})`,
+    },
     accepts: [
         FieldType.String,
         FieldType.Number,

package/dist/src/function-configs/date/toMonthlyDate.js.map

@@ -1 +1 @@
-{"version":3,"file":"toMonthlyDate.js","sourceRoot":"","sources":["../../../../src/function-configs/date/toMonthlyDate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EACmB,WAAW,EAAE,sBAAsB,EACzD,0BAA0B,EAC7B,MAAM,kBAAkB,CAAC;AAE1B,MAAM,CAAC,MAAM,mBAAmB,GAAyB;IACrD,IAAI,EAAE,eAAe;IACrB,IAAI,EAAE,sBAAsB,CAAC,eAAe;IAC5C,YAAY,EAAE,WAAW,CAAC,iBAAiB;IAC3C,QAAQ,EAAE,0BAA0B,CAAC,IAAI;IACzC,WAAW,EAAE,qDAAqD;IAClE,QAAQ,EAAE;QACN;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;QACD;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,CAAC,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC;YAC5D,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;QACD;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;KACJ;IACD,MAAM;QACF,OAAO,kBAAkB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,EAAE;QACL,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,IAAI;KACjB;IACD,eAAe,EAAE,EAAE;IACnB,WAAW,CAAC,WAAW;QACnB,MAAM,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;QAErC,OAAO;YACH,YAAY,EAAE;gBACV,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,KAAK,EAAE,YAAY,CAAC,KAAK;gBACzB,IAAI,EAAE,SAAS,CAAC,IAAI;aACvB;SACJ,CAAC;IACN,CAAC;CACJ,CAAC"}
+{"version":3,"file":"toMonthlyDate.js","sourceRoot":"","sources":["../../../../src/function-configs/date/toMonthlyDate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EACmB,WAAW,EAAE,sBAAsB,EACzD,0BAA0B,EAC7B,MAAM,kBAAkB,CAAC;AAE1B,MAAM,CAAC,MAAM,mBAAmB,GAAyB;IACrD,IAAI,EAAE,eAAe;IACrB,IAAI,EAAE,sBAAsB,CAAC,eAAe;IAC5C,YAAY,EAAE,WAAW,CAAC,iBAAiB;IAC3C,QAAQ,EAAE,0BAA0B,CAAC,IAAI;IACzC,WAAW,EAAE,qDAAqD;IAClE,QAAQ,EAAE;QACN;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;QACD;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,CAAC,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC;YAC5D,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;QACD;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;KACJ;IACD,MAAM;QACF,OAAO,kBAAkB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IACD;;;;;;MAME;IACF,GAAG,EAAE;QACD,KAAK,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;QACvB,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,uBAAuB,KAAK,GAAG;KAC7D;IACD,OAAO,EAAE;QACL,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,IAAI;KACjB;IACD,eAAe,EAAE,EAAE;IACnB,WAAW,CAAC,WAAW;QACnB,MAAM,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;QAErC,OAAO;YACH,YAAY,EAAE;gBACV,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,KAAK,EAAE,YAAY,CAAC,KAAK;gBACzB,IAAI,EAAE,SAAS,CAAC,IAAI;aACvB;SACJ,CAAC;IACN,CAAC;CACJ,CAAC"}

package/dist/src/function-configs/date/toTimeZone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toTimeZone.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toTimeZone.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,YAAY;IACzB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,gBAAgB,EAAE,oBAAoB,CAAC,YAAY,CAuG/D,CAAC"}
+{"version":3,"file":"toTimeZone.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toTimeZone.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,WAAW,YAAY;IACzB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,gBAAgB,EAAE,oBAAoB,CAAC,YAAY,CAqH/D,CAAC"}

package/dist/src/function-configs/date/toTimeZone.js

@@ -1,6 +1,7 @@
 import { DateFormat, FieldType } from '@terascope/types';
 import { toTimeZone } from '@terascope/core-utils';
 import { ProcessMode, FunctionDefinitionType, FunctionDefinitionCategory } from '../interfaces.js';
+import { currentOffsetMinutes, dateWithOffset, timezoneOffsetMinutes } from './sql-utils.js';
 export const toTimeZoneConfig = {
     name: 'toTimeZone',
     type: FunctionDefinitionType.FIELD_TRANSFORM,
@@ -82,6 +83,18 @@ export const toTimeZoneConfig = {
     create({ args: { timezone } }) {
         return (val) => toTimeZone(val, timezone);
     },
+    /**
+     * The instant with the zone's offset for that date attached; `timezoneOffsetMinutes`
+     * describes exactly which offset. A zone core-utils cannot resolve keeps the UDF, which
+     * returns null as `DataFrame` does. Only a `Date` column is handled; `String` and `Number`
+     * input is parsed by the UDF.
+    */
+    sql: {
+        types: [FieldType.Date],
+        applies: (args) => currentOffsetMinutes(args.timezone) !== undefined,
+        returns_date_value: true,
+        expression: ({ value, instant, args }) => dateWithOffset(instant ?? value, timezoneOffsetMinutes(instant ?? value, args.timezone)),
+    },
     accepts: [
         FieldType.String,
         FieldType.Number,

package/dist/src/function-configs/date/toTimeZone.js.map

@@ -1 +1 @@
-{"version":3,"file":"toTimeZone.js","sourceRoot":"","sources":["../../../../src/function-configs/date/toTimeZone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EACmB,WAAW,EAAE,sBAAsB,EACzD,0BAA0B,EAC7B,MAAM,kBAAkB,CAAC;AAM1B,MAAM,CAAC,MAAM,gBAAgB,GAAuC;IAChE,IAAI,EAAE,YAAY;IAClB,IAAI,EAAE,sBAAsB,CAAC,eAAe;IAC5C,YAAY,EAAE,WAAW,CAAC,iBAAiB;IAC3C,QAAQ,EAAE,0BAA0B,CAAC,IAAI;IACzC,WAAW,EAAE,gCAAgC;IAC7C,QAAQ,EAAE;QACN;YACI,IAAI,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE;YACrC,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,+BAA+B;SAC1C;QACD;YACI,IAAI,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE;YACrC,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC;YAC3C,MAAM,EAAE,+BAA+B;SAC1C;QACD;YACI,IAAI,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE;YACrC,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,+BAA+B;SAC1C;QACD;YACI,IAAI,EAAE,EAAE,QAAQ,EAAE,kBAAkB,EAAE;YACtC,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,+BAA+B;SAC1C;QACD;YACI,IAAI,EAAE,EAAE,QAAQ,EAAE,kBAAkB,EAAE;YACtC,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,+BAA+B;SAC1C;QACD;YACI,IAAI,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE;YACrC,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,+BAA+B;SAC1C;QACD;YACI,IAAI,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE;YACnC,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,+BAA+B;SAC1C;KACJ;IACD,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE;QACzB,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,EAAE;QACL,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,IAAI;KACjB;IACD,eAAe,EAAE;QACb,QAAQ,EAAE;YACN,IAAI,EAAE,SAAS,CAAC,MAAM;YACtB,WAAW,EAAE,6CAA6C;SAC7D;KACJ;IACD,kBAAkB,EAAE,CAAC,UAAU,CAAC;IAChC,WAAW,CAAC,WAAW;QACnB,MAAM,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;QAErC,OAAO;YACH,YAAY,EAAE;gBACV,GAAG,YAAY;gBACf,IAAI,EAAE,SAAS,CAAC,IAAI;aACvB;SACJ,CAAC;IACN,CAAC;CACJ,CAAC"}
+{"version":3,"file":"toTimeZone.js","sourceRoot":"","sources":["../../../../src/function-configs/date/toTimeZone.ts"],"names":[],"mappings":"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"}

package/dist/src/function-configs/date/toTimeZoneUsingLocation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toTimeZoneUsingLocation.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toTimeZoneUsingLocation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGnE,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,yBAAyB;IACtC,QAAQ,EAAE,QAAQ,CAAC;CACtB;AAWD,eAAO,MAAM,6BAA6B,EAAE,oBAAoB,CAAC,yBAAyB,CAyHzF,CAAC"}
+{"version":3,"file":"toTimeZoneUsingLocation.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toTimeZoneUsingLocation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGnE,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,WAAW,yBAAyB;IACtC,QAAQ,EAAE,QAAQ,CAAC;CACtB;AAqBD,eAAO,MAAM,6BAA6B,EAAE,oBAAoB,CAAC,yBAAyB,CAuIzF,CAAC"}

package/dist/src/function-configs/date/toTimeZoneUsingLocation.js

@@ -2,6 +2,7 @@ import { DateFormat, FieldType } from '@terascope/types';
 import { toTimeZone } from '@terascope/core-utils';
 import { lookupTimezone } from '@terascope/geo-utils';
 import { ProcessMode, FunctionDefinitionType, FunctionDefinitionCategory } from '../interfaces.js';
+import { currentOffsetMinutes, dateWithOffset, timezoneOffsetMinutes } from './sql-utils.js';
 function toTimeZoneUsingLocationFP(location) {
     // location validation happens inside lookupTimezone
     const timezone = lookupTimezone(location);
@@ -9,6 +10,16 @@ function toTimeZoneUsingLocationFP(location) {
         return toTimeZone(val, timezone);
     };
 }
+/** The zone for a constant location, or undefined when it does not resolve to a usable one. */
+function zoneForLocation(location) {
+    try {
+        const zone = lookupTimezone(location);
+        return currentOffsetMinutes(zone) === undefined ? undefined : zone;
+    }
+    catch {
+        return undefined;
+    }
+}
 export const toTimeZoneUsingLocationConfig = {
     name: 'toTimeZoneUsingLocation',
     type: FunctionDefinitionType.FIELD_TRANSFORM,
@@ -107,6 +118,17 @@ export const toTimeZoneUsingLocationConfig = {
     create({ args: { location } }) {
         return toTimeZoneUsingLocationFP(location);
     },
+    /**
+     * `toTimeZone`, with the zone looked up once from the constant `location` as
+     * `toTimeZoneUsingLocationFP` does. A location that does not resolve keeps the UDF, which
+     * throws as `DataFrame` does. Only a `Date` column is handled.
+    */
+    sql: {
+        types: [FieldType.Date],
+        applies: (args) => zoneForLocation(args.location) !== undefined,
+        returns_date_value: true,
+        expression: ({ value, instant, args }) => dateWithOffset(instant ?? value, timezoneOffsetMinutes(instant ?? value, zoneForLocation(args.location))),
+    },
     accepts: [
         FieldType.String,
         FieldType.Number,

package/dist/src/function-configs/date/toTimeZoneUsingLocation.js.map

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

package/dist/src/function-configs/date/toYearlyDate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toYearlyDate.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toYearlyDate.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAE1B,eAAO,MAAM,kBAAkB,EAAE,oBA+DhC,CAAC"}
+{"version":3,"file":"toYearlyDate.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/date/toYearlyDate.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAE1B,eAAO,MAAM,kBAAkB,EAAE,oBA0EhC,CAAC"}

package/dist/src/function-configs/date/toYearlyDate.js

@@ -47,6 +47,17 @@ export const toYearlyDateConfig = {
     create() {
         return trimISODateSegment(ISO8601DateSegment.yearly);
     },
+    /**
+     * Runs as `date_trunc('year', x)`.
+     *
+     * Both sides truncate in UTC, whatever the host timezone.
+     *
+     * Only a `Date` column is handled; `String` and `Number` input is parsed by the UDF.
+    */
+    sql: {
+        types: [FieldType.Date],
+        expression: ({ value }) => `date_trunc('year', ${value})`,
+    },
     accepts: [
         FieldType.String,
         FieldType.Number,

package/dist/src/function-configs/date/toYearlyDate.js.map

@@ -1 +1 @@
-{"version":3,"file":"toYearlyDate.js","sourceRoot":"","sources":["../../../../src/function-configs/date/toYearlyDate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EACmB,WAAW,EAAE,sBAAsB,EACzD,0BAA0B,EAC7B,MAAM,kBAAkB,CAAC;AAE1B,MAAM,CAAC,MAAM,kBAAkB,GAAyB;IACpD,IAAI,EAAE,cAAc;IACpB,IAAI,EAAE,sBAAsB,CAAC,eAAe;IAC5C,YAAY,EAAE,WAAW,CAAC,iBAAiB;IAC3C,QAAQ,EAAE,0BAA0B,CAAC,IAAI;IACzC,WAAW,EAAE,oDAAoD;IACjE,QAAQ,EAAE;QACN;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;QACD;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,CAAC,IAAI,IAAI,CAAC,0BAA0B,CAAC,EAAE,GAAG,CAAC;YAClD,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;YAC3B,SAAS,EAAE,IAAI;SAClB;QACD;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;YAC3B,SAAS,EAAE,IAAI;SAClB;KACJ;IACD,MAAM;QACF,OAAO,kBAAkB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,EAAE;QACL,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,IAAI;KACjB;IACD,eAAe,EAAE,EAAE;IACnB,WAAW,CAAC,WAAW;QACnB,MAAM,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;QAErC,OAAO;YACH,YAAY,EAAE;gBACV,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,KAAK,EAAE,YAAY,CAAC,KAAK;gBACzB,IAAI,EAAE,SAAS,CAAC,IAAI;aACvB;SACJ,CAAC;IACN,CAAC;CACJ,CAAC"}
+{"version":3,"file":"toYearlyDate.js","sourceRoot":"","sources":["../../../../src/function-configs/date/toYearlyDate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EACmB,WAAW,EAAE,sBAAsB,EACzD,0BAA0B,EAC7B,MAAM,kBAAkB,CAAC;AAE1B,MAAM,CAAC,MAAM,kBAAkB,GAAyB;IACpD,IAAI,EAAE,cAAc;IACpB,IAAI,EAAE,sBAAsB,CAAC,eAAe;IAC5C,YAAY,EAAE,WAAW,CAAC,iBAAiB;IAC3C,QAAQ,EAAE,0BAA0B,CAAC,IAAI;IACzC,WAAW,EAAE,oDAAoD;IACjE,QAAQ,EAAE;QACN;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;SAC9B;QACD;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,CAAC,IAAI,IAAI,CAAC,0BAA0B,CAAC,EAAE,GAAG,CAAC;YAClD,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;YAC3B,SAAS,EAAE,IAAI;SAClB;QACD;YACI,IAAI,EAAE,EAAG;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC/E;YACD,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,0BAA0B;YACjC,MAAM,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE;YACtD,gBAAgB,EAAE,SAAS;YAC3B,SAAS,EAAE,IAAI;SAClB;KACJ;IACD,MAAM;QACF,OAAO,kBAAkB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACzD,CAAC;IACD;;;;;;MAME;IACF,GAAG,EAAE;QACD,KAAK,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;QACvB,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,sBAAsB,KAAK,GAAG;KAC5D;IACD,OAAO,EAAE;QACL,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,IAAI;KACjB;IACD,eAAe,EAAE,EAAE;IACnB,WAAW,CAAC,WAAW;QACnB,MAAM,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;QAErC,OAAO;YACH,YAAY,EAAE;gBACV,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,KAAK,EAAE,YAAY,CAAC,KAAK;gBACzB,IAAI,EAAE,SAAS,CAAC,IAAI;aACvB;SACJ,CAAC;IACN,CAAC;CACJ,CAAC"}

package/dist/src/function-configs/geo/geoContains.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geoContains.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoContains.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EACH,mBAAmB,EAEtB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC5B,KAAK,EAAE,QAAQ,CAAC;CACnB;AA6FD,eAAO,MAAM,iBAAiB,EAAE,mBAAmB,CAAC,eAAe,CA+BlE,CAAC"}
+{"version":3,"file":"geoContains.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoContains.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EACH,mBAAmB,EAEtB,MAAM,kBAAkB,CAAC;AAK1B,MAAM,WAAW,eAAe;IAC5B,KAAK,EAAE,QAAQ,CAAC;CACnB;AA6FD,eAAO,MAAM,iBAAiB,EAAE,mBAAmB,CAAC,eAAe,CA2ClE,CAAC"}

package/dist/src/function-configs/geo/geoContains.js

@@ -1,6 +1,7 @@
 import { geoContainsFP, toGeoJSON } from '@terascope/geo-utils';
 import { FieldType, GeoShapeType } from '@terascope/types';
 import { ProcessMode, FunctionDefinitionType, FunctionDefinitionCategory, } from '../interfaces.js';
+import { isGeoColumn, isGeoArg, asGeometry, constantGeometry, tryPredicate, isScalarColumn } from './sql-utils.js';
 const examples = [
     {
         args: { value: '33.435518,-111.873616' },
@@ -101,6 +102,16 @@ export const geoContainsConfig = {
     create({ args: { value } }) {
         return geoContainsFP(value);
     },
+    /**
+     * `ST_Contains`. For a shape that touches a hole's edge, `geo-utils` reports it as not
+     * contained and `ST_Contains` reports it as contained; the SQL answer is the correct one.
+     * See `sql-utils.ts`.
+    */
+    sql: {
+        applies: (args, inputConfig) => isScalarColumn(inputConfig)
+            && isGeoColumn(inputConfig) && isGeoArg(args.value),
+        expression: ({ value, args, inputConfig }) => tryPredicate(`ST_Contains(${asGeometry(value, inputConfig)}, ${constantGeometry(args.value)})`),
+    },
     accepts: [
         FieldType.GeoJSON,
         FieldType.GeoPoint,

package/dist/src/function-configs/geo/geoContains.js.map

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

package/dist/src/function-configs/geo/geoContainsPoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geoContainsPoint.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoContainsPoint.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EACH,mBAAmB,EAKtB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,oBAAoB;IACjC,KAAK,EAAE,aAAa,CAAC;CACxB;AAgGD,eAAO,MAAM,sBAAsB,EAAE,mBAAmB,CAAC,oBAAoB,CAuB5E,CAAC"}
+{"version":3,"file":"geoContainsPoint.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoContainsPoint.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EACH,mBAAmB,EAKtB,MAAM,kBAAkB,CAAC;AAK1B,MAAM,WAAW,oBAAoB;IACjC,KAAK,EAAE,aAAa,CAAC;CACxB;AAgGD,eAAO,MAAM,sBAAsB,EAAE,mBAAmB,CAAC,oBAAoB,CAmC5E,CAAC"}

package/dist/src/function-configs/geo/geoContainsPoint.js

@@ -1,6 +1,7 @@
 import { geoContainsFP, isGeoPoint } from '@terascope/geo-utils';
 import { FieldType, GeoShapeType } from '@terascope/types';
 import { ProcessMode, FunctionDefinitionType, FunctionDefinitionCategory } from '../interfaces.js';
+import { isGeoColumn, isGeoArg, asGeometry, constantGeometry, tryPredicate, } from './sql-utils.js';
 const examples = [
     {
         args: { point: '15, 15' },
@@ -104,6 +105,16 @@ export const geoContainsPointConfig = {
     create({ args: { point } }) {
         return geoContainsFP(point);
     },
+    /**
+     * `ST_Contains(shape, point)`: the column is the shape and the argument is the point.
+     *
+     * For a point exactly on a hole's edge, `geo-utils` reports it as contained and `ST_Contains`
+     * does not, because the point is on the polygon's boundary. The SQL answer is the correct one.
+    */
+    sql: {
+        applies: (args, inputConfig) => isGeoColumn(inputConfig) && isGeoArg(args.point),
+        expression: ({ value, args, inputConfig }) => tryPredicate(`ST_Contains(${asGeometry(value, inputConfig)}, ${constantGeometry(args.point)})`),
+    },
     accepts: [FieldType.GeoJSON],
     argument_schema: {
         point: {

package/dist/src/function-configs/geo/geoContainsPoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"geoContainsPoint.js","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoContainsPoint.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"geoContainsPoint.js","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoContainsPoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAiB,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAEH,WAAW,EACX,sBAAsB,EACtB,0BAA0B,EAE7B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACH,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,YAAY,GACpE,MAAM,gBAAgB,CAAC;AAMxB,MAAM,QAAQ,GAAsD;IAChE;QACI,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;QACzB,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE;QAC1E,KAAK,EAAE,WAAW;QAClB,KAAK,EAAE;YACH,IAAI,EAAE,YAAY,CAAC,OAAO;YAC1B,WAAW,EAAE;gBACT,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;aACrD;SACJ;QACD,MAAM,EAAE;YACJ,IAAI,EAAE,YAAY,CAAC,OAAO;YAC1B,WAAW,EAAE;gBACT,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;aACrD;SACJ;KACJ;IACD;QACI,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;QACzB,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE;QAC1E,KAAK,EAAE,WAAW;QAClB,KAAK,EAAE;YACH,IAAI,EAAE,YAAY,CAAC,YAAY;YAC/B,WAAW,EAAE;gBACT;oBACI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;iBACrD;gBACD;oBACI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;iBAC/D;aACJ;SACJ;QACD,MAAM,EAAE;YACJ,IAAI,EAAE,YAAY,CAAC,YAAY;YAC/B,WAAW,EAAE;gBACT;oBACI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;iBACrD;gBACD;oBACI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;iBAC/D;aACJ;SACJ;KACJ;IACD;QACI,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;QACzB,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE;QAC1E,KAAK,EAAE,WAAW;QAClB,KAAK,EAAE;YACH,IAAI,EAAE,YAAY,CAAC,OAAO;YAC1B,WAAW,EAAE;gBACT,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC5D,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;aAC/D;SACJ;QACD,MAAM,EAAE,IAAI;KACf;IACD;QACI,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;QACzB,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE;QAC1E,KAAK,EAAE,WAAW;QAClB,KAAK,EAAE;YACH,IAAI,EAAE,YAAY,CAAC,OAAO;YAC1B,WAAW,EAAE;gBACT,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBAClD,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;aACrD;SACJ;QACD,MAAM,EAAE;YACJ,IAAI,EAAE,YAAY,CAAC,OAAO;YAC1B,WAAW,EAAE;gBACT,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBAClD,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;aACrD;SACJ;QACD,WAAW,EAAE,uCAAuC;KACvD;IACD;QACI,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;QACzB,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE;QAC1E,KAAK,EAAE,WAAW;QAClB,KAAK,EAAE;YACH,IAAI,EAAE,YAAY,CAAC,KAAK;YACxB,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;SACxB;QACD,MAAM,EAAE;YACJ,IAAI,EAAE,YAAY,CAAC,KAAK;YACxB,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;SACxB;QACD,WAAW,EAAE,4CAA4C;KAC5D;CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAA8C;IAC7E,IAAI,EAAE,kBAAkB;IACxB,IAAI,EAAE,sBAAsB,CAAC,gBAAgB;IAC7C,YAAY,EAAE,WAAW,CAAC,iBAAiB;IAC3C,QAAQ,EAAE,0BAA0B,CAAC,GAAG;IACxC,QAAQ;IACR,WAAW,EAAE,wEAAwE;IACrF,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE;QACtB,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IACD;;;;;MAKE;IACF,GAAG,EAAE;QACD,OAAO,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;QAChF,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,YAAY,CACtD,eAAe,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CACpF;KACJ;IACD,OAAO,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;IAC5B,eAAe,EAAE;QACb,KAAK,EAAE;YACH,IAAI,EAAE,SAAS,CAAC,GAAG;YACnB,WAAW,EAAE,8HAA8H;SAC9I;KACJ;IACD,kBAAkB,EAAE,CAAC,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,KAAK,EAAE;QACxB,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,4BAA4B,KAAK,4BAA4B,CAAC,CAAC;QACnF,CAAC;IACL,CAAC;CACJ,CAAC"}

package/dist/src/function-configs/geo/geoDisjoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geoDisjoint.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoDisjoint.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EACH,mBAAmB,EAKtB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC5B,KAAK,EAAE,QAAQ,CAAC;CACnB;AA8DD,eAAO,MAAM,iBAAiB,EAAE,mBAAmB,CAAC,eAAe,CA+BlE,CAAC"}
+{"version":3,"file":"geoDisjoint.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoDisjoint.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EACH,mBAAmB,EAKtB,MAAM,kBAAkB,CAAC;AAK1B,MAAM,WAAW,eAAe;IAC5B,KAAK,EAAE,QAAQ,CAAC;CACnB;AA8DD,eAAO,MAAM,iBAAiB,EAAE,mBAAmB,CAAC,eAAe,CAuClE,CAAC"}

package/dist/src/function-configs/geo/geoDisjoint.js

@@ -1,6 +1,7 @@
 import { geoDisjointFP, toGeoJSON } from '@terascope/geo-utils';
 import { FieldType, GeoShapeType } from '@terascope/types';
 import { ProcessMode, FunctionDefinitionType, FunctionDefinitionCategory } from '../interfaces.js';
+import { isGeoColumn, isGeoArg, asGeometry, constantGeometry, tryPredicate, isScalarColumn } from './sql-utils.js';
 const examples = [
     {
         args: { value: ['10,10', '10,50', '50,50', '50,10', '10,10'] },
@@ -70,6 +71,12 @@ export const geoDisjointConfig = {
     create({ args: { value } }) {
         return geoDisjointFP(value);
     },
+    /** `ST_Disjoint`. Gives the same answers as `geoDisjoint`, including for shapes with holes. */
+    sql: {
+        applies: (args, inputConfig) => isScalarColumn(inputConfig)
+            && isGeoColumn(inputConfig) && isGeoArg(args.value),
+        expression: ({ value, args, inputConfig }) => tryPredicate(`ST_Disjoint(${asGeometry(value, inputConfig)}, ${constantGeometry(args.value)})`),
+    },
     accepts: [
         FieldType.GeoJSON,
         FieldType.GeoPoint,

package/dist/src/function-configs/geo/geoDisjoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"geoDisjoint.js","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoDisjoint.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"geoDisjoint.js","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoDisjoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAY,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAEH,WAAW,EACX,sBAAsB,EACtB,0BAA0B,EAE7B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACH,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,YAAY,EAAE,cAAc,EACpF,MAAM,gBAAgB,CAAC;AAMxB,MAAM,QAAQ,GAAiD;IAC3D;QACI,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAC9D,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE,EAAE;QACzE,KAAK,EAAE,WAAW;QAClB,KAAK,EAAE,wBAAwB;QAC/B,MAAM,EAAE,wBAAwB;KACnC;IACD;QACI,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAC9D,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE;QAC1E,KAAK,EAAE,WAAW;QAClB,KAAK,EAAE;YACH,IAAI,EAAE,YAAY,CAAC,KAAK;YACxB,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;SACxB;QACD,MAAM,EAAE,IAAI;KACf;IACD;QACI,IAAI,EAAE;YACF,KAAK,EAAE;gBACH,IAAI,EAAE,YAAY,CAAC,OAAO;gBAC1B,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aAC9D;SACJ;QACD,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE;QAC1E,KAAK,EAAE,WAAW;QAClB,KAAK,EAAE;YACH,IAAI,EAAE,YAAY,CAAC,OAAO;YAC1B,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;SACpE;QACD,MAAM,EAAE;YACJ,IAAI,EAAE,YAAY,CAAC,OAAO;YAC1B,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;SACpE;KACJ;IACD;QACI,IAAI,EAAE;YACF,KAAK,EAAE;gBACH,IAAI,EAAE,YAAY,CAAC,OAAO;gBAC1B,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aAC9D;SACJ;QACD,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE;QAC1E,KAAK,EAAE,WAAW;QAClB,KAAK,EAAE;YACH,IAAI,EAAE,YAAY,CAAC,YAAY;YAC/B,WAAW,EAAE;gBACT;oBACI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;iBACrD;gBACD;oBACI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;iBAC/D;aACJ;SACJ;QACD,MAAM,EAAE,IAAI;KACf;CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAyC;IACnE,IAAI,EAAE,aAAa;IACnB,IAAI,EAAE,sBAAsB,CAAC,gBAAgB;IAC7C,YAAY,EAAE,WAAW,CAAC,WAAW;IACrC,QAAQ,EAAE,0BAA0B,CAAC,GAAG;IACxC,QAAQ;IACR,WAAW,EAAE,kHAAkH;IAC/H,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE;QACtB,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IACD,+FAA+F;IAC/F,GAAG,EAAE;QACD,OAAO,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC;eACpD,WAAW,CAAC,WAAW,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;QACvD,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,YAAY,CACtD,eAAe,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CACpF;KACJ;IACD,OAAO,EAAE;QACL,SAAS,CAAC,OAAO;QACjB,SAAS,CAAC,QAAQ;QAClB,SAAS,CAAC,GAAG;QACb,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,MAAM;QAChB,SAAS,CAAC,MAAM;KACnB;IACD,eAAe,EAAE;QACb,KAAK,EAAE;YACH,IAAI,EAAE,SAAS,CAAC,GAAG;YACnB,WAAW,EAAE,sFAAsF;SACtG;KACJ;IACD,kBAAkB,EAAE,CAAC,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,KAAK,EAAE;QACxB,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAClG,CAAC;IACL,CAAC;CACJ,CAAC"}

package/dist/src/function-configs/geo/geoIntersects.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geoIntersects.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoIntersects.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EACH,mBAAmB,EAKtB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,iBAAiB;IAC9B,KAAK,EAAE,QAAQ,CAAC;CACnB;AA+DD,eAAO,MAAM,mBAAmB,EAAE,mBAAmB,CAAC,iBAAiB,CA+BtE,CAAC"}
+{"version":3,"file":"geoIntersects.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoIntersects.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EACH,mBAAmB,EAKtB,MAAM,kBAAkB,CAAC;AAK1B,MAAM,WAAW,iBAAiB;IAC9B,KAAK,EAAE,QAAQ,CAAC;CACnB;AA+DD,eAAO,MAAM,mBAAmB,EAAE,mBAAmB,CAAC,iBAAiB,CAyCtE,CAAC"}

package/dist/src/function-configs/geo/geoIntersects.js

@@ -1,6 +1,7 @@
 import { geoIntersectsFP, toGeoJSON } from '@terascope/geo-utils';
 import { FieldType, GeoShapeType } from '@terascope/types';
 import { ProcessMode, FunctionDefinitionType, FunctionDefinitionCategory } from '../interfaces.js';
+import { isGeoColumn, isGeoArg, asGeometry, constantGeometry, tryPredicate, isScalarColumn } from './sql-utils.js';
 const examples = [
     {
         args: { value: ['10,10', '10,50', '50,50', '50,10', '10,10'] },
@@ -71,6 +72,14 @@ export const geoIntersectsConfig = {
     create({ args: { value } }) {
         return geoIntersectsFP(value);
     },
+    /**
+     * `ST_Intersects`. Gives the same answers as `geoIntersects`, including for shapes with holes.
+    */
+    sql: {
+        applies: (args, inputConfig) => isScalarColumn(inputConfig)
+            && isGeoColumn(inputConfig) && isGeoArg(args.value),
+        expression: ({ value, args, inputConfig }) => tryPredicate(`ST_Intersects(${asGeometry(value, inputConfig)}, ${constantGeometry(args.value)})`),
+    },
     accepts: [
         FieldType.GeoJSON,
         FieldType.GeoPoint,

package/dist/src/function-configs/geo/geoIntersects.js.map

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

package/dist/src/function-configs/geo/geoPointWithinRange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geoPointWithinRange.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoPointWithinRange.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiC,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACH,mBAAmB,EAEtB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,uBAAuB;IACpC,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,yBAAyB,EAAE,mBAAmB,CAAC,uBAAuB,CAwDlF,CAAC"}
+{"version":3,"file":"geoPointWithinRange.d.ts","sourceRoot":"","sources":["../../../../src/function-configs/geo/geoPointWithinRange.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiC,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACH,mBAAmB,EAEtB,MAAM,kBAAkB,CAAC;AAI1B,MAAM,WAAW,uBAAuB;IACpC,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,yBAAyB,EAAE,mBAAmB,CAAC,uBAAuB,CAgFlF,CAAC"}

package/dist/src/function-configs/geo/geoPointWithinRange.js

@@ -2,6 +2,8 @@ import { joinList } from '@terascope/core-utils';
 import { geoPointWithinRangeFP, isGeoPoint, parseGeoDistance } from '@terascope/geo-utils';
 import { FieldType, GEO_DISTANCE_UNITS } from '@terascope/types';
 import { ProcessMode, FunctionDefinitionType, FunctionDefinitionCategory } from '../interfaces.js';
+import { parseGeoPoint } from '@terascope/geo-utils';
+import { isGeoPointColumn, rangeInMeters, distanceSphere } from './sql-utils.js';
 export const geoPointWithinRangeConfig = {
     name: 'geoPointWithinRange',
     aliases: ['geoDistance'],
@@ -28,6 +30,32 @@ export const geoPointWithinRangeConfig = {
     create({ args: { point, distance } }) {
         return geoPointWithinRangeFP(point, distance);
     },
+    /**
+     * A true distance test. `geoPointWithinRange` approximates the circle with a 64-sided polygon,
+     * so it reports some points just inside the range as out of range: for `1000km`, a point
+     * 998.867 km away is `false` in JavaScript and `true` here.
+     *
+     * `ST_Distance_Sphere` takes (lat, lon); see `distanceSphere`.
+    */
+    sql: {
+        applies: (args, inputConfig) => {
+            if (!isGeoPointColumn(inputConfig))
+                return false;
+            try {
+                parseGeoPoint(args.point);
+                const { distance, unit } = parseGeoDistance(args.distance);
+                return rangeInMeters(distance, unit) != null;
+            }
+            catch {
+                return false;
+            }
+        },
+        expression: ({ value, args }) => {
+            const { distance, unit } = parseGeoDistance(args.distance);
+            const meters = rangeInMeters(distance, unit);
+            return `(${distanceSphere(value, parseGeoPoint(args.point))} <= ${meters})`;
+        },
+    },
     accepts: [
         FieldType.GeoJSON,
         FieldType.GeoPoint,