Move SavedData and ValidatedData interfaces from internal types (#1251)

gohabereg · web-flow · commit 333a3d0e5bcd · 2020-08-27T03:29:37.000+03:00
* Move SavedData and ValidatedData interfaces from internal types

* Add changelog
diff --git a/dist/editor.js b/dist/editor.js
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### 2.19
 
+- `Fix` — Fix problem with types usage [#1183](https://github.com/codex-team/editor.js/issues/1183)
 - `Fix` - Fixed issue with Spam clicking the "Click to tune" button duplicates the icons on FireFox. [#1273](https://github.com/codex-team/editor.js/issues/1273)
 - `Fix` - Fixed issue with `editor.blocks.delete(index)` method which throws an error when Editor.js is not focused, even after providing a valid index. [#1182](https://github.com/codex-team/editor.js/issues/1182)
 - `Improvements` - The `initialBlock` property of Editor config is deprecated. Use the `defaultBlock` instead. [#993](https://github.com/codex-team/editor.js/issues/993)
diff --git a/example/tools/checklist b/example/tools/checklist
@@ -1 +1 @@
-Subproject commit c4c3f564b30cd1bbdeb0bd75a7bd5e6b7dbef61b
+Subproject commit df6dcedb92ef586901b04cf72946aced9e36e58d
diff --git a/example/tools/code b/example/tools/code
@@ -1 +1 @@
-Subproject commit 8b74d1bef0a925587841dc79a644f0fef2341a23
+Subproject commit 1297b8c280ff34efaca8f3a2a3d263ec4201077d
diff --git a/example/tools/delimiter b/example/tools/delimiter
@@ -1 +1 @@
-Subproject commit 44ec669216315cd064629fe0d5cab4773d8bb8eb
+Subproject commit 6819831b7166c1cdfa31df77ab569274d9910aac
diff --git a/example/tools/embed b/example/tools/embed
@@ -1 +1 @@
-Subproject commit 034240d58c3186967a0f5b692d9a52ae9cd584cb
+Subproject commit 44473de4c60dd836ccb61b4dbcf4cc00088acd19
diff --git a/example/tools/header b/example/tools/header
@@ -1 +1 @@
-Subproject commit bd5249244eea80d061773aa45a4de877a7829041
+Subproject commit 93e0b6d6418034f4e7ee704aba090cc25ca16ac2
diff --git a/example/tools/image b/example/tools/image
@@ -1 +1 @@
-Subproject commit c78c013e1c3890dfd714f7957aa43c803c544e4b
+Subproject commit 1d6f474c14613c60344d30ebd930a18ca123e4a4
diff --git a/example/tools/inline-code b/example/tools/inline-code
@@ -1 +1 @@
-Subproject commit 051b8e9e03e2f6bea30875da8253f6c0d858b231
+Subproject commit 37a5e8d1db305cf75acd6622d9b82e2f308f71c6
diff --git a/example/tools/link b/example/tools/link
@@ -1 +1 @@
-Subproject commit 0a0d73b49c2d8077a3e62096c44741db6295e12f
+Subproject commit 33ffba6f9104d163c69c963ca06fed329a819238
diff --git a/example/tools/list b/example/tools/list
@@ -1 +1 @@
-Subproject commit 497c0437c5572cb9010988e2edf0d5548d58c441
+Subproject commit f537cf6ecb26fece34c56a85b51e79b07451e69e
diff --git a/example/tools/marker b/example/tools/marker
@@ -1 +1 @@
-Subproject commit 6708697c1af79abbf6650f0f14e1cedc45eb5213
+Subproject commit c68375288c40774e8d8ceff79aa559d562078aaa
diff --git a/example/tools/quote b/example/tools/quote
@@ -1 +1 @@
-Subproject commit 119611a4735eba7069776a2b2494d9e70c74e707
+Subproject commit 58bf8bd571ae259e3d150ac0c12d1676e5706470
diff --git a/example/tools/raw b/example/tools/raw
@@ -1 +1 @@
-Subproject commit 698d1e35a682126befdd381d1963242e6b3b9b82
+Subproject commit 7c6d41603797ebfd00d59fc7ff623342b8f5a48c
diff --git a/example/tools/simple-image b/example/tools/simple-image
@@ -1 +1 @@
-Subproject commit 369b7e7c5a7aaef72751a62702ca4fd1222d6c97
+Subproject commit 0fd96a70b371af0cc0720b8c2c0d0888b8a44bc5
diff --git a/example/tools/table b/example/tools/table
@@ -1 +1 @@
-Subproject commit b666a0dc2ec24e3a25582f4598ca39954d3b3a34
+Subproject commit af9dc3885077ab2ea1b0ae8ae0d145ff1a40fc40
diff --git a/example/tools/warning b/example/tools/warning
@@ -1 +1 @@
-Subproject commit 7a99d65f25c371976266062ff74b5d2d4c648433
+Subproject commit 293109d03d9ff3cdecc52ec959866662d80dd0ce
diff --git a/src/components/block/api.ts b/src/components/block/api.ts
@@ -1,6 +1,6 @@
 import Block from './index';
 import { BlockToolData, ToolConfig } from '../../../types/tools';
-import { SavedData } from '../../types-internal/block-data';
+import { SavedData } from '../../../types/data-formats';
 import { BlockAPI as BlockAPIInterface } from '../../../types/api';
 
 /**
diff --git a/src/components/block/index.ts b/src/components/block/index.ts
@@ -10,7 +10,7 @@ import {
   ToolSettings
 } from '../../../types';
 
-import { SavedData } from '../../types-internal/block-data';
+import { SavedData } from '../../../types/data-formats';
 import $ from '../dom';
 import * as _ from '../utils';
 import ApiModule from '../modules/api';
diff --git a/src/components/modules/paste.ts b/src/components/modules/paste.ts
@@ -9,7 +9,7 @@ import {
   PasteEventDetail
 } from '../../../types';
 import Block from '../block';
-import { SavedData } from '../../types-internal/block-data';
+import { SavedData } from '../../../types/data-formats';
 
 /**
  * Tag substitute object.
diff --git a/src/components/modules/sanitizer.ts b/src/components/modules/sanitizer.ts
@@ -37,7 +37,7 @@ import * as _ from '../utils';
 
 import HTMLJanitor from 'html-janitor';
 import { BlockToolData, InlineToolConstructable, SanitizerConfig } from '../../../types';
-import { SavedData } from '../../types-internal/block-data';
+import { SavedData } from '../../../types/data-formats';
 
 /**
  *
diff --git a/src/components/modules/saver.ts b/src/components/modules/saver.ts
@@ -7,7 +7,7 @@
  */
 import Module from '../__module';
 import { OutputData } from '../../../types';
-import { ValidatedData } from '../../types-internal/block-data';
+import { ValidatedData } from '../../../types/data-formats';
 import Block from '../block';
 import * as _ from '../utils';
 
diff --git a/src/components/modules/toolbar/conversion.ts b/src/components/modules/toolbar/conversion.ts
@@ -2,7 +2,7 @@ import Module from '../../__module';
 import $ from '../../dom';
 import { BlockToolConstructable } from '../../../../types';
 import * as _ from '../../utils';
-import { SavedData } from '../../../types-internal/block-data';
+import { SavedData } from '../../../../types/data-formats';
 import Flipper from '../../flipper';
 import I18n from '../../i18n';
 import { I18nInternalNS } from '../../i18n/namespace-internal';
diff --git a/src/components/tools/paragraph b/src/components/tools/paragraph
@@ -1 +1 @@
-Subproject commit c6c528aa2a5f660d1cbb5f3a45c088d65b11784d
+Subproject commit 306ed49135905d56ebb7d55f90f26fcd603ca7f1
diff --git a/src/types-internal/block-data.d.ts b/src/types-internal/block-data.d.ts
diff --git a/types/api/block.d.ts b/types/api/block.d.ts
@@ -1,5 +1,5 @@
 import {BlockToolData, ToolConfig} from '../tools';
-import {SavedData} from '../../src/types-internal/block-data';
+import {SavedData} from '../data-formats';
 
 /**
  * @interface BlockAPI Describes Block API methods and properties
diff --git a/types/data-formats/block-data.d.ts b/types/data-formats/block-data.d.ts
@@ -0,0 +1,20 @@
+import {BlockToolData} from '../tools';
+
+/**
+ * Tool's saved data
+ */
+export interface SavedData {
+  tool: string;
+  data: BlockToolData;
+  time: number;
+}
+
+/**
+ * Tool's data after validation
+ */
+export interface ValidatedData {
+  tool?: string;
+  data?: BlockToolData;
+  time?: number;
+  isValid: boolean;
+}
diff --git a/types/data-formats/index.d.ts b/types/data-formats/index.d.ts
@@ -0,0 +1,2 @@
+export * from './block-data';
+export * from './output-data';
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -26,7 +26,7 @@ import {
   Tooltip,
   I18n,
 } from './api';
-import {OutputData} from './data-formats/output-data';
+import { OutputData } from './data-formats';
 
 /**
  * Interfaces used for development
