Merge branch 'feature/asyncquerybus' into next

XYOracleNetwork · Feb 7, 2024 · 25bb8ab · 25bb8ab
2 parents d5775d6 + fd784f8
commit 25bb8ab
Show file tree

Hide file tree

Showing 26 changed files with 1,358 additions and 1,158 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "@xylabs/tsconfig-dom-jest": "^3.2.42",
     "dotenv": "^16.4.1",
     "eslint": "^8.56.0",
-    "eslint-plugin-unicorn": "^50.0.1",
+    "eslint-plugin-unicorn": "^51.0.1",
     "jest": "^29.7.0",
     "jest-docblock": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",

diff --git a/packages/manifest/package.json b/packages/manifest/package.json
@@ -16,6 +16,7 @@
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^3.2.42",
     "@xylabs/tsconfig": "^3.2.42",
+    "ajv": "^8.12.0",
     "typescript": "^5.3.3"
   },
   "types": "dist/node/index.d.ts",

diff --git a/packages/manifest/src/dapp-package-manifest-schema.json b/packages/manifest/src/dapp-package-manifest-schema.json
@@ -0,0 +1,27 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://xyo.network/schemas/dapp-package-manifest-schema.json",
+  "properties": {
+    "description": {
+      "type": "string"
+    },
+    "external": {
+      "$ref": "definitions-schema.json#/definitions/external",
+      "description": "The list of permission requests made by the dApp"
+    },
+    "nodes": {
+      "$ref": "definitions-schema.json#/definitions/nodes",
+      "description": "The list of Nodes that are defined in the manifest"
+    },
+    "schema": {
+      "pattern": "^network.xyo.dapp.manifest$",
+      "type": "string"
+    }
+  },
+  "required": [
+    "nodes",
+    "schema"
+  ],
+  "title": "XYO Dapp Manifest",
+  "type": "object"
+}
diff --git a/packages/manifest/src/schema.json b/packages/manifest/src/schema.json
@@ -1,217 +1,14 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://xyo.network/schemas/package-manifest-schema.json",
   "additionalProperties": false,
-  "definitions": {
-    "architecture": {
-      "description": "Architecture",
-      "enum": [
-        "386",
-        "amd64",
-        "arm",
-        "arm64",
-        "loong64",
-        "mips",
-        "mipsle",
-        "mips64",
-        "mips64le",
-        "ppc64",
-        "ppc64le",
-        "riscv64",
-        "s390x",
-        "wasm"
-      ],
-      "type": "string"
-    },
-    "config": {
-      "additionalProperties": true,
-      "description": "Config for a module",
-      "id": {
-        "type": "string"
-      },
-      "properties": {
-        "accountPath": {
-          "description": "HDWallet path to derive account",
-          "type": "string"
-        },
-        "architecture": {
-          "$ref": "#/definitions/architecture"
-        },
-        "description": {
-          "type": "string"
-        },
-        "features": {
-          "items": {
-            "$ref": "#/definitions/feature"
-          },
-          "type": "array"
-        },
-        "language": {
-          "$ref": "#/definitions/language"
-        },
-        "name": {
-          "type": "string"
-        },
-        "os": {
-          "$ref": "#/definitions/os"
-        },
-        "schema": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "name",
-        "schema"
-      ],
-      "type": "object"
-    },
-    "feature": {
-      "description": "Framework",
-      "enum": [
-        "angular",
-        "asp.net",
-        "browser",
-        "cryengine",
-        "corona",
-        "django",
-        "flutter",
-        "ionic",
-        "jquery",
-        "nodejs",
-        "phonegap",
-        "react",
-        "react-native",
-        "spring",
-        "unity",
-        "unreal",
-        "vue",
-        "xamarin"
-      ],
-      "type": "string"
-    },
-    "language": {
-      "description": "Language",
-      "enum": [
-        "c",
-        "c++",
-        "c#",
-        "go",
-        "java",
-        "javascript",
-        "kotlin",
-        "lua",
-        "python",
-        "ruby",
-        "rust",
-        "scala",
-        "solidity",
-        "swift"
-      ],
-      "type": "string"
-    },
-    "module": {
-      "additionalProperties": false,
-      "description": "Module Definition",
-      "properties": {
-        "config": {
-          "$ref": "#/definitions/config"
-        },
-        "description": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "config"
-      ],
-      "type": "object"
-    },
-    "modules": {
-      "description": "List of Modules",
-      "items": {
-        "$ref": "#/definitions/module"
-      },
-      "nullable": true,
-      "type": "array"
-    },
-    "node": {
-      "additionalProperties": false,
-      "description": "Node Definition - Generally loaded into an existing or new Node Module",
-      "id": {
-        "type": "string"
-      },
-      "properties": {
-        "config": {
-          "$ref": "#/definitions/config"
-        },
-        "description": {
-          "type": "string"
-        },
-        "modules": {
-          "additionalProperties": false,
-          "description": "Modules in the Node",
-          "properties": {
-            "private": {
-              "$ref": "#/definitions/modules"
-            },
-            "public": {
-              "$ref": "#/definitions/modules"
-            }
-          },
-          "required": [],
-          "type": "object"
-        },
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [],
-      "type": "object"
-    },
-    "nodes": {
-      "description": "List of Node Manifests",
-      "items": {
-        "$ref": "#/definitions/node"
-      },
-      "type": "array"
-    },
-    "os": {
-      "description": "Operating System",
-      "enum": [
-        "aix",
-        "android",
-        "darwin",
-        "dragonfly",
-        "freebsd",
-        "illumos",
-        "ios",
-        "linux",
-        "netbsd",
-        "openbsd",
-        "osx",
-        "plan9",
-        "solaris",
-        "windows"
-      ],
-      "type": "string"
-    },
-    "payloads": {
-      "description": "List of Modules",
-      "items": {
-        "$ref": "#/definitions/module"
-      },
-      "nullable": true,
-      "type": "array"
-    }
-  },
   "description": "Describes an XYO Package which is a collection of XYO Modules",
   "properties": {
-    "$schema": {
-      "type": "string"
-    },
     "description": {
       "type": "string"
     },
     "nodes": {
-      "$ref": "#/definitions/nodes",
+      "$ref": "shared/definitions-schema.json#/definitions/nodes",
       "description": "The list of Nodes that are defined in the manifest"
     },
     "schema": {