From 7027fa4ac9d70b536e0f9e1076bc6d5e78a667ce Mon Sep 17 00:00:00 2001 From: lawvs <18554747+lawvs@users.noreply.github.com> Date: Wed, 3 Aug 2022 00:30:56 +0800 Subject: [PATCH] refactor: split page template --- .../services/editor-block/templates/blog.json | 237 +++++++ .../editor-block/templates/empty.json | 15 + .../services/editor-block/templates/grid.json | 159 +++++ .../editor-block/templates/group-templates.ts | 592 ------------------ .../templates/template-factory.ts | 24 +- .../services/editor-block/templates/todo.json | 173 +++++ .../services/editor-block/templates/types.ts | 4 +- 7 files changed, 605 insertions(+), 599 deletions(-) create mode 100644 libs/datasource/db-service/src/services/editor-block/templates/blog.json create mode 100644 libs/datasource/db-service/src/services/editor-block/templates/empty.json create mode 100644 libs/datasource/db-service/src/services/editor-block/templates/grid.json delete mode 100644 libs/datasource/db-service/src/services/editor-block/templates/group-templates.ts create mode 100644 libs/datasource/db-service/src/services/editor-block/templates/todo.json diff --git a/libs/datasource/db-service/src/services/editor-block/templates/blog.json b/libs/datasource/db-service/src/services/editor-block/templates/blog.json new file mode 100644 index 0000000000..bd4d745adb --- /dev/null +++ b/libs/datasource/db-service/src/services/editor-block/templates/blog.json @@ -0,0 +1,237 @@ +{ + "type": "group", + "properties": {}, + "blocks": [ + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "As a collaborative real-time editor, AFFiNE aims to resolve problems in three situations:" + } + ] + } + }, + "blocks": [] + }, + { + "type": "bullet", + "properties": { + "text": { + "value": [ + { + "text": "Multi-master replication: the synchronization of data between equipment and applications;" + } + ] + } + }, + "blocks": [] + }, + { + "type": "bullet", + "properties": { + "text": { + "value": [ + { + "text": "Eventual consistency: the consistence of data regardless of network latency and outage;" + } + ] + } + }, + "blocks": [] + }, + { + "type": "bullet", + "properties": { + "text": { + "value": [ + { + "text": "Conflict resolution: the resolution of conflict between simultaneous edits." + } + ] + } + }, + "blocks": [] + }, + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "To achieve these aims, a proper collaborative algorithm should be used. There are hundreds of collaborative algorithms being invented over the past three decades, but they usually fall into two categories: either operational transformation (OT) or conflict-free replicated data type (CRDT). We think CRDT is a better choice." + } + ] + } + }, + "blocks": [] + }, + { + "type": "heading1", + "properties": { + "text": { + "value": [{ "bold": true, "text": "What does CRDT do" }] + } + }, + "blocks": [] + }, + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "CRDT is capable of discovering and resolving conflicts while ensuring the effective distribution and merge of date. It may sound like magic, but think about historical study, it is very possible to discover the truth from scattered evidence." + } + ] + } + }, + "blocks": [] + }, + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "For CRDT, every piece of data is like a \"historic fragment\". We keep collecting the fragments from other clients and then restore the truth by excluding repeated data and correcting false information." + } + ] + } + }, + "blocks": [] + }, + { + "type": "heading1", + "properties": { + "text": { + "value": [{ "bold": true, "text": "Why CRDT is better" }] + } + }, + "blocks": [] + }, + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "In contrast to OT, CRDT possesses three big advantages:" + } + ] + } + }, + "blocks": [] + }, + { + "type": "heading2", + "properties": { + "text": { + "value": [{ "bold": true, "text": "Flexibility" }] + } + }, + "blocks": [] + }, + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "CRDT supports more data types. For example, Yjs supports Array, Map, and Treelike, and therefore applies to more business scenarios." + } + ] + } + }, + "blocks": [] + }, + { + "type": "heading2", + "properties": { + "text": { + "value": [{ "bold": true, "text": "Performance" }] + } + }, + "blocks": [] + }, + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "CRDT tolerates higher latency and can wait longer for solving conflicts, whereas the calculation of OT in the same condition may become too overwhelming for a server to sustain." + } + ] + } + }, + "blocks": [] + }, + { + "type": "heading2", + "properties": { + "text": { + "value": [{ "bold": true, "text": "Extensibility" }] + } + }, + "blocks": [] + }, + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "Because CRDT supports more data types and editor elements, it is more extensible." + } + ] + } + }, + "blocks": [] + }, + { + "type": "heading1", + "properties": { + "text": { "value": [{ "text": "Conclusion" }] } + }, + "blocks": [] + }, + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "Collaborative algorithm is still a foreign concept for many developers. There are some introductions to it, but as to how it shall be used, there is still lack of clear explanation. I hope this article helps. If you also work for a startup company and want some suggestions, CRDT, especially Yjs, should be a better choice." + } + ] + } + }, + "blocks": [] + }, + { + "type": "text", + "properties": { "text": { "value": [{ "text": "" }] } }, + "blocks": [] + }, + { + "type": "text", + "properties": { + "text": { + "value": [ + { "text": "" }, + { + "type": "link", + "url": "https://blog.affine.pro/", + "id": "link.stubssslo0rq", + "children": [{ "text": "← View all posts" }] + }, + { "text": "" } + ] + } + }, + "blocks": [] + } + ] +} diff --git a/libs/datasource/db-service/src/services/editor-block/templates/empty.json b/libs/datasource/db-service/src/services/editor-block/templates/empty.json new file mode 100644 index 0000000000..763095a964 --- /dev/null +++ b/libs/datasource/db-service/src/services/editor-block/templates/empty.json @@ -0,0 +1,15 @@ +{ + "type": "group", + "properties": {}, + "blocks": [ + { + "type": "text", + "properties": { + "text": { + "value": [{ "text": "" }] + } + }, + "blocks": [] + } + ] +} diff --git a/libs/datasource/db-service/src/services/editor-block/templates/grid.json b/libs/datasource/db-service/src/services/editor-block/templates/grid.json new file mode 100644 index 0000000000..f97c4e425b --- /dev/null +++ b/libs/datasource/db-service/src/services/editor-block/templates/grid.json @@ -0,0 +1,159 @@ +{ + "type": "group", + "properties": {}, + "blocks": [ + { + "type": "heading2", + "properties": { + "text": { + "value": [ + { + "bold": true, + "text": "Performance" + } + ] + } + }, + "blocks": [] + }, + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "CRDT tolerates higher latency and can wait longer for solving conflicts, whereas the calculation of OT in the same condition may become too overwhelming for a server to sustain." + } + ] + } + }, + "blocks": [] + }, + { + "type": "heading2", + "properties": { + "text": { + "value": [ + { + "bold": true, + "text": "Extensibility" + } + ] + } + }, + "blocks": [] + }, + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "Because CRDT supports more data types and editor elements, it is more extensible." + } + ] + } + }, + "blocks": [] + }, + { + "type": "heading1", + "properties": { + "text": { + "value": [ + { + "text": "Conclusion" + } + ] + } + }, + "blocks": [] + }, + { + "type": "grid", + "properties": {}, + "blocks": [ + { + "type": "gridItem", + "properties": { + "gridItemWidth": "50%" + }, + "blocks": [ + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "Collaborative algorithm is still a foreign concept for many developers. There are some introductions to it, but as to how it shall be used, there is still lack of clear explanation. I hope this article helps. If you also work for a startup company and want some suggestions, CRDT, especially Yjs, should be a better choice." + } + ] + } + }, + "blocks": [] + } + ] + }, + { + "type": "gridItem", + "properties": { + "gridItemWidth": "50%" + }, + "blocks": [ + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "Collaborative algorithm is still a foreign concept for many developers. There are some introductions to it, but as to how it shall be used, there is still lack of clear explanation. I hope this article helps. If you also work for a startup company and want some suggestions, CRDT, especially Yjs, should be a better choice." + } + ] + } + }, + "blocks": [] + } + ] + } + ] + }, + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "" + } + ] + } + }, + "blocks": [] + }, + { + "type": "text", + "properties": { + "text": { + "value": [ + { + "text": "" + }, + { + "type": "link", + "url": "https://blog.affine.pro/", + "id": "link.stubssslo0rq", + "children": [ + { + "text": "← View all posts" + } + ] + }, + { + "text": "" + } + ] + } + } + } + ] +} diff --git a/libs/datasource/db-service/src/services/editor-block/templates/group-templates.ts b/libs/datasource/db-service/src/services/editor-block/templates/group-templates.ts deleted file mode 100644 index 3888b54333..0000000000 --- a/libs/datasource/db-service/src/services/editor-block/templates/group-templates.ts +++ /dev/null @@ -1,592 +0,0 @@ -//@ts-nocheck -import { GroupTemplate } from './types'; -type GroupTemplateMap = Record; -const groupTemplateMap: GroupTemplateMap = { - empty: { - type: 'group', - properties: {}, - blocks: [ - { - type: 'text', - properties: { - text: { - value: [{ text: '' }], - }, - }, - blocks: [], - }, - ], - }, - todolist: { - type: 'group', - properties: {}, - blocks: [ - { - type: 'heading1', - properties: { - text: { - value: [{ text: '🎓Graduating from the project' }], - }, - }, - blocks: [], - }, - { - type: 'todo', - properties: { - text: { - value: [ - { - text: 'Congratulations! Now you can start create your own projects!', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'todo', - properties: { - text: { - value: [ - { - text: 'To start using workspaces and folders hit the ', - }, - { - bold: true, - text: 'button at the top left of the screen', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'todo', - properties: { - text: { - value: [ - { - text: '', - }, - { - text: 'At any time if you feel lost do visit our 📚Blog: ', - }, - { - type: 'link', - url: 'https://blog.affine.pro/', - id: 'link.qx4yhw81or54', - children: [ - { - text: 'https://blog.affine.pro', - }, - ], - }, - { - text: '', - }, - ], - }, - collapsed: { - value: false, - }, - }, - blocks: [], - }, - { - type: 'todo', - properties: { - text: { - value: [ - { - text: '', - }, - { - text: 'If you have any suggestions drop a post in our Reddit Channel：', - }, - { - type: 'link', - url: 'https://www.reddit.com/r/Affine/', - id: 'link.zeafc4ogfvrb', - children: [ - { - text: 'https://www.reddit.com/r/Affine/', - }, - ], - }, - { - text: ' ', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'heading2', - properties: { - text: { - value: [ - { - text: '🎉 The Essentials. Check things off after you tried them!', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'todo', - properties: { - text: { - value: [ - { text: ' ✅ ' }, - { bold: true, text: 'Check' }, - { - text: ' the text box here to complete the task!', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'todo', - properties: { - text: { - value: [ - { text: '' }, - { text: '' }, - { text: ' 👋 ' }, - { bold: true, text: 'Drag' }, - { - text: ' the ⠟ button left of the checkbox to reorder tasks', - }, - { text: '' }, - { text: '' }, - ], - }, - }, - blocks: [], - }, - { - type: 'todo', - properties: { - text: { - value: [ - { text: '' }, - { text: '' }, - { text: ' ➡️ ' }, - { bold: true, text: 'Fold' }, - { text: ' and ' }, - { bold: true, text: 'Unfold' }, - { - text: ' a task to simplify your list using the arrow on the right ⤵️', - }, - ], - }, - numberType: 'type1', - collapsed: { value: false }, - }, - }, - ], - }, - blog: { - type: 'group', - properties: {}, - blocks: [ - { - type: 'text', - properties: { - text: { - value: [ - { - text: 'As a collaborative real-time editor, AFFiNE aims to resolve problems in three situations:', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'bullet', - properties: { - text: { - value: [ - { - text: 'Multi-master replication: the synchronization of data between equipment and applications;', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'bullet', - properties: { - text: { - value: [ - { - text: 'Eventual consistency: the consistence of data regardless of network latency and outage;', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'bullet', - properties: { - text: { - value: [ - { - text: 'Conflict resolution: the resolution of conflict between simultaneous edits.', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'text', - properties: { - text: { - value: [ - { - text: 'To achieve these aims, a proper collaborative algorithm should be used. There are hundreds of collaborative algorithms being invented over the past three decades, but they usually fall into two categories: either operational transformation (OT) or conflict-free replicated data type (CRDT). We think CRDT is a better choice.', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'heading1', - properties: { - text: { - value: [{ bold: true, text: 'What does CRDT do' }], - }, - }, - blocks: [], - }, - { - type: 'text', - properties: { - text: { - value: [ - { - text: 'CRDT is capable of discovering and resolving conflicts while ensuring the effective distribution and merge of date. It may sound like magic, but think about historical study, it is very possible to discover the truth from scattered evidence.', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'text', - properties: { - text: { - value: [ - { - text: 'For CRDT, every piece of data is like a "historic fragment". We keep collecting the fragments from other clients and then restore the truth by excluding repeated data and correcting false information.', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'heading1', - properties: { - text: { - value: [{ bold: true, text: 'Why CRDT is better' }], - }, - }, - blocks: [], - }, - { - type: 'text', - properties: { - text: { - value: [ - { - text: 'In contrast to OT, CRDT possesses three big advantages:', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'heading2', - properties: { - text: { - value: [{ bold: true, text: 'Flexibility' }], - }, - }, - blocks: [], - }, - { - type: 'text', - properties: { - text: { - value: [ - { - text: 'CRDT supports more data types. For example, Yjs supports Array, Map, and Treelike, and therefore applies to more business scenarios.', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'heading2', - properties: { - text: { - value: [{ bold: true, text: 'Performance' }], - }, - }, - blocks: [], - }, - { - type: 'text', - properties: { - text: { - value: [ - { - text: 'CRDT tolerates higher latency and can wait longer for solving conflicts, whereas the calculation of OT in the same condition may become too overwhelming for a server to sustain.', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'heading2', - properties: { - text: { - value: [{ bold: true, text: 'Extensibility' }], - }, - }, - blocks: [], - }, - { - type: 'text', - properties: { - text: { - value: [ - { - text: 'Because CRDT supports more data types and editor elements, it is more extensible.', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'heading1', - properties: { - text: { value: [{ text: 'Conclusion' }] }, - }, - blocks: [], - }, - { - type: 'text', - properties: { - text: { - value: [ - { - text: 'Collaborative algorithm is still a foreign concept for many developers. There are some introductions to it, but as to how it shall be used, there is still lack of clear explanation. I hope this article helps. If you also work for a startup company and want some suggestions, CRDT, especially Yjs, should be a better choice.', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'text', - properties: { text: { value: [{ text: '' }] } }, - blocks: [], - }, - { - type: 'text', - properties: { - text: { - value: [ - { text: '' }, - { - type: 'link', - url: 'https://blog.affine.pro/', - id: 'link.stubssslo0rq', - children: [{ text: '← View all posts' }], - }, - { text: '' }, - ], - }, - }, - blocks: [], - }, - ], - }, - grid: { - type: 'group', - properties: {}, - blocks: [ - { - type: 'heading2', - properties: { - text: { - value: [ - { - bold: true, - text: 'Performance', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'text', - properties: { - text: { - value: [ - { - text: 'CRDT tolerates higher latency and can wait longer for solving conflicts, whereas the calculation of OT in the same condition may become too overwhelming for a server to sustain.', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'heading2', - properties: { - text: { - value: [ - { - bold: true, - text: 'Extensibility', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'text', - properties: { - text: { - value: [ - { - text: 'Because CRDT supports more data types and editor elements, it is more extensible.', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'heading1', - properties: { - text: { - value: [ - { - text: 'Conclusion', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'grid', - properties: {}, - blocks: [ - { - type: 'gridItem', - properties: { - gridItemWidth: '50%', - }, - blocks: [ - { - type: 'text', - properties: { - text: { - value: [ - { - text: 'Collaborative algorithm is still a foreign concept for many developers. There are some introductions to it, but as to how it shall be used, there is still lack of clear explanation. I hope this article helps. If you also work for a startup company and want some suggestions, CRDT, especially Yjs, should be a better choice.', - }, - ], - }, - }, - blocks: [], - }, - ], - }, - { - type: 'gridItem', - properties: { - gridItemWidth: '50%', - }, - blocks: [ - { - type: 'text', - properties: { - text: { - value: [ - { - text: 'Collaborative algorithm is still a foreign concept for many developers. There are some introductions to it, but as to how it shall be used, there is still lack of clear explanation. I hope this article helps. If you also work for a startup company and want some suggestions, CRDT, especially Yjs, should be a better choice.', - }, - ], - }, - }, - blocks: [], - }, - ], - }, - ], - }, - { - type: 'text', - properties: { - text: { - value: [ - { - text: '', - }, - ], - }, - }, - blocks: [], - }, - { - type: 'text', - properties: { - text: { - value: [ - { - text: '', - }, - { - type: 'link', - url: 'https://blog.affine.pro/', - id: 'link.stubssslo0rq', - children: [ - { - text: '← View all posts', - }, - ], - }, - { - text: '', - }, - ], - }, - }, - }, - ], - }, -}; - -export type GroupTemplateKeys = 'todolist' | 'blog' | 'empty' | 'grid'; -export { groupTemplateMap }; diff --git a/libs/datasource/db-service/src/services/editor-block/templates/template-factory.ts b/libs/datasource/db-service/src/services/editor-block/templates/template-factory.ts index 3fa16ac460..953cf0e6de 100644 --- a/libs/datasource/db-service/src/services/editor-block/templates/template-factory.ts +++ b/libs/datasource/db-service/src/services/editor-block/templates/template-factory.ts @@ -1,6 +1,19 @@ -import { groupTemplateMap } from './group-templates'; -import { Template, TemplateMeta } from './types'; -const defaultTemplateList: Array = [ +import { Template, TemplateMeta, GroupTemplate } from './types'; +import blogTemplate from './blog.json'; +import emptyTemplate from './empty.json'; +import gridTemplate from './grid.json'; +import todoTemplate from './todo.json'; + +export type GroupTemplateKeys = 'todolist' | 'blog' | 'empty' | 'grid'; +type GroupTemplateMap = Record; +const groupTemplateMap = { + empty: emptyTemplate, + todolist: todoTemplate, + blog: blogTemplate, + grid: gridTemplate, +} as GroupTemplateMap; + +const defaultTemplateList = [ { name: 'New From Quick Start', groupKeys: ['todolist'], @@ -9,12 +22,13 @@ const defaultTemplateList: Array = [ { name: 'New From Blog', groupKeys: ['blog'] }, { name: ' New Todolist', groupKeys: ['todolist'] }, { name: ' New Empty Page', groupKeys: ['empty'] }, -]; +] as const; + const TemplateFactory = { defaultTemplateList: defaultTemplateList, generatePageTemplateByGroupKeys(props: TemplateMeta): Template { const newTitle = props.name || 'Get Started with AFFiNE'; - const keys = props.groupKeys || []; + const keys: GroupTemplateKeys[] = props.groupKeys || []; const blankPage: Template = { type: 'page', properties: { diff --git a/libs/datasource/db-service/src/services/editor-block/templates/todo.json b/libs/datasource/db-service/src/services/editor-block/templates/todo.json new file mode 100644 index 0000000000..a6cbbee0e3 --- /dev/null +++ b/libs/datasource/db-service/src/services/editor-block/templates/todo.json @@ -0,0 +1,173 @@ +{ + "type": "group", + "properties": {}, + "blocks": [ + { + "type": "heading1", + "properties": { + "text": { + "value": [{ "text": "🎓Graduating from the project" }] + } + }, + "blocks": [] + }, + { + "type": "todo", + "properties": { + "text": { + "value": [ + { + "text": "Congratulations! Now you can start create your own projects!" + } + ] + } + }, + "blocks": [] + }, + { + "type": "todo", + "properties": { + "text": { + "value": [ + { + "text": "To start using workspaces and folders hit the " + }, + { + "bold": true, + "text": "button at the top left of the screen" + } + ] + } + }, + "blocks": [] + }, + { + "type": "todo", + "properties": { + "text": { + "value": [ + { + "text": "" + }, + { + "text": "At any time if you feel lost do visit our 📚Blog: " + }, + { + "type": "link", + "url": "https://blog.affine.pro/", + "id": "link.qx4yhw81or54", + "children": [ + { + "text": "https://blog.affine.pro" + } + ] + }, + { + "text": "" + } + ] + }, + "collapsed": { + "value": false + } + }, + "blocks": [] + }, + { + "type": "todo", + "properties": { + "text": { + "value": [ + { + "text": "" + }, + { + "text": "If you have any suggestions drop a post in our Reddit Channel：" + }, + { + "type": "link", + "url": "https://www.reddit.com/r/Affine/", + "id": "link.zeafc4ogfvrb", + "children": [ + { + "text": "https://www.reddit.com/r/Affine/" + } + ] + }, + { + "text": " " + } + ] + } + }, + "blocks": [] + }, + { + "type": "heading2", + "properties": { + "text": { + "value": [ + { + "text": "🎉 The Essentials. Check things off after you tried them!" + } + ] + } + }, + "blocks": [] + }, + { + "type": "todo", + "properties": { + "text": { + "value": [ + { "text": " ✅ " }, + { "bold": true, "text": "Check" }, + { + "text": " the text box here to complete the task!" + } + ] + } + }, + "blocks": [] + }, + { + "type": "todo", + "properties": { + "text": { + "value": [ + { "text": "" }, + { "text": "" }, + { "text": " 👋 " }, + { "bold": true, "text": "Drag" }, + { + "text": " the ⠟ button left of the checkbox to reorder tasks" + }, + { "text": "" }, + { "text": "" } + ] + } + }, + "blocks": [] + }, + { + "type": "todo", + "properties": { + "text": { + "value": [ + { "text": "" }, + { "text": "" }, + { "text": " ➡️ " }, + { "bold": true, "text": "Fold" }, + { "text": " and " }, + { "bold": true, "text": "Unfold" }, + { + "text": " a task to simplify your list using the arrow on the right ⤵️" + } + ] + }, + "numberType": "type1", + "collapsed": { "value": false } + } + } + ] +} diff --git a/libs/datasource/db-service/src/services/editor-block/templates/types.ts b/libs/datasource/db-service/src/services/editor-block/templates/types.ts index 54b680adfc..5af9abf45d 100644 --- a/libs/datasource/db-service/src/services/editor-block/templates/types.ts +++ b/libs/datasource/db-service/src/services/editor-block/templates/types.ts @@ -1,5 +1,5 @@ -import { DefaultColumnsValue, BlockFlavorKeys } from './../index'; -import { groupTemplateMap, GroupTemplateKeys } from './group-templates'; +import { BlockFlavorKeys, DefaultColumnsValue } from './../index'; +import { GroupTemplateKeys } from './template-factory'; // interface Block { // type: BlockFlavorKeys;