Partially move server-side savedObjects domain implementation to packages (#137448)

* create @kbn/core-saved-objects-utils-server package

* create empty @kbn/core-saved-objects-base-server-internal package

* fix more internal imports

* [CI] Auto-commit changed files from 'node scripts/precommit_hook.js --ref HEAD~1..HEAD --fix'

* start moving stuff to base package

* Fix SS mocks

* adapt some imports

* start fixing internal imports

* fix remaining core usages

* start fixing external usages

* lint

* move type registry and mocks to packages

* adapt usages of serializer in tests

* fix test mocking

* [CI] Auto-commit changed files from 'node scripts/generate packages_build_manifest'

* fix more internal usages of SOTR/mock

* fix package

* fix external usages

* fix more mocked packages

* fix more mocked packages

* self review

* Fix mistake from main merge

Attempt to undo an incorrect merge.

* add root_input_dir

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Christiane (Tina) Heiligers <christiane.heiligers@elastic.co>

package.json

@@ -237,11 +237,14 @@
     "@kbn/core-preboot-server-mocks": "link:bazel-bin/packages/core/preboot/core-preboot-server-mocks",
     "@kbn/core-saved-objects-api-browser": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-api-browser",
     "@kbn/core-saved-objects-api-server": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-api-server",
+    "@kbn/core-saved-objects-base-server-internal": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-base-server-internal",
+    "@kbn/core-saved-objects-base-server-mocks": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-base-server-mocks",
     "@kbn/core-saved-objects-browser": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-browser",
     "@kbn/core-saved-objects-browser-internal": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-browser-internal",
     "@kbn/core-saved-objects-browser-mocks": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-browser-mocks",
     "@kbn/core-saved-objects-common": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-common",
     "@kbn/core-saved-objects-server": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-server",
+    "@kbn/core-saved-objects-utils-server": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-utils-server",
     "@kbn/core-test-helpers-deprecations-getters": "link:bazel-bin/packages/core/test-helpers/core-test-helpers-deprecations-getters",
     "@kbn/core-test-helpers-http-setup-browser": "link:bazel-bin/packages/core/test-helpers/core-test-helpers-http-setup-browser",
     "@kbn/core-theme-browser": "link:bazel-bin/packages/core/theme/core-theme-browser",
@@ -894,11 +897,14 @@
     "@types/kbn__core-public-internal-base": "link:bazel-bin/packages/core/public/internal-base/npm_module_types",
     "@types/kbn__core-saved-objects-api-browser": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-api-browser/npm_module_types",
     "@types/kbn__core-saved-objects-api-server": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-api-server/npm_module_types",
+    "@types/kbn__core-saved-objects-base-server-internal": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-base-server-internal/npm_module_types",
+    "@types/kbn__core-saved-objects-base-server-mocks": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-base-server-mocks/npm_module_types",
     "@types/kbn__core-saved-objects-browser": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-browser/npm_module_types",
     "@types/kbn__core-saved-objects-browser-internal": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-browser-internal/npm_module_types",
     "@types/kbn__core-saved-objects-browser-mocks": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-browser-mocks/npm_module_types",
     "@types/kbn__core-saved-objects-common": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-common/npm_module_types",
     "@types/kbn__core-saved-objects-server": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-server/npm_module_types",
+    "@types/kbn__core-saved-objects-utils-server": "link:bazel-bin/packages/core/saved-objects/core-saved-objects-utils-server/npm_module_types",
     "@types/kbn__core-server-internal-base": "link:bazel-bin/packages/core/server/internal-base/npm_module_types",
     "@types/kbn__core-test-helpers-deprecations-getters": "link:bazel-bin/packages/core/test-helpers/core-test-helpers-deprecations-getters/npm_module_types",
     "@types/kbn__core-test-helpers-http-setup-browser": "link:bazel-bin/packages/core/test-helpers/core-test-helpers-http-setup-browser/npm_module_types",

packages/BUILD.bazel

@@ -102,11 +102,14 @@ filegroup(
     "//packages/core/preboot/core-preboot-server:build",
     "//packages/core/saved-objects/core-saved-objects-api-browser:build",
     "//packages/core/saved-objects/core-saved-objects-api-server:build",
+    "//packages/core/saved-objects/core-saved-objects-base-server-internal:build",
+    "//packages/core/saved-objects/core-saved-objects-base-server-mocks:build",
     "//packages/core/saved-objects/core-saved-objects-browser-internal:build",
     "//packages/core/saved-objects/core-saved-objects-browser-mocks:build",
     "//packages/core/saved-objects/core-saved-objects-browser:build",
     "//packages/core/saved-objects/core-saved-objects-common:build",
     "//packages/core/saved-objects/core-saved-objects-server:build",
+    "//packages/core/saved-objects/core-saved-objects-utils-server:build",
     "//packages/core/test-helpers/core-test-helpers-deprecations-getters:build",
     "//packages/core/test-helpers/core-test-helpers-http-setup-browser:build",
     "//packages/core/theme/core-theme-browser-internal:build",
@@ -375,11 +378,14 @@ filegroup(
     "//packages/core/preboot/core-preboot-server:build_types",
     "//packages/core/saved-objects/core-saved-objects-api-browser:build_types",
     "//packages/core/saved-objects/core-saved-objects-api-server:build_types",
+    "//packages/core/saved-objects/core-saved-objects-base-server-internal:build_types",
+    "//packages/core/saved-objects/core-saved-objects-base-server-mocks:build_types",
     "//packages/core/saved-objects/core-saved-objects-browser-internal:build_types",
     "//packages/core/saved-objects/core-saved-objects-browser-mocks:build_types",
     "//packages/core/saved-objects/core-saved-objects-browser:build_types",
     "//packages/core/saved-objects/core-saved-objects-common:build_types",
     "//packages/core/saved-objects/core-saved-objects-server:build_types",
+    "//packages/core/saved-objects/core-saved-objects-utils-server:build_types",
     "//packages/core/test-helpers/core-test-helpers-deprecations-getters:build_types",
     "//packages/core/test-helpers/core-test-helpers-http-setup-browser:build_types",
     "//packages/core/theme/core-theme-browser-internal:build_types",

packages/core/saved-objects/core-saved-objects-base-server-internal/BUILD.bazel

@@ -0,0 +1,111 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "core-saved-objects-base-server-internal"
+PKG_REQUIRE_NAME = "@kbn/core-saved-objects-base-server-internal"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+    "**/*.stories.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+RUNTIME_DEPS = [
+  "@npm//lodash",
+  "@npm//semver",
+  "//packages/kbn-config-schema",
+  ### test dependencies
+  "//packages/kbn-logging-mocks",
+  "@npm//@hapi/boom",
+]
+
+TYPES_DEPS = [
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "@npm//@types/lodash",
+  "@npm//@types/semver",
+  "//packages/kbn-logging:npm_module_types",
+  "//packages/kbn-config-schema:npm_module_types",
+  "//packages/core/base/core-base-server-internal:npm_module_types",
+  "//packages/core/saved-objects/core-saved-objects-server:npm_module_types",
+  "//packages/core/saved-objects/core-saved-objects-utils-server:npm_module_types",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+  root_input_dir = "src",
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  declaration_map = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)

packages/core/saved-objects/core-saved-objects-base-server-internal/README.md

@@ -0,0 +1,4 @@
+# @kbn/core-saved-objects-base-server-internal
+
+This package contains the base parts of the server-side savedObjects internal implementation, 
+used by all the other internal server-side savedObjects packages. 

packages/core/saved-objects/core-saved-objects-base-server-internal/jest.config.js

@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../../../..',
+  roots: ['<rootDir>/packages/core/saved-objects/core-saved-objects-base-server-internal'],
+};

packages/core/saved-objects/core-saved-objects-base-server-internal/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@kbn/core-saved-objects-base-server-internal",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0"
+}

