reorganize editor package modules

apps/app/src/components/PageEditor/LinkEditModal.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState, useCallback } from 'react';
 
 import path from 'path';
 
-import Linker from '@growi/editor/src/services/link-util/Linker';
+import { Linker } from '@growi/editor/src/services-internal';
 import { useLinkEditModal } from '@growi/editor/src/stores/use-link-edit-modal';
 import { useTranslation } from 'next-i18next';
 import {

packages/editor/src/components/CodeMirrorEditor/CodeMirrorEditor.tsx

@@ -13,11 +13,11 @@ import type { ReactCodeMirrorProps } from '@uiw/react-codemirror';
 import type { EditorSettings, GlobalCodeMirrorEditorKey } from '../../consts';
 import {
   useFileDropzone, FileDropzoneOverlay,
-} from '../../services';
+} from '../../services-internal';
 import {
   adjustPasteData, getStrFromBol,
-} from '../../services/paste-util/paste-markdown-util';
-import { useShowTableIcon } from '../../services/table';
+} from '../../services-internal/paste-util/paste-markdown-util';
+import { useShowTableIcon } from '../../services-internal/table';
 import { useDefaultExtensions, useCodeMirrorEditorIsolated, useEditorSettings } from '../../stores';
 
 import { Toolbar } from './Toolbar';

packages/editor/src/components/CodeMirrorEditor/Toolbar/AttachmentsDropdownItem.tsx

@@ -5,7 +5,7 @@ import {
   DropdownItem,
 } from 'reactstrap';
 
