uql-orm 0.58.0 → 0.59.0

package/dist/entity/metadata/definition.js

@@ -186,17 +186,10 @@ export function defineEntity(entity, opts = {}) {
         meta.derivedName = true;
     }
     meta.schema = opts.schema ?? meta.schema;
-    let proto = Object.getPrototypeOf(entity.prototype);
-    while (proto.constructor !== Object) {
-        const parent = proto.constructor;
-        // An `abstract class BaseEntity` carrying `@Field`s but no `@Entity()` has nobody to drain its
-        // registrations, so do it here. Walking the *class* prototype chain rather than reading through the
-        // metadata object's is what makes this work on every transformer: tsc and esbuild chain metadata
-        // across `extends`, SWC does not.
-        applyMembers(parent, ownRegistrations(parent));
-        extendMeta(meta, ensureMeta(parent));
-        proto = Object.getPrototypeOf(proto);
-    }
+    // The class's real chain first: where a class both extends a base and names one, the one it extends
+    // is the nearer, and nearer wins every merge.
+    inheritFrom(meta, parentOf(entity));
+    inheritFrom(meta, opts.extends);
     // Derive soft-delete from the (inheritance-merged) fields, so own and inherited markers are handled
     // uniformly. Exactly one field may be marked; it auto-registers the built-in `softDelete` read
     // filter (a reserved name - see defineFilter - so it never clobbers a user filter).
@@ -471,6 +464,24 @@ function junctionColumn(meta, idKey) {
 function getIdKeys(meta) {
     return getKeys(meta.fields).filter((key) => meta.fields[key]?.isId);
 }
+/**
+ * Merges `ancestor` and its own ancestors into `meta`, nearest first, so a further one never overwrites
+ * a nearer. An `abstract class BaseEntity` carrying `@Field`s but no `@Entity()` has nobody to drain
+ * its registrations, so do it here. Walking the *class* prototype chain rather than the metadata
+ * object's is what makes this work on every transformer: tsc and esbuild chain metadata across
+ * `extends`, SWC does not.
+ */
+function inheritFrom(meta, ancestor) {
+    for (let parent = ancestor; parent && parent !== Object; parent = parentOf(parent)) {
+        const base = parent;
+        applyMembers(base, ownRegistrations(base));
+        extendMeta(meta, ensureMeta(base));
+    }
+}
+/** The class `entity` extends, `Object` where it extends nothing. */
+function parentOf(entity) {
+    return Object.getPrototypeOf(entity.prototype)?.constructor;
+}
 function extendMeta(target, source) {
     const sourceFields = { ...source.fields };
     // A subclass declaring its own primary key drops the parent's - every column of it, or a composite

package/dist/type/entity.d.ts

@@ -878,6 +878,13 @@ type EntityRelationOptions<E> = {
  */
 export type EntityOptions<E = unknown> = {
     readonly name?: string;
+    /**
+     * The base to inherit fields, relations, hooks and filters from, for a class that cannot extend one
+     * (minted at runtime, or its base chosen from data): the merge `class Child extends Base` does, with
+     * the class's real base nearer, so it wins. Checked against whatever properties the entity declares,
+     * which a class behind an index signature has none of. See the Inheritance guide.
+     */
+    readonly extends?: string extends keyof E ? Type<object> : Type<Partial<E>>;
     /**
      * The schema (in MySQL terms, database) this table lives in, pinning it whichever pool reads it;
      * unset follows the pool's own. Not in `name`: a dotted `name` is rejected.

package/package.json

@@ -3,7 +3,7 @@
   "homepage": "https://uql-orm.dev",
   "description": "The JSON-native TypeScript ORM for Bun, Browsers, Edge, Deno, Node, Workers. Supports PostgreSQL, PGlite, MySQL, MariaDB, SQLite, CockroachDB, SQL Server, Turso, Neon, Cloudflare D1 and MongoDB. Queries are plain JSON, typed to the leaf.",
   "license": "MIT",
-  "version": "0.58.0",
+  "version": "0.59.0",
   "type": "module",
   "engines": {
     "node": ">=24"