chore: bump pesa

- fix isPesa impl

backend/database/tests/testCore.spec.ts

@@ -104,7 +104,7 @@ describe('DatabaseCore: Migrate and Check Db', function () {
         );
 
         assert.strictEqual(
-          column.type,
+          column.type.toLowerCase(),
           dbColType,
           `${schemaName}.${column.name}:: type check: ${column.type}, ${dbColType}`
         );

dummy/index.ts

@@ -164,6 +164,10 @@ async function getPayments(fyo: Fyo, invoices: Invoice[]) {
       amount: invoice.outstandingAmount,
     });
 
+    if (doc.amount!.isZero()) {
+      continue;
+    }
+
     payments.push(doc);
   }
 

dummy/tests/testDummy.spec.ts

@@ -8,7 +8,7 @@ import 'mocha';
 import { getTestDbPath } from 'tests/helpers';
 import { setupDummyInstance } from '..';
 
-describe.skip('dummy', function () {
+describe('dummy', function () {
   const dbPath = getTestDbPath();
 
   let fyo: Fyo;
@@ -28,7 +28,7 @@ describe.skip('dummy', function () {
 
   specify('setupDummyInstance', async function () {
     await assertDoesNotThrow(async () => {
-      await setupDummyInstance(dbPath, fyo);
+      await setupDummyInstance(dbPath, fyo, 1, 25);
     }, 'setup instance failed');
 
     for (const item in purchaseItemPartyMap) {

fyo/core/converter.ts

@@ -3,7 +3,7 @@ import { Doc } from 'fyo/model/doc';
 import { isPesa } from 'fyo/utils';
 import { ValueError } from 'fyo/utils/errors';
 import { DateTime } from 'luxon';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Field, FieldTypeEnum, RawValue, TargetField } from 'schemas/types';
 import { getIsNullOrUndef } from 'utils';
 import { DatabaseHandler } from './dbHandler';

fyo/core/types.ts

@@ -1,5 +1,5 @@
 import { Doc } from 'fyo/model/doc';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { RawValue } from 'schemas/types';
 import { AuthDemuxBase } from 'utils/auth/types';
 import { DatabaseDemuxBase } from 'utils/db/types';

fyo/model/doc.ts

@@ -5,7 +5,7 @@ import { Verb } from 'fyo/telemetry/types';
 import { DEFAULT_USER } from 'fyo/utils/consts';
 import { ConflictError, MandatoryError, NotFoundError } from 'fyo/utils/errors';
 import Observable from 'fyo/utils/observable';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import {
   Field,
   FieldTypeEnum,

fyo/model/helpers.ts

@@ -2,7 +2,7 @@ import { Fyo } from 'fyo';
 import { DocValue } from 'fyo/core/types';
 import { isPesa } from 'fyo/utils';
 import { isEqual } from 'lodash';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
 import { getIsNullOrUndef } from 'utils';
 import { Doc } from './doc';

fyo/utils/format.ts

@@ -2,7 +2,7 @@ import { Fyo } from 'fyo';
 import { DocValue } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import { DateTime } from 'luxon';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
 import { getIsNullOrUndef } from 'utils';
 import {

fyo/utils/index.ts

@@ -1,7 +1,7 @@
 import { Fyo } from 'fyo';
 import { Doc } from 'fyo/model/doc';
 import { Action } from 'fyo/model/types';
-import { pesa } from 'pesa';
+import { Money } from 'pesa';
 import { Field, OptionField, SelectOption } from 'schemas/types';
 import { getIsNullOrUndef } from 'utils';
 
@@ -37,7 +37,7 @@ export function getDuplicates(array: unknown[]) {
 }
 
 export function isPesa(value: unknown): boolean {
-  return value instanceof pesa().constructor;
+  return value instanceof Money;
 }
 
 export function getActions(doc: Doc): Action[] {

models/Transactional/LedgerPosting.ts

@@ -3,7 +3,7 @@ import { ValidationError } from 'fyo/utils/errors';
 import { Account } from 'models/baseModels/Account/Account';
 import { AccountingLedgerEntry } from 'models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry';
 import { ModelNameEnum } from 'models/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Transactional } from './Transactional';
 import { AccountBalanceChange, TransactionType } from './types';
 

models/Transactional/types.ts

@@ -1,5 +1,5 @@
 import { Doc } from 'fyo/model/doc';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 
 export interface LedgerPostingOptions {
   reference: Doc;

models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts

@@ -1,7 +1,7 @@
 import { Doc } from 'fyo/model/doc';
 import { ListViewSettings } from 'fyo/model/types';
 import { ModelNameEnum } from 'models/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 
 export class AccountingLedgerEntry extends Doc {
   date?: string | Date;

models/baseModels/Invoice/Invoice.ts

@@ -4,7 +4,7 @@ import { DefaultMap, FiltersMap, FormulaMap } from 'fyo/model/types';
 import { getExchangeRate } from 'models/helpers';
 import { Transactional } from 'models/Transactional/Transactional';
 import { ModelNameEnum } from 'models/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { getIsNullOrUndef } from 'utils';
 import { Party } from '../Party/Party';
 import { Payment } from '../Payment/Payment';

models/baseModels/InvoiceItem/InvoiceItem.ts

@@ -2,7 +2,7 @@ import { DocValue } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import { FiltersMap, FormulaMap, ValidationMap } from 'fyo/model/types';
 import { ValidationError } from 'fyo/utils/errors';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Invoice } from '../Invoice/Invoice';
 
 export abstract class InvoiceItem extends Doc {

models/baseModels/Item/Item.ts

@@ -9,7 +9,7 @@ import {
   ValidationMap,
 } from 'fyo/model/types';
 import { ValidationError } from 'fyo/utils/errors';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { AccountRootTypeEnum, AccountTypeEnum } from '../Account/types';
 
 export class Item extends Doc {

models/baseModels/JournalEntry/JournalEntry.ts

@@ -4,12 +4,12 @@ import {
   Action,
   DefaultMap,
   FiltersMap,
-  ListViewSettings
+  ListViewSettings,
 } from 'fyo/model/types';
 import { DateTime } from 'luxon';
 import { getLedgerLinkAction } from 'models/helpers';
 import { Transactional } from 'models/Transactional/Transactional';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { LedgerPosting } from '../../Transactional/LedgerPosting';
 
 export class JournalEntry extends Transactional {

models/baseModels/JournalEntryAccount/JournalEntryAccount.ts

@@ -1,6 +1,6 @@
 import { Doc } from 'fyo/model/doc';
 import { FiltersMap, FormulaMap } from 'fyo/model/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 
 export class JournalEntryAccount extends Doc {
   getAutoDebitCredit(type: 'debit' | 'credit') {

models/baseModels/Party/Party.ts

@@ -11,7 +11,7 @@ import {
   validateEmail,
   validatePhoneNumber,
 } from 'fyo/model/validationFunction';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { PartyRole } from './types';
 
 export class Party extends Doc {

models/baseModels/Payment/Payment.ts

@@ -17,7 +17,7 @@ import { getLedgerLinkAction } from 'models/helpers';
 import { LedgerPosting } from 'models/Transactional/LedgerPosting';
 import { Transactional } from 'models/Transactional/Transactional';
 import { ModelNameEnum } from 'models/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Invoice } from '../Invoice/Invoice';
 import { Party } from '../Party/Party';
 import { PaymentFor } from '../PaymentFor/PaymentFor';

models/baseModels/PaymentFor/PaymentFor.ts

@@ -1,7 +1,7 @@
 import { Doc } from 'fyo/model/doc';
 import { FiltersMap, FormulaMap } from 'fyo/model/types';
 import { ModelNameEnum } from 'models/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { PartyRoleEnum } from '../Party/types';
 import { Payment } from '../Payment/Payment';
 

models/baseModels/TaxSummary/TaxSummary.ts

@@ -1,6 +1,6 @@
 import { Doc } from 'fyo/model/doc';
 import { FormulaMap } from 'fyo/model/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 
 export class TaxSummary extends Doc {
   account?: string;

models/helpers.ts

@@ -3,7 +3,7 @@ import { Doc } from 'fyo/model/doc';
 import { Action, ColumnConfig } from 'fyo/model/types';
 import { NotFoundError } from 'fyo/utils/errors';
 import { DateTime } from 'luxon';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Router } from 'vue-router';
 import {
   AccountRootType,

package.json

@@ -29,7 +29,7 @@
     "lodash": "^4.17.21",
     "luxon": "^2.0.2",
     "node-fetch": "2",
-    "pesa": "^1.1.11",
+    "pesa": "^1.1.12",
     "vue": "^3.2.30",
     "vue-router": "^4.0.12"
   },

src/utils/index.ts

@@ -5,7 +5,7 @@ import { t } from 'fyo';
 import { Doc } from 'fyo/model/doc';
 import { isPesa } from 'fyo/utils';
 import { DuplicateEntryError, LinkValidationError } from 'fyo/utils/errors';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
 
 export function stringifyCircular(

yarn.lock

@@ -9403,10 +9403,10 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-pesa@^1.1.11:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/pesa/-/pesa-1.1.11.tgz#85829e5aa11ea3e44d7c9ea4b500e4d6def6dc5f"
-  integrity sha512-eyl0lpdUIV0dNXVeTMnhBJj6u9GRIYwP+vFdUN+767Fv3PNQHPHAkCQJqDseGfEF75lhe23ZnfbA/uMidlq5/Q==
+pesa@^1.1.12:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/pesa/-/pesa-1.1.12.tgz#905132abf9e1aa33eaf68cdea61c07ea2284d12d"
+  integrity sha512-OnbJne4T1vRXbBbvnRy3NZVI1hVmcDBsBZ2GcQk3KydbONuDUE7R3xB604bnXTgt44h2ujcVBJvMU9I7ObqBRQ==
 
 pg-connection-string@2.5.0:
   version "2.5.0"