@nestjs-dash/typeorm 0.0.1 → 0.1.1

package/dist/entity-decorators.d.ts

@@ -0,0 +1,3 @@
+export { Filterable, getEntityColumnMeta, getSoftDeleteField, normalizeSortDirection, Searchable, SoftDeletable, Sortable, type EntityColumnMeta, type EntityConstructor, type SortDirectionInput } from '@nestjs-dash/adapter';
+export { listQueryConfigFromEntity } from '@nestjs-dash/core';
+//# sourceMappingURL=entity-decorators.d.ts.map

package/dist/entity-decorators.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity-decorators.d.ts","sourceRoot":"","sources":["../src/entity-decorators.ts"],"names":[],"mappings":"AASA,OAAO,EACH,UAAU,EACV,mBAAmB,EACnB,kBAAkB,EAClB,sBAAsB,EACtB,UAAU,EACV,aAAa,EACb,QAAQ,EACR,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/entity-decorators.js

@@ -0,0 +1,3 @@
+export { Filterable, getEntityColumnMeta, getSoftDeleteField, normalizeSortDirection, Searchable, SoftDeletable, Sortable } from '@nestjs-dash/adapter';
+export { listQueryConfigFromEntity } from '@nestjs-dash/core';
+//# sourceMappingURL=entity-decorators.js.map

package/dist/entity-decorators.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity-decorators.js","sourceRoot":"","sources":["../src/entity-decorators.ts"],"names":[],"mappings":"AASA,OAAO,EACH,UAAU,EACV,mBAAmB,EACnB,kBAAkB,EAClB,sBAAsB,EACtB,UAAU,EACV,aAAa,EACb,QAAQ,EAIX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/index.d.ts

