feat(pkg): remove old "validator.js" and use its ESM+AJV version

Author: maxkoryukov

package.json

@@ -3,13 +3,8 @@
   "version": "1.1.2",
   "description": "JSON Resume Schema",
   "private": false,
-  "main": "validator.js",
   "exports": {
     ".": {
-      "require": "./validator.js",
-      "import": "./validator.js"
-    },
-    "./all": {
       "require": "./dist/index.cjs",
       "import": "./index.mjs"
     },
@@ -41,11 +36,9 @@
     "sample.resume.json",
     "sample.job.json",
     "schema.json",
-    "job-schema.json",
-    "validator.js"
+    "job-schema.json"
   ],
   "dependencies": {
-    "jsonschema": "^1.4.1"
   },
   "devDependencies": {
     "ajv": "^8.20.0",

test/0-package.spec.cjs

@@ -1,7 +1,7 @@
 'use strict'
 
 const tape = require('tape')
-const { validate, schema, jobSchema } = require('@jsonresume/schema/all')
+const { validate, schema, jobSchema } = require('@jsonresume/schema')
 
 tape('CJS package export - validate', (t) => {
 	t.equal(typeof validate, 'function', 'package should export "validate" function')

test/0-package.spec.mjs

@@ -1,5 +1,5 @@
 import tape from 'tape'
-import { validate, schema, jobSchema } from '@jsonresume/schema/all'
+import { validate, schema, jobSchema } from '@jsonresume/schema'
 
 import treeValidate      from '@jsonresume/schema/validate'
 import treeSchemasResume from '@jsonresume/schema/schemas/resume.json'  with { type: 'json' }

test/awards-esm.spec.mjs

@@ -1,5 +1,5 @@
 import test from 'tape'
-import { validate } from '@jsonresume/schema/all'
+import validate from '@jsonresume/schema/validate'
 
 import fixtures from './__test__/awards.json' with { type: 'json' }
 

test/awards.spec.js

@@ -1,5 +1,5 @@
 var test = require("tape");
-var { validate } = require("../validator");
+var { validate } = require("@jsonresume/schema");
 const fixtures = require("./__test__/awards.json");
 
 test("awards - valid", (t) => {

test/basics.spec.js

@@ -1,5 +1,5 @@
 var test = require('tape');
-var { validate } = require('../validator');
+var { validate } = require("@jsonresume/schema");
 const fixtures = require('./__test__/basics.json');
 
 test('basics - valid', (t) => {

test/certificates.spec.js

@@ -1,5 +1,5 @@
 var test = require('tape');
-var { validate } = require('../validator');
+var { validate } = require("@jsonresume/schema");
 const fixtures = require('./__test__/certificates.json');
 
 test('certificates - valid', (t) => {

test/dates.spec.js

@@ -1,56 +1,58 @@
-var test = require("tape");
-var Validator = require("jsonschema").Validator;
+'use strict'
+const test = require('tape')
+const Ajv = require('ajv')
 
-const fixtures = require("./__test__/dates.json");
-// var mockDateSchema = require('./__test__/mockDateSchema.json');
+const schemaResume = require('@jsonresume/schema/schemas/resume.json')
 
-const mockDateSchema = {
-  type: "string",
-  description: "Mock Date Format",
-  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})$",
-};
+const fixtures = require('./__test__/dates.json');
+
+const miniDateSchema = {
+  type: 'string',
+  description: 'Mock Date Format',
 
-function dateValidate(resumeJson, callback) {
-  var v = new Validator();
+  // copy 'date' pattern from resume schema
+  pattern: schemaResume['$defs']['iso8601']['pattern'],
+};
 
-  const validation = v.validate(resumeJson, mockDateSchema);
+function dateValidate (resumeJson, callback) {
+  const ajv = new Ajv();
+  const validate = ajv.compile(miniDateSchema)
 
-  if (!validation.valid) {
-    return callback(validation.errors, false);
+  if (!validate(resumeJson)) {
+    return callback(validate.errors, false);
   }
 
   return callback(null, true);
 }
 
-test("dates - YYYY-MM-DD", (t) => {
+test('dates - YYYY-MM-DD', (t) => {
   dateValidate(fixtures.yearMonthDay, (err, valid) => {
-    t.equal(err, null, "err should be null");
-    t.true(valid, "valid is true");
+    t.equal(err, null, 'err should be null');
+    t.true(valid, 'valid is true');
   });
   t.end();
 });
 
-test("dates - YYYY-MM", (t) => {
+test('dates - YYYY-MM', (t) => {
   dateValidate(fixtures.yearMonth, (err, valid) => {
-    t.equal(err, null, "err should be null");
-    t.true(valid, "valid is true");
+    t.equal(err, null, 'err should be null');
+    t.true(valid, 'valid is true');
   });
   t.end();
 });
 
-test("dates - YYYY", (t) => {
+test('dates - YYYY', (t) => {
   dateValidate(fixtures.yearMonthDay, (err, valid) => {
-    t.equal(err, null, "err should be null");
-    t.true(valid, "valid is true");
+    t.equal(err, null, 'err should be null');
+    t.true(valid, 'valid is true');
   });
   t.end();
 });
 
-test("dates - invalid", (t) => {
+test('dates - invalid', (t) => {
   dateValidate(fixtures.invalid, (err, valid) => {
-    t.notEqual(err, null, "err should contain an error");
-    t.false(valid, "valid is false");
+    t.notEqual(err, null, 'err should contain an error');
+    t.false(valid, 'valid is false');
   });
   t.end();
 });

test/education.spec.js

@@ -1,5 +1,5 @@
 var test = require('tape');
-var { validate } = require('../validator');
+var { validate } = require("@jsonresume/schema");
 const fixtures = require('./__test__/education.json');
 
 test('eductaion - valid', (t) => {

test/interests.spec.js

@@ -1,5 +1,5 @@
 var test = require('tape');
-var { validate } = require('../validator');
+var { validate } = require("@jsonresume/schema");
 const fixtures = require('./__test__/interests.json');
 
 test('interests - valid', (t) => {