Merge pull request #28 from Bayer-Group/TSlint-and-npm-audit-fix

npm audit and TS lint fix

Author: akuma1

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@bayer/geostyler-geoserver-sld-parser",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "GeoStyler-Geoserver-Style-Parser implementation for SLD",
   "main": "build/dist/GeoserverSldStyleParser.js",
   "types": "build/dist/GeoserverSldStyleParser.d.ts",
@@ -12,8 +12,7 @@
     "prepublishOnly": "npm run build",
     "test": "jest",
     "test:watch": "jest --watchAll",
-    "lint": "tslint --project tsconfig.json --config tslint.json && tsc --noEmit --project tsconfig.json",
-    "release": "np --no-yarn && git push https://github.com/terrestris/geostyler-sld-parser.git master --tags"
+    "lint": "tslint --project tsconfig.json --config tslint.json && tsc --noEmit --project tsconfig.json"
   },
   "license": "BSD",
   "repository": {
@@ -39,18 +38,20 @@
     "@babel/polyfill": "^7.4.4",
     "@babel/preset-env": "^7.5.5",
     "@babel/preset-typescript": "^7.3.3",
-    "@types/jest": "^24.0.18",
+    "@types/jest": "^27.0.3",
     "@types/lodash": "^4.14.138",
     "@types/node": "^12.7.3",
     "@types/xml2js": "^0.4.4",
     "babel-jest": "^24.9.0",
-    "coveralls": "^3.0.6",
-    "jest": "^24.9.0",
-    "np": "^5.0.3",
+    "buffer": "^6.0.3",
+    "child_process": "^1.0.2",
+    "jest": "^27.3.1",
+    "semver": "^7.3.5",
+    "terser-webpack-plugin": "^5.2.5",
     "ts-loader": "^6.0.4",
     "tslint": "^5.19.0",
-    "typescript": "^3.6.2",
-    "webpack": "^4.39.3",
-    "webpack-cli": "^3.3.7"
+    "typescript": "^4.5.2",
+    "webpack": "^5.64.3",
+    "webpack-cli": "^4.9.1"
   }
 }

package.json

@@ -0,0 +1,18 @@
+const semver = require('semver')
+const child_process = require('child_process')
+const packageJson = require('./../package.json')
+
+const packageName = packageJson.name
+const tag = packageJson.version.includes('-') ? 'next' : 'latest'
+const latestVersion = child_process.execSync(`npm view ${packageName}@latest version`).toString()
+
+// publish with a `shipping` tag so we can control the latest/next tags manually since NPM defaults to latest if no tag is provided
+child_process.execSync(`export SHIP=true && npm run build && npm publish -f --tag shipping`)
+// remove the temporary shipping tag
+child_process.execSync(`npm dist-tags remove ${packageName} shipping || true`)
+
+// only if the latest is less than the current version do we tag it (this ignores support branches)
+if (semver.gt(packageJson.version, latestVersion)) {
+    // add the appropriate next or latest tag manually to the version just published
+    child_process.execSync(`npm dist-tags add ${packageName}@${packageJson.version} ${tag}`)
+}

scripts/ship.js

@@ -1,4 +1,4 @@
-import GeoserverSldStyleParser from './GeoserverSldStyleParser'
+import GeoserverSldStyleParser from './GeoserverSldStyleParser';
 
 const polygonSimpleGraphicFill: any = {
   name: 'My Style',
@@ -7,22 +7,21 @@ const polygonSimpleGraphicFill: any = {
       name: 'My Rule',
       symbolizers: [
         {
-          "kind": "Fill",
-          "color": "#a5c9e5",
-          "graphicFill": {
-            "kind": "Mark",
-            "wellKnownName": "Star",
-            "radius": 8,
-            "color": "#0000FF",
+          'kind': 'Fill',
+          'color': '#a5c9e5',
+          'graphicFill': {
+            'kind': 'Mark',
+            'wellKnownName': 'Star',
+            'radius': 8,
+            'color': '#0000FF',
           },
-          "graphic-margin": '3 5 10'
+          'graphic-margin': '3 5 10'
         },
       ],
     },
   ],
 };
 
-
 const sldOutput = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <NamedLayer>
@@ -54,28 +53,25 @@ const sldOutput = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
       </FeatureTypeStyle>
     </UserStyle>
   </NamedLayer>
