Merge branch 'main' into refactor/input_on_error

dyne · Jun 24, 2024 · 481fdb6 · 481fdb6
2 parents a03e20e + 274df7c
commit 481fdb6
Show file tree

Hide file tree

Showing 30 changed files with 113 additions and 58 deletions.
diff --git a/docs/examples/index.md b/docs/examples/index.md
@@ -12,3 +12,4 @@ SPDX-License-Identifier: CC-BY-NC-SA-4.0
 <!--@include: git/index.md-->
 <!--@include: helpers/index.md-->
 <!--@include: http/index.md-->
+<!--@include: json-schema/index.md-->
diff --git a/docs/examples/json-schema/index.md b/docs/examples/json-schema/index.md
@@ -0,0 +1,14 @@
+<!--
+SPDX-FileCopyrightText: 2024 Dyne.org foundation
+
+SPDX-License-Identifier: CC-BY-NC-SA-4.0
+-->
+
+## json-schema plugin examples
+
+### validate json
+::: code-group
+<<< @/examples/json-schema/validate.zen{3 gherkin:line-numbers}
+<<< @/examples/json-schema/validate.data{json}
+<<< @/examples/json-schema/validate.keys{json}
+:::
diff --git a/docs/examples/json-schema/validate.data b/docs/examples/json-schema/validate.data
@@ -0,0 +1,6 @@
+{
+    "json_data": {
+        "first_name": "Jhon",
+        "last_name": "Doe"
+    }
+}
diff --git a/docs/examples/json-schema/validate.keys b/docs/examples/json-schema/validate.keys
@@ -0,0 +1,17 @@
+{
+	"json_schema": {
+		"type": "object",
+		"properties": {
+			"first_name": {
+				"type": "string"
+			},
+			"last_name": {
+				"type": "string"
+			}
+		},
+		"required": [
+			"first_name",
+			"last_name"
+		]
+	}
+}
diff --git a/docs/examples/json-schema/validate.zen b/docs/examples/json-schema/validate.zen
@@ -0,0 +1,6 @@
+Rule unknown ignore
+
+Given I send json_data 'json_data' and send json_schema 'json_schema' and validate json and output into 'result'
+
+Given I have a 'string dictionary' named 'result'
+Then print the 'result'
diff --git a/docs/statements/index.md b/docs/statements/index.md
@@ -161,15 +161,20 @@ neither the open/connect part nor the parameters part are present.
 | connect      | object         | do same delete       |
 | connect      | object,headers | do same delete       |
 
+## json-schema plugin
+| open/connect | params                | phrase        |
+| ------------ | --------------------- | ------------- |
+|              | json_data,json_schema | validate json |
+
 ## oauth plugin
-| open/connect | params                                | phrase                            |
-| ------------ | ------------------------------------- | --------------------------------- |
-|              | request,server_data                   | generate access token             |
-|              | request,server_data                   | verify request parameters         |
-|              | request,server_data                   | generate authorization code       |
-|              | request,client,server_data,expires_in | generate request uri              |
-|              | token,server_data                     | get claims from token             |
-|              | request_uri,data,server_data          | add data to authorization details |
+| open/connect | params                                | phrase                               |
+| ------------ | ------------------------------------- | ------------------------------------ |
+|              | request,server_data                   | generate access token                |
+|              | request,server_data                   | verify request parameters            |
+|              | request,server_data                   | generate authorization code          |
+|              | request,client,server_data,expires_in | generate request uri                 |
+|              | token,server_data                     | get authorization details from token |
+|              | request_uri,data,server_data          | add data to authorization details    |
 
 ## pocketbase plugin
 | open/connect | params                              | phrase                    |

diff --git a/docs/statements/index.mjs b/docs/statements/index.mjs
@@ -15,6 +15,7 @@ import {fs as sl_fs} from "@slangroom/fs";
 import {git} from "@slangroom/git";
 import {helpers} from "@slangroom/helpers";
 import {http} from "@slangroom/http";
+import {JSONSchema} from "@slangroom/json-schema";
 import {oauth} from "@slangroom/oauth";
 import {pocketbase} from "@slangroom/pocketbase";
 import {qrcode} from "@slangroom/qrcode";
@@ -24,7 +25,7 @@ import {timestamp} from "@slangroom/timestamp";
 import {wallet} from "@slangroom/wallet";
 import {zencode} from "@slangroom/zencode";
 
