Jun 7, 2020 · Jun 5, 2020 · Jun 7, 2020 · Jun 7, 2020 · Jun 7, 2020 · Jun 7, 2020
diff --git a/src/build.ts b/src/build.ts
 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";


  // 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
 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
 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
 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", () => {
      ],
    };

    const valid =validateSchema(json);
    const valid =validateTutorial(json);
    expect(valid).toBe(true);
  });
 });
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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";

Expand DownExpand Up		@@ -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;
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -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,
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -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",
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -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", () => {
Expand DownExpand Up		@@ -45,7 +48,7 @@ describe("validate tutorial", () => {
		],
		};

		const valid =validateSchema(json);
		const valid =validateTutorial(json);
		expect(valid).toBe(true);
		});
		});