refactor schema validation

Signed-off-by: shmck <shawn.j.mckay@gmail.com>
coderoad · ShMcK · Jun 7, 2020 · Jun 5, 2020 · Jun 7, 2020 · Jun 7, 2020
commit 8cd8a8818ab0df4e2d938b13f76186be730180f1
diff --git a/src/build.ts b/src/build.ts
@@ -5,6 +5,7 @@ import * as util from "util";
 import { parse } from "./utils/parse";
 import { getArg } from "./utils/args";
 import { getCommits, CommitLogObject } from "./utils/commits";
+import tutorialSchema from "./schema/tutorial";
 import { validateSchema } from "./utils/validateSchema";
 import * as T from "../typings/tutorial";
 
@@ -112,7 +113,7 @@ async function build(args: string[]) {
 
   // validate tutorial based on json schema
   try {
-    const valid = validateSchema(tutorial);
+    const valid = validateSchema(tutorialSchema, tutorial);
     if (!valid) {
       console.error("Tutorial validation failed. See above to see what to fix");
       return;

diff --git a/src/utils/validateSchema.ts b/src/utils/validateSchema.ts
@@ -1,10 +1,11 @@
-import schema from "../schema/tutorial";
-
 // https://www.npmjs.com/package/ajv
 // @ts-ignore ajv typings not working
 import JsonSchema from "ajv";
 
-export function validateSchema(json: any): boolean | PromiseLike<boolean> {
+export function validateSchema(
+  schema: any,
+  json: any
+): boolean | PromiseLike<boolean> {
   // validate using https://json-schema.org/
   const jsonSchema = new JsonSchema({
     allErrors: true,

diff --git a/src/utils/validateSkeleton.ts b/src/utils/validateSkeleton.ts
diff --git a/tests/skeleton.test.ts b/tests/skeleton.test.ts
@@ -1,4 +1,7 @@
-import { validateSkeleton } from "../src/utils/validateSkeleton";
+import { validateSchema } from "../src/utils/validateSchema";
+import skeletonSchema from "../src/schema/skeleton";
+
+const validateSkeleton = (json: any) => validateSchema(skeletonSchema, json);
 
 const validJson = {
   version: "0.1.0",

diff --git a/tests/validate.test.ts b/tests/validate.test.ts
@@ -1,11 +1,14 @@
 import * as T from "../typings/tutorial";
+import tutorialSchema from "../src/schema/tutorial";
 import { validateSchema } from "../src/utils/validateSchema";
 
+const validateTutorial = (json: any) => validateSchema(tutorialSchema, json);
+
 describe("validate tutorial", () => {
   it("should reject an empty tutorial", () => {
     const json = { version: "here" };
 
-    const valid = validateSchema(json);
+    const valid = validateTutorial(json);
     expect(valid).toBe(false);
   });
   it("should return true for a valid tutorial", () => {
@@ -45,7 +48,7 @@ describe("validate tutorial", () => {
       ],
     };
 
-    const valid = validateSchema(json);
+    const valid = validateTutorial(json);
     expect(valid).toBe(true);
   });
 });