@@ -1,2 +1,89 @@
-export {};
+import type { BelongsToMeta, FilterOperator, FindOneOptions, ListQuery, ListQueryConfig, Paginated, PropertyAdapter, PropertyType, RecordData, RelationCapableAdapter, RelationDefinition, RelationOption, ResourceAdapter } from '@nestjs-dash/adapter';
+import { type ResourceClass } from '@nestjs-dash/core';
+import { Between, Equal, ILike, In, IsNull, LessThan, LessThanOrEqual, Like, MoreThan, MoreThanOrEqual, Not, type EntityTarget, type ObjectLiteral, type Repository, type SelectQueryBuilder } from 'typeorm';
+export type TypeOrmConnectionLike = {
+    getRepository<Entity extends ObjectLiteral>(target: EntityTarget<Entity>): Repository<Entity>;
+};
+export declare class TypeOrmProperty implements PropertyAdapter {
+    private readonly propertyName;
+    private readonly propertyType;
+    private readonly flags;
+    constructor(propertyName: string, propertyType: PropertyType, flags?: {
+        id?: boolean;
+        editable?: boolean;
+        sortable?: boolean;
+    });
+    name(): string;
+    type(): PropertyType;
+    isId(): boolean;
+    isEditable(): boolean;
+    isSortable(): boolean;
+}
+export declare class TypeOrmResource<T extends ObjectLiteral> implements ResourceAdapter, RelationCapableAdapter {
+    private readonly resourceId;
+    private readonly repository;
+    private readonly props;
+    private readonly defaultConfig;
+    private readonly options;
+    constructor(resourceId: string, repository: Repository<T>, props: PropertyAdapter[], defaultConfig: ListQueryConfig, options?: {
+        relations?: RelationDefinition[];
+        resolveRepository?: (slug: string) => Repository<ObjectLiteral> | undefined;
+    });
+    id(): string;
+    properties(): PropertyAdapter[];
+    find(query: ListQuery, config?: ListQueryConfig): Promise<Paginated<RecordData>>;
+    findOne(id: string, options?: FindOneOptions): Promise<RecordData | null>;
+    create(data: RecordData): Promise<RecordData>;
+    update(id: string, data: RecordData): Promise<RecordData>;
+    delete(id: string): Promise<void>;
+    supportsSoftDelete(): boolean;
+    deletedAtField(): string;
+    restore(id: string): Promise<void>;
+    findRelated(ownerId: string, relation: RelationDefinition, query: ListQuery): Promise<Paginated<RecordData>>;
+    associate(ownerId: string, relation: RelationDefinition, relatedId: string): Promise<void>;
+    dissociate(_ownerId: string, relation: RelationDefinition, relatedId: string): Promise<void>;
+    attach(ownerId: string, relation: RelationDefinition, relatedId: string, pivot?: RecordData): Promise<void>;
+    detach(ownerId: string, relation: RelationDefinition, relatedId: string): Promise<void>;
+    searchRelatedOptions(meta: BelongsToMeta, query?: {
+        search?: string;
+        limit?: number;
+    }): Promise<RelationOption[]>;
+    private requireRelatedRepo;
+}
+export declare function createTypeOrmResource<T extends ObjectLiteral>(options: {
+    id: string;
+    repository: Repository<T>;
+    properties: PropertyAdapter[];
+    listQueryConfig: ListQueryConfig;
+    relations?: RelationDefinition[];
+    resolveRepository?: (slug: string) => Repository<ObjectLiteral> | undefined;
+}): TypeOrmResource<T>;
+export declare function propertiesFromRepository<T extends ObjectLiteral>(repository: Repository<T>): TypeOrmProperty[];
+export type CreateTypeOrmResourceFromModelOptions<_T extends ObjectLiteral> = {
+    properties?: TypeOrmProperty[];
+    listQueryConfig?: ListQueryConfig;
+    relations?: RelationDefinition[];
+    resolveRepository?: (slug: string) => Repository<ObjectLiteral> | undefined;
+    id?: string;
+};
+export declare function createTypeOrmResourceFromModel<T extends ObjectLiteral>(resource: ResourceClass, repository: Repository<T>, options?: CreateTypeOrmResourceFromModelOptions<T>): TypeOrmResource<T>;
+export declare function bindTypeOrmResourcesFromModels(resources: ResourceClass[], connection: TypeOrmConnectionLike): void;
+export declare function paginateResource<T extends ObjectLiteral>(query: ListQuery, repoOrQb: Repository<T> | SelectQueryBuilder<T>, config: ListQueryConfig): Promise<Paginated<RecordData>>;
+export declare function isRepository<T extends ObjectLiteral>(value: Repository<T> | SelectQueryBuilder<T>): value is Repository<T>;
+export declare function applySearch<T extends ObjectLiteral>(qb: SelectQueryBuilder<T>, alias: string, query: ListQuery, config: ListQueryConfig): void;
+export declare function applyFilters<T extends ObjectLiteral>(qb: SelectQueryBuilder<T>, alias: string, query: ListQuery, config: ListQueryConfig): void;
+export declare function buildFilterWhere(alias: string, column: string, expression: string, allowed: FilterOperator[] | true): {
+    clause: string;
+    params: Record<string, unknown>;
+} | null;
+export declare function applySort<T extends ObjectLiteral>(qb: SelectQueryBuilder<T>, alias: string, query: ListQuery, config: ListQueryConfig): void;
+export declare const TypeOrmAdapter: {
+    forRoot(): {
+        name: string;
+    };
+    createResource: typeof createTypeOrmResource;
+};
+export { Filterable, getEntityColumnMeta, listQueryConfigFromEntity, normalizeSortDirection, Searchable, Sortable, type EntityColumnMeta, type SortDirectionInput } from './entity-decorators.js';
+export { relationsFromResource } from '@nestjs-dash/core';
+export { Between, Equal, ILike, In, IsNull, LessThan, LessThanOrEqual, Like, MoreThan, MoreThanOrEqual, Not, type EntityTarget };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -1,5 +1,532 @@
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const pkg = require('../package.json');
-console.log(`Hello from ${pkg.name}`);
+import { relationsFromResource, resolveListQueryConfig, resolveResourceSlug, } from '@nestjs-dash/core';
+import { Between, Equal, ILike, In, IsNull, LessThan, LessThanOrEqual, Like, MoreThan, MoreThanOrEqual, Not, } from 'typeorm';
+import { listQueryConfigFromEntity } from './entity-decorators.js';
+export class TypeOrmProperty {
+    constructor(propertyName, propertyType, flags = {}) {
+        this.propertyName = propertyName;
+        this.propertyType = propertyType;
+        this.flags = flags;
+    }
+    name() {
+        return this.propertyName;
+    }
+    type() {
+        return this.propertyType;
+    }
+    isId() {
+        return this.flags.id ?? false;
+    }
+    isEditable() {
+        return this.flags.editable ?? !this.isId();
+    }
+    isSortable() {
+        return this.flags.sortable ?? true;
+    }
+}
+export class TypeOrmResource {
+    constructor(resourceId, repository, props, defaultConfig, options = {}) {
+        this.resourceId = resourceId;
+        this.repository = repository;
+        this.props = props;
+        this.defaultConfig = defaultConfig;
+        this.options = options;
+    }
+    id() {
+        return this.resourceId;
+    }
+    properties() {
+        return this.props;
+    }
+    find(query, config) {
+        return paginateResource(query, this.repository, {
+            ...this.defaultConfig,
+            ...config,
+            sortableColumns: config?.sortableColumns ?? this.defaultConfig.sortableColumns,
+        });
+    }
+    async findOne(id, options) {
+        const relations = normalizeFindRelations(options?.relations);
+        const record = await findOneCompatible(this.repository, id, relations);
+        return record ?? null;
+    }
+    async create(data) {
+        const entity = this.repository.create(data);
+        const saved = await this.repository.save(entity);
+        return saved;
+    }
+    async update(id, data) {
+        await this.repository.update({ id }, data);
+        const updated = await this.findOne(id);
+        if (!updated) {
+            throw new Error(`Record ${id} not found`);
+        }
+        return updated;
+    }
+    async delete(id) {
+        if (this.supportsSoftDelete()) {
+            await this.repository.softDelete({ id });
+            return;
+        }
+        await this.repository.delete({ id });
+    }
+    supportsSoftDelete() {
+        return this.repository.metadata.deleteDateColumn != null;
+    }
+    deletedAtField() {
+        const column = this.repository.metadata.deleteDateColumn;
+        if (!column) {
+            throw new Error(`Resource ${this.resourceId} has no delete-date column`);
+        }
+        return column.propertyName;
+    }
+    async restore(id) {
+        if (!this.supportsSoftDelete()) {
+            throw new Error(`Resource ${this.resourceId} has no delete-date column to restore`);
+        }
+        await this.repository.restore({ id });
+    }
+    async findRelated(ownerId, relation, query) {
+        const relatedRepo = this.requireRelatedRepo(relation.relatedResource);
+        const config = relation.listQueryConfig ?? {
+            sortableColumns: ['id'],
+            defaultLimit: 20,
+        };
+        if (relation.type === 'has-many') {
+            const foreignKey = relation.foreignKey;
+            if (!foreignKey) {
+                throw new Error(`HasMany relation ${relation.name} needs foreignKey`);
+            }
+            return paginateResource({
+                ...query,
+                filter: {
+                    ...query.filter,
+                    [foreignKey]: `$eq:${ownerId}`,
+                },
+            }, relatedRepo, {
+                ...config,
+                filterableColumns: {
+                    ...config.filterableColumns,
+                    [foreignKey]: true,
+                },
+            });
+        }
+        const ownerRelation = relation.ownerRelationProperty ?? relation.name;
+        if (!relation.relatedRelationProperty) {
+            const viaOwner = this.repository
+                .createQueryBuilder('owner')
+                .leftJoinAndSelect(`owner.${ownerRelation}`, 'entity')
+                .where('owner.id = :ownerId', { ownerId });
+            const owner = await viaOwner.getOne();
+            const related = (owner?.[ownerRelation] ??
+                []);
+            const ids = related.map((row) => String(row.id));
+            if (ids.length === 0) {
+                return emptyPage(query, config);
+            }
+            return paginateResource({
+                ...query,
+                filter: {
+                    ...query.filter,
+                    id: `$in:${ids.join(',')}`,
+                },
+            }, relatedRepo, {
+                ...config,
+                filterableColumns: {
+                    ...config.filterableColumns,
+                    id: true,
+                },
+            });
+        }
+        const qb = relatedRepo
+            .createQueryBuilder('entity')
+            .innerJoin(`entity.${relation.relatedRelationProperty}`, 'owner', 'owner.id = :ownerId', {
+            ownerId,
+        });
+        return paginateResource(query, qb, config);
+    }
+    async associate(ownerId, relation, relatedId) {
+        const foreignKey = relation.foreignKey;
+        if (!foreignKey) {
+            throw new Error(`HasMany relation ${relation.name} needs foreignKey`);
+        }
+        const relatedRepo = this.requireRelatedRepo(relation.relatedResource);
+        await relatedRepo.update({ id: relatedId }, {
+            [foreignKey]: ownerId,
+        });
+    }
+    async dissociate(_ownerId, relation, relatedId) {
+        const foreignKey = relation.foreignKey;
+        if (!foreignKey) {
+            throw new Error(`HasMany relation ${relation.name} needs foreignKey`);
+        }
+        const relatedRepo = this.requireRelatedRepo(relation.relatedResource);
+        await relatedRepo.update({ id: relatedId }, {
+            [foreignKey]: null,
+        });
+    }
+    async attach(ownerId, relation, relatedId, pivot) {
+        const ownerRelation = relation.ownerRelationProperty ?? relation.name;
+        if (relation.pivotTable && pivot && Object.keys(pivot).length > 0) {
+            const pivotForeignKey = relation.pivotForeignKey ?? `${singularize(this.resourceId)}Id`;
+            const pivotRelatedKey = relation.pivotRelatedKey ?? `${singularize(relation.relatedResource)}Id`;
+            await this.repository.manager
+                .createQueryBuilder()
+                .insert()
+                .into(relation.pivotTable)
+                .values({
+                [pivotForeignKey]: ownerId,
+                [pivotRelatedKey]: relatedId,
+                ...pivot,
+            })
+                .orIgnore()
+                .execute();
+            return;
+        }
+        await this.repository.createQueryBuilder().relation(ownerRelation).of(ownerId).add(relatedId);
+    }
+    async detach(ownerId, relation, relatedId) {
+        const ownerRelation = relation.ownerRelationProperty ?? relation.name;
+        if (relation.pivotTable) {
+            const pivotForeignKey = relation.pivotForeignKey ?? `${singularize(this.resourceId)}Id`;
+            const pivotRelatedKey = relation.pivotRelatedKey ?? `${singularize(relation.relatedResource)}Id`;
+            await this.repository.manager
+                .createQueryBuilder()
+                .delete()
+                .from(relation.pivotTable)
+                .where(`${pivotForeignKey} = :ownerId AND ${pivotRelatedKey} = :relatedId`, {
+                ownerId,
+                relatedId,
+            })
+                .execute();
+            return;
+        }
+        await this.repository
+            .createQueryBuilder()
+            .relation(ownerRelation)
+            .of(ownerId)
+            .remove(relatedId);
+    }
+    async searchRelatedOptions(meta, query = {}) {
+        const relatedRepo = this.requireRelatedRepo(meta.resource);
+        const searchBy = meta.searchBy ?? [meta.titleAttribute];
+        const result = await paginateResource({
+            search: query.search,
+            searchBy,
+            limit: query.limit ?? 25,
+            page: 1,
+        }, relatedRepo, {
+            sortableColumns: [meta.titleAttribute, 'id'],
+            searchableColumns: searchBy,
+            defaultSortBy: [[meta.titleAttribute, 'ASC']],
+        });
+        return result.data.map((row) => ({
+            value: String(row.id),
+            label: String(row[meta.titleAttribute] ?? row.id),
+        }));
+    }
+    requireRelatedRepo(slug) {
+        if (slug === this.resourceId) {
+            return this.repository;
+        }
+        const repo = this.options.resolveRepository?.(slug);
+        if (!repo) {
+            throw new Error(`Related repository for ${slug} not registered`);
+        }
+        return repo;
+    }
+}
+function singularize(value) {
+    return value.endsWith('s') ? value.slice(0, -1) : value;
+}
+function normalizeFindRelations(relations) {
+    if (relations == null) {
+        return undefined;
+    }
+    if (Array.isArray(relations)) {
+        if (relations.length === 0) {
+            return undefined;
+        }
+        return Object.fromEntries(relations.map((name) => [name, true]));
+    }
+    const entries = Object.entries(relations).map(([key, value]) => [
+        key,
+        value === true || (value != null && typeof value === 'object'),
+    ]);
+    return Object.fromEntries(entries);
+}
+function isLegacyConnectionRepository(repository) {
+    return typeof repository.findOneBy !== 'function';
+}
+async function findOneCompatible(repository, id, relations) {
+    if (!isLegacyConnectionRepository(repository)) {
+        return repository.findOne({
+            where: { id },
+            relations: relations,
+        });
+    }
+    const legacyFindOne = repository.findOne;
+    return legacyFindOne(id, relations ? { relations: Object.keys(relations) } : undefined);
+}
+function emptyPage(query, config) {
+    const limit = query.limit ?? config.defaultLimit ?? 20;
+    return {
+        data: [],
+        meta: {
+            itemsPerPage: limit,
+            totalItems: 0,
+            currentPage: query.page ?? 1,
+            totalPages: 1,
+            sortBy: query.sortBy ?? config.defaultSortBy ?? [],
+        },
+    };
+}
+export function createTypeOrmResource(options) {
+    return new TypeOrmResource(options.id, options.repository, options.properties, options.listQueryConfig, {
+        relations: options.relations,
+        resolveRepository: options.resolveRepository,
+    });
+}
+function mapColumnPropertyType(column) {
+    if (column.relationMetadata) {
+        return 'reference';
+    }
+    const raw = column.type;
+    const typeName = typeof raw === 'string'
+        ? raw.toLowerCase()
+        : typeof raw === 'function'
+            ? raw.name.toLowerCase()
+            : String(raw).toLowerCase();
+    if (typeName.includes('bool') || typeName === 'bit') {
+        return 'boolean';
+    }
+    if (typeName.includes('int') ||
+        typeName.includes('decimal') ||
+        typeName.includes('numeric') ||
+        typeName.includes('float') ||
+        typeName.includes('double') ||
+        typeName === 'real' ||
+        typeName === 'money') {
+        return 'number';
+    }
+    if (typeName === 'date') {
+        return 'date';
+    }
+    if (typeName.includes('timestamp') ||
+        typeName.includes('datetime') ||
+        typeName === 'timestamptz') {
+        return 'datetime';
+    }
+    if (typeName.includes('json') || typeName === 'simple-json' || typeName === 'simple-array') {
+        return 'json';
+    }
+    return 'string';
+}
+export function propertiesFromRepository(repository) {
+    return repository.metadata.columns.map((column) => {
+        const isId = column.isPrimary;
+        return new TypeOrmProperty(column.propertyName, mapColumnPropertyType(column), {
+            id: isId,
+            editable: !isId && !column.isCreateDate && !column.isUpdateDate && !column.isDeleteDate,
+            sortable: true,
+        });
+    });
+}
+function listQueryConfigForResource(resource, model, properties) {
+    return resolveListQueryConfig(resource, properties.map((property) => property.name()), (tableDefaults, columnCapabilities) => listQueryConfigFromEntity(model, tableDefaults, columnCapabilities, properties), properties);
+}
+export function createTypeOrmResourceFromModel(resource, repository, options = {}) {
+    const model = resource.model;
+    if (model == null) {
+        throw new Error(`Resource ${resource.name} is missing static model for TypeORM auto-bind`);
+    }
+    const properties = options.properties ?? propertiesFromRepository(repository);
+    const listQueryConfig = options.listQueryConfig ??
+        listQueryConfigForResource(resource, model, properties);
+    const relations = options.relations ?? relationsFromResource(resource);
+    return createTypeOrmResource({
+        id: options.id ?? resolveResourceSlug(resource),
+        repository,
+        properties,
+        listQueryConfig,
+        relations: relations.length ? relations : undefined,
+        resolveRepository: options.resolveRepository,
+    });
+}
+export function bindTypeOrmResourcesFromModels(resources, connection) {
+    const bySlug = new Map();
+    for (const resource of resources) {
+        bySlug.set(resolveResourceSlug(resource), resource);
+    }
+    const resolveRepository = (slug) => {
+        const resource = bySlug.get(slug);
+        const model = resource?.model;
+        if (!model) {
+            return undefined;
+        }
+        try {
+            return connection.getRepository(model);
+        }
+        catch {
+            return undefined;
+        }
+    };
+    for (const resource of resources) {
+        if (resource.adapter) {
+            continue;
+        }
+        const model = resource.model;
+        if (!model) {
+            continue;
+        }
+        const repository = connection.getRepository(model);
+        resource.adapter = createTypeOrmResourceFromModel(resource, repository, {
+            resolveRepository,
+        });
+    }
+}
+export async function paginateResource(query, repoOrQb, config) {
+    const qb = isRepository(repoOrQb) ? repoOrQb.createQueryBuilder('entity') : repoOrQb;
+    const alias = qb.alias;
+    const defaultLimit = config.defaultLimit ?? 20;
+    const maxLimit = config.maxLimit ?? 100;
+    const limit = Math.min(Math.max(query.limit ?? defaultLimit, 1), maxLimit);
+    const page = Math.max(query.page ?? 1, 1);
+    if (config.select?.length) {
+        qb.select(config.select.map((column) => `${alias}.${column}`));
+    }
+    if (Array.isArray(config.relations)) {
+        for (const relation of config.relations) {
+            qb.leftJoinAndSelect(`${alias}.${relation}`, relation);
+        }
+    }
+    const deleteDateColumn = qb.expressionMap.mainAlias?.metadata?.deleteDateColumn;
+    if (deleteDateColumn && !query.withDeleted) {
+        qb.andWhere(`${alias}.${deleteDateColumn.propertyName} IS NULL`);
+    }
+    applySearch(qb, alias, query, config);
+    applyFilters(qb, alias, query, config);
+    applySort(qb, alias, query, config);
+    const totalItems = await qb.getCount();
+    qb.skip((page - 1) * limit).take(limit);
+    const entities = await qb.getMany();
+    const sortBy = query.sortBy?.length ? query.sortBy : (config.defaultSortBy ?? []);
+    return {
+        data: entities,
+        meta: {
+            itemsPerPage: limit,
+            totalItems,
+            currentPage: page,
+            totalPages: Math.max(Math.ceil(totalItems / limit), 1),
+            sortBy,
+            search: query.search,
+            filter: query.filter,
+        },
+    };
+}
+export function isRepository(value) {
+    return 'metadata' in value && typeof value.createQueryBuilder === 'function';
+}
+export function applySearch(qb, alias, query, config) {
+    const search = query.search?.trim();
+    if (!search) {
+        return;
+    }
+    const columns = query.searchBy?.length ? query.searchBy : (config.searchableColumns ?? []);
+    if (columns.length === 0) {
+        return;
+    }
+    const parts = columns.map((column, index) => {
+        const param = `search${index}`;
+        qb.setParameter(param, `%${search.toLowerCase()}%`);
+        return `LOWER(CAST(${alias}.${column} AS TEXT)) LIKE :${param}`;
+    });
+    qb.andWhere(`(${parts.join(' OR ')})`);
+}
+export function applyFilters(qb, alias, query, config) {
+    if (!query.filter) {
+        return;
+    }
+    for (const [column, raw] of Object.entries(query.filter)) {
+        const allowed = config.filterableColumns?.[column];
+        if (!allowed) {
+            continue;
+        }
+        const values = Array.isArray(raw) ? raw : [raw];
+        for (const expression of values) {
+            const where = buildFilterWhere(alias, column, expression, allowed);
+            if (where) {
+                qb.andWhere(where.clause, where.params);
+            }
+        }
+    }
+}
+export function buildFilterWhere(alias, column, expression, allowed) {
+    const [operator, ...rest] = expression.split(':');
+    const value = rest.join(':');
+    const op = (operator?.startsWith('$') ? operator : '$eq');
+    if (allowed !== true && !allowed.includes(op)) {
+        return null;
+    }
+    const path = `${alias}.${column}`;
+    const param = `f_${column}_${op.replace('$', '')}`;
+    switch (op) {
+        case '$eq':
+            return { clause: `${path} = :${param}`, params: { [param]: value } };
+        case '$not':
+            return { clause: `${path} != :${param}`, params: { [param]: value } };
+        case '$null':
+            return { clause: `${path} IS NULL`, params: {} };
+        case '$in':
+            return {
+                clause: `${path} IN (:...${param})`,
+                params: { [param]: value.split(',') },
+            };
+        case '$gt':
+            return { clause: `${path} > :${param}`, params: { [param]: value } };
+        case '$gte':
+            return { clause: `${path} >= :${param}`, params: { [param]: value } };
+        case '$lt':
+            return { clause: `${path} < :${param}`, params: { [param]: value } };
+        case '$lte':
+            return { clause: `${path} <= :${param}`, params: { [param]: value } };
+        case '$btw': {
+            const [min, max] = value.split(',');
+            return {
+                clause: `${path} BETWEEN :${param}Min AND :${param}Max`,
+                params: { [`${param}Min`]: min, [`${param}Max`]: max },
+            };
+        }
+        case '$ilike':
+        case '$contains':
+            return {
+                clause: `LOWER(CAST(${path} AS TEXT)) LIKE :${param}`,
+                params: { [param]: `%${value.toLowerCase()}%` },
+            };
+        case '$sw':
+            return {
+                clause: `LOWER(CAST(${path} AS TEXT)) LIKE :${param}`,
+                params: { [param]: `${value.toLowerCase()}%` },
+            };
+        default:
+            return { clause: `${path} = :${param}`, params: { [param]: expression } };
+    }
+}
+export function applySort(qb, alias, query, config) {
+    const sortBy = query.sortBy?.length ? query.sortBy : (config.defaultSortBy ?? []);
+    for (const [column, direction] of sortBy) {
+        if (!config.sortableColumns.includes(column)) {
+            continue;
+        }
+        qb.addOrderBy(`${alias}.${column}`, direction);
+    }
+}
+export const TypeOrmAdapter = {
+    forRoot() {
+        return { name: '@nestjs-dash/typeorm' };
+    },
+    createResource: createTypeOrmResource,
+};
+export { Filterable, getEntityColumnMeta, listQueryConfigFromEntity, normalizeSortDirection, Searchable, Sortable } from './entity-decorators.js';
+export { relationsFromResource } from '@nestjs-dash/core';
+export { Between, Equal, ILike, In, IsNull, LessThan, LessThanOrEqual, Like, MoreThan, MoreThanOrEqual, Not };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAqB,CAAC;AAE3D,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,16 +1,8 @@
 {
   "name": "@nestjs-dash/typeorm",
-  "version": "0.0.1",
-  "description": "TypeORM adapter for nestjs-dash (ResourceAdapter/DatabaseAdapter implementation + entity decorators)",
+  "version": "0.1.1",
+  "description": "TypeORM adapter for NestJS Dash (ResourceAdapter/DatabaseAdapter implementation + entity decorators)",
   "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/nestjs-dash/typeorm.git"
-  },
-  "bugs": {
-    "url": "https://github.com/nestjs-dash/typeorm/issues"
-  },
-  "homepage": "https://github.com/nestjs-dash/typeorm#readme",
   "files": [
     "dist"
   ],
