Angular 15

.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
       - restore_cache:
           keys:
             - node-{{ checksum "package-lock.json" }}
-      - run: npm install
+      - run: npm install --no-save
       - save_cache:
           key: node-{{ checksum "package-lock.json" }}
           paths:

apps/playground/package.json

@@ -2,28 +2,27 @@
   "name": "playground",
   "private": false,
   "dependencies": {
-    "@angular/common": "^14.0.3",
-    "@angular/compiler": "^14.0.3",
-    "@angular/core": "^14.0.3",
-    "@angular/platform-browser": "^14.0.3",
-    "@angular/platform-browser-dynamic": "^14.0.3",
-    "@angular/router": "^14.0.3",
-    "core-js": "^3.23.3",
-    "rxjs": "^7.5.5",
-    "tslib": "^2.4.0",
-    "zone.js": "^0.11.6"
+    "@angular/common": "^12.0.4",
+    "@angular/compiler": "^12.0.4",
+    "@angular/core": "^12.0.4",
+    "@angular/platform-browser": "^12.0.4",
+    "@angular/platform-browser-dynamic": "^12.0.4",
+    "@angular/router": "^12.0.4",
+    "core-js": "^3.10.1",
+    "rxjs": "^6.6.7",
+    "tslib": "^2.2.0",
+    "zone.js": "^0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^14.0.3",
-    "@angular-builders/jest": "14.0.0",
-    "@angular/cli": "^14.0.3",
-    "@angular/compiler-cli": "^14.0.3",
-    "@types/node": "^18.0.0",
-    "codelyzer": "^6.0.2",
-    "ts-node": "^10.8.1",
+    "@angular-devkit/build-angular": "^12.0.4",
+    "@angular/cli": "^12.0.4",
+    "@angular/compiler-cli": "^12.0.4",
+    "@types/node": "^12.20.7",
+    "codelyzer": "^6.0.0",
+    "ts-node": "^8.10.2",
     "tslint": "^6.1.3",
     "tslint-angular": "^3.0.3",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "~4.7.4"
+    "typescript": "~4.2.4"
   }
 }

apps/playground/src/app/main/main.component.ts

@@ -275,6 +275,21 @@ export class MainComponent implements OnInit {
         }
       }
     });
+
+    this.charts.push({
+      title: 'WordTree',
+      type: ChartType.WordTree,
+      // type: 'WordTree' as ChartType,
+      columns: ['Phrases'],
+      data: [['This is a test'], ['This is not a test'], ['This is an actual test']],
+      options: {
+        wordtree: {
+          format: 'implicit',
+          type: 'double',
+          word: 'test'
+        }
+      }
+    });
   }
 
   public onReady() {

libs/angular-google-charts/jest.config.js

@@ -1,7 +1,6 @@
 module.exports = {
   preset: 'jest-preset-angular',
   setupFilesAfterEnv: ['<rootDir>/src/setup-tests.ts'],
-  globalSetup: 'jest-preset-angular/global-setup',
   resetMocks: true,
   globals: {
     'ts-jest': {

libs/angular-google-charts/package.json

@@ -25,32 +25,31 @@
   },
   "dependencies": {
     "@types/google.visualization": "0.0.68",
-    "tslib": "^2.4.0"
+    "tslib": "^2.2.0"
   },
   "peerDependencies": {
-    "@angular/common": ">=6.0.0 <=14.x.x",
-    "@angular/core": ">=6.0.0 <=14.x.x"
+    "@angular/common": ">=6.0.0 <=15.x.x",
+    "@angular/core": ">=6.0.0 <=15.x.x"
   },
   "devDependencies": {
-    "@angular-builders/jest": "14.0.0",
-    "@angular-devkit/build-angular": "^14.0.3",
-    "@angular/cli": "^14.0.3",
-    "@angular/compiler-cli": "^14.0.3",
-    "@types/jest": "^28.1.3",
-    "@types/node": "^18.0.0",
-    "codelyzer": "^6.0.2",
-    "jest": "28.1.1",
-    "jest-junit": "^14.0.0",
-    "jest-preset-angular": "12.1.0",
-    "ng-packagr": "^14.0.2",
-    "standard-version": "^9.5.0",
-    "ts-jest": "28.0.5",
-    "rxjs": "^7.5.5",
-    "ts-node": "^10.8.1",
+    "@angular-builders/jest": "^12.1.0",
+    "@angular-devkit/build-angular": "^12.0.4",
+    "@angular/cli": "^12.0.4",
+    "@angular/compiler-cli": "^12.0.4",
+    "@types/jest": "^26.0.22",
+    "@types/node": "^12.20.7",
+    "codelyzer": "^6.0.0",
+    "jest": "^27.0.0",
+    "jest-junit": "^12.2.0",
+    "jest-preset-angular": "^9.0.3",
+    "ng-packagr": "^12.0.5",
+    "standard-version": "^9.2.0",
+    "ts-jest": "^27.0.0",
+    "ts-node": "^10.0.0",
     "tslint": "^6.1.3",
     "tslint-angular": "^3.0.3",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "~4.7.4"
+    "typescript": "~4.2.4"
   },
   "main": "src/index.ts"
 }

libs/angular-google-charts/src/lib/components/chart-base/chart-base.component.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { ChartErrorEvent, ChartReadyEvent, ChartSelectionChangedEvent } from '../../types/events';
 
 export type Column = string | google.visualization.ColumnSpec;
-export type Row = (string | number | Date | null)[];
+export type Row = (string | number | Date | { v: string | number | Date | null; f: string | null } | null)[];
 
 export interface ChartBase {
   /**

libs/angular-google-charts/src/lib/types/chart-type.ts

@@ -24,5 +24,5 @@ export enum ChartType {
   Table = 'Table',
   Timeline = 'Timeline',
   TreeMap = 'TreeMap',
-  WordTree = 'wordtree'
+  WordTree = 'WordTree'
 }