@zipify/wysiwyg 4.2.2 → 4.4.0-0

package/lib/cli/commands/ToJsonCommand.js

@@ -1,6 +1,6 @@
 import { resolve } from 'path';
-import { ContentSerializer, ContextWindow } from '../../services';
-import { NodeDomParser } from '../NodeDomParser';
+import { ContentSerializer, ContextWindow } from '@/services';
+import { NodeDomParser } from '@/node';
 import { Command } from './Command';
 
 export class ToJsonCommand extends Command {

package/lib/composables/__tests__/__snapshots__/useEditor.test.js.snap

@@ -4,7 +4,6 @@ exports[`life cycle should emit changes 1`] = `
 Array [
   Array [
     Object {
-      "__wswg__": true,
       "attrs": Object {
         "meta": Object {},
       },

package/lib/composables/useEditor.ts

@@ -1,14 +1,12 @@
 import { type AnyExtension, Editor } from '@tiptap/vue-3';
-import type { Content } from '@tiptap/core';
+import type { Content, JSONContent } from '@tiptap/core';
 import { onUnmounted, watch, reactive, unref } from 'vue';
 import type { Ref, UnwrapNestedRefs } from 'vue';
 import { ContentNormalizer } from '@/services';
-import { markWysiwygContent } from '@/utils';
-import type { WysiwygContent } from '@/utils';
 
 export interface IUseEditorProps {
     content: Ref<Content>;
-    onChange: (content: WysiwygContent) => void;
+    onChange: (content: JSONContent) => void;
     extensions: AnyExtension[];
     isReadonlyRef: Ref<boolean>;
 
@@ -16,18 +14,13 @@ export interface IUseEditorProps {
 
 export interface IUseEditorReturn {
     editor: Editor;
-    getContent(): WysiwygContent;
+    getContent(): JSONContent;
 }
 
 export function useEditor({ content, onChange, extensions, isReadonlyRef }: IUseEditorProps): IUseEditorReturn {
-    // eslint-disable-next-line prefer-const
-    let editor: UnwrapNestedRefs<Editor>;
-
-    const getContent = (): WysiwygContent => markWysiwygContent(editor.getJSON());
-
-    editor = reactive(new Editor({
+    const editor: UnwrapNestedRefs<Editor> = reactive(new Editor({
         content: ContentNormalizer.normalize(content.value),
-        onUpdate: () => onChange(getContent()),
+        onUpdate: () => onChange(editor.getJSON()),
         extensions,
         injectCSS: false,
         editable: !unref(isReadonlyRef),
@@ -41,7 +34,7 @@ export function useEditor({ content, onChange, extensions, isReadonlyRef }: IUse
     onUnmounted(() => editor.destroy());
 
     watch(content, (value) => {
-        if (JSON.stringify(getContent()) !== JSON.stringify(value)) {
+        if (JSON.stringify(editor.getJSON()) !== JSON.stringify(value)) {
             const content = ContentNormalizer.normalize(value);
 
             editor.commands.setContent(content, false);
@@ -50,5 +43,5 @@ export function useEditor({ content, onChange, extensions, isReadonlyRef }: IUse
 
     watch(isReadonlyRef, (isReadonly) => editor.setEditable(!isReadonly, false));
 
-    return { editor: editor as Editor, getContent };
+    return { editor: editor as Editor, getContent: () => editor.getJSON() };
 }

package/lib/entryLib.ts

@@ -1,6 +1,6 @@
 export { default as Wysiwyg } from './Wysiwyg.vue';
 export { NodeFactory, HtmlToJsonParser } from './services';
 export { NodeTypes, TextSettings, Alignments } from './enums';
-export { isWysiwygContent, unmarkWysiwygContent, markWysiwygContent } from './utils';
+export { isWysiwygContent } from './utils';
 export * from './components/base';
 export { InjectionTokens } from './injectionTokens';

package/lib/entryNode.ts

@@ -0,0 +1,2 @@
+export { ContentSerializer, ContextWindow } from './services';
+export { NodeDomParser } from './node';

package/lib/node/NodeDomParser.ts

@@ -0,0 +1,16 @@
+import { JSDOM } from 'jsdom';
+
+export class NodeDomParser {
+    static createWindow(): Window {
+        return new JSDOM().window as unknown as Window;
+    }
+
+    types!: Window;
+
+    parse(html: string): Document {
+        const { window } = new JSDOM(html);
+
+        this.types = window as unknown as Window;
+        return window.document;
+    }
+}

package/lib/node/index.ts

@@ -0,0 +1 @@
+export * from './NodeDomParser';

package/lib/utils/index.ts

@@ -7,8 +7,7 @@ export { convertLineHeight } from './convertLineHeight';
 export { convertFontSize } from './convertFontSize';
 export { convertAlignment } from './convertAlignment';
 export { importIcon } from './importIcon';
-export { isWysiwygContent, markWysiwygContent, unmarkWysiwygContent } from './isWysiwygContent';
-export type { WysiwygContent } from './isWysiwygContent';
+export { isWysiwygContent } from './isWysiwygContent';
 export { resolveTextPosition } from './resolveTextPosition';
 export { resolvePositionOffset } from './resolvePositionOffset';
 export { isNodeFullySelected } from './isNodeFullySelected';

package/lib/utils/isWysiwygContent.ts

@@ -1,18 +1,5 @@
 import type { JSONContent } from '@tiptap/core';
 
-export interface WysiwygContent extends JSONContent{
-    __wswg__: true;
-}
-
 export function isWysiwygContent(content: string | object): content is JSONContent {
-    return typeof content === 'object' && (content as WysiwygContent).__wswg__;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export function unmarkWysiwygContent({ __wswg__, ...content }: WysiwygContent): JSONContent {
-    return content;
-}
-
-export function markWysiwygContent(content: JSONContent): WysiwygContent {
-    return { ...content, __wswg__: true };
+    return typeof content === 'object' && (content as JSONContent).type === 'doc';
 }

package/package.json

@@ -1,9 +1,16 @@
 {
   "name": "@zipify/wysiwyg",
-  "version": "4.2.2",
+  "version": "4.4.0-0",
   "description": "Zipify modification of TipTap text editor",
-  "main": "dist/wysiwyg.mjs",
-  "types": "dist/wysiwyg.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/wysiwyg.mjs",
+      "types": "./dist/wysiwyg.d.ts"
+    },
+    "./node": {
+      "require": "./dist/node.cjs"
+    }
+  },
   "bin": {
     "zipify-wysiwyg": "bin/cli"
   },
@@ -21,6 +28,7 @@
     "lib:build": "npm run lib:build-types && vite build --config config/build/lib.config.ts",
     "lib:build-types": "vue-tsc -P ./tsconfig.types.json",
     "lib:release": "[ -f .env ] && export $(cat .env | xargs) && release-it",
+    "node:build": "NODE_ENV=production rollup --config config/build/node.config.js --bundleConfigAsCjs",
     "cli:build": "NODE_ENV=production rollup --config config/build/cli.config.js --bundleConfigAsCjs",
     "cli:dev": "NODE_ENV=development rollup --config config/build/cli.config.js --bundleConfigAsCjs --watch",
     "example:start": "NODE_ENV=development vite serve --config config/build/example.config.ts",
@@ -49,8 +57,8 @@
   },
   "peerDependencies": {
     "@zipify/colorpicker": "^3.2",
-    "vue": "^3.4",
-    "simplebar": "^6.2"
+    "simplebar": "^6.2",
+    "vue": "^3.4"
   },
   "peerDependenciesMeta": {
     "@zipify/colorpicker": {
@@ -69,19 +77,18 @@
     "@babel/plugin-transform-runtime": "^7.24.0",
     "@babel/preset-env": "^7.24.0",
     "@babel/runtime": "^7.24.0",
-    "@optimize-lodash/rollup-plugin": "^4.0.4",
+    "@optimize-lodash/rollup-plugin": "^5.0.0",
     "@rollup/plugin-alias": "^5.1.0",
-    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-replace": "^5.0.5",
-    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-replace": "^5.0.7",
     "@rushstack/eslint-patch": "^1.7.2",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.10.0",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
     "@typescript-eslint/parser": "^7.2.0",
-    "@vitejs/plugin-vue": "^5.0.4",
+    "@vitejs/plugin-vue": "^5.1.2",
     "@vue/eslint-config-typescript": "^13.0.0",
     "@vue/test-utils": "^2.4.5",
     "@vue/tsconfig": "^0.5.1",
@@ -101,13 +108,14 @@
     "lint-staged": "^15.2.2",
     "postcss-html": "^1.6.0",
     "release-it": "^17.1.1",
-    "rollup": "^4.13.0",
+    "rollup": "^4.21.1",
     "rollup-plugin-esbuild": "^6.1.1",
+    "rollup-plugin-esbuild-minify": "^1.1.2",
     "simplebar": "^6.2.5",
     "stylelint": "^14.16.1",
     "svgo": "^3.2.0",
     "typescript": "^5.4.2",
-    "vite": "^5.1.6",
+    "vite": "^5.4.2",
     "vue": "3.4.21",
     "vue-tsc": "^2.0.6"
   },

package/lib/cli/NodeDomParser.js

@@ -1,16 +0,0 @@
-import { JSDOM } from 'jsdom';
-
-export class NodeDomParser {
-    static createWindow() {
-        return new JSDOM().window;
-    }
-
-    types;
-
-    parse(html) {
-        const { window } = new JSDOM(html);
-
-        this.types = window;
-        return window.document;
-    }
-}