packages/core/saved-objects/core-saved-objects-base-server-internal/src/index.ts

@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { LEGACY_URL_ALIAS_TYPE, type LegacyUrlAlias } from './legacy_alias';
+export {
+  getProperty,
+  getRootProperties,
+  getRootPropertiesObjects,
+  getTypes,
+  type IndexMapping,
+  type IndexMappingMeta,
+  type SavedObjectsTypeMappingDefinitions,
+} from './mappings';
+export { SavedObjectsSerializer } from './serialization';
+export { SavedObjectsTypeValidator } from './validation';
+export { decodeRequestVersion, decodeVersion, encodeVersion, encodeHitVersion } from './version';
+export {
+  savedObjectsConfig,
+  savedObjectsMigrationConfig,
+  SavedObjectConfig,
+  type SavedObjectsConfigType,
+  type SavedObjectsMigrationConfigType,
+} from './saved_objects_config';
+export { SavedObjectTypeRegistry } from './saved_objects_type_registry';

packages/core/saved-objects/core-saved-objects-base-server-internal/src/legacy_alias/index.ts

@@ -6,7 +6,5 @@
  * Side Public License, v 1.
  */
 
-export * from './encode_version';
-export * from './encode_hit_version';
-export * from './decode_version';
-export * from './decode_request_version';
+export type { LegacyUrlAlias } from './types';
+export { LEGACY_URL_ALIAS_TYPE } from './constants';

packages/core/saved-objects/core-saved-objects-base-server-internal/src/serialization/serializer.test.ts

@@ -7,28 +7,47 @@
  */
 
 import _ from 'lodash';
-import type { SavedObjectsRawDoc } from '@kbn/core-saved-objects-server';
+import type { SavedObjectsRawDoc, ISavedObjectTypeRegistry } from '@kbn/core-saved-objects-server';
 import { SavedObjectsSerializer } from './serializer';
-import { typeRegistryMock } from '../saved_objects_type_registry.mock';
 import { encodeVersion } from '../version';
-import { LEGACY_URL_ALIAS_TYPE } from '../object_types';
+import { LEGACY_URL_ALIAS_TYPE } from '../legacy_alias';
 
-let typeRegistry = typeRegistryMock.create();
-typeRegistry.isNamespaceAgnostic.mockReturnValue(true);
-typeRegistry.isSingleNamespace.mockReturnValue(false);
-typeRegistry.isMultiNamespace.mockReturnValue(false);
+const createMockedTypeRegistry = ({
+  isNamespaceAgnostic,
+  isSingleNamespace,
+  isMultiNamespace,
+}: {
+  isNamespaceAgnostic: boolean;
+  isSingleNamespace: boolean;
+  isMultiNamespace: boolean;
+}): ISavedObjectTypeRegistry => {
+  const typeRegistry: Partial<ISavedObjectTypeRegistry> = {
+    isNamespaceAgnostic: jest.fn().mockReturnValue(isNamespaceAgnostic),
+    isSingleNamespace: jest.fn().mockReturnValue(isSingleNamespace),
+    isMultiNamespace: jest.fn().mockReturnValue(isMultiNamespace),
+  };
+  return typeRegistry as ISavedObjectTypeRegistry;
+};
+
+let typeRegistry = createMockedTypeRegistry({
+  isNamespaceAgnostic: true,
+  isSingleNamespace: false,
+  isMultiNamespace: false,
+});
 const namespaceAgnosticSerializer = new SavedObjectsSerializer(typeRegistry);
 
-typeRegistry = typeRegistryMock.create();
-typeRegistry.isNamespaceAgnostic.mockReturnValue(false);
-typeRegistry.isSingleNamespace.mockReturnValue(true);
-typeRegistry.isMultiNamespace.mockReturnValue(false);
+typeRegistry = typeRegistry = createMockedTypeRegistry({
+  isNamespaceAgnostic: false,
+  isSingleNamespace: true,
+  isMultiNamespace: false,
+});
 const singleNamespaceSerializer = new SavedObjectsSerializer(typeRegistry);
 
