Merge pull request #9 from hwbllmnn/use-typescript

Use typescript

jest.config.js

@@ -1,6 +1,7 @@
 module.exports = {
   moduleFileExtensions: [
-    'js'
+    'js',
+    'ts'
   ],
   moduleDirectories: [
     'node_modules'
@@ -10,7 +11,11 @@ module.exports = {
   ],
   collectCoverage: true,
   collectCoverageFrom: [
-    'src/**/*.js'
+    'src/**/*.ts'
   ],
+  transform: {
+    '\\.(js)$': '<rootDir>/node_modules/babel-jest',
+    '\\.(ts)$': 'ts-jest'
+  },
   coverageDirectory: '<rootDir>/coverage'
 };

oltypes.d.ts

@@ -0,0 +1,7 @@
+declare module 'ol/extent';
+declare module 'ol/geom/Geometry';
+declare module 'ol/style/Style';
+declare module 'ol/geom/Polygon';
+declare module 'ol/geom/LineString';
+declare module 'ol/render/canvas/Immediate';
+declare module 'ol/transform';

package.json

@@ -5,12 +5,12 @@
   "main": "src/index.js",
   "scripts": {
     "release": "np --no-yarn && git push git@github.com:terrestris/legend-util.git master --tags",
-    "lint": "eslint --ext js src/",
+    "lint": "tslint --project tsconfig.json --config tslint.json && tsc --noEmit --project tsconfig.json",
     "test": "jest --maxWorkers=4",
     "test:watch": "jest --watchAll",
     "coveralls": "cat coverage/lcov.info | coveralls",
     "clean:dist": "rimraf ./dist/*",
-    "build:dist": "npm run clean:dist && webpack",
+    "build:dist": "tsc -p ./tsconfig.prod.json",
     "build:dev": "npm run clean:dist && webpack --mode=development",
     "start:dev": "npm run clean:dist && webpack --mode=development --watch"
   },
@@ -28,12 +28,15 @@
   "peerDependencies": {
     "d3": "~5"
   },
+  "types": "dist/index.d.ts",
   "devDependencies": {
     "@babel/core": "7.2.2",
     "@babel/plugin-proposal-class-properties": "7.3.0",
     "@babel/plugin-proposal-function-bind": "7.2.0",
     "@babel/polyfill": "7.2.5",
     "@babel/preset-env": "7.3.1",
+    "@types/d3-selection": "1.3.4",
+    "@types/jest": "24.0.0",
     "babel-eslint": "10.0.1",
     "babel-jest": "24.0.0",
     "babel-loader": "8.0.5",
@@ -43,12 +46,18 @@
     "coveralls": "3.0.2",
     "d3": "5.8.2",
     "eslint": "5.13.0",
+    "geostyler": "^3.0.0",
     "geostyler-openlayers-parser": "1.0.0",
+    "geostyler-style": "^0.14.3",
     "jest": "24.0.0",
     "jsdom": "13.2.0",
     "np": "4.0.2",
     "ol": "5.3.0",
     "rimraf": "2.6.3",
+    "ts-jest": "23.10.5",
+    "tslint": "5.12.1",
+    "typedoc": "0.14.2",
+    "typescript": "3.3.3",
     "webpack": "4.29.1",
     "webpack-cli": "3.2.3"
   }

src/LegendRenderer/LegendRenderer.spec.js → src/LegendRenderer/LegendRenderer.spec.ts

@@ -9,15 +9,20 @@ describe('LegendRenderer', () => {
   });
 
   it('can be constructed', () => {
-    const renderer = new LegendRenderer();
+    const renderer = new LegendRenderer({
+      size: [0, 0]
+    });
     expect(renderer).not.toBeUndefined();
   });
 
   it('can convert config objects', () => {
-    const renderer = new LegendRenderer();
+    const renderer = new LegendRenderer({
+      size: [0, 0]
+    });
     const config = renderer.extractConfigFromStyle({
       rules: [{
-        name: 'Legend item 1'
+        name: 'Legend item 1',
+        symbolizers: []
       }],
       name: 'Legend 1'
     });
@@ -26,22 +31,29 @@ describe('LegendRenderer', () => {
   });
 
   it('can convert config objects without style name', () => {
-    const renderer = new LegendRenderer();
+    const renderer = new LegendRenderer({
+      size: [0, 0]
+    });
     const config = renderer.extractConfigFromStyle({
       rules: [{
-        name: 'Legend item 1'
-      }]
+        name: 'Legend item 1',
+        symbolizers: []
+      }],
+      name: ''
     });
     expect(config.title).toBe(undefined);
   });
 
   it('will not throw when constructing a rule icon', () => {
-    const renderer = new LegendRenderer();
+    const renderer = new LegendRenderer({
+      size: [0, 0]
+    });
     expect(() => renderer.getRuleIcon({
       symbolizers: [{
         kind: 'Mark',
         wellKnownName: 'Circle'
-      }]
+      }],
+      name: ''
     })).not.toThrow();
   });