metal-orm 1.1.10 → 1.1.16

package/package.json

@@ -1,96 +1,100 @@
-{
-  "name": "metal-orm",
-  "version": "1.1.10",
-  "type": "module",
-  "types": "./dist/index.d.ts",
-  "engines": {
-    "node": ">=20.0.0"
-  },
-  "bin": {
-    "metal-orm-gen": "./scripts/generate-entities.mjs"
-  },
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
-    }
-  },
-  "files": [
-    "dist",
-    "src",
-    "global.d.ts",
-    "scripts"
-  ],
-  "scripts": {
-    "prepublishOnly": "npm run build",
-    "build": "tsup",
-    "check": "tsc --noEmit",
-    "gen:entities": "node scripts/generate-entities.mjs",
-    "test": "vitest --run",
-    "test:watch": "vitest",
-    "test:ui": "vitest --ui",
-    "test:mysql": "vitest --run tests/e2e/mysql-memory.test.ts tests/e2e/decorators-mysql-memory.test.ts tests/e2e/save-graph-mysql-memory.test.ts",
-    "test:mysql:optimized": "vitest --run --config tests/e2e/mysql/vitest.config.ts",
-    "test:sqlite": "vitest --run tests/e2e/sqlite-memory.test.ts tests/e2e/decorators-sqlite-memory.test.ts tests/e2e/save-graph-sqlite-memory.test.ts",
-    "test:pglite": "vitest --run tests/e2e/pglite-memory.test.ts",
-    "test:e2e": "vitest --run tests/e2e",
-    "show-sql": "node scripts/show-sql.mjs",
-    "lint": "node scripts/run-eslint.mjs",
-    "lint:fix": "node scripts/run-eslint.mjs --fix"
-  },
-  "peerDependencies": {
-    "better-sqlite3": "^11.0.0",
-    "ioredis": "^5.0.0",
-    "keyv": "^5.6.0",
-    "mysql2": "^3.9.0",
-    "pg": "^8.0.0",
-    "sqlite3": "^5.1.6",
-    "tedious": "^19.0.0"
-  },
-  "peerDependenciesMeta": {
-    "better-sqlite3": {
-      "optional": true
-    },
-    "mysql2": {
-      "optional": true
-    },
-    "pg": {
-      "optional": true
-    },
-    "sqlite3": {
-      "optional": true
-    },
-    "tedious": {
-      "optional": true
-    },
-    "keyv": {
-      "optional": true
-    },
-    "ioredis": {
-      "optional": true
-    }
-  },
-  "devDependencies": {
-    "@electric-sql/pglite": "^0.4.2",
-    "@typescript-eslint/eslint-plugin": "^8.58.0",
-    "@typescript-eslint/parser": "^8.58.0",
-    "@vitest/ui": "^4.1.2",
-    "better-sqlite3": "^12.8.0",
-    "eslint": "^10.1.0",
-    "express": "^5.2.1",
-    "ioredis": "^5.10.1",
-    "ioredis-mock": "^8.13.1",
-    "keyv": "^5.6.0",
-    "mysql-memory-server": "^1.14.1",
-    "mysql2": "^3.20.0",
-    "pg": "^8.20.0",
-    "sqlite3": "^6.0.1",
-    "supertest": "^7.2.2",
-    "tedious": "^19.2.1",
-    "tsup": "^8.5.1",
-    "tsx": "^4.21.0",
-    "typescript": "^5.9.3",
-    "vitest": "^4.1.2"
-  }
-}
+{
+  "name": "metal-orm",
+  "version": "1.1.16",
+  "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/celsowm/metal-orm"
+  },
+  "types": "./dist/index.d.ts",
+  "engines": {
+    "node": ">=20.0.0"
+  },
+  "bin": {
+    "metal-orm-gen": "./scripts/generate-entities.mjs"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
+  "files": [
+    "dist",
+    "src",
+    "global.d.ts",
+    "scripts"
+  ],
+  "scripts": {
+    "prepublishOnly": "npm run build",
+    "build": "tsup",
+    "check": "tsc --noEmit -p tsconfig.check.json",
+    "gen:entities": "node scripts/generate-entities.mjs",
+    "test": "vitest --run",
+    "test:watch": "vitest",
+    "test:ui": "vitest --ui",
+    "test:mysql": "vitest --run tests/e2e/mysql-memory.test.ts tests/e2e/decorators-mysql-memory.test.ts tests/e2e/save-graph-mysql-memory.test.ts",
+    "test:mysql:optimized": "vitest --run --config tests/e2e/mysql/vitest.config.ts",
+    "test:sqlite": "vitest --run tests/e2e/sqlite-memory.test.ts tests/e2e/decorators-sqlite-memory.test.ts tests/e2e/save-graph-sqlite-memory.test.ts",
+    "test:pglite": "vitest --run tests/e2e/pglite-memory.test.ts",
+    "test:e2e": "vitest --run tests/e2e",
+    "show-sql": "node scripts/show-sql.mjs",
+    "lint": "node scripts/run-eslint.mjs",
+    "lint:fix": "node scripts/run-eslint.mjs --fix"
+  },
+  "peerDependencies": {
+    "better-sqlite3": "^12.11.1",
+    "ioredis": "^5.11.1",
+    "keyv": "^5.6.0",
+    "mysql2": "^3.22.5",
+    "pg": "^8.22.0",
+    "sqlite3": "^6.0.1",
+    "tedious": "^19.2.1"
+  },
+  "peerDependenciesMeta": {
+    "better-sqlite3": {
+      "optional": true
+    },
+    "mysql2": {
+      "optional": true
+    },
+    "pg": {
+      "optional": true
+    },
+    "sqlite3": {
+      "optional": true
+    },
+    "tedious": {
+      "optional": true
+    },
+    "keyv": {
+      "optional": true
+    },
+    "ioredis": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "@electric-sql/pglite": "^0.5.3",
+    "@typescript-eslint/eslint-plugin": "^8.62.0",
+    "@typescript-eslint/parser": "^8.62.0",
+    "@vitest/ui": "^4.1.9",
+    "better-sqlite3": "^12.11.1",
+    "eslint": "^10.6.0",
+    "express": "^5.2.1",
+    "ioredis": "^5.11.1",
+    "ioredis-mock": "^8.13.1",
+    "keyv": "^5.6.0",
+    "mysql-memory-server": "^1.14.1",
+    "mysql2": "^3.22.5",
+    "pg": "^8.22.0",
+    "sqlite3": "^6.0.1",
+    "supertest": "^7.2.2",
+    "tedious": "^19.2.1",
+    "tsup": "^8.5.1",
+    "tsx": "^4.22.4",
+    "typescript": "^5.9.3",
+    "vitest": "^4.1.9"
+  }
+}

