Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 0 additions & 12 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -197,18 +197,6 @@ repos:
- id: check-metaschema
files: \.schema\.json$
args: ["--verbose"]
# Keep this in sync with yaml.schemas in settings.json
# TODO Change once https://github.com/python-jsonschema/check-jsonschema/issues/340 is implemented
- id: check-jsonschema
# files: .+/models/.+\.(yaml|json)$
files: \.types\.yaml$
args: ["--verbose", "--schemafile", "docs/models/enola/schemas/Types.schema.json"]
- id: check-jsonschema
files: \.type\.yaml$
args: ["--verbose", "--schemafile", "docs/models/enola/schemas/Type.schema.json"]
- id: check-jsonschema
files: \.thing\.yaml$
args: ["--verbose", "--schemafile", "docs/models/enola/schemas/Thing.schema.json"]

# https://github.com/NixOS/nixfmt#pre-commit
- repo: https://github.com/NixOS/nixfmt
Expand Down
5 changes: 1 addition & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,7 @@
"https://squidfunk.github.io/mkdocs-material/schema.json": "mkdocs.yaml",

// TODO https://github.com/linkml/linkml/issues/2179
"https://raw.githubusercontent.com/linkml/linkml-model/main/linkml_model/jsonschema/meta.schema.json": "*.linkml.yaml",

// Keep this in sync with check-jsonschema in .pre-commit-config.yaml
"docs/models/enola/schemas/Thing.schema.json": "*.thing.yaml"
"https://raw.githubusercontent.com/linkml/linkml-model/main/linkml_model/jsonschema/meta.schema.json": "*.linkml.yaml"
},
"yaml.customTags": [
"!ENV scalar",
Expand Down
3 changes: 0 additions & 3 deletions docs/concepts/core-arch.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,3 @@
# Core Architecture

These _logical models_ were originally [implemented](implementation.md) as Protobuf messages, but this is changing.

<!-- TODO They are also published as JSON Schemas, for [`EntityKind`](../models/enola/schemas/EntityKind.schema.json)
and [`Type`](../models/enola/schemas/Type.schema.json) et al. -->
24 changes: 0 additions & 24 deletions tools/protoc/protoc.bash
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,3 @@ set -euox pipefail
# (It's kind of dumb how as-is there is a protoc "in" Bazel and a separate one.)

protoc --version

# https://github.com/chrusty/protoc-gen-jsonschema
if ! [ -x "$(command -v protoc-gen-jsonschema)" ]; then
# As always, it's NEVER a good idea to use @latest here, but always a fixed version
go install github.com/chrusty/protoc-gen-jsonschema/cmd/protoc-gen-jsonschema@1.4.1
fi

PLUGIN=$(go env GOPATH)/bin/protoc-gen-jsonschema
${PLUGIN} --version

mkdir -pv docs/models/enola/schemas/
protoc \
--plugin="${PLUGIN}" \
--jsonschema_opt=allow_null_values \
--jsonschema_opt=file_extension=schema.json \
--jsonschema_opt=disallow_additional_properties \
--jsonschema_out=docs/models/enola/schemas/ \
java/dev/enola/thing/thing.proto

# TODO Add core/lib/src/main/java/dev/enola/core/enola_core.proto
# when https://github.com/chrusty/protoc-gen-jsonschema/issues/180 is fixed

mkdir -pv ~/.npm/lib/
npx --yes prettier --write docs/models/enola/schemas/*.json
37 changes: 0 additions & 37 deletions tools/protoc/protoc4maven.bash

This file was deleted.

Loading