shacl2code 1.1.0__tar.gz → 1.2.0__tar.gz

{shacl2code-1.1.0 → shacl2code-1.2.0}/.github/workflows/coverage-generate.yaml

@@ -28,9 +28,22 @@ jobs:
         uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
         with:
           python-version: "3.11"
+      - name: Setup Node
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version: 24
       - name: Install dependencies
         run: |
-          sudo apt install -y build-essential doxygen graphviz
+          sudo apt install -y build-essential cppcheck doxygen graphviz
+          npm install -g jsonld-cli
+          npm --prefix scripts ci
+      - name: Install Go static analysis tools
+        run: |
+          echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH"
+          go install honnef.co/go/tools/cmd/staticcheck@latest
+      - name: Install Rust static analysis tools
+        run: |
+          rustup component add clippy
       - name: Install package
         run: |
           pip install -e .[dev]

shacl2code-1.2.0/.github/workflows/test.yaml

@@ -0,0 +1,87 @@
+---
+name: Test shacl2code
+on:
+  push:
+    # Skip changes in docs and other workflows
+    paths: &trigger-paths
+      - "**"
+      - "!**/*.md"
+      - "!LICENSE"
+      - "!.github/ISSUE_TEMPLATE/**"
+      - "!.github/workflows/**"
+      - ".github/workflows/test.yaml"
+  pull_request:
+    paths: *trigger-paths
+  workflow_call:
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        include:
+          - os: macos-latest
+            python-version: "3.10"
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - name: Setup Python ${{ matrix.python-version }}
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Setup Node
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version: 24
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build
+          npm install -g jsonld-cli
+          npm --prefix scripts ci
+      - name: Install Linux packages
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt update
+          sudo apt install -y build-essential cppcheck doxygen graphviz
+      - name: Install macOS packages
+        if: runner.os == 'macOS'
+        run: |
+          brew update
+          brew install cppcheck doxygen gcc go graphviz
+      - name: Install Go static analysis tools
+        run: |
+          echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH"
+          go install honnef.co/go/tools/cmd/staticcheck@latest
+      - name: Install Rust static analysis tools
+        run: |
+          rustup component add clippy
+      - name: Build package
+        run: |
+          python -m build
+      - name: Install package
+        run: |
+          pip install -e .[dev]
+      - name: Run tests
+        run: |
+          pytest -v
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - name: Setup Python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        with:
+          # Black in this Python version must support all target-versions listed in pyproject.toml
+          python-version: "3.14"
+      - uses: psf/black@87928e6d6761a4a6d22250e1fee5601b3998086e # 26.5.1
+      - uses: py-actions/flake8@84ec6726560b6d5bd68f2a5bed83d62b52bb50ba # v2.3.0
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install clang-format
+      - name: Check code formatting
+        run: |
+          ./scripts/format.sh
+          git diff --exit-code

{shacl2code-1.1.0 → shacl2code-1.2.0}/.gitignore

@@ -1,3 +1,8 @@
+# Node
+node_modules/
+package.json
+package-lock.json
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

