Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/hyper-schema #139

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feature/hyper-schema #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1f6f1d
Adds hyper-schema
bwalsh Nov 29, 2023
d2704d8
update branch
bwalsh Nov 29, 2023
ba5264c
fix http loader
matthewpeterkort Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/jv/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/santhosh-tekuri/jsonschema/cmd/jv
module github.com/bmeg/jsonschema/cmd/jv

go 1.15

require (
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
github.com/bmeg/jsonschema/v5 v5.3.1
gopkg.in/yaml.v3 v3.0.1
)
4 changes: 2 additions & 2 deletions cmd/jv/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"path/filepath"
"strings"

"github.com/santhosh-tekuri/jsonschema/v5"
_ "github.com/santhosh-tekuri/jsonschema/v5/httploader"
"github.com/bmeg/jsonschema/v5"
_ "github.com/bmeg/jsonschema/v5/httploader"
"gopkg.in/yaml.v3"
)

Expand Down
23 changes: 23 additions & 0 deletions draft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,27 @@ var (
"https://json-schema.org/draft/2020-12/vocab/validation",
},
}
Draft2020HyperSchema = &Draft{
version: 2020,
id: "$id",
boolSchema: true,
vocab: []string{
"https://json-schema.org/draft/2020-12/vocab/core",
"https://json-schema.org/draft/2020-12/vocab/applicator",
"https://json-schema.org/draft/2020-12/vocab/unevaluated",
"https://json-schema.org/draft/2020-12/vocab/validation",
"https://json-schema.org/draft/2020-12/vocab/meta-data",
"https://json-schema.org/draft/2020-12/vocab/format-annotation",
"https://json-schema.org/draft/2020-12/vocab/content",
"https://json-schema.org/draft/2019-09/vocab/hyper-schema",
},
defaultVocab: []string{
"https://json-schema.org/draft/2020-12/vocab/core",
"https://json-schema.org/draft/2020-12/vocab/applicator",
"https://json-schema.org/draft/2020-12/vocab/unevaluated",
"https://json-schema.org/draft/2020-12/vocab/validation",
},
}

latest = Draft2020
)
Expand All @@ -241,6 +262,8 @@ func findDraft(url string) *Draft {
return latest
case "https://json-schema.org/draft/2020-12/schema":
return Draft2020
case "https://json-schema.org/draft/2020-12/hyper-schema":
return Draft2020HyperSchema
case "https://json-schema.org/draft/2019-09/schema":
return Draft2019
case "https://json-schema.org/draft-07/schema":
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/santhosh-tekuri/jsonschema/v5
module github.com/bmeg/jsonschema/v5

go 1.19
4 changes: 1 addition & 3 deletions httploader/httploader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
// registering its Loaders.
//
// To use httploader, link this package into your program:
//
// import _ "github.com/santhosh-tekuri/jsonschema/v5/httploader"
package httploader

import (
"fmt"
"io"
"net/http"

"github.com/santhosh-tekuri/jsonschema/v5"
"github.com/bmeg/jsonschema/v5"
)

// Client is the default HTTP Client used to Get the resource.
Expand Down
2 changes: 1 addition & 1 deletion schema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"strings"
"testing"

_ "github.com/bmeg/jsonschema/v5/httploader"
"github.com/santhosh-tekuri/jsonschema/v5"
_ "github.com/santhosh-tekuri/jsonschema/v5/httploader"
)

var skipTests = map[string]map[string][]string{
Expand Down