Move paste plugin to roosterjs-content-model-plugins package (#2192)

microsoft · Nov 7, 2023 · 528caf4 · 528caf4
1 parent d79c2ca
commit 528caf4
Show file tree

Hide file tree

Showing 59 changed files with 117 additions and 92 deletions.
diff --git a/demo/scripts/controls/getToggleablePlugins.ts b/demo/scripts/controls/getToggleablePlugins.ts
@@ -2,7 +2,7 @@ import BuildInPluginState, { BuildInPluginList, UrlPlaceholder } from './BuildIn
 import { Announce } from 'roosterjs-editor-plugins/lib/Announce';
 import { AutoFormat } from 'roosterjs-editor-plugins/lib/AutoFormat';
 import { ContentEdit } from 'roosterjs-editor-plugins/lib/ContentEdit';
-import { ContentModelPastePlugin } from 'roosterjs-content-model-editor';
+import { ContentModelPastePlugin } from 'roosterjs-content-model-plugins';
 import { CustomReplace as CustomReplacePlugin } from 'roosterjs-editor-plugins/lib/CustomReplace';
 import { CutPasteListChain } from 'roosterjs-editor-plugins/lib/CutPasteListChain';
 import { EditorPlugin, KnownAnnounceStrings } from 'roosterjs-editor-types';

diff --git a/demo/scripts/tsconfig.json b/demo/scripts/tsconfig.json
@@ -43,11 +43,11 @@
             "roosterjs-content-model-editor/lib/*": [
                 "packages-content-model/roosterjs-content-model-editor/lib/*"
             ],
-            "roosterjs-content-model-adapter": [
-                "packages-content-model/roosterjs-content-model-adapter/lib/index"
+            "roosterjs-content-model-plugins": [
+                "packages-content-model/roosterjs-content-model-plugins/lib/index"
             ],
-            "roosterjs-content-model-adapter/lib/*": [
-                "packages-content-model/roosterjs-content-model-adapter/lib/*"
+            "roosterjs-content-model-plugins/lib/*": [
+                "packages-content-model/roosterjs-content-model-plugins/lib/*"
             ],
             "roosterjs-react": ["packages-ui/roosterjs-react/lib/index"],
             "roosterjs-react/lib/*": ["packages-ui/roosterjs-react/lib/*"]

diff --git a/...ges-content-model/roosterjs-content-model-editor/lib/editor/coreApi/createContentModel.ts b/...ges-content-model/roosterjs-content-model-editor/lib/editor/coreApi/createContentModel.ts
@@ -1,4 +1,4 @@
-import { cloneModel } from '../../modelApi/common/cloneModel';
+import { cloneModel } from '../../publicApi/model/cloneModel';
 import type { DOMSelection, DomToModelOption } from 'roosterjs-content-model-types';
 import {
     createDomToModelContext,

diff --git a/...odel/roosterjs-content-model-editor/lib/editor/corePlugins/ContentModelCopyPastePlugin.ts b/...odel/roosterjs-content-model-editor/lib/editor/corePlugins/ContentModelCopyPastePlugin.ts
@@ -1,7 +1,7 @@
 import paste from '../../publicApi/utils/paste';
 import { addRangeToSelection } from '../../domUtils/addRangeToSelection';
 import { ChangeSource } from '../../publicTypes/event/ContentModelContentChangedEvent';
-import { cloneModel } from '../../modelApi/common/cloneModel';
+import { cloneModel } from '../../publicApi/model/cloneModel';
 import { ColorTransformDirection, PluginEventType } from 'roosterjs-editor-types';
 import { deleteSelection } from '../../modelApi/edit/deleteSelection';
 import { extractClipboardItems } from 'roosterjs-editor-dom';

diff --git a/packages-content-model/roosterjs-content-model-editor/lib/index.ts b/packages-content-model/roosterjs-content-model-editor/lib/index.ts
@@ -106,10 +106,10 @@ export { default as setParagraphMargin } from './publicApi/block/setParagraphMar
 export { default as toggleCode } from './publicApi/segment/toggleCode';
 export { default as paste } from './publicApi/utils/paste';
 export { default as insertEntity } from './publicApi/entity/insertEntity';
+export { CachedElementHandler, CloneModelOptions, cloneModel } from './publicApi/model/cloneModel';
 
 export { default as ContentModelEditor } from './editor/ContentModelEditor';
 export { default as isContentModelEditor } from './editor/isContentModelEditor';
-export { default as ContentModelPastePlugin } from './editor/plugins/PastePlugin/ContentModelPastePlugin';
 
 export { default as ContentModelFormatPlugin } from './editor/corePlugins/ContentModelFormatPlugin';
 export { default as ContentModelEditPlugin } from './editor/corePlugins/ContentModelEditPlugin';

diff --git a/...-editor/lib/modelApi/common/cloneModel.ts → ...-editor/lib/publicApi/model/cloneModel.ts b/...-editor/lib/modelApi/common/cloneModel.ts → ...-editor/lib/publicApi/model/cloneModel.ts
@@ -28,15 +28,20 @@ import type {
 } from 'roosterjs-content-model-types';
 
 /**
- * @internal
+ * Function type used for cloneModel API to specify how to handle cached element when clone a model
+ * @param node The cached node
+ * @param type Type of the node, it can be
+ * - general: DOM element of ContentModelGeneralSegment or ContentModelGeneralBlock
+ * - entity: Wrapper element in ContentModelEntity
+ * - cache: Cached node in other model element that supports cache
  */
 export type CachedElementHandler = (
     node: HTMLElement,
     type: 'general' | 'entity' | 'cache'
 ) => HTMLElement | undefined;
 
 /**
- * @internal
+ *
  * Options for cloneModel API
  */
 export interface CloneModelOptions {
@@ -51,7 +56,9 @@ export interface CloneModelOptions {
 }
 
 /**
- * @internal
+ * Clone a content model
+ * @param model The content model to clone
+ * @param options @optional Options to specify customize the clone behavior
  */
 export function cloneModel(
     model: ContentModelDocument,

diff --git a/...ontent-model/roosterjs-content-model-editor/test/editor/coreApi/createContentModelTest.ts b/...ontent-model/roosterjs-content-model-editor/test/editor/coreApi/createContentModelTest.ts
@@ -1,4 +1,4 @@
-import * as cloneModel from '../../../lib/modelApi/common/cloneModel';
+import * as cloneModel from '../../../lib/publicApi/model/cloneModel';
 import * as createDomToModelContext from 'roosterjs-content-model-dom/lib/domToModel/context/createDomToModelContext';
 import * as domToContentModel from 'roosterjs-content-model-dom/lib/domToModel/domToContentModel';
 import { ContentModelEditorCore } from '../../../lib/publicTypes/ContentModelEditorCore';

diff --git a/...del/roosterjs-content-model-editor/test/editor/plugins/ContentModelCopyPastePluginTest.ts b/...del/roosterjs-content-model-editor/test/editor/plugins/ContentModelCopyPastePluginTest.ts
@@ -1,5 +1,5 @@
 import * as addRangeToSelection from '../../../lib/domUtils/addRangeToSelection';
-import * as cloneModelFile from '../../../lib/modelApi/common/cloneModel';
+import * as cloneModelFile from '../../../lib/publicApi/model/cloneModel';
 import * as contentModelToDomFile from 'roosterjs-content-model-dom/lib/modelToDom/contentModelToDom';
 import * as deleteSelectionsFile from '../../../lib/modelApi/edit/deleteSelection';
 import * as extractClipboardItemsFile from 'roosterjs-editor-dom/lib/clipboard/extractClipboardItems';

diff --git a/...or/test/modelApi/common/cloneModelTest.ts → ...or/test/publicApi/model/cloneModelTest.ts b/...or/test/modelApi/common/cloneModelTest.ts → ...or/test/publicApi/model/cloneModelTest.ts
@@ -1,4 +1,4 @@
-import { cloneModel } from '../../../lib/modelApi/common/cloneModel';
+import { cloneModel } from '../../../lib/publicApi/model/cloneModel';
 import { ContentModelDocument } from 'roosterjs-content-model-types';
 import { createEntity } from 'roosterjs-content-model-dom';
 

diff --git a/packages-content-model/roosterjs-content-model-editor/test/publicApi/utils/pasteTest.ts b/packages-content-model/roosterjs-content-model-editor/test/publicApi/utils/pasteTest.ts
@@ -1,19 +1,22 @@
-import * as addParserF from '../../../lib/editor/plugins/PastePlugin/utils/addParser';
+import * as addParserF from '../../../../roosterjs-content-model-plugins/lib/paste/utils/addParser';
 import * as domToContentModel from 'roosterjs-content-model-dom/lib/domToModel/domToContentModel';
-import * as ExcelF from '../../../lib/editor/plugins/PastePlugin/Excel/processPastedContentFromExcel';
-import * as getPasteSourceF from '../../../lib/editor/plugins/PastePlugin/pasteSourceValidations/getPasteSource';
+import * as ExcelF from '../../../../roosterjs-content-model-plugins/lib/paste/Excel/processPastedContentFromExcel';
+import * as getPasteSourceF from '../../../../roosterjs-content-model-plugins/lib/paste/pasteSourceValidations/getPasteSource';
 import * as getSelectedSegmentsF from '../../../lib/publicApi/selection/getSelectedSegments';
 import * as mergeModelFile from '../../../lib/modelApi/common/mergeModel';
-import * as PPT from '../../../lib/editor/plugins/PastePlugin/PowerPoint/processPastedContentFromPowerPoint';
-import * as setProcessorF from '../../../lib/editor/plugins/PastePlugin/utils/setProcessor';
-import * as WacComponents from '../../../lib/editor/plugins/PastePlugin/WacComponents/processPastedContentWacComponents';
-import * as WordDesktopFile from '../../../lib/editor/plugins/PastePlugin/WordDesktop/processPastedContentFromWordDesktop';
+import * as PPT from '../../../../roosterjs-content-model-plugins/lib/paste/PowerPoint/processPastedContentFromPowerPoint';
+import * as setProcessorF from '../../../../roosterjs-content-model-plugins/lib/paste/utils/setProcessor';
+import * as WacComponents from '../../../../roosterjs-content-model-plugins/lib/paste/WacComponents/processPastedContentWacComponents';
+import * as WordDesktopFile from '../../../../roosterjs-content-model-plugins/lib/paste/WordDesktop/processPastedContentFromWordDesktop';
 import ContentModelEditor from '../../../lib/editor/ContentModelEditor';
-import ContentModelPastePlugin from '../../../lib/editor/plugins/PastePlugin/ContentModelPastePlugin';
 import { ContentModelDocument, DomToModelOption } from 'roosterjs-content-model-types';
+import { ContentModelPastePlugin } from '../../../../roosterjs-content-model-plugins/lib/paste/ContentModelPastePlugin';
 import { createContentModelDocument, tableProcessor } from 'roosterjs-content-model-dom';
-import { expectEqual, initEditor } from '../../editor/plugins/paste/e2e/testUtils';
 import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor';
+import {
+    expectEqual,
+    initEditor,
+} from '../../../../roosterjs-content-model-plugins/test/paste/e2e/testUtils';
 import {
     ContentModelFormatter,
     FormatWithContentModelContext,

diff --git a/packages-content-model/roosterjs-content-model-plugins/lib/index.ts b/packages-content-model/roosterjs-content-model-plugins/lib/index.ts
@@ -0,0 +1 @@
+export { ContentModelPastePlugin } from './paste/ContentModelPastePlugin';
diff --git a/...ns/PastePlugin/ContentModelPastePlugin.ts → ...gins/lib/paste/ContentModelPastePlugin.ts b/...ns/PastePlugin/ContentModelPastePlugin.ts → ...gins/lib/paste/ContentModelPastePlugin.ts
@@ -10,15 +10,17 @@ import { processPastedContentFromExcel } from './Excel/processPastedContentFromE
 import { processPastedContentFromPowerPoint } from './PowerPoint/processPastedContentFromPowerPoint';
 import { processPastedContentFromWordDesktop } from './WordDesktop/processPastedContentFromWordDesktop';
 import { processPastedContentWacComponents } from './WacComponents/processPastedContentWacComponents';
-import type { PasteType } from '../../../publicTypes/parameter/PasteType';
-import type ContentModelBeforePasteEvent from '../../../publicTypes/event/ContentModelBeforePasteEvent';
+import type {
+    ContentModelBeforePasteEvent,
+    IContentModelEditor,
+    PasteType,
+} from 'roosterjs-content-model-editor';
 import type {
     BorderFormat,
     ContentModelBlockFormat,
     ContentModelTableCellFormat,
     FormatParser,
 } from 'roosterjs-content-model-types';
-import type { IContentModelEditor } from '../../../publicTypes/IContentModelEditor';
 import type {
     EditorPlugin,
     HtmlSanitizerOptions,
@@ -43,7 +45,7 @@ const PasteTypeMap: Record<OldPasteType, PasteType> = {
  * 4. Content copied from Power Point
  * (This class is still under development, and may still be changed in the future with some breaking changes)
  */
-export default class ContentModelPastePlugin implements EditorPlugin {
+export class ContentModelPastePlugin implements EditorPlugin {
     private editor: IContentModelEditor | null = null;
 
     /**

diff --git a/...in/Excel/processPastedContentFromExcel.ts → ...te/Excel/processPastedContentFromExcel.ts b/...in/Excel/processPastedContentFromExcel.ts → ...te/Excel/processPastedContentFromExcel.ts
@@ -1,8 +1,8 @@
 import addParser from '../utils/addParser';
 import { isNodeOfType, moveChildNodes } from 'roosterjs-content-model-dom';
 import { setProcessor } from '../utils/setProcessor';
-import type ContentModelBeforePasteEvent from '../../../../publicTypes/event/ContentModelBeforePasteEvent';
 import type { TrustedHTMLHandler } from 'roosterjs-editor-types';
+import type { ContentModelBeforePasteEvent } from 'roosterjs-content-model-editor';
 
 const LAST_TD_END_REGEX = /<\/\s*td\s*>((?!<\/\s*tr\s*>)[\s\S])*$/i;
 const LAST_TR_END_REGEX = /<\/\s*tr\s*>((?!<\/\s*table\s*>)[\s\S])*$/i;

diff --git a/...int/processPastedContentFromPowerPoint.ts → ...int/processPastedContentFromPowerPoint.ts b/...int/processPastedContentFromPowerPoint.ts → ...int/processPastedContentFromPowerPoint.ts
diff --git a/...ents/processPastedContentWacComponents.ts → ...ents/processPastedContentWacComponents.ts b/...ents/processPastedContentWacComponents.ts → ...ents/processPastedContentWacComponents.ts
@@ -1,6 +1,6 @@
 import addParser from '../utils/addParser';
 import { setProcessor } from '../utils/setProcessor';
-import type ContentModelBeforePasteEvent from '../../../../publicTypes/event/ContentModelBeforePasteEvent';
+import type { ContentModelBeforePasteEvent } from 'roosterjs-content-model-editor';
 import type {
     ContentModelBlockFormat,
     ContentModelBlockGroup,

diff --git a/...op/processPastedContentFromWordDesktop.ts → ...op/processPastedContentFromWordDesktop.ts b/...op/processPastedContentFromWordDesktop.ts → ...op/processPastedContentFromWordDesktop.ts
@@ -5,7 +5,7 @@ import { moveChildNodes } from 'roosterjs-content-model-dom';
 import { processWordComments } from './processWordComments';
 import { processWordList } from './processWordLists';
 import { setProcessor } from '../utils/setProcessor';
-import type ContentModelBeforePasteEvent from '../../../../publicTypes/event/ContentModelBeforePasteEvent';
+import type { ContentModelBeforePasteEvent } from 'roosterjs-content-model-editor';
 import type {
     ContentModelBlockFormat,
     ContentModelListItemFormat,

diff --git a/...Plugin/WordDesktop/processWordComments.ts → .../paste/WordDesktop/processWordComments.ts b/...Plugin/WordDesktop/processWordComments.ts → .../paste/WordDesktop/processWordComments.ts
diff --git a/...stePlugin/WordDesktop/processWordLists.ts → ...lib/paste/WordDesktop/processWordLists.ts b/...stePlugin/WordDesktop/processWordLists.ts → ...lib/paste/WordDesktop/processWordLists.ts
diff --git a/...lugin/pasteSourceValidations/constants.ts → ...paste/pasteSourceValidations/constants.ts b/...lugin/pasteSourceValidations/constants.ts → ...paste/pasteSourceValidations/constants.ts
diff --git a/...Validations/documentContainWacElements.ts → ...Validations/documentContainWacElements.ts b/...Validations/documentContainWacElements.ts → ...Validations/documentContainWacElements.ts
diff --git a/.../pasteSourceValidations/getPasteSource.ts → .../pasteSourceValidations/getPasteSource.ts b/.../pasteSourceValidations/getPasteSource.ts → .../pasteSourceValidations/getPasteSource.ts
diff --git a/...urceValidations/isExcelDesktopDocument.ts → ...urceValidations/isExcelDesktopDocument.ts b/...urceValidations/isExcelDesktopDocument.ts → ...urceValidations/isExcelDesktopDocument.ts
diff --git a/...ourceValidations/isExcelOnlineDocument.ts → ...ourceValidations/isExcelOnlineDocument.ts b/...ourceValidations/isExcelOnlineDocument.ts → ...ourceValidations/isExcelOnlineDocument.ts
diff --git a/...ourceValidations/isGoogleSheetDocument.ts → ...ourceValidations/isGoogleSheetDocument.ts b/...ourceValidations/isGoogleSheetDocument.ts → ...ourceValidations/isGoogleSheetDocument.ts
diff --git a/...alidations/isPowerPointDesktopDocument.ts → ...alidations/isPowerPointDesktopDocument.ts b/...alidations/isPowerPointDesktopDocument.ts → ...alidations/isPowerPointDesktopDocument.ts
diff --git a/...ourceValidations/isWordDesktopDocument.ts → ...ourceValidations/isWordDesktopDocument.ts b/...ourceValidations/isWordDesktopDocument.ts → ...ourceValidations/isWordDesktopDocument.ts
diff --git a/...Validations/shouldConvertToSingleImage.ts → ...Validations/shouldConvertToSingleImage.ts b/...Validations/shouldConvertToSingleImage.ts → ...Validations/shouldConvertToSingleImage.ts
diff --git a/...or/plugins/PastePlugin/utils/addParser.ts → ...odel-plugins/lib/paste/utils/addParser.ts b/...or/plugins/PastePlugin/utils/addParser.ts → ...odel-plugins/lib/paste/utils/addParser.ts
diff --git a/...astePlugin/utils/deprecatedColorParser.ts → .../lib/paste/utils/deprecatedColorParser.ts b/...astePlugin/utils/deprecatedColorParser.ts → .../lib/paste/utils/deprecatedColorParser.ts
diff --git a/...or/plugins/PastePlugin/utils/getStyles.ts → ...odel-plugins/lib/paste/utils/getStyles.ts b/...or/plugins/PastePlugin/utils/getStyles.ts → ...odel-plugins/lib/paste/utils/getStyles.ts
diff --git a/...r/plugins/PastePlugin/utils/linkParser.ts → ...del-plugins/lib/paste/utils/linkParser.ts b/...r/plugins/PastePlugin/utils/linkParser.ts → ...del-plugins/lib/paste/utils/linkParser.ts
diff --git a/...plugins/PastePlugin/utils/setProcessor.ts → ...l-plugins/lib/paste/utils/setProcessor.ts b/...plugins/PastePlugin/utils/setProcessor.ts → ...l-plugins/lib/paste/utils/setProcessor.ts
diff --git a/packages-content-model/roosterjs-content-model-plugins/package.json b/packages-content-model/roosterjs-content-model-plugins/package.json
@@ -0,0 +1,15 @@
+{
+    "name": "roosterjs-content-model-plugins",
+    "description": "Content Model for roosterjs (Under development)",
+    "dependencies": {
+        "tslib": "^2.3.1",
+        "roosterjs-editor-types": "",
+        "roosterjs-editor-dom": "",
+        "roosterjs-editor-core": "",
+        "roosterjs-content-model-editor": "",
+        "roosterjs-content-model-dom": "",
+        "roosterjs-content-model-types": ""
+    },
+    "version": "0.0.0",
+    "main": "./lib/index.ts"
+}
diff --git a/...or/plugins/ContentModelPastePluginTest.ts → ...test/paste/ContentModelPastePluginTest.ts b/...or/plugins/ContentModelPastePluginTest.ts → ...test/paste/ContentModelPastePluginTest.ts
@@ -1,15 +1,14 @@
-import * as addParser from '../../../lib/editor/plugins/PastePlugin/utils/addParser';
+import * as addParser from '../../lib/paste/utils/addParser';
 import * as chainSanitizerCallbackFile from 'roosterjs-editor-dom/lib/htmlSanitizer/chainSanitizerCallback';
-import * as ExcelFile from '../../../lib/editor/plugins/PastePlugin/Excel/processPastedContentFromExcel';
-import * as getPasteSource from '../../../lib/editor/plugins/PastePlugin/pasteSourceValidations/getPasteSource';
-import * as PowerPointFile from '../../../lib/editor/plugins/PastePlugin/PowerPoint/processPastedContentFromPowerPoint';
-import * as setProcessor from '../../../lib/editor/plugins/PastePlugin/utils/setProcessor';
-import * as WacFile from '../../../lib/editor/plugins/PastePlugin/WacComponents/processPastedContentWacComponents';
-import * as WordDesktopFile from '../../../lib/editor/plugins/PastePlugin/WordDesktop/processPastedContentFromWordDesktop';
-import ContentModelBeforePasteEvent from '../../../lib/publicTypes/event/ContentModelBeforePasteEvent';
-import ContentModelPastePlugin from '../../../lib/editor/plugins/PastePlugin/ContentModelPastePlugin';
-import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor';
-import { PastePropertyNames } from '../../../lib/editor/plugins/PastePlugin/pasteSourceValidations/constants';
+import * as ExcelFile from '../../lib/paste/Excel/processPastedContentFromExcel';
+import * as getPasteSource from '../../lib/paste/pasteSourceValidations/getPasteSource';
+import * as PowerPointFile from '../../lib/paste/PowerPoint/processPastedContentFromPowerPoint';
+import * as setProcessor from '../../lib/paste/utils/setProcessor';
+import * as WacFile from '../../lib/paste/WacComponents/processPastedContentWacComponents';
+import * as WordDesktopFile from '../../lib/paste/WordDesktop/processPastedContentFromWordDesktop';
+import { ContentModelBeforePasteEvent, IContentModelEditor } from 'roosterjs-content-model-editor';
+import { ContentModelPastePlugin } from '../../lib/paste/ContentModelPastePlugin';
+import { PastePropertyNames } from '../../lib/paste/pasteSourceValidations/constants';
 import { PasteType, PluginEventType } from 'roosterjs-editor-types';
 
 const trustedHTMLHandler = <any>'mock';

diff --git a/...lugins/paste/deprecatedColorParserTest.ts → ...s/test/paste/deprecatedColorParserTest.ts b/...lugins/paste/deprecatedColorParserTest.ts → ...s/test/paste/deprecatedColorParserTest.ts
@@ -1,4 +1,4 @@
-import { deprecatedBorderColorParser } from '../../../../lib/editor/plugins/PastePlugin/utils/deprecatedColorParser';
+import { deprecatedBorderColorParser } from '../../lib/paste/utils/deprecatedColorParser';
 
 const DeprecatedColors: string[] = [
     'activeborder',

diff --git a/...s/paste/e2e/cmPasteFromExcelOnlineTest.ts → ...t/paste/e2e/cmPasteFromExcelOnlineTest.ts b/...s/paste/e2e/cmPasteFromExcelOnlineTest.ts → ...t/paste/e2e/cmPasteFromExcelOnlineTest.ts
@@ -1,8 +1,7 @@
-import * as processPastedContentFromExcel from '../../../../../lib/editor/plugins/PastePlugin/Excel/processPastedContentFromExcel';
-import paste from '../../../../../lib/publicApi/utils/paste';
+import * as processPastedContentFromExcel from '../../../lib/paste/Excel/processPastedContentFromExcel';
 import { ClipboardData } from 'roosterjs-editor-types';
 import { expectEqual, initEditor } from './testUtils';
-import { IContentModelEditor } from '../../../../../lib/publicTypes/IContentModelEditor';
+import { IContentModelEditor, paste } from 'roosterjs-content-model-editor';
 import { itChromeOnly } from 'roosterjs-editor-dom/test/DomTestHelper';
 import { tableProcessor } from 'roosterjs-content-model-dom';
 

diff --git a/...plugins/paste/e2e/cmPasteFromExcelTest.ts → ...ns/test/paste/e2e/cmPasteFromExcelTest.ts b/...plugins/paste/e2e/cmPasteFromExcelTest.ts → ...ns/test/paste/e2e/cmPasteFromExcelTest.ts
@@ -1,9 +1,8 @@
-import * as processPastedContentFromExcel from '../../../../../lib/editor/plugins/PastePlugin/Excel/processPastedContentFromExcel';
-import paste from '../../../../../lib/publicApi/utils/paste';
+import * as processPastedContentFromExcel from '../../../lib/paste/Excel/processPastedContentFromExcel';
 import { Browser } from 'roosterjs-editor-dom';
 import { ClipboardData } from 'roosterjs-editor-types';
 import { expectEqual, initEditor } from './testUtils';
-import { IContentModelEditor } from '../../../../../lib/publicTypes/IContentModelEditor';
+import { IContentModelEditor, paste } from 'roosterjs-content-model-editor';
 import { itChromeOnly } from 'roosterjs-editor-dom/test/DomTestHelper';
 import { tableProcessor } from 'roosterjs-content-model-dom';
 

diff --git a/...r/plugins/paste/e2e/cmPasteFromWacTest.ts → ...gins/test/paste/e2e/cmPasteFromWacTest.ts b/...r/plugins/paste/e2e/cmPasteFromWacTest.ts → ...gins/test/paste/e2e/cmPasteFromWacTest.ts
@@ -1,9 +1,8 @@
-import * as processPastedContentWacComponents from '../../../../../lib/editor/plugins/PastePlugin/WacComponents/processPastedContentWacComponents';
-import paste from '../../../../../lib/publicApi/utils/paste';
+import * as processPastedContentWacComponents from '../../../lib/paste/WacComponents/processPastedContentWacComponents';
 import { ClipboardData } from 'roosterjs-editor-types';
 import { DomToModelOption } from 'roosterjs-content-model-types';
 import { expectEqual, initEditor } from './testUtils';
-import { IContentModelEditor } from '../../../../../lib/publicTypes/IContentModelEditor';
+import { IContentModelEditor, paste } from 'roosterjs-content-model-editor';
 import { tableProcessor } from 'roosterjs-content-model-dom';
 
 const ID = 'CM_Paste_From_WORD_Online_E2E';

diff --git a/.../plugins/paste/e2e/cmPasteFromWordTest.ts → ...ins/test/paste/e2e/cmPasteFromWordTest.ts b/.../plugins/paste/e2e/cmPasteFromWordTest.ts → ...ins/test/paste/e2e/cmPasteFromWordTest.ts
@@ -1,10 +1,8 @@
-import * as wordFile from '../../../../../lib/editor/plugins/PastePlugin/WordDesktop/processPastedContentFromWordDesktop';
-import paste from '../../../../../lib/publicApi/utils/paste';
+import * as wordFile from '../../../lib/paste/WordDesktop/processPastedContentFromWordDesktop';
 import { ClipboardData } from 'roosterjs-editor-types';
-import { cloneModel } from '../../../../../lib/modelApi/common/cloneModel';
+import { cloneModel, IContentModelEditor, paste } from 'roosterjs-content-model-editor';
 import { DomToModelOption } from 'roosterjs-content-model-types';
 import { expectEqual, initEditor } from './testUtils';
-import { IContentModelEditor } from '../../../../../lib/publicTypes/IContentModelEditor';
 import { itChromeOnly } from 'roosterjs-editor-dom/test/DomTestHelper';
 import { tableProcessor } from 'roosterjs-content-model-dom';
 

diff --git a/...t/editor/plugins/paste/e2e/cmPasteTest.ts → ...del-plugins/test/paste/e2e/cmPasteTest.ts b/...t/editor/plugins/paste/e2e/cmPasteTest.ts → ...del-plugins/test/paste/e2e/cmPasteTest.ts
@@ -1,9 +1,8 @@
-import * as wordFile from '../../../../../lib/editor/plugins/PastePlugin/WordDesktop/processPastedContentFromWordDesktop';
-import paste from '../../../../../lib/publicApi/utils/paste';
+import * as wordFile from '../../../lib/paste/WordDesktop/processPastedContentFromWordDesktop';
 import { ClipboardData } from 'roosterjs-editor-types';
 import { DomToModelOption } from 'roosterjs-content-model-types';
 import { expectEqual, initEditor } from './testUtils';
-import { IContentModelEditor } from '../../../../../lib/publicTypes/IContentModelEditor';
+import { IContentModelEditor, paste } from 'roosterjs-content-model-editor';
 import { itChromeOnly } from 'roosterjs-editor-dom/test/DomTestHelper';
 import { tableProcessor } from 'roosterjs-content-model-dom';
 

diff --git a/...est/editor/plugins/paste/e2e/testUtils.ts → ...model-plugins/test/paste/e2e/testUtils.ts b/...est/editor/plugins/paste/e2e/testUtils.ts → ...model-plugins/test/paste/e2e/testUtils.ts
@@ -1,13 +1,13 @@
-import ContentModelEditor from '../../../../../lib/editor/ContentModelEditor';
-import ContentModelPastePlugin from '../../../../../lib/editor/plugins/PastePlugin/ContentModelPastePlugin';
-import { cloneModel } from '../../../../../lib/modelApi/common/cloneModel';
 import { ContentModelDocument } from 'roosterjs-content-model-types';
+import { ContentModelPastePlugin } from '../../../lib/paste/ContentModelPastePlugin';
 import {
     ContentModelEditorOptions,
+    ContentModelEditor,
     IContentModelEditor,
-} from '../../../../../lib/publicTypes/IContentModelEditor';
+    cloneModel,
+} from 'roosterjs-content-model-editor';
 
-export function initEditor(id: string) {
+export function initEditor(id: string): IContentModelEditor {
     let node = document.createElement('div');
     node.id = id;
     document.body.insertBefore(node, document.body.childNodes[0]);
@@ -26,7 +26,7 @@ export function initEditor(id: string) {
 
     let editor = new ContentModelEditor(node as HTMLDivElement, options);
 
-    return editor as IContentModelEditor;
+    return editor;
 }
 
 export function expectEqual(model1: ContentModelDocument, model2: ContentModelDocument) {

diff --git a/...st/editor/plugins/paste/linkParserTest.ts → ...odel-plugins/test/paste/linkParserTest.ts b/...st/editor/plugins/paste/linkParserTest.ts → ...odel-plugins/test/paste/linkParserTest.ts
@@ -1,6 +1,6 @@
 import { ContentModelDocument } from 'roosterjs-content-model-types';
 import { createBeforePasteEventMock } from './processPastedContentFromWordDesktopTest';
-import { parseLink } from '../../../../lib/editor/plugins/PastePlugin/utils/linkParser';
+import { parseLink } from '../../lib/paste/utils/linkParser';
 import {
     contentModelToDom,
     createDomToModelContext,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { ContentModelPastePlugin } from './paste/ContentModelPastePlugin';