Introduce src/common for code/types shared between public/server

elastic · Jul 4, 2019 · 5f7b8e9 · 5f7b8e9
1 parent 9e78c2c
commit 5f7b8e9
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 25 deletions.
diff --git a/src/core/common/index.ts b/src/core/common/index.ts
@@ -0,0 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export {
+  SavedObject,
+  SavedObjectAttributes,
+  SavedObjectReference,
+  SavedObjectsClientContract as SavedObjectsServerClientContract,
+  SavedObjectsFindOptions,
+  SavedObjectsMigrationVersion,
+} from '../server/saved_objects';
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
@@ -8,12 +8,12 @@ import { IconType } from '@elastic/eui';
 import { Observable } from 'rxjs';
 import React from 'react';
 import * as Rx from 'rxjs';
-import { SavedObject } from 'src/core/server';
-import { SavedObjectAttributes } from 'src/core/server';
-import { SavedObjectReference } from 'src/core/server';
-import { SavedObjectsClientContract as SavedObjectsApi } from 'src/core/server';
-import { SavedObjectsFindOptions } from 'src/core/server';
-import { SavedObjectsMigrationVersion } from 'src/core/server';
+import { SavedObject } from 'src/core/common';
+import { SavedObjectAttributes } from 'src/core/common';
+import { SavedObjectReference } from 'src/core/common';
+import { SavedObjectsServerClientContract as SavedObjectsApi } from 'src/core/common';
+import { SavedObjectsFindOptions } from 'src/core/common';
+import { SavedObjectsMigrationVersion } from 'src/core/common';
 import { EuiGlobalToastListToast as Toast } from '@elastic/eui';
 
 // @public (undocumented)

diff --git a/src/core/public/saved_objects/saved_objects_client.ts b/src/core/public/saved_objects/saved_objects_client.ts
@@ -24,10 +24,10 @@ import {
   SavedObject,
   SavedObjectAttributes,
   SavedObjectReference,
-  SavedObjectsClientContract as SavedObjectsApi,
+  SavedObjectsServerClientContract as SavedObjectsApi,
   SavedObjectsFindOptions,
   SavedObjectsMigrationVersion,
-} from 'src/core/server';
+} from 'src/core/common';
 // TODO: Migrate to an error modal powered by the NP?
 import {
   isAutoCreateIndexError,
@@ -40,10 +40,10 @@ export {
   SavedObject,
   SavedObjectAttributes,
   SavedObjectReference,
-  SavedObjectsClientContract as SavedObjectsApi,
+  SavedObjectsServerClientContract as SavedObjectsApi,
   SavedObjectsFindOptions,
   SavedObjectsMigrationVersion,
-} from 'src/core/server';
+} from 'src/core/common';
 
 interface RequestParams {
   method: 'POST' | 'GET' | 'PUT' | 'DELETE';

diff --git a/src/core/public/saved_objects/simple_saved_object.ts b/src/core/public/saved_objects/simple_saved_object.ts
@@ -18,7 +18,7 @@
  */
 
 import { get, has, set } from 'lodash';
-import { SavedObject as SavedObjectType, SavedObjectAttributes } from 'src/core/server';
+import { SavedObject as SavedObjectType, SavedObjectAttributes } from 'src/core/common';
 import { SavedObjectsClient } from './saved_objects_client';
 
 /**

diff --git a/src/core/server/saved_objects/service/saved_objects_client.ts b/src/core/server/saved_objects/service/saved_objects_client.ts
@@ -115,14 +115,6 @@ export interface SavedObjectsBulkGetObject {
   fields?: string[];
 }
 
-/**
- *
- * @public
- */
-export interface SavedObjectsBulkResponse<T extends SavedObjectAttributes = any> {
-  saved_objects: Array<SavedObject<T>>;
-}
-
 /**
  *
  * @public

diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
@@ -469,12 +469,6 @@ export interface SavedObjectsBulkResponse<T extends SavedObjectAttributes = any>
     saved_objects: Array<SavedObject<T>>;
 }
 
-// @public (undocumented)
-export interface SavedObjectsBulkResponse<T extends SavedObjectAttributes = any> {
-    // (undocumented)
-    saved_objects: Array<SavedObject<T>>;
-}
-
 // @internal (undocumented)
 export class SavedObjectsClient {
     // Warning: (ae-forgotten-export) The symbol "SavedObjectsRepository" needs to be exported by the entry point index.d.ts

diff --git a/src/dev/jest/config.js b/src/dev/jest/config.js
@@ -55,6 +55,7 @@ export default {
   moduleNameMapper: {
     '^plugins/([^\/.]*)(.*)': '<rootDir>/src/legacy/core_plugins/$1/public$2',
     '^ui/(.*)': '<rootDir>/src/legacy/ui/public/$1',
+    '^src/core/(.*)': '<rootDir>/src/core/$1',
     '^uiExports/(.*)': '<rootDir>/src/dev/jest/mocks/file_mock.js',
     '^test_utils/(.*)': '<rootDir>/src/test_utils/public/$1',
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/src/dev/jest/mocks/file_mock.js',