From dab9243d237aa40c18deb661c1e42c9403cb96ad Mon Sep 17 00:00:00 2001
From: PhilReact <philliplangmartinez@gmail.com>
Date: Sat, 12 Apr 2025 10:30:43 +0300
Subject: [PATCH] fix global types

---
 package-lock.json                             |  4 +-
 package.json                                  |  7 ++-
 src/common/Spinners/BarSpinner/BarSpinner.tsx |  7 ++-
 src/{global.d.ts => global.ts}                | 50 +------------------
 src/index.ts                                  |  2 +
 tsconfig.json                                 |  2 +-
 tsup.config.ts                                |  2 +-
 7 files changed, 17 insertions(+), 57 deletions(-)
 rename src/{global.d.ts => global.ts} (81%)

diff --git a/package-lock.json b/package-lock.json
index ec5d187..c0562d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "qapp-core",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "qapp-core",
-      "version": "1.0.18",
+      "version": "1.0.19",
       "license": "MIT",
       "dependencies": {
         "@tanstack/react-virtual": "^3.13.2",
diff --git a/package.json b/package.json
index f10a9f0..04c4ffc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "qapp-core",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "Qortal's core React library with global state, UI components, and utilities",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -11,15 +11,14 @@
       "require": "./dist/index.js"
     },
     "./global": {
-      "types": "./dist/src/global.d.ts"
+      "types": "./dist/global.d.ts"
     }
   },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup && npm run copy-types",
-    "copy-types": "cpy src/global.d.ts dist",
+    "build": "tsup",
     "prepare": "npm run build",
     "clean": "rm -rf dist"
   },
diff --git a/src/common/Spinners/BarSpinner/BarSpinner.tsx b/src/common/Spinners/BarSpinner/BarSpinner.tsx
index a51a512..5c3019d 100644
--- a/src/common/Spinners/BarSpinner/BarSpinner.tsx
+++ b/src/common/Spinners/BarSpinner/BarSpinner.tsx
@@ -1,6 +1,11 @@
 import React from 'react'
 import './barSpinner.css'
