@@ -8,7 +8,7 @@ import { DataShapeName } from '../../../../enums/DataShapeNames';
88import { FieldType } from '../../../../enums/FieldType' ;
99import { Status } from '@vue-skuilder/common' ;
1010import _ from 'lodash' ;
11- import { marked } from 'marked' ;
11+ import { marked , MarkedToken , Tokens } from 'marked' ;
1212import FillInView from './fillIn.vue' ;
1313
1414/**
@@ -64,7 +64,7 @@ function splitText(
6464 return { left, middle, right } ;
6565}
6666
67- export function splitTextToken ( token : marked . Tokens . Text ) : marked . Tokens . Text [ ] {
67+ export function splitTextToken ( token : Tokens . Text ) : Tokens . Text [ ] {
6868 if ( containsComponent ( token ) ) {
6969 const textChunks = splitByDelimiters ( token . text , '{{' , '}}' ) ;
7070 const rawChunks = splitByDelimiters ( token . raw , '{{' , '}}' ) ;
@@ -85,10 +85,10 @@ export function splitTextToken(token: marked.Tokens.Text): marked.Tokens.Text[]
8585 }
8686}
8787
88- export type TokenOrComponent = marked . Token | { type : 'component' ; raw : string } ;
88+ export type TokenOrComponent = MarkedToken | { type : 'component' ; raw : string } ;
8989
90- export function splitParagraphToken ( token : marked . Tokens . Paragraph ) : TokenOrComponent [ ] {
91- let ret : marked . Token [ ] = [ ] ;
90+ export function splitParagraphToken ( token : Tokens . Paragraph ) : TokenOrComponent [ ] {
91+ let ret : MarkedToken [ ] = [ ] ;
9292
9393 if ( containsComponent ( token ) ) {
9494 const textChunks = splitByDelimiters ( token . text , '{{' , '}}' ) ;
@@ -99,16 +99,16 @@ export function splitParagraphToken(token: marked.Tokens.Paragraph): TokenOrComp
9999 type : 'text' ,
100100 text : textChunks [ i ] ,
101101 raw : rawChunks [ i ] ,
102- } as marked . Tokens . Text ;
102+ } as Tokens . Text ;
103103
104104 if ( isComponent ( textToken ) ) {
105105 ret . push ( textToken ) ;
106106 } else {
107107 marked . lexer ( rawChunks [ i ] ) . forEach ( ( t ) => {
108108 if ( t . type === 'paragraph' ) {
109- ret = ret . concat ( t . tokens ) ;
109+ ret = ret . concat ( t . tokens as MarkedToken [ ] ) ;
110110 } else {
111- ret . push ( t ) ;
111+ ret . push ( t as MarkedToken ) ;
112112 }
113113 } ) ;
114114 }
@@ -123,7 +123,7 @@ export function splitParagraphToken(token: marked.Tokens.Paragraph): TokenOrComp
123123 return ret ;
124124}
125125
126- export function containsComponent ( token : marked . Token ) {
126+ export function containsComponent ( token : MarkedToken ) {
127127 if ( token . type === 'text' || token . type === 'paragraph' ) {
128128 const opening = token . raw . indexOf ( '{{' ) ;
129129 const closing = token . raw . indexOf ( '}}' ) ;
@@ -138,7 +138,7 @@ export function containsComponent(token: marked.Token) {
138138 }
139139}
140140
141- export function isComponent ( token : marked . Token ) {
141+ export function isComponent ( token : MarkedToken ) {
142142 return token . type === 'text' && token . text . startsWith ( '{{' ) && token . text . endsWith ( '}}' ) ;
143143}
144144
@@ -199,12 +199,12 @@ export class BlanksCard extends Question {
199199 public answers : string [ ] | null = null ;
200200 public options : string [ ] | null = null ;
201201
202- public splitTextToken ( token : marked . Tokens . Text ) : marked . Tokens . Text [ ] {
202+ public splitTextToken ( token : Tokens . Text ) : Tokens . Text [ ] {
203203 if ( containsComponent ( token ) ) {
204204 const text = splitText ( token . text , '{{' , '}}' ) ;
205205 const raw = splitText ( token . raw , '{{' , '}}' ) ;
206206
207- const ret : marked . Tokens . Text [ ] = [ ] ;
207+ const ret : Tokens . Text [ ] = [ ] ;
208208
209209 if ( raw . left . length > 0 ) {
210210 ret . push ( {
0 commit comments