From fefaee74e340f3cf9bb79cd9c8009661216b749a Mon Sep 17 00:00:00 2001 From: chinlinlee Date: Fri, 29 Dec 2023 15:13:22 +0800 Subject: [PATCH] refactor: use root scope module alias instead Refactor module aliases to use the root scope instead of absolute paths Utilize root scope module aliases instead of absolute paths for better clarity and maintainability of the codebase. This change makes it easier --- .gitignore | 4 +-- .../WADO-RS/service/thumbnail.service.js | 2 +- api/WADO-URI/controller/retrieveInstance.js | 2 +- .../MWL-RS/change-filtered-mwlItem-status.js | 2 +- .../MWL-RS/change-mwlItem-status.js | 2 +- .../controller/MWL-RS/count-mwlItem.js | 2 +- .../controller/MWL-RS/create-mwlItem.js | 2 +- .../controller/MWL-RS/get-mwlItem.js | 2 +- .../controller/QIDO-RS/base.controller.js | 2 +- .../QIDO-RS/service/QIDO-RS.service.js | 12 +++---- .../UPS-RS/change-workItem-state.js | 2 +- .../controller/UPS-RS/create-workItems.js | 2 +- .../controller/UPS-RS/get-workItem.js | 2 +- .../UPS-RS/service/cancel.service.js | 2 +- .../service/change-workItem-state.service.js | 2 +- .../UPS-RS/service/create-workItem.service.js | 4 +-- .../UPS-RS/service/subscribe.service.js | 2 +- .../service/suspend-subscription.service.js | 2 +- .../UPS-RS/service/unsubscribe.service.js | 2 +- .../UPS-RS/service/update-workItem.service.js | 2 +- api/dicom-web/controller/UPS-RS/subscribe.js | 2 +- .../controller/UPS-RS/suspend-subscription.js | 2 +- .../controller/UPS-RS/unsubscribe.js | 2 +- .../controller/UPS-RS/update-workItem.js | 2 +- .../controller/WADO-RS/base.controller.js | 2 +- .../WADO-RS/bulkdata/base.controller.js | 4 +-- .../controller/WADO-RS/bulkdata/bulkdata.js | 2 +- .../controller/WADO-RS/bulkdata/instance.js | 4 +-- .../controller/WADO-RS/bulkdata/series.js | 4 +-- .../controller/WADO-RS/bulkdata/study.js | 4 +-- .../WADO-RS/deletion/base.controller.js | 2 +- .../WADO-RS/metadata/base.controller.js | 2 +- .../metadata/retrieveInstanceMetadata.js | 2 +- .../metadata/retrieveSeriesMetadata.js | 2 +- .../WADO-RS/metadata/retrieveStudyMetadata.js | 2 +- .../WADO-RS/rendered/base.controller.js | 4 +-- .../WADO-RS/rendered/instanceFrames.js | 4 +-- .../controller/WADO-RS/rendered/instances.js | 4 +-- .../controller/WADO-RS/rendered/series.js | 4 +-- .../controller/WADO-RS/rendered/study.js | 4 +-- .../WADO-RS/service/thumbnail.service.js | 2 +- .../WADO-RS/thumbnail/base.controller.js | 2 +- config/jsconfig.mongodb.json | 36 ------------------- config/jsconfig.sql.json | 36 ------------------- config/modula-alias/mongodb/package.json | 15 -------- config/modula-alias/sql/package.json | 16 --------- dimse-sql/patientQueryTask.js | 2 +- dimse-sql/seriesQueryTask.js | 2 +- dimse/c-find.js | 8 ++--- dimse/c-get.js | 2 +- dimse/c-move.js | 2 +- dimse/utils.js | 2 +- jsconfig.json | 21 +++++++++++ 53 files changed, 87 insertions(+), 171 deletions(-) delete mode 100644 config/jsconfig.mongodb.json delete mode 100644 config/jsconfig.sql.json create mode 100644 jsconfig.json diff --git a/.gitignore b/.gitignore index 9d34e050..069815de 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,4 @@ config/ae-prod.properties # ignore jscpd output report -/report - -/jsconfig.json \ No newline at end of file +/report \ No newline at end of file diff --git a/api-sql/dicom-web/controller/WADO-RS/service/thumbnail.service.js b/api-sql/dicom-web/controller/WADO-RS/service/thumbnail.service.js index 1e635bc4..10b16063 100644 --- a/api-sql/dicom-web/controller/WADO-RS/service/thumbnail.service.js +++ b/api-sql/dicom-web/controller/WADO-RS/service/thumbnail.service.js @@ -1,4 +1,4 @@ -const renderedService = require("@rendered-service"); +const renderedService = require("@api/dicom-web/controller/WADO-RS/service/rendered.service"); const _ = require("lodash"); const { ThumbnailService, diff --git a/api/WADO-URI/controller/retrieveInstance.js b/api/WADO-URI/controller/retrieveInstance.js index 4af01fba..78cc046c 100644 --- a/api/WADO-URI/controller/retrieveInstance.js +++ b/api/WADO-URI/controller/retrieveInstance.js @@ -1,4 +1,4 @@ -const { WadoUriService, NotFoundInstanceError } = require("@wado-uri-service"); +const { WadoUriService } = require("@api/WADO-URI/service/WADO-URI.service"); const { Controller } = require("../../controller.class"); const { ApiLogger } = require("../../../utils/logs/api-logger"); const { ApiErrorArrayHandler } = require("@error/api-errors.handler"); diff --git a/api/dicom-web/controller/MWL-RS/change-filtered-mwlItem-status.js b/api/dicom-web/controller/MWL-RS/change-filtered-mwlItem-status.js index 9836a99a..65cd9eda 100644 --- a/api/dicom-web/controller/MWL-RS/change-filtered-mwlItem-status.js +++ b/api/dicom-web/controller/MWL-RS/change-filtered-mwlItem-status.js @@ -1,7 +1,7 @@ const { ApiErrorArrayHandler } = require("@error/api-errors.handler"); const { Controller } = require("@root/api/controller.class"); const { ApiLogger } = require("@root/utils/logs/api-logger"); -const { ChangeFilteredMwlItemStatusService } = require("@mwl-service/change-filtered-mwlItem-status"); +const { ChangeFilteredMwlItemStatusService } = require("@api/dicom-web/controller/MWL-RS/service/change-filtered-mwlItem-status"); class ChangeFilteredMwlItemStatusController extends Controller { constructor(req, res) { diff --git a/api/dicom-web/controller/MWL-RS/change-mwlItem-status.js b/api/dicom-web/controller/MWL-RS/change-mwlItem-status.js index 5b7a04aa..f0873724 100644 --- a/api/dicom-web/controller/MWL-RS/change-mwlItem-status.js +++ b/api/dicom-web/controller/MWL-RS/change-mwlItem-status.js @@ -1,7 +1,7 @@ const { ApiErrorArrayHandler } = require("@error/api-errors.handler"); const { Controller } = require("@root/api/controller.class"); const { ApiLogger } = require("@root/utils/logs/api-logger"); -const { ChangeMwlItemStatusService } = require("@mwl-service/change-mwlItem-status"); +const { ChangeMwlItemStatusService } = require("@api/dicom-web/controller/MWL-RS/service/change-mwlItem-status"); class ChangeMwlItemStatusController extends Controller { constructor(req, res) { diff --git a/api/dicom-web/controller/MWL-RS/count-mwlItem.js b/api/dicom-web/controller/MWL-RS/count-mwlItem.js index f64debfa..ab630370 100644 --- a/api/dicom-web/controller/MWL-RS/count-mwlItem.js +++ b/api/dicom-web/controller/MWL-RS/count-mwlItem.js @@ -1,7 +1,7 @@ const { ApiErrorArrayHandler } = require("@error/api-errors.handler"); const { Controller } = require("@root/api/controller.class"); const { ApiLogger } = require("@root/utils/logs/api-logger"); -const { GetMwlItemCountService } = require("@mwl-service/count-mwlItem.service"); +const { GetMwlItemCountService } = require("@api/dicom-web/controller/MWL-RS/service/count-mwlItem.service"); class GetMwlItemCountController extends Controller { constructor(req, res) { diff --git a/api/dicom-web/controller/MWL-RS/create-mwlItem.js b/api/dicom-web/controller/MWL-RS/create-mwlItem.js index aa387248..152b3966 100644 --- a/api/dicom-web/controller/MWL-RS/create-mwlItem.js +++ b/api/dicom-web/controller/MWL-RS/create-mwlItem.js @@ -1,7 +1,7 @@ const { ApiErrorArrayHandler } = require("@error/api-errors.handler"); const { Controller } = require("@root/api/controller.class"); const { ApiLogger } = require("@root/utils/logs/api-logger"); -const { CreateMwlItemService } = require("@mwl-service/create-mwlitem.service"); +const { CreateMwlItemService } = require("@api/dicom-web/controller/MWL-RS/service/create-mwlitem.service"); class CreateMwlItemController extends Controller { constructor(req, res) { diff --git a/api/dicom-web/controller/MWL-RS/get-mwlItem.js b/api/dicom-web/controller/MWL-RS/get-mwlItem.js index b3065fec..4e78a132 100644 --- a/api/dicom-web/controller/MWL-RS/get-mwlItem.js +++ b/api/dicom-web/controller/MWL-RS/get-mwlItem.js @@ -1,7 +1,7 @@ const { ApiErrorArrayHandler } = require("@error/api-errors.handler"); const { Controller } = require("@root/api/controller.class"); const { ApiLogger } = require("@root/utils/logs/api-logger"); -const { GetMwlItemService } = require("@mwl-service/get-mwlItem.service"); +const { GetMwlItemService } = require("@api/dicom-web/controller/MWL-RS/service/get-mwlItem.service"); class GetMwlItemController extends Controller { constructor(req, res) { diff --git a/api/dicom-web/controller/QIDO-RS/base.controller.js b/api/dicom-web/controller/QIDO-RS/base.controller.js index ce69d448..f26448ba 100644 --- a/api/dicom-web/controller/QIDO-RS/base.controller.js +++ b/api/dicom-web/controller/QIDO-RS/base.controller.js @@ -1,6 +1,6 @@ const { Controller } = require("@root/api/controller.class"); const { ApiLogger } = require("@root/utils/logs/api-logger"); -const { QidoRsService } = require("@qido-rs-service"); +const { QidoRsService } = require("@api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service"); const { ApiErrorArrayHandler } = require("@error/api-errors.handler"); class BaseQueryController extends Controller { diff --git a/api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js b/api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js index 2d269133..ca6d14da 100644 --- a/api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js +++ b/api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js @@ -1,14 +1,14 @@ const _ = require("lodash"); -const { dictionary } = require("../../../../../models/DICOM/dicom-tags-dic"); const { DicomWebService } = require("../../../service/dicom-web.service"); -const { - DicomWebServiceError, - DicomWebStatusCodes -} = require("@error/dicom-web-service"); const { AuditManager } = require("@models/DICOM/audit/auditManager"); const { EventType } = require("@models/DICOM/audit/eventType"); const { EventOutcomeIndicator } = require("@models/DICOM/audit/auditUtils"); -const { QueryPatientDicomJsonFactory, QueryStudyDicomJsonFactory, QuerySeriesDicomJsonFactory, QueryInstanceDicomJsonFactory } = require("@query-dicom-json-factory"); +const { + QueryPatientDicomJsonFactory, + QueryStudyDicomJsonFactory, + QuerySeriesDicomJsonFactory, + QueryInstanceDicomJsonFactory +} = require("@api/dicom-web/controller/QIDO-RS/service/query-dicom-json-factory"); const { convertAllQueryToDicomTag } = require("@root/api/dicom-web/service/base-query.service"); const HierarchyQueryDicomJsonFactory = Object.freeze({ diff --git a/api/dicom-web/controller/UPS-RS/change-workItem-state.js b/api/dicom-web/controller/UPS-RS/change-workItem-state.js index ce353d7f..ab2a3faa 100644 --- a/api/dicom-web/controller/UPS-RS/change-workItem-state.js +++ b/api/dicom-web/controller/UPS-RS/change-workItem-state.js @@ -1,6 +1,6 @@ const { ChangeWorkItemStateService -} = require("@ups-service/change-workItem-state.service"); +} = require("@api/dicom-web/controller/UPS-RS/service/change-workItem-state.service"); const { ApiLogger } = require("../../../../utils/logs/api-logger"); const { Controller } = require("../../../controller.class"); const { DicomWebServiceError } = require("@error/dicom-web-service"); diff --git a/api/dicom-web/controller/UPS-RS/create-workItems.js b/api/dicom-web/controller/UPS-RS/create-workItems.js index 78269bcd..3cbf429b 100644 --- a/api/dicom-web/controller/UPS-RS/create-workItems.js +++ b/api/dicom-web/controller/UPS-RS/create-workItems.js @@ -1,7 +1,7 @@ const _ = require("lodash"); const { CreateWorkItemService -} = require("@ups-service/create-workItem.service"); +} = require("@api/dicom-web/controller/UPS-RS/service/create-workItem.service"); const { ApiLogger } = require("../../../../utils/logs/api-logger"); const { Controller } = require("../../../controller.class"); const { DicomWebServiceError } = require("@error/dicom-web-service"); diff --git a/api/dicom-web/controller/UPS-RS/get-workItem.js b/api/dicom-web/controller/UPS-RS/get-workItem.js index 133e0c6f..bf87c0ee 100644 --- a/api/dicom-web/controller/UPS-RS/get-workItem.js +++ b/api/dicom-web/controller/UPS-RS/get-workItem.js @@ -1,7 +1,7 @@ const _ = require("lodash"); const { GetWorkItemService -} = require("@ups-service/get-workItem.service"); +} = require("@api/dicom-web/controller/UPS-RS/service/get-workItem.service"); const { ApiLogger } = require("../../../../utils/logs/api-logger"); const { Controller } = require("../../../controller.class"); const { ApiErrorArrayHandler } = require("@error/api-errors.handler"); diff --git a/api/dicom-web/controller/UPS-RS/service/cancel.service.js b/api/dicom-web/controller/UPS-RS/service/cancel.service.js index d5384075..42a82729 100644 --- a/api/dicom-web/controller/UPS-RS/service/cancel.service.js +++ b/api/dicom-web/controller/UPS-RS/service/cancel.service.js @@ -4,7 +4,7 @@ const { DicomWebServiceError, DicomWebStatusCodes } = require("@error/dicom-web-service"); -const { BaseWorkItemService } = require("@ups-service/base-workItem.service"); +const { BaseWorkItemService } = require("@api/dicom-web/controller/UPS-RS/service/base-workItem.service"); const { dictionary } = require("@models/DICOM/dicom-tags-dic"); const { UPS_EVENT_TYPE } = require("./workItem-event"); const { raccoonConfig } = require("@root/config-class"); diff --git a/api/dicom-web/controller/UPS-RS/service/change-workItem-state.service.js b/api/dicom-web/controller/UPS-RS/service/change-workItem-state.service.js index f3536065..3ded0248 100644 --- a/api/dicom-web/controller/UPS-RS/service/change-workItem-state.service.js +++ b/api/dicom-web/controller/UPS-RS/service/change-workItem-state.service.js @@ -7,7 +7,7 @@ const { DicomWebServiceError, DicomWebStatusCodes } = require("@error/dicom-web-service"); -const { BaseWorkItemService } = require("@ups-service/base-workItem.service"); +const { BaseWorkItemService } = require("@api/dicom-web/controller/UPS-RS/service/base-workItem.service"); const { UPS_EVENT_TYPE } = require("./workItem-event"); class ChangeWorkItemStateService extends BaseWorkItemService { diff --git a/api/dicom-web/controller/UPS-RS/service/create-workItem.service.js b/api/dicom-web/controller/UPS-RS/service/create-workItem.service.js index 9553539c..0a8a18f7 100644 --- a/api/dicom-web/controller/UPS-RS/service/create-workItem.service.js +++ b/api/dicom-web/controller/UPS-RS/service/create-workItem.service.js @@ -7,8 +7,8 @@ const { DicomWebStatusCodes } = require("@error/dicom-web-service"); const { DicomJsonModel } = require("@dicom-json-model"); -const { BaseWorkItemService } = require("@ups-service/base-workItem.service"); -const { SubscribeService } = require("@ups-service/subscribe.service"); +const { BaseWorkItemService } = require("@api/dicom-web/controller/UPS-RS/service/base-workItem.service"); +const { SubscribeService } = require("@api/dicom-web/controller/UPS-RS/service/subscribe.service"); const { UPS_EVENT_TYPE } = require("./workItem-event"); const { dictionary } = require("@models/DICOM/dicom-tags-dic"); diff --git a/api/dicom-web/controller/UPS-RS/service/subscribe.service.js b/api/dicom-web/controller/UPS-RS/service/subscribe.service.js index 41195066..d0d7f0eb 100644 --- a/api/dicom-web/controller/UPS-RS/service/subscribe.service.js +++ b/api/dicom-web/controller/UPS-RS/service/subscribe.service.js @@ -9,7 +9,7 @@ const { DicomWebStatusCodes } = require("@error/dicom-web-service"); const { SUBSCRIPTION_STATE, SUBSCRIPTION_FIXED_UIDS } = require("@models/DICOM/ups"); -const { BaseWorkItemService } = require("@ups-service/base-workItem.service"); +const { BaseWorkItemService } = require("@api/dicom-web/controller/UPS-RS/service/base-workItem.service"); const { UPS_EVENT_TYPE } = require("./workItem-event"); const { convertAllQueryToDicomTag } = require("@root/api/dicom-web/service/base-query.service"); diff --git a/api/dicom-web/controller/UPS-RS/service/suspend-subscription.service.js b/api/dicom-web/controller/UPS-RS/service/suspend-subscription.service.js index e2bf8e60..f47e5c0c 100644 --- a/api/dicom-web/controller/UPS-RS/service/suspend-subscription.service.js +++ b/api/dicom-web/controller/UPS-RS/service/suspend-subscription.service.js @@ -4,7 +4,7 @@ const { DicomWebServiceError, DicomWebStatusCodes } = require("@error/dicom-web-service"); -const { BaseWorkItemService } = require("@ups-service/base-workItem.service"); +const { BaseWorkItemService } = require("@api/dicom-web/controller/UPS-RS/service/base-workItem.service"); class SuspendSubscribeService extends BaseWorkItemService { diff --git a/api/dicom-web/controller/UPS-RS/service/unsubscribe.service.js b/api/dicom-web/controller/UPS-RS/service/unsubscribe.service.js index c48ca2c2..655ab405 100644 --- a/api/dicom-web/controller/UPS-RS/service/unsubscribe.service.js +++ b/api/dicom-web/controller/UPS-RS/service/unsubscribe.service.js @@ -9,7 +9,7 @@ const { DicomWebStatusCodes } = require("@error/dicom-web-service"); const { SUBSCRIPTION_STATE, SUBSCRIPTION_FIXED_UIDS } = require("@models/DICOM/ups"); -const { BaseWorkItemService } = require("@ups-service/base-workItem.service"); +const { BaseWorkItemService } = require("@api/dicom-web/controller/UPS-RS/service/base-workItem.service"); class UnSubscribeService extends BaseWorkItemService { diff --git a/api/dicom-web/controller/UPS-RS/service/update-workItem.service.js b/api/dicom-web/controller/UPS-RS/service/update-workItem.service.js index e028d3b2..2b3f1c6f 100644 --- a/api/dicom-web/controller/UPS-RS/service/update-workItem.service.js +++ b/api/dicom-web/controller/UPS-RS/service/update-workItem.service.js @@ -7,7 +7,7 @@ const { DicomWebStatusCodes } = require("@error/dicom-web-service"); const { DicomJsonModel } = require("@dicom-json-model"); -const { BaseWorkItemService } = require("@ups-service/base-workItem.service"); +const { BaseWorkItemService } = require("@api/dicom-web/controller/UPS-RS/service/base-workItem.service"); const { dictionary } = require("@models/DICOM/dicom-tags-dic"); const { UPS_EVENT_TYPE } = require("./workItem-event"); diff --git a/api/dicom-web/controller/UPS-RS/subscribe.js b/api/dicom-web/controller/UPS-RS/subscribe.js index eaef8621..f1a11e13 100644 --- a/api/dicom-web/controller/UPS-RS/subscribe.js +++ b/api/dicom-web/controller/UPS-RS/subscribe.js @@ -1,6 +1,6 @@ const { SubscribeService -} = require("@ups-service/subscribe.service"); +} = require("@api/dicom-web/controller/UPS-RS/service/subscribe.service"); const { ApiLogger } = require("../../../../utils/logs/api-logger"); const { Controller } = require("../../../controller.class"); const { DicomWebServiceError } = require("@error/dicom-web-service"); diff --git a/api/dicom-web/controller/UPS-RS/suspend-subscription.js b/api/dicom-web/controller/UPS-RS/suspend-subscription.js index a3128cdf..4e0dc215 100644 --- a/api/dicom-web/controller/UPS-RS/suspend-subscription.js +++ b/api/dicom-web/controller/UPS-RS/suspend-subscription.js @@ -6,7 +6,7 @@ const { SuspendSubscribeService -} = require("@ups-service/suspend-subscription.service"); +} = require("@api/dicom-web/controller/UPS-RS/service/suspend-subscription.service"); const { ApiLogger } = require("../../../../utils/logs/api-logger"); const { Controller } = require("../../../controller.class"); const { DicomWebServiceError } = require("@error/dicom-web-service"); diff --git a/api/dicom-web/controller/UPS-RS/unsubscribe.js b/api/dicom-web/controller/UPS-RS/unsubscribe.js index f6316372..5d455821 100644 --- a/api/dicom-web/controller/UPS-RS/unsubscribe.js +++ b/api/dicom-web/controller/UPS-RS/unsubscribe.js @@ -1,6 +1,6 @@ const { UnSubscribeService -} = require("@ups-service/unsubscribe.service"); +} = require("@api/dicom-web/controller/UPS-RS/service/unsubscribe.service"); const { ApiLogger } = require("../../../../utils/logs/api-logger"); const { Controller } = require("../../../controller.class"); const { DicomWebServiceError } = require("@error/dicom-web-service"); diff --git a/api/dicom-web/controller/UPS-RS/update-workItem.js b/api/dicom-web/controller/UPS-RS/update-workItem.js index 267ccfbb..ac5d955a 100644 --- a/api/dicom-web/controller/UPS-RS/update-workItem.js +++ b/api/dicom-web/controller/UPS-RS/update-workItem.js @@ -1,6 +1,6 @@ const { UpdateWorkItemService -} = require("@ups-service/update-workItem.service"); +} = require("@api/dicom-web/controller/UPS-RS/service/update-workItem.service"); const { ApiLogger } = require("../../../../utils/logs/api-logger"); const { Controller } = require("../../../controller.class"); const { DicomWebServiceError } = require("@error/dicom-web-service"); diff --git a/api/dicom-web/controller/WADO-RS/base.controller.js b/api/dicom-web/controller/WADO-RS/base.controller.js index 0cb72f13..bc4c30be 100644 --- a/api/dicom-web/controller/WADO-RS/base.controller.js +++ b/api/dicom-web/controller/WADO-RS/base.controller.js @@ -11,7 +11,7 @@ const { InstanceImagePathFactory, multipartContentTypeWriter, StudyImagePathFactory, - SeriesImagePathFactory } = require("@wado-rs-service"); + SeriesImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); const { ApiErrorArrayHandler } = require("@error/api-errors.handler"); class BaseRetrieveController extends Controller { diff --git a/api/dicom-web/controller/WADO-RS/bulkdata/base.controller.js b/api/dicom-web/controller/WADO-RS/bulkdata/base.controller.js index 3d1e56d1..8403f66d 100644 --- a/api/dicom-web/controller/WADO-RS/bulkdata/base.controller.js +++ b/api/dicom-web/controller/WADO-RS/bulkdata/base.controller.js @@ -1,7 +1,7 @@ const { Controller } = require("@root/api/controller.class"); -const { StudyBulkDataFactory, BulkDataService } = require("@bulkdata-service"); +const { StudyBulkDataFactory, BulkDataService } = require("@api/dicom-web/controller/WADO-RS/bulkdata/service/bulkdata"); const { ApiLogger } = require("@root/utils/logs/api-logger"); -const { StudyImagePathFactory } = require("@wado-rs-service"); +const { StudyImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); const { ApiErrorArrayHandler } = require("@error/api-errors.handler"); class BaseBulkDataController extends Controller { diff --git a/api/dicom-web/controller/WADO-RS/bulkdata/bulkdata.js b/api/dicom-web/controller/WADO-RS/bulkdata/bulkdata.js index 7da20b55..85da4720 100644 --- a/api/dicom-web/controller/WADO-RS/bulkdata/bulkdata.js +++ b/api/dicom-web/controller/WADO-RS/bulkdata/bulkdata.js @@ -1,4 +1,4 @@ -const { SpecificBulkDataFactory } = require("@bulkdata-service"); +const { SpecificBulkDataFactory } = require("@api/dicom-web/controller/WADO-RS/bulkdata/service/bulkdata"); const { BaseBulkDataController } = require("./base.controller"); class BulkDataController extends BaseBulkDataController { diff --git a/api/dicom-web/controller/WADO-RS/bulkdata/instance.js b/api/dicom-web/controller/WADO-RS/bulkdata/instance.js index eaa5e16a..44b76c81 100644 --- a/api/dicom-web/controller/WADO-RS/bulkdata/instance.js +++ b/api/dicom-web/controller/WADO-RS/bulkdata/instance.js @@ -1,6 +1,6 @@ -const { InstanceBulkDataFactory } = require("@bulkdata-service"); +const { InstanceBulkDataFactory } = require("@api/dicom-web/controller/WADO-RS/bulkdata/service/bulkdata"); const { BaseBulkDataController } = require("./base.controller"); -const { InstanceImagePathFactory } = require("@wado-rs-service"); +const { InstanceImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); class InstanceBulkDataController extends BaseBulkDataController { constructor(req, res) { diff --git a/api/dicom-web/controller/WADO-RS/bulkdata/series.js b/api/dicom-web/controller/WADO-RS/bulkdata/series.js index e66164be..e1a253a7 100644 --- a/api/dicom-web/controller/WADO-RS/bulkdata/series.js +++ b/api/dicom-web/controller/WADO-RS/bulkdata/series.js @@ -1,6 +1,6 @@ -const { SeriesBulkDataFactory } = require("@bulkdata-service"); +const { SeriesBulkDataFactory } = require("@api/dicom-web/controller/WADO-RS/bulkdata/service/bulkdata"); const { BaseBulkDataController } = require("./base.controller"); -const { SeriesImagePathFactory } = require("@wado-rs-service"); +const { SeriesImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); class SeriesBulkDataController extends BaseBulkDataController { constructor(req, res) { diff --git a/api/dicom-web/controller/WADO-RS/bulkdata/study.js b/api/dicom-web/controller/WADO-RS/bulkdata/study.js index 01f00204..82c5b15d 100644 --- a/api/dicom-web/controller/WADO-RS/bulkdata/study.js +++ b/api/dicom-web/controller/WADO-RS/bulkdata/study.js @@ -1,6 +1,6 @@ -const { StudyBulkDataFactory } = require("@bulkdata-service"); +const { StudyBulkDataFactory } = require("@api/dicom-web/controller/WADO-RS/bulkdata/service/bulkdata"); const { BaseBulkDataController } = require("./base.controller"); -const { StudyImagePathFactory } = require("@wado-rs-service"); +const { StudyImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); class StudyBulkDataController extends BaseBulkDataController { constructor(req, res) { diff --git a/api/dicom-web/controller/WADO-RS/deletion/base.controller.js b/api/dicom-web/controller/WADO-RS/deletion/base.controller.js index 6243a569..e6f96059 100644 --- a/api/dicom-web/controller/WADO-RS/deletion/base.controller.js +++ b/api/dicom-web/controller/WADO-RS/deletion/base.controller.js @@ -1,6 +1,6 @@ const { Controller } = require("@root/api/controller.class"); const { ApiLogger } = require("@root/utils/logs/api-logger"); -const { DeleteService } = require("@delete-service"); +const { DeleteService } = require("@api/dicom-web/controller/WADO-RS/deletion/service/delete"); const { ApiErrorArrayHandler } = require("@error/api-errors.handler"); class BaseDeleteController extends Controller { diff --git a/api/dicom-web/controller/WADO-RS/metadata/base.controller.js b/api/dicom-web/controller/WADO-RS/metadata/base.controller.js index c5cf7f9f..5a53c00e 100644 --- a/api/dicom-web/controller/WADO-RS/metadata/base.controller.js +++ b/api/dicom-web/controller/WADO-RS/metadata/base.controller.js @@ -1,6 +1,6 @@ const { Controller } = require("@root/api/controller.class"); const { ApiLogger } = require("@root/utils/logs/api-logger"); -const { StudyImagePathFactory } = require("@wado-rs-service"); +const { StudyImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); const { MetadataService } = require("../service/metadata.service"); const { ApiErrorArrayHandler } = require("@error/api-errors.handler"); diff --git a/api/dicom-web/controller/WADO-RS/metadata/retrieveInstanceMetadata.js b/api/dicom-web/controller/WADO-RS/metadata/retrieveInstanceMetadata.js index 61f0b21e..23c94544 100644 --- a/api/dicom-web/controller/WADO-RS/metadata/retrieveInstanceMetadata.js +++ b/api/dicom-web/controller/WADO-RS/metadata/retrieveInstanceMetadata.js @@ -1,5 +1,5 @@ const { BaseRetrieveMetadataController } = require("./base.controller"); -const { InstanceImagePathFactory } = require("@wado-rs-service"); +const { InstanceImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); class RetrieveInstanceMetadataController extends BaseRetrieveMetadataController { constructor(req, res) { diff --git a/api/dicom-web/controller/WADO-RS/metadata/retrieveSeriesMetadata.js b/api/dicom-web/controller/WADO-RS/metadata/retrieveSeriesMetadata.js index b44a26c5..d04393ad 100644 --- a/api/dicom-web/controller/WADO-RS/metadata/retrieveSeriesMetadata.js +++ b/api/dicom-web/controller/WADO-RS/metadata/retrieveSeriesMetadata.js @@ -1,5 +1,5 @@ const { BaseRetrieveMetadataController } = require("./base.controller"); -const { SeriesImagePathFactory } = require("@wado-rs-service"); +const { SeriesImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); class RetrieveSeriesMetadataController extends BaseRetrieveMetadataController { constructor(req, res) { diff --git a/api/dicom-web/controller/WADO-RS/metadata/retrieveStudyMetadata.js b/api/dicom-web/controller/WADO-RS/metadata/retrieveStudyMetadata.js index d8658ec9..416f5c91 100644 --- a/api/dicom-web/controller/WADO-RS/metadata/retrieveStudyMetadata.js +++ b/api/dicom-web/controller/WADO-RS/metadata/retrieveStudyMetadata.js @@ -1,4 +1,4 @@ -const { StudyImagePathFactory } = require("@wado-rs-service"); +const { StudyImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); const { BaseRetrieveMetadataController } = require("./base.controller"); class RetrieveStudyMetadataController extends BaseRetrieveMetadataController { diff --git a/api/dicom-web/controller/WADO-RS/rendered/base.controller.js b/api/dicom-web/controller/WADO-RS/rendered/base.controller.js index 71f9e6af..34d26913 100644 --- a/api/dicom-web/controller/WADO-RS/rendered/base.controller.js +++ b/api/dicom-web/controller/WADO-RS/rendered/base.controller.js @@ -1,8 +1,8 @@ const _ = require("lodash"); -const renderedService = require("@rendered-service"); +const renderedService = require("@api/dicom-web/controller/WADO-RS/service/rendered.service"); const { StudyImagePathFactory -} = require("@wado-rs-service"); +} = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); const errorResponse = require("@root/utils/errorResponse/errorResponseMessage"); const { ApiLogger } = require("@root/utils/logs/api-logger"); const { Controller } = require("../../../../controller.class"); diff --git a/api/dicom-web/controller/WADO-RS/rendered/instanceFrames.js b/api/dicom-web/controller/WADO-RS/rendered/instanceFrames.js index eee25b09..07a3fa4d 100644 --- a/api/dicom-web/controller/WADO-RS/rendered/instanceFrames.js +++ b/api/dicom-web/controller/WADO-RS/rendered/instanceFrames.js @@ -1,7 +1,7 @@ const _ = require("lodash"); -const { InstanceImagePathFactory } = require("@wado-rs-service"); +const { InstanceImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); const { BaseRetrieveRenderedController } = require("./base.controller"); -const { InstanceFramesListWriter } = require("@rendered-service"); +const { InstanceFramesListWriter } = require("@api/dicom-web/controller/WADO-RS/service/rendered.service"); class RetrieveRenderedInstanceFramesController extends BaseRetrieveRenderedController { constructor(req, res) { diff --git a/api/dicom-web/controller/WADO-RS/rendered/instances.js b/api/dicom-web/controller/WADO-RS/rendered/instances.js index 46324f05..c9c48250 100644 --- a/api/dicom-web/controller/WADO-RS/rendered/instances.js +++ b/api/dicom-web/controller/WADO-RS/rendered/instances.js @@ -1,5 +1,5 @@ -const { InstanceImagePathFactory } = require("@wado-rs-service"); -const { InstanceFramesWriter } = require("@rendered-service"); +const { InstanceImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); +const { InstanceFramesWriter } = require("@api/dicom-web/controller/WADO-RS/service/rendered.service"); const { BaseRetrieveRenderedController } = require("./base.controller"); class RetrieveRenderedInstancesController extends BaseRetrieveRenderedController { diff --git a/api/dicom-web/controller/WADO-RS/rendered/series.js b/api/dicom-web/controller/WADO-RS/rendered/series.js index 92a1e1d2..02620c13 100644 --- a/api/dicom-web/controller/WADO-RS/rendered/series.js +++ b/api/dicom-web/controller/WADO-RS/rendered/series.js @@ -1,5 +1,5 @@ -const { SeriesImagePathFactory } = require("@wado-rs-service"); -const { SeriesFramesWriter } = require("@rendered-service"); +const { SeriesImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); +const { SeriesFramesWriter } = require("@api/dicom-web/controller/WADO-RS/service/rendered.service"); const { BaseRetrieveRenderedController } = require("./base.controller"); class RetrieveRenderedSeriesController extends BaseRetrieveRenderedController { diff --git a/api/dicom-web/controller/WADO-RS/rendered/study.js b/api/dicom-web/controller/WADO-RS/rendered/study.js index 84bc6f36..f5fffafa 100644 --- a/api/dicom-web/controller/WADO-RS/rendered/study.js +++ b/api/dicom-web/controller/WADO-RS/rendered/study.js @@ -1,5 +1,5 @@ -const { StudyImagePathFactory } = require("@wado-rs-service"); -const { StudyFramesWriter } = require("@rendered-service"); +const { StudyImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); +const { StudyFramesWriter } = require("@api/dicom-web/controller/WADO-RS/service/rendered.service"); const { BaseRetrieveRenderedController } = require("./base.controller"); class RetrieveRenderedStudyController extends BaseRetrieveRenderedController { diff --git a/api/dicom-web/controller/WADO-RS/service/thumbnail.service.js b/api/dicom-web/controller/WADO-RS/service/thumbnail.service.js index 82937497..539f877a 100644 --- a/api/dicom-web/controller/WADO-RS/service/thumbnail.service.js +++ b/api/dicom-web/controller/WADO-RS/service/thumbnail.service.js @@ -1,6 +1,6 @@ const { InstanceModel } = require("@dbModels/instance.model"); const errorResponse = require("../../../../../utils/errorResponse/errorResponseMessage"); -const renderedService = require("@rendered-service"); +const renderedService = require("@api/dicom-web/controller/WADO-RS/service/rendered.service"); const _ = require("lodash"); const { getUidsString } = require("./WADO-RS.service"); class ThumbnailService { diff --git a/api/dicom-web/controller/WADO-RS/thumbnail/base.controller.js b/api/dicom-web/controller/WADO-RS/thumbnail/base.controller.js index e09c1fd3..c657a3ba 100644 --- a/api/dicom-web/controller/WADO-RS/thumbnail/base.controller.js +++ b/api/dicom-web/controller/WADO-RS/thumbnail/base.controller.js @@ -1,5 +1,5 @@ const { Controller } = require("@root/api/controller.class"); -const { StudyImagePathFactory } = require("@wado-rs-service"); +const { StudyImagePathFactory } = require("@api/dicom-web/controller/WADO-RS/service/WADO-RS.service"); const { ThumbnailService } = require("../service/thumbnail.service"); const { ApiLogger } = require("@root/utils/logs/api-logger"); diff --git a/config/jsconfig.mongodb.json b/config/jsconfig.mongodb.json deleted file mode 100644 index 199b4dd8..00000000 --- a/config/jsconfig.mongodb.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "compilerOptions": { - "module": "CommonJS", - "paths": { - "@dcm4che/*": ["./models/DICOM/dcm4che/wrapper/org/dcm4che3/*"], - "@java-wrapper/*": ["./models/DICOM/dcm4che/wrapper/*"], - "@models/*": ["./models/*"], - "@error/*" : ["./error/*"], - "@root/*": ["./*"], - "@chinlinlee/*": ["./models/DICOM/dcm4che/wrapper/org/github/chinlinlee/*"], - "@dbModels/*": ["./models/mongodb/models/*"], - "@dicom-json-model": ["./models/DICOM/dicom-json-model.js"], - "@query-dicom-json-factory": ["./api/dicom-web/controller/QIDO-RS/service/query-dicom-json-factory.js"], - "@stow-rs-service": ["./api/dicom-web/controller/STOW-RS/service/stow-rs.service.js"], - "@qido-rs-service": ["./api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js"], - "@wado-rs-service": ["./api/dicom-web/controller/WADO-RS/service/WADO-RS.service.js"], - "@wado-uri-service": ["./api/WADO-URI/service/WADO-URI.service.js"], - "@bulkdata-service": ["./api/dicom-web/controller/WADO-RS/bulkdata/service/bulkdata.js"], - "@delete-service": ["./api/dicom-web/controller/WADO-RS/deletion/service/delete.js"], - "@rendered-service": ["./api/dicom-web/controller/WADO-RS/service/rendered.service.js"], - "@thumbnail-service": ["./api/dicom-web/controller/WADO-RS/service/thumbnail.service.js"], - "@ups-service/*": ["./api/dicom-web/controller/UPS-RS/service/*"], - "@mwl-service/*": ["./api/dicom-web/controller/MWL-RS/service/*"], - "@dimse-query-builder": ["./dimse/queryBuilder.js"], - "@dimse-patient-query-task": ["./dimse/patientQueryTask.js"], - "@dimse-study-query-task": ["./dimse/studyQueryTask.js"], - "@dimse-series-query-task": ["./dimse/seriesQueryTask.js"], - "@dimse-instance-query-task": ["./dimse/instanceQueryTask.js"], - "@dimse-utils": ["./dimse/utils.js"], - "@api/*": ["./api/*"] - } - }, - "exclude": [ - "node_modules", "**/node_modules/*" - ] -} \ No newline at end of file diff --git a/config/jsconfig.sql.json b/config/jsconfig.sql.json deleted file mode 100644 index c4d1a146..00000000 --- a/config/jsconfig.sql.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "compilerOptions": { - "module": "CommonJS", - "paths": { - "@dcm4che/*": ["./models/DICOM/dcm4che/wrapper/org/dcm4che3/*"], - "@java-wrapper/*": ["./models/DICOM/dcm4che/wrapper/*"], - "@models/*": ["./models/*"], - "@error/*" : ["./error/*"], - "@root/*": ["./*"], - "@chinlinlee/*": ["./models/DICOM/dcm4che/wrapper/org/github/chinlinlee/*"], - "@dbModels/*": ["./models/sql/models/*"], - "@dicom-json-model": ["./models/sql/dicom-json-model.js"], - "@query-dicom-json-factory": ["./api/dicom-web/controller/QIDO-RS/service/query-dicom-json-factory.js"], - "@stow-rs-service": ["./api/dicom-web/controller/STOW-RS/service/stow-rs.service.js"], - "@qido-rs-service": ["./api-sql/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js"], - "@wado-rs-service": ["./api-sql/dicom-web/controller/WADO-RS/service/WADO-RS.service.js"], - "@wado-uri-service": ["./api-sql/WADO-URI/service/WADO-URI.service.js"], - "@bulkdata-service": ["./api-sql/dicom-web/controller/WADO-RS/bulkdata/service/bulkdata.js"], - "@delete-service": ["./api-sql/dicom-web/controller/WADO-RS/deletion/service/delete.js"], - "@rendered-service": ["./api-sql/dicom-web/controller/WADO-RS/service/rendered.service.js"], - "@thumbnail-service": ["./api-sql/dicom-web/controller/WADO-RS/service/thumbnail.service.js"], - "@ups-service/*": ["./api-sql/dicom-web/controller/UPS-RS/service/*"], - "@mwl-service/*": ["./api-sql/dicom-web/controller/MWL-RS/service/*"], - "@dimse-query-builder": ["./dimse-sql/queryBuilder.js"], - "@dimse-patient-query-task": ["./dimse-sql/patientQueryTask.js"], - "@dimse-study-query-task": ["./dimse-sql/studyQueryTask.js"], - "@dimse-series-query-task": ["./dimse-sql/seriesQueryTask.js"], - "@dimse-instance-query-task": ["./dimse-sql/instanceQueryTask.js"], - "@dimse-utils": ["./dimse-sql/utils.js"], - "@api/*": ["./api-sql/*"] - } - }, - "exclude": [ - "node_modules", "**/node_modules/*" - ] -} \ No newline at end of file diff --git a/config/modula-alias/mongodb/package.json b/config/modula-alias/mongodb/package.json index 1ccf6c60..db14a9b7 100644 --- a/config/modula-alias/mongodb/package.json +++ b/config/modula-alias/mongodb/package.json @@ -11,21 +11,6 @@ "@dicom-json-model": "../../../models/DICOM/dicom-json-model.js", "@query-dicom-json-factory": "../../../api/dicom-web/controller/QIDO-RS/service/query-dicom-json-factory.js", "@stow-rs-service": "../../../api/dicom-web/controller/STOW-RS/service/stow-rs.service.js", - "@qido-rs-service": "../../../api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js", - "@wado-rs-service": "../../../api/dicom-web/controller/WADO-RS/service/WADO-RS.service.js", - "@wado-uri-service": "../../../api/WADO-URI/service/WADO-URI.service.js", - "@bulkdata-service": "../../../api/dicom-web/controller/WADO-RS/bulkdata/service/bulkdata.js", - "@delete-service": "../../../api/dicom-web/controller/WADO-RS/deletion/service/delete.js", - "@rendered-service": "../../../api/dicom-web/controller/WADO-RS/service/rendered.service.js", - "@thumbnail-service": "../../../api/dicom-web/controller/WADO-RS/service/thumbnail.service.js", - "@ups-service": "../../../api/dicom-web/controller/UPS-RS/service", - "@mwl-service": "../../../api/dicom-web/controller/MWL-RS/service", - "@dimse-query-builder": "../../../dimse/queryBuilder.js", - "@dimse-patient-query-task": "../../../dimse/patientQueryTask.js", - "@dimse-study-query-task": "../../../dimse/studyQueryTask.js", - "@dimse-series-query-task": "../../../dimse/seriesQueryTask.js", - "@dimse-instance-query-task": "../../../dimse/instanceQueryTask.js", - "@dimse-utils": "../../../dimse/utils.js", "@dimse": "../../../dimse", "@api": "../../../api" } diff --git a/config/modula-alias/sql/package.json b/config/modula-alias/sql/package.json index cf5845c7..01621c48 100644 --- a/config/modula-alias/sql/package.json +++ b/config/modula-alias/sql/package.json @@ -9,23 +9,7 @@ "@dbModels": "../../../models/sql/models", "@dbInitializer": "../../../models/sql/initializer.js", "@dicom-json-model": "../../../models/sql/dicom-json-model.js", - "@query-dicom-json-factory": "../../../api-sql/dicom-web/controller/QIDO-RS/service/query-dicom-json-factory.js", "@stow-rs-service": "../../../api/dicom-web/controller/STOW-RS/service/stow-rs.service.js", - "@qido-rs-service": "../../../api-sql/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js", - "@wado-rs-service": "../../../api-sql/dicom-web/controller/WADO-RS/service/WADO-RS.service.js", - "@wado-uri-service": "../../../api-sql/WADO-URI/service/WADO-URI.service.js", - "@bulkdata-service": "../../../api-sql/dicom-web/controller/WADO-RS/bulkdata/service/bulkdata.js", - "@delete-service": "../../../api-sql/dicom-web/controller/WADO-RS/deletion/service/delete.js", - "@rendered-service": "../../../api-sql/dicom-web/controller/WADO-RS/service/rendered.service.js", - "@thumbnail-service": "../../../api-sql/dicom-web/controller/WADO-RS/service/thumbnail.service.js", - "@ups-service": "../../../api-sql/dicom-web/controller/UPS-RS/service", - "@mwl-service": "../../../api-sql/dicom-web/controller/MWL-RS/service", - "@dimse-query-builder": "../../../dimse-sql/queryBuilder.js", - "@dimse-patient-query-task": "../../../dimse-sql/patientQueryTask.js", - "@dimse-study-query-task": "../../../dimse-sql/studyQueryTask.js", - "@dimse-series-query-task": "../../../dimse-sql/seriesQueryTask.js", - "@dimse-instance-query-task": "../../../dimse-sql/instanceQueryTask.js", - "@dimse-utils": "../../../dimse-sql/utils.js", "@dimse": "../../../dimse-sql", "@api": "../../../api-sql" } diff --git a/dimse-sql/patientQueryTask.js b/dimse-sql/patientQueryTask.js index 42e4145b..4c0b2fe6 100644 --- a/dimse-sql/patientQueryTask.js +++ b/dimse-sql/patientQueryTask.js @@ -1,6 +1,6 @@ const _ = require("lodash"); const { createPatientQueryTaskInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/PatientQueryTaskInject"); -const { DimseQueryBuilder } = require("@dimse-query-builder"); +const { DimseQueryBuilder } = require("@dimse/queryBuilder"); const { PatientQueryBuilder } = require("@root/api-sql/dicom-web/controller/QIDO-RS/service/patientQueryBuilder"); const { PatientModel } = require("@models/sql/models/patient.model"); const { JsPatientQueryTask } = require("../dimse/patientQueryTask"); diff --git a/dimse-sql/seriesQueryTask.js b/dimse-sql/seriesQueryTask.js index bcdcf38d..7cc46e5c 100644 --- a/dimse-sql/seriesQueryTask.js +++ b/dimse-sql/seriesQueryTask.js @@ -1,7 +1,7 @@ const _ = require("lodash"); const { createQueryTaskInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/QueryTaskInject"); -const { DimseQueryBuilder } = require("@dimse-query-builder"); +const { DimseQueryBuilder } = require("@dimse/queryBuilder"); const { JsStudyQueryTask } = require("./studyQueryTask"); const { SeriesQueryTask } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/SeriesQueryTask"); const { Attributes } = require("@dcm4che/data/Attributes"); diff --git a/dimse/c-find.js b/dimse/c-find.js index c0ab0304..824b3a27 100644 --- a/dimse/c-find.js +++ b/dimse/c-find.js @@ -7,10 +7,10 @@ const { PresentationContext } = require("@dcm4che/net/pdu/PresentationContext"); const { QueryRetrieveLevel2 } = require("@dcm4che/net/service/QueryRetrieveLevel2"); const { BasicModCFindSCP } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/BasicModCFindSCP"); const { createCFindSCPInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/CFindSCPInject"); -const { JsPatientQueryTask } = require("@dimse-patient-query-task"); -const { JsStudyQueryTask } = require("@dimse-study-query-task"); -const { JsSeriesQueryTask } = require("@dimse-series-query-task"); -const { JsInstanceQueryTask } = require("@dimse-instance-query-task"); +const { JsPatientQueryTask } = require("@dimse/patientQueryTask"); +const { JsStudyQueryTask } = require("@dimse/studyQueryTask"); +const { JsSeriesQueryTask } = require("@dimse/seriesQueryTask"); +const { JsInstanceQueryTask } = require("@dimse/instanceQueryTask"); const { PATIENT_ROOT_LEVELS, STUDY_ROOT_LEVELS, PATIENT_STUDY_ONLY_LEVELS } = require("./level"); const { Tag } = require("@dcm4che/data/Tag"); const { JsMwlQueryTask } = require("./mwlQueryTask"); diff --git a/dimse/c-get.js b/dimse/c-get.js index 3b1ff5bc..54e54dad 100644 --- a/dimse/c-get.js +++ b/dimse/c-get.js @@ -2,7 +2,7 @@ const { UID } = require("@dcm4che/data/UID"); const { createCGetSCPInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/CGetSCPInject"); const { SimpleCGetSCP } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/SimpleCGetSCP"); const { PATIENT_ROOT_LEVELS, STUDY_ROOT_LEVELS, PATIENT_STUDY_ONLY_LEVELS } = require("./level"); -const { getInstancesFromKeysAttr } = require("@dimse-utils"); +const { getInstancesFromKeysAttr } = require("@dimse/utils"); const { RetrieveTaskImpl } = require("@chinlinlee/dcm777/dcmqrscp/RetrieveTaskImpl"); const { createRetrieveAuditInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/dcmqrscp/RetrieveAuditInject"); const { Dimse } = require("@dcm4che/net/Dimse"); diff --git a/dimse/c-move.js b/dimse/c-move.js index e56215b2..684b552b 100644 --- a/dimse/c-move.js +++ b/dimse/c-move.js @@ -13,7 +13,7 @@ const { AAssociateRQ } = require("@dcm4che/net/pdu/AAssociateRQ"); const { Connection } = require("@dcm4che/net/Connection"); const { RetrieveTaskImpl } = require("@chinlinlee/dcm777/dcmqrscp/RetrieveTaskImpl"); const { Dimse } = require("@dcm4che/net/Dimse"); -const { getInstancesFromKeysAttr } = require("@dimse-utils"); +const { getInstancesFromKeysAttr } = require("@dimse/utils"); const { createRetrieveAuditInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/dcmqrscp/RetrieveAuditInject"); const { DimseRetrieveAuditService } = require("./service/retrieveAudit.service"); diff --git a/dimse/utils.js b/dimse/utils.js index 595af81d..beca3753 100644 --- a/dimse/utils.js +++ b/dimse/utils.js @@ -113,7 +113,7 @@ class QueryTaskUtils { } static async getQueryBuilder(queryAttr, level = "patient") { - const { DimseQueryBuilder } = require("@dimse-query-builder"); + const { DimseQueryBuilder } = require("@dimse/queryBuilder"); return new DimseQueryBuilder(queryAttr, level); } diff --git a/jsconfig.json b/jsconfig.json new file mode 100644 index 00000000..13195588 --- /dev/null +++ b/jsconfig.json @@ -0,0 +1,21 @@ +{ + "compilerOptions": { + "module": "CommonJS", + "paths": { + "@dcm4che/*": ["./models/DICOM/dcm4che/wrapper/org/dcm4che3/*"], + "@java-wrapper/*": ["./models/DICOM/dcm4che/wrapper/*"], + "@models/*": ["./models/*"], + "@error/*" : ["./error/*"], + "@root/*": ["./*"], + "@chinlinlee/*": ["./models/DICOM/dcm4che/wrapper/org/github/chinlinlee/*"], + "@dbModels/*": ["./models/mongodb/models/*"], + "@dicom-json-model": ["./models/mongodb/dicom-json-model.js"], + "@stow-rs-service": ["./api/dicom-web/controller/STOW-RS/service/stow-rs.service.js"], + "@dimse/*": ["./dimse/*"], + "@api/*": ["./api/*"] + } + }, + "exclude": [ + "node_modules", "**/node_modules/*" + ] +} \ No newline at end of file