feat: Added website property to the contact item

Author: kostysh

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windingtree/org.json-schema",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "ORG.JSON schema for the ORGiD protocol",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,15 +24,15 @@
   },
   "homepage": "https://github.com/windingtree/org.json-schema#readme",
   "devDependencies": {
-    "@types/node": "17.0.10",
-    "typescript": "4.5.4",
-    "ajv": "8.9.0",
+    "@types/node": "18.11.11",
+    "typescript": "4.9.3",
+    "ajv": "8.11.2",
     "ajv-formats": "2.1.1",
-    "chai": "4.3.4",
+    "chai": "4.3.7",
     "js-yaml": "4.1.0",
-    "json-schema-to-typescript": "10.1.5",
-    "mocha": "9.1.4",
-    "eslint": "8.7.0"
+    "json-schema-to-typescript": "11.0.2",
+    "mocha": "10.1.0",
+    "eslint": "8.29.0"
   },
   "publishConfig": {
     "access": "public"

src/org.json.yaml

@@ -584,6 +584,8 @@ definitions:
   ContactReference:
     description: Contact reference
     type: object
+    required:
+      - function
     properties:
       function:
         description: >-
@@ -599,6 +601,10 @@ definitions:
         description: Email
         type: string
         format: email
+      website:
+        description: Website URI
+        type: string
+        pattern: '^(https|http){1}:\/\/([\w\d.-]+)(:(\d*))?(\/[\w\d.-?=#&%-_]*)?$'
       messengers:
         description: Messenger accounts
         type: array
@@ -613,6 +619,7 @@ definitions:
         "name": "John Smith",
         "phone": "+1234567890",
         "email": "email@spam.com",
+        "website": "https://website.web",
         "messengers": [
           {
             "type": "whatsapp",

types/org.json/index.d.ts

@@ -138,12 +138,7 @@ export interface VerificationMethodReference {
    * A public key PEM property is used to specify the PEM-encoded version of the public key
    */
   publicKeyPem?: string;
-  /**
-   * Public key in JWT format (recommended key format)
-   */
-  publicKeyJwk?: {
-    [k: string]: unknown;
-  };
+  publicKeyJwk?: PublicKeyJwkReference;
   /**
    * Public key in value in Base58 Bitcoin format
    */
@@ -152,27 +147,34 @@ export interface VerificationMethodReference {
    * Note about the private key purpose
    */
   note?: string;
+  verificationMethodRevocation?: VerificationMethodRevocationReference;
+  [k: string]: unknown;
+}
+/**
+ * Public key in JWT format (recommended key format)
+ */
+export interface PublicKeyJwkReference {
+  [k: string]: unknown;
+}
+/**
+ * Verification method revocation status
+ */
+export interface VerificationMethodRevocationReference {
   /**
-   * Verification method revocation status
-   */
-  verificationMethodRevocation?: {
-    /**
-     * Revocation reason according to https://datatracker.ietf.org/doc/html/rfc5280#section-5.3.1
-     */
-    reason?:
-      | "unspecified"
-      | "keyCompromise"
-      | "affiliationChanged"
-      | "superseded"
-      | "cessationOfOperation"
-      | "certificateHold"
-      | "privilegeWithdrawn";
-    /**
-     * Date of the public key invalidation
-     */
-    invalidityDate?: string;
-    [k: string]: unknown;
-  };
+   * Revocation reason according to https://datatracker.ietf.org/doc/html/rfc5280#section-5.3.1
+   */
+  reason?:
+    | "unspecified"
+    | "keyCompromise"
+    | "affiliationChanged"
+    | "superseded"
+    | "cessationOfOperation"
+    | "certificateHold"
+    | "privilegeWithdrawn";
+  /**
+   * Date of the public key invalidation
+   */
+  invalidityDate?: string;
   [k: string]: unknown;
 }
 /**
@@ -447,7 +449,7 @@ export interface ContactReference {
   /**
    * Contact function: sales, support, accounting, etc.
    */
-  function?: string;
+  function: string;
   /**
    * Contact person or department name
    */
@@ -460,6 +462,10 @@ export interface ContactReference {
    * Email
    */
   email?: string;
+  /**
+   * Website URI
+   */
+  website?: string;
   /**
    * Messenger accounts
    */

types/orgVc/index.d.ts

@@ -281,12 +281,7 @@ export interface VerificationMethodReference {
    * A public key PEM property is used to specify the PEM-encoded version of the public key
    */
   publicKeyPem?: string;
-  /**
-   * Public key in JWT format (recommended key format)
-   */
-  publicKeyJwk?: {
-    [k: string]: unknown;
-  };
+  publicKeyJwk?: PublicKeyJwkReference;
   /**
    * Public key in value in Base58 Bitcoin format
    */
@@ -295,27 +290,34 @@ export interface VerificationMethodReference {
    * Note about the private key purpose
    */
   note?: string;
+  verificationMethodRevocation?: VerificationMethodRevocationReference;
+  [k: string]: unknown;
+}
+/**
+ * Public key in JWT format (recommended key format)
+ */
+export interface PublicKeyJwkReference {
+  [k: string]: unknown;
+}
+/**
+ * Verification method revocation status
+ */
+export interface VerificationMethodRevocationReference {
   /**
-   * Verification method revocation status
-   */
-  verificationMethodRevocation?: {
-    /**
-     * Revocation reason according to https://datatracker.ietf.org/doc/html/rfc5280#section-5.3.1
-     */
-    reason?:
-      | "unspecified"
-      | "keyCompromise"
-      | "affiliationChanged"
-      | "superseded"
-      | "cessationOfOperation"
-      | "certificateHold"
-      | "privilegeWithdrawn";
-    /**
-     * Date of the public key invalidation
-     */
-    invalidityDate?: string;
-    [k: string]: unknown;
-  };
+   * Revocation reason according to https://datatracker.ietf.org/doc/html/rfc5280#section-5.3.1
+   */
+  reason?:
+    | "unspecified"
+    | "keyCompromise"
+    | "affiliationChanged"
+    | "superseded"
+    | "cessationOfOperation"
+    | "certificateHold"
+    | "privilegeWithdrawn";
+  /**
+   * Date of the public key invalidation
+   */
+  invalidityDate?: string;
   [k: string]: unknown;
 }
 /**
@@ -507,7 +509,7 @@ export interface ContactReference {
   /**
    * Contact function: sales, support, accounting, etc.
    */
-  function?: string;
+  function: string;
   /**
    * Contact person or department name
    */
@@ -520,6 +522,10 @@ export interface ContactReference {
    * Email
    */
   email?: string;
+  /**
+   * Website URI
+   */
+  website?: string;
   /**
    * Messenger accounts
    */