-export const BarSpinner = ({width = '20px', color}) => {
+
+interface PropsBarSpinner {
+  width: string
+  color?: string
+}
+export const BarSpinner = ({width = '20px', color}: PropsBarSpinner) => {
   return (
     <div style={{
         width,
diff --git a/src/global.d.ts b/src/global.ts
similarity index 81%
rename from src/global.d.ts
rename to src/global.ts
index 8bc6a50..ee9023c 100644
--- a/src/global.d.ts
+++ b/src/global.ts
@@ -1,56 +1,8 @@
 import { AddForeignServerQortalRequest, AddListItemsQortalRequest, BuyNameQortalRequest, CancelSellNameQortalRequest, CancelTradeSellOrderQortalRequest, CreatePollQortalRequest, CreateTradeBuyOrderQortalRequest, CreateTradeSellOrderQortalRequest, DecryptDataQortalRequest, DecryptDataWithSharingKeyQortalRequest, DecryptQortalGroupDataQortalRequest, DeleteHostedDataQortalRequest, DeleteListItemQortalRequest, EncryptDataQortalRequest, EncryptDataWithSharingKeyQortalRequest, EncryptQortalGroupDataQortalRequest, FetchQdnResourceQortalRequest, GetAccountDataQortalRequest, GetAccountNamesQortalRequest, GetBalanceQortalRequest, GetCrosschainServerInfoQortalRequest, GetDaySummaryQortalRequest, GetForeignFeeQortalRequest, GetHostedDataQortalRequest, GetListItemsQortalRequest, GetNameDataQortalRequest, GetPriceQortalRequest, GetQdnResourceMetadataQortalRequest, GetQdnResourcePropertiesQortalRequest, GetQdnResourceStatusQortalRequest, GetQdnResourceUrlQortalRequest, GetServerConnectionHistoryQortalRequest, GetTxActivitySummaryQortalRequest, GetUserAccountQortalRequest, GetUserWalletInfoQortalRequest, GetUserWalletQortalRequest, GetWalletBalanceQortalRequest, LinkToQdnResourceQortalRequest, ListQdnResourcesQortalRequest, PublishMultipleQdnResourcesQortalRequest, PublishQdnResourceQortalRequest, RegisterNameQortalRequest, RemoveForeignServerQortalRequest, SearchNamesQortalRequest, SearchQdnResourcesQortalRequest, SellNameQortalRequest, SendCoinQortalRequest, SetCurrentForeignServerQortalRequest, UpdateForeignFeeQortalRequest, UpdateNameQortalRequest, VoteOnPollQortalRequest, SendChatMessageQortalRequest, SearchChatMessagesQortalRequest, JoinGroupQortalRequest, AddGroupAdminQortalRequest, UpdateGroupQortalRequest, ListGroupsQortalRequest, CreateGroupQortalRequest, RemoveGroupAdminQortalRequest, BanFromGroupQortalRequest, CancelGroupBanQortalRequest, KickFromGroupQortalRequest, InviteToGroupQortalRequest, CancelGroupInviteQortalRequest, LeaveGroupQortalRequest, DeployAtQortalRequest, GetAtQortalRequest, GetAtDataQortalRequest, ListAtsQortalRequest, FetchBlockQortalRequest, FetchBlockRangeQortalRequest, SearchTransactionsQortalRequest, IsUsingPublicNodeQortalRequest, AdminActionQortalRequest, OpenNewTabQortalRequest, ShowActionsQortalRequest, SignTransactionQortalRequest, CreateAndCopyEmbedLinkQortalRequest,  } from "./types/qortalRequests/interfaces"
 
-export {} // mark this file as a module
 
 declare global {
 
-  // interface QortalRequestOptions {
-  //   action: string
-  //   name?: string
-  //   service?: string
-  //   data64?: string
-  //   title?: string
-  //   description?: string
-  //   category?: string
-  //   tags?: string[]
-  //   identifier?: string
-  //   address?: string
-  //   metaData?: string
-  //   encoding?: string
-  //   includeMetadata?: boolean
-  //   limit?: number
-  //   offset?: number
-  //   reverse?: boolean
-  //   resources?: any[]
-  //   filename?: string
-  //   list_name?: string
-  //   item?: string
-  //   items?: string[]
-  //   tag1?: string
-  //   tag2?: string
-  //   tag3?: string
-  //   tag4?: string
-  //   tag5?: string
-  //   coin?: string
-  //   destinationAddress?: string
-  //   amount?: number
-  //   blob?: Blob
-  //   mimeType?: string
-  //   file?: File
-  //   encryptedData?: string
-  //   prefix?: boolean
-  //   exactMatchNames?: boolean
-  //   base64?: string
-  //   groupId?: number | string
-  //   isAdmins?: boolean
-  //   payments?: any[]
-  //   assetId?: number
-  //   publicKeys?: string[]
-  //   recipient?: string
-  //   before?: number | null
-  //   qortalLink?: string
-  // }
-
   type QortalRequestOptions =
   SendCoinQortalRequest | 
   GetCrosschainServerInfoQortalRequest | 
@@ -143,3 +95,5 @@ declare global {
     _qdnTheme: string
   }
 }
+
+export const __keepGlobalModule = true;
\ No newline at end of file
diff --git a/src/index.ts b/src/index.ts
index e8383a1..0720ffd 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,3 +1,5 @@
+/// <reference path="./global.ts" />
+
 export { useResourceStatus } from './hooks/useResourceStatus';
 export { Spacer } from './common/Spacer';
 import './index.css'
diff --git a/tsconfig.json b/tsconfig.json
index 2f39ae3..abbcb06 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,6 +10,6 @@
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true
   },
-    "include": ["src", "src/global.d.ts"]
+    "include": ["src"]
   }
   
\ No newline at end of file
diff --git a/tsup.config.ts b/tsup.config.ts
index 4368e14..6df2718 100644
--- a/tsup.config.ts
+++ b/tsup.config.ts
@@ -1,7 +1,7 @@
 import { defineConfig } from 'tsup';
 
 export default defineConfig({
-  entry: ['src/index.ts'],
+  entry: ['src/index.ts', 'src/global.ts'],
   format: ['esm', 'cjs'],
   dts: true,
   external: [