uql-orm 0.25.0 → 0.25.1

package/dist/migrate/codegen/entityCodeGenerator.js

@@ -10,6 +10,7 @@
  * - JSDoc comments for sync-added fields
  */
 import { canonicalToTypeScript } from '../../schema/canonicalType.js';
+import { DEFAULT_FOREIGN_KEY_ACTION, } from '../../schema/types.js';
 import { camelCase, pascalCase, singularize } from '../../util/string.util.js';
 import { buildFieldOptionsSource } from './fieldOptionsSource.js';
 /**
@@ -234,8 +235,15 @@ export class EntityCodeGenerator {
             }
             lines.push('   */');
         }
-        // Decorator
-        lines.push(`  @${decoratorName}({ entity: () => ${relatedClassName} })`);
+        // Decorator. `onDelete`/`onUpdate` only when introspection found a real referential action, so a
+        // round-trip through an unconstrained column stays as terse as before.
+        const fkActions = [];
+        if (rel.onDelete && rel.onDelete !== DEFAULT_FOREIGN_KEY_ACTION)
+            fkActions.push(`onDelete: '${rel.onDelete}'`);
+        if (rel.onUpdate && rel.onUpdate !== DEFAULT_FOREIGN_KEY_ACTION)
+            fkActions.push(`onUpdate: '${rel.onUpdate}'`);
+        const fkActionsSource = fkActions.length ? `, ${fkActions.join(', ')}` : '';
+        lines.push(`  @${decoratorName}({ entity: () => ${relatedClassName}${fkActionsSource} })`);
         // Property
         lines.push(`  ${propertyName}?: ${relatedClassName};`);
         return lines.join('\n');

package/dist/schema/schemaASTBuilder.js

@@ -181,9 +181,12 @@ export class SchemaASTBuilder {
                         type: relation.cardinality === 'm1' ? 'ManyToOne' : 'OneToOne',
                         from: { table, columns: [localColumn] },
                         to: { table: relatedTable, columns: [foreignColumn] },
-                        // The relation's own action wins over the global default, so one relation can cascade in the
-                        // database while the rest stay on `NO ACTION`.
-                        onDelete: relation.onDelete ?? options.defaultForeignKeyAction ?? this.defaultForeignKeyAction,
+                        // Falls back to the FK column's own `onDelete`, which is what makes a bare `@Field({
+                        // references, onDelete })` work with no relation declared at all.
+                        onDelete: relation.onDelete ??
+                            localField.onDelete ??
+                            options.defaultForeignKeyAction ??
+                            this.defaultForeignKeyAction,
                         onUpdate: relation.onUpdate ?? options.defaultForeignKeyAction ?? this.defaultForeignKeyAction,
                         confidence: 1.0,
                         inferredFrom: 'entity_decorator',

package/dist/type/entity.d.ts

@@ -237,6 +237,13 @@ export type FieldOptions<V = TsTypeOf<FieldType>> = {
      * Entity that this field references (for foreign keys).
      */
     readonly references?: EntityGetter;
+    /**
+     * Referential action for the generated foreign key. Delete side only: `onUpdate` below already means
+     * a value callback. Reach for `@ManyToOne({ onDelete, onUpdate })` when the update side matters too, or
+     * when this disagrees with a relation also declared on the same column (the relation wins).
+     * @example `@Field({ references: () => Company, onDelete: 'CASCADE' }) companyId?: string;`
+     */
+    readonly onDelete?: ForeignKeyAction;
     readonly virtual?: QueryRaw;
     readonly updatable?: boolean;
     readonly eager?: boolean;
@@ -363,16 +370,11 @@ export type RelationOptions<E = any> = {
     cardinality: RelationCardinality;
     readonly cascade?: boolean | CascadeType;
     /**
-     * Referential actions for the generated foreign key, letting the database do the work instead of the
-     * ORM: `onDelete: 'CASCADE'` makes deleting the parent a single statement rather than the graph walk
-     * `cascade` performs. Defaults to the migrator's `defaultForeignKeyAction`.
-     *
-     * Read only from the side that owns the key (`@ManyToOne`, or a `@OneToOne` without `mappedBy`),
-     * matching where TypeORM, Prisma and Drizzle put it. Not available on a bare `@Field({ references })`
-     * with no relation, because `FieldOptions.onUpdate` already means a value callback there.
-     *
-     * This overlaps `cascade` rather than conflicting with it: declaring both deletes the children in JS
-     * and then leaves the foreign key nothing to cascade, so pick one.
+     * Referential actions for the generated foreign key, letting the database cascade instead of the ORM's
+     * `cascade` (pick one; declaring both leaves the FK nothing to do). Read from the owning side
+     * (`@ManyToOne`, or a `@OneToOne` without `mappedBy`). `onDelete` falls back to the FK field's own
+     * `@Field({ onDelete })` when unset here; `onUpdate` has no such fallback since that key already means
+     * a value callback on `FieldOptions`.
      */
     readonly onDelete?: ForeignKeyAction;
     readonly onUpdate?: ForeignKeyAction;

package/package.json

@@ -3,7 +3,7 @@
   "homepage": "https://uql-orm.dev",
   "description": "Extremely fast, type-safe TypeScript ORM - one API for every database",
   "license": "MIT",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "type": "module",
   "engines": {
     "node": ">=24"
@@ -58,7 +58,7 @@
   ],
   "scripts": {
     "prepack": "bun run verify-dist.ts && cp ../../README.md .",
-    "postpack": "rm README.md",
+    "postpack": "rm README.md && npm pkg delete gitHead",
     "compile.browser": "bun build src/browser/index.ts --minify --sourcemap=linked --format=esm --target=browser --outdir=dist/browser --entry-naming 'uql-browser.min.[ext]'",
     "build": "bun run clean && tsc -b tsconfig.build.json && bun run compile.browser && bun run verify-dist.ts",
     "start": "tsc --watch",
@@ -197,6 +197,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "gitHead": "cfe2b005308b808d2e6e3d6e062c13791c883d13"
+  }
 }

package/LICENSE.md

@@ -1,22 +0,0 @@
-Copyright (c) 2015-present UQL Contributors
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.