sqlmorpheus 0.1.1 → 0.1.2

package/dist/index.d.mts

@@ -98,9 +98,9 @@ interface DatabaseInstructions {
     postMigration?(fromVersion: number, toVersion: number): SqlChanges;
 }
 
-declare function DbTable<T extends BackendTable>(tableName: string, primaryKey?: keyof T): (table: Class<T>, context: any) => void;
+declare function DbTable<T extends BackendTable>(tableName: string, primaryKey?: keyof T): (table: Class<T>, context?: any) => void;
 
-declare function ForeignKey<TOther extends BackendTable>(toTable: Class<TOther>, toColumn: keyof TOther, onDelete?: ForeignKeyActions, onUpdate?: ForeignKeyActions): (_: undefined, context: any) => void;
+declare function ForeignKey<TOther extends BackendTable>(toTable: Class<TOther>, toColumn: keyof TOther, onDelete?: ForeignKeyActions, onUpdate?: ForeignKeyActions): (table: any, context: any) => void;
 
 declare function prepareMigration(db: DatabaseAccess, instructions: DatabaseInstructions, overwriteExisting?: boolean): Promise<void>;
 declare function runPreparedMigrations(db: DatabaseAccess, instructions: DatabaseInstructions): Promise<void>;

package/dist/index.mjs

@@ -24,9 +24,12 @@ var Logger = new LoggerClass();
 // src/lib/tableInfo/TableInfo.ts
 var TABLE_INFO_PROPERTY_NAME = Symbol("tableInfo");
 function getTableInfo(table) {
-  if (!table.hasOwnProperty(Symbol.metadata))
-    table[Symbol.metadata] = {};
-  return getTableInfoFromMetadata(table[Symbol.metadata]);
+  let metadata = table[Symbol.metadata] ?? table.prototype?.[Symbol.metadata];
+  if (!metadata) {
+    metadata = {};
+    table[Symbol.metadata] = metadata;
+  }
+  return getTableInfoFromMetadata(metadata);
 }
 function getTableInfoFromMetadata(metadata) {
   if (!metadata[TABLE_INFO_PROPERTY_NAME])
@@ -840,7 +843,7 @@ ${foreignKeyOnQuery}`;
 function DbTable(tableName, primaryKey) {
   return (table, context) => {
     Object.defineProperty(table, "name", { value: tableName, writable: false });
-    const tableInfo = getTableInfoFromMetadata(context.metadata);
+    const tableInfo = context?.metadata ? getTableInfoFromMetadata(context.metadata) : getTableInfo(table);
     tableInfo.primaryKey = primaryKey?.toString();
     if (tableInfo.foreignKeys) {
       for (const foreignKey of tableInfo.foreignKeys) {
@@ -853,13 +856,14 @@ function DbTable(tableName, primaryKey) {
 // src/lib/tableInfo/decorators/ForeignKey.ts
 import "polyfill-symbol-metadata";
 function ForeignKey(toTable, toColumn, onDelete, onUpdate) {
-  return (_, context) => {
-    const metadata = getTableInfoFromMetadata(context.metadata);
+  return (table, context) => {
+    const metadata = context?.metadata ? getTableInfoFromMetadata(context.metadata) : getTableInfo(table);
     if (!metadata.foreignKeys)
       metadata.foreignKeys = [];
     metadata.foreignKeys.push({
       fromTable: "",
-      fromColumn: context.name,
+      fromColumn: context.name ?? context,
+      //to stay compatible with old decorator structure (see https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html#decorator-metadata)
       toTable: toTable.name,
       toColumn: toColumn.toString(),
       onDelete,

package/dist/lib/tableInfo/TableInfo.js

@@ -5,9 +5,13 @@ exports.getTableInfo = getTableInfo;
 exports.getTableInfoFromMetadata = getTableInfoFromMetadata;
 exports.TABLE_INFO_PROPERTY_NAME = Symbol("tableInfo");
 function getTableInfo(table) {
-    if (!table.hasOwnProperty(Symbol.metadata))
-        table[Symbol.metadata] = {};
-    return getTableInfoFromMetadata(table[Symbol.metadata]);
+    //to stay compatible with old decorator structure (see https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html#decorator-metadata):
+    let metadata = table[Symbol.metadata] ?? table.prototype?.[Symbol.metadata];
+    if (!metadata) {
+        metadata = {};
+        table[Symbol.metadata] = metadata;
+    }
+    return getTableInfoFromMetadata(metadata);
 }
 function getTableInfoFromMetadata(metadata) {
     if (!metadata[exports.TABLE_INFO_PROPERTY_NAME])

package/dist/lib/tableInfo/decorators/DbTable.d.ts

@@ -1,2 +1,2 @@
 import { BackendTable, Class } from "../../typings/BackendTable";
-export default function DbTable<T extends BackendTable>(tableName: string, primaryKey?: keyof T): (table: Class<T>, context: any) => void;
+export default function DbTable<T extends BackendTable>(tableName: string, primaryKey?: keyof T): (table: Class<T>, context?: any) => void;

package/dist/lib/tableInfo/decorators/DbTable.js

@@ -5,7 +5,7 @@ const TableInfo_1 = require("../TableInfo");
 function DbTable(tableName, primaryKey) {
     return (table, context) => {
         Object.defineProperty(table, "name", { value: tableName, writable: false });
-        const tableInfo = (0, TableInfo_1.getTableInfoFromMetadata)(context.metadata);
+        const tableInfo = context?.metadata ? (0, TableInfo_1.getTableInfoFromMetadata)(context.metadata) : (0, TableInfo_1.getTableInfo)(table);
         tableInfo.primaryKey = primaryKey?.toString();
         if (tableInfo.foreignKeys) {
             for (const foreignKey of tableInfo.foreignKeys) {

package/dist/lib/tableInfo/decorators/ForeignKey.d.ts

@@ -1,4 +1,4 @@
 import { BackendTable, Class } from "../../typings/BackendTable";
 import "polyfill-symbol-metadata";
 import { ForeignKeyActions } from "../../typings/ForeignKeyInfo";
-export default function ForeignKey<TOther extends BackendTable>(toTable: Class<TOther>, toColumn: keyof TOther, onDelete?: ForeignKeyActions, onUpdate?: ForeignKeyActions): (_: undefined, context: any) => void;
+export default function ForeignKey<TOther extends BackendTable>(toTable: Class<TOther>, toColumn: keyof TOther, onDelete?: ForeignKeyActions, onUpdate?: ForeignKeyActions): (table: any, context: any) => void;

package/dist/lib/tableInfo/decorators/ForeignKey.js

@@ -4,13 +4,13 @@ exports.default = ForeignKey;
 const TableInfo_1 = require("../TableInfo");
 require("polyfill-symbol-metadata");
 function ForeignKey(toTable, toColumn, onDelete, onUpdate) {
-    return (_, context) => {
-        const metadata = (0, TableInfo_1.getTableInfoFromMetadata)(context.metadata);
+    return (table, context) => {
+        const metadata = context?.metadata ? (0, TableInfo_1.getTableInfoFromMetadata)(context.metadata) : (0, TableInfo_1.getTableInfo)(table);
         if (!metadata.foreignKeys)
             metadata.foreignKeys = [];
         metadata.foreignKeys.push({
             fromTable: "",
-            fromColumn: context.name,
+            fromColumn: context.name ?? context, //to stay compatible with old decorator structure (see https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html#decorator-metadata)
             toTable: toTable.name,
             toColumn: toColumn.toString(),
             onDelete: onDelete,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlmorpheus",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "author": "JodliDev",
   "keywords": [],
   "license": "MIT",