yuppi 1.3.3 → 1.3.5

package/README.md

@@ -8,17 +8,17 @@
 [Function]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function
 [Promise]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise
 [Void]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Undefined
-[YuppiOptionsDefault]: ./src/defaults/YuppiOptions.default.ts
 [Domain]: ./src/patterns/Domain.pattern.ts
 [Email]: ./src/patterns/Email.pattern.ts
 [HTTP]: ./src/patterns/HTTP.pattern.ts
 [PhoneNumber]: ./src/patterns/PhoneNumber.pattern.ts
 [URI]: ./src/patterns/URI.pattern.ts
 [Username]: ./src/patterns/Username.pattern.ts
+[YuppiOptionsDefault]: ./src/defaults/YuppiOptions.default.ts
 [AnyObject]: https://github.com/jquense/yup/blob/master/src/util/objectTypes.ts#L7
 [JSONSchema]: https://github.com/sinclairzx81/typebox/blob/master/src/type/object/object.ts#L78
 [Schema]: ./src/types/Schema.type.ts
-[ValidateOptions]: https://github.com/jquense/yup/blob/master/src/types.ts#L47
+[ValidateOptions]: https://github.com/jquense/yup/blob/master/src/types.ts#L48
 [ValidationError]: https://github.com/jquense/yup/blob/master/src/ValidationError.ts#L53
 [YuppiOptions]: ./src/types/YuppiOptions.type.ts
 
@@ -62,6 +62,7 @@ Schemas that can be converted to Yup and JSON Schema.
 - Contains ready regex patterns
 - Portable schemas as a JSON file
 - Works with Yup, stable and secure
+- Schemas can be declared for TypeScript
 - It is strict and therefore does not accept more than one type
 - Error messages are ready to be understood but can be edited if desired
 - Can be converted to Yup and [JSON Schema](https://json-schema.org). JSON Schema is OpenAPI compatible
@@ -162,7 +163,6 @@ Validate the properties with your Yuppi schema.
 > const schema: Schema = {
 >   display_name: {
 >     type: 'string',
->     min: 1,
 >     max: 32,
 >     nullable: false,
 >     required: true
@@ -278,7 +278,6 @@ Convert your Yuppi schema into [JSON Schema](https://json-schema.org).
 >     properties: {
 >       display_name: {
 >         type: "string",
->         minLength: 1,
 >         maxLength: 32,
 >       },
 >       username: {

package/dist/main.js

@@ -37,7 +37,7 @@ module.exports = __toCommonJS(main_exports);
 
 // src/Yuppi.class.ts
 var import_json_schema_to_typescript = require("json-schema-to-typescript");
-var import_lodash = __toESM(require("lodash"));
+var import_lodash = __toESM(require("lodash.merge"));
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 
@@ -56,6 +56,8 @@ var convertToJSONSchema = (schema) => {
       schema2 = base(schema2, key, config);
       return schema2;
     } else if (config.type === "number") {
+      if (config.positive) config.min = 1;
+      if (config.negative) config.max = -1;
       schema2 = config.integer === true ? import_typebox.Type.Integer({ enum: config.enum, minimum: config.min, maximum: config.max, positive: config.positive, negative: config.negative, default: config.default }) : import_typebox.Type.Number({ enum: config.enum, minimum: config.min, maximum: config.max, positive: config.positive, negative: config.negative, default: config.default });
       schema2 = base(schema2, key, config);
       return schema2;
@@ -234,7 +236,7 @@ var YuppiOptionsDefault = {
 var Yuppi = class {
   options;
   constructor(options = YuppiOptionsDefault) {
-    this.options = import_lodash.default.merge({}, YuppiOptionsDefault, options);
+    this.options = (0, import_lodash.default)({}, YuppiOptionsDefault, options);
   }
   validate(schema, properties) {
     const yup_schema = this.convertToYup(schema);

package/dist/main.mjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/Yuppi.class.ts
 import { compile } from "json-schema-to-typescript";
-import _ from "lodash";
+import merge from "lodash.merge";
 import fs from "fs";
 import path from "path";
 
@@ -25,6 +25,8 @@ var convertToJSONSchema = (schema) => {
       schema2 = base(schema2, key, config);
       return schema2;
     } else if (config.type === "number") {
+      if (config.positive) config.min = 1;
+      if (config.negative) config.max = -1;
       schema2 = config.integer === true ? Type.Integer({ enum: config.enum, minimum: config.min, maximum: config.max, positive: config.positive, negative: config.negative, default: config.default }) : Type.Number({ enum: config.enum, minimum: config.min, maximum: config.max, positive: config.positive, negative: config.negative, default: config.default });
       schema2 = base(schema2, key, config);
       return schema2;
@@ -203,7 +205,7 @@ var YuppiOptionsDefault = {
 var Yuppi = class {
   options;
   constructor(options = YuppiOptionsDefault) {
-    this.options = _.merge({}, YuppiOptionsDefault, options);
+    this.options = merge({}, YuppiOptionsDefault, options);
   }
   validate(schema, properties) {
     const yup_schema = this.convertToYup(schema);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuppi",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "Schemas that can be converted to Yup and JSON Schema.",
   "license": "MIT",
   "homepage": "https://github.com/keift/yuppi",
@@ -16,14 +16,14 @@
   },
   "dependencies": {
     "@sinclair/typebox": "^0.34.41",
-    "@types/lodash": "^4.17.20",
-    "@types/node": "^24.6.0",
+    "@types/lodash.merge": "^4.6.9",
+    "@types/node": "^24.6.2",
     "json-schema-to-typescript": "^15.0.4",
-    "lodash": "^4.17.21",
+    "lodash.merge": "^4.6.2",
     "yup": "^1.7.1"
   },
   "devDependencies": {
-    "neatlint": "^1.1.16",
+    "neatlint": "^1.1.18",
     "prettier": "^3.6.2",
     "tsup": "^8.5.0"
   },