@famgia/omnify-core 0.0.127 → 0.0.129

package/dist/index.d.cts

@@ -235,6 +235,8 @@ interface LoadSchemasOptions {
     readonly extensions?: readonly string[];
     /** Whether to load recursively from subdirectories (default: true) */
     readonly recursive?: boolean;
+    /** Skip partial schema resolution (default: false) - use mergePartialSchemas later */
+    readonly skipPartialResolution?: boolean;
 }
 /**
  * Converts a file name to a schema name (PascalCase).
@@ -284,6 +286,15 @@ declare function loadSchema(filePath: string, options?: LoadSchemaOptions): Prom
  * @throws OmnifyError if duplicate schema names or invalid files
  */
 declare function loadSchemas(directoryPath: string, options?: LoadSchemasOptions): Promise<SchemaCollection>;
+/**
+ * Merges partial schemas into their target schemas.
+ * Call this after combining schemas from multiple sources.
+ *
+ * @param schemas - Collection of regular schemas
+ * @param partials - Array of partial schemas to merge (optional, extracted from schemas if not provided)
+ * @returns Schema collection with partials merged into targets
+ */
+declare function mergePartialSchemas(schemas: Record<string, LoadedSchema>, partials?: LoadedSchema[]): SchemaCollection;
 /**
  * The reserved name for the File schema (polymorphic file storage).
  */
