mirror of
https://github.com/TECHNOFAB11/docsonnet.git
synced 2025-12-16 16:23:53 +01:00
feat: faster parser (#3)
* fix(load): support nested objects * feat: initial golang parser Moves most of load.libsonnet to a Golang app for hopefully much faster parsing (fingers crossed) * feat(fast): nested objects, subpackages * feat: incorporate fast mode into main binary Moves the work done in the fast directory into the main executable, removing the Jsonnet based parser in favor of the much faster Golang one.
This commit is contained in:
parent
75f8e7373c
commit
4e4d4a7170
7 changed files with 442 additions and 57 deletions
183
pkg/docsonnet/fast.go
Normal file
183
pkg/docsonnet/fast.go
Normal file
|
|
@ -0,0 +1,183 @@
|
|||
package docsonnet
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
// load docsonnet
|
||||
//
|
||||
// Data assumptions:
|
||||
// - only map[string]interface{} and fields
|
||||
// - fields (#...) coming first
|
||||
func fastLoad(d DS) Package {
|
||||
start := time.Now()
|
||||
|
||||
pkg := d.Package()
|
||||
fmt.Println("load", pkg.Name)
|
||||
|
||||
pkg.API = make(Fields)
|
||||
pkg.Sub = make(map[string]Package)
|
||||
|
||||
for k, v := range d {
|
||||
if k == "#" {
|
||||
continue
|
||||
}
|
||||
|
||||
f := v.(map[string]interface{})
|
||||
|
||||
// field
|
||||
name := strings.TrimPrefix(k, "#")
|
||||
if strings.HasPrefix(k, "#") {
|
||||
pkg.API[name] = loadField(name, f, d)
|
||||
continue
|
||||
}
|
||||
|
||||
// non-docsonnet
|
||||
// subpackage?
|
||||
if _, ok := f["#"]; ok {
|
||||
p := fastLoad(DS(f))
|
||||
pkg.Sub[p.Name] = p
|
||||
continue
|
||||
}
|
||||
|
||||
// non-annotated nested?
|
||||
// try to load, but skip when already loaded as annotated above
|
||||
if nested, ok := loadNested(name, f); ok && !fieldsHas(pkg.API, name) {
|
||||
pkg.API[name] = *nested
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Println("done load", pkg.Name, time.Since(start))
|
||||
return pkg
|
||||
}
|
||||
|
||||
func fieldsHas(f Fields, key string) bool {
|
||||
_, b := f[key]
|
||||
return b
|
||||
}
|
||||
|
||||
func loadNested(name string, msi map[string]interface{}) (*Field, bool) {
|
||||
out := Object{
|
||||
Name: name,
|
||||
Fields: make(Fields),
|
||||
}
|
||||
|
||||
ok := false
|
||||
for k, v := range msi {
|
||||
f := v.(map[string]interface{})
|
||||
n := strings.TrimPrefix(k, "#")
|
||||
|
||||
if !strings.HasPrefix(k, "#") {
|
||||
if l, ok := loadNested(k, f); ok {
|
||||
out.Fields[n] = *l
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
ok = true
|
||||
l := loadField(n, f, msi)
|
||||
out.Fields[n] = l
|
||||
}
|
||||
|
||||
if !ok {
|
||||
return nil, false
|
||||
}
|
||||
|
||||
return &Field{Object: &out}, true
|
||||
}
|
||||
|
||||
func loadField(name string, field map[string]interface{}, parent map[string]interface{}) Field {
|
||||
if ifn, ok := field["function"]; ok {
|
||||
return loadFn(name, ifn.(map[string]interface{}))
|
||||
}
|
||||
|
||||
if iobj, ok := field["object"]; ok {
|
||||
return loadObj(name, iobj.(map[string]interface{}), parent)
|
||||
}
|
||||
|
||||
panic("field lacking {function | object}")
|
||||
}
|
||||
|
||||
func loadFn(name string, msi map[string]interface{}) Field {
|
||||
fn := Function{
|
||||
Name: name,
|
||||
Help: msi["help"].(string),
|
||||
}
|
||||
if args, ok := msi["args"]; ok {
|
||||
fn.Args = loadArgs(args.([]interface{}))
|
||||
}
|
||||
return Field{Function: &fn}
|
||||
}
|
||||
|
||||
func loadArgs(is []interface{}) []Argument {
|
||||
args := make([]Argument, len(is))
|
||||
for i := range is {
|
||||
arg := is[i].(map[string]interface{})
|
||||
args[i] = Argument{
|
||||
Name: arg["name"].(string),
|
||||
Type: Type(arg["type"].(string)),
|
||||
Default: arg["default"],
|
||||
}
|
||||
}
|
||||
return args
|
||||
}
|
||||
|
||||
func fieldNames(msi map[string]interface{}) []string {
|
||||
out := make([]string, 0, len(msi))
|
||||
for k := range msi {
|
||||
out = append(out, k)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func loadObj(name string, msi map[string]interface{}, parent map[string]interface{}) Field {
|
||||
obj := Object{
|
||||
Name: name,
|
||||
Help: msi["help"].(string),
|
||||
Fields: make(Fields),
|
||||
}
|
||||
|
||||
// look for children in same key without #
|
||||
var iChilds interface{}
|
||||
var ok bool
|
||||
if iChilds, ok = parent[name]; !ok {
|
||||
fmt.Println("aborting, no", name, strings.Join(fieldNames(parent), ", "))
|
||||
return Field{Object: &obj}
|
||||
}
|
||||
|
||||
childs := iChilds.(map[string]interface{})
|
||||
for k, v := range childs {
|
||||
name := strings.TrimPrefix(k, "#")
|
||||
f := v.(map[string]interface{})
|
||||
if !strings.HasPrefix(k, "#") {
|
||||
if l, ok := loadNested(k, f); ok {
|
||||
obj.Fields[name] = *l
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
obj.Fields[name] = loadField(name, f, childs)
|
||||
}
|
||||
|
||||
return Field{Object: &obj}
|
||||
}
|
||||
|
||||
type DS map[string]interface{}
|
||||
|
||||
func (d DS) Package() Package {
|
||||
hash, ok := d["#"]
|
||||
if !ok {
|
||||
log.Fatalln("Package declaration missing")
|
||||
}
|
||||
|
||||
pkg := hash.(map[string]interface{})
|
||||
return Package{
|
||||
Help: pkg["help"].(string),
|
||||
Name: pkg["name"].(string),
|
||||
Import: pkg["import"].(string),
|
||||
}
|
||||
}
|
||||
|
|
@ -32,18 +32,22 @@ func Load(filename string) (*Package, error) {
|
|||
|
||||
// invoke load.libsonnet
|
||||
vm.ExtCode("main", fmt.Sprintf(`(import "%s")`, filename))
|
||||
|
||||
log.Println("evaluating Jsonnet")
|
||||
data, err := vm.EvaluateSnippet("load.libsonnet", string(load))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
log.Println("parsing result")
|
||||
// parse the result
|
||||
var d Package
|
||||
var d DS
|
||||
if err := json.Unmarshal([]byte(data), &d); err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
|
||||
return &d, nil
|
||||
p := fastLoad(d)
|
||||
return &p, nil
|
||||
}
|
||||
|
||||
// importer wraps jsonnet.FileImporter, to statically provide load.libsonnet,
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ func Render(pkg docsonnet.Package) map[string]string {
|
|||
}
|
||||
|
||||
func render(pkg docsonnet.Package, parents []string, root bool) map[string]string {
|
||||
fmt.Println("render", pkg.Name)
|
||||
link := "/" + strings.Join(append(parents, pkg.Name), "/")
|
||||
if root {
|
||||
link = "/"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue