add math evaluation

2 years ago · 31767b1026
3 changed files with 181 additions and 2 deletions
--- a/app/client.imba
+++ b/app/client.imba
@ -9,6 +9,7 @@ import download from 'downloadjs'
 import { nanoid } from 'nanoid'
 import { parse_url } from './utils'
 import initial_config from './config'
+import { evaluate as eval_math } from 'mathjs'

 let state = {
 	query: ''
@ -378,6 +379,14 @@ tag app
 		settings_active = no
 		loading = no

+	get math_result
+		try
+			let result = eval_math state.query
+			throw _ if result.toString! is state.query.trim!
+			result
+		catch
+			no
+
 	def handle_click_export
 		loading = yes
 		let datetime = new Date!.toString!.split(" ")
@ -396,6 +405,7 @@ tag app
 		return unless config.enable_search_on_paste
 		return if state.query.length > 0
 		global.setTimeout(&, 0) do
+			return if math_result
 			bang ||= config.default_bang
 			handle_bang!

@ -656,8 +666,11 @@ tag app
 						disabled=loading
 					>

-					<.side.right @click.if(!loading)=toggle_settings>
-						<svg src="./assets/settings.svg">
+					if let m = math_result
+						<[c:blue3 pt:15px fs:20px ml:10px]> "= {m}"
+					else
+						<.side.right @click.if(!loading)=toggle_settings>
+							<svg src="./assets/settings.svg">

 				if config.enable_tips and not config.enable_simplify_ui
 					if editing_link
--- a/package-lock.json
+++ b/package-lock.json
@ -14,9 +14,21 @@
 				"fzi": "^1.0.0",
 				"imba": "^2.0.0-alpha.218",
 				"lodash": "^4.17.21",
+				"mathjs": "^11.1.0",
 				"nanoid": "^4.0.0"
 			}
 		},
+		"node_modules/@babel/runtime": {
+			"version": "7.18.9",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
+			"integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+			"dependencies": {
+				"regenerator-runtime": "^0.13.4"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
 		"node_modules/@esbuild/linux-loong64": {
 			"version": "0.15.5",
 			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.5.tgz",
@ -89,6 +101,23 @@
 				"fsevents": "~2.3.2"
 			}
 		},
+		"node_modules/complex.js": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.1.1.tgz",
+			"integrity": "sha512-8njCHOTtFFLtegk6zQo0kkVX1rngygb/KQI6z1qZxlFI3scluC+LVTCFbrkWjBv4vvLlbQ9t88IPMC6k95VTTg==",
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"type": "patreon",
+				"url": "https://www.patreon.com/infusion"
+			}
+		},
+		"node_modules/decimal.js": {
+			"version": "10.4.0",
+			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.0.tgz",
+			"integrity": "sha512-Nv6ENEzyPQ6AItkGwLE2PGKinZZ9g59vSh2BeH6NqPu0OTKZ5ruJsVqh/orbAnqXc9pBbgXAIrc2EyaCj8NpGg=="
+		},
 		"node_modules/dexie": {
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/dexie/-/dexie-3.2.2.tgz",
@ -445,6 +474,11 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/escape-latex": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz",
+			"integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw=="
+		},
 		"node_modules/fill-range": {
 			"version": "7.0.1",
 			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@ -456,6 +490,18 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/fraction.js": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
+			"integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"type": "patreon",
+				"url": "https://www.patreon.com/infusion"
+			}
+		},
 		"node_modules/fsevents": {
 			"version": "2.3.2",
 			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
@ -540,11 +586,38 @@
 				"node": ">=0.12.0"
 			}
 		},
+		"node_modules/javascript-natural-sort": {
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
+			"integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw=="
+		},
 		"node_modules/lodash": {
 			"version": "4.17.21",
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
 			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
 		},
+		"node_modules/mathjs": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/mathjs/-/mathjs-11.1.0.tgz",
+			"integrity": "sha512-cbsEruLNoIlj5h5vOF+DUQVe4EsA/WNomSQDMnX2WafX9TLneBSCRMx2okgGnSLzLoMGWQ211KVzY55bEnQa8Q==",
+			"dependencies": {
+				"@babel/runtime": "^7.18.9",
+				"complex.js": "^2.1.1",
+				"decimal.js": "^10.4.0",
+				"escape-latex": "^1.2.0",
+				"fraction.js": "^4.2.0",
+				"javascript-natural-sort": "^0.7.1",
+				"seedrandom": "^3.0.5",
+				"tiny-emitter": "^2.1.0",
+				"typed-function": "^4.1.0"
+			},
+			"bin": {
+				"mathjs": "bin/cli.js"
+			},
+			"engines": {
+				"node": ">= 14"
+			}
+		},
 		"node_modules/nanoid": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.0.tgz",
@ -586,6 +659,21 @@
 				"node": ">=8.10.0"
 			}
 		},