package/scripts/generate-entities/render.mjs

@@ -5,15 +5,20 @@ import { buildSchemaMetadata } from './schema.mjs';
 const escapeJsString = value => value.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
 
 const sanitizePropertyName = columnName => {
-  if (!columnName) return '';
+  if (typeof columnName !== 'string' || !columnName) return '';
   return columnName
     .replace(/\s+/g, '_')
     .replace(/[^a-zA-Z0-9_$]/g, '_')
     .replace(/^[0-9]/, '_$&');
 };
 
+const normalizeColumns = columns =>
+  (Array.isArray(columns) ? columns : []).filter(
+    column => column && typeof column.name === 'string' && column.name.trim().length > 0
+  );
+
 const formatJsDoc = comment => {
-  if (!comment) return null;
+  if (typeof comment !== 'string') return null;
   const normalized = comment.replace(/\r\n?/g, '\n').trim();
   if (!normalized) return null;
   const lines = normalized.split('\n').map(line => line.replace(/\*\//g, '*\\/'));
@@ -152,7 +157,7 @@ const buildColumnRemarks = column => {
 
 const buildColumnDoc = column => {
   const entries = [];
-  if (column.comment) {
+  if (typeof column.comment === 'string' && column.comment) {
     entries.push(column.comment);
   }
   const defaultValue = formatDefaultValueForDoc(column.default);
@@ -190,12 +195,13 @@ const renderColumnExpression = (column, tablePk, tableSchema, defaultSchema, pro
           : `col.default(${expr}, ${def.code})`;
     }
   }
-  if (column.references) {
+  if (
+    column.references &&
+    typeof column.references.table === 'string' &&
+    typeof column.references.column === 'string'
+  ) {
     const refTable = normalizeReferenceTable(column.references.table, tableSchema, defaultSchema);
-    const refParts = [
-      `table: '${escapeJsString(refTable)}'`,
-      `column: '${escapeJsString(column.references.column)}'`
-    ];
+    const refParts = [`table: '${escapeJsString(refTable)}'`, `column: '${escapeJsString(column.references.column)}'`];
     if (column.references.onDelete) refParts.push(`onDelete: '${escapeJsString(column.references.onDelete)}'`);
     if (column.references.onUpdate) refParts.push(`onUpdate: '${escapeJsString(column.references.onUpdate)}'`);
     expr = `col.references(${expr}, { ${refParts.join(', ')} })`;
@@ -277,9 +283,10 @@ const renderEntityClassLines = ({ table, className, naming, relations, resolveCl
   lines.push(`@Entity(${entityOpts})`);
   lines.push(`export class ${className} {`);
 
-  const columnPropertyNames = new Set(table.columns.map(col => sanitizePropertyName(col.name)));
+  const tableColumns = normalizeColumns(table.columns);
+  const columnPropertyNames = new Set(tableColumns.map(col => sanitizePropertyName(col.name)));
 
-  for (const col of table.columns) {
+  for (const col of tableColumns) {
     const propertyName = sanitizePropertyName(col.name);
     const rendered = renderColumnExpression(col, table.primaryKey, table.schema, defaultSchema, propertyName);
     appendJsDoc(lines, rendered.comment, '  ');
@@ -414,7 +421,9 @@ const computeTableUsage = (table, relations, defaultSchema, treeConfig) => {
     needsTreeChildrenDecorator: false
   };
 
-  for (const col of table.columns) {
+  const tableColumns = normalizeColumns(table.columns);
+
+  for (const col of tableColumns) {
     usage.needsCol = true;
     const rendered = renderColumnExpression(col, table.primaryKey, table.schema, defaultSchema);
     if (rendered.decorator === 'PrimaryKey') {
@@ -552,7 +561,7 @@ export const renderEntityFile = (schema, options) => {
 
   // Views only need col and Column decorator
   for (const view of views) {
-    if (view.columns.length > 0) {
+    if (normalizeColumns(view.columns).length > 0) {
       aggregateUsage.needsCol = true;
       aggregateUsage.needsColumnDecorator = true;
     }