-typeRegistry = typeRegistryMock.create();
-typeRegistry.isNamespaceAgnostic.mockReturnValue(false);
-typeRegistry.isSingleNamespace.mockReturnValue(false);
-typeRegistry.isMultiNamespace.mockReturnValue(true);
+typeRegistry = typeRegistry = createMockedTypeRegistry({
+  isNamespaceAgnostic: false,
+  isSingleNamespace: false,
+  isMultiNamespace: true,
+});
 const multiNamespaceSerializer = new SavedObjectsSerializer(typeRegistry);
 
 const sampleTemplate = {

packages/core/saved-objects/core-saved-objects-base-server-internal/src/serialization/serializer.ts

@@ -14,9 +14,9 @@ import type {
   SavedObjectSanitizedDoc,
   SavedObjectsRawDocParseOptions,
 } from '@kbn/core-saved-objects-server';
-import { LEGACY_URL_ALIAS_TYPE } from '../object_types';
+import { SavedObjectsUtils } from '@kbn/core-saved-objects-utils-server';
+import { LEGACY_URL_ALIAS_TYPE } from '../legacy_alias';
 import { decodeVersion, encodeVersion } from '../version';
-import { SavedObjectsUtils } from '../service';
 
 /**
  * Core internal implementation of {@link ISavedObjectsSerializer}

packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/schema.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { schema, Type } from '@kbn/config-schema';
+import { schema, type Type } from '@kbn/config-schema';
 import type {
   SavedObjectsValidationSpec,
   SavedObjectSanitizedDoc,

packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/validator.test.ts

@@ -7,12 +7,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { loggerMock, type MockedLogger } from '@kbn/logging-mocks';
 import type {
   SavedObjectSanitizedDoc,
   SavedObjectsValidationMap,
 } from '@kbn/core-saved-objects-server';
-import { SavedObjectsTypeValidator } from '.';
-import { loggerMock, MockedLogger } from '@kbn/logging-mocks';
+import { SavedObjectsTypeValidator } from './validator';
 
 describe('Saved Objects type validator', () => {
   let validator: SavedObjectsTypeValidator;

packages/core/saved-objects/core-saved-objects-base-server-internal/src/version/decode_version.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsErrorHelpers } from '../service/lib/errors';
+import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-utils-server';
 import { decodeBase64 } from './base64';
 
 /**

packages/core/saved-objects/core-saved-objects-base-server-internal/src/version/index.ts

@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { encodeVersion } from './encode_version';
+export { encodeHitVersion } from './encode_hit_version';
+export { decodeVersion } from './decode_version';
+export { decodeRequestVersion } from './decode_request_version';

packages/core/saved-objects/core-saved-objects-base-server-internal/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../../../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}

packages/core/saved-objects/core-saved-objects-base-server-mocks/BUILD.bazel

@@ -0,0 +1,100 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "core-saved-objects-base-server-mocks"
+PKG_REQUIRE_NAME = "@kbn/core-saved-objects-base-server-mocks"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+    "**/*.stories.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+RUNTIME_DEPS = [
+]
+
+TYPES_DEPS = [
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "//packages/core/saved-objects/core-saved-objects-server:npm_module_types",
+  "//packages/core/saved-objects/core-saved-objects-base-server-internal:npm_module_types",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+  root_input_dir = "src",
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  declaration_map = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)

packages/core/saved-objects/core-saved-objects-base-server-mocks/README.md

@@ -0,0 +1,5 @@
+# @kbn/core-saved-objects-base-server-mocks
+
+This package contains the mocks for the base server-side savedObjects sub-domain:
+- `SavedObjectTypeRegistry` mock
+- `SavedObjectsSerializer` mock

packages/core/saved-objects/core-saved-objects-base-server-mocks/jest.config.js

@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../../../..',
+  roots: ['<rootDir>/packages/core/saved-objects/core-saved-objects-base-server-mocks'],
+};

packages/core/saved-objects/core-saved-objects-base-server-mocks/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@kbn/core-saved-objects-base-server-mocks",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0"
+}

packages/core/saved-objects/core-saved-objects-base-server-mocks/src/index.ts

@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { typeRegistryMock } from './saved_objects_type_registry.mock';
+export { serializerMock } from './serializer.mock';

packages/core/saved-objects/core-saved-objects-base-server-mocks/src/saved_objects_type_registry.mock.ts

@@ -7,7 +7,7 @@
  */
 
 import type { ISavedObjectTypeRegistry } from '@kbn/core-saved-objects-server';
-import type { SavedObjectTypeRegistry } from './saved_objects_type_registry';
+import type { SavedObjectTypeRegistry } from '@kbn/core-saved-objects-base-server-internal';
 
 const createRegistryMock = (): jest.Mocked<
   ISavedObjectTypeRegistry & Pick<SavedObjectTypeRegistry, 'registerType'>

packages/core/saved-objects/core-saved-objects-base-server-mocks/src/serializer.mock.ts

@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { ISavedObjectsSerializer } from '@kbn/core-saved-objects-server';
+
+const createSerializerMock = () => {
+  const mock: jest.Mocked<ISavedObjectsSerializer> = {
+    isRawSavedObject: jest.fn(),
+    rawToSavedObject: jest.fn(),
+    savedObjectToRaw: jest.fn(),
+    generateRawId: jest.fn(),
+    generateRawLegacyUrlAliasId: jest.fn(),
+  };
+  return mock;
+};
+
+export const serializerMock = {
+  create: createSerializerMock,
+};

packages/core/saved-objects/core-saved-objects-base-server-mocks/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../../../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}

packages/core/saved-objects/core-saved-objects-utils-server/BUILD.bazel

@@ -0,0 +1,106 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "core-saved-objects-utils-server"
+PKG_REQUIRE_NAME = "@kbn/core-saved-objects-utils-server"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+    "**/*.stories.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+RUNTIME_DEPS = [
+  "@npm//lodash",
+  "@npm//uuid",
+  "@npm//@hapi/boom",
+]
+
+
+TYPES_DEPS = [
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "@npm//@types/lodash",
+  "@npm//@types/uuid",
+  "@npm//@hapi/boom",
+  "//packages/core/saved-objects/core-saved-objects-server:npm_module_types",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+  root_input_dir = "src",
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  declaration_map = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)

