From 401a86eeeb9b9551a194141f9e30bdb51670160c Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 23 May 2022 11:00:54 +0530
Subject: [PATCH] chore: bump pesa - fix isPesa impl

---
 backend/database/tests/testCore.spec.ts                   | 2 +-
 dummy/index.ts                                            | 4 ++++
 dummy/tests/testDummy.spec.ts                             | 4 ++--
 fyo/core/converter.ts                                     | 2 +-
 fyo/core/types.ts                                         | 2 +-
 fyo/model/doc.ts                                          | 2 +-
 fyo/model/helpers.ts                                      | 2 +-
 fyo/utils/format.ts                                       | 2 +-
 fyo/utils/index.ts                                        | 4 ++--
 models/Transactional/LedgerPosting.ts                     | 2 +-
 models/Transactional/types.ts                             | 2 +-
 .../AccountingLedgerEntry/AccountingLedgerEntry.ts        | 2 +-
 models/baseModels/Invoice/Invoice.ts                      | 2 +-
 models/baseModels/InvoiceItem/InvoiceItem.ts              | 2 +-
 models/baseModels/Item/Item.ts                            | 2 +-
 models/baseModels/JournalEntry/JournalEntry.ts            | 4 ++--
 .../baseModels/JournalEntryAccount/JournalEntryAccount.ts | 2 +-
 models/baseModels/Party/Party.ts                          | 2 +-
 models/baseModels/Payment/Payment.ts                      | 2 +-
 models/baseModels/PaymentFor/PaymentFor.ts                | 2 +-
 models/baseModels/TaxSummary/TaxSummary.ts                | 2 +-
 models/helpers.ts                                         | 2 +-
 package.json                                              | 2 +-
 src/utils/index.ts                                        | 2 +-
 yarn.lock                                                 | 8 ++++----
 25 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/backend/database/tests/testCore.spec.ts b/backend/database/tests/testCore.spec.ts
index 59f9443a..248a1a46 100644
--- a/backend/database/tests/testCore.spec.ts
+++ b/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}`
         );
diff --git a/dummy/index.ts b/dummy/index.ts
index 7eff9882..17077a67 100644
--- a/dummy/index.ts
+++ b/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);
   }
 
diff --git a/dummy/tests/testDummy.spec.ts b/dummy/tests/testDummy.spec.ts
index 4a1f37e3..a756b223 100644
--- a/dummy/tests/testDummy.spec.ts
+++ b/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) {
diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index b56ba09b..03c2ed58 100644
--- a/fyo/core/converter.ts
+++ b/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';
diff --git a/fyo/core/types.ts b/fyo/core/types.ts
index 98d11fc6..6afa05fa 100644
--- a/fyo/core/types.ts
+++ b/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';
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 3dd9db93..2269a618 100644
--- a/fyo/model/doc.ts
+++ b/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,
diff --git a/fyo/model/helpers.ts b/fyo/model/helpers.ts
index be8f8271..927a8c93 100644
--- a/fyo/model/helpers.ts
+++ b/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';
diff --git a/fyo/utils/format.ts b/fyo/utils/format.ts
index edf49ae4..6abd0f47 100644
--- a/fyo/utils/format.ts
+++ b/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 {
diff --git a/fyo/utils/index.ts b/fyo/utils/index.ts
index f2be03c0..647960e7 100644
--- a/fyo/utils/index.ts
+++ b/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[] {
diff --git a/models/Transactional/LedgerPosting.ts b/models/Transactional/LedgerPosting.ts
index dfd34d00..904a906c 100644
--- a/models/Transactional/LedgerPosting.ts
+++ b/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';
 
diff --git a/models/Transactional/types.ts b/models/Transactional/types.ts
index dc58ee8b..721cf5a3 100644
--- a/models/Transactional/types.ts
+++ b/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;
diff --git a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
index 91318f94..e556e95a 100644
--- a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
+++ b/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;
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 650f50a6..7103db78 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/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';
diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts
index 6025f9ae..0ce0d2a9 100644
--- a/models/baseModels/InvoiceItem/InvoiceItem.ts
+++ b/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 {
diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts
index a7f07549..7ad8a6d1 100644
--- a/models/baseModels/Item/Item.ts
+++ b/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 {
diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
index d53f8c57..1aeedf34 100644
--- a/models/baseModels/JournalEntry/JournalEntry.ts
+++ b/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 {
diff --git a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
index af762e95..55945e21 100644
--- a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
+++ b/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') {
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index 88591cc7..6dbeafca 100644
--- a/models/baseModels/Party/Party.ts
+++ b/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 {
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index 2bceac5d..00f847c7 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/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';
diff --git a/models/baseModels/PaymentFor/PaymentFor.ts b/models/baseModels/PaymentFor/PaymentFor.ts
index 9aeedcd1..52aec1e6 100644
--- a/models/baseModels/PaymentFor/PaymentFor.ts
+++ b/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';
 
diff --git a/models/baseModels/TaxSummary/TaxSummary.ts b/models/baseModels/TaxSummary/TaxSummary.ts
index 9a751362..7ca232ba 100644
--- a/models/baseModels/TaxSummary/TaxSummary.ts
+++ b/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;
diff --git a/models/helpers.ts b/models/helpers.ts
index 8e9d6577..7485b0cb 100644
--- a/models/helpers.ts
+++ b/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,
diff --git a/package.json b/package.json
index 4627ae76..eec613da 100644
--- a/package.json
+++ b/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"
   },
diff --git a/src/utils/index.ts b/src/utils/index.ts
index cae8c404..af6d3bd9 100644
--- a/src/utils/index.ts
+++ b/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(
diff --git a/yarn.lock b/yarn.lock
index 1665d47b..7fa31303 100644
--- a/yarn.lock
+++ b/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"