+		"node_modules/regenerator-runtime": {
+			"version": "0.13.9",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+			"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+		},
+		"node_modules/seedrandom": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
+			"integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
+		},
+		"node_modules/tiny-emitter": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+			"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+		},
 		"node_modules/to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@ -596,9 +684,25 @@
 			"engines": {
 				"node": ">=8.0"
 			}
+		},
+		"node_modules/typed-function": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/typed-function/-/typed-function-4.1.0.tgz",
+			"integrity": "sha512-DGwUl6cioBW5gw2L+6SMupGwH/kZOqivy17E4nsh1JI9fKF87orMmlQx3KISQPmg3sfnOUGlwVkroosvgddrlg==",
+			"engines": {
+				"node": ">= 14"
+			}
 		}
 	},
 	"dependencies": {
+		"@babel/runtime": {
+			"version": "7.18.9",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
+			"integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+			"requires": {
+				"regenerator-runtime": "^0.13.4"
+			}
+		},
 		"@esbuild/linux-loong64": {
 			"version": "0.15.5",
 			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.5.tgz",
@ -642,6 +746,16 @@
 				"readdirp": "~3.6.0"
 			}
 		},
+		"complex.js": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.1.1.tgz",
+			"integrity": "sha512-8njCHOTtFFLtegk6zQo0kkVX1rngygb/KQI6z1qZxlFI3scluC+LVTCFbrkWjBv4vvLlbQ9t88IPMC6k95VTTg=="
+		},
+		"decimal.js": {
+			"version": "10.4.0",
+			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.0.tgz",
+			"integrity": "sha512-Nv6ENEzyPQ6AItkGwLE2PGKinZZ9g59vSh2BeH6NqPu0OTKZ5ruJsVqh/orbAnqXc9pBbgXAIrc2EyaCj8NpGg=="
+		},
 		"dexie": {
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/dexie/-/dexie-3.2.2.tgz",
@ -806,6 +920,11 @@
 			"integrity": "sha512-Yz8w/D8CUPYstvVQujByu6mlf48lKmXkq6bkeSZZxTA626efQOJb26aDGLzmFWx6eg/FwrXgt6SZs9V8Pwy/aA==",
 			"optional": true
 		},
+		"escape-latex": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz",
+			"integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw=="
+		},
 		"fill-range": {
 			"version": "7.0.1",
 			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@ -814,6 +933,11 @@
 				"to-regex-range": "^5.0.1"
 			}
 		},
+		"fraction.js": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
+			"integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="
+		},
 		"fsevents": {
 			"version": "2.3.2",
 			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
@ -868,11 +992,32 @@
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
 			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
 		},
+		"javascript-natural-sort": {
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
+			"integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw=="
+		},
 		"lodash": {
 			"version": "4.17.21",
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
 			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
 		},
+		"mathjs": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/mathjs/-/mathjs-11.1.0.tgz",
+			"integrity": "sha512-cbsEruLNoIlj5h5vOF+DUQVe4EsA/WNomSQDMnX2WafX9TLneBSCRMx2okgGnSLzLoMGWQ211KVzY55bEnQa8Q==",
+			"requires": {
+				"@babel/runtime": "^7.18.9",
+				"complex.js": "^2.1.1",
+				"decimal.js": "^10.4.0",
+				"escape-latex": "^1.2.0",
+				"fraction.js": "^4.2.0",
+				"javascript-natural-sort": "^0.7.1",
+				"seedrandom": "^3.0.5",
+				"tiny-emitter": "^2.1.0",
+				"typed-function": "^4.1.0"
+			}
+		},
 		"nanoid": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.0.tgz",
@ -896,6 +1041,21 @@
 				"picomatch": "^2.2.1"
 			}
 		},
+		"regenerator-runtime": {
+			"version": "0.13.9",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+			"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+		},
+		"seedrandom": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
+			"integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
+		},
+		"tiny-emitter": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+			"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+		},
 		"to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@ -903,6 +1063,11 @@
 			"requires": {
 				"is-number": "^7.0.0"
 			}
+		},
+		"typed-function": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/typed-function/-/typed-function-4.1.0.tgz",
+			"integrity": "sha512-DGwUl6cioBW5gw2L+6SMupGwH/kZOqivy17E4nsh1JI9fKF87orMmlQx3KISQPmg3sfnOUGlwVkroosvgddrlg=="
 		}
 	}
 }
--- a/package.json
+++ b/package.json
@ -19,6 +19,7 @@
 		"fzi": "^1.0.0",
 		"imba": "^2.0.0-alpha.218",
 		"lodash": "^4.17.21",
+		"mathjs": "^11.1.0",
 		"nanoid": "^4.0.0"
 	},
 	"description": "A lightweight new-tab page that lets you very quickly fuzzy find links and navigate to a result.",