packages/core/saved-objects/core-saved-objects-utils-server/README.md

@@ -0,0 +1,5 @@
+# @kbn/core-saved-objects-utils-server
+
+This package contains public utilities for Core's server-side `savedObjects` domain.
+
+

packages/core/saved-objects/core-saved-objects-utils-server/jest.config.js

@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../../../..',
+  roots: ['<rootDir>/packages/core/saved-objects/core-saved-objects-utils-server'],
+};

packages/core/saved-objects/core-saved-objects-utils-server/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@kbn/core-saved-objects-utils-server",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0"
+}

packages/core/saved-objects/core-saved-objects-utils-server/src/index.ts

@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { mergeSavedObjectMigrationMaps } from './merge_migration_maps';
+export { SavedObjectsErrorHelpers, type DecoratedError } from './saved_objects_error_helpers';
+export {
+  SavedObjectsUtils,
+  ALL_NAMESPACES_STRING,
+  DEFAULT_NAMESPACE_STRING,
+  FIND_DEFAULT_PAGE,
+  FIND_DEFAULT_PER_PAGE,
+} from './saved_objects_utils';

packages/core/saved-objects/core-saved-objects-utils-server/src/merge_migration_maps.test.ts

@@ -11,7 +11,7 @@ import type {
   SavedObjectMigrationMap,
   SavedObjectUnsanitizedDoc,
 } from '@kbn/core-saved-objects-server';
