sqlmorpheus 0.1.0 → 0.1.2

package/dist/index.d.mts

@@ -98,13 +98,13 @@ 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 async function prepareMigration(db: DatabaseAccess, dbInstructions: DatabaseInstructions, overwriteExisting?: boolean): Promise<void>;
-declare async function runPreparedMigrations(db: DatabaseAccess, dbInstructions: DatabaseInstructions);
-declare async function prepareAndRunMigration(db: DatabaseAccess, dbInstructions: DatabaseInstructions, overwriteExisting?: boolean): Promise<void>;
-declare async function rollback(db: DatabaseAccess, dbInstructions: DatabaseInstructions, toVersion: number);
+declare function prepareMigration(db: DatabaseAccess, instructions: DatabaseInstructions, overwriteExisting?: boolean): Promise<void>;
+declare function runPreparedMigrations(db: DatabaseAccess, instructions: DatabaseInstructions): Promise<void>;
+declare function prepareAndRunMigration(db: DatabaseAccess, instructions: DatabaseInstructions, overwriteExisting?: boolean): Promise<void>;
+declare function rollback(db: DatabaseAccess, instructions: DatabaseInstructions, toVersion: number): Promise<void>;
 
 export { DbTable, ForeignKey, prepareAndRunMigration, prepareMigration, rollback, runPreparedMigrations };

package/dist/index.d.ts

@@ -1,6 +1,9 @@
 import { DatabaseAccess } from "./lib/typings/DatabaseAccess";
 import DatabaseInstructions from "./lib/typings/DatabaseInstructions";
+import DbTable from "./lib/tableInfo/decorators/DbTable";
+import ForeignKey from "./lib/tableInfo/decorators/ForeignKey";
 export declare function prepareMigration(db: DatabaseAccess, instructions: DatabaseInstructions, overwriteExisting?: boolean): Promise<void>;
 export declare function runPreparedMigrations(db: DatabaseAccess, instructions: DatabaseInstructions): Promise<void>;
 export declare function prepareAndRunMigration(db: DatabaseAccess, instructions: DatabaseInstructions, overwriteExisting?: boolean): Promise<void>;
 export declare function rollback(db: DatabaseAccess, instructions: DatabaseInstructions, toVersion: number): Promise<void>;
+export { DbTable, ForeignKey };

package/dist/index.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ForeignKey = exports.DbTable = void 0;
 exports.prepareMigration = prepareMigration;
 exports.runPreparedMigrations = runPreparedMigrations;
 exports.prepareAndRunMigration = prepareAndRunMigration;
@@ -10,6 +11,10 @@ exports.rollback = rollback;
 const MigrationManager_1 = require("./lib/MigrationManager");
 const MigrationHistoryManager_1 = __importDefault(require("./lib/MigrationHistoryManager"));
 const Logger_1 = require("./lib/Logger");
+const DbTable_1 = __importDefault(require("./lib/tableInfo/decorators/DbTable"));
+exports.DbTable = DbTable_1.default;
+const ForeignKey_1 = __importDefault(require("./lib/tableInfo/decorators/ForeignKey"));
+exports.ForeignKey = ForeignKey_1.default;
 async function prepareMigration(db, instructions, overwriteExisting) {
     Logger_1.Logger.setMode(instructions.loggerMode);
     const mm = new MigrationManager_1.MigrationManager(db, instructions);

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])
@@ -836,6 +839,39 @@ ${foreignKeyOnQuery}`;
   }
 };
 
+// src/lib/tableInfo/decorators/DbTable.ts
+function DbTable(tableName, primaryKey) {
+  return (table, context) => {
+    Object.defineProperty(table, "name", { value: tableName, writable: false });
+    const tableInfo = context?.metadata ? getTableInfoFromMetadata(context.metadata) : getTableInfo(table);
+    tableInfo.primaryKey = primaryKey?.toString();
+    if (tableInfo.foreignKeys) {
+      for (const foreignKey of tableInfo.foreignKeys) {
+        foreignKey.fromTable = tableName;
+      }
+    }
+  };
+}
+
+// src/lib/tableInfo/decorators/ForeignKey.ts
+import "polyfill-symbol-metadata";
+function ForeignKey(toTable, toColumn, onDelete, onUpdate) {
+  return (table, context) => {
+    const metadata = context?.metadata ? getTableInfoFromMetadata(context.metadata) : getTableInfo(table);
+    if (!metadata.foreignKeys)
+      metadata.foreignKeys = [];
+    metadata.foreignKeys.push({
+      fromTable: "",
+      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,
+      onUpdate
+    });
+  };
+}
+
 // src/index.ts
 async function prepareMigration(db, instructions, overwriteExisting) {
   Logger.setMode(instructions.loggerMode);
@@ -877,6 +913,8 @@ async function rollback(db, instructions, toVersion) {
   migrationHistoryManager.setLastHistoryVersion(toVersion);
 }
 export {
+  DbTable,
+  ForeignKey,
   prepareAndRunMigration,
   prepareMigration,
   rollback,

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.0",
+  "version": "0.1.2",
   "author": "JodliDev",
   "keywords": [],
   "license": "MIT",