yuppi 1.3.0 → 1.3.2

package/README.md

@@ -224,9 +224,9 @@ Declare your Yuppi schema for TypeScript.
 > Example:
 >
 > ```typescript
-> import type { User } from './yuppi/types/user';
+> import type { User } from './yuppi/types/User';
 >
-> Yupp.declare(schema, 'user');
+> Yupp.declare(schema, 'User');
 >
 > const user = Yupp.validate(schema, properties) as User;
 > /*

package/dist/main.js

@@ -45,8 +45,8 @@ var import_path = __toESM(require("path"));
 var import_typebox = require("@sinclair/typebox");
 var convertToJSONSchema = (schema) => {
   const base = (schema2, key, config) => {
-    if (!config.required) schema2 = import_typebox.Type.Optional(schema2);
     if (config.nullable || config.default === null) schema2 = import_typebox.Type.Union([schema2, import_typebox.Type.Null()]);
+    if (!config.required) schema2 = import_typebox.Type.Optional(schema2);
     return schema2;
   };
   const build = (key, config) => {
@@ -89,6 +89,8 @@ var Yup = __toESM(require("yup"));
 var convertToYup = (schema, error_messages) => {
   const base = (schema2, key, config) => {
     schema2 = schema2.nullable();
+    if (config.default) schema2 = schema2.default(config.default);
+    if (!config.nullable && config.default !== null) schema2 = schema2.nonNullable(({ path: path2 }) => (error_messages?.base?.nullable ?? "").replaceAll("{path}", path2));
     if (config.required)
       schema2 = schema2.test(
         "required",
@@ -100,8 +102,6 @@ var convertToYup = (schema, error_messages) => {
           return true;
         }
       );
-    if (!config.nullable && config.default !== null) schema2 = schema2.nonNullable(({ path: path2 }) => (error_messages?.base?.nullable ?? "").replaceAll("{path}", path2));
-    if (config.default) schema2 = schema2.default(config.default);
     return schema2;
   };
   const build = (key, config) => {
@@ -178,6 +178,11 @@ var convertToYup = (schema, error_messages) => {
   return Yup.object().shape(properties);
 };
 
+// src/utils/PascalCase.util.ts
+var pascalCase = (text) => {
+  return text.replace(/[^a-zA-Z0-9]/g, " ").split(" ").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("");
+};
+
 // src/defaults/YuppiOptions.default.ts
 var YuppiOptionsDefault = {
   folder_path: "./",
@@ -236,7 +241,7 @@ var Yuppi = class {
     return yup_schema.validateSync(properties, this.options.validate_options);
   }
   declare(schema, name) {
-    name = name.toLowerCase();
+    name = pascalCase(name);
     const types_dir = import_path.default.join(this.options.folder_path ?? "./", "yuppi", "types");
     const banner_comment = `/* eslint-disable */
 

package/dist/main.mjs

@@ -14,8 +14,8 @@ import path from "path";
 import { Type } from "@sinclair/typebox";
 var convertToJSONSchema = (schema) => {
   const base = (schema2, key, config) => {
-    if (!config.required) schema2 = Type.Optional(schema2);
     if (config.nullable || config.default === null) schema2 = Type.Union([schema2, Type.Null()]);
+    if (!config.required) schema2 = Type.Optional(schema2);
     return schema2;
   };
   const build = (key, config) => {
@@ -58,6 +58,8 @@ import * as Yup from "yup";
 var convertToYup = (schema, error_messages) => {
   const base = (schema2, key, config) => {
     schema2 = schema2.nullable();
+    if (config.default) schema2 = schema2.default(config.default);
+    if (!config.nullable && config.default !== null) schema2 = schema2.nonNullable(({ path: path2 }) => (error_messages?.base?.nullable ?? "").replaceAll("{path}", path2));
     if (config.required)
       schema2 = schema2.test(
         "required",
@@ -69,8 +71,6 @@ var convertToYup = (schema, error_messages) => {
           return true;
         }
       );
-    if (!config.nullable && config.default !== null) schema2 = schema2.nonNullable(({ path: path2 }) => (error_messages?.base?.nullable ?? "").replaceAll("{path}", path2));
-    if (config.default) schema2 = schema2.default(config.default);
     return schema2;
   };
   const build = (key, config) => {
@@ -147,6 +147,11 @@ var convertToYup = (schema, error_messages) => {
   return Yup.object().shape(properties);
 };
 
+// src/utils/PascalCase.util.ts
+var pascalCase = (text) => {
+  return text.replace(/[^a-zA-Z0-9]/g, " ").split(" ").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("");
+};
+
 // src/defaults/YuppiOptions.default.ts
 var YuppiOptionsDefault = {
   folder_path: "./",
@@ -205,7 +210,7 @@ var Yuppi = class {
     return yup_schema.validateSync(properties, this.options.validate_options);
   }
   declare(schema, name) {
-    name = name.toLowerCase();
+    name = pascalCase(name);
     const types_dir = path.join(this.options.folder_path ?? "./", "yuppi", "types");
     const banner_comment = `/* eslint-disable */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuppi",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Schemas that can be converted to Yup and JSON Schema.",
   "license": "MIT",
   "homepage": "https://github.com/keift/yuppi",