From 9abe4e78a9904ff0fa2b97855bd1d3620fc42f78 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Sun, 5 Nov 2017 22:08:36 +0000 Subject: [PATCH] refactor: rename $data.js and $data.json without $, closes #526 --- lib/ajv.js | 4 ++-- lib/{$data.js => data.js} | 2 +- lib/keyword.js | 2 +- lib/refs/{$data.json => data.json} | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename lib/{$data.js => data.js} (96%) rename lib/refs/{$data.json => data.json} (94%) diff --git a/lib/ajv.js b/lib/ajv.js index 1827f71..6eb97c6 100644 --- a/lib/ajv.js +++ b/lib/ajv.js @@ -7,7 +7,7 @@ var compileSchema = require('./compile') , stableStringify = require('fast-json-stable-stringify') , formats = require('./compile/formats') , rules = require('./compile/rules') - , $dataMetaSchema = require('./$data') + , $dataMetaSchema = require('./data') , patternGroups = require('./patternGroups') , util = require('./compile/util'); @@ -433,7 +433,7 @@ function addFormat(name, format) { function addDraft6MetaSchema(self) { var $dataSchema; if (self._opts.$data) { - $dataSchema = require('./refs/$data.json'); + $dataSchema = require('./refs/data.json'); self.addMetaSchema($dataSchema, $dataSchema.$id, true); } if (self._opts.meta === false) return; diff --git a/lib/$data.js b/lib/data.js similarity index 96% rename from lib/$data.js rename to lib/data.js index 60cfc2d..5f1ad85 100644 --- a/lib/$data.js +++ b/lib/data.js @@ -38,7 +38,7 @@ module.exports = function (metaSchema, keywordsJsonPointers) { keywords[key] = { anyOf: [ schema, - { $ref: 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#' } + { $ref: 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#' } ] }; } diff --git a/lib/keyword.js b/lib/keyword.js index 85e64c6..341811a 100644 --- a/lib/keyword.js +++ b/lib/keyword.js @@ -50,7 +50,7 @@ function addKeyword(keyword, definition) { metaSchema = { anyOf: [ metaSchema, - { '$ref': 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#' } + { '$ref': 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#' } ] }; } diff --git a/lib/refs/$data.json b/lib/refs/data.json similarity index 94% rename from lib/refs/$data.json rename to lib/refs/data.json index 7bc6aca..f17b414 100644 --- a/lib/refs/$data.json +++ b/lib/refs/data.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#", + "$id": "https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#", "description": "Meta-schema for $data reference (JSON-schema extension proposal)", "type": "object", "required": [ "$data" ],