-</StyledLayerDescriptor>
-`
+</StyledLayerDescriptor>`;
 
 const parser = new GeoserverSldStyleParser();
 
 describe('GeoserverFillSymbolizer', () => {
   describe('#writeStyle', () => {
-    it('transforms graphic-margin in VendorOptions', () => {
+    it('transforms graphic-margin in VendorOptions', async () => {
       expect.assertions(1);
-      parser
-        .writeStyle(polygonSimpleGraphicFill).then(sld => {
-        expect(sld).toEqual(sldOutput);
-      });
+      const sld = await parser.writeStyle(polygonSimpleGraphicFill);
+      expect(sld).toEqual(sldOutput);
+
     });
   });
   describe('#readStyle', () => {
-    it('reads VendorOptions graphic-margin', () => {
+    it('reads VendorOptions graphic-margin', async () => {
       expect.assertions(1);
-      parser
-        .readStyle(sldOutput).then(gsObject => {
-        expect(gsObject).toEqual(polygonSimpleGraphicFill);
-      });
+      const gsObject =  await parser.readStyle(sldOutput);
+      expect(gsObject).toEqual(polygonSimpleGraphicFill);
+
     });
   });
 });

src/GeoserverFillSymbolizer.spec.ts

@@ -53,7 +53,7 @@ interface GeoserverMarkSymbolizer extends BasePointSymbolizer {
    */
   pitchScale?: 'map' | 'viewport';
 
-  func?: any
+  func?: any;
 }
 
-export default GeoserverMarkSymbolizer
+export default GeoserverMarkSymbolizer;

src/GeoserverMarkSymbolizer.ts

@@ -1,15 +1,19 @@
 import SldStyleParser from 'geostyler-sld-parser';
 import { WellKnownName } from 'geostyler-style';
 import GeoserverTextSymbolizer from './GeoserverTextSymbolizer';
-import GeoserverMarkSymbolizer from './GeoserverMarkSymbolizer'
+import GeoserverMarkSymbolizer from './GeoserverMarkSymbolizer';
+import GeoserverFillSymbolizer from './GeoserverFillSymbolizer';
 import {
   Filter,
   ComparisonFilter, BaseSymbolizer,
 } from 'geostyler-style';
-import GeoserverFillSymbolizer from './GeoserverFillSymbolizer';
-import GeoserverTextSymbolizer from './GeoserverTextSymbolizer';
-var _get = require('lodash.get')
-
+const _get = require('lodash.get');
+type CssParam  = {
+  '_': string | number,
+  '$': {
+    name: string
+  };
+};
 const VENDOR_OPTIONS_MAP = [
   'partials',
   'repeat',
@@ -28,7 +32,7 @@ function keysByValue (object: any, value: any) {
   return Object.keys(object).filter(key => object[key] === value);
 }
 
-var WELLKNOWNNAME_TTF_REGEXP = /^ttf:\/\/(.+)#(.+)$/;
+const WELLKNOWNNAME_TTF_REGEXP = /^ttf:\/\/(.+)#(.+)$/;
 
 class GeoserverSldStyleParser extends SldStyleParser {
   getSldComparisonFilterFromComparisonFilter(comparisonFilter: ComparisonFilter): any {
@@ -99,8 +103,7 @@ class GeoserverSldStyleParser extends SldStyleParser {
     return finalSymbolizer;
   }
 
-
-/**
+  /**
    * Get the GeoStyler-Style MarkSymbolizer from an SLD Symbolizer
    *
    * @param {object} sldSymbolizer The SLD Symbolizer
@@ -116,7 +119,6 @@ class GeoserverSldStyleParser extends SldStyleParser {
     const size: string = _get(sldSymbolizer, 'Graphic[0].Size[0]');
     const rotation: string = _get(sldSymbolizer, 'Graphic[0].Rotation[0]');
 
-
     let fillParams: any[] = _get(sldSymbolizer, 'Graphic[0].Mark[0].Fill[0].CssParameter') || [];
     if (fillParams.length === 0) {
       fillParams = _get(sldSymbolizer, 'Graphic[0].Mark[0].Fill[0].SvgParameter') || [];
@@ -132,46 +134,46 @@ class GeoserverSldStyleParser extends SldStyleParser {
       }
     }
 
-    var sldFunction = _get(sldSymbolizer, 'Graphic[0].Mark[0].Fill[0].CssParameter[' + colorIdx + '].Function');
+    const sldFunction = _get(sldSymbolizer, 'Graphic[0].Mark[0].Fill[0].CssParameter[' + colorIdx + '].Function');
 
     const fillOpacityIdx: number = fillParams.findIndex((cssParam: any) => {
       return cssParam.$.name === 'fill-opacity';
     });
     let fillOpacity: string = _get(sldSymbolizer,
-      'Graphic[0].Mark[0].Fill[0].CssParameter[' + fillOpacityIdx + ']._');
+                                   'Graphic[0].Mark[0].Fill[0].CssParameter[' + fillOpacityIdx + ']._');
     if (!fillOpacity) {
       fillOpacity = _get(sldSymbolizer,
-        'Graphic[0].Mark[0].Fill[0].SvgParameter[' + fillOpacityIdx + ']._');
+                         'Graphic[0].Mark[0].Fill[0].SvgParameter[' + fillOpacityIdx + ']._');
     }
     const markSymbolizer: GeoserverMarkSymbolizer = {
       kind: 'Mark',
     } as GeoserverMarkSymbolizer;
 
     if (sldFunction) {
       if (sldFunction[0].$.name === 'Interpolate') {
-        const perChunk = 2 // items per chunk
+        const perChunk = 2; // items per chunk
 
         var newArray = sldFunction[0].Literal.reduce((resultArray: any, item: any, index: any) => { 
-          const chunkIndex = Math.floor(index/perChunk)
+          const chunkIndex = Math.floor(index / perChunk);
 
-          if(!resultArray[chunkIndex]) {
-            resultArray[chunkIndex] = [] // start a new chunk
+          if (!resultArray[chunkIndex]) {
+            resultArray[chunkIndex] = []; // start a new chunk
           }
-          resultArray[chunkIndex].push(item)
+          resultArray[chunkIndex].push(item);
 
-          return resultArray
-        }, [])
+          return resultArray;
+        },                                           []);
 
         const newestArray = newArray.map((arr: any, i: any) => {
-          return [i === 0 ? '>' : '<', sldFunction[0].PropertyName[0], ...arr]
-        })
+          return [i === 0 ? '>' : '<', sldFunction[0].PropertyName[0], ...arr];
+        });
 
         const functionArray = [
           sldFunction[0].$.name,
           ...newestArray
-        ]
+        ];
 
-        markSymbolizer.func = functionArray
+        markSymbolizer.func = functionArray;
       }
     }
 
@@ -255,7 +257,7 @@ class GeoserverSldStyleParser extends SldStyleParser {
     }];
 
     if (markSymbolizer.color || markSymbolizer.fillOpacity) {
-      const cssParameters = [];
+      const cssParameters: CssParam[] = [];
       if (markSymbolizer.color) {
         cssParameters.push({
           '_': markSymbolizer.color,
@@ -309,14 +311,14 @@ class GeoserverSldStyleParser extends SldStyleParser {
     }
 
     if (markSymbolizer.func) {
-      const propertyName = markSymbolizer.func[1][1]
-      const emptyArray: string[] = []
+      const propertyName = markSymbolizer.func[1][1];
+      const emptyArray: string[] = [];
       markSymbolizer.func.map((arr: string[], i: any) => {
         if (i !== 0) {
-            emptyArray.push(arr[2])
-            if (arr.length === 4) emptyArray.push(arr[3])
+            emptyArray.push(arr[2]);
+            if (arr.length === 4) { emptyArray.push(arr[3]); }
           }
-      })
+      });
 
       const cssParameters = [];
 

src/GeoserverSldStyleParser.ts

@@ -1,4 +1,4 @@
-import GeoserverSldStyleParser from '../src/GeoserverSldStyleParser'
+import GeoserverSldStyleParser from '../src/GeoserverSldStyleParser';
 
 const pointSimpleText: any = {
   name: 'My Style',
@@ -15,7 +15,7 @@ const pointSimpleText: any = {
       ],
     },
   ],
-}
+};
 
 const sldOutput = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -38,27 +38,22 @@ const sldOutput = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
       </FeatureTypeStyle>
     </UserStyle>
   </NamedLayer>
-</StyledLayerDescriptor>
-`
-const parser = new GeoserverSldStyleParser()
+</StyledLayerDescriptor>`;
+const parser = new GeoserverSldStyleParser();
 
-describe('GeoserverTextSymbolizer', () => {
+describe('GeoserverTextSymbolizer',  () => {
   describe('#writeStyle', () => {
-    it('transforms spaceAround in VendorOptions', () => {
-      expect.assertions(1)
-      parser
-        .writeStyle(pointSimpleText).then((sld: string) => {
-        expect(sld).toEqual(sldOutput)
-      })
-    })
-  })
-  describe('#readStyle', () => {
-    it('reads VendorOptions space-around', () => {
-      expect.assertions(1)
-      parser
-        .readStyle(sldOutput).then(gsObject => {
-        expect(gsObject).toEqual(pointSimpleText)
-      })
-    })
-  })
-})
+    it('transforms spaceAround in VendorOptions', async () => {
+      expect.assertions(1);
+      const sld: string = await parser.writeStyle(pointSimpleText);
+      expect(sld).toEqual(sldOutput);
+    });
+  });
+  describe('#readStyle',  () => {
+    it('reads VendorOptions space-around', async () => {
+      expect.assertions(1);
+      const gsObject = await parser.readStyle(sldOutput);
+      expect(gsObject).toEqual(pointSimpleText);
+    });
+  });
+});

src/GeoserverTextSymbolizer.spec.ts

@@ -5,7 +5,7 @@
     "outDir": "build/dist",
     "module": "commonjs",
     "target": "es5",
-    "lib": ["es6", "dom"],
+    "lib": ["es6", "dom", "es2017"],
     "sourceMap": true,
     "moduleResolution": "node",
     "rootDir": "src",
@@ -30,4 +30,4 @@
     "browser",
     "browser-build.config.js"
   ]
-}
+}