From 81bf1234f956b622d857d9d243a5355b5662f4fb Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 20 Sep 2023 15:37:42 +0200 Subject: [PATCH 1/4] move repository files into core folder --- .../core}/repository/collection-repository.interface.ts | 0 .../core}/repository/copy-repository.interface.ts | 0 .../data-source/collection-data-source.interface.ts | 0 .../repository/data-source/copy-data-source.interface.ts | 2 +- .../data-source/data-source-response.interface.ts | 0 .../core}/repository/data-source/data-source.interface.ts | 6 +++--- .../extend-data-source-paged-response-data.function.ts | 0 .../extend-data-source-paged-response-data.test.ts | 0 .../extend-data-source-response-data.function.ts | 0 .../data-source/extend-data-source-response-data.test.ts | 0 .../repository/data-source/folder-data-source.interface.ts | 0 .../core}/repository/data-source/index.ts | 0 .../repository/data-source/item-data-source.interface.ts | 2 +- .../repository/data-source/move-data-source.interface.ts | 2 +- .../repository/data-source/tree-data-source.interface.ts | 0 .../core}/repository/detail-repository.interface.ts | 0 .../core}/repository/folder-repository.interface.ts | 0 src/{shared => packages/core}/repository/index.ts | 0 .../core}/repository/item-repository.interface.ts | 0 .../core}/repository/move-repository.interface.ts | 0 .../core}/repository/repository-items.manager.ts | 4 ++-- .../core}/repository/tree-repository.interface.ts | 0 tsconfig.json | 2 +- 23 files changed, 9 insertions(+), 9 deletions(-) rename src/{shared => packages/core}/repository/collection-repository.interface.ts (100%) rename src/{shared => packages/core}/repository/copy-repository.interface.ts (100%) rename src/{shared => packages/core}/repository/data-source/collection-data-source.interface.ts (100%) rename src/{shared => packages/core}/repository/data-source/copy-data-source.interface.ts (62%) rename src/{shared => packages/core}/repository/data-source/data-source-response.interface.ts (100%) rename src/{shared => packages/core}/repository/data-source/data-source.interface.ts (80%) rename src/{shared => packages/core}/repository/data-source/extend-data-source-paged-response-data.function.ts (100%) rename src/{shared => packages/core}/repository/data-source/extend-data-source-paged-response-data.test.ts (100%) rename src/{shared => packages/core}/repository/data-source/extend-data-source-response-data.function.ts (100%) rename src/{shared => packages/core}/repository/data-source/extend-data-source-response-data.test.ts (100%) rename src/{shared => packages/core}/repository/data-source/folder-data-source.interface.ts (100%) rename src/{shared => packages/core}/repository/data-source/index.ts (100%) rename src/{shared => packages/core}/repository/data-source/item-data-source.interface.ts (62%) rename src/{shared => packages/core}/repository/data-source/move-data-source.interface.ts (60%) rename src/{shared => packages/core}/repository/data-source/tree-data-source.interface.ts (100%) rename src/{shared => packages/core}/repository/detail-repository.interface.ts (100%) rename src/{shared => packages/core}/repository/folder-repository.interface.ts (100%) rename src/{shared => packages/core}/repository/index.ts (100%) rename src/{shared => packages/core}/repository/item-repository.interface.ts (100%) rename src/{shared => packages/core}/repository/move-repository.interface.ts (100%) rename src/{shared => packages/core}/repository/repository-items.manager.ts (95%) rename src/{shared => packages/core}/repository/tree-repository.interface.ts (100%) diff --git a/src/shared/repository/collection-repository.interface.ts b/src/packages/core/repository/collection-repository.interface.ts similarity index 100% rename from src/shared/repository/collection-repository.interface.ts rename to src/packages/core/repository/collection-repository.interface.ts diff --git a/src/shared/repository/copy-repository.interface.ts b/src/packages/core/repository/copy-repository.interface.ts similarity index 100% rename from src/shared/repository/copy-repository.interface.ts rename to src/packages/core/repository/copy-repository.interface.ts diff --git a/src/shared/repository/data-source/collection-data-source.interface.ts b/src/packages/core/repository/data-source/collection-data-source.interface.ts similarity index 100% rename from src/shared/repository/data-source/collection-data-source.interface.ts rename to src/packages/core/repository/data-source/collection-data-source.interface.ts diff --git a/src/shared/repository/data-source/copy-data-source.interface.ts b/src/packages/core/repository/data-source/copy-data-source.interface.ts similarity index 62% rename from src/shared/repository/data-source/copy-data-source.interface.ts rename to src/packages/core/repository/data-source/copy-data-source.interface.ts index f2477be161..50c4ff2501 100644 --- a/src/shared/repository/data-source/copy-data-source.interface.ts +++ b/src/packages/core/repository/data-source/copy-data-source.interface.ts @@ -1,4 +1,4 @@ -import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; +import type { DataSourceResponse } from 'src/packages/core/repository'; export interface UmbCopyDataSource { copy(unique: string, targetUnique: string | null): Promise>; diff --git a/src/shared/repository/data-source/data-source-response.interface.ts b/src/packages/core/repository/data-source/data-source-response.interface.ts similarity index 100% rename from src/shared/repository/data-source/data-source-response.interface.ts rename to src/packages/core/repository/data-source/data-source-response.interface.ts diff --git a/src/shared/repository/data-source/data-source.interface.ts b/src/packages/core/repository/data-source/data-source.interface.ts similarity index 80% rename from src/shared/repository/data-source/data-source.interface.ts rename to src/packages/core/repository/data-source/data-source.interface.ts index 23689c83d9..3699d7bc1e 100644 --- a/src/shared/repository/data-source/data-source.interface.ts +++ b/src/packages/core/repository/data-source/data-source.interface.ts @@ -1,15 +1,15 @@ -import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; +import type { DataSourceResponse } from 'src/packages/core/repository'; export interface UmbDataSource< CreateRequestType, CreateResponseType, UpdateRequestType, ResponseType, - CreateScaffoldPresetType = Partial + CreateScaffoldPresetType = Partial, > { createScaffold( parentId: string | null, - preset?: Partial | CreateScaffoldPresetType + preset?: Partial | CreateScaffoldPresetType, ): Promise>; get(unique: string): Promise>; insert(data: CreateRequestType): Promise>; diff --git a/src/shared/repository/data-source/extend-data-source-paged-response-data.function.ts b/src/packages/core/repository/data-source/extend-data-source-paged-response-data.function.ts similarity index 100% rename from src/shared/repository/data-source/extend-data-source-paged-response-data.function.ts rename to src/packages/core/repository/data-source/extend-data-source-paged-response-data.function.ts diff --git a/src/shared/repository/data-source/extend-data-source-paged-response-data.test.ts b/src/packages/core/repository/data-source/extend-data-source-paged-response-data.test.ts similarity index 100% rename from src/shared/repository/data-source/extend-data-source-paged-response-data.test.ts rename to src/packages/core/repository/data-source/extend-data-source-paged-response-data.test.ts diff --git a/src/shared/repository/data-source/extend-data-source-response-data.function.ts b/src/packages/core/repository/data-source/extend-data-source-response-data.function.ts similarity index 100% rename from src/shared/repository/data-source/extend-data-source-response-data.function.ts rename to src/packages/core/repository/data-source/extend-data-source-response-data.function.ts diff --git a/src/shared/repository/data-source/extend-data-source-response-data.test.ts b/src/packages/core/repository/data-source/extend-data-source-response-data.test.ts similarity index 100% rename from src/shared/repository/data-source/extend-data-source-response-data.test.ts rename to src/packages/core/repository/data-source/extend-data-source-response-data.test.ts diff --git a/src/shared/repository/data-source/folder-data-source.interface.ts b/src/packages/core/repository/data-source/folder-data-source.interface.ts similarity index 100% rename from src/shared/repository/data-source/folder-data-source.interface.ts rename to src/packages/core/repository/data-source/folder-data-source.interface.ts diff --git a/src/shared/repository/data-source/index.ts b/src/packages/core/repository/data-source/index.ts similarity index 100% rename from src/shared/repository/data-source/index.ts rename to src/packages/core/repository/data-source/index.ts diff --git a/src/shared/repository/data-source/item-data-source.interface.ts b/src/packages/core/repository/data-source/item-data-source.interface.ts similarity index 62% rename from src/shared/repository/data-source/item-data-source.interface.ts rename to src/packages/core/repository/data-source/item-data-source.interface.ts index 88fb741ee3..ef09afc89d 100644 --- a/src/shared/repository/data-source/item-data-source.interface.ts +++ b/src/packages/core/repository/data-source/item-data-source.interface.ts @@ -1,4 +1,4 @@ -import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; +import type { DataSourceResponse } from 'src/packages/core/repository'; export interface UmbItemDataSource { getItems(unique: Array): Promise>>; diff --git a/src/shared/repository/data-source/move-data-source.interface.ts b/src/packages/core/repository/data-source/move-data-source.interface.ts similarity index 60% rename from src/shared/repository/data-source/move-data-source.interface.ts rename to src/packages/core/repository/data-source/move-data-source.interface.ts index e0ac7ce1d7..7621e2fe4e 100644 --- a/src/shared/repository/data-source/move-data-source.interface.ts +++ b/src/packages/core/repository/data-source/move-data-source.interface.ts @@ -1,4 +1,4 @@ -import type { UmbDataSourceErrorResponse } from '@umbraco-cms/backoffice/repository'; +import type { UmbDataSourceErrorResponse } from 'src/packages/core/repository'; export interface UmbMoveDataSource { move(unique: string, targetUnique: string | null): Promise; diff --git a/src/shared/repository/data-source/tree-data-source.interface.ts b/src/packages/core/repository/data-source/tree-data-source.interface.ts similarity index 100% rename from src/shared/repository/data-source/tree-data-source.interface.ts rename to src/packages/core/repository/data-source/tree-data-source.interface.ts diff --git a/src/shared/repository/detail-repository.interface.ts b/src/packages/core/repository/detail-repository.interface.ts similarity index 100% rename from src/shared/repository/detail-repository.interface.ts rename to src/packages/core/repository/detail-repository.interface.ts diff --git a/src/shared/repository/folder-repository.interface.ts b/src/packages/core/repository/folder-repository.interface.ts similarity index 100% rename from src/shared/repository/folder-repository.interface.ts rename to src/packages/core/repository/folder-repository.interface.ts diff --git a/src/shared/repository/index.ts b/src/packages/core/repository/index.ts similarity index 100% rename from src/shared/repository/index.ts rename to src/packages/core/repository/index.ts diff --git a/src/shared/repository/item-repository.interface.ts b/src/packages/core/repository/item-repository.interface.ts similarity index 100% rename from src/shared/repository/item-repository.interface.ts rename to src/packages/core/repository/item-repository.interface.ts diff --git a/src/shared/repository/move-repository.interface.ts b/src/packages/core/repository/move-repository.interface.ts similarity index 100% rename from src/shared/repository/move-repository.interface.ts rename to src/packages/core/repository/move-repository.interface.ts diff --git a/src/shared/repository/repository-items.manager.ts b/src/packages/core/repository/repository-items.manager.ts similarity index 95% rename from src/shared/repository/repository-items.manager.ts rename to src/packages/core/repository/repository-items.manager.ts index 75f08fb040..ca1727a1f0 100644 --- a/src/shared/repository/repository-items.manager.ts +++ b/src/packages/core/repository/repository-items.manager.ts @@ -1,4 +1,4 @@ -import { UmbItemRepository } from '@umbraco-cms/backoffice/repository'; +import { UmbItemRepository } from 'src/packages/core/repository'; import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { UmbArrayState, UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; import { UmbExtensionClassInitializer } from '@umbraco-cms/backoffice/extension-registry'; @@ -29,7 +29,7 @@ export class UmbRepositoryItemsManager string | undefined + getUniqueMethod?: (entry: ItemType) => string | undefined, ) { this.host = host; this.#getUnique = getUniqueMethod || ((entry) => entry.id || ''); diff --git a/src/shared/repository/tree-repository.interface.ts b/src/packages/core/repository/tree-repository.interface.ts similarity index 100% rename from src/shared/repository/tree-repository.interface.ts rename to src/packages/core/repository/tree-repository.interface.ts diff --git a/tsconfig.json b/tsconfig.json index d4de6fd9d6..7c949e5c74 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -46,7 +46,7 @@ "@umbraco-cms/backoffice/events": ["src/shared/umb-events"], "@umbraco-cms/backoffice/icon": ["src/shared/icon-registry"], "@umbraco-cms/backoffice/models": ["src/shared/models"], - "@umbraco-cms/backoffice/repository": ["src/shared/repository"], + "@umbraco-cms/backoffice/repository": ["src/packages/core/repository"], "@umbraco-cms/backoffice/resources": ["src/shared/resources"], "@umbraco-cms/backoffice/router": ["src/shared/router"], "@umbraco-cms/backoffice/style": ["src/shared/style"], From 65d300dddec9d0c4435ed0f7fa078ea0f5f2b28c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 20 Sep 2023 15:39:03 +0200 Subject: [PATCH 2/4] update web test runner importmap --- web-test-runner.config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-test-runner.config.mjs b/web-test-runner.config.mjs index 397aed2b1b..c24e8c5ce9 100644 --- a/web-test-runner.config.mjs +++ b/web-test-runner.config.mjs @@ -45,7 +45,6 @@ export default { '@umbraco-cms/backoffice/events': './src/shared/umb-events/index.ts', '@umbraco-cms/backoffice/icon': './src/shared/icon-registry/index.ts', '@umbraco-cms/backoffice/models': './src/shared/models/index.ts', - '@umbraco-cms/backoffice/repository': './src/shared/repository/index.ts', '@umbraco-cms/backoffice/resources': './src/shared/resources/index.ts', '@umbraco-cms/backoffice/router': './src/shared/router/index.ts', '@umbraco-cms/backoffice/style': './src/shared/style/index.ts', @@ -79,6 +78,7 @@ export default { '@umbraco-cms/backoffice/variant': './src/packages/core/variant/index.ts', '@umbraco-cms/backoffice/workspace': './src/packages/core/workspace/index.ts', '@umbraco-cms/backoffice/culture': './src/packages/core/culture/index.ts', + '@umbraco-cms/backoffice/repository': './src/packages/core/repository/index.ts', '@umbraco-cms/backoffice/dictionary': './src/packages/dictionary/dictionary/index.ts', From eb26b12c614fe3353f22ed76c560b7b854ce922b Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 21 Sep 2023 10:54:11 +0200 Subject: [PATCH 3/4] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03d64b8394..089f462562 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ "./events": "./dist-cms/shared/umb-events/index.js", "./icon": "./dist-cms/shared/icon/index.js", "./models": "./dist-cms/shared/models/index.js", - "./repository": "./dist-cms/shared/repository/index.js", "./resources": "./dist-cms/shared/resources/index.js", "./router": "./dist-cms/shared/router/index.js", "./style": "./dist-cms/shared/style/index.js", @@ -47,6 +46,7 @@ "./tree": "./dist-cms/packages/core/tree/index.js", "./variant": "./dist-cms/packages/core/variant/index.js", "./workspace": "./dist-cms/packages/core/workspace/index.js", + "./repository": "./dist-cms/packages/core/repository/index.js", "./dictionary": "./dist-cms/packages/dictionary/dictionary/index.js", "./document": "./dist-cms/packages/documents/documents/index.js", "./document-blueprint": "./dist-cms/packages/documents/document-blueprints/index.js", From bc26d074a17a25148be1d89e3d945631c13acad1 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 21 Sep 2023 11:00:19 +0200 Subject: [PATCH 4/4] update imports --- .../core/repository/data-source/copy-data-source.interface.ts | 2 +- .../core/repository/data-source/data-source.interface.ts | 2 +- .../core/repository/data-source/item-data-source.interface.ts | 2 +- .../core/repository/data-source/move-data-source.interface.ts | 2 +- src/packages/core/repository/repository-items.manager.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/packages/core/repository/data-source/copy-data-source.interface.ts b/src/packages/core/repository/data-source/copy-data-source.interface.ts index 50c4ff2501..f2477be161 100644 --- a/src/packages/core/repository/data-source/copy-data-source.interface.ts +++ b/src/packages/core/repository/data-source/copy-data-source.interface.ts @@ -1,4 +1,4 @@ -import type { DataSourceResponse } from 'src/packages/core/repository'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; export interface UmbCopyDataSource { copy(unique: string, targetUnique: string | null): Promise>; diff --git a/src/packages/core/repository/data-source/data-source.interface.ts b/src/packages/core/repository/data-source/data-source.interface.ts index 3699d7bc1e..c029560648 100644 --- a/src/packages/core/repository/data-source/data-source.interface.ts +++ b/src/packages/core/repository/data-source/data-source.interface.ts @@ -1,4 +1,4 @@ -import type { DataSourceResponse } from 'src/packages/core/repository'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; export interface UmbDataSource< CreateRequestType, diff --git a/src/packages/core/repository/data-source/item-data-source.interface.ts b/src/packages/core/repository/data-source/item-data-source.interface.ts index ef09afc89d..88fb741ee3 100644 --- a/src/packages/core/repository/data-source/item-data-source.interface.ts +++ b/src/packages/core/repository/data-source/item-data-source.interface.ts @@ -1,4 +1,4 @@ -import type { DataSourceResponse } from 'src/packages/core/repository'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; export interface UmbItemDataSource { getItems(unique: Array): Promise>>; diff --git a/src/packages/core/repository/data-source/move-data-source.interface.ts b/src/packages/core/repository/data-source/move-data-source.interface.ts index 7621e2fe4e..e0ac7ce1d7 100644 --- a/src/packages/core/repository/data-source/move-data-source.interface.ts +++ b/src/packages/core/repository/data-source/move-data-source.interface.ts @@ -1,4 +1,4 @@ -import type { UmbDataSourceErrorResponse } from 'src/packages/core/repository'; +import type { UmbDataSourceErrorResponse } from '@umbraco-cms/backoffice/repository'; export interface UmbMoveDataSource { move(unique: string, targetUnique: string | null): Promise; diff --git a/src/packages/core/repository/repository-items.manager.ts b/src/packages/core/repository/repository-items.manager.ts index ca1727a1f0..ee2b154ae7 100644 --- a/src/packages/core/repository/repository-items.manager.ts +++ b/src/packages/core/repository/repository-items.manager.ts @@ -1,4 +1,4 @@ -import { UmbItemRepository } from 'src/packages/core/repository'; +import { UmbItemRepository } from '@umbraco-cms/backoffice/repository'; import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { UmbArrayState, UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; import { UmbExtensionClassInitializer } from '@umbraco-cms/backoffice/extension-registry';