chore: fix circular reference issue

marko-js · Mar 1, 2022 · f20e52e · f20e52e
1 parent f1e073b
commit f20e52e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/states/HTML_CONTENT.ts b/src/states/HTML_CONTENT.ts
@@ -1,4 +1,3 @@
-import { checkForCDATA, checkForPlaceholder, handleDelimitedBlockEOL } from ".";
 import {
   Parser,
   CODE,
@@ -43,7 +42,12 @@ export const HTML_CONTENT: StateDefinition<HTMLContentMeta> = {
       this.endText();
       this.endHtmlBlock();
     } else if (content.delimiter) {
-      handleDelimitedBlockEOL(this, len, content.delimiter, content.indent);
+      STATE.handleDelimitedBlockEOL(
+        this,
+        len,
+        content.delimiter,
+        content.indent
+      );
     } else {
       this.startText();
     }
@@ -53,7 +57,7 @@ export const HTML_CONTENT: StateDefinition<HTMLContentMeta> = {
 
   char(code) {
     if (code === CODE.OPEN_ANGLE_BRACKET) {
-      if (checkForCDATA(this)) return;
+      if (STATE.checkForCDATA(this)) return;
 
       const nextCode = this.lookAtCharCodeAhead(1);
 
@@ -103,7 +107,7 @@ export const HTML_CONTENT: StateDefinition<HTMLContentMeta> = {
       this.endText();
       this.enterState(STATE.INLINE_SCRIPT);
       this.skip(1); // skip space
-    } else if (!checkForPlaceholder(this, code)) {
+    } else if (!STATE.checkForPlaceholder(this, code)) {
       this.startText();
     }
   },

diff --git a/src/states/JS_COMMENT_LINE.ts b/src/states/JS_COMMENT_LINE.ts
@@ -1,5 +1,4 @@
-import { checkForClosingTag } from ".";
-import { BODY_MODE, CODE, StateDefinition } from "../internal";
+import { BODY_MODE, CODE, STATE, StateDefinition } from "../internal";
 
 // We enter STATE.JS_COMMENT_LINE after we encounter a "//" sequence
 // when parsing JavaScript code.
@@ -23,7 +22,7 @@ export const JS_COMMENT_LINE: StateDefinition = {
     ) {
       // First, see if we need to see if we reached the closing tag
       // eg: <script>//foo</script>
-      checkForClosingTag(this);
+      STATE.checkForClosingTag(this);
     }
   },
 };
diff --git a/src/states/PARSED_TEXT_CONTENT.ts b/src/states/PARSED_TEXT_CONTENT.ts
@@ -1,9 +1,3 @@
-import {
-  checkForCDATA,
-  checkForClosingTag,
-  checkForPlaceholder,
-  handleDelimitedBlockEOL,
-} from ".";
 import { Parser, STATE, CODE, StateDefinition, Range } from "../internal";
 
 export interface ParsedTextContentMeta extends Range {
@@ -30,7 +24,12 @@ export const PARSED_TEXT_CONTENT: StateDefinition<ParsedTextContentMeta> = {
       this.endText();
       this.endHtmlBlock();
     } else if (content.delimiter) {
-      handleDelimitedBlockEOL(this, len, content.delimiter, content.indent);
+      STATE.handleDelimitedBlockEOL(
+        this,
+        len,
+        content.delimiter,
+        content.indent
+      );
     } else {
       this.startText();
     }
@@ -42,7 +41,7 @@ export const PARSED_TEXT_CONTENT: StateDefinition<ParsedTextContentMeta> = {
     switch (code) {
       case CODE.OPEN_ANGLE_BRACKET:
         if (!this.isConcise) {
-          checkForClosingTag(this) || checkForCDATA(this);
+          STATE.checkForClosingTag(this) || STATE.checkForCDATA(this);
         }
         break;
       case CODE.FORWARD_SLASH:
@@ -63,7 +62,7 @@ export const PARSED_TEXT_CONTENT: StateDefinition<ParsedTextContentMeta> = {
         this.enterState(STATE.TEMPLATE_STRING);
         break;
       default:
-        if (!checkForPlaceholder(this, code)) this.startText();
+        if (!STATE.checkForPlaceholder(this, code)) this.startText();
         break;
     }
   },