From 99151a6a5d49f86696bae5a8d7406faee3b45dc2 Mon Sep 17 00:00:00 2001
From: Ben Allfree <ben@benallfree.com>
Date: Wed, 5 Jun 2024 23:00:58 -0700
Subject: [PATCH] chore(common,pockethost): refactor mergeConfig to common

---
 packages/common/src/Logger.ts                            | 2 +-
 packages/common/src/index.ts                             | 1 +
 .../{pockethost/src/util => common/src}/mergeConfig.ts   | 0
 packages/pockethost/src/services/FtpService/index.ts     | 9 +++++++--
 .../src/services/InstanceLoggerService/index.ts          | 3 ++-
 .../src/services/MothershipAdminClientService/index.ts   | 2 +-
 packages/pockethost/src/services/PortService.ts          | 4 ++--
 packages/pockethost/src/util/index.ts                    | 1 -
 8 files changed, 14 insertions(+), 8 deletions(-)
 rename packages/{pockethost/src/util => common/src}/mergeConfig.ts (100%)

diff --git a/packages/common/src/Logger.ts b/packages/common/src/Logger.ts
index fc9766a0..b61ffe46 100644
--- a/packages/common/src/Logger.ts
+++ b/packages/common/src/Logger.ts
@@ -2,7 +2,7 @@
 
 import chalk from 'chalk'
 import stringify from 'json-stringify-safe'
-import { mergeConfig } from '../../pockethost/src/util/mergeConfig'
+import { mergeConfig } from './mergeConfig'
 import { mkSingleton } from './mkSingleton'
 import { PocketHostAction, action } from './plugin'
 
diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
index f259019b..96a84a37 100644
--- a/packages/common/src/index.ts
+++ b/packages/common/src/index.ts
@@ -5,6 +5,7 @@ export * from './assert'
 export * from './asyncExecutionGuard'
 export * from './events'
 export * from './ioc'
+export * from './mergeConfig'
 export * from './mkSingleton'
 export * from './newId'
 export * from './plugin'
diff --git a/packages/pockethost/src/util/mergeConfig.ts b/packages/common/src/mergeConfig.ts
similarity index 100%
rename from packages/pockethost/src/util/mergeConfig.ts
rename to packages/common/src/mergeConfig.ts
diff --git a/packages/pockethost/src/services/FtpService/index.ts b/packages/pockethost/src/services/FtpService/index.ts
index 367d6a42..483974ab 100644
--- a/packages/pockethost/src/services/FtpService/index.ts
+++ b/packages/pockethost/src/services/FtpService/index.ts
@@ -7,8 +7,13 @@ import {
   SSL_CERT,
   SSL_KEY,
 } from '$constants'
-import { exitHook, mergeConfig } from '$util'
-import { LoggerService, PocketBase, mkSingleton } from '@pockethost/common'
+import { exitHook } from '$util'
+import {
+  LoggerService,
+  PocketBase,
+  mergeConfig,
+  mkSingleton,
+} from '@pockethost/common'
 import { keys, values } from '@s-libs/micro-dash'
 import { readFileSync } from 'fs'
 import { FtpSrv } from 'ftp-srv'
diff --git a/packages/pockethost/src/services/InstanceLoggerService/index.ts b/packages/pockethost/src/services/InstanceLoggerService/index.ts
index 53228ae0..4c49532b 100644
--- a/packages/pockethost/src/services/InstanceLoggerService/index.ts
+++ b/packages/pockethost/src/services/InstanceLoggerService/index.ts
@@ -1,8 +1,9 @@
 import { mkInstanceDataPath } from '$constants'
-import { asyncExitHook, mergeConfig } from '$util'
+import { asyncExitHook } from '$util'
 import {
   LoggerService,
   createCleanupManager,
+  mergeConfig,
   stringify,
 } from '@pockethost/common'
 import * as fs from 'fs'
diff --git a/packages/pockethost/src/services/MothershipAdminClientService/index.ts b/packages/pockethost/src/services/MothershipAdminClientService/index.ts
index 6852f443..d36e18da 100644
--- a/packages/pockethost/src/services/MothershipAdminClientService/index.ts
+++ b/packages/pockethost/src/services/MothershipAdminClientService/index.ts
@@ -3,11 +3,11 @@ import {
   MOTHERSHIP_ADMIN_USERNAME,
   MOTHERSHIP_URL,
 } from '$constants'
-import { mergeConfig } from '$util'
 import {
   Logger,
   LoggerService,
   PocketBase,
+  mergeConfig,
   mkSingleton,
 } from '@pockethost/common'
 import { createAdminPbClient } from './createAdminPbClient'
diff --git a/packages/pockethost/src/services/PortService.ts b/packages/pockethost/src/services/PortService.ts
index 845ef15f..7a227342 100644
--- a/packages/pockethost/src/services/PortService.ts
+++ b/packages/pockethost/src/services/PortService.ts
@@ -1,6 +1,6 @@
 import { INITIAL_PORT_POOL_SIZE } from '$constants'
-import { mergeConfig, PromiseAllocator } from '$util'
-import { mkSingleton } from '@pockethost/common'
+import { PromiseAllocator } from '$util'
+import { mergeConfig, mkSingleton } from '@pockethost/common'
 import getPort from 'get-port'
 
 export type Config = { maxPorts: number }
diff --git a/packages/pockethost/src/util/index.ts b/packages/pockethost/src/util/index.ts
index 9f7f88bf..9a0d4ad3 100644
--- a/packages/pockethost/src/util/index.ts
+++ b/packages/pockethost/src/util/index.ts
@@ -6,7 +6,6 @@ export * from './discordAlert'
 export * from './env'
 export * from './exit'
 export * from './internal'
-export * from './mergeConfig'
 export * from './now'
 export * from './process'
 export * from './smartFetch'