Generate rust schemas (#119)

- fixes #123 
- fixes #111

.github/workflows/style.yaml

@@ -4,15 +4,15 @@ on:
 jobs:
   formatting:
     runs-on: ubuntu-latest
-    container: node:21.5.0-alpine3.19
+    container: node:22.5.1-alpine3.19
     steps:
       - uses: actions/checkout@v4
       - run: npm ci --workspace-root
       - run: npm run formatting
 
   spelling:
     runs-on: ubuntu-latest
-    container: node:21.5.0-alpine3.19
+    container: node:22.5.1-alpine3.19
     steps:
       - uses: actions/checkout@v4
       - run: npm ci --workspace-root

.github/workflows/test-cargo.yaml

@@ -4,23 +4,31 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: rust:1.77.0
+    container: rust:1.80.0
     steps:
       - uses: actions/checkout@v4
       - run: cargo test --workspace --all-targets
 
   clippy:
     runs-on: ubuntu-latest
-    container: rust:1.77.0
+    container: rust:1.80.0
     steps:
       - uses: actions/checkout@v4
       - run: rustup component add clippy
       - run: cargo clippy --all-targets
 
   rustfmt:
     runs-on: ubuntu-latest
-    container: rust:1.77.0
+    container: rust:1.80.0
     steps:
       - uses: actions/checkout@v4
       - run: rustup component add rustfmt
       - run: cargo fmt --check
+
+  fixtures:
+    runs-on: ubuntu-latest
+    container: rust:1.80.0
+    steps:
+      - uses: actions/checkout@v4
+      - run: rustup component add rustfmt
+      - run: ./package-fixtures-cargo

.github/workflows/test-npm.yaml

@@ -4,8 +4,44 @@ on:
 jobs:
   audit:
     runs-on: ubuntu-latest
-    container: node:21.5.0-alpine3.19
+    container: node:22.5.1-alpine3.19
     steps:
       - uses: actions/checkout@v4
       - run: npm ci
       - run: npm --workspaces audit --audit-level high
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22.5.1
+      - run: corepack enable
+      - run: rustup default 1.80.0
+
+      - run: rustup target add wasm32-unknown-unknown
+      - run: cargo install wasm-bindgen-cli
+
+      - uses: actions/checkout@v4
+      - run: npm ci
+
+      - run: npm --workspaces run build --if-present
+      - run: npm --workspaces test --if-present
+
+  fixtures:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22.5.1
+      - run: corepack enable
+      - run: rustup default 1.80.0
+
+      - run: rustup target add wasm32-unknown-unknown
+      - run: cargo install wasm-bindgen-cli
+
+      - uses: actions/checkout@v4
+      - run: npm ci
+
+      - run: ./test-fixtures-npm
+      - run: ./package-fixtures-npm

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["packages/cargo/jns42-core", "packages/cargo/jns42-generator"]
+members = ["packages/cargo/*"]
 
 [profile.release]
 lto = true

fixtures/specification/anonymous.yaml → fixtures/specifications/anonymous.yaml

@@ -7,3 +7,5 @@ allOf:
   - properties:
       name:
         type: string
+examples:
+  - name: Piet

fixtures/testing/models.json → fixtures/specifications/models.json

@@ -1,6 +1,7 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "description": "Collection of models",
+  "$dynamicAnchor": "child",
   "$defs": {
     "id": {
       "$anchor": "id",

fixtures/specifications/string-or-boolean.json

@@ -0,0 +1,4 @@
+{
+  "type": ["string", "boolean"],
+  "examples": ["hi", true]
+}

fixtures/specifications/string.json

@@ -0,0 +1,4 @@
+{
+  "type": "string",
+  "examples": "a"
+}

fixtures/testing/simple-object.yaml

@@ -17,9 +17,9 @@ schemas:
     required:
       - id
     properties:
-      id: { $ref: "./models.json#/$defs/id" }
-      name: { $ref: "./models.json#/$defs/name" }
-      child: { $ref: "./models.json#/$defs/child" }
+      id: { $ref: "../specifications/models.json#/$defs/id" }
+      name: { $ref: "../specifications/models.json#/$defs/name" }
+      child: { $ref: "../specifications/models.json#/$defs/child" }
     examples:
       - id: 1
       - id: 2

generate.mjs

@@ -0,0 +1,60 @@
+#!/usr/bin/env node
+
+import cp from "child_process";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+const workspaceRoot = path.resolve(dirname);
+
+const options = {
+  shell: true,
+  stdio: "inherit",
+  env: process.env,
+  cwd: workspaceRoot,
+};
+
+const packages = [
+  ["schema-draft-04", "http://json-schema.org/draft-04/schema#"],
+  // ["schema-draft-06", "http://json-schema.org/draft-06/schema#"],
+  // ["schema-draft-07", "http://json-schema.org/draft-07/schema#"],
+  // ["schema-draft-2019-09", "https://json-schema.org/draft/2019-09/schema"],
+  ["schema-draft-2020-12", "https://json-schema.org/draft/2020-12/schema"],
+  // ["schema-swagger-v2", "http://swagger.io/v2/schema.json#/definitions/schema"],
+  ["schema-oas-v3-0", "https://spec.openapis.org/oas/3.0/schema/2021-09-28#/definitions/Schema"],
+  ["schema-oas-v3-1", "https://spec.openapis.org/oas/3.1/dialect/base"],
+  ["swagger-v2", "http://swagger.io/v2/schema.json#"],
+  ["oas-v3-0", "https://spec.openapis.org/oas/3.0/schema/2021-09-28"],
+  ["oas-v3-1", "https://spec.openapis.org/oas/3.1/schema/2022-10-07"],
+];
+
+cp.execFileSync("cargo", ["build"], options);
+cp.execFileSync("npm", ["run", "--workspaces", "build"], options);
+
+for (const [name, location] of packages) {
+  cp.execFileSync("cargo", [
+    "run",
+    "--package",
+    "jns42-generator",
+    "package",
+    location,
+    "--package-directory",
+    path.join(workspaceRoot, "generated", "cargo", name),
+    "--package-name",
+    name,
+    "--package-version",
+    "0.1.0",
+  ]);
+
+  cp.execFileSync("node", [
+    path.join(workspaceRoot, "packages", "npm", "jns42-generator", "bundled", "program.js"),
+    "package",
+    location,
+    "--package-directory",
+    path.join(workspaceRoot, "generated", "npm", name),
+    "--package-name",
+    name,
+    "--package-version",
+    "0.1.0",
+  ]);
+}

package-fixtures-cargo

@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+export NODE_ENV=development
+
+set +e
+
+ERROR=0
+
+export DIRECTORY=/tmp/jns42/$RANDOM
+
+for F in $(ls fixtures/specifications); do
+  export N=${F%.*};
+
+  echo $N;
+
+  if ! cargo run --package jns42-generator package \
+    fixtures/specifications/$F \
+    --package-directory $DIRECTORY/$N \
+    --package-name $N \
+    --package-version "0.0.0" \
+  ; then 
+    ERROR=1;
+  fi;
+
+  if ! ( cd $DIRECTORY/$N ; cargo test); then
+    ERROR=1;
+  fi;
+
+done;
+
+rm -rf $DIRECTORY
+
+exit $ERROR
+
+

package-fixtures-npm

@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+export NODE_ENV=development
+
+npm run build --workspaces --if-present
+
+set +e
+
+ERROR=0
+
+export DIRECTORY=/tmp/jns42/$RANDOM
+
+for F in $(ls fixtures/specifications); do
+  export N=${F%.*};
+
+  echo $N;
+
+  if ! node ./packages/npm/jns42-generator/bundled/program.js package \
+    fixtures/specifications/$F \
+    --package-directory $DIRECTORY/$N \
+    --package-name $N \
+    --package-version "0.0.0" \
+  ; then 
+    ERROR=1;
+  fi;
+
+  if ! ( cd $DIRECTORY/$N ; npm install ; npm test); then
+    ERROR=1;
+  fi;
+
+done;
+
+rm -rf $DIRECTORY
+
+exit $ERROR

package.json

@@ -1,10 +1,8 @@
 {
   "private": true,
-  "packageManager": "npm@10.3.0",
+  "packageManager": "npm@10.8.1",
   "workspaces": [
-    "generated/npm/*",
-    "packages/npm/jns42-core",
-    "packages/npm/jns42-generator"
+    "packages/npm/*"
   ],
   "scripts": {
     "spelling": "cspell",

packages/cargo/jns42-core/Cargo.toml

@@ -29,6 +29,7 @@ wasm-bindgen = "0.2.92"
 wasm-bindgen-futures = "0.4.42"
 gloo = "0.11.0"
 semver = "1.0.23"
+js-sys = "0.3.69"
 
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]