From 18b0cea78cb2810cf3fc79584310234c54f0126d Mon Sep 17 00:00:00 2001 From: Rob Colbert Date: Sun, 2 Feb 2025 23:36:32 -0500 Subject: [PATCH] fixing some circular dependencies --- src/lib/core/component-registry.ts | 12 +++++------- src/lib/core/log-transport-console.ts | 4 +++- src/lib/core/service.ts | 4 +++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/lib/core/component-registry.ts b/src/lib/core/component-registry.ts index ce6d49d..39cb725 100644 --- a/src/lib/core/component-registry.ts +++ b/src/lib/core/component-registry.ts @@ -10,13 +10,11 @@ import path from "node:path"; import mongoose from "mongoose"; -import { - DtpBase, - DtpPlatform, - DtpService, - WebServer, - WebController, -} from "../dtplib.js"; +import { DtpBase } from "./base.js"; +import { DtpPlatform } from "./platform.js"; +import { DtpService } from "./service.js"; +import { WebServer } from "../web/server.js"; +import { WebController } from "../web/controller.js"; type ModelRegistry = Record; type ServiceRegistry = Record; diff --git a/src/lib/core/log-transport-console.ts b/src/lib/core/log-transport-console.ts index b8ccb43..f2c712f 100644 --- a/src/lib/core/log-transport-console.ts +++ b/src/lib/core/log-transport-console.ts @@ -7,7 +7,9 @@ import * as util from "node:util"; import dayjs from "dayjs"; import color from "ansicolor"; -import { DtpLogLevel, DtpLogTransport, DtpComponent } from "../dtplib.js"; +import { DtpLogLevel } from "./log.js"; +import { DtpLogTransport } from "./log-transport.js"; +import { DtpComponent } from "./component.js"; export class DtpLogTransportConsole implements DtpLogTransport { async writeLog( diff --git a/src/lib/core/service.ts b/src/lib/core/service.ts index 7ec51d4..7d4db47 100644 --- a/src/lib/core/service.ts +++ b/src/lib/core/service.ts @@ -2,7 +2,9 @@ // Copyright (C) 2025 DTP Technologies, LLC // All Rights Reserved -import { DtpPlatform, DtpBase, DtpComponent } from "../dtplib.js"; +import { DtpPlatform } from "./platform.js"; +import { DtpBase } from "./base.js"; +import { DtpComponent } from "./component.js"; export type DtpServiceUpdate = { $set?: Record;