@@ -1363,4 +1374,4 @@ declare class VersionStore {
  */
 declare function createVersionStore(config: VersionStoreConfig): VersionStore;
 
-export { type AssociationMetadata, type ChangeAction, type CreateVersionOptions, type DefaultValueValidationResult, type DiffOperationResult, type ExpandedProperty, FILE_SCHEMA_NAME, type FormatOptions, type GenerateOptions, type GenerateResult, type GeneratedFile, type LoadResult, type LoadSchemaOptions, type LoadSchemasOptions, Omnify, OmnifyError, type OmnifyLogger, type OmnifyOptions, PluginManager, type PluginManagerOptions, type PluginRegistrationResult, type PluginRegistry, type PropertyMetadata, type RegisteredType, type SchemaError, type SchemaIntrospection, type SchemaMetadata, type SchemaValidationResult, type SchemaWarning, type ValidationOptions, type ValidationResult, type VersionChange, type VersionDiff, type VersionFile, type VersionIndexSnapshot, type VersionPropertySnapshot, type VersionSchemaSnapshot, VersionStore, type VersionStoreConfig, type VersionSummary, atlasError, atlasNotFoundError, circularReferenceError, configError, configNotFoundError, createFileLoadedSchema, createFileSchemaDefinition, createOmnify, createPluginManager, createVersionStore, duplicateSchemaError, ensureFileSchema, expandProperty, expandSchema, expandSchemaProperties, expandSchemas, fileNameToSchemaName, findReferencedSchemas, findReferencingSchemas, formatError, formatErrorPlain, formatErrorSummary, generateFileSchemaYaml, generationError, getAssociationMetadata, getCustomTypeNames, getEntitySchemas, getEnumSchemas, getExitCode, getGroups, getPropertyMetadata, getRelationshipGraph, getSchemaMetadata, getSchemaNames, getSchemasByGroup, getSchemasByKind, getTopologicalOrder, getTypeInfo, hasCircularReferences, internalError, introspectSchema, introspectSchemas, invalidAssociationTargetError, invalidConfigError, invalidPropertyTypeError, isCompoundType, jsonSyntaxError, loadSchema, loadSchemas, missingConfigFieldError, missingFieldError, notImplementedError, outputWriteError, parseJsonSchema, parseYamlSchema, pluginError, pluginNotFoundError, pluginTypeConflictError, schemaNotFoundError, schemaParseError, schemasHaveFileProperties, validateAssociations, validateDefaultValue, validateEnumSchema, validateOptions, validateProperties, validatePropertyType, validateSchema, validateSchemas, validationError, yamlSyntaxError };
+export { type AssociationMetadata, type ChangeAction, type CreateVersionOptions, type DefaultValueValidationResult, type DiffOperationResult, type ExpandedProperty, FILE_SCHEMA_NAME, type FormatOptions, type GenerateOptions, type GenerateResult, type GeneratedFile, type LoadResult, type LoadSchemaOptions, type LoadSchemasOptions, Omnify, OmnifyError, type OmnifyLogger, type OmnifyOptions, PluginManager, type PluginManagerOptions, type PluginRegistrationResult, type PluginRegistry, type PropertyMetadata, type RegisteredType, type SchemaError, type SchemaIntrospection, type SchemaMetadata, type SchemaValidationResult, type SchemaWarning, type ValidationOptions, type ValidationResult, type VersionChange, type VersionDiff, type VersionFile, type VersionIndexSnapshot, type VersionPropertySnapshot, type VersionSchemaSnapshot, VersionStore, type VersionStoreConfig, type VersionSummary, atlasError, atlasNotFoundError, circularReferenceError, configError, configNotFoundError, createFileLoadedSchema, createFileSchemaDefinition, createOmnify, createPluginManager, createVersionStore, duplicateSchemaError, ensureFileSchema, expandProperty, expandSchema, expandSchemaProperties, expandSchemas, fileNameToSchemaName, findReferencedSchemas, findReferencingSchemas, formatError, formatErrorPlain, formatErrorSummary, generateFileSchemaYaml, generationError, getAssociationMetadata, getCustomTypeNames, getEntitySchemas, getEnumSchemas, getExitCode, getGroups, getPropertyMetadata, getRelationshipGraph, getSchemaMetadata, getSchemaNames, getSchemasByGroup, getSchemasByKind, getTopologicalOrder, getTypeInfo, hasCircularReferences, internalError, introspectSchema, introspectSchemas, invalidAssociationTargetError, invalidConfigError, invalidPropertyTypeError, isCompoundType, jsonSyntaxError, loadSchema, loadSchemas, mergePartialSchemas, missingConfigFieldError, missingFieldError, notImplementedError, outputWriteError, parseJsonSchema, parseYamlSchema, pluginError, pluginNotFoundError, pluginTypeConflictError, schemaNotFoundError, schemaParseError, schemasHaveFileProperties, validateAssociations, validateDefaultValue, validateEnumSchema, validateOptions, validateProperties, validatePropertyType, validateSchema, validateSchemas, validationError, yamlSyntaxError };

package/dist/index.d.ts

@@ -235,6 +235,8 @@ interface LoadSchemasOptions {
     readonly extensions?: readonly string[];
     /** Whether to load recursively from subdirectories (default: true) */
     readonly recursive?: boolean;
+    /** Skip partial schema resolution (default: false) - use mergePartialSchemas later */
+    readonly skipPartialResolution?: boolean;
 }
 /**
  * Converts a file name to a schema name (PascalCase).
@@ -284,6 +286,15 @@ declare function loadSchema(filePath: string, options?: LoadSchemaOptions): Prom
  * @throws OmnifyError if duplicate schema names or invalid files
  */
 declare function loadSchemas(directoryPath: string, options?: LoadSchemasOptions): Promise<SchemaCollection>;
+/**
+ * Merges partial schemas into their target schemas.
+ * Call this after combining schemas from multiple sources.
+ *
+ * @param schemas - Collection of regular schemas
+ * @param partials - Array of partial schemas to merge (optional, extracted from schemas if not provided)
+ * @returns Schema collection with partials merged into targets
+ */
+declare function mergePartialSchemas(schemas: Record<string, LoadedSchema>, partials?: LoadedSchema[]): SchemaCollection;
 /**
  * The reserved name for the File schema (polymorphic file storage).
  */
@@ -1363,4 +1374,4 @@ declare class VersionStore {
  */
 declare function createVersionStore(config: VersionStoreConfig): VersionStore;
 
-export { type AssociationMetadata, type ChangeAction, type CreateVersionOptions, type DefaultValueValidationResult, type DiffOperationResult, type ExpandedProperty, FILE_SCHEMA_NAME, type FormatOptions, type GenerateOptions, type GenerateResult, type GeneratedFile, type LoadResult, type LoadSchemaOptions, type LoadSchemasOptions, Omnify, OmnifyError, type OmnifyLogger, type OmnifyOptions, PluginManager, type PluginManagerOptions, type PluginRegistrationResult, type PluginRegistry, type PropertyMetadata, type RegisteredType, type SchemaError, type SchemaIntrospection, type SchemaMetadata, type SchemaValidationResult, type SchemaWarning, type ValidationOptions, type ValidationResult, type VersionChange, type VersionDiff, type VersionFile, type VersionIndexSnapshot, type VersionPropertySnapshot, type VersionSchemaSnapshot, VersionStore, type VersionStoreConfig, type VersionSummary, atlasError, atlasNotFoundError, circularReferenceError, configError, configNotFoundError, createFileLoadedSchema, createFileSchemaDefinition, createOmnify, createPluginManager, createVersionStore, duplicateSchemaError, ensureFileSchema, expandProperty, expandSchema, expandSchemaProperties, expandSchemas, fileNameToSchemaName, findReferencedSchemas, findReferencingSchemas, formatError, formatErrorPlain, formatErrorSummary, generateFileSchemaYaml, generationError, getAssociationMetadata, getCustomTypeNames, getEntitySchemas, getEnumSchemas, getExitCode, getGroups, getPropertyMetadata, getRelationshipGraph, getSchemaMetadata, getSchemaNames, getSchemasByGroup, getSchemasByKind, getTopologicalOrder, getTypeInfo, hasCircularReferences, internalError, introspectSchema, introspectSchemas, invalidAssociationTargetError, invalidConfigError, invalidPropertyTypeError, isCompoundType, jsonSyntaxError, loadSchema, loadSchemas, missingConfigFieldError, missingFieldError, notImplementedError, outputWriteError, parseJsonSchema, parseYamlSchema, pluginError, pluginNotFoundError, pluginTypeConflictError, schemaNotFoundError, schemaParseError, schemasHaveFileProperties, validateAssociations, validateDefaultValue, validateEnumSchema, validateOptions, validateProperties, validatePropertyType, validateSchema, validateSchemas, validationError, yamlSyntaxError };
+export { type AssociationMetadata, type ChangeAction, type CreateVersionOptions, type DefaultValueValidationResult, type DiffOperationResult, type ExpandedProperty, FILE_SCHEMA_NAME, type FormatOptions, type GenerateOptions, type GenerateResult, type GeneratedFile, type LoadResult, type LoadSchemaOptions, type LoadSchemasOptions, Omnify, OmnifyError, type OmnifyLogger, type OmnifyOptions, PluginManager, type PluginManagerOptions, type PluginRegistrationResult, type PluginRegistry, type PropertyMetadata, type RegisteredType, type SchemaError, type SchemaIntrospection, type SchemaMetadata, type SchemaValidationResult, type SchemaWarning, type ValidationOptions, type ValidationResult, type VersionChange, type VersionDiff, type VersionFile, type VersionIndexSnapshot, type VersionPropertySnapshot, type VersionSchemaSnapshot, VersionStore, type VersionStoreConfig, type VersionSummary, atlasError, atlasNotFoundError, circularReferenceError, configError, configNotFoundError, createFileLoadedSchema, createFileSchemaDefinition, createOmnify, createPluginManager, createVersionStore, duplicateSchemaError, ensureFileSchema, expandProperty, expandSchema, expandSchemaProperties, expandSchemas, fileNameToSchemaName, findReferencedSchemas, findReferencingSchemas, formatError, formatErrorPlain, formatErrorSummary, generateFileSchemaYaml, generationError, getAssociationMetadata, getCustomTypeNames, getEntitySchemas, getEnumSchemas, getExitCode, getGroups, getPropertyMetadata, getRelationshipGraph, getSchemaMetadata, getSchemaNames, getSchemasByGroup, getSchemasByKind, getTopologicalOrder, getTypeInfo, hasCircularReferences, internalError, introspectSchema, introspectSchemas, invalidAssociationTargetError, invalidConfigError, invalidPropertyTypeError, isCompoundType, jsonSyntaxError, loadSchema, loadSchemas, mergePartialSchemas, missingConfigFieldError, missingFieldError, notImplementedError, outputWriteError, parseJsonSchema, parseYamlSchema, pluginError, pluginNotFoundError, pluginTypeConflictError, schemaNotFoundError, schemaParseError, schemasHaveFileProperties, validateAssociations, validateDefaultValue, validateEnumSchema, validateOptions, validateProperties, validatePropertyType, validateSchema, validateSchemas, validationError, yamlSyntaxError };

package/dist/index.js

@@ -844,7 +844,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 {
@@ -879,16 +880,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"
         };
@@ -901,12 +921,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) {
@@ -2349,6 +2369,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) {
@@ -2784,6 +2807,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;
 }
@@ -4656,6 +4693,7 @@ export {
   jsonSyntaxError,
   loadSchema,
   loadSchemas,
+  mergePartialSchemas,
   missingConfigFieldError,
   missingFieldError,
   notImplementedError,