-import { useFileDropzone } from '../../../services';
+import { useFileDropzone } from '../../../services-internal';
 
 type Props = {
   acceptedUploadFileType: AcceptedUploadFileType,

packages/editor/src/components/CodeMirrorEditor/Toolbar/LinkEditButton.tsx

@@ -3,7 +3,7 @@ import { useCallback } from 'react';
 import { DropdownItem } from 'reactstrap';
 
 import type { GlobalCodeMirrorEditorKey } from '../../../consts';
-import { getMarkdownLink, replaceFocusedMarkdownLinkWithEditor } from '../../../services/link-util/markdown-link-util';
+import { getMarkdownLink, replaceFocusedMarkdownLinkWithEditor } from '../../../services-internal';
 import { useCodeMirrorEditorIsolated } from '../../../stores';
 import { useLinkEditModal } from '../../../stores/use-link-edit-modal';
 

packages/editor/src/components/CodeMirrorEditorMain.tsx

@@ -5,7 +5,7 @@ import { keymap, scrollPastEnd } from '@codemirror/view';
 import type { IUserHasId } from '@growi/core/dist/interfaces';
 
 import { GlobalCodeMirrorEditorKey } from '../consts';
-import { setDataLine } from '../services/extensions/setDataLine';
+import { setDataLine } from '../services-internal';
 import { useCodeMirrorEditorIsolated, useCollaborativeEditorMode } from '../stores';
 
 import { CodeMirrorEditor, type CodeMirrorEditorProps } from '.';

packages/editor/src/components/CodeMirrorEditorReadOnly.tsx

@@ -3,7 +3,7 @@ import { useEffect } from 'react';
 import { type Extension, EditorState } from '@codemirror/state';
 
 import { GlobalCodeMirrorEditorKey } from '../consts';
-import { setDataLine } from '../services/extensions/setDataLine';
+import { setDataLine } from '../services-internal/extensions';
 import { useCodeMirrorEditorIsolated } from '../stores';
 
 import { CodeMirrorEditor } from '.';

packages/editor/src/components/playground/Playground.tsx

@@ -5,9 +5,8 @@ import {
 import { AcceptedUploadFileType } from '@growi/core';
 import { toast } from 'react-toastify';
 
-import type { EditorSettings } from '../../consts';
 import { GlobalCodeMirrorEditorKey } from '../../consts';
-import type { EditorTheme, KeyMapMode } from '../../services';
+import type { EditorSettings, EditorTheme, KeyMapMode } from '../../consts';
 import { useCodeMirrorEditorIsolated } from '../../stores';
 import { CodeMirrorEditorMain } from '../CodeMirrorEditorMain';
 

packages/editor/src/components/playground/PlaygroundController.tsx

@@ -2,11 +2,11 @@ import { useCallback } from 'react';
 
 import { useForm } from 'react-hook-form';
 
-import { GlobalCodeMirrorEditorKey } from '../../consts';
-import type { EditorTheme, KeyMapMode } from '../../services';
+import type { EditorTheme, KeyMapMode } from '../../consts';
 import {
+  GlobalCodeMirrorEditorKey,
   AllEditorTheme, AllKeyMap,
-} from '../../services';
+} from '../../consts';
 import { useCodeMirrorEditorIsolated } from '../../stores';
 
 export const InitEditorValueRow = (): JSX.Element => {

packages/editor/src/index.ts

@@ -1,5 +1,5 @@
 export * from './components';
 export * from './consts';
 export * from './models';
-export * from './services-ext';
+export * from './services';
 export * from './stores';

packages/editor/src/services-ext/use-codemirror-editor/index.ts

@@ -1 +0,0 @@
-export * from './use-codemirror-editor';

packages/editor/src/services/editor-theme/index.ts → packages/editor/src/services-internal/editor-theme/index.ts

@@ -1,6 +1,6 @@
 import type { Extension } from '@codemirror/state';
 
-import type { EditorTheme } from 'src/consts';
+import type { EditorTheme } from '../../consts';
 
 export const getEditorTheme = async(themeName?: EditorTheme): Promise<Extension> => {
   switch (themeName) {

packages/editor/src/services-internal/extensions/index.ts

@@ -0,0 +1,2 @@
+export * from './emojiAutocompletionSettings';
+export * from './setDataLine';

packages/editor/src/services-internal/index.ts

@@ -0,0 +1,5 @@
+export * from './file-dropzone';
+export * from './editor-theme';
+export * from './keymaps';
+export * from './link-util';
+export * from './extensions';

packages/editor/src/services/link-util/Linker.ts → packages/editor/src/services-internal/link-util/Linker.ts

@@ -1,6 +1,6 @@
 import { encodeSpaces } from '@growi/core/dist/utils/page-path-utils';
 
-export default class Linker {
+export class Linker {
 
   type: string;
 

packages/editor/src/services-internal/link-util/index.ts

@@ -0,0 +1,2 @@
+export * from './Linker';
+export * from './markdown-link-util';

packages/editor/src/services/link-util/markdown-link-util.ts → packages/editor/src/services-internal/link-util/markdown-link-util.ts

@@ -1,6 +1,6 @@
 import type { EditorView } from '@codemirror/view';
 
-import Linker from './Linker';
+import { Linker } from './Linker';
 
 const curPos = (editor: EditorView) => {
   return editor.state.selection.main.head;

packages/editor/src/services/table/use-show-table-icon.ts → packages/editor/src/services-internal/table/use-show-table-icon.ts

@@ -4,7 +4,7 @@ import type { ViewUpdate } from '@codemirror/view';
 import { EditorView } from 'codemirror';
 
 
-import type { UseCodeMirrorEditor } from '../../services-ext';
+import type { UseCodeMirrorEditor } from '../../services';
 
 import { isInTable } from './insert-new-row-to-table-markdown';
 

packages/editor/src/services/index.ts

@@ -1,3 +1 @@
-export * from './file-dropzone';
-export * from './editor-theme';
-export * from './keymaps';
+export * from './use-codemirror-editor';

packages/editor/src/stores/codemirror-editor.ts

@@ -5,7 +5,7 @@ import type { ReactCodeMirrorProps, UseCodeMirror } from '@uiw/react-codemirror'
 import type { SWRResponse } from 'swr';
 import deepmerge from 'ts-deepmerge';
 
-import { type UseCodeMirrorEditor, useCodeMirrorEditor } from '../services-ext';
+import { type UseCodeMirrorEditor, useCodeMirrorEditor } from '../services';
 
 
 const isValid = (u: UseCodeMirrorEditor) => {

packages/editor/src/stores/use-collaborative-editor-mode.ts

@@ -8,7 +8,7 @@ import { SocketIOProvider } from 'y-socket.io';
 import * as Y from 'yjs';
 
 import { userColor } from '../consts';
-import type { UseCodeMirrorEditor } from '../services-ext';
+import type { UseCodeMirrorEditor } from '../services';
 
 type UserLocalState = {
   name: string;

packages/editor/src/stores/use-default-extensions.ts

@@ -11,8 +11,8 @@ import type { KeyBinding } from '@codemirror/view';
 import { keymap, EditorView } from '@codemirror/view';
 import { tags } from '@lezer/highlight';
 
-import type { UseCodeMirrorEditor } from '../services-ext';
-import { emojiAutocompletionSettings } from '../services/extensions/emojiAutocompletionSettings';
+import type { UseCodeMirrorEditor } from '../services';
+import { emojiAutocompletionSettings } from '../services-internal';
 
 
 // set new markdownKeymap instead of default one

packages/editor/src/stores/use-editor-settings.ts

@@ -7,10 +7,10 @@ import {
 } from '@codemirror/view';
 
 import type { EditorSettings, KeyMapMode, EditorTheme } from '../consts';
-import { getEditorTheme, getKeymap } from '../services';
-import type { UseCodeMirrorEditor } from '../services-ext';
-import { insertNewlineContinueMarkup } from '../services/list-util/insert-newline-continue-markup';
-import { insertNewRowToMarkdownTable, isInTable } from '../services/table';
+import type { UseCodeMirrorEditor } from '../services';
+import { getEditorTheme, getKeymap } from '../services-internal';
+import { insertNewlineContinueMarkup } from '../services-internal/list-util/insert-newline-continue-markup';
+import { insertNewRowToMarkdownTable, isInTable } from '../services-internal/table';
 
 
 export const useEditorSettings = (

packages/editor/src/stores/use-link-edit-modal.ts

@@ -1,7 +1,7 @@
 import { useSWRStatic } from '@growi/core/dist/swr';
 import type { SWRResponse } from 'swr';
 
-import type Linker from '../services/link-util/Linker';
+import type { Linker } from '../services-internal';
 
 type LinkEditModalStatus = {
   isOpened: boolean,