@koopjs/winnow - npm Package Compare versions

Comparing version 4.1.2 to 4.1.3

package.json

 {
   "name": "@koopjs/winnow",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "description": "Apply sql-like filters to GeoJSON",
@@ -53,3 +53,3 @@ "main": "src/index.js",
     "@koopjs/logger": "5.0.0",
-    "@terraformer/arcgis": "^2.1.1",
+    "@terraformer/arcgis": "^2.1.2",
     "@terraformer/spatial": "^2.1.2",
@@ -59,13 +59,13 @@ "@turf/bbox-polygon": "^6.5.0",
     "@types/geojson": "^7946.0.10",
-    "alasql": "^4.0.0",
+    "alasql": "^4.1.4",
     "classybrew": "0.0.3",
-    "joi": "^17.6.3",
+    "joi": "^17.10.1",
     "js-sql-parser": "^1.4.1",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "ngeohash": "^0.6.3",
     "proj4": "^2.9.0",
-    "simple-statistics": "^7.0.0",
+    "simple-statistics": "^7.8.3",
     "string-hash": "^1.1.3",
-    "wkt-parser": "^1.2.2"
+    "wkt-parser": "^1.3.3"
   },
@@ -81,5 +81,5 @@ "devDependencies": {
   "optionalDependencies": {
-    "farmhash": "^3.1.0"
+    "farmhash": "^3.3.0"
   },
   "types": "index.d.ts"
 }

src/filter-and-transform/filters/hashed-objectid-comparator.js

 const createIntegerHash = require('../helpers/create-integer-hash');
-const { logger } = require('../../logger');
+const logManager = require('../../logger');
 