@@ -22,31 +14,18 @@
     }
   },
   "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/",
-    "tag": "latest"
+    "access": "public"
   },
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "check-types": "tsc -p tsconfig.json --noEmit",
-    "format": "oxfmt",
-    "lint": "oxlint src",
-    "test": "vitest run",
-    "test:coverage": "vitest run --coverage",
-    "release": "release-it",
-    "dev": "tsc -p tsconfig.json --watch"
+  "dependencies": {
+    "@nestjs-dash/adapter": "0.1.1",
+    "@nestjs-dash/core": "0.1.1"
   },
   "devDependencies": {
-    "@types/node": "^26.5.1",
-    "@vitest/coverage-v8": "5.0.0",
-    "oxfmt": "^0.67.0",
-    "oxlint": "^1.82.0",
+    "@nestjs-dash/typescript-config": "0.1.0",
     "reflect-metadata": "^0.2.2",
     "typeorm": "^1.1.1",
-    "typescript": "7.0.2",
-    "vitest": "^5.0.0",
-    "release-it": "^21.0.2",
-    "@release-it/conventional-changelog": "^12.0.0"
+    "typescript": "6.0.3",
+    "vitest": "^5.0.0"
   },
   "peerDependencies": {
     "reflect-metadata": "^0.2.2",
@@ -56,5 +35,14 @@
     "reflect-metadata": {
       "optional": true
     }
+  },
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "check-types": "tsc -p tsconfig.json --noEmit",
+    "format": "oxfmt",
+    "lint": "oxlint src",
+    "test": "vitest run",
+    "test:coverage": "vitest run --coverage",
+    "dev": "tsc -p tsconfig.json --watch"
   }
 }

package/README.md

@@ -1 +0,0 @@
-# @nestjs-dash/typeorm