@zipify/wysiwyg 2.6.0 → 2.7.0-0

package/lib/cli/commands/ToJsonCommand.js

@@ -1,5 +1,6 @@
 import { resolve } from 'path';
-import { ContentSerializer } from '../ContentSerializer';
+import { ContentSerializer, ContextWindow } from '../../services';
+import { NodeDomParser } from '../NodeDomParser';
 import { Command } from './Command';
 
 export class ToJsonCommand extends Command {
@@ -23,7 +24,14 @@ export class ToJsonCommand extends Command {
 
     doCommand(html, { config, format }) {
         const configPath = resolve(process.cwd(), config);
-        const serializer = ContentSerializer.build(require(configPath).editor);
+
+        ContextWindow.use(NodeDomParser.createWindow());
+
+        const serializer = ContentSerializer.build({
+            config: require(configPath).editor,
+            nodeDomParser: new NodeDomParser()
+        });
+
         const content = serializer.toJSON(this.#formatInputHtml(html));
         const json = this.#stringifyContent(content);
 

package/lib/cli/index.js

@@ -1,2 +1 @@
-export { ContentSerializer } from './ContentSerializer';
 export * from './commands';

package/lib/entry-lib.js

@@ -1,4 +1,4 @@
 export { default as Wysiwyg } from './Wysiwyg';
-export { NodeFactory } from './services';
+export { NodeFactory, HtmlToJsonParser } from './services';
 export { NodeTypes, TextSettings, Alignments } from './enums';
 export { isWysiwygContent, unmarkWysiwygContent, markWysiwygContent } from './utils';

package/lib/{cli → services}/ContentSerializer.js

@@ -3,23 +3,21 @@ import { getSchema } from '@tiptap/core';
 import { DOMParser } from 'prosemirror-model';
 import { buildExtensions } from '../extensions';
 import { Devices } from '../enums';
-import { ContentNormalizer, ContextWindow } from '../services';
-import { NodeDomParser } from './NodeDomParser';
+import { ContentNormalizer } from './normalizer';
+import { ContextWindow } from './ContextWidnow';
 
 export class ContentSerializer {
-    static build(options) {
-        ContextWindow.use(NodeDomParser.createWindow());
-
+    static build({ config, nodeDomParser }) {
         const extensions = buildExtensions({
-            fonts: options.fonts,
+            fonts: config.fonts,
             minFontSize: 0,
             maxFontSize: 0,
-            presetsRef: ref(options.presets),
-            defaultPresetId: options.defaultPresetId,
-            linkPresetId: options.linkPresetId,
+            presetsRef: ref(config.presets),
+            defaultPresetId: config.defaultPresetId,
+            linkPresetId: config.linkPresetId,
             makePresetVariable: () => '',
-            basePresetClass: options.basePresetClass,
-            baseListClass: options.baseListClass,
+            basePresetClass: config.basePresetClass,
+            baseListClass: config.baseListClass,
             deviceRef: ref(Devices.DESKTOP),
             pageBlocksRef: ref([]),
             wrapperRef: ContextWindow.document.createElement('p')
@@ -28,25 +26,26 @@ export class ContentSerializer {
 
         return new ContentSerializer({
             schema: schema,
-            domParser: DOMParser.fromSchema(schema)
+            domParser: DOMParser.fromSchema(schema),
+            nodeDomParser
         });
     }
 
     #schema;
     #domParser;
+    #nodeDomParser;
 
-    constructor({ schema, domParser }) {
+    constructor({ schema, domParser, nodeDomParser }) {
         this.#schema = schema;
         this.#domParser = domParser;
+        this.#nodeDomParser = nodeDomParser;
     }
 
     toJSON(html) {
-        const normalizer = ContentNormalizer.build(html, {
-            parser: new NodeDomParser()
-        });
+        const normalizer = ContentNormalizer.build(html, { parser: this.#nodeDomParser });
 
         normalizer.normalizeHTML();
 
-        return this.#domParser.parse(normalizer.dom.body);
+        return this.#domParser.parse(normalizer.dom.body).toJSON();
     }
 }

package/lib/services/HtmlToJsonParser.js

@@ -0,0 +1,17 @@
+import { ContentSerializer } from './ContentSerializer';
+
+export class HtmlToJsonParser {
+    static create(config) {
+        return new HtmlToJsonParser(ContentSerializer.build({ config }));
+    }
+
+    #contentSerializer;
+
+    constructor(contentSerializer) {
+        this.#contentSerializer = contentSerializer;
+    }
+
+    toJSON(html) {
+        return this.#contentSerializer.toJSON(html);
+    }
+}

package/lib/services/index.js

@@ -1,6 +1,8 @@
 export { JsonSerializer } from './JsonSerializer';
+export { ContentSerializer } from './ContentSerializer';
 export { Storage } from './Storage';
 export { FavoriteColors } from './FavoriteColors';
 export { ContentNormalizer } from './normalizer';
 export { ContextWindow } from './ContextWidnow';
 export { NodeFactory } from './NodeFactory';
+export { HtmlToJsonParser } from './HtmlToJsonParser';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zipify/wysiwyg",
-  "version": "2.6.0",
+  "version": "2.7.0-0",
   "description": "Zipify modification of TipTap text editor",
   "main": "dist/wysiwyg.mjs",
   "bin": {