winnow - npm Package Compare versions

Comparing version 1.12.7 to 1.13.0

CHANGELOG.md

@@ -5,2 +5,10 @@ # Change Log
 
+## [1.13.0] - 04-04-2018
+### Added
+* Add support for date comparisons in WHERE filter with timestamp Syntax and BETWEEN operator
+
+### Fixed
+* Exclusion of date fields from response when not requested with `outFields` option
+* Attempted property access of null feature in `ST_Intersects` function
+
 ## [1.12.7] - 04-03-2018 
@@ -233,3 +241,4 @@ ### Fixed
 
-[1.12.6]: https://github.com/featureserver/winnow/compare/v1.12.6...v1.12.7
+[1.13.0]: https://github.com/featureserver/winnow/compare/v1.12.7...v1.13.0
+[1.12.7]: https://github.com/featureserver/winnow/compare/v1.12.6...v1.12.7
 [1.12.6]: https://github.com/featureserver/winnow/compare/v1.12.5...v1.12.6
@@ -236,0 +245,0 @@ [1.12.5]: https://github.com/featureserver/winnow/compare/v1.12.4...v1.12.5

dist/options/index.js

@@ -34,3 +34,3 @@ var _ = require('lodash')
   })
-  prepared.dateFields = normalizeDateFields(prepared.collection)
+  prepared.dateFields = normalizeDateFields(prepared.collection, prepared.fields)
   if (prepared.where === '1=1') { delete prepared.where }
@@ -37,0 +37,0 @@ return prepared

dist/options/normalizeOptions.js

@@ -31,7 +31,17 @@ var _ = require('lodash')
 
-function normalizeDateFields (collection) {
+/**
+ * Identify Date-type fields and explicitly add to dateFields array if outFields query param contains
+ * the date field name or if outFields is a wildcard (when outFields=*, preparedFields === undefined)
+ *
+ * @param {Object} collection metadata about the data source
+ * @param String[] preparedFields - single element string array of delimited field names from "outFields" query param
+ */
+function normalizeDateFields (collection, preparedFields) {
   var dateFields = []
   if (collection && collection.metadata && collection.metadata.fields) {
     collection.metadata.fields.forEach(function (field, i) {
-      if (field.type === 'Date') { dateFields.push(field.name) }
+      // If field is a Date and was included in requested fields (or requested fields are wildcard) add to array
+      if (field.type === 'Date' && (preparedFields === undefined || preparedFields.indexOf(field.name) > -1)) {
+        dateFields.push(field.name)
+      }
     })
@@ -38,0 +48,0 @@ }

dist/options/normalizeSQL.js

@@ -15,6 +15,12 @@ function normalizeWhere (options) {
 
+/**
+ * Transform the input of requested response fields
+ * @param {Object} options - object that may contain 'fields' or 'outFields' property
+ */
 function normalizeFields (options) {
   var fields = options.fields || options.outFields
   if (fields === '*') { return undefined }
-  return typeof fields === 'string' ? [fields] : fields
+  if (typeof fields === 'string' || fields instanceof String) { return fields.split(',') }
+  if (fields instanceof Array) { return fields }
+  return undefined
 }
@@ -21,0 +27,0 @@

dist/sql.js

@@ -37,4 +37,5 @@ var Terraformer = require('terraformer')
 
+  if (!feature) { return false }
   if (!(feature.type || feature.coordinates)) { feature = convertFromEsri(feature) } // TODO: remove ? temporary esri geometry conversion
-  if (!(feature && feature.type && feature.coordinates && feature.coordinates.length > 0)) { return false }
+  if (!(feature.type && feature.coordinates && feature.coordinates.length > 0)) { return false }
   if (feature.type === 'Point') { return sql.fn.ST_Contains(feature, filterGeom) }
@@ -41,0 +42,0 @@ var filter = new Terraformer.Primitive(filterGeom)

dist/where.js

@@ -19,2 +19,4 @@ var _ = require('lodash');
     return '1=1'
+  } else if (node.operator === 'BETWEEN') {
+    expr = traverse(node.left, options) + " " + (node.operator) + " " + (traverse(node.right.value[0], options)) + "AND" + (traverse(node.right.value[1], options))
   } else {
@@ -105,3 +107,15 @@ // store the column node for value decoding
 
+
 /**
+ * Convert a timestamp node to its iso8601 string representation.
+ *
+ * @param  {object} node    AST value node
+ * @param  {object} options winnow options
+ * @return {string}         value string
+ */
+function handleTimestampValue(node, options) {
+  return ("'" + (new Date(node.value).toISOString()) + "'")
+}
+
+/**
  * Traverse a SQL AST and return its string representation
@@ -132,2 +146,4 @@ * @param  {object} node    AST node
       return handleValue(node, options)
+    case 'timestamp':
+      return handleTimestampValue(node, options)
     default:
@@ -134,0 +150,0 @@ throw new Error('Unrecognized AST node: \n' + JSON.stringify(node, null, 2))

package.json

 {
   "name": "winnow",
-  "version": "1.12.7",
+  "version": "1.13.0",
   "description": "Apply sql-like filters to GeoJSON",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

Fixed alerts

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

153263

1.23%

Lines of code

1310

2.42%

Number of medium supply chain risk alerts

0

-100%

No dependency changes