Merge branch 'master' into fix/go-editor-config

CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.14.1](https://github.com/open-rpc/meta-schema/compare/1.14.0...1.14.1) (2021-03-15)
+
+
+### Bug Fixes
+
+* allow methods array to have refs ([709a380](https://github.com/open-rpc/meta-schema/commit/709a3808f5b712f9fc07dd8a54a66f213924d41e))
+* **github action:** eslint workflow node version ([a51cc70](https://github.com/open-rpc/meta-schema/commit/a51cc70cbef90342b1e1130164bd54b50774023f))
+
 # [1.14.0](https://github.com/open-rpc/meta-schema/compare/1.13.20...1.14.0) (2020-11-10)
 
 

index.d.ts

@@ -341,7 +341,8 @@ export interface MethodObject {
   externalDocs?: ExternalDocumentationObject;
   [regex: string]: SpecificationExtension | any;
 }
-export type Methods = MethodObject[];
+export type MethodReference = MethodObject | ReferenceObject;
+export type Methods = MethodReference[];
 export interface SchemaComponents { [key: string]: any; }
 export interface LinkComponents { [key: string]: any; }
 export interface ErrorComponents { [key: string]: any; }

index.py

@@ -384,7 +384,9 @@ class MethodObject(TypedDict):
     deprecated: Optional[MethodObjectDeprecated]
     externalDocs: Optional[ExternalDocumentationObject]
 
-Methods = NewType("Methods", List[MethodObject])
+MethodReference = NewType("MethodReference", Union[MethodObject, ReferenceObject])
+
+Methods = NewType("Methods", List[MethodReference])
 
 SchemaComponents = NewType("SchemaComponents", Mapping[Any, Any])
 

index.rs

@@ -436,7 +436,12 @@ pub struct MethodObject {
     pub(crate) deprecated: Option<MethodObjectDeprecated>,
     pub(crate) externalDocs: Option<ExternalDocumentationObject>,
 }
-pub type Methods = Vec<MethodObject>;
+#[derive(Serialize, Deserialize)]
+pub enum MethodReference {
+    MethodObject,
+    ReferenceObject
+}
+pub type Methods = Vec<MethodReference>;
 pub type SchemaComponents = HashMap<String, Option<serde_json::Value>>;
 pub type LinkComponents = HashMap<String, Option<serde_json::Value>>;
 pub type ErrorComponents = HashMap<String, Option<serde_json::Value>>;

schema.json

@@ -39,7 +39,15 @@
       "type": "array",
       "additionalItems": false,
       "items": {
-        "$ref": "#/definitions/methodObject"
+        "title": "methodOrReference",
+        "oneOf": [
+          {
+            "$ref": "#/definitions/methodObject"
+          },
+          {
+            "$ref": "#/definitions/referenceObject"
+          }
+        ]
       }
     },
     "components": {
@@ -120,7 +128,7 @@
     "JSONSchema": {
       "$ref": "https://raw.githubusercontent.com/json-schema-tools/meta-schema/1.5.9/src/schema.json"
     },
-    "referenceObject": { 
+    "referenceObject": {
       "title": "referenceObject",
       "type": "object",
       "additionalProperties": false,

src/test.ts

@@ -20,7 +20,7 @@ describe("meta-schema", () => {
     const dereffed = await deref.resolve();
     expect(dereffed).toBeTruthy();
     expect(dereffed.definitions).not.toBeDefined();
-    expect(dereffed.properties.methods.items.properties.result.oneOf[0].properties.schema.title).toBe("JSONSchema");
-    expect(dereffed.properties.methods.items.properties.result.oneOf[1].title).toBe("referenceObject");
+    expect(dereffed.properties.methods.items.oneOf[0].properties.result.oneOf[0].properties.schema.title).toBe("JSONSchema");
+    expect(dereffed.properties.methods.items.oneOf[0].properties.result.oneOf[1].title).toBe("referenceObject");
   });
 });