mirror of
https://github.com/MontFerret/ferret.git
synced 2024-12-14 11:23:02 +02:00
Autocomplete REPL (#219)
* add pkg/stdlib/objects Length function * rename lenght.go -> length.go * fix tests according to other tests * add new tests to length tests * delete objects method Length * add objects method Has * add objects function Keys * small fixes in Keys and Has functions * change Has function * unit tests for Keys function * add unit tests for merge. also little change in lib.go * add doc to Keys function * Merge function prototype * add unit tests for KEEP function * added KEEP function * added doc for KEYS function * update lib.go * update lib.go * upd merge prototype * addded isEqualObjects function to objects tests * change object method Compare * added unit tests for Compare method * changed Compare method * fix Compare method * rename method Clone to Copy * added Cloneable interface * added Value to Cloneable interface * implemented Cloneable intefrace by array * added some more unit tests for values.Array * fix values.Array.Compare method * added one more unit test * implemented Cloneable interface by Object * unit tests for Object.Clone * move core.IsCloneable to value.go * change Clone function * move IsClonable to package values * updated MERGE unit tests * added MERGE function * added MERGE to lib * added one more test * changed MERGE function * rewrite a few comments according to Go Best Practices * rewrite comments * fix bug when result of the KEEP function was dependent on source object * some more changes in KEEP function * init VALUES function * push test with bug * add stress test * small changes in stress tests * changes in object.Comapare * change object.Compare * add more tests for object.Compare * added comments to object.Compare function * change object.Comapare * delete useless comment * one more change in object.Compare * init datetime * added test for datetime * added lib.go * add helpers functions * made values.DefaultTimeLayout public * added DATE function * added DATE_DAYOFWEEK function * added DATE_YEAR function * added DATE_MONTH function * added one more testCase for DATE_MONTH * added DATE_DAY function * added DateDay to lib * added DATE_HOUR, DATE_MINUTE and DATE_SECOND functions * added DATE_DAYOFYEAR, DATE_LEAPYEAR, DATE_MILLISECOND functions * fix names in tests * one more case into dayofyear_test * added DATE_QUARTER function * added DATE_DAYS_IN_MONTH function * added DATE_FORMAT function * added -v flag into go test * update DATE_FORMAT test cases * added one more test case * add helpers functions * made values.DefaultTimeLayout public * added DATE function * added DATE_DAYOFWEEK function * added DATE_YEAR function * added DATE_MONTH function * added one more testCase for DATE_MONTH * added DATE_DAY function * added DateDay to lib * added DATE_HOUR, DATE_MINUTE and DATE_SECOND functions * added DATE_DAYOFYEAR, DATE_LEAPYEAR, DATE_MILLISECOND functions * fix names in tests * one more case into dayofyear_test * added DATE_QUARTER function * added DATE_DAYS_IN_MONTH function * added DATE_FORMAT function * added -v flag into go test * Set codecov support for all branches * update DATE_FORMAT test cases * Updated codecov settings * Added panic recovery mechanism (#158) * Bump github.com/mafredri/cdp from 0.19.0 to 0.20.0 (#159) Bumps [github.com/mafredri/cdp](https://github.com/mafredri/cdp) from 0.19.0 to 0.20.0. - [Release notes](https://github.com/mafredri/cdp/releases) - [Commits](https://github.com/mafredri/cdp/compare/v0.19.0...v0.20.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump github.com/gofrs/uuid from 3.1.1 to 3.1.2 (#160) Bumps [github.com/gofrs/uuid](https://github.com/gofrs/uuid) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/gofrs/uuid/releases) - [Commits](https://github.com/gofrs/uuid/compare/v3.1.1...v3.1.2) Signed-off-by: dependabot[bot] <support@dependabot.com> * added one more test case * sorter instead Compare now * rename utils.LOG -> utils.PRINT * rename utils.Logs -> utils.Print * added DATE_ADD, DATE_SUBTRACT functions * use keyed fields now * added DATE_DIFF function * delete unused var * delete useless type cast * fixed a bug when adding/subtrating did not take an amount of units * added DateCompare function * renames * fix small bug * fix * init autocompleter * init autocomplete * delete init tokens and add fql.LiteralNames in autocomplete
This commit is contained in:
3timeslazy
Tim Voronov
parent
ea6260685f
commit
7cb7d75204
50
cli/autocompleter.go
Normal file
50
cli/autocompleter.go
Normal file
@ -0,0 +1,50 @@
|
||||
package cli
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"github.com/derekparker/trie"
|
||||
)
|
||||
|
||||
// AutoCompleter autocompletes queries
|
||||
// into the REPL.
|
||||
// Implements AutoCompleter interface from
|
||||
// github.com/chzyer/readline
|
||||
type AutoCompleter struct {
|
||||
coreFuncs *trie.Trie
|
||||
}
|
||||
|
||||
func NewAutoCompleter(functions []string) *AutoCompleter {
|
||||
coreFuncs := trie.New()
|
||||
|
||||
for _, function := range functions {
|
||||
coreFuncs.Add(function, function)
|
||||
}
|
||||
|
||||
return &AutoCompleter{
|
||||
coreFuncs: coreFuncs,
|
||||
}
|
||||
}
|
||||
|
||||
// Do implements method of AutoCompleter interface
|
||||
func (ac *AutoCompleter) Do(line []rune, pos int) (newLine [][]rune, length int) {
|
||||
lineStr := string(line)
|
||||
tokens := strings.Split(lineStr, " ")
|
||||
token := tokens[len(tokens)-1]
|
||||
|
||||
// if remove this check, than
|
||||
// on any empty string will return
|
||||
// all available functions
|
||||
if token == "" {
|
||||
return newLine, pos
|
||||
}
|
||||
|
||||
for _, fn := range ac.coreFuncs.PrefixSearch(token) {
|
||||
// cuts a piece of word that is already written
|
||||
// in the repl
|
||||
withoutPre := []rune(fn)[len(token):]
|
||||
newLine = append(newLine, withoutPre)
|
||||
}
|
||||
|
||||
return newLine, pos
|
||||
}
|
||||
26
cli/repl.go
26
cli/repl.go
@ -3,14 +3,17 @@ package cli
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"github.com/MontFerret/ferret/pkg/compiler"
|
||||
"github.com/MontFerret/ferret/pkg/runtime"
|
||||
"github.com/MontFerret/ferret/pkg/runtime/logging"
|
||||
"github.com/chzyer/readline"
|
||||
"os"
|
||||
"os/signal"
|
||||
"strings"
|
||||
"syscall"
|
||||
|
||||
"github.com/MontFerret/ferret/pkg/parser/fql"
|
||||
|
||||
"github.com/MontFerret/ferret/pkg/compiler"
|
||||
"github.com/MontFerret/ferret/pkg/runtime"
|
||||
"github.com/MontFerret/ferret/pkg/runtime/logging"
|
||||
"github.com/chzyer/readline"
|
||||
)
|
||||
|
||||
func Repl(version string, opts Options) {
|
||||
@ -23,6 +26,11 @@ func Repl(version string, opts Options) {
|
||||
Prompt: "> ",
|
||||
InterruptPrompt: "^C",
|
||||
EOFPrompt: "exit",
|
||||
AutoComplete: NewAutoCompleter(
|
||||
append(
|
||||
fqlLiterals(),
|
||||
ferret.RegisteredFunctions()...,
|
||||
)),
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
@ -138,3 +146,13 @@ func Repl(version string, opts Options) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func fqlLiterals() (literals []string) {
|
||||
lns := fql.NewFqlLexer(nil).LiteralNames
|
||||
|
||||
for _, ln := range lns {
|
||||
literals = append(literals, strings.Trim(ln, "'"))
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
package compiler
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"github.com/MontFerret/ferret/pkg/parser"
|
||||
"github.com/MontFerret/ferret/pkg/runtime"
|
||||
"github.com/MontFerret/ferret/pkg/runtime/core"
|
||||
"github.com/MontFerret/ferret/pkg/stdlib"
|
||||
"github.com/pkg/errors"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type FqlCompiler struct {
|
||||
@ -104,3 +105,10 @@ func (c *FqlCompiler) MustCompile(query string) *runtime.Program {
|
||||
|
||||
return program
|
||||
}
|
||||
|
||||
func (c *FqlCompiler) RegisteredFunctions() (funcs []string) {
|
||||
for k := range c.funcs {
|
||||
funcs = append(funcs, k)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user