@tstdl/base 0.92.75 → 0.92.77

package/orm/server/drizzle/schema-converter.js

@@ -1,5 +1,5 @@
 import { toCamelCase, toSnakeCase } from 'drizzle-orm/casing';
-import { boolean, doublePrecision, index, integer, jsonb, pgSchema, text, unique, uniqueIndex, uuid } from 'drizzle-orm/pg-core';
+import { boolean, doublePrecision, index, integer, jsonb, pgSchema, primaryKey, text, unique, uniqueIndex, uuid } from 'drizzle-orm/pg-core';
 import { MultiKeyMap } from '../../../data-structures/multi-key-map.js';
 import { tryGetEnumName } from '../../../enumeration/enumeration.js';
 import { NotSupportedError } from '../../../errors/not-supported.error.js';
@@ -54,8 +54,13 @@ export function _getDrizzleTableFromType(type, schemaName) {
         const indexFn = (data.options?.unique == true) ? uniqueIndex : index;
         return indexFn(data.name).using(data.options?.using ?? 'btree', ...columns);
     }
-    const columnEntries = columnDefinitions.map((entry) => [entry.name, entry.type]);
+    const primaryKeyColumns = columnDefinitions.filter((columnDefinition) => columnDefinition.reflectionData?.primaryKey == true);
+    const skipPrimaryKey = primaryKeyColumns.length > 1;
+    const columnEntries = columnDefinitions.map((entry) => [entry.name, entry.buildType({ skipPrimaryKey })]);
     const drizzleSchema = dbSchema.table(tableName, fromEntries(columnEntries), (table) => [
+        ...((primaryKeyColumns.length > 1)
+            ? [primaryKey({ columns: primaryKeyColumns.map((columnDefinition) => getColumn(table, columnDefinition.name)) })]
+            : []),
         ...(columnDefinitions.map((columnDefinition) => {
             const indexData = columnDefinition.reflectionData?.index;
             if (isUndefined(indexData)) {
@@ -105,21 +110,19 @@ function getPostgresColumnEntries(type, tableName, dbSchema, path = new JsonPath
             }
             : (value) => value;
         const prefixedColumnName = [prefix, columnName].join('');
-        return [
-            {
+        return [{
                 name: toCamelCase(prefixedColumnName),
                 objectPath,
-                type: getPostgresColumn(toSnakeCase(prefixedColumnName), dbSchema, schema, columnReflectionData ?? {}, { type, property }),
                 reflectionData: columnReflectionData,
+                buildType: (options) => getPostgresColumn(toSnakeCase(prefixedColumnName), dbSchema, schema, columnReflectionData ?? {}, options, { type, property }),
                 dereferenceObjectPath: compileDereferencer(objectPath, { optional: true }),
                 toDatabase,
                 fromDatabase
-            }
-        ];
+            }];
     });
     return entries;
 }
-function getPostgresColumn(columnName, dbSchema, propertySchema, reflectionData, context) {
+function getPostgresColumn(columnName, dbSchema, propertySchema, reflectionData, options, context) {
     let nullable = false;
     let array = false;
     let baseSchema = propertySchema;
@@ -146,7 +149,7 @@ function getPostgresColumn(columnName, dbSchema, propertySchema, reflectionData,
     if (isDefined(reflectionData.unique)) {
         column = column.unique(reflectionData.unique.name, isString(reflectionData.unique.options?.nulls) ? { nulls: reflectionData.unique.options.nulls } : undefined);
     }
-    if (reflectionData.primaryKey == true) {
+    if ((reflectionData.primaryKey == true) && (options.skipPrimaryKey != true)) {
         column = column.primaryKey();
     }
     if (isDefined(reflectionData.references)) {

package/orm/server/repository.d.ts

@@ -60,6 +60,12 @@ export declare class EntityRepository<T extends Entity = Entity> implements Reso
     has(id: string): Promise<boolean>;
     hasByQuery(query: Query<T>): Promise<boolean>;
     hasAll(ids: string[]): Promise<boolean>;
+    /**
+     * Tries to insert using ON CONFLICT DO NOTHING
+     * @param entity entity to insert
+     * @returns entity if inserted, undefined on conflict
+     */
+    tryInsert(entity: NewEntity<T>): Promise<T | undefined>;
     insert(entity: NewEntity<T>): Promise<T>;
     insertMany(entities: NewEntity<T>[]): Promise<T[]>;
     upsert(target: OneOrMany<Paths<UntaggedDeep<T>>>, entity: NewEntity<T>, update?: EntityUpdate<T>): Promise<T>;
@@ -78,7 +84,8 @@ export declare class EntityRepository<T extends Entity = Entity> implements Reso
     deleteManyByQuery(query: Query<T>, metadataUpdate?: EntityMetadataUpdate): Promise<T[]>;
     hardDelete(id: string): Promise<void>;
     tryHardDelete(id: string): Promise<boolean>;
-    hardDeleteByQuery(query: Query<T>): Promise<boolean>;
+    hardDeleteByQuery(query: Query<T>): Promise<void>;
+    tryHardDeleteByQuery(query: Query<T>): Promise<boolean>;
     hardDeleteMany(ids: string[]): Promise<number>;
     hardDeleteManyByQuery(query: Query<T>): Promise<number>;
     protected convertQuery(query: Query<T>): SQL;

package/orm/server/repository.js

@@ -185,6 +185,24 @@ let EntityRepository = class EntityRepository {
             .from(this.table);
         return assertDefinedPass(result[0]).contains;
     }
+    /**
+     * Tries to insert using ON CONFLICT DO NOTHING
+     * @param entity entity to insert
+     * @returns entity if inserted, undefined on conflict
+     */
+    async tryInsert(entity) {
+        const transformContext = await this.getTransformContext();
+        const columns = await this.mapToInsertColumns(entity, transformContext);
+        const [row] = await this.session
+            .insert(this.table)
+            .values(columns)
+            .onConflictDoNothing()
+            .returning();
+        if (isUndefined(row)) {
+            return undefined;
+        }
+        return this.mapToEntity(row, transformContext);
+    }
     async insert(entity) {
         const transformContext = await this.getTransformContext();
         const columns = await this.mapToInsertColumns(entity, transformContext);
@@ -359,16 +377,22 @@ let EntityRepository = class EntityRepository {
         }
     }
     async tryHardDelete(id) {
-        const result = await this.session.delete(this.table).where(eq(this.table.id, id));
-        console.log({ deleteResult: result });
+        const result = await this.session
+            .delete(this.table)
+            .where(eq(this.table.id, id));
         return isNotNull(result.rowCount) && (result.rowCount > 0);
     }
     async hardDeleteByQuery(query) {
+        const result = await this.tryHardDeleteByQuery(query);
+        if (!result) {
+            throw new NotFoundError(`${this.type.entityName} not found.`);
+        }
+    }
+    async tryHardDeleteByQuery(query) {
         const idQuery = this.getIdLimitQuery(query);
         const result = await this.session
             .delete(this.table)
             .where(inArray(this.table.id, idQuery));
-        console.log({ deleteResult: result });
         return isNotNull(result.rowCount) && (result.rowCount > 0);
     }
     async hardDeleteMany(ids) {
@@ -376,8 +400,9 @@ let EntityRepository = class EntityRepository {
     }
     async hardDeleteManyByQuery(query) {
         const sqlQuery = this.convertQuery(query);
-        const result = await this.session.delete(this.table).where(sqlQuery);
-        console.log({ deleteResult: result });
+        const result = await this.session
+            .delete(this.table)
+            .where(sqlQuery);
         return assertNotNullPass(result.rowCount);
     }
     convertQuery(query) {

package/orm/server/types.d.ts

@@ -8,11 +8,14 @@ import type { Tagged } from '../../types/index.js';
 import type { OrmColumnReflectionData } from '../decorators.js';
 import type { EntityType } from '../entity.js';
 import type { ColumnBuilder, EmbeddedConfigTag } from '../types.js';
+export type BuildTypeOptions = {
+    skipPrimaryKey?: boolean;
+};
 export type ColumnDefinition = {
     name: string;
     objectPath: JsonPath;
-    type: PgColumnBuilder<any, any, any, any>;
     reflectionData: OrmColumnReflectionData | undefined;
+    buildType: (options: BuildTypeOptions) => PgColumnBuilder<any, any, any, any>;
     dereferenceObjectPath: (obj: Record) => any;
     toDatabase: (value: unknown, context: TransformContext) => any;
     fromDatabase: (value: unknown, context: TransformContext) => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.92.75",
+  "version": "0.92.77",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -148,14 +148,14 @@
     "@typescript-eslint/eslint-plugin": "8.24",
     "concurrently": "9.1",
     "drizzle-kit": "0.30",
-    "eslint": "9.20",
+    "eslint": "9.21",
     "globals": "16.0",
     "tsc-alias": "1.8",
     "typescript": "5.7"
   },
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.17",
-    "@google/generative-ai": "^0.21",
+    "@google/generative-ai": "^0.22",
     "@tstdl/angular": "^0.92",
     "@zxcvbn-ts/core": "^3.0",
     "@zxcvbn-ts/language-common": "^3.0",