Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hapijs/formula
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.0.0
Choose a base ref
...
head repository: hapijs/formula
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.0.1
Choose a head ref
  • 4 commits
  • 5 files changed
  • 2 contributors

Commits on Oct 24, 2020

  1. Move to Sideway

    hueniverse committed Oct 24, 2020
    Copy the full SHA
    c59f35e View commit details
  2. Cleanup

    hueniverse committed Oct 24, 2020
    Copy the full SHA
    41ae98e View commit details

Commits on Dec 14, 2022

  1. chore: better number regex

    Marsup committed Dec 14, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    Marsup Nicolas Morel
    Copy the full SHA
    9fbc20a View commit details
  2. 3.0.1

    Marsup committed Dec 14, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    Marsup Nicolas Morel
    Copy the full SHA
    5b44c1b View commit details
Showing with 15 additions and 16 deletions.
  1. +1 −0 .eslintignore
  2. +1 −1 LICENSE.md
  3. +7 −10 README.md
  4. +1 −1 lib/index.js
  5. +5 −4 package.json
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dist
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2019-2020, Sideway Inc, and project contributors
Copyright (c) 2019-2020, Sideway. Inc, and project contributors
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
17 changes: 7 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
<a href="https://hapi.dev"><img src="https://raw.githubusercontent.com/hapijs/assets/master/images/family.png" width="180px" align="right" /></a>

# @hapi/formula
# @sideway/formula

#### Math and string formula parser.

**formula** is part of the **hapi** ecosystem and was designed to work seamlessly with the [hapi web framework](https://hapi.dev) and its other components (but works great on its own or with other frameworks). If you are using a different web framework and find this module useful, check out [hapi](https://hapi.dev) – they work even better together.
**formula** is part of the **joi** ecosystem.

### Visit the [hapi.dev](https://hapi.dev) Developer Portal for tutorials, documentation, and support
### Visit the [joi.dev](https://joi.dev) Developer Portal for tutorials, documentation, and support

## Useful resources

- [Documentation and API](https://hapi.dev/family/formula/)
- [Version status](https://hapi.dev/resources/status/#formula) (builds, dependencies, node versions, licenses, eol)
- [Changelog](https://hapi.dev/family/formula/changelog/)
- [Project policies](https://hapi.dev/policies/)
- [Free and commercial support options](https://hapi.dev/support/)
- [Documentation and API](https://joi.dev/module/formula/)
- [Version status](https://joi.dev/resources/status/#formula) (builds, dependencies, node versions, licenses, eol)
- [Changelog](https://joi.dev/module/formula/changelog/)
- [Project policies](https://joi.dev/policies/)

## Acknowledgements

2 changes: 1 addition & 1 deletion lib/index.js
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ const internals = {
'[': ']'
},

numberRx: /^(?:[0-9]*\.?[0-9]*){1}$/,
numberRx: /^(?:[0-9]*(\.[0-9]*)?){1}$/,
tokenRx: /^[\w\$\#\.\@\:\{\}]+$/,

symbol: Symbol('formula'),
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "@hapi/formula",
"name": "@sideway/formula",
"description": "Math and string formula parser.",
"version": "3.0.0",
"repository": "git://github.com/hapijs/formula",
"version": "3.0.1",
"repository": "git://github.com/sideway/formula",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"keywords": [
@@ -16,8 +16,9 @@
],
"dependencies": {},
"devDependencies": {
"typescript": "4.0.x",
"@hapi/code": "8.x.x",
"@hapi/lab": "22.x.x"
"@hapi/lab": "24.x.x"
},
"scripts": {
"test": "lab -a @hapi/code -t 100 -L -Y",