fixed tests, split out walker library

Author: jonluca

package.json

@@ -1,21 +1,20 @@
 {
 	"name": "browser-json-schema-to-openapi-schema",
-	"version": "0.0.8",
+	"version": "0.0.9",
 	"description": "Converts a JSON Schema to OpenAPI Schema Object",
-	"type": "module",
 	"bin": {
 		"json-schema-to-openapi-schema": "bin/json-schema-to-openapi-schema.js"
 	},
 	"types": "dist/mjs/index.d.ts",
 	"files": [
 		"/dist"
 	],
-	"main": "dist/cjs/index.js",
-	"module": "dist/mjs/index.js",
+	"main": "dist/src/cjs/index.js",
+	"module": "dist/src/mjs/index.js",
 	"exports": {
 		".": {
-			"import": "./dist/mjs/index.js",
-			"require": "./dist/cjs/index.js"
+			"import": "./dist/src/mjs/index.js",
+			"require": "./dist/src/cjs/index.js"
 		}
 	},
 	"scripts": {
@@ -32,25 +31,21 @@
 	},
 	"dependencies": {
 		"@apidevtools/json-schema-ref-parser": "^9.0.9",
-		"@cloudflare/json-schema-walker": "^0.1.1",
 		"chalk": "^5.0.1",
-		"clone": "^2.1.2",
+		"json-schema-walker": "^0.0.1",
 		"yargs": "^17.5.1"
 	},
 	"devDependencies": {
-		"@types/clone": "^2.1.1",
 		"@typescript-eslint/eslint-plugin": "^5.31.0",
 		"@typescript-eslint/parser": "^5.31.0",
 		"c8": "^7.12.0",
-		"coveralls": "^3.1.1",
 		"eslint": "^8.21.0",
 		"eslint-config-prettier": "^8.5.0",
 		"eslint-plugin-prettier": "^4.2.1",
 		"eslint-plugin-unused-imports": "^2.0.0",
 		"mocha": "^10.0.0",
 		"nock": "^13.2.9",
 		"prettier": "^2.7.1",
-		"should": "^13.2.3",
 		"typescript": "^4.7.4",
 		"vitest": "^0.20.2"
 	},

src/index.ts

@@ -1,14 +1,12 @@
 import type { JSONSchema } from '@apidevtools/json-schema-ref-parser';
-import RefParser from '@apidevtools/json-schema-ref-parser';
 import type {
 	JSONSchema4,
 	JSONSchema6Definition,
 	JSONSchema7Definition,
 } from 'json-schema';
-import clone from 'clone';
 import type { Options, SchemaType, SchemaTypeKeys } from './types';
-import { getVocabulary, schemaWalk, vocabularies } from './lib/walker';
 import { oas3schema } from './lib/openApiSchema';
+import { Walker } from 'json-schema-walker';
 
 class InvalidTypeError extends Error {
 	constructor(message: string) {
@@ -29,53 +27,14 @@ const allowedKeywords = [
 	...Object.keys(oas3schema.definitions.Schema.properties),
 ];
 
-function isCyclic(obj: any) {
-	const seenObjects = new Set();
-
-	function detect(obj: any) {
-		if (obj && typeof obj === 'object') {
-			if (seenObjects.has(obj)) {
-				return true;
-			}
-			seenObjects.add(obj);
-			for (const key in obj) {
-				// eslint-disable-next-line no-prototype-builtins
-				if (obj.hasOwnProperty(key) && detect(obj[key])) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	return detect(obj);
-}
-
 const convert = async <T = JSONSchema>(
 	schema: T,
 	options?: Options
 ): Promise<SchemaType> => {
-	const {
-		cloneSchema = true,
-		dereference = false,
-		dereferenceOptions,
-	} = options || {};
-	let schemaToUse = schema as SchemaType;
-
-	if (cloneSchema) {
-		schemaToUse = clone(schema);
-	}
-
-	const parser = new RefParser();
-	if (dereference) {
-		// We run the risk of circular references here
-		const res = await parser.dereference(schema, dereferenceOptions || {});
-		schemaToUse = res as SchemaType;
-	}
-
-	const vocab = getVocabulary(schemaToUse, vocabularies.DRAFT_04);
-	schemaWalk(schemaToUse, convertSchema, null, vocab);
-	return schemaToUse;
+	const walker = new Walker<T>();
+	await walker.loadSchema(schema, options);
+	await walker.walk(convertSchema, walker.vocabularies.DRAFT_07);
+	return walker.rootSchema;
 };
 
 function stripIllegalKeywords(schema: SchemaType) {
@@ -114,20 +73,29 @@ function convertSchema(schema: SchemaType | undefined) {
 	schema = convertIllegalKeywordsAsExtensions(schema);
 	return schema;
 }
-
-function validateType(type: string | string[]) {
-	const validTypes = [
-		'null',
-		'boolean',
-		'object',
-		'array',
-		'number',
-		'string',
-		'integer',
-	];
+const validTypes = new Set([
+	'null',
+	'boolean',
+	'object',
+	'array',
+	'number',
+	'string',
+	'integer',
+]);
+function validateType(type: any) {
+	if (typeof type === 'object' && !Array.isArray(type)) {
+		// Refs are allowed because they fix circular references
+		if (type.$ref) {
+			return;
+		}
+		// this is a de-referenced circular ref
+		if (type.properties) {
+			return;
+		}
+	}
 	const types = Array.isArray(type) ? type : [type];
 	types.forEach((type) => {
-		if (validTypes.indexOf(type) < 0 && type !== undefined)
+		if (type && !validTypes.has(type))
 			throw new InvalidTypeError('Type "' + type + '" is not a valid type');
 	});
 }