From cf63395b6d90d8aff901c3c2dde935f90af23538 Mon Sep 17 00:00:00 2001
From: Sam Mckenzie <25828757+samjmck@users.noreply.github.com>
Date: Wed, 13 Nov 2024 18:45:00 +0100
Subject: [PATCH] Use local library codebase if it exists

---
 .gitignore                                                 | 2 ++
 package.json                                               | 6 ++++++
 src/App.svelte                                             | 4 ++--
 src/components/BrokerAdapter.svelte                        | 6 +++---
 src/components/Brokers.svelte                              | 2 +-
 src/components/modal/PaymentInfo.svelte                    | 4 ++--
 src/components/modal/PromptFailedSecurityFetches.svelte    | 4 ++--
 src/components/modal/PromptFilterBrokerTransactions.svelte | 4 ++--
 src/components/modal/PromptMergeTransactions.svelte        | 4 ++--
 src/overrides.ts                                           | 6 +++---
 src/pdf-worker.js                                          | 4 ++--
 src/stores.ts                                              | 2 +-
 src/tests.ts                                               | 4 ++--
 13 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index f2dee0b..9484560 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 node_modules
 src/registered_funds.ts
 .netlify
+lib/
+tobcalc-lib/
diff --git a/package.json b/package.json
index 407451d..9b4abbd 100644
--- a/package.json
+++ b/package.json
@@ -20,5 +20,11 @@
   },
   "dependencies": {
     "@samjmck/tobcalc-lib": "npm:@jsr/samjmck__tobcalc-lib@^1.0.10"
+  },
+  "imports": {
+    "#lib": [
+      "./tobcalc-lib/lib/esm/export",
+      "@samjmck/tobcalc-lib"
+    ]
   }
 }
diff --git a/src/App.svelte b/src/App.svelte
index ea24f88..357045a 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -6,9 +6,9 @@
 		setECBUrlStart,
 		setJustETFUrlStart,
 		setYahooFinanceQuery1UrlStart,
-	} from "@samjmck/tobcalc-lib";
+	} from "#lib";
 	import { runTests } from "./tests";
-	import type { TaxFormData, fillPdf, FormRow } from "@samjmck/tobcalc-lib";
+	import type { TaxFormData, fillPdf, FormRow } from "#lib";
 	import PdfDownload from "./components/PdfDownload.svelte";
 	import Brokers from "./components/Brokers.svelte";
 	import PaymentInfo from "./components/modal/PaymentInfo.svelte";
diff --git a/src/components/BrokerAdapter.svelte b/src/components/BrokerAdapter.svelte
index 4811473..6bdf9c4 100644
--- a/src/components/BrokerAdapter.svelte
+++ b/src/components/BrokerAdapter.svelte
@@ -6,8 +6,8 @@
         FormRow,
         Security,
         TaxableTransaction
-    } from "@samjmck/tobcalc-lib";
-    import { formatMoney, isNameRegistered, SecurityType, getTaxableTransactions, getTaxFormData } from "@samjmck/tobcalc-lib";
+    } from "#lib";
+    import { formatMoney, isNameRegistered, SecurityType, getTaxableTransactions, getTaxFormData } from "#lib";
     import { Broker } from "../broker";
     import { getSecuritiesMapWithOverrides, getTaxRateWithOverrides } from "../overrides";
     import { formatPercentage } from "../format";
@@ -187,4 +187,4 @@
         overflow: hidden;
     }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/Brokers.svelte b/src/components/Brokers.svelte
index afde5f4..0fc816e 100644
--- a/src/components/Brokers.svelte
+++ b/src/components/Brokers.svelte
@@ -4,7 +4,7 @@
         DEGIROAdapter,
         Trading212Adapter,
         BoursoramaAdapter
-	} from "@samjmck/tobcalc-lib";
+	} from "#lib";
     import { adapterNumber, totalTaxFormData } from "../stores";
     import BrokerAdapter from "./BrokerAdapter.svelte";
     import { Broker, brokers } from "../broker";
diff --git a/src/components/modal/PaymentInfo.svelte b/src/components/modal/PaymentInfo.svelte
index df73c24..ffbfcc1 100644
--- a/src/components/modal/PaymentInfo.svelte
+++ b/src/components/modal/PaymentInfo.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { openPaymentInfo, nationalRegistrationNumber, lastSession } from "../../stores";
-    import { formatMoney } from "@samjmck/tobcalc-lib";
+    import { formatMoney } from "#lib";
     import QrCode from "../ui/QrCode.svelte";
     import Modal from "./Modal.svelte";
     import Input from "../ui/Input.svelte";
