From 482868c48397ce422bc2673e2dcb2686051e7b6a Mon Sep 17 00:00:00 2001 From: Evgeny Metelkin Date: Wed, 7 Aug 2024 21:16:04 +0300 Subject: [PATCH] heta-compiler to v0.8.6, null value --- package-lock.json | 29 ++++++++++--------- package.json | 5 ++-- src/heta-colors.js | 2 +- src/heta-templates/qsp-units.heta.template.js | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7e78df7..766d512 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@viz-js/viz": "^3.2.3", "ajv": "^8.12.0", - "heta-compiler": "github:hetalang/heta-compiler", + "heta-compiler": "^0.8.6", "jquery": "^3.7.0", "js-yaml": "^4.1.0", "jszip": "^3.10.1", @@ -7350,9 +7350,9 @@ } }, "node_modules/heta-compiler": { - "version": "0.8.4", - "resolved": "git+ssh://git@github.com/hetalang/heta-compiler.git#6b20315664c4f952ac9fc9976409b66c1413dba4", - "license": "Apache-2.0", + "version": "0.8.6", + "resolved": "https://registry.npmjs.org/heta-compiler/-/heta-compiler-0.8.6.tgz", + "integrity": "sha512-53A9RrdoYecPXXzw9BSFIM3JOrM8IVIR6FnRppHRmyn0lE4GwnmrF7sa4uwuTW6GRFIBo++BuC6bfoAkvaACJw==", "dependencies": { "@insysbio/topo-sort": "^1.0.1", "ajv": "^6.12.6", @@ -7360,7 +7360,7 @@ "colors": "^1.4.0", "commander": "^11.1.0", "fs-extra": "^11.1.1", - "heta-parser": "^0.3.18", + "heta-parser": "^0.4.0", "inquirer": "^8.2.6", "js-yaml": "^4.1.0", "lodash": "^4.17.21", @@ -7420,9 +7420,9 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "node_modules/heta-parser": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/heta-parser/-/heta-parser-0.3.18.tgz", - "integrity": "sha512-nOyiGi1N6JVmN/zxyDaYYwXlipJnm0NElVG2twwj3Z6aTH2NdpT5GVZAMRQaZlLEVMZ4glWDLpPjy3CeyRU3Og==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/heta-parser/-/heta-parser-0.4.0.tgz", + "integrity": "sha512-Qk7Bnirbg5ombRQ4aBzR/KF7cvUQxw4zr5dWcpQeRtOomgmTQ/b23U2yR3Z5bJ8dE5WR82NyonxI24AtG1T2aA==", "dependencies": { "commander": "^11.1.0", "pegjs": "^0.10.0" @@ -21459,8 +21459,9 @@ "dev": true }, "heta-compiler": { - "version": "git+ssh://git@github.com/hetalang/heta-compiler.git#6b20315664c4f952ac9fc9976409b66c1413dba4", - "from": "heta-compiler@github:hetalang/heta-compiler", + "version": "0.8.6", + "resolved": "https://registry.npmjs.org/heta-compiler/-/heta-compiler-0.8.6.tgz", + "integrity": "sha512-53A9RrdoYecPXXzw9BSFIM3JOrM8IVIR6FnRppHRmyn0lE4GwnmrF7sa4uwuTW6GRFIBo++BuC6bfoAkvaACJw==", "requires": { "@insysbio/topo-sort": "^1.0.1", "ajv": "^6.12.6", @@ -21468,7 +21469,7 @@ "colors": "^1.4.0", "commander": "^11.1.0", "fs-extra": "^11.1.1", - "heta-parser": "^0.3.18", + "heta-parser": "^0.4.0", "inquirer": "^8.2.6", "js-yaml": "^4.1.0", "lodash": "^4.17.21", @@ -21512,9 +21513,9 @@ } }, "heta-parser": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/heta-parser/-/heta-parser-0.3.18.tgz", - "integrity": "sha512-nOyiGi1N6JVmN/zxyDaYYwXlipJnm0NElVG2twwj3Z6aTH2NdpT5GVZAMRQaZlLEVMZ4glWDLpPjy3CeyRU3Og==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/heta-parser/-/heta-parser-0.4.0.tgz", + "integrity": "sha512-Qk7Bnirbg5ombRQ4aBzR/KF7cvUQxw4zr5dWcpQeRtOomgmTQ/b23U2yR3Z5bJ8dE5WR82NyonxI24AtG1T2aA==", "requires": { "commander": "^11.1.0", "pegjs": "^0.10.0" diff --git a/package.json b/package.json index 8299dcc..eb59373 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "dependencies": { "@viz-js/viz": "^3.2.3", "ajv": "^8.12.0", - "heta-compiler": "github:hetalang/heta-compiler", + "heta-compiler": "^0.8.6", "jquery": "^3.7.0", "js-yaml": "^4.1.0", "jszip": "^3.10.1", @@ -58,6 +58,5 @@ }, "engines": { "node": ">=16.0.0" - }, - "sideEffects": false + } } diff --git a/src/heta-colors.js b/src/heta-colors.js index 94a0926..377ccf2 100644 --- a/src/heta-colors.js +++ b/src/heta-colors.js @@ -3,7 +3,7 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'; monaco.languages.register({id: 'heta'}); monaco.languages.setMonarchTokensProvider('heta', { defaultToken: 'invalid', - keywords: ['abstract', 'concrete', 'namespace', 'include', 'type', 'with', 'begin', 'end', 'true', 'false', 'Inf', 'NaN'], + keywords: ['abstract', 'concrete', 'namespace', 'include', 'type', 'with', 'begin', 'end', 'true', 'false', 'Inf', 'NaN', 'null'], //tokenPostfix: ".heta", brackets: [ { token: "delimiter.bracket", open: "{", close: "}" }, diff --git a/src/heta-templates/qsp-units.heta.template.js b/src/heta-templates/qsp-units.heta.template.js index d11defe..fd113de 100644 --- a/src/heta-templates/qsp-units.heta.template.js +++ b/src/heta-templates/qsp-units.heta.template.js @@ -136,7 +136,7 @@ um #defineUnit { units: [ { kind: metre, multiplier: 1e-6 } ] }; mm #defineUnit { - units: [ { kind: metre, multiplier: 1e-13 } ] + units: [ { kind: metre, multiplier: 1e-3 } ] }; cm #defineUnit { units: [ { kind: metre, multiplier: 1e-2 } ]