json-2-joi 2.5.1 → 3.0.1

package/lib/resolver.js

@@ -1,4 +1,3 @@
-/* global Map */
 const Joi = require('joi');
 const Hoek = require('@hapi/hoek');
 const Bourne = require('@hapi/bourne');
@@ -124,7 +123,9 @@ function getJoiInstance(joiOptions, extensions, joiInstance) {
                     }
                     try {
                         return { value: Bourne.parse(value) };
-                    } catch (ignoreErr) { } // eslint-disable-line no-empty
+                    } catch (ignoreErr) { /* eslint-disable-line no-unused-vars */
+                        // Purposefully ignoring error
+                    }
                 }
             }
         },
@@ -139,7 +140,9 @@ function getJoiInstance(joiOptions, extensions, joiInstance) {
                     }
                     try {
                         return { value: Bourne.parse(value) };
-                    } catch (ignoreErr) { } // eslint-disable-line no-empty
+                    } catch (ignoreErr) { /* eslint-disable-line no-unused-vars */
+                        // Purposefully ignoring error
+                    }
                 }
             }
         },
@@ -282,7 +285,6 @@ class SchemaResolver {
             }
             if (partialSchemas.length === 0) {
                 //Fall through to whatever.
-                //eslint-disable-next-line no-console
                 console.warn('WARNING: schema missing a \'type\' or \'$ref\' or \'enum\': \n%s', JSON.stringify(schema, null, 2));
                 //TODO: Handle better
                 partialSchemas.push(this.joi.any());
@@ -298,7 +300,9 @@ class SchemaResolver {
             resolvedSchema = resolvedSchema.default(schema.default)
         }
 
-        if (schemaId) {
+        resolvedSchema = this.copyMetaAnnotations(schema, resolvedSchema);
+
+        if (schemaId && !(this.joiSharedSchemas.get(schemaId))) {
             resolvedSchema = resolvedSchema.id(normalizedId(schemaId));
             this.joiSharedSchemas.set(schemaId, resolvedSchema);
         }
@@ -469,6 +473,22 @@ class SchemaResolver {
         return addEnumRestriction(joischema, schema.enum, resolveOptions);
     }
 
+    copyMetaAnnotations(schema, joischema) {
+        const metaDataNames = ['title', 'deprecated', 'readOnly', 'writeOnly'];
+        const metas = {};
+        for (const metaName of metaDataNames) {
+            if (typeof schema[metaName] !== 'undefined') {
+                metas[metaName] = schema[metaName];
+            }
+        }
+
+        if (Object.keys(metas).length === 0) {
+            return joischema;
+        }
+
+        return joischema.meta(metas);
+    }
+
     resolveOneOf(schema, resolveOptions, baseUri) {
         Hoek.assert(Array.isArray(schema.oneOf), 'Expected oneOf to be an array.');
 
@@ -524,7 +544,7 @@ class SchemaResolver {
 
         if (isObject(schema.additionalProperties)) {
             joischema = joischema.pattern(/^/, this.resolve(schema.additionalProperties, resolveOptions, baseUri));
-        } else if (typeof this.joiOptions.allowUnknown === 'undefined') {
+        } else if (typeof this.joiOptions.allowUnknown === 'undefined' || typeof schema.additionalProperties !== 'undefined') {
             joischema = joischema.unknown(schema.additionalProperties !== false);
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-2-joi",
-  "version": "2.5.1",
+  "version": "3.0.1",
   "license": "Apache 2.0",
   "description": "Converts json-schema to Joi schema. (Enhanced enjoi)",
   "main": "./index.js",
@@ -13,9 +13,6 @@
     "type": "git",
     "url": "git://github.com/kenspirit/json-2-joi.git"
   },
-  "engines": {
-    "node": ">=12"
-  },
   "keywords": [
     "json-to-joi",
     "json-2-joi",
@@ -35,17 +32,19 @@
   "homepage": "https://github.com/kenspirit/json-2-joi",
   "dependencies": {
     "@hapi/bourne": "^3.0.0",
-    "@hapi/hoek": "^9.3.0",
-    "debug": "^4.3.4"
+    "@hapi/hoek": "^11.0.4",
+    "debug": "^4.3.5"
   },
   "peerDependencies": {
-    "joi": "^17.6.0"
+    "joi": "^17.13.3"
   },
   "devDependencies": {
-    "joi": "^17.6.0",
-    "eslint": "^6.8.0",
-    "nyc": "^15.1.0",
-    "tape": "^5.5.3"
+    "@eslint/js": "^9.6.0",
+    "eslint": "^9.6.0",
+    "globals": "^15.7.0",
+    "joi": "^17.13.3",
+    "nyc": "^17.0.0",
+    "tape": "^5.8.1"
   },
   "files": [
     "lib/**/*.js",