fix: add json type & circular dep

toeverything · Dec 14, 2023 · a8f4309 · a8f4309
1 parent 4d3c427
commit a8f4309
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 6 deletions.
diff --git a/packages/blocks/src/_common/components/rich-text/rich-text-operations.ts b/packages/blocks/src/_common/components/rich-text/rich-text-operations.ts
@@ -22,7 +22,8 @@ import {
  focusBlockByModel,
  focusTitle,
 } from '../../../_common/utils/selection.js';
-import { type ListBlockModel, type PageBlockModel } from '../../../models.js';
+import type { ListBlockModel } from '../../../list-block/index.js';
+import type { PageBlockModel } from '../../../page-block/index.js';
 import type { ExtendedModel } from '../../types.js';
 
 /**

diff --git a/packages/blocks/src/page-block/edgeless/components/toolbar/template/builtin-templates.ts b/packages/blocks/src/page-block/edgeless/components/toolbar/template/builtin-templates.ts
@@ -5,6 +5,7 @@ export type Template = {
  content: unknown;
  asserts?: Record<string, string>;
  preview: string;
+ version?: object;
 };
 
 export type TemplateCategory = {

diff --git a/packages/blocks/src/page-block/edgeless/components/toolbar/template/json/flow-chart.ts b/packages/blocks/src/page-block/edgeless/components/toolbar/template/json/flow-chart.ts
@@ -1,4 +1,6 @@
-export const flowChart = {
+import type { Template } from '../builtin-templates.js';
+
+export const flowChart: Template = {
  name: 'flow chart',
  preview: '',
  content: {

diff --git a/packages/blocks/src/page-block/edgeless/components/toolbar/template/json/gantt-chart.ts b/packages/blocks/src/page-block/edgeless/components/toolbar/template/json/gantt-chart.ts
@@ -1,4 +1,6 @@
-export const ganttChart = {
+import type { Template } from '../builtin-templates.js';
+
+export const ganttChart: Template = {
  name: 'gantt chart',
  preview: '',
  content: {

diff --git a/packages/blocks/src/page-block/edgeless/components/toolbar/template/json/kanban.ts b/packages/blocks/src/page-block/edgeless/components/toolbar/template/json/kanban.ts
@@ -1,4 +1,6 @@
-export const kanban = {
+import type { Template } from '../builtin-templates.js';
+
+export const kanban: Template = {
  name: 'kanban',
  preview: '',
  content: {

diff --git a/packages/blocks/src/page-block/edgeless/components/toolbar/template/json/monthly-calendar.ts b/packages/blocks/src/page-block/edgeless/components/toolbar/template/json/monthly-calendar.ts
@@ -1,4 +1,6 @@
-export const monthlyCalendar = {
+import type { Template } from '../builtin-templates.js';
+
+export const monthlyCalendar: Template = {
  name: 'monthly calendar',
  preview: '',
  asserts: {

diff --git a/packages/blocks/src/page-block/edgeless/components/toolbar/template/json/storyboard.ts b/packages/blocks/src/page-block/edgeless/components/toolbar/template/json/storyboard.ts
@@ -1,4 +1,6 @@
-export const storyboard = {
+import type { Template } from '../builtin-templates.js';
+
+export const storyboard: Template = {
  name: 'storyboard',
  preview: '',
  asserts: {