-import { mergeSavedObjectMigrationMaps } from './utils';
+import { mergeSavedObjectMigrationMaps } from './merge_migration_maps';
 
 describe('mergeSavedObjectMigrationMaps', () => {
   const obj1: SavedObjectMigrationMap = {

packages/core/saved-objects/core-saved-objects-utils-server/src/merge_migration_maps.ts

@@ -7,12 +7,12 @@
  */
 
 import { mergeWith } from 'lodash';
-import {
+import type {
   SavedObjectMigrationContext,
   SavedObjectMigrationFn,
   SavedObjectMigrationMap,
   SavedObjectUnsanitizedDoc,
-} from '../..';
+} from '@kbn/core-saved-objects-server';
 
 /**
  * Merges two saved object migration maps.

packages/core/saved-objects/core-saved-objects-utils-server/src/saved_objects_error_helpers.test.ts

@@ -7,8 +7,7 @@
  */
 
 import Boom from '@hapi/boom';
-
-import { SavedObjectsErrorHelpers } from './errors';
+import { SavedObjectsErrorHelpers } from './saved_objects_error_helpers';
 
 describe('savedObjectsClient/errorTypes', () => {
   describe('BadRequest error', () => {

packages/core/saved-objects/core-saved-objects-utils-server/src/saved_objects_utils.test.ts

@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { mockUuidv1, mockUuidv5 } from './utils.test.mock';
+import { mockUuidv1, mockUuidv5 } from './saved_objects_utils.test.mock';
 
-import { SavedObjectsFindOptions } from '@kbn/core-saved-objects-api-server';
-import { SavedObjectsUtils } from './utils';
+import type { SavedObjectsFindOptions } from '@kbn/core-saved-objects-api-server';
+import { SavedObjectsUtils } from './saved_objects_utils';
 
 describe('SavedObjectsUtils', () => {
   const {

packages/core/saved-objects/core-saved-objects-utils-server/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../../../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}

src/core/server/core_usage_data/core_usage_data_service.test.ts

@@ -18,14 +18,14 @@ import { mockCoreContext } from '@kbn/core-base-server-mocks';
 import { config as RawLoggingConfig } from '@kbn/core-logging-server-internal';
 import { config as RawElasticsearchConfig } from '@kbn/core-elasticsearch-server-internal';
 import { config as RawHttpConfig } from '@kbn/core-http-server-internal';
-import { savedObjectsConfig as RawSavedObjectsConfig } from '../saved_objects/saved_objects_config';
+import { savedObjectsConfig as RawSavedObjectsConfig } from '@kbn/core-saved-objects-base-server-internal';
 import { httpServiceMock } from '@kbn/core-http-server-mocks';
 import { metricsServiceMock } from '@kbn/core-metrics-server-mocks';
 import { savedObjectsServiceMock } from '../saved_objects/saved_objects_service.mock';
 
 import { CoreUsageDataService } from './core_usage_data_service';
 import { elasticsearchServiceMock } from '@kbn/core-elasticsearch-server-mocks';
-import { typeRegistryMock } from '../saved_objects/saved_objects_type_registry.mock';
+import { typeRegistryMock } from '@kbn/core-saved-objects-base-server-mocks';
 import { CORE_USAGE_STATS_TYPE } from './constants';
 import { CoreUsageStatsClient } from './core_usage_stats_client';
 

src/core/server/core_usage_data/core_usage_data_service.ts

@@ -23,9 +23,12 @@ import type { HttpConfigType, InternalHttpServiceSetup } from '@kbn/core-http-se
 import type { ElasticsearchServiceStart } from '@kbn/core-elasticsearch-server';
 import type { ElasticsearchConfigType } from '@kbn/core-elasticsearch-server-internal';
 import type { MetricsServiceSetup, OpsMetrics } from '@kbn/core-metrics-server';
-import { SavedObjectsServiceStart, SavedObjectTypeRegistry } from '..';
+import {
+  LEGACY_URL_ALIAS_TYPE,
+  type SavedObjectsConfigType,
+} from '@kbn/core-saved-objects-base-server-internal';
 
-import { SavedObjectsConfigType } from '../saved_objects/saved_objects_config';
+import { SavedObjectsServiceStart, SavedObjectTypeRegistry } from '..';
 import type {
   CoreServicesUsageData,
   CoreUsageData,
@@ -36,7 +39,6 @@ import type {
 } from './types';
 import { isConfigured } from './is_configured';
 import { coreUsageStatsType } from './core_usage_stats';
-import { LEGACY_URL_ALIAS_TYPE } from '../saved_objects/object_types';
 import { CORE_USAGE_STATS_TYPE } from './constants';
 import { CoreUsageStatsClient } from './core_usage_stats_client';
 import { CoreIncrementUsageCounter } from './types';

src/core/server/core_usage_data/core_usage_stats_client.test.ts

@@ -29,8 +29,8 @@ import {
   LEGACY_DASHBOARDS_EXPORT_STATS_PREFIX,
   BULK_RESOLVE_STATS_PREFIX,
 } from './core_usage_stats_client';
+import { DEFAULT_NAMESPACE_STRING } from '@kbn/core-saved-objects-utils-server';
 import { CoreUsageStatsClient } from '.';
-import { DEFAULT_NAMESPACE_STRING } from '../saved_objects/service/lib/utils';
 
 describe('CoreUsageStatsClient', () => {
   const setup = (namespace?: string) => {

src/core/server/core_usage_data/core_usage_stats_client.ts

@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { DEFAULT_NAMESPACE_STRING } from '@kbn/core-saved-objects-utils-server';
 import { CORE_USAGE_STATS_TYPE, CORE_USAGE_STATS_ID } from './constants';
 import { CoreUsageStats } from './types';
-import { DEFAULT_NAMESPACE_STRING } from '../saved_objects/service/lib/utils';
 import {
   ISavedObjectsRepository,
   SavedObjectsImportOptions,

src/core/server/index.ts

@@ -388,6 +388,12 @@ export type {
   ISavedObjectsSerializer,
   SavedObjectsRequestHandlerContext,
 } from '@kbn/core-saved-objects-server';
+export {
+  SavedObjectsErrorHelpers,
+  SavedObjectsUtils,
+  mergeSavedObjectMigrationMaps,
+} from '@kbn/core-saved-objects-utils-server';
+export { SavedObjectTypeRegistry } from '@kbn/core-saved-objects-base-server-internal';
 
 export type {
   SavedObjectsRepository,
@@ -396,14 +402,7 @@ export type {
   SavedObjectsImporter,
   SavedObjectsImportError,
 } from './saved_objects';
-export {
-  SavedObjectsClient,
-  SavedObjectsErrorHelpers,
-  SavedObjectsSerializer,
-  SavedObjectTypeRegistry,
-  SavedObjectsUtils,
-  mergeSavedObjectMigrationMaps,
-} from './saved_objects';
+export { SavedObjectsClient } from './saved_objects';
 
 export type {
   IUiSettingsClient,

src/core/server/integration_tests/saved_objects/routes/delete_unknown_types.test.ts

@@ -8,8 +8,8 @@
 
 import supertest from 'supertest';
 import { elasticsearchServiceMock } from '@kbn/core-elasticsearch-server-mocks';
+import { typeRegistryMock } from '@kbn/core-saved-objects-base-server-mocks';
 import { registerDeleteUnknownTypesRoute } from '../../../saved_objects/routes/deprecations';
-import { typeRegistryMock } from '../../../saved_objects/saved_objects_type_registry.mock';
 import { setupServer } from '../../../saved_objects/routes/test_utils';
 import { SavedObjectsType } from '../../..';
 import type { InternalSavedObjectsRequestHandlerContext } from '../../../saved_objects/internal_types';

src/core/server/integration_tests/saved_objects/routes/export.test.ts

@@ -16,7 +16,7 @@ import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
 import { savedObjectsExporterMock } from '../../../saved_objects/export/saved_objects_exporter.mock';
-import { SavedObjectConfig } from '../../../saved_objects/saved_objects_config';
+import type { SavedObjectConfig } from '@kbn/core-saved-objects-base-server-internal';
 import { registerExportRoute } from '../../../saved_objects/routes/export';
 import { setupServer, createExportableType } from '../../../saved_objects/routes/test_utils';
 import type { InternalSavedObjectsRequestHandlerContext } from '../../../saved_objects/internal_types';

src/core/server/integration_tests/saved_objects/routes/import.test.ts

@@ -9,14 +9,15 @@
 jest.mock('uuid');
 
 import supertest from 'supertest';
+import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-utils-server';
 import { registerImportRoute } from '../../../saved_objects/routes/import';
 import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
-import { SavedObjectConfig } from '../../../saved_objects/saved_objects_config';
+import { SavedObjectConfig } from '@kbn/core-saved-objects-base-server-internal';
 import { setupServer, createExportableType } from '../../../saved_objects/routes/test_utils';
-import { SavedObjectsErrorHelpers, SavedObjectsImporter } from '../../../saved_objects';
+import { SavedObjectsImporter } from '../../../saved_objects';
 import type { InternalSavedObjectsRequestHandlerContext } from '../../../saved_objects/internal_types';
 
 type SetupServerReturn = Awaited<ReturnType<typeof setupServer>>;

src/core/server/integration_tests/saved_objects/routes/resolve_import_errors.test.ts

@@ -15,7 +15,7 @@ import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
 import { setupServer, createExportableType } from '../../../saved_objects/routes/test_utils';
-import { SavedObjectConfig } from '../../../saved_objects/saved_objects_config';
+import { SavedObjectConfig } from '@kbn/core-saved-objects-base-server-internal';
 import { SavedObjectsImporter } from '../../../saved_objects/import';
 import type { InternalSavedObjectsRequestHandlerContext } from '../../../saved_objects/internal_types';
 

src/core/server/mocks.ts

@@ -23,6 +23,7 @@ import { httpServiceMock } from '@kbn/core-http-server-mocks';
 import { elasticsearchServiceMock } from '@kbn/core-elasticsearch-server-mocks';
 import { metricsServiceMock } from '@kbn/core-metrics-server-mocks';
 import { capabilitiesServiceMock } from '@kbn/core-capabilities-server-mocks';
+import { typeRegistryMock as savedObjectsTypeRegistryMock } from '@kbn/core-saved-objects-base-server-mocks';
 import type {
   PluginInitializerContext,
   CoreSetup,
@@ -34,7 +35,6 @@ import type {
 import { httpResourcesMock } from './http_resources/http_resources_service.mock';
 import { savedObjectsServiceMock } from './saved_objects/saved_objects_service.mock';
 import { savedObjectsClientMock } from './saved_objects/service/saved_objects_client.mock';
-import { typeRegistryMock as savedObjectsTypeRegistryMock } from './saved_objects/saved_objects_type_registry.mock';
 import { renderingMock } from './rendering/rendering_service.mock';
 import { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
 import { SharedGlobalConfig } from './plugins';
@@ -47,12 +47,12 @@ export { configServiceMock, configDeprecationsMock } from '@kbn/config-mocks';
 export { loggingSystemMock } from '@kbn/core-logging-server-mocks';
 export { httpServerMock, sessionStorageMock, httpServiceMock } from '@kbn/core-http-server-mocks';
 export { elasticsearchServiceMock } from '@kbn/core-elasticsearch-server-mocks';
+export { typeRegistryMock as savedObjectsTypeRegistryMock } from '@kbn/core-saved-objects-base-server-mocks';
 export { httpResourcesMock } from './http_resources/http_resources_service.mock';
 export { savedObjectsRepositoryMock } from './saved_objects/service/lib/repository.mock';
 export { savedObjectsServiceMock } from './saved_objects/saved_objects_service.mock';
 export { savedObjectsClientMock } from './saved_objects/service/saved_objects_client.mock';
 export { migrationMocks } from './saved_objects/migrations/mocks';
-export { typeRegistryMock as savedObjectsTypeRegistryMock } from './saved_objects/saved_objects_type_registry.mock';
 export { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
 export { metricsServiceMock } from '@kbn/core-metrics-server-mocks';
 export { renderingMock } from './rendering/rendering_service.mock';

src/core/server/plugins/legacy_config.ts

@@ -16,8 +16,11 @@ import {
   ElasticsearchConfigType,
   config as elasticsearchConfig,
 } from '@kbn/core-elasticsearch-server-internal';
+import {
+  type SavedObjectsConfigType,
+  savedObjectsConfig,
+} from '@kbn/core-saved-objects-base-server-internal';
 import { SharedGlobalConfig, SharedGlobalConfigKeys } from './types';
-import { SavedObjectsConfigType, savedObjectsConfig } from '../saved_objects/saved_objects_config';
 
 const createGlobalConfig = ({
   elasticsearch,

src/core/server/plugins/types.ts

@@ -20,8 +20,7 @@ import type {
 import type { PluginName, PluginOpaqueId, PluginType } from '@kbn/core-base-common';
 import type { NodeInfo } from '@kbn/core-node-server';
 import type { ElasticsearchConfigType } from '@kbn/core-elasticsearch-server-internal';
-
-import { SavedObjectsConfigType } from '../saved_objects/saved_objects_config';
+import type { SavedObjectsConfigType } from '@kbn/core-saved-objects-base-server-internal';
 import { CorePreboot, CoreSetup, CoreStart } from '..';
 
 type Maybe<T> = T | undefined;

src/core/server/saved_objects/deprecations/deprecation_factory.ts

@@ -7,8 +7,8 @@
  */
 
 import type { ISavedObjectTypeRegistry } from '@kbn/core-saved-objects-server';
+import type { SavedObjectConfig } from '@kbn/core-saved-objects-base-server-internal';
 import type { RegisterDeprecationsConfig } from '../../deprecations';
-import type { SavedObjectConfig } from '../saved_objects_config';
 import { getUnknownTypesDeprecations } from './unknown_object_types';
 
 interface GetDeprecationProviderOptions {

src/core/server/saved_objects/deprecations/unknown_object_types.test.ts

@@ -9,7 +9,7 @@
 import { getIndexForTypeMock } from './unknown_object_types.test.mocks';
 
 import { deleteUnknownTypeObjects, getUnknownTypesDeprecations } from './unknown_object_types';
-import { typeRegistryMock } from '../saved_objects_type_registry.mock';
+import { typeRegistryMock } from '@kbn/core-saved-objects-base-server-mocks';
 import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
 import { SavedObjectsType } from '../..';
 import { createAggregateTypesSearchResponse } from '../migrations/actions/check_for_unknown_docs.mocks';

src/core/server/saved_objects/export/collect_exported_objects.test.ts

@@ -15,7 +15,7 @@ import type {
 import { applyExportTransformsMock } from './collect_exported_objects.test.mocks';
 import { savedObjectsClientMock } from '../../mocks';
 import { loggerMock } from '@kbn/logging-mocks';
-import { SavedObjectTypeRegistry } from '../saved_objects_type_registry';
+import { SavedObjectTypeRegistry } from '@kbn/core-saved-objects-base-server-internal';
 import { collectExportedObjects, ExclusionReason } from './collect_exported_objects';
 
 const createObject = (parts: Partial<SavedObject>): SavedObject => ({

src/core/server/saved_objects/export/saved_objects_exporter.test.ts

@@ -8,9 +8,9 @@
 
 import { httpServerMock } from '@kbn/core-http-server-mocks';
 import type { SavedObject } from '@kbn/core-saved-objects-common';
+import { SavedObjectTypeRegistry } from '@kbn/core-saved-objects-base-server-internal';
 import { SavedObjectsExporter } from './saved_objects_exporter';
 import { savedObjectsClientMock } from '../service/saved_objects_client.mock';
-import { SavedObjectTypeRegistry } from '../saved_objects_type_registry';
 import { loggerMock, MockedLogger } from '@kbn/logging-mocks';
 import { Readable } from 'stream';
 import { createPromiseFromStreams, createConcatStream } from '@kbn/utils';

src/core/server/saved_objects/import/import_saved_objects.test.ts

@@ -30,8 +30,8 @@ import type {
   ISavedObjectTypeRegistry,
   SavedObjectsImportHook,
 } from '@kbn/core-saved-objects-server';
+import { typeRegistryMock } from '@kbn/core-saved-objects-base-server-mocks';
 import { savedObjectsClientMock } from '../../mocks';
-import { typeRegistryMock } from '../saved_objects_type_registry.mock';
 import { importSavedObjectsFromStream, ImportSavedObjectsOptions } from './import_saved_objects';
 import type { ImportStateMap } from './lib';
 

src/core/server/saved_objects/import/lib/check_conflicts.test.ts

@@ -13,7 +13,7 @@ import type {
   SavedObjectsImportRetry,
 } from '@kbn/core-saved-objects-common';
 import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
-import { SavedObjectsErrorHelpers } from '../../service';
+import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-utils-server';
 import { checkConflicts } from './check_conflicts';
 
 jest.mock('uuid', () => ({

src/core/server/saved_objects/import/lib/check_origin_conflicts.test.ts

@@ -16,9 +16,9 @@ import type {
 } from '@kbn/core-saved-objects-common';
 import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
 import type { ISavedObjectTypeRegistry } from '@kbn/core-saved-objects-server';
+import { typeRegistryMock } from '@kbn/core-saved-objects-base-server-mocks';
 import { checkOriginConflicts } from './check_origin_conflicts';
 import { savedObjectsClientMock } from '../../../mocks';
-import { typeRegistryMock } from '../../saved_objects_type_registry.mock';
 import type { ImportStateMap } from './types';
 
 jest.mock('uuid', () => ({

src/core/server/saved_objects/import/lib/check_reference_origins.test.ts

@@ -15,7 +15,7 @@ import type {
 import type { ISavedObjectTypeRegistry } from '@kbn/core-saved-objects-server';
 import { checkReferenceOrigins, CheckReferenceOriginsParams } from './check_reference_origins';
 import { savedObjectsClientMock } from '../../../mocks';
-import { typeRegistryMock } from '../../saved_objects_type_registry.mock';
+import { typeRegistryMock } from '@kbn/core-saved-objects-base-server-mocks';
 import type { ImportStateMap } from './types';
 
 const MULTI_NS_TYPE = 'multi';

src/core/server/saved_objects/import/lib/create_saved_objects.test.ts

@@ -9,8 +9,8 @@
 import { savedObjectsClientMock } from '../../../mocks';
 import type { SavedObject, SavedObjectsImportFailure } from '@kbn/core-saved-objects-common';
 import { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
+import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-utils-server';
 import { createSavedObjects } from './create_saved_objects';
-import { SavedObjectsErrorHelpers } from '../../service';
 import { extractErrors } from './extract_errors';
 
 type CreateSavedObjectsParams = Parameters<typeof createSavedObjects>[0];

src/core/server/saved_objects/import/lib/extract_errors.test.ts

@@ -8,8 +8,8 @@
 
 import type { SavedObject } from '@kbn/core-saved-objects-common';
 import type { CreatedObject } from '@kbn/core-saved-objects-server';
+import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-utils-server';
 import { extractErrors } from './extract_errors';
-import { SavedObjectsErrorHelpers } from '../../service';
 
 describe('extractErrors()', () => {
   test('returns empty array when no errors exist', () => {

src/core/server/saved_objects/import/lib/validate_references.test.ts

@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
+import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-utils-server';
 import type { ValidateReferencesParams } from './validate_references';
 import { validateReferences } from './validate_references';
 import { savedObjectsClientMock } from '../../../mocks';
-import { SavedObjectsErrorHelpers } from '../../service';
 
 function setup({
   objects = [],

src/core/server/saved_objects/import/resolve_import_errors.test.ts

@@ -36,8 +36,8 @@ import type {
   ISavedObjectTypeRegistry,
   SavedObjectsImportHook,
 } from '@kbn/core-saved-objects-server';
+import { typeRegistryMock } from '@kbn/core-saved-objects-base-server-mocks';
 import { savedObjectsClientMock } from '../../mocks';
-import { typeRegistryMock } from '../saved_objects_type_registry.mock';
 import {
   resolveSavedObjectsImportErrors,
   ResolveSavedObjectsImportErrorsOptions,

src/core/server/saved_objects/index.ts

@@ -14,8 +14,6 @@ export type { SavedObjectsImportError } from './import';
 
 export type { SavedObjectsExporter, SavedObjectsExportError } from './export';
 
-export { SavedObjectsSerializer } from './serialization';
-
 export { SavedObjectsService } from './saved_objects_service';
 
 export type {
@@ -23,10 +21,4 @@ export type {
   InternalSavedObjectsServiceSetup,
 } from './saved_objects_service';
 
-export type { SavedObjectsTypeMappingDefinitions } from './mappings';
-
-export { mergeSavedObjectMigrationMaps } from './migrations';
-
-export { savedObjectsConfig, savedObjectsMigrationConfig } from './saved_objects_config';
-export { SavedObjectTypeRegistry } from './saved_objects_type_registry';
 export { CoreSavedObjectsRouteHandlerContext } from './saved_objects_route_handler_context';

src/core/server/saved_objects/migrations/actions/create_index.ts

@@ -11,8 +11,8 @@ import * as TaskEither from 'fp-ts/lib/TaskEither';
 import { pipe } from 'fp-ts/lib/pipeable';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
+import type { IndexMapping } from '@kbn/core-saved-objects-base-server-internal';
 import { AcknowledgeResponse } from '.';
-import { IndexMapping } from '../../mappings';
 import {
   catchRetryableEsClientErrors,
   RetryableEsClientError,

src/core/server/saved_objects/migrations/actions/fetch_indices.ts

@@ -5,10 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+
 import * as TaskEither from 'fp-ts/lib/TaskEither';
 import * as Either from 'fp-ts/lib/Either';
 import type { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
-import { IndexMapping } from '../../mappings';
+import type { IndexMapping } from '@kbn/core-saved-objects-base-server-internal';
 import {
   catchRetryableEsClientErrors,
   RetryableEsClientError,

src/core/server/saved_objects/migrations/actions/update_and_pickup_mappings.ts

@@ -10,7 +10,7 @@ import * as Either from 'fp-ts/lib/Either';
 import * as TaskEither from 'fp-ts/lib/TaskEither';
 import { pipe } from 'fp-ts/lib/pipeable';
 import type { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
-import { IndexMapping } from '../../mappings';
+import type { IndexMapping } from '@kbn/core-saved-objects-base-server-internal';
 import {
   catchRetryableEsClientErrors,
   RetryableEsClientError,

src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts

@@ -6,7 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { IndexMapping, SavedObjectsTypeMappingDefinitions } from '../../mappings';
+import type {
+  IndexMapping,
+  SavedObjectsTypeMappingDefinitions,
+} from '@kbn/core-saved-objects-base-server-internal';
 import { buildActiveMappings, diffMappings } from './build_active_mappings';
 
 describe('buildActiveMappings', () => {

src/core/server/saved_objects/migrations/core/build_active_mappings.ts

@@ -13,7 +13,10 @@
 import crypto from 'crypto';
 import { cloneDeep, mapValues } from 'lodash';
 import type { SavedObjectsMappingProperties } from '@kbn/core-saved-objects-server';
-import { IndexMapping, SavedObjectsTypeMappingDefinitions } from '../../mappings';
+import type {
+  IndexMapping,
+  SavedObjectsTypeMappingDefinitions,
+} from '@kbn/core-saved-objects-base-server-internal';
 
 /**
  * Creates an index mapping with the core properties required by saved object

src/core/server/saved_objects/migrations/core/build_index_map.test.ts

@@ -7,8 +7,8 @@
  */
 
 import type { SavedObjectsType } from '@kbn/core-saved-objects-server';
+import { SavedObjectTypeRegistry } from '@kbn/core-saved-objects-base-server-internal';
 import { createIndexMap } from './build_index_map';
-import { SavedObjectTypeRegistry } from '../../saved_objects_type_registry';
 
 const createRegistry = (...types: Array<Partial<SavedObjectsType>>) => {
   const registry = new SavedObjectTypeRegistry();

src/core/server/saved_objects/migrations/core/build_index_map.ts

@@ -7,7 +7,7 @@
  */
 
 import type { ISavedObjectTypeRegistry } from '@kbn/core-saved-objects-server';
-import type { SavedObjectsTypeMappingDefinitions } from '../../mappings';
+import type { SavedObjectsTypeMappingDefinitions } from '@kbn/core-saved-objects-base-server-internal';
 
 export interface CreateIndexMapOptions {
   kibanaIndexName: string;

src/core/server/saved_objects/migrations/core/disable_unknown_type_mapping_fields.ts

@@ -7,7 +7,7 @@
  */
 
 import type { SavedObjectsMappingProperties } from '@kbn/core-saved-objects-server';
-import { IndexMapping } from '../../mappings';
+import type { IndexMapping } from '@kbn/core-saved-objects-base-server-internal';
 
 /**
  * Merges the active mappings and the source mappings while disabling the

src/core/server/saved_objects/migrations/core/document_migrator.test.mock.ts

@@ -7,8 +7,9 @@
  */
 
 const mockGetConvertedObjectId = jest.fn().mockReturnValue('uuidv5');
-jest.mock('../../service/lib/utils', () => {
-  const actual = jest.requireActual('../../service/lib/utils');
+
+jest.mock('@kbn/core-saved-objects-utils-server', () => {
+  const actual = jest.requireActual('@kbn/core-saved-objects-utils-server');
   return {
     ...actual,
     SavedObjectsUtils: {

src/core/server/saved_objects/migrations/core/document_migrator.test.ts

@@ -10,11 +10,13 @@ import { mockGetConvertedObjectId } from './document_migrator.test.mock';
 import { set } from '@kbn/safer-lodash-set';
 import _ from 'lodash';
 import type { SavedObjectUnsanitizedDoc, SavedObjectsType } from '@kbn/core-saved-objects-server';
+import {
+  SavedObjectTypeRegistry,
+  LEGACY_URL_ALIAS_TYPE,
+} from '@kbn/core-saved-objects-base-server-internal';
 import { DocumentMigrator } from './document_migrator';
 import { TransformSavedObjectDocumentError } from './transform_saved_object_document_error';
 import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
-import { SavedObjectTypeRegistry } from '../../saved_objects_type_registry';
-import { LEGACY_URL_ALIAS_TYPE } from '../../object_types';
 
 const mockLoggerFactory = loggingSystemMock.create();
 const mockLogger = mockLoggerFactory.get('mock logger');

src/core/server/saved_objects/migrations/core/document_migrator.ts

@@ -58,10 +58,13 @@ import type {
   SavedObjectMigrationFn,
   SavedObjectMigrationMap,
 } from '@kbn/core-saved-objects-server';
+import { DEFAULT_NAMESPACE_STRING, SavedObjectsUtils } from '@kbn/core-saved-objects-utils-server';
+import {
+  type LegacyUrlAlias,
+  LEGACY_URL_ALIAS_TYPE,
+} from '@kbn/core-saved-objects-base-server-internal';
 import { MigrationLogger } from './migration_logger';
 import { TransformSavedObjectDocumentError } from '.';
-import { DEFAULT_NAMESPACE_STRING, SavedObjectsUtils } from '../../service/lib/utils';
-import { LegacyUrlAlias, LEGACY_URL_ALIAS_TYPE } from '../../object_types';
 
 const DEFAULT_MINIMUM_CONVERT_VERSION = '8.0.0';
 

src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts

@@ -9,8 +9,10 @@
 import { set } from '@kbn/safer-lodash-set';
 import * as Either from 'fp-ts/lib/Either';
 import _ from 'lodash';
-import { SavedObjectTypeRegistry } from '../../saved_objects_type_registry';
-import { SavedObjectsSerializer } from '../../serialization';
+import {
+  SavedObjectTypeRegistry,
+  SavedObjectsSerializer,
+} from '@kbn/core-saved-objects-base-server-internal';
 import {
   DocumentsTransformFailed,
   DocumentsTransformSuccess,

src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts

@@ -16,7 +16,7 @@ import type {
   SavedObjectsRawDoc,
   SavedObjectUnsanitizedDoc,
 } from '@kbn/core-saved-objects-server';
-import { SavedObjectsSerializer } from '../../serialization';
+import { SavedObjectsSerializer } from '@kbn/core-saved-objects-base-server-internal';
 import { MigrateAndConvertFn } from './document_migrator';
 import { TransformSavedObjectDocumentError } from '.';