diff --git a/.gitignore b/.gitignore
index 54dcc97e..1213275f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,3 @@ dist-ssr
server/dist
public/dist
out
-
-apps/**/false/*
-false
diff --git a/apps/server/package.json b/apps/server/package.json
index 310879fb..2aa2f391 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -1,6 +1,6 @@
{
"name": "@erp/factuges-server",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"scripts": {
"build": "tsup src/index.ts --config tsup.config.ts",
diff --git a/apps/web/package.json b/apps/web/package.json
index cb46c861..3af819d9 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,7 +1,7 @@
{
"name": "@erp/factuges-web",
"private": true,
- "version": "0.10.1",
+ "version": "0.10.2",
"type": "module",
"scripts": {
"typecheck": "tsc -p tsconfig.json --noEmit",
diff --git a/modules/auth/package.json b/modules/auth/package.json
index a0418ad6..af62a49c 100644
--- a/modules/auth/package.json
+++ b/modules/auth/package.json
@@ -1,6 +1,6 @@
{
"name": "@erp/auth",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/modules/catalogs/package.json b/modules/catalogs/package.json
index 9f0cc73b..d8e2c9d5 100644
--- a/modules/catalogs/package.json
+++ b/modules/catalogs/package.json
@@ -1,7 +1,7 @@
{
"name": "@erp/catalogs",
"description": "Catalogs module",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/modules/companies/package.json b/modules/companies/package.json
index da4b7aaf..4b05ce2d 100644
--- a/modules/companies/package.json
+++ b/modules/companies/package.json
@@ -1,7 +1,7 @@
{
"name": "@erp/companies",
"description": "Companies module",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/modules/core/package.json b/modules/core/package.json
index 53309d16..7b2542c6 100644
--- a/modules/core/package.json
+++ b/modules/core/package.json
@@ -1,6 +1,6 @@
{
"name": "@erp/core",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/modules/core/src/web/components/form/form-actions/page-form-header.tsx b/modules/core/src/web/components/form/form-actions/page-form-header.tsx
index 6fb4c658..38bff5d4 100644
--- a/modules/core/src/web/components/form/form-actions/page-form-header.tsx
+++ b/modules/core/src/web/components/form/form-actions/page-form-header.tsx
@@ -5,7 +5,7 @@ import { ArrowLeftIcon } from "lucide-react";
import type { ReactNode } from "react";
export interface PageFormHeaderProps {
- title: string;
+ title: string | ReactNode;
backLabel: string;
onBack?: () => void;
diff --git a/modules/customer-invoices/package.json b/modules/customer-invoices/package.json
index 4bcd71bf..d3c103da 100644
--- a/modules/customer-invoices/package.json
+++ b/modules/customer-invoices/package.json
@@ -1,6 +1,6 @@
{
"name": "@erp/customer-invoices",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/modules/customer-invoices/src/api/application/invoice-series/services/invoice-series-number-assigner.ts b/modules/customer-invoices/src/api/application/invoice-series/services/invoice-series-number-assigner.ts
index 5c6489bd..a536d267 100644
--- a/modules/customer-invoices/src/api/application/invoice-series/services/invoice-series-number-assigner.ts
+++ b/modules/customer-invoices/src/api/application/invoice-series/services/invoice-series-number-assigner.ts
@@ -1,5 +1,5 @@
import type { UniqueID } from "@repo/rdx-ddd";
-import { type Maybe, Result } from "@repo/rdx-utils";
+import type { Maybe, Result } from "@repo/rdx-utils";
import type { InvoiceNumber, InvoiceSerie } from "../../../domain";
diff --git a/modules/customer-invoices/src/api/infrastructure/issued-invoices/di/issued-invoice-public-services.ts b/modules/customer-invoices/src/api/infrastructure/issued-invoices/di/issued-invoice-public-services.ts
index e5ed8701..a9eac281 100644
--- a/modules/customer-invoices/src/api/infrastructure/issued-invoices/di/issued-invoice-public-services.ts
+++ b/modules/customer-invoices/src/api/infrastructure/issued-invoices/di/issued-invoice-public-services.ts
@@ -4,13 +4,13 @@ import type { DocumentSeriesPublicServicesType } from "@erp/document-series/api"
import type { UniqueID } from "@repo/rdx-ddd";
import { Result } from "@repo/rdx-utils";
+import type { IInvoiceSeriesNumberAssigner } from "../../../application/invoice-series";
import {
type IIssuedInvoiceCreatorParams,
type IIssuedInvoicePublicServices,
type IIssuedInvoiceServicesContext,
buildIssuedInvoiceCreator,
} from "../../../application/issued-invoices";
-import type { IInvoiceSeriesNumberAssigner } from "../../../application/invoice-series";
import { InvoiceNumber, InvoiceSerie } from "../../../domain";
import { buildV2IssuedInvoicePersistence } from "./issued-invoice-persistence.di";
@@ -29,11 +29,13 @@ export function buildIssuedInvoicePublicServices(
// Fase 1C: la emision ya persiste en `issued_invoices` y relaciona Verifactu por `issued_invoice_id`.
const persistence = buildV2IssuedInvoicePersistence({ catalogs, database });
const { repository } = persistence;
+
const invoiceSeriesNumberAssigner: IInvoiceSeriesNumberAssigner = {
assignNextNumber: async ({ companyId, invoiceSeriesCode, transaction }) => {
- const requestedSeriesCode = invoiceSeriesCode
- .map((series) => series.toPrimitive())
- .unwrapOr(null);
+ const requestedSeriesCode = invoiceSeriesCode.match(
+ (serie) => serie.toString(),
+ () => null
+ );
const assignResult = await documentSeriesServices.assignNextNumber({
companyId: companyId.toString(),
@@ -56,12 +58,12 @@ export function buildIssuedInvoicePublicServices(
return Result.fail(assignedSeriesResult.error);
}
- return Result.ok({
- invoiceNumber: invoiceNumberResult.data,
- formattedNumber: assignResult.data.reference,
- invoiceSeriesId: assignResult.data.series_id,
- invoiceSeriesCode: assignedSeriesResult.data,
- });
+ return Result.ok({
+ invoiceNumber: invoiceNumberResult.data,
+ formattedNumber: assignResult.data.reference,
+ invoiceSeriesId: assignResult.data.series_id,
+ invoiceSeriesCode: assignedSeriesResult.data,
+ });
},
};
diff --git a/modules/customer-invoices/src/web/proformas/detail/ui/components/proforma-detail-header-meta.tsx b/modules/customer-invoices/src/web/proformas/detail/ui/components/proforma-detail-header-meta.tsx
index d270bcb6..7a02b499 100644
--- a/modules/customer-invoices/src/web/proformas/detail/ui/components/proforma-detail-header-meta.tsx
+++ b/modules/customer-invoices/src/web/proformas/detail/ui/components/proforma-detail-header-meta.tsx
@@ -19,7 +19,7 @@ export const ProformaDetailHeaderMeta = ({ proforma }: ProformaDetailHeaderMetaP
);
return (
-
+
{items.map((item, index) => (
{index > 0 ?
| : null}
diff --git a/modules/customer-invoices/src/web/proformas/detail/ui/pages/proforma-detail-page.tsx b/modules/customer-invoices/src/web/proformas/detail/ui/pages/proforma-detail-page.tsx
index 859f3366..dd2fed2f 100644
--- a/modules/customer-invoices/src/web/proformas/detail/ui/pages/proforma-detail-page.tsx
+++ b/modules/customer-invoices/src/web/proformas/detail/ui/pages/proforma-detail-page.tsx
@@ -68,7 +68,7 @@ export const ProformaDetailPage = () => {
}
backLabel="Volver al listado"
onBack={ctrl.navigateBack}
- title={`Proforma ${ctrl.proforma.proformaReference}`}
+ title={<>{`Proforma ${ctrl.proforma.proformaReference}`}>}
>
diff --git a/modules/customer-invoices/src/web/proformas/list/ui/blocks/proformas-grid/use-proforma-grid-columns.tsx b/modules/customer-invoices/src/web/proformas/list/ui/blocks/proformas-grid/use-proforma-grid-columns.tsx
index 3668c693..e0a87f13 100644
--- a/modules/customer-invoices/src/web/proformas/list/ui/blocks/proformas-grid/use-proforma-grid-columns.tsx
+++ b/modules/customer-invoices/src/web/proformas/list/ui/blocks/proformas-grid/use-proforma-grid-columns.tsx
@@ -20,8 +20,8 @@ import {
import type { ColumnDef } from "@tanstack/react-table";
import {
CopyIcon,
- EyeIcon,
ExternalLinkIcon,
+ EyeIcon,
FileDownIcon,
FileTextIcon,
FolderArchiveIcon,
@@ -80,9 +80,7 @@ const stopRowPropagation = (event: React.MouseEvent | React.KeyboardEvent) => {
event.stopPropagation();
};
-const stopRowPropagationAndPreventDefault = (
- event: React.MouseEvent | React.KeyboardEvent
-) => {
+const stopRowPropagationAndPreventDefault = (event: React.MouseEvent | React.KeyboardEvent) => {
event.preventDefault();
event.stopPropagation();
};
@@ -367,12 +365,12 @@ export function useProformasGridColumns(
key: "edit",
label: t("pages.proformas.list.actions.edit"),
icon: PencilIcon,
- disabled: !actionHandlers.onEditClick || !isNormalScope || isIssued,
- disabledReason: !isNormalScope
- ? getScopeReason()
- : isIssued
+ disabled: !(actionHandlers.onEditClick && isNormalScope) || isIssued,
+ disabledReason: isNormalScope
+ ? isIssued
? t("pages.proformas.list.actions.disabled_reasons.edit_issued")
- : undefined,
+ : undefined
+ : getScopeReason(),
onClick: handleEdit,
},
];
@@ -382,11 +380,11 @@ export function useProformasGridColumns(
key: "linked-invoice",
label: t("pages.proformas.list.actions.view_linked_invoice"),
icon: ExternalLinkIcon,
- disabled: !isIssued || !proforma.linkedInvoiceId,
+ disabled: !(isIssued && proforma.linkedInvoiceId),
disabledReason:
- !isIssued || !proforma.linkedInvoiceId
- ? t("pages.proformas.list.actions.disabled_reasons.linked_invoice_unavailable")
- : undefined,
+ isIssued && proforma.linkedInvoiceId
+ ? undefined
+ : t("pages.proformas.list.actions.disabled_reasons.linked_invoice_unavailable"),
href: proforma.linkedInvoiceId
? `/issed-invoices/${proforma.linkedInvoiceId}`
: undefined,
@@ -396,26 +394,27 @@ export function useProformasGridColumns(
label: t("pages.proformas.list.actions.change_status"),
icon: RefreshCwIcon,
disabled:
- !actionHandlers.onChangeStatusClick || !isNormalScope || !nextTransition || isIssued,
- disabledReason: !isNormalScope
- ? getScopeReason()
- : isIssued
+ !(actionHandlers.onChangeStatusClick && isNormalScope && nextTransition) ||
+ isIssued,
+ disabledReason: isNormalScope
+ ? isIssued
? t("pages.proformas.list.actions.disabled_reasons.status_issued")
- : !nextTransition
- ? t("proformas.change_proforma_status_dialog.empty_available_statuses")
- : undefined,
+ : nextTransition
+ ? undefined
+ : t("proformas.change_proforma_status_dialog.empty_available_statuses")
+ : getScopeReason(),
onClick: handleChangeStatus,
},
{
key: "issue",
label: t("pages.proformas.list.actions.issue"),
icon: FileTextIcon,
- disabled: !actionHandlers.onIssueClick || !isNormalScope || !isApproved || isIssued,
- disabledReason: !isNormalScope
- ? getScopeReason()
- : !isApproved
- ? t("proformas.issue_proforma_dialog.not_allowed_description")
- : undefined,
+ disabled: !(actionHandlers.onIssueClick && isNormalScope && isApproved) || isIssued,
+ disabledReason: isNormalScope
+ ? isApproved
+ ? undefined
+ : t("proformas.issue_proforma_dialog.not_allowed_description")
+ : getScopeReason(),
onClick: handleIssue,
},
{
@@ -432,31 +431,31 @@ export function useProformasGridColumns(
key: "archive",
label: t("pages.proformas.list.actions.archive"),
icon: FolderArchiveIcon,
- disabled: !actionHandlers.onArchiveClick || !isArchivable,
- disabledReason: !actionHandlers.onArchiveClick
- ? undefined
- : !isNormalScope
- ? getScopeReason()
- : t("proformas.archive.error_conflict_message"),
+ disabled: !(actionHandlers.onArchiveClick && isArchivable),
+ disabledReason: actionHandlers.onArchiveClick
+ ? isNormalScope
+ ? t("proformas.archive.error_conflict_message")
+ : getScopeReason()
+ : undefined,
onClick: handleArchive,
},
{
key: "unarchive",
label: t("pages.proformas.list.actions.unarchive"),
icon: Undo2Icon,
- disabled: !actionHandlers.onUnarchiveClick || !isUnarchivable,
- disabledReason: !actionHandlers.onUnarchiveClick
- ? undefined
- : !isArchivedScope
- ? t("pages.proformas.list.actions.disabled_reasons.archived_only")
- : t("proformas.unarchive.error_conflict_message"),
+ disabled: !(actionHandlers.onUnarchiveClick && isUnarchivable),
+ disabledReason: actionHandlers.onUnarchiveClick
+ ? isArchivedScope
+ ? t("proformas.unarchive.error_conflict_message")
+ : t("pages.proformas.list.actions.disabled_reasons.archived_only")
+ : undefined,
onClick: handleUnarchive,
},
{
key: "download-pdf",
label: t("pages.proformas.list.actions.download_pdf"),
icon: FileDownIcon,
- disabled: !actionHandlers.onDownloadPdf || isDeletedScope || isPDFLoading,
+ disabled: Boolean(!actionHandlers.onDownloadPdf || isDeletedScope || isPDFLoading),
disabledReason: isDeletedScope
? t("pages.proformas.list.actions.disabled_reasons.deleted_scope")
: isPDFLoading
@@ -473,9 +472,9 @@ export function useProformasGridColumns(
disabled: !actionHandlers.onDeleteClick || isDeletedScope || !isDraft,
disabledReason: isDeletedScope
? t("pages.proformas.list.actions.disabled_reasons.deleted_scope")
- : !isDraft
- ? t("proformas.delete_proforma_dialog.error_conflict_message")
- : undefined,
+ : isDraft
+ ? undefined
+ : t("proformas.delete_proforma_dialog.error_conflict_message"),
onClick: handleDelete,
},
];
@@ -543,7 +542,9 @@ export function useProformasGridColumns(
return (
- {item}
: item} />
+
{item} : item}
+ />
{action.disabledReason ?? action.label}
);
@@ -574,11 +575,7 @@ export function useProformasGridColumns(
/>
{t("common.more_actions")}
-
+
{t("common.actions")}
diff --git a/modules/customer-invoices/src/web/proformas/shared/ui/blocks/proforma-page-header.tsx b/modules/customer-invoices/src/web/proformas/shared/ui/blocks/proforma-page-header.tsx
index e345c8f6..4b65b002 100644
--- a/modules/customer-invoices/src/web/proformas/shared/ui/blocks/proforma-page-header.tsx
+++ b/modules/customer-invoices/src/web/proformas/shared/ui/blocks/proforma-page-header.tsx
@@ -3,7 +3,7 @@ import { cn } from "@repo/shadcn-ui/lib/utils";
import type { ReactNode } from "react";
export interface ProformaPageHeaderProps {
- title: string;
+ title: string | ReactNode;
backLabel?: string;
onBack?: () => void;
statusLabel?: string;
diff --git a/modules/customers/package.json b/modules/customers/package.json
index f94e68c2..845d5276 100644
--- a/modules/customers/package.json
+++ b/modules/customers/package.json
@@ -1,7 +1,7 @@
{
"name": "@erp/customers",
"description": "Customers",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/modules/document-series/package.json b/modules/document-series/package.json
index 507db352..fd2ed3e5 100644
--- a/modules/document-series/package.json
+++ b/modules/document-series/package.json
@@ -1,7 +1,7 @@
{
"name": "@erp/document-series",
"description": "Document series module",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/modules/factuges/package.json b/modules/factuges/package.json
index 9dd76cca..64779a0d 100644
--- a/modules/factuges/package.json
+++ b/modules/factuges/package.json
@@ -1,6 +1,6 @@
{
"name": "@erp/factuges",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/modules/identity/package.json b/modules/identity/package.json
index c434dc92..86ee7e82 100644
--- a/modules/identity/package.json
+++ b/modules/identity/package.json
@@ -1,7 +1,7 @@
{
"name": "@erp/identity",
"description": "Identity module",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/modules/supplier-invoices/package.json b/modules/supplier-invoices/package.json
index 0284c6ef..b845a138 100644
--- a/modules/supplier-invoices/package.json
+++ b/modules/supplier-invoices/package.json
@@ -1,7 +1,7 @@
{
"name": "@erp/supplier-invoices",
"description": "Supplier invoices",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/modules/supplier/package.json b/modules/supplier/package.json
index d9b98176..14db75c3 100644
--- a/modules/supplier/package.json
+++ b/modules/supplier/package.json
@@ -1,7 +1,7 @@
{
"name": "@erp/suppliers",
"description": "Suppliers",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/package.json b/package.json
index 9d4ce92d..74c0aed3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "uecko-erp-2025",
"private": true,
- "version": "0.10.1",
+ "version": "0.10.2",
"workspaces": [
"apps/*",
"modules/*",
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 7979386d..14058411 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
{
"name": "@repo/i18next",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"scripts": {
diff --git a/packages/rdx-criteria/package.json b/packages/rdx-criteria/package.json
index 6dce4802..0fd99efa 100644
--- a/packages/rdx-criteria/package.json
+++ b/packages/rdx-criteria/package.json
@@ -1,6 +1,6 @@
{
"name": "@repo/rdx-criteria",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/packages/rdx-criteria/src/__tests__/build-boolean-full-text-query.test.ts b/packages/rdx-criteria/src/__tests__/build-boolean-full-text-query.test.ts
deleted file mode 100644
index be808bd8..00000000
--- a/packages/rdx-criteria/src/__tests__/build-boolean-full-text-query.test.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { describe, expect, test } from "vitest";
-
-import { buildBooleanFullTextQuery } from "../build-boolean-full-text-query";
-
-describe("buildBooleanFullTextQuery", () => {
- test.each([
- ["pr", "+pr*"],
- ["pr-", "+pr*"],
- ["-pr", "+pr*"],
- ["cliente prueba", "+cliente* +prueba*"],
- ["cliente-prueba", "+cliente* +prueba*"],
- ["José Pérez", "+José* +Pérez*"],
- ["++ -- **", ""],
- ["", ""],
- [" ", ""],
- ['+ - > < ( ) ~ * " @', ""],
- ])("normalizes %p into %p", (input, expected) => {
- expect(buildBooleanFullTextQuery(input)).toBe(expected);
- });
-});
diff --git a/packages/rdx-criteria/src/__tests__/criteria-to-sequelize-converter.test.ts b/packages/rdx-criteria/src/__tests__/criteria-to-sequelize-converter.test.ts
deleted file mode 100644
index 536a848d..00000000
--- a/packages/rdx-criteria/src/__tests__/criteria-to-sequelize-converter.test.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { describe, expect, test } from "vitest";
-import { Op, type Sequelize } from "sequelize";
-
-import { Criteria } from "../critera";
-import { CriteriaToSequelizeConverter } from "../criteria-to-sequelize-converter";
-
-const createDatabaseStub = () =>
- ({
- escape: (value: string) => `'${value.replaceAll("'", "''")}'`,
- }) as Sequelize;
-
-describe("CriteriaToSequelizeConverter quick search", () => {
- test("builds a full-text filter and score for free text search", () => {
- const converter = new CriteriaToSequelizeConverter();
- const criteria = Criteria.fromPrimitives([], "name", "asc", 10, 0, "pr-");
-
- const options = converter.convert(criteria, {
- searchableFields: ["name", "trade_name"],
- sortableFields: ["name"],
- enableFullText: true,
- database: createDatabaseStub(),
- strictMode: true,
- });
-
- expect(options.attributes).toEqual({
- include: [[expect.objectContaining({ val: expect.stringContaining("'+pr*'") }), "score"]],
- });
- expect(options.order).toEqual([
- [expect.objectContaining({ val: "score" }), "DESC"],
- ["name", "ASC"],
- ]);
- expect(options.where).toEqual({
- [Op.and]: expect.any(Array),
- });
- });
-
- test("omits MATCH, score and score ordering when the normalized search is empty", () => {
- const converter = new CriteriaToSequelizeConverter();
- const criteria = Criteria.fromPrimitives([], "name", "asc", 10, 0, "++ -- **");
-
- const options = converter.convert(criteria, {
- searchableFields: ["name", "trade_name"],
- sortableFields: ["name"],
- enableFullText: true,
- database: createDatabaseStub(),
- strictMode: true,
- });
-
- expect(options.attributes).toBeUndefined();
- expect(options.order).toEqual([["name", "ASC"]]);
- expect(options.where).toBeUndefined();
- });
-});
diff --git a/packages/rdx-criteria/src/criteria-to-sequelize-converter.ts b/packages/rdx-criteria/src/criteria-to-sequelize-converter.ts
index 47b2d62d..7ffce8b6 100644
--- a/packages/rdx-criteria/src/criteria-to-sequelize-converter.ts
+++ b/packages/rdx-criteria/src/criteria-to-sequelize-converter.ts
@@ -1,5 +1,6 @@
import { type FindOptions, Op, type OrderItem, Sequelize, type WhereOptions } from "sequelize";
+import { buildBooleanFullTextQuery } from "./build-boolean-full-text-query";
import type { Criteria } from "./critera.js";
import type {
ConvertParams,
@@ -7,7 +8,6 @@ import type {
CriteriaMappings,
ICriteriaToOrmConverter,
} from "./types.js";
-import { buildBooleanFullTextQuery } from "./build-boolean-full-text-query.js";
import { appendOrder, normalizeOrder, prependOrder } from "./utils";
/**
@@ -256,10 +256,7 @@ export class CriteriaToSequelizeConverter implements ICriteriaToOrmConverter {
throw new Error(`[CriteriaToSequelizeConverter] Unsupported field mapping: ${String(value)}`);
}
- private buildNullWhereCondition(
- mapping: CriteriaFieldMapping,
- value: unknown
- ): WhereOptions {
+ private buildNullWhereCondition(mapping: CriteriaFieldMapping, value: unknown): WhereOptions {
switch (mapping.type) {
case "root":
return {
@@ -267,11 +264,16 @@ export class CriteriaToSequelizeConverter implements ICriteriaToOrmConverter {
};
case "association":
- return Sequelize.where(Sequelize.col(`${mapping.association}.${mapping.column}`), value) as
- unknown as WhereOptions;
+ return Sequelize.where(
+ Sequelize.col(`${mapping.association}.${mapping.column}`),
+ value
+ ) as unknown as WhereOptions;
case "literal":
- return Sequelize.where(Sequelize.literal(mapping.expression), value) as unknown as WhereOptions;
+ return Sequelize.where(
+ Sequelize.literal(mapping.expression),
+ value
+ ) as unknown as WhereOptions;
default:
return this.assertNever(mapping);
diff --git a/packages/rdx-criteria/src/index.ts b/packages/rdx-criteria/src/index.ts
index 6f259500..9b551d00 100644
--- a/packages/rdx-criteria/src/index.ts
+++ b/packages/rdx-criteria/src/index.ts
@@ -1,5 +1,5 @@
-export * from "./critera";
export * from "./build-boolean-full-text-query";
+export * from "./critera";
export * from "./criteria-from-url-converter";
export * from "./criteria-to-sequelize-converter";
export * from "./defaults";
diff --git a/packages/rdx-ddd/package.json b/packages/rdx-ddd/package.json
index 8669f3b3..6eaaa9ab 100644
--- a/packages/rdx-ddd/package.json
+++ b/packages/rdx-ddd/package.json
@@ -1,6 +1,6 @@
{
"name": "@repo/rdx-ddd",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/packages/rdx-logger/package.json b/packages/rdx-logger/package.json
index 5c70e29a..65a4c617 100644
--- a/packages/rdx-logger/package.json
+++ b/packages/rdx-logger/package.json
@@ -1,6 +1,6 @@
{
"name": "@repo/rdx-logger",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/packages/rdx-ui/package.json b/packages/rdx-ui/package.json
index 2064599a..b1c20c3a 100644
--- a/packages/rdx-ui/package.json
+++ b/packages/rdx-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@repo/rdx-ui",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/packages/rdx-utils/package.json b/packages/rdx-utils/package.json
index a818b755..1f4cdc30 100644
--- a/packages/rdx-utils/package.json
+++ b/packages/rdx-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@repo/rdx-utils",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"type": "module",
"sideEffects": false,
diff --git a/packages/shadcn-ui/package.json b/packages/shadcn-ui/package.json
index aa141374..f2215dbd 100644
--- a/packages/shadcn-ui/package.json
+++ b/packages/shadcn-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@repo/shadcn-ui",
- "version": "0.10.1",
+ "version": "0.10.2",
"type": "module",
"private": true,
"exports": {
diff --git a/packages/typescript-config/package.json b/packages/typescript-config/package.json
index 790bb610..7002f967 100644
--- a/packages/typescript-config/package.json
+++ b/packages/typescript-config/package.json
@@ -1,6 +1,6 @@
{
"name": "@repo/typescript-config",
- "version": "0.10.1",
+ "version": "0.10.2",
"private": true,
"publishConfig": {
"access": "public"
diff --git a/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/linux/FastReportCliGenerator b/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/linux/FastReportCliGenerator
index 12b845b7..4baa4c06 100755
Binary files a/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/linux/FastReportCliGenerator and b/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/linux/FastReportCliGenerator differ
diff --git a/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/windows/FastReportCliGenerator.exe b/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/windows/FastReportCliGenerator.exe
index 3e2d8274..d07340e5 100755
Binary files a/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/windows/FastReportCliGenerator.exe and b/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/windows/FastReportCliGenerator.exe differ