metal-orm 1.0.75 → 1.0.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metal-orm",
-  "version": "1.0.75",
+  "version": "1.0.77",
   "type": "module",
   "types": "./dist/index.d.ts",
   "engines": {

package/scripts/generate-entities/render.mjs

@@ -218,6 +218,7 @@ const METAL_ORM_IMPORT_ORDER = [
   'BelongsToMany',
   'HasManyCollection',
   'HasOneReference',
+  'BelongsToReference',
   'ManyToManyCollection',
   'bootstrapEntities',
   'getTableDefFromEntity'
@@ -250,7 +251,7 @@ const renderEntityClassLines = ({ table, className, naming, relations, resolveCl
         lines.push(
           `  @BelongsTo({ target: () => ${targetClass}, foreignKey: '${escapeJsString(rel.foreignKey)}' })`
         );
-        lines.push(`  ${rel.property}?: ${targetClass};`);
+        lines.push(`  ${rel.property}!: BelongsToReference<${targetClass}>;`);
         lines.push('');
         break;
       case 'hasMany':
@@ -301,6 +302,7 @@ const computeTableUsage = (table, relations, defaultSchema) => {
     needsBelongsToManyDecorator: false,
     needsHasManyCollection: false,
     needsHasOneReference: false,
+    needsBelongsToReference: false,
     needsManyToManyCollection: false
   };
 
@@ -325,6 +327,7 @@ const computeTableUsage = (table, relations, defaultSchema) => {
     }
     if (rel.kind === 'belongsTo') {
       usage.needsBelongsToDecorator = true;
+      usage.needsBelongsToReference = true;
     }
     if (rel.kind === 'belongsToMany') {
       usage.needsBelongsToManyDecorator = true;
@@ -347,6 +350,7 @@ const getMetalOrmImportNamesFromUsage = usage => {
   if (usage.needsBelongsToManyDecorator) names.add('BelongsToMany');
   if (usage.needsHasManyCollection) names.add('HasManyCollection');
   if (usage.needsHasOneReference) names.add('HasOneReference');
+  if (usage.needsBelongsToReference) names.add('BelongsToReference');
   if (usage.needsManyToManyCollection) names.add('ManyToManyCollection');
   return names;
 };
@@ -386,6 +390,7 @@ export const renderEntityFile = (schema, options) => {
     needsBelongsToManyDecorator: false,
     needsHasManyCollection: false,
     needsHasOneReference: false,
+    needsBelongsToReference: false,
     needsManyToManyCollection: false
   };
 
@@ -401,6 +406,7 @@ export const renderEntityFile = (schema, options) => {
     aggregateUsage.needsBelongsToManyDecorator ||= tableUsage.needsBelongsToManyDecorator;
     aggregateUsage.needsHasManyCollection ||= tableUsage.needsHasManyCollection;
     aggregateUsage.needsHasOneReference ||= tableUsage.needsHasOneReference;
+    aggregateUsage.needsBelongsToReference ||= tableUsage.needsBelongsToReference;
     aggregateUsage.needsManyToManyCollection ||= tableUsage.needsManyToManyCollection;
   }
 

package/scripts/inflection/compound.mjs

@@ -70,3 +70,17 @@ export const applyToCompoundHead = (term, { connectors, transformWord } = {}) =>
   return rebuildFromWords(out, format, original);
 };
 
+export const applyToCompoundWords = (term, { connectors, transformWord } = {}) => {
+  if (!term || !String(term).trim()) return '';
+  const original = String(term).trim();
+  const format = detectTextFormat(original);
+  const words = splitIntoWords(original, format);
+
+  const out = words.map(word => {
+    const normalized = normalizeLookup(word);
+    if (connectors?.has?.(normalized)) return word;
+    return transformWord ? transformWord(word) : word;
+  });
+
+  return rebuildFromWords(out, format, original);
+};

package/scripts/inflection/pt-br.mjs

@@ -1,6 +1,9 @@
 import {
   applyToCompoundHead,
+  applyToCompoundWords,
+  detectTextFormat,
   normalizeLookup,
+  splitIntoWords,
   stripDiacritics
 } from './compound.mjs';
 
@@ -172,6 +175,14 @@ export const PT_BR_CONNECTORS = Object.freeze(new Set(
   ].map(normalizeLookup)
 ));
 
+const hasConnectorWord = (term, connectors) => {
+  if (!term || !String(term).trim()) return false;
+  const original = String(term).trim();
+  const format = detectTextFormat(original);
+  const words = splitIntoWords(original, format);
+  return words.some(word => connectors?.has?.(normalizeLookup(word)));
+};
+
 // ═══════════════════════════════════════════════════════════════════════════
 // INFLECTION RULES
 // ═══════════════════════════════════════════════════════════════════════════
@@ -348,7 +359,10 @@ export const singularizeWordPtBr = (
 export const pluralizeRelationPropertyPtBr = (
   term,
   { pluralizeWord = pluralizeWordPtBr, connectors = PT_BR_CONNECTORS } = {}
-) => applyToCompoundHead(term, { connectors, transformWord: pluralizeWord });
+) =>
+  hasConnectorWord(term, connectors)
+    ? applyToCompoundHead(term, { connectors, transformWord: pluralizeWord })
+    : applyToCompoundWords(term, { connectors, transformWord: pluralizeWord });
 
 /**
  * Singularizes a compound property/relation name in Portuguese.
@@ -356,7 +370,10 @@ export const pluralizeRelationPropertyPtBr = (
 export const singularizeRelationPropertyPtBr = (
   term,
   { singularizeWord = singularizeWordPtBr, connectors = PT_BR_CONNECTORS } = {}
-) => applyToCompoundHead(term, { connectors, transformWord: singularizeWord });
+) =>
+  hasConnectorWord(term, connectors)
+    ? applyToCompoundHead(term, { connectors, transformWord: singularizeWord })
+    : applyToCompoundWords(term, { connectors, transformWord: singularizeWord });
 
 // ═══════════════════════════════════════════════════════════════════════════
 // INFLECTOR FACTORY
@@ -388,4 +405,4 @@ export const createPtBrInflector = ({ customIrregulars = {} } = {}) => {
   });
 };
 
-export default createPtBrInflector;
+export default createPtBrInflector;