@tstdl/base 0.93.41 → 0.93.42

package/orm/sqls.d.ts

@@ -60,7 +60,7 @@ export type TsHeadlineOptions = {
     fragmentDelimiter?: string;
 };
 export declare function enumValue<T extends EnumerationObject>(enumeration: T, value: EnumerationValue<T>): SQL<string>;
-export declare function singleReferenceCheck<E extends EnumerationObject>(enumeration: E, discriminator: Column, columns: Column[], columnMapping: Record<EnumerationValue<E>, Column>): SQL;
+export declare function singleReferenceCheck<E extends EnumerationObject>(enumeration: E, discriminator: Column, columns: Column[], columnMapping: Record<EnumerationValue<E>, Column | null>): SQL;
 export declare function array<T>(values: SQL<T>[]): SQL<T[]>;
 export declare function array<T = unknown>(values: SQLChunk[]): SQL<T[]>;
 export declare function autoAlias<T>(column: AnyColumn<{

package/orm/sqls.js

@@ -1,4 +1,5 @@
-import { assertDefined, isDefined, isNumber, isString } from '../utils/type-guards.js';
+import { objectEntries } from '../utils/object/object.js';
+import { assertDefined, isDefined, isNotNull, isNumber, isString } from '../utils/type-guards.js';
 import { and, eq, sql, Table } from 'drizzle-orm';
 import { getEnumName } from './enums.js';
 /** Drizzle SQL helper for getting the current transaction's timestamp. Returns a Date object. */
@@ -14,15 +15,15 @@ export function enumValue(enumeration, value) {
 }
 export function singleReferenceCheck(enumeration, discriminator, columns, columnMapping) {
     const whens = [];
-    for (const [value, column] of Object.entries(columnMapping)) {
-        whens.push(sql `  WHEN ${enumValue(enumeration, value)} THEN ${column} IS NOT NULL`);
+    for (const [value, column] of objectEntries(columnMapping)) {
+        if (isNotNull(column)) {
+            whens.push(sql `  WHEN ${enumValue(enumeration, value)} THEN ${column} IS NOT NULL`);
+        }
     }
-    return and(sql `
-CASE ${discriminator}
+    return and(sql `CASE ${discriminator}
 ${sql.join(whens, sql `\n`)}
   ELSE FALSE
-END
-`, eq(numNonNulls(...columns), sql.raw('1')));
+END`, eq(numNonNulls(...columns), sql.raw('1')));
 }
 export function array(values) {
     const valueString = sql.join(values, sql.raw(', '));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.41",
+  "version": "0.93.42",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"