{shacl2code-1.1.0 → shacl2code-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shacl2code
-Version: 1.1.0
+Version: 1.2.0
 Summary: Convert SHACL model file to code bindings
 Project-URL: Homepage, https://github.com/JPEWdev/shacl2code
 Project-URL: Repository, https://github.com/JPEWdev/shacl2code.git
@@ -10,33 +10,40 @@ License-Expression: MIT
 License-File: LICENSE
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: C++
+Classifier: Programming Language :: Go
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Rust
+Classifier: Topic :: File Formats :: JSON :: JSON Schema
 Classifier: Topic :: Software Development :: Build Tools
-Requires-Python: >=3.8
+Classifier: Topic :: Software Development :: Code Generators
+Requires-Python: >=3.9
 Requires-Dist: jinja2>=3.1.2
 Requires-Dist: rdflib>=7.0.0
 Provides-Extra: dev
+Requires-Dist: black>=25.11.0; extra == 'dev'
 Requires-Dist: flake8-import-order>=0.19.2; extra == 'dev'
 Requires-Dist: flake8>=7.0.0; extra == 'dev'
-Requires-Dist: jsonschema>=4.23.0; extra == 'dev'
-Requires-Dist: mypy>=1.14.1; extra == 'dev'
+Requires-Dist: jsonschema>=4.25.1; extra == 'dev'
+Requires-Dist: mypy>=1.19.1; extra == 'dev'
 Requires-Dist: pyrefly>=0.55.0; extra == 'dev'
 Requires-Dist: pyright>=1.1.403; extra == 'dev'
-Requires-Dist: pyshacl>=0.25.0; extra == 'dev'
+Requires-Dist: pyshacl!=0.40.0,>=0.25.0; extra == 'dev'
 Requires-Dist: pytest-cov>=4.1; extra == 'dev'
+Requires-Dist: pytest-xdist>=3.5; extra == 'dev'
 Requires-Dist: pytest>=7.4; extra == 'dev'
-Requires-Dist: types-jsonschema>=4.23.0; extra == 'dev'
+Requires-Dist: types-jsonschema>=4.25.1; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # Convert SHACL Model to code bindings
 
+[![PyPI - Version](https://img.shields.io/pypi/v/shacl2code)](https://pypi.org/project/shacl2code/)
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9999/badge)](https://www.bestpractices.dev/projects/9999)
 [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/JPEWdev/shacl2code/badge)](https://scorecard.dev/viewer/?uri=github.com/JPEWdev/shacl2code)
 [![Coverage Report](https://raw.githubusercontent.com/JPEWdev/shacl2code/python-coverage-comment-action-data/badge.svg)](https://htmlpreview.github.io/?https://github.com/JPEWdev/shacl2code/blob/python-coverage-comment-action-data/htmlcov/index.html)
@@ -83,6 +90,59 @@ The available language bindings can be viewed by running:
 shacl2code list
 ```
 
+### Using JSON-LD contexts
+
+When using JSON-LD contexts, the context document shall align with the model.
+
+During model development, there may be cases where the context URL is known
+but not yet live or resolvable. In these situations, you can use the
+`--context-url` option to map your local context file to its future public home.
+
+The `--context-url` option accepts two arguments:
+
+1. `CONTEXT_LOCATION`: The actual path to the local or temporary file
+   containing the context.
+2. `CONTEXT_URL`: The official public URL. While temporarily unresolvable
+   during development, this is the URL that production JSON-LD processors will
+   eventually rely on, so it must be recorded inside the generated JSON Schema.
+
+### Generating the JSON Schema file
+
+`shacl2code` can generate a JSON Schema directly from a model.
+
+To view all options specific to JSON Schema generation, run:
+
+```shell
+shacl2code generate jsonschema -h
+```
+
+#### Example 1: Generating from publicly available URLs
+
+To generate a schema using remote, publicly accessible assets
+(such as SPDX 3.0.1):
+
+```shell
+shacl2code generate \
+    --input https://spdx.org/rdf/3.0.1/spdx-model.ttl \
+    --input https://spdx.org/rdf/3.0.1/spdx-json-serialize-annotations.ttl \
+    --context https://spdx.org/rdf/3.0.1/spdx-context.jsonld \
+    jsonschema \
+    --output spdx-json-schema.json
+```
+
+#### Example 2: Generating with a local context document
+
+To generate a schema using a local context file while embedding its future
+public URL:
+
+```shell
+shacl2code generate \
+    --input model-draft.ttl \
+    --context-url context-draft.jsonld https://example.com/context.jsonld \
+    jsonschema \
+   --output schema.json
+```
+
 ## Developing
 
 Developing on `shacl2code` is best done using a virtual environment. You can
@@ -250,5 +310,66 @@ classes are automatically concrete unless they indicate otherwise.
 It is also possible to define a class as abstract by declaring it to be of
 type: `http://spdx.invalid./AbstractClass`, but this is not preferred.
 
+### Pre-Release models
+
+`shacl2code` can detect if an ontology is a "pre-release" version (still
+subject to breaking changes). For language bindings that support it (such as
+Python), importing a pre-release ontology binding will emit a warning
+(e.g. `FutureWarning`).
+
+Pre-release status can be specified explicitly via command-line options,
+or inferred automatically from various ontology annotations. For example,
+
+```ttl
+<http://example.org/my-ontology> a ow:Ontology ;
+   sh-to-code:isPreRelease true
+   .
+```
+
+Note that the IRI of the ontology must be the prefix of all IRIs that belong to
+that ontology.
+
+In the event of conflicting annotations, `shacl2code` evaluates pre-release
+status using the following order of precedence (1 = the highest priority):
+
+1. **`--pre-release` or `--no-pre-release` command-line options**:
+   Explicitly marks the generated bindings as pre-release or stable,
+   overriding any annotations in the input ontology.
+2. **`sh-to-code:isPreRelease`**:
+   The `shacl2code` custom boolean annotation
+   (`sh-to-code:isPreRelease true` or `false`).
+3. **`adms:status` (EU SEMIC Vocabulary)**:
+   If the status is
+   `<http://publications.europa.eu/resource/authority/dataset-status/DEVELOP>`,
+   it is considered a pre-release.
+   Other values in the dataset-status vocabulary space (e.g. `COMPLETED`)
+   indicate a stable release.
+4. **`adms:status` (Original ADMS Vocabulary)**:
+   If the status is `<http://purl.org/adms/status/UnderDevelopment>`,
+   it is considered a pre-release.
+   Other values in the ADMS status namespace (e.g. `Completed`)
+   indicate a stable release.
+5. **`bibo:status` (Bibliographic Ontology)**:
+   If set to `<http://purl.org/ontology/bibo/status/draft>`, it is
+   considered a pre-release.
+   Other values in the BIBO status namespace (e.g. `published`, `legal`)
+   indicate a stable release.
+6. **`schema:creativeWorkStatus`**:
+   If set to `"Draft"` or `"Incomplete"`, it is considered a pre-release.
+   Other values (e.g. `"Published"`) indicate a stable release.
+7. **`vs:term_status`**:
+   If set to `"unstable"` or `"testing"`, it is considered a pre-release.
+   Other values (e.g. `"stable"`) indicate a stable release.
+8. **`owl:versionInfo` (pre-release extension)**:
+   If the version string contains a pre-release extension suffix
+   (e.g., `-alpha`, `-beta`, `-dev`, `-rc`, `-SNAPSHOT`, `.alpha`, etc.).
+9. **`owl:versionInfo` (major version zero)**:
+   If the version string corresponds to a major version zero in
+   [Semantic Versioning][semver] (e.g., `0.7.1`).
+10. **Default Fallback**:
+    If none of the above are present, the ontology is assumed to be a stable
+    release.
+
 [pytest]: https://www.pytest.org
 [pytest-cov]: https://pytest-cov.readthedocs.io/en/latest/
+[semver]: https://semver.org/

{shacl2code-1.1.0 → shacl2code-1.2.0}/README.md

@@ -1,5 +1,6 @@
 # Convert SHACL Model to code bindings
 
+[![PyPI - Version](https://img.shields.io/pypi/v/shacl2code)](https://pypi.org/project/shacl2code/)
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9999/badge)](https://www.bestpractices.dev/projects/9999)
 [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/JPEWdev/shacl2code/badge)](https://scorecard.dev/viewer/?uri=github.com/JPEWdev/shacl2code)
 [![Coverage Report](https://raw.githubusercontent.com/JPEWdev/shacl2code/python-coverage-comment-action-data/badge.svg)](https://htmlpreview.github.io/?https://github.com/JPEWdev/shacl2code/blob/python-coverage-comment-action-data/htmlcov/index.html)
@@ -46,6 +47,59 @@ The available language bindings can be viewed by running:
 shacl2code list
 ```
 
+### Using JSON-LD contexts
+
+When using JSON-LD contexts, the context document shall align with the model.
+
+During model development, there may be cases where the context URL is known
+but not yet live or resolvable. In these situations, you can use the
+`--context-url` option to map your local context file to its future public home.
+
+The `--context-url` option accepts two arguments:
+
+1. `CONTEXT_LOCATION`: The actual path to the local or temporary file
+   containing the context.
+2. `CONTEXT_URL`: The official public URL. While temporarily unresolvable
+   during development, this is the URL that production JSON-LD processors will
+   eventually rely on, so it must be recorded inside the generated JSON Schema.
+
+### Generating the JSON Schema file
+
+`shacl2code` can generate a JSON Schema directly from a model.
+
+To view all options specific to JSON Schema generation, run:
+
+```shell
+shacl2code generate jsonschema -h
+```
+
+#### Example 1: Generating from publicly available URLs
+
+To generate a schema using remote, publicly accessible assets
+(such as SPDX 3.0.1):
+
+```shell
+shacl2code generate \
+    --input https://spdx.org/rdf/3.0.1/spdx-model.ttl \
+    --input https://spdx.org/rdf/3.0.1/spdx-json-serialize-annotations.ttl \
+    --context https://spdx.org/rdf/3.0.1/spdx-context.jsonld \
+    jsonschema \
+    --output spdx-json-schema.json
+```
+
+#### Example 2: Generating with a local context document
+
+To generate a schema using a local context file while embedding its future
+public URL:
+
+```shell
+shacl2code generate \
+    --input model-draft.ttl \
+    --context-url context-draft.jsonld https://example.com/context.jsonld \
+    jsonschema \
+   --output schema.json
+```
+
 ## Developing
 
 Developing on `shacl2code` is best done using a virtual environment. You can
@@ -213,5 +267,66 @@ classes are automatically concrete unless they indicate otherwise.
 It is also possible to define a class as abstract by declaring it to be of
 type: `http://spdx.invalid./AbstractClass`, but this is not preferred.
 
+### Pre-Release models
+
+`shacl2code` can detect if an ontology is a "pre-release" version (still
+subject to breaking changes). For language bindings that support it (such as
+Python), importing a pre-release ontology binding will emit a warning
+(e.g. `FutureWarning`).
+
+Pre-release status can be specified explicitly via command-line options,
+or inferred automatically from various ontology annotations. For example,
+
+```ttl
+<http://example.org/my-ontology> a ow:Ontology ;
+   sh-to-code:isPreRelease true
+   .
+```
+
+Note that the IRI of the ontology must be the prefix of all IRIs that belong to
+that ontology.
+
+In the event of conflicting annotations, `shacl2code` evaluates pre-release
+status using the following order of precedence (1 = the highest priority):
+
+1. **`--pre-release` or `--no-pre-release` command-line options**:
+   Explicitly marks the generated bindings as pre-release or stable,
+   overriding any annotations in the input ontology.
+2. **`sh-to-code:isPreRelease`**:
+   The `shacl2code` custom boolean annotation
+   (`sh-to-code:isPreRelease true` or `false`).
+3. **`adms:status` (EU SEMIC Vocabulary)**:
+   If the status is
+   `<http://publications.europa.eu/resource/authority/dataset-status/DEVELOP>`,
+   it is considered a pre-release.
+   Other values in the dataset-status vocabulary space (e.g. `COMPLETED`)
+   indicate a stable release.
+4. **`adms:status` (Original ADMS Vocabulary)**:
+   If the status is `<http://purl.org/adms/status/UnderDevelopment>`,
+   it is considered a pre-release.
+   Other values in the ADMS status namespace (e.g. `Completed`)
+   indicate a stable release.
+5. **`bibo:status` (Bibliographic Ontology)**:
+   If set to `<http://purl.org/ontology/bibo/status/draft>`, it is
+   considered a pre-release.
+   Other values in the BIBO status namespace (e.g. `published`, `legal`)
+   indicate a stable release.
+6. **`schema:creativeWorkStatus`**:
+   If set to `"Draft"` or `"Incomplete"`, it is considered a pre-release.
+   Other values (e.g. `"Published"`) indicate a stable release.
+7. **`vs:term_status`**:
+   If set to `"unstable"` or `"testing"`, it is considered a pre-release.
+   Other values (e.g. `"stable"`) indicate a stable release.
+8. **`owl:versionInfo` (pre-release extension)**:
+   If the version string contains a pre-release extension suffix
+   (e.g., `-alpha`, `-beta`, `-dev`, `-rc`, `-SNAPSHOT`, `.alpha`, etc.).
+9. **`owl:versionInfo` (major version zero)**:
+   If the version string corresponds to a major version zero in
+   [Semantic Versioning][semver] (e.g., `0.7.1`).
+10. **Default Fallback**:
+    If none of the above are present, the ontology is assumed to be a stable
+    release.
+
 [pytest]: https://www.pytest.org
 [pytest-cov]: https://pytest-cov.readthedocs.io/en/latest/
+[semver]: https://semver.org/

{shacl2code-1.1.0 → shacl2code-1.2.0}/SECURITY.md

@@ -6,7 +6,8 @@ These version of shacl2code are currently receiving security fixes:
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 0.0.x   | :white_check_mark: |
+| 1.0.x   | :white_check_mark: |
+| 0.0.x   |                    |
 
 ## Reporting a Vulnerability
 

{shacl2code-1.1.0 → shacl2code-1.2.0}/pyproject.toml

@@ -6,7 +6,7 @@ dependencies = [
     "jinja2 >= 3.1.2",
     "rdflib >= 7.0.0",
 ]
-requires-python = ">= 3.8"
+requires-python = ">= 3.9"
 authors = [
     {name = "Joshua Watt", email = "JPEWhacker@gmail.com"},
 ]
@@ -15,29 +15,35 @@ classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
     "Topic :: Software Development :: Build Tools",
+    "Topic :: Software Development :: Code Generators",
+    "Programming Language :: C++",
+    "Programming Language :: Go",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Rust",
+    "Topic :: File Formats :: JSON :: JSON Schema",
 ]
 license = "MIT"
 
 [project.optional-dependencies]
 dev = [
+    "black >= 25.11.0",
     "flake8 >= 7.0.0",
     "flake8-import-order >= 0.19.2",
-    "jsonschema >= 4.23.0",  # latest version for Python 3.8 is 4.23.x
-    "mypy >= 1.14.1",  # latest version for Python 3.8 is 1.14.x
+    "jsonschema >= 4.25.1",  # latest version for Python 3.9 is 4.25.x
+    "mypy >= 1.19.1",  # latest version for Python 3.9 is 1.19.x
     "pyrefly >= 0.55.0",
     "pyright >= 1.1.403",
-    "pyshacl >= 0.25.0",
+    "pyshacl >= 0.25.0, != 0.40.0",  # 0.40.0 uses `str | X` at runtime, breaks Python < 3.10
     "pytest >= 7.4",
     "pytest-cov >= 4.1",
-    "types-jsonschema >= 4.23.0",
+    "pytest-xdist >= 3.5",
+    "types-jsonschema >= 4.25.1",
 ]
 
 [project.urls]
@@ -75,6 +81,9 @@ warn_redundant_casts = true
 addopts = [
     "--import-mode=importlib",
     "--cov=shacl2code",
+    "-n",
+    "auto",
+    "--dist=loadfile",
 ]
 # Suppress 3rd-party warnings to reduce log noise. Remove after libraries get updated.
 filterwarnings = [
@@ -91,4 +100,5 @@ relative_files = true
 patch = ["subprocess"]
 
 [tool.black]
+target-version = ["py39", "py310", "py311", "py312", "py313", "py314"]
 include = '(\.pyi?(\.j2)?$)|(main\.py\.j2$)'

shacl2code-1.2.0/scripts/ajv-compile.js

@@ -0,0 +1,76 @@
+#!/usr/bin/env node
+// SPDX-FileContributor: Arthit Suriyawongkul
+// SPDX-FileCopyrightText: 2026 Joshua Watt
+// SPDX-FileType: SOURCE
+// SPDX-License-Identifier: MIT
+//
+// Validate a JSON Schema file against its meta-schema using ajv v8.
+// Usage: ajv-compile.js <schema.json> [draft-version]
+// draft-version: 2020-12 or 2019-09 (default: inferred from "$schema")
+const fs = require("fs");
+
+const schemaFile = process.argv[2];
+const draftArg = process.argv[3];
+
+if (!schemaFile) {
+    console.error("Usage: ajv-compile.js <schema.json> [draft-version]");
+    process.exit(2);
+}
+
+const draftMap = {
+    "2020-12": "ajv/dist/2020",
+    "2019-09": "ajv/dist/2019",
+};
+
+const schemaUriMap = {
+    "https://json-schema.org/draft/2020-12/schema": "2020-12",
+    "http://json-schema.org/draft/2020-12/schema": "2020-12",
+    "https://json-schema.org/draft/2019-09/schema": "2019-09",
+    "http://json-schema.org/draft/2019-09/schema": "2019-09",
+};
+
+let schema;
+try {
+    schema = JSON.parse(fs.readFileSync(schemaFile, "utf8"));
+} catch (e) {
+    console.error(`Failed to read/parse "${schemaFile}": ${e.message}`);
+    process.exit(2);
+}
+
+let draft = draftArg;
+if (!draft) {
+    draft = schemaUriMap[schema.$schema?.replace(/#$/, "")];
+    if (!draft) {
+        console.error(
+            `Unable to infer draft version from "$schema": ${schema.$schema}. ` +
+                "Pass the draft version explicitly as the second argument.",
+        );
+        process.exit(2);
+    }
+}
+
+const ajvModule = draftMap[draft];
+if (!ajvModule) {
+    console.error(`Unsupported draft version: ${draft}. Supported: ${Object.keys(draftMap).join(", ")}`);
+    process.exit(2);
+}
+
+let Ajv;
+try {
+    Ajv = require(ajvModule);
+} catch (e) {
+    console.error(
+        `Failed to load "${ajvModule}": ${e.message}\n` +
+            'Run "npm --prefix scripts install" to install dependencies.',
+    );
+    process.exit(2);
+}
+
+const ajv = new Ajv();
+try {
+    ajv.compile(schema);
+    console.log("schema is valid");
+} catch (e) {
+    console.error("schema is invalid:", e.message);
+    process.exit(1);
+}

{shacl2code-1.1.0 → shacl2code-1.2.0}/scripts/format.sh

@@ -7,3 +7,4 @@ cd $THIS_DIR/..
 
 clang-format -i $(git ls-files '*.cpp.j2' '*.cpp' '*.hpp.j2' '*.hpp', '*.h', '*.h.j2')
 gofmt -w $(git ls-files '*.go.j2' '*.go')
+rustfmt --edition 2021 $(git ls-files '*.rs')

{shacl2code-1.1.0 → shacl2code-1.2.0}/src/shacl2code/__init__.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2024 Joshua Watt
 #
 # SPDX-License-Identifier: MIT
+"""shacl2code - Generate code from SHACL ontology models"""
 
 from .main import main
 from .model import Model, ModelException

{shacl2code-1.1.0 → shacl2code-1.2.0}/src/shacl2code/__main__.py

@@ -3,6 +3,7 @@
 # Copyright (c) 2024 Joshua Watt
 #
 # SPDX-License-Identifier: MIT
+"""Entry point for running shacl2code as a module (python -m shacl2code)"""
 
 import sys
 

{shacl2code-1.1.0 → shacl2code-1.2.0}/src/shacl2code/context.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2024 Joshua Watt
 #
 # SPDX-License-Identifier: MIT
+"""JSON-LD context processing and IRI compaction/expansion utilities"""
 
 import re
 from contextlib import contextmanager

{shacl2code-1.1.0 → shacl2code-1.2.0}/src/shacl2code/lang/__init__.py

@@ -2,6 +2,7 @@
 # Copyright (c) 2024 Joshua Watt
 #
 # SPDX-License-Identifier: MIT
+"""Language binding renderers for shacl2code"""
 
 # All renderers must be imported here to be registered
 from .cpp import CppRender
@@ -10,6 +11,7 @@ from .jinja import JinjaRender
 from .jsonschema import JsonSchemaRender
 from .lang import LANGUAGES
 from .python import PythonRender
+from .rust import RustRender
 
 __all__ = [
     "LANGUAGES",
@@ -18,4 +20,5 @@ __all__ = [
     "JinjaRender",
     "JsonSchemaRender",
     "PythonRender",
+    "RustRender",
 ]

{shacl2code-1.1.0 → shacl2code-1.2.0}/src/shacl2code/lang/common.py

@@ -119,17 +119,17 @@ class JinjaTemplateRender(object):
             return ni
 
         classes = ObjectList(model.classes)
+        ontologies = ObjectList(model.ontologies)
         concrete_classes = ObjectList(
             list(c for c in model.classes if not c.is_abstract)
         )
         abstract_classes = ObjectList(list(c for c in model.classes if c.is_abstract))
-        enums = ObjectList(model.enums)
 
         render_args = {
             "classes": classes,
+            "ontologies": ontologies,
             "concrete_classes": concrete_classes,
             "abstract_classes": abstract_classes,
-            "enums": enums,
             "context": model.context,
             **self.get_additional_render_args(model),
         }

{shacl2code-1.1.0 → shacl2code-1.2.0}/src/shacl2code/lang/golang.py

@@ -242,9 +242,9 @@ class GoLangRender(JinjaTemplateRender):
             # template
             "go_package": textwrap.dedent(f"""
                 */
-
                 package {args.package}
                 /*"""),
+            "package_name": args.package,
         }
 
     @classmethod