From dddc52568debb45743add4f63e910958b23a98c4 Mon Sep 17 00:00:00 2001 From: Adithya Sreyaj Date: Sat, 17 Jun 2023 22:23:50 +0530 Subject: [PATCH] feat(rxjs): upgrade rxjs to v7 --- package-lock.json | 81 +++++++------------ package.json | 6 +- .../events/before-model-destroyed-event.ts | 4 +- src/variable/evaluator/variable-evaluator.ts | 5 +- tsconfig.json | 2 +- 5 files changed, 39 insertions(+), 59 deletions(-) diff --git a/package-lock.json b/package-lock.json index 68395ed3..1a52ed70 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,17 +36,17 @@ "rollup-plugin-commonjs": "^10.1.0", "rollup-plugin-sourcemaps": "^0.6.3", "rollup-plugin-typescript2": "^0.34.1", - "rxjs": "6.6.7", + "rxjs": "^7.8.1", "semantic-release": "19.0.5", "ts-jest": "^26.5.6", "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0", "typedoc": "^0.22.17", - "typescript": "^4.0.5" + "typescript": "^4.2" }, "peerDependencies": { "core-js": "^3.6.5", - "rxjs": "^6.5.5" + "rxjs": "^7.0.0" } }, "node_modules/@ampproject/remapping": { @@ -9533,15 +9533,6 @@ "node": ">=8" } }, - "node_modules/inquirer/node_modules/rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", - "dev": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/inquirer/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -9554,12 +9545,6 @@ "node": ">=8" } }, - "node_modules/inquirer/node_modules/tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", - "dev": true - }, "node_modules/inquirer/node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -21587,17 +21572,20 @@ } }, "node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" + "tslib": "^2.1.0" } }, + "node_modules/rxjs/node_modules/tslib": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz", + "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==", + "dev": true + }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -23294,9 +23282,9 @@ } }, "node_modules/typescript": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz", - "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz", + "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -31151,15 +31139,6 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", - "dev": true, - "requires": { - "tslib": "^2.1.0" - } - }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -31169,12 +31148,6 @@ "has-flag": "^4.0.0" } }, - "tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", - "dev": true - }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -40279,12 +40252,20 @@ } }, "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz", + "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==", + "dev": true + } } }, "safe-buffer": { @@ -41593,9 +41574,9 @@ } }, "typescript": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz", - "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz", + "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index 70f5df53..085e56b3 100644 --- a/package.json +++ b/package.json @@ -104,20 +104,20 @@ "rollup-plugin-commonjs": "^10.1.0", "rollup-plugin-sourcemaps": "^0.6.3", "rollup-plugin-typescript2": "^0.34.1", - "rxjs": "6.6.7", + "rxjs": "^7.8.1", "semantic-release": "19.0.5", "ts-jest": "^26.5.6", "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0", "typedoc": "^0.22.17", - "typescript": "^4.0.5" + "typescript": "^4.2" }, "dependencies": { "lodash-es": "^4.17.21" }, "peerDependencies": { "core-js": "^3.6.5", - "rxjs": "^6.5.5" + "rxjs": "^7.0.0" }, "repository": { "type": "git", diff --git a/src/model/events/before-model-destroyed-event.ts b/src/model/events/before-model-destroyed-event.ts index 95cc4826..280de6ea 100644 --- a/src/model/events/before-model-destroyed-event.ts +++ b/src/model/events/before-model-destroyed-event.ts @@ -1,5 +1,5 @@ import { Observable } from 'rxjs'; -import { filter, mapTo, take } from 'rxjs/operators'; +import { filter, map, take } from 'rxjs/operators'; import { DashboardEvent } from '../../communication/dashboard-event'; import { DashboardEventManager } from '../../communication/dashboard-event-manager'; @@ -20,7 +20,7 @@ export class BeforeModelDestroyedEvent extends DashboardEvent { public getBeforeDestructionObservable(model: object): Observable { return this.getObservable().pipe( filter(destroyedModel => destroyedModel === model), - mapTo(undefined), + map(() => undefined), take(1) ); } diff --git a/src/variable/evaluator/variable-evaluator.ts b/src/variable/evaluator/variable-evaluator.ts index 6ce5c889..de15816a 100644 --- a/src/variable/evaluator/variable-evaluator.ts +++ b/src/variable/evaluator/variable-evaluator.ts @@ -27,10 +27,9 @@ export class VariableEvaluator { }; try { - const value = this.convertNodeToValue(this.parser.parse(), dictionary) as T; - result.value = value; + result.value = this.convertNodeToValue(this.parser.parse(), dictionary) as T; } catch (e) { - result.error = e && (e as Error).message; + result.error = (e as Error)?.message; } const variablesAfterEvaluate = [...this.variableNamesFromLastEvaluate]; diff --git a/tsconfig.json b/tsconfig.json index a86cb8e2..7418c37f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "moduleResolution": "node", "module": "esNext", - "target": "es5", + "target": "ES6", "lib": ["es2015", "es2016", "es2017", "esnext.array", "dom"], "strict": true, "sourceMap": true,