Rename toJson to toJSON to for native serializer

Trinovantes · Jun 25, 2024 · 1deee7d · 1deee7d
1 parent 9be3a49
commit 1deee7d
Show file tree

Hide file tree

Showing 24 changed files with 59 additions and 59 deletions.
diff --git a/demo/components/CodePreview.vue b/demo/components/CodePreview.vue
@@ -64,7 +64,7 @@ watch(editorText, async(editorText) => {
 
     try {
         const parserOutput = htmlCompiler.parse(editorText, { disableWarnings: true })
-        outputAst.value = JSON.stringify(parserOutput.root.toJson(), undefined, 4)
+        outputAst.value = JSON.stringify(parserOutput.root.toJSON(), undefined, 4)
 
         const outputHtml = htmlCompiler.compile(parserOutput)
         renderedHtmlPre.value = await codeToHtml(outputHtml.body, {

diff --git a/src/RstNode/Block/DoctestBlock.ts b/src/RstNode/Block/DoctestBlock.ts
@@ -25,8 +25,8 @@ export class RstDoctestBlock extends RstNode {
         super(registrar, source)
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstDoctestBlockData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstDoctestBlockData>
 
         root.data = {
             rawText: this._rawText,

diff --git a/src/RstNode/Block/Document.ts b/src/RstNode/Block/Document.ts
@@ -23,11 +23,11 @@ export class RstDocument extends RstNode {
         super(registrar, source, children)
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstDocumentData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstDocumentData>
 
         root.data = {
-            docMeta: this.docMeta?.toJson() ?? null,
+            docMeta: this.docMeta?.toJSON() ?? null,
         }
 
         return root

diff --git a/src/RstNode/Block/LiteralBlock.ts b/src/RstNode/Block/LiteralBlock.ts
@@ -26,8 +26,8 @@ export class RstLiteralBlock extends RstNode {
         super(registrar, source)
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstLiteralBlockData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstLiteralBlockData>
 
         root.data = {
             rawText: this._rawText,

diff --git a/src/RstNode/Block/Section.ts b/src/RstNode/Block/Section.ts
@@ -36,8 +36,8 @@ export class RstSection extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstSectionData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstSectionData>
 
         root.data = {
             level: this.level,

diff --git a/src/RstNode/ExplicitMarkup/CitationDef.ts b/src/RstNode/ExplicitMarkup/CitationDef.ts
@@ -35,8 +35,8 @@ export class RstCitationDef extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstCitationDefData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstCitationDefData>
 
         root.data = {
             rawLabel: this._rawLabel,

diff --git a/src/RstNode/ExplicitMarkup/Comment.ts b/src/RstNode/ExplicitMarkup/Comment.ts
@@ -24,8 +24,8 @@ export class RstComment extends RstNode {
         super(registrar, source)
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstCommentData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstCommentData>
 
         root.data = {
             rawText: this._rawText,

diff --git a/src/RstNode/ExplicitMarkup/Directive.ts b/src/RstNode/ExplicitMarkup/Directive.ts
@@ -49,13 +49,13 @@ export class RstDirective extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstDirectiveData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstDirectiveData>
 
         root.data = {
             rawDirective: this._rawDirective,
-            initContent: this.initContent.map((node) => node.toJson()),
-            config: this.config?.toJson() ?? null,
+            initContent: this.initContent.map((node) => node.toJSON()),
+            config: this.config?.toJSON() ?? null,
             rawBodyText: this.rawBodyText,
         }
 

diff --git a/src/RstNode/ExplicitMarkup/FootnoteDef.ts b/src/RstNode/ExplicitMarkup/FootnoteDef.ts
@@ -43,8 +43,8 @@ export class RstFootnoteDef extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstFootnoteDefData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstFootnoteDefData>
 
         root.data = {
             rawLabel: this._rawLabel,

diff --git a/src/RstNode/ExplicitMarkup/HyperlinkTarget.ts b/src/RstNode/ExplicitMarkup/HyperlinkTarget.ts
@@ -72,8 +72,8 @@ export class RstHyperlinkTarget extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstHyperlinkTargetData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstHyperlinkTargetData>
 
         root.data = {
             rawLabel: this._rawLabel,

diff --git a/src/RstNode/ExplicitMarkup/SubstitutionDef.ts b/src/RstNode/ExplicitMarkup/SubstitutionDef.ts
@@ -48,14 +48,14 @@ export class RstSubstitutionDef extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstSubstitutionDefData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstSubstitutionDefData>
 
         root.data = {
             rawNeedle: this._rawNeedle,
             rawDirective: this._rawDirective,
-            initContent: this.initContent.map((node) => node.toJson()),
-            config: this.config?.toJson() ?? null,
+            initContent: this.initContent.map((node) => node.toJSON()),
+            config: this.config?.toJSON() ?? null,
         }
 
         return root

diff --git a/src/RstNode/Inline/HyperlinkRef.ts b/src/RstNode/Inline/HyperlinkRef.ts
@@ -64,8 +64,8 @@ export class RstHyperlinkRef extends RstText {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstHyperlinkRefData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstHyperlinkRefData>
 
         root.data = {
             rawText: this.rawText,

diff --git a/src/RstNode/Inline/InterpretedText.ts b/src/RstNode/Inline/InterpretedText.ts
@@ -33,8 +33,8 @@ export class RstInterpretedText extends RstText {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstInterpretedTextData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstInterpretedTextData>
 
         root.data = {
             rawText: this.rawText,

diff --git a/src/RstNode/Inline/Text.ts b/src/RstNode/Inline/Text.ts
@@ -28,8 +28,8 @@ export class RstText extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstTextData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstTextData>
 
         root.data = {
             rawText: this.rawText,

diff --git a/src/RstNode/List/BulletListItem.ts b/src/RstNode/List/BulletListItem.ts
@@ -35,8 +35,8 @@ export class RstBulletListItem extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstBulletListItemData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstBulletListItemData>
 
         root.data = {
             bullet: this.bullet,

diff --git a/src/RstNode/List/DefinitionListItem.ts b/src/RstNode/List/DefinitionListItem.ts
@@ -37,13 +37,13 @@ export class RstDefinitionListItem extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstDefinitionListItemData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstDefinitionListItemData>
 
         root.data = {
-            term: this.term.map((node) => node.toJson()),
-            classifiers: this.classifiers.map((classifier) => classifier.map((node) => node.toJson())),
-            definition: this.definition.map((bodyNode) => bodyNode.toJson()),
+            term: this.term.map((node) => node.toJSON()),
+            classifiers: this.classifiers.map((classifier) => classifier.map((node) => node.toJSON())),
+            definition: this.definition.map((bodyNode) => bodyNode.toJSON()),
         }
 
         return root

diff --git a/src/RstNode/List/EnumeratedList.ts b/src/RstNode/List/EnumeratedList.ts
@@ -39,8 +39,8 @@ export class RstEnumeratedList extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstEnumeratedListData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstEnumeratedListData>
 
         root.data = {
             listType: this.listType,

diff --git a/src/RstNode/List/FieldListItem.ts b/src/RstNode/List/FieldListItem.ts
@@ -36,12 +36,12 @@ export class RstFieldListItem extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstFieldListItemData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstFieldListItemData>
 
         root.data = {
-            name: this.name.map((node) => node.toJson()),
-            body: this.body.map((node) => node.toJson()),
+            name: this.name.map((node) => node.toJSON()),
+            body: this.body.map((node) => node.toJSON()),
         }
 
         return root

diff --git a/src/RstNode/List/OptionListItem.ts b/src/RstNode/List/OptionListItem.ts
@@ -38,8 +38,8 @@ export class RstOptionListItem extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<OptionListItemData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<OptionListItemData>
 
         root.data = {
             options: this.options,

diff --git a/src/RstNode/RstNode.ts b/src/RstNode/RstNode.ts
@@ -66,12 +66,12 @@ export abstract class RstNode {
         return root
     }
 
-    toJson(): RstNodeJson {
+    toJSON(): RstNodeJson {
         return {
             type: this.nodeType,
             data: {},
             source: this.source,
-            children: this.children.map((child) => child.toJson()),
+            children: this.children.map((child) => child.toJSON()),
         }
     }
 

diff --git a/src/RstNode/Table/Table.ts b/src/RstNode/Table/Table.ts
@@ -36,12 +36,12 @@ export class RstTable extends RstNode {
         this.isComplexTable = !hasHeaderRow || hasSpanningCells || hasNonParagraphCellContent
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstTableData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstTableData>
 
         root.data = {
-            headRows: this.headRows.map((child) => child.toJson()),
-            bodyRows: this.bodyRows.map((child) => child.toJson()),
+            headRows: this.headRows.map((child) => child.toJSON()),
+            bodyRows: this.bodyRows.map((child) => child.toJSON()),
         }
 
         return root

diff --git a/src/RstNode/Table/TableCell.ts b/src/RstNode/Table/TableCell.ts
@@ -44,8 +44,8 @@ export class RstTableCell extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstTableCellData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstTableCellData>
 
         root.data = {
             rowSpan: this.rowSpan,

diff --git a/src/RstNode/Table/TableRow.ts b/src/RstNode/Table/TableRow.ts
@@ -34,8 +34,8 @@ export class RstTableRow extends RstNode {
         return root
     }
 
-    override toJson(): RstNodeJson {
-        const root = super.toJson() as RstNodeJson<RstTableRowData>
+    override toJSON(): RstNodeJson {
+        const root = super.toJSON() as RstNodeJson<RstTableRowData>
 
         root.data = {
             isHeadRow: this.isHeadRow,

diff --git a/tests/unit/RstNode/RstNode.test.ts b/tests/unit/RstNode/RstNode.test.ts
@@ -266,9 +266,9 @@ Oh yes, the _\`Norwegian Blue\`.  What's, um, what's wrong with it?
 See https://www.python.org.
 `
 
-describe('toJson', () => {
+describe('toJSON', () => {
     const { root } = parseTestInput(input)
-    const rootClone = new RstNodeRegistrar().reviveRstNodeFromJson(root.toJson())
+    const rootClone = new RstNodeRegistrar().reviveRstNodeFromJson(root.toJSON())
 
     test('node can be converted to json and revived into equivalent node', () => {
         expect(rootClone.toObject()).toStrictEqual(root.toObject())