@@ -48,4 +48,4 @@ /**
   
-  logger.debug(`unsupported operator "${operator}"; ignoring`);
+  logManager.logger.debug(`unsupported operator "${operator}"; ignoring`);
   return false;
 };

src/filter-and-transform/transforms/project.js

@@ -1,2 +0,2 @@
-const { logger } = require('../../logger');
+const logManager = require('../../logger');
 const projectCoordinates = require('../../helpers/project-coordinates');
@@ -25,3 +25,3 @@
   } catch (error) {
-    logger.debug(error);
+    logManager.logger.debug(error);
     // TODO: should we throw error instead of returning null?
@@ -28,0 +28,0 @@ return null;

src/filter-and-transform/transforms/to-esri-attributes.js

 const _ = require('lodash');
-const { logger } = require('../../logger');
+const logManager = require('../../logger');
 const { createIntegerHash } = require('../helpers');
@@ -16,3 +16,3 @@
   if (requiresObjectId && shouldLogIdFieldWarning(properties[idField])) {
-    logger.debug(`OBJECTIDs created from provider's "idField" (${idField}: ${properties[idField]}) are not integers from 0 to 2147483647`);
+    logManager.logger.debug(`OBJECTIDs created from provider's "idField" (${idField}: ${properties[idField]}) are not integers from 0 to 2147483647`);
   }
@@ -19,0 +19,0 @@

src/logger/index.js

@@ -1,19 +0,19 @@
-let logger = require('./logger');
 const Logger = require('@koopjs/logger');
+let logger = new Logger();
 
 module.exports = {
-  logger,
-  setLogger,
+  get logger () {
+    return logger;
+  },
+  setLogger: ({ logger: _logger, logLevel }) => {
+    if (_logger) {
+      logger = _logger;
+      logger.silly('Winnow no longer using default logger.');
+      return;
+    }
+  
+    if (logLevel) {
+      logger = new Logger({ logLevel });
+    }
+  }
 };
-
-function setLogger({ logger: _logger, logLevel }) {
-  if (_logger) {
-    logger = _logger;
-    logger.silly('Winnow no longer using default logger.');
-    return;
-  }
-
-  if (logLevel) {
-    logger = new Logger({ logLevel });
-  }
-}

src/normalize-query-options/geometry-filter-spatial-reference.js

 const _ = require('lodash');
-const { logger } = require('../logger');
+const logManager = require('../logger');
 const { normalizeArray } = require('./helpers');
@@ -19,3 +19,3 @@ const normalizeSpatialReference = require('./spatial-reference');
   if (!spatialReference) {
-    logger.debug('geometry filter spatial reference unknown. Defaulting to EPSG:4326.');
+    logManager.logger.debug('geometry filter spatial reference unknown. Defaulting to EPSG:4326.');
   }
@@ -22,0 +22,0 @@ return spatialReference || { wkid: 4326 };

src/normalize-query-options/id-field.js

 const _ = require('lodash');
-const { logger } = require('../logger');
+const logManager = require('../logger');
 /**
@@ -12,3 +12,3 @@ * Ensure idField is set if metadata doesn't have a value but a field named OBJECTID is present
   if (shouldWarnIdFieldIsMissingFromData(idField, features)) {
-    logger.debug('requested provider has "idField" assignment, but this property is not found in properties of all features.');
+    logManager.logger.debug('requested provider has "idField" assignment, but this property is not found in properties of all features.');
   }
@@ -15,0 +15,0 @@

src/normalize-query-options/limit.js

@@ -1,2 +0,2 @@
-const { logger } = require('../logger');
+const logManager = require('../logger');
 
@@ -12,3 +12,3 @@ /**
   if (limit !== undefined && !Number.isInteger(limit)) {
-    logger.debug('"limit" option is not an integer; skipping');
+    logManager.logger.debug('"limit" option is not an integer; skipping');
     return;
@@ -15,0 +15,0 @@ }

src/normalize-query-options/output-data-spatial-reference.js

 const normalizeSpatialReference = require('./spatial-reference');
 const { getCollectionCrs } = require('./helpers');
-const { logger } = require('../logger');
+const logManager = require('../logger');
 
@@ -23,3 +23,3 @@ function normalizeOutputDataSpatialReference (options = {}) {
   if (!spatialReference) {
-    logger.debug(`spatial reference "${outputSpatialReference}" could not be normalized. Defaulting to EPSG:4326.`);
+    logManager.logger.debug(`spatial reference "${outputSpatialReference}" could not be normalized. Defaulting to EPSG:4326.`);
     // @TODO: throw error
@@ -26,0 +26,0 @@ }

src/normalize-query-options/source-data-spatial-reference.js

 const normalizeSpatialReference = require('./spatial-reference');
 const { getCollectionCrs } = require('./helpers');
-const { logger } = require('../logger');
+const logManager = require('../logger');
 
@@ -12,3 +12,3 @@ function normalizeSourceDataSpatialReference ({ inputCrs, sourceSR, collection } = {}) {
   if (!spatialReference) {
-    logger.debug(`spatial reference "${sourceDataSpatialReference}" could not be normalized. Defaulting to EPSG:4326.`);
+    logManager.logger.debug(`spatial reference "${sourceDataSpatialReference}" could not be normalized. Defaulting to EPSG:4326.`);
     // @TODO: throw error?
@@ -15,0 +15,0 @@ }

src/normalize-query-options/spatial-reference.js

 const esriProjCodes = require('@esri/proj-codes');
 const Joi = require('joi');
 const wktParser = require('wkt-parser');
-const { logger } = require('../logger');
+const logManager = require('../logger');
 const PROJ4_WKIDS = [4326, 4269, 3857, 3785, 900913, 102113];
@@ -24,3 +24,3 @@ const wktLookup = new Map();
   if (error) {
-    logger.debug(`${input} is not a valid spatial reference; defaulting to none`);
+    logManager.logger.debug(`${input} is not a valid spatial reference; defaulting to none`);
     // Todo: throw error
@@ -97,3 +97,3 @@ return;
     // Todo - throw error
-    logger.debug(`An unknown spatial reference was detected: ${wkid}; defaulting to none`);
+    logManager.logger.debug(`An unknown spatial reference was detected: ${wkid}; defaulting to none`);
     return;
@@ -119,3 +119,3 @@ }
   } catch (err) {
-    logger.debug(`An un-parseable WKT spatial reference was detected: ${wkt}`);
+    logManager.logger.debug(`An un-parseable WKT spatial reference was detected: ${wkt}`);
     // Todo: throw error
@@ -122,0 +122,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

86797

increased by0.06%

Worsened metrics

Number of package files

79

decreased by-1.25%

Lines of code

2077

decreased by-0.1%

Dependency changes

• Updated@terraformer/arcgis@^2.1.2

• Updatedalasql@^4.1.4

• Updatedjoi@^17.10.1

• Updatedlodash@^4.17.21

• Updatedsimple-statistics@^7.8.3

• Updatedwkt-parser@^1.3.3