Merge pull request #2 from NativeScript/feat/ns7

fix: NativeClass decorator and es2017 build for ns 7

Author: shiv19

src-angular/index.ts

@@ -1,4 +1,3 @@
-/// <reference path="references.d.ts" />
 import { NgModule, Directive } from '@angular/core';
 import { registerElement } from '@nativescript/angular';
 import { UIChartsView } from '@nativescript/ui-charts';

src-angular/package.json

@@ -29,7 +29,7 @@
 		"@nativescript/angular": "rc",
 		"@nativescript/core": "rc",
 		"cpy-cli": "~3.1.1",
-		"@nativescript/ui-charts": "file:../src",
+		"@nativescript/ui-charts": "latest",
 		"ng-packagr": "~10.0.0",
 		"rxjs": "^6.6.0",
 		"typescript": "~3.9.0",

src-angular/references.d.ts

@@ -62,6 +62,7 @@ export declare const typesMap: {
     HIDataLabels: (options: any) => java.util.ArrayList<any>;
     HIExporting: (options: any) => any;
     HIFunction: (options: any) => com.highsoft.highcharts.core.HIFunction | HIFunction;
+    HIHover: (options: any) => any;
     HILabel: (options: any) => any;
     HILabels: (options: any) => any;
     HILayoutAlgorithm: (options: any) => any;
@@ -74,13 +75,16 @@ export declare const typesMap: {
     HIPoint: (options: any) => any;
     HIPopup: (options: any) => any;
     HIPlotOptions: (options: any) => any;
+    HIPlotBands: (options: any) => any;
+    HIPlotLines: (options: any) => any;
     HIResetZoomButton: (options: any) => any;
     HIScrollablePlotArea: (options: any) => any;
     HISeries: (options: any) => any;
     HIShapes: (options: any) => any;
     HIStackLabels: (options: any) => any;
     HIStates: (options: any) => any;
     HISubtitle: (options: any) => any;
+    HITime: (options: any) => any;
     HITitle: (options: any) => any;
     HITheme: (options: any) => any;
     HITooltip: (options: any) => any;

src/options-handlers/helpers/_helpers.common.d.ts

@@ -1 +1 @@
-export declare function plotLinesHandler(plotLinesOptions: any): any;
+export declare function plotLinesHandler(plotLineOptions: any): any;

src/options-handlers/plotLines/plotLines-handler.d.ts

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/ui-charts",
-	"version": "0.0.4",
+	"version": "0.0.5",
 	"description": "Nativescript wrapper for Highcharts iOS and Android SDKs",
 	"main": "ui-charts",
 	"typings": "index.d.ts",
@@ -15,7 +15,7 @@
 		"url": "git+https://github.com/NativeScript/nativescript-ui-charts.git"
 	},
 	"scripts": {
-		"tsc": "npm i && tsc",
+		"tsc": "npm i && ts-patch install && tsc",
 		"build": "npm run tsc && npm run build.native && npm run build.angular && mv \"$(npm pack | tail -n 1)\" nativescript-ui-charts.tgz",
 		"build.angular": "cd ../src-angular && npm run build",
 		"build.native": "node scripts/build-native.js",
@@ -29,7 +29,7 @@
 		"demo-angular.android": "npm i && cd ../demo-angular && tns run android --no-hmr",
 		"demo-angular.reset": "cd ../demo-angular && npx rimraf -- hooks node_modules platforms package-lock.json",
 		"plugin.prepare": "npm run build && cd ../demo && tns plugin remove @nativescript/ui-charts && tns plugin add ../src && cd ../demo-angular && tns plugin remove @nativescript/ui-charts && tns plugin add ../src",
-		"clean": "npm run demo.reset && npm run demo-angular.reset && npx rimraf -- node_modules package-lock.json angular && npm i"
+		"clean": "npm run demo.reset && npm run demo-angular.reset && npx rimraf node_modules package-lock.json angular && npm run tsc"
 	},
 	"keywords": [
 		"NativeScript",
@@ -58,14 +58,16 @@
 	"homepage": "https://github.com/NativeScript/nativescript-ui-charts",
 	"devDependencies": {
 		"@nativescript/core": "rc",
+		"@nativescript/webpack": "~2.1.0",
 		"nativescript-vue": "^2.7.0",
 		"prompt": "^1.0.0",
 		"rimraf": "^3.0.2",
 		"semver": "^7.3.2",
 		"@nativescript/types": "rc",
 		"tslint": "^6.1.2",
+		"ts-node": "^9.0.0",
+		"ts-patch": "~1.3.0",
 		"typescript": "~3.9.0"
 	},
-	"dependencies": {},
 	"bootstrapper": "nativescript-plugin-seed"
 }

src/package.json

@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
       "noEmitHelpers": true,
-      "target": "es5",
-      "module": "commonjs",
+      "target": "es2017",
+      "module": "esnext",
       "declaration": true,
       "noImplicitAny": false,
       "noImplicitUseStrict": true,
@@ -17,12 +17,14 @@
       "skipLibCheck": true,
       "skipDefaultLibCheck": true,
       "lib": [
-          "es6",
+          "es2017",
           "dom"
+      ],
+      "plugins": [
+        { "transform": "@nativescript/webpack/transformers/ns-transform-native-classes", "type": "raw" }
       ]
   },
   "exclude": [
-      "node_modules",
-      "node_modules/@nativescript/types"
+      "node_modules"
   ]
 }

src/tsconfig.json

@@ -71,6 +71,7 @@ export class UIChartsView extends UIChartsViewBase {
     }
 }
 
+@NativeClass()
 class HighchartsViewDelegateImpl
     extends NSObject // native delegates mostly always extend NSObject
     implements HIChartViewDelegate {