Content Model: Reorganize some code

packages-content-model/roosterjs-content-model-dom/lib/domToModel/processors/textProcessor.ts

@@ -4,7 +4,7 @@ import { addSelectionMarker } from '../utils/addSelectionMarker';
 import { areSameFormats } from '../utils/areSameFormats';
 import { createText } from '../../modelApi/creators/createText';
 import { getRegularSelectionOffsets } from '../utils/getRegularSelectionOffsets';
-import { hasSpacesOnly } from '../../domUtils/stringUtil';
+import { hasSpacesOnly } from '../../modelApi/common/hasSpacesOnly';
 import {
     ContentModelBlockGroup,
     DomToModelContext,

packages-content-model/roosterjs-content-model-dom/lib/index.ts

@@ -49,6 +49,4 @@ export { parseValueWithUnit } from './formatHandlers/utils/parseValueWithUnit';
 export { BorderKeys } from './formatHandlers/common/borderFormatHandler';
 export { defaultImplicitFormatMap } from './formatHandlers/utils/defaultStyles';
 
-export { isPunctuation, isSpace, normalizeText } from './domUtils/stringUtil';
-
 export { createDomToModelContext } from './domToModel/context/createDomToModelContext';

packages-content-model/roosterjs-content-model-dom/lib/modelApi/common/hasSpacesOnly.ts

@@ -0,0 +1,12 @@
+// A regex to match text that only has space and CR
+// We use real space char " " (\u0020) here but not "\s" since "\s" will also match " " (\u00A0) which is something we need to keep
+const SPACE_TEXT_REGEX = /^[\r\n\t ]*$/;
+
+/**
+ * @internal
+ * Check if the given string only has space, including line breaks.
+ * @param txt The string to check
+ */
+export function hasSpacesOnly(txt: string): boolean {
+    return SPACE_TEXT_REGEX.test(txt);
+}

packages-content-model/roosterjs-content-model-dom/test/domUtils/stringUtilTest.ts → packages-content-model/roosterjs-content-model-dom/lib/modelApi/common/hasSpacesOnlyTest.ts

@@ -1,4 +1,4 @@
-import { hasSpacesOnly } from '../../lib/domUtils/stringUtil';
+import { hasSpacesOnly } from '../../../lib/modelApi/common/hasSpacesOnly';
 
 describe('hasSpacesOnly', () => {
     it('Empty string', () => {

packages-content-model/roosterjs-content-model-dom/lib/modelApi/common/normalizeSegment.ts

@@ -1,4 +1,4 @@
-import { hasSpacesOnly } from '../../domUtils/stringUtil';
+import { hasSpacesOnly } from './hasSpacesOnly';
 import {
     ContentModelParagraph,
     ContentModelSegment,

packages-content-model/roosterjs-content-model-dom/lib/domUtils/stringUtil.ts → packages-content-model/roosterjs-content-model-editor/lib/domUtils/stringUtil.ts

@@ -1,11 +1,8 @@
-// A regex to match text that only has space and CR
-// We use real space char " " (\u0020) here but not "\s" since "\s" will also match " " (\u00A0) which is something we need to keep
-const SPACE_TEXT_REGEX = /^[\r\n\t ]*$/;
-
 const SPACES_REGEX = /[\u2000\u2009\u200a​\u200b​\u202f\u205f​\u3000\s\t\r\n]/gm;
 const PUNCTUATIONS = '.,?!:"()[]\\/';
 
 /**
+ * @internal
  * Check if the given character is punctuation
  * @param char The character to check
  */
@@ -14,6 +11,7 @@ export function isPunctuation(char: string) {
 }
 
 /**
+ * @internal
  * Check if the give character is a space. A space can be normal ASCII pace (32) or non-break space (160) or other kinds of spaces
  * such as ZeroWidthSpace, ...
  * @param char The character to check
@@ -25,14 +23,6 @@ export function isSpace(char: string) {
 
 /**
  * @internal
- * Check if the given string only has space, including line breaks.
- * @param txt The string to check
- */
-export function hasSpacesOnly(txt: string): boolean {
-    return SPACE_TEXT_REGEX.test(txt);
-}
-
-/**
  * Normalize spaces of the given string. After normalization, all leading (for forward) or trailing (for backward) spaces
  * will be replaces with non-break space (160)
  * @param txt The string to normalize

packages-content-model/roosterjs-content-model-editor/lib/modelApi/edit/deleteSteps/deleteWordSelection.ts

@@ -1,10 +1,6 @@
 import { ContentModelParagraph } from 'roosterjs-content-model-types';
-import {
-    isPunctuation,
-    isSpace,
-    isWhiteSpacePreserved,
-    normalizeText,
-} from 'roosterjs-content-model-dom';
+import { isPunctuation, isSpace, normalizeText } from '../../../domUtils/stringUtil';
+import { isWhiteSpacePreserved } from 'roosterjs-content-model-dom';
 import {
     DeleteResult,
     DeleteSelectionContext,

packages-content-model/roosterjs-content-model-editor/lib/modelApi/edit/utils/deleteSegment.ts

@@ -1,12 +1,9 @@
 import { ContentModelParagraph, ContentModelSegment } from 'roosterjs-content-model-types';
 import { deleteSingleChar } from './deleteSingleChar';
 import { EntityOperation } from 'roosterjs-editor-types';
+import { isWhiteSpacePreserved, normalizeSingleSegment } from 'roosterjs-content-model-dom';
+import { normalizeText } from '../../../domUtils/stringUtil';
 import { OnDeleteEntity } from './DeleteSelectionStep';
-import {
-    isWhiteSpacePreserved,
-    normalizeSingleSegment,
-    normalizeText,
-} from 'roosterjs-content-model-dom';
 
 /**
  * @internal

packages-content-model/roosterjs-content-model-editor/lib/modelApi/selection/adjustWordSelection.ts

@@ -1,4 +1,5 @@
-import { createText, isPunctuation, isSpace } from 'roosterjs-content-model-dom';
+import { createText } from 'roosterjs-content-model-dom';
+import { isPunctuation, isSpace } from '../../domUtils/stringUtil';
 import { iterateSelections } from '../../modelApi/selection/iterateSelections';
 import {
     ContentModelDocument,