@jsonresume/schema 1.0.1 → 1.1.0

package/README.md

@@ -15,16 +15,18 @@ The current working version of the schema is `v1.0.0` that is represented by the
 
 All PR's for the next version should be made against the `develop` branch. 
 
+This enforces that the schema package, always has the official stable release of the schema.
+
 ### Getting started
 
 ```
-npm install --save resume-schema
+npm install --save @jsonresume/schema
 ```
 
 To use
 
 ```js
-const resumeSchema = require("resume-schema");
+const resumeSchema = require("@jsonresume/schema");
 resumeSchema.validate(
   { name: "Thomas" },
   function (err, report) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonresume/schema",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "JSON Resume Schema",
   "private": false,
   "main": "validator.js",
@@ -27,7 +27,7 @@
     "validator.js"
   ],
   "dependencies": {
-    "z-schema": "^4.2.4"
+    "jsonschema": "^1.4.1"
   },
   "devDependencies": {
     "ajv-cli": "^3.3.0",

package/schema.json

@@ -1,10 +1,11 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "additionalProperties": false,
+  "$schema": "http://json-schema.org/draft-07/schema#",
+" $id": "http://example.com/example.json",
+  "additionalProperties": true,
   "definitions": {
     "iso8601": {
       "type": "string",
-      "description": "e.g. 2014-06-29",
+      "description": "Similar to the standard date type, but each section after the year is optional. e.g. 2014-06-29 or 2023-04",
       "pattern": "^([1-2][0-9]{3}-[0-1][0-9]-[0-3][0-9]|[1-2][0-9]{3}-[0-1][0-9]|[1-2][0-9]{3})$"
     }
   },
@@ -274,9 +275,7 @@
             "description": "e.g. Certified Kubernetes Administrator"
           },
           "date": {
-            "type": "string",
-            "description": "e.g. 1989-06-12",
-            "format": "date"
+            "$ref": "#/definitions/iso8601"
           },
           "url": {
             "type": "string",

package/validator.js

@@ -1,20 +1,20 @@
-'use strict';
-var ZSchema = require('z-schema');
-var schema = require('./schema');
+"use strict";
+var schema = require("./schema");
+var Validator = require("jsonschema").Validator;
 
 function validate(resumeJson, callback) {
-  var callbackWrapper = function(err, valid) {
-    if(err) {
-      callback(err)
-    } else {
-      callback(null, {valid: valid});
-    }
+  var v = new Validator();
+
+  const validation = v.validate(resumeJson, schema);
+
+  if (!validation.valid) {
+    return callback(validation.errors, false);
   }
 
-  new ZSchema().validate(resumeJson, schema, callbackWrapper);
+  return callback(null, true);
 }
 
 module.exports = {
   validate: validate,
-  schema: schema
+  schema: schema,
 };