@famgia/omnify-core 0.0.127 → 0.0.129

package/dist/index.cjs

@@ -85,6 +85,7 @@ __export(index_exports, {
   jsonSyntaxError: () => jsonSyntaxError,
   loadSchema: () => loadSchema,
   loadSchemas: () => loadSchemas,
+  mergePartialSchemas: () => mergePartialSchemas,
   missingConfigFieldError: () => missingConfigFieldError,
   missingFieldError: () => missingFieldError,
   notImplementedError: () => notImplementedError,
@@ -955,7 +956,8 @@ async function findSchemaFiles(dirPath, extensions, recursive) {
 async function loadSchemas(directoryPath, options = {}) {
   const {
     extensions = [".yaml", ".yml", ".json"],
-    recursive = true
+    recursive = true,
+    skipPartialResolution = false
   } = options;
   const absoluteDir = path.resolve(directoryPath);
   try {
@@ -990,16 +992,35 @@ async function loadSchemas(directoryPath, options = {}) {
     schemas[schema.name] = schema;
     schemaLocations[schema.name] = filePath;
   }
+  if (skipPartialResolution) {
+    for (const partial of partialSchemas) {
+      const partialKey = `__partial__${partial.name}`;
+      schemas[partialKey] = partial;
+    }
+    return schemas;
+  }
+  return mergePartialSchemas(schemas, partialSchemas);
+}
+function mergePartialSchemas(schemas, partials) {
+  const partialSchemas = partials ?? [];
+  const cleanSchemas = {};
+  for (const [key, schema] of Object.entries(schemas)) {
+    if (key.startsWith("__partial__")) {
+      partialSchemas.push(schema);
+    } else {
+      cleanSchemas[key] = schema;
+    }
+  }
   for (const partial of partialSchemas) {
     const targetName = partial.target;
     if (!targetName) {
       console.warn(`Partial schema '${partial.name}' has no target, skipping`);
       continue;
     }
-    const target = schemas[targetName];
+    const target = cleanSchemas[targetName];
     if (!target) {
       if (partial.name === targetName) {
-        schemas[partial.name] = {
+        cleanSchemas[partial.name] = {
           ...partial,
           kind: "object"
         };
@@ -1012,12 +1033,12 @@ async function loadSchemas(directoryPath, options = {}) {
       ...partial.properties ?? {},
       ...target.properties ?? {}
     };
-    schemas[targetName] = {
+    cleanSchemas[targetName] = {
       ...target,
       properties: mergedProperties
     };
   }
-  return schemas;
+  return cleanSchemas;
 }
 var FILE_SCHEMA_NAME = "File";
 function schemasHaveFileProperties(schemas) {
@@ -2460,6 +2481,9 @@ function validateDefaultValue(typeName, value, property) {
 
 // src/validation/validator.ts
 var VALID_ID_TYPES = ["Int", "BigInt", "Uuid", "String"];
+function toSnakeCase(str) {
+  return str.replace(/([a-z])([A-Z])/g, "$1_$2").toLowerCase();
+}
 function buildLocation7(file, line, column) {
   const loc = { file };
   if (line !== void 0) {
@@ -2895,6 +2919,20 @@ function validateAssociations(schema, allSchemas) {
         )
       );
     }
+    if (relation === "ManyToOne" || relation === "OneToOne" && !assocProp.mappedBy) {
+      const expectedFkColumn = `${toSnakeCase(name)}_id`;
+      if (schema.properties[expectedFkColumn]) {
+        errors.push(
+          validationError(
+            `Duplicate FK definition: Property '${expectedFkColumn}' conflicts with Association '${name}'`,
+            buildLocation7(schema.filePath),
+            `Both create the same column '${expectedFkColumn}'. Choose one approach:
+  1. Use Association only (remove '${expectedFkColumn}' property) - recommended
+  2. Use explicit FK only (remove '${name}' Association)`
+          )
+        );
+      }
+    }
   }
   return errors;
 }
@@ -4768,6 +4806,7 @@ function createVersionStore(config) {
   jsonSyntaxError,
   loadSchema,
   loadSchemas,
+  mergePartialSchemas,
   missingConfigFieldError,
   missingFieldError,
   notImplementedError,