@kravc/schema 2.2.3 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kravc/schema",
-  "version": "2.2.3",
+  "version": "2.3.1",
   "description": "Advanced JSON schema manipulation and validation library.",
   "keywords": [
     "JSON",
@@ -34,15 +34,15 @@
     "lodash.pick": "^4.4.0",
     "lodash.uniq": "^4.5.0",
     "security-context": "^4.0.0",
-    "validator": "^12.2.0",
-    "z-schema": "^5.0.0"
+    "validator": "^13.7.0",
+    "z-schema": "^5.0.2"
   },
   "devDependencies": {
-    "chai": "^4.2.0",
-    "eslint": "^7.12.1",
-    "js-yaml": "^3.13.1",
-    "jsonld": "^5.0.0",
-    "mocha": "^8.2.1",
+    "chai": "^4.3.4",
+    "eslint": "^8.6.0",
+    "js-yaml": "^4.1.0",
+    "jsonld": "^5.2.0",
+    "mocha": "^9.1.3",
     "nyc": "^15.0.1"
   },
   "nyc": {

package/src/Schema.spec.js

@@ -1,13 +1,13 @@
 'use strict'
 
+const { load }         = require('js-yaml')
 const { Schema }       = require('src')
 const { expect }       = require('chai')
-const { safeLoad }     = require('js-yaml')
 const { readFileSync } = require('fs')
 
 const loadSync = (yamlPath) => {
   const id     = yamlPath.split('.')[0].split('/').reverse()[0]
-  const source = safeLoad(readFileSync(yamlPath))
+  const source = load(readFileSync(yamlPath))
 
   return new Schema(source, id)
 }

package/src/Validator.spec.js

@@ -1,13 +1,13 @@
 'use strict'
 
+const { load }         = require('js-yaml')
 const { expect }       = require('chai')
-const { safeLoad }     = require('js-yaml')
 const { readFileSync } = require('fs')
 const { Schema, Validator } = require('src')
 
 const loadSync = (yamlPath) => {
   const id     = yamlPath.split('.')[0].split('/').reverse()[0]
-  const source = safeLoad(readFileSync(yamlPath))
+  const source = load(readFileSync(yamlPath))
 
   return new Schema(source, id)
 }

package/src/helpers/normalizeType.js

@@ -11,17 +11,19 @@ const normalizeType = (type, value) => {
   }
 
   if (isBoolean) {
-    const isBoolean = typeof value === 'boolean'
-    const isNumber  = typeof value === 'number'
+    const isNumberValue  = typeof value === 'number'
+    const isStringValue  = typeof value === 'string'
 
-    if (!isBoolean) {
-      if (isNumber) {
+    const shouldConvertValue = isNumberValue || isStringValue
+
+    if (shouldConvertValue) {
+      if (isNumberValue) {
         normalizedValue = Boolean(value)
+      }
 
-      } else {
+      if (isStringValue) {
         const isTrue = value.toLowerCase() === 'true' || value === '1'
         normalizedValue = isTrue ? true : false
-
       }
     }
   }