@@ -100,4 +100,4 @@
         display: flex;
         flex-direction: column;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/modal/PromptFailedSecurityFetches.svelte b/src/components/modal/PromptFailedSecurityFetches.svelte
index 9d4524c..b15022a 100644
--- a/src/components/modal/PromptFailedSecurityFetches.svelte
+++ b/src/components/modal/PromptFailedSecurityFetches.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import type { Security } from "@samjmck/tobcalc-lib";
-    import { SecurityType } from "@samjmck/tobcalc-lib";
+    import type { Security } from "#lib";
+    import { SecurityType } from "#lib";
     import Modal from "./Modal.svelte";
     import Table from "../ui/Table.svelte";
     import Button from "../ui/Button.svelte";
diff --git a/src/components/modal/PromptFilterBrokerTransactions.svelte b/src/components/modal/PromptFilterBrokerTransactions.svelte
index 7446b8a..11f970c 100644
--- a/src/components/modal/PromptFilterBrokerTransactions.svelte
+++ b/src/components/modal/PromptFilterBrokerTransactions.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import type { BrokerTransaction } from "@samjmck/tobcalc-lib";
-    import { formatMoney } from "@samjmck/tobcalc-lib";
+    import type { BrokerTransaction } from "#lib";
+    import { formatMoney } from "#lib";
     import { formatDate } from "../../format";
     import { alwaysOpenFilterDialog } from "../../stores";
     import Modal from "./Modal.svelte";
diff --git a/src/components/modal/PromptMergeTransactions.svelte b/src/components/modal/PromptMergeTransactions.svelte
index d2ca984..074ba43 100644
--- a/src/components/modal/PromptMergeTransactions.svelte
+++ b/src/components/modal/PromptMergeTransactions.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import type { BrokerTransaction } from "@samjmck/tobcalc-lib";
-    import { formatMoney } from "@samjmck/tobcalc-lib";
+    import type { BrokerTransaction } from "#lib";
+    import { formatMoney } from "#lib";
     import { formatDate } from "../../format";
     import Modal from "./Modal.svelte";
     import Table from "../ui/Table.svelte";
diff --git a/src/overrides.ts b/src/overrides.ts
index a661397..e6b665c 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -1,5 +1,5 @@
-import type { Security, TaxableTransaction, TaxRateFunction } from "@samjmck/tobcalc-lib";
-import { getDefaultTaxRate, getSecurity, SecurityType } from "@samjmck/tobcalc-lib";
+import type { Security, TaxableTransaction, TaxRateFunction } from "#lib";
+import { getDefaultTaxRate, getSecurity, SecurityType } from "#lib";
 
 export const taxRates = [
     0.0012,
@@ -55,4 +55,4 @@ export async function getSecuritiesMapWithOverrides(
     const failedSecuritiesMap = await getFailedIsinsSecurities(failedIsins);
 
     return new Map([...securitiesMap, ...failedSecuritiesMap]);
-}
\ No newline at end of file
+}
diff --git a/src/pdf-worker.js b/src/pdf-worker.js
index 168ab04..c592505 100644
--- a/src/pdf-worker.js
+++ b/src/pdf-worker.js
@@ -1,3 +1,3 @@
-import { workerMessageEventListener } from "@samjmck/tobcalc-lib";
+import { workerMessageEventListener } from "#lib";
 
-self.onmessage = workerMessageEventListener;
\ No newline at end of file
+self.onmessage = workerMessageEventListener;
diff --git a/src/stores.ts b/src/stores.ts
index 0e4bab9..1cbe72c 100644
--- a/src/stores.ts
+++ b/src/stores.ts
@@ -1,5 +1,5 @@
 import { type Writable, writable } from "svelte/store";
-import type { TaxFormData } from "@samjmck/tobcalc-lib";
+import type { TaxFormData } from "#lib";
 
 export interface SessionInfo {
     lang: string;
diff --git a/src/tests.ts b/src/tests.ts
index 88320bd..a32112d 100644
--- a/src/tests.ts
+++ b/src/tests.ts
@@ -1,5 +1,5 @@
-import { CurrencyCode, getCurrencyExchangeRatesMap, getSecurity, SecurityType } from "@samjmck/tobcalc-lib";
-import type { ETF } from "@samjmck/tobcalc-lib";
+import { CurrencyCode, getCurrencyExchangeRatesMap, getSecurity, SecurityType } from "#lib";
+import type { ETF } from "#lib";
 
 // TODO: use informative error instead of string?
 export async function runTests(): Promise<string | null> {