-const IGNORED_PKG = ['browser', 'core', 'deps', 'ignored', 'json-schema', 'shared']
+const IGNORED_PKG = ['browser', 'core', 'deps', 'ignored', 'shared']
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const ourDirPath = path.resolve(__dirname, "./");
@@ -59,6 +60,7 @@ const generateTable = (plugin, name) => {
 	[git, 'git'],
 	[helpers, 'helpers'],
 	[http, 'http'],
+	[JSONSchema, 'json-schema'],
 	[oauth, 'oauth'],
 	[pocketbase, 'pocketbase'],
 	[qrcode, 'qrcode'],

diff --git a/docs/statements/package.json b/docs/statements/package.json
@@ -1,30 +1,31 @@
 {
-  "name": "statements",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@slangroom/core": "workspace:^",
-    "@slangroom/db": "workspace:^",
-    "@slangroom/ethereum": "workspace:^",
-    "@slangroom/fs": "workspace:^",
-    "@slangroom/git": "workspace:^",
-    "@slangroom/helpers": "workspace:^",
-    "@slangroom/http": "workspace:^",
-    "@slangroom/oauth": "workspace:^",
-    "@slangroom/pocketbase": "workspace:^",
-    "@slangroom/qrcode": "workspace:^",
-    "@slangroom/redis": "workspace:^",
-    "@slangroom/shell": "workspace:^",
-    "@slangroom/timestamp": "workspace:^",
-    "@slangroom/wallet": "workspace:^",
-    "@slangroom/zencode": "workspace:^",
-    "markdown-table": "^3.0.3"
-  }
+	"name": "statements",
+	"version": "1.0.0",
+	"description": "",
+	"main": "index.js",
+	"scripts": {
+		"test": "echo \"Error: no test specified\" && exit 1"
+	},
+	"keywords": [],
+	"author": "",
+	"license": "ISC",
+	"dependencies": {
+		"@slangroom/core": "workspace:^",
+		"@slangroom/db": "workspace:^",
+		"@slangroom/ethereum": "workspace:^",
+		"@slangroom/fs": "workspace:^",
+		"@slangroom/git": "workspace:^",
+		"@slangroom/helpers": "workspace:^",
+		"@slangroom/http": "workspace:^",
+		"@slangroom/json-schema": "workspace:^",
+		"@slangroom/oauth": "workspace:^",
+		"@slangroom/pocketbase": "workspace:^",
+		"@slangroom/qrcode": "workspace:^",
+		"@slangroom/redis": "workspace:^",
+		"@slangroom/shell": "workspace:^",
+		"@slangroom/timestamp": "workspace:^",
+		"@slangroom/wallet": "workspace:^",
+		"@slangroom/zencode": "workspace:^",
+		"markdown-table": "^3.0.3"
+	}
 }
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
-  "version": "1.33.9",
+  "version": "1.33.10",
   "command": {
     "publish": {
       "conventionalCommits": true

diff --git a/pkg/browser/package.json b/pkg/browser/package.json
@@ -8,7 +8,7 @@
 		"@slangroom/pocketbase": "workspace:*",
 		"@slangroom/qrcode": "workspace:*"
 	},
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"repository": "https://github.com/dyne/slangroom",
 	"license": "AGPL-3.0-only",
 	"type": "module",

diff --git a/pkg/core/package.json b/pkg/core/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/core",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/deps": "workspace:*",
 		"@slangroom/ignored": "workspace:*",

diff --git a/pkg/db/package.json b/pkg/db/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/db",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/core": "workspace:*",
 		"sequelize": "^6.16.0",

diff --git a/pkg/deps/package.json b/pkg/deps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/deps",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"chalk": "^5.3.0",
 		"chevrotain": "^10.5.0"

diff --git a/pkg/ethereum/package.json b/pkg/ethereum/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/ethereum",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/core": "workspace:*",
 		"@slangroom/shared": "workspace:*",

diff --git a/pkg/fs/package.json b/pkg/fs/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/fs",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/core": "workspace:*",
 		"@slangroom/shared": "workspace:*",

diff --git a/pkg/git/package.json b/pkg/git/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/git",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/core": "workspace:*",
 		"isomorphic-git": "^1.25.10"

diff --git a/pkg/helpers/package.json b/pkg/helpers/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/helpers",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/core": "workspace:*",
 		"@slangroom/shared": "workspace:*",

diff --git a/pkg/http/package.json b/pkg/http/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/http",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/core": "workspace:*",
 		"@slangroom/shared": "workspace:*",

diff --git a/pkg/ignored/package.json b/pkg/ignored/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/ignored",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/deps": "workspace:*",
 		"@slangroom/shared": "workspace:*"

diff --git a/pkg/json-schema/package.json b/pkg/json-schema/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/json-schema",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/core": "workspace:*",
 		"@slangroom/shared": "workspace:*",

diff --git a/pkg/oauth/package.json b/pkg/oauth/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/oauth",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@node-oauth/oauth2-server": "^5.1.0",
 		"@slangroom/core": "workspace:*",

diff --git a/pkg/pocketbase/package.json b/pkg/pocketbase/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/pocketbase",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@capacitor/preferences": "^6.0.0",
 		"@slangroom/core": "workspace:*",

diff --git a/pkg/qrcode/package.json b/pkg/qrcode/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/qrcode",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/core": "workspace:*",
 		"qrcode": "^1.5.3"

diff --git a/pkg/redis/package.json b/pkg/redis/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/redis",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@redis/client": "^1.5.12",
 		"@slangroom/core": "workspace:*",

diff --git a/pkg/shared/package.json b/pkg/shared/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/shared",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/deps": "workspace:*"
 	},

diff --git a/pkg/shell/package.json b/pkg/shell/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/shell",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/core": "workspace:*",
 		"execa": "^8.0.1"

diff --git a/pkg/timestamp/package.json b/pkg/timestamp/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/timestamp",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/core": "workspace:*",
 		"@slangroom/shared": "workspace:*"

diff --git a/pkg/wallet/package.json b/pkg/wallet/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/wallet",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@meeco/sd-jwt": "^0.0.3",
 		"@meeco/sd-jwt-vc": "^0.0.4",

diff --git a/pkg/zencode/package.json b/pkg/zencode/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slangroom/zencode",
-	"version": "1.33.9",
+	"version": "1.33.10",
 	"dependencies": {
 		"@slangroom/core": "workspace:*",
 		"@slangroom/shared": "workspace:*"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml