From c8fd66fa9bbb2c48d72c55dd3d6412c1f3146f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Fri, 14 Nov 2025 14:34:27 +0800 Subject: [PATCH] Refactor imports to use package names instead of aliases Replaced all path alias imports (e.g., '@/napcat-core') with direct package imports (e.g., 'napcat-core/index') across napcat-common, napcat-core, and napcat-webui-backend. This improves compatibility with tooling and workspace resolution, and aligns with standard TypeScript/Node.js import practices. --- packages/napcat-common/src/event.ts | 4 ++-- packages/napcat-common/src/file-uuid.ts | 2 +- packages/napcat-common/src/forward-msg-builder.ts | 2 +- packages/napcat-common/src/helper.ts | 2 +- packages/napcat-common/src/message-unique.ts | 2 +- packages/napcat-core/apis/friend.ts | 4 ++-- packages/napcat-core/index.ts | 2 +- packages/napcat-core/listeners/NodeIKernelMsgListener.ts | 2 +- packages/napcat-core/package.json | 1 + packages/napcat-core/packet/context/operationContext.ts | 2 +- packages/napcat-core/packet/context/packetContext.ts | 2 +- packages/napcat-core/packet/message/element.ts | 2 +- packages/napcat-core/packet/message/message.ts | 2 +- packages/napcat-core/services/NodeIKernelProfileService.ts | 2 +- packages/napcat-webui-backend/src/types/data.d.ts | 4 ++-- 15 files changed, 18 insertions(+), 17 deletions(-) diff --git a/packages/napcat-common/src/event.ts b/packages/napcat-common/src/event.ts index 31482547..22ba5246 100644 --- a/packages/napcat-common/src/event.ts +++ b/packages/napcat-common/src/event.ts @@ -1,6 +1,6 @@ -import { NodeIQQNTWrapperSession } from '@/napcat-core/wrapper'; +import { NodeIQQNTWrapperSession } from 'napcat-core/wrapper'; import { randomUUID } from 'crypto'; -import { ListenerNamingMapping, ServiceNamingMapping } from '@/napcat-core'; +import { ListenerNamingMapping, ServiceNamingMapping } from 'napcat-core/index'; interface InternalMapKey { timeout: number; diff --git a/packages/napcat-common/src/file-uuid.ts b/packages/napcat-common/src/file-uuid.ts index be7817d4..0d301594 100644 --- a/packages/napcat-common/src/file-uuid.ts +++ b/packages/napcat-common/src/file-uuid.ts @@ -1,4 +1,4 @@ -import { Peer } from '@/napcat-core'; +import { Peer } from 'napcat-core/index'; import { randomUUID } from 'crypto'; class TimeBasedCache { diff --git a/packages/napcat-common/src/forward-msg-builder.ts b/packages/napcat-common/src/forward-msg-builder.ts index 9d5ced1d..e7048af4 100644 --- a/packages/napcat-common/src/forward-msg-builder.ts +++ b/packages/napcat-common/src/forward-msg-builder.ts @@ -1,5 +1,5 @@ import * as crypto from 'node:crypto'; -import { PacketMsg } from '@/napcat-core/packet/message/message'; +import { PacketMsg } from 'napcat-core/packet/message/message'; interface ForwardMsgJson { app: string diff --git a/packages/napcat-common/src/helper.ts b/packages/napcat-common/src/helper.ts index fd11685c..38bd0c92 100644 --- a/packages/napcat-common/src/helper.ts +++ b/packages/napcat-common/src/helper.ts @@ -1,7 +1,7 @@ import path from 'node:path'; import fs from 'fs'; import os from 'node:os'; -import { QQLevel } from '@/napcat-core'; +import { QQLevel } from 'napcat-core/index'; import { QQVersionConfigType } from './types'; export async function solveProblem any> (func: T, ...args: Parameters): Promise | undefined> { diff --git a/packages/napcat-common/src/message-unique.ts b/packages/napcat-common/src/message-unique.ts index 8fd588e7..0351d90f 100644 --- a/packages/napcat-common/src/message-unique.ts +++ b/packages/napcat-common/src/message-unique.ts @@ -1,4 +1,4 @@ -import { Peer } from '@/napcat-core'; +import { Peer } from 'napcat-core/index'; import crypto from 'crypto'; export class LimitedHashTable { diff --git a/packages/napcat-core/apis/friend.ts b/packages/napcat-core/apis/friend.ts index 22d4df96..44a53538 100644 --- a/packages/napcat-core/apis/friend.ts +++ b/packages/napcat-core/apis/friend.ts @@ -1,5 +1,5 @@ -import { FriendRequest, FriendV2 } from '@/napcat-core/types'; -import { BuddyListReqType, InstanceContext, NapCatCore } from '@/napcat-core/index'; +import { FriendRequest, FriendV2 } from 'napcat-core/types'; +import { BuddyListReqType, InstanceContext, NapCatCore } from 'napcat-core/index'; import { LimitedHashTable } from 'napcat-common/src/message-unique'; export class NTQQFriendApi { diff --git a/packages/napcat-core/index.ts b/packages/napcat-core/index.ts index 17aacce8..16709417 100644 --- a/packages/napcat-core/index.ts +++ b/packages/napcat-core/index.ts @@ -6,7 +6,7 @@ import { NTQQSystemApi, NTQQUserApi, NTQQWebApi, -} from '@/napcat-core/apis'; +} from 'napcat-core/apis'; import { NTQQCollectionApi } from '@/napcat-core/apis/collection'; import { NodeIQQNTWrapperSession, diff --git a/packages/napcat-core/listeners/NodeIKernelMsgListener.ts b/packages/napcat-core/listeners/NodeIKernelMsgListener.ts index a4ce224c..d2f1682c 100644 --- a/packages/napcat-core/listeners/NodeIKernelMsgListener.ts +++ b/packages/napcat-core/listeners/NodeIKernelMsgListener.ts @@ -1,5 +1,5 @@ import { ChatType, KickedOffLineInfo, RawMessage } from '@/napcat-core/types'; -import { CommonFileInfo } from '@/napcat-core'; +import { CommonFileInfo } from 'napcat-core/index'; export interface OnRichMediaDownloadCompleteParams { fileModelId: string, diff --git a/packages/napcat-core/package.json b/packages/napcat-core/package.json index b9bca327..09599cc7 100644 --- a/packages/napcat-core/package.json +++ b/packages/napcat-core/package.json @@ -19,6 +19,7 @@ "@sinclair/typebox": "^0.34.38", "file-type": "^21.0.0", "napcat-image-size": "workspace:*", + "napcat-core": "workspace:*", "napcat-common": "workspace:*", "napcat-onebot": "workspace:*" }, diff --git a/packages/napcat-core/packet/context/operationContext.ts b/packages/napcat-core/packet/context/operationContext.ts index f6f669d4..d6357008 100644 --- a/packages/napcat-core/packet/context/operationContext.ts +++ b/packages/napcat-core/packet/context/operationContext.ts @@ -9,7 +9,7 @@ import { PacketMsgReplyElement, PacketMsgVideoElement, } from '@/napcat-core/packet/message/element'; -import { ChatType, MsgSourceType, NTMsgType, RawMessage } from '@/napcat-core'; +import { ChatType, MsgSourceType, NTMsgType, RawMessage } from 'napcat-core/index'; import { MiniAppRawData, MiniAppReqParams } from '@/napcat-core/packet/entities/miniApp'; import { AIVoiceChatType } from '@/napcat-core/packet/entities/aiChat'; import { NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core'; diff --git a/packages/napcat-core/packet/context/packetContext.ts b/packages/napcat-core/packet/context/packetContext.ts index 1208d4fb..f224fa7c 100644 --- a/packages/napcat-core/packet/context/packetContext.ts +++ b/packages/napcat-core/packet/context/packetContext.ts @@ -1,5 +1,5 @@ import { PacketHighwayContext } from '@/napcat-core/packet/highway/highwayContext'; -import { NapCatCore } from '@/napcat-core'; +import { NapCatCore } from 'napcat-core/index'; import { PacketLogger } from '@/napcat-core/packet/context/loggerContext'; import { NapCoreContext } from '@/napcat-core/packet/context/napCoreContext'; import { PacketClientContext } from '@/napcat-core/packet/context/clientContext'; diff --git a/packages/napcat-core/packet/message/element.ts b/packages/napcat-core/packet/message/element.ts index dca6607a..32decabf 100644 --- a/packages/napcat-core/packet/message/element.ts +++ b/packages/napcat-core/packet/message/element.ts @@ -32,7 +32,7 @@ import { SendTextElement, SendVideoElement, Peer, -} from '@/napcat-core'; +} from 'napcat-core/index'; import { ForwardMsgBuilder } from 'napcat-common/src/forward-msg-builder'; import { PacketMsg, PacketSendMsgElement } from '@/napcat-core/packet/message/message'; diff --git a/packages/napcat-core/packet/message/message.ts b/packages/napcat-core/packet/message/message.ts index 03bc9cfa..4970d2a1 100644 --- a/packages/napcat-core/packet/message/message.ts +++ b/packages/napcat-core/packet/message/message.ts @@ -1,5 +1,5 @@ import { IPacketMsgElement } from '@/napcat-core/packet/message/element'; -import { SendMessageElement, SendMultiForwardMsgElement } from '@/napcat-core'; +import { SendMessageElement, SendMultiForwardMsgElement } from 'napcat-core/index'; export type PacketSendMsgElement = SendMessageElement | SendMultiForwardMsgElement; diff --git a/packages/napcat-core/services/NodeIKernelProfileService.ts b/packages/napcat-core/services/NodeIKernelProfileService.ts index dab3e342..bc650791 100644 --- a/packages/napcat-core/services/NodeIKernelProfileService.ts +++ b/packages/napcat-core/services/NodeIKernelProfileService.ts @@ -1,5 +1,5 @@ import { AnyCnameRecord } from 'node:dns'; -import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, ProfileBizType, SimpleInfo, UserDetailInfoByUin, UserDetailInfoListenerArg, UserDetailSource } from '@/napcat-core'; +import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, ProfileBizType, SimpleInfo, UserDetailInfoByUin, UserDetailInfoListenerArg, UserDetailSource } from 'napcat-core/index'; import { GeneralCallResult } from '@/napcat-core/services/common'; export interface NodeIKernelProfileService { diff --git a/packages/napcat-webui-backend/src/types/data.d.ts b/packages/napcat-webui-backend/src/types/data.d.ts index eb404f83..11ea67a8 100644 --- a/packages/napcat-webui-backend/src/types/data.d.ts +++ b/packages/napcat-webui-backend/src/types/data.d.ts @@ -1,5 +1,5 @@ -import type { LoginListItem, SelfInfo } from '@/napcat-core'; -import type { OneBotConfig } from '@/napcat-onebot/config/config'; +import type { LoginListItem, SelfInfo } from 'napcat-core'; +import type { OneBotConfig } from 'napcat-onebot/config/config'; interface LoginRuntimeType { LoginCurrentTime: number;