@yozora/tokenizer-fenced-code 2.0.0-alpha.0 → 2.0.0-alpha.1

package/README.md

@@ -84,14 +84,14 @@ so you can use `YozoraParser` / `GfmExParser` / `GfmParser` directly.
 registered in *YastParser* as a plugin-in before it can be used.
 
 ```typescript {4,9}
-import { DefaultYastParser } from '@yozora/core-parser'
+import { DefaultParser } from '@yozora/core-parser'
 import ParagraphTokenizer from '@yozora/tokenizer-paragraph'
 import TextTokenizer from '@yozora/tokenizer-text'
 import FencedCodeTokenizer from '@yozora/tokenizer-fenced-code'
 
-const parser = new DefaultYastParser()
-  .useBlockFallbackTokenizer(new ParagraphTokenizer())
-  .useInlineFallbackTokenizer(new TextTokenizer())
+const parser = new DefaultParser()
+  .useFallbackTokenizer(new ParagraphTokenizer())
+  .useFallbackTokenizer(new TextTokenizer())
   .useTokenizer(new FencedCodeTokenizer())
 
 // parse source markdown content
@@ -256,7 +256,6 @@ Name              | Type        | Required  | Default
 [@yozora/tokenizer-link]:                     https://github.com/yozorajs/yozora/tree/main/tokenizers/link#readme
 [@yozora/tokenizer-link-reference]:           https://github.com/yozorajs/yozora/tree/main/tokenizers/link-reference#readme
 [@yozora/tokenizer-list]:                     https://github.com/yozorajs/yozora/tree/main/tokenizers/list#readme
-[@yozora/tokenizer-list-item]:                https://github.com/yozorajs/yozora/tree/main/tokenizers/list-item#readme
 [@yozora/tokenizer-math]:                     https://github.com/yozorajs/yozora/tree/main/tokenizers/math#readme
 [@yozora/tokenizer-paragraph]:                https://github.com/yozorajs/yozora/tree/main/tokenizers/paragraph#readme
 [@yozora/tokenizer-setext-heading]:           https://github.com/yozorajs/yozora/tree/main/tokenizers/setext-heading#readme
@@ -316,7 +315,6 @@ Name              | Type        | Required  | Default
 [doc-@yozora/tokenizer-definition]:           https://yozora.guanghechen.com/docs/package/tokenizer-definition
 [doc-@yozora/tokenizer-link-reference]:       https://yozora.guanghechen.com/docs/package/tokenizer-link-reference
 [doc-@yozora/tokenizer-list]:                 https://yozora.guanghechen.com/docs/package/tokenizer-list
-[doc-@yozora/tokenizer-list-item]:            https://yozora.guanghechen.com/docs/package/tokenizer-list-item
 [doc-@yozora/tokenizer-math]:                 https://yozora.guanghechen.com/docs/package/tokenizer-math
 [doc-@yozora/tokenizer-paragraph]:            https://yozora.guanghechen.com/docs/package/tokenizer-paragraph
 [doc-@yozora/tokenizer-setext-heading]:       https://yozora.guanghechen.com/docs/package/tokenizer-setext-heading

package/lib/cjs/index.js

@@ -12,13 +12,13 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var FencedBlockTokenizer__default = /*#__PURE__*/_interopDefaultLegacy(FencedBlockTokenizer);
 
 const match = function (api) {
-    const hook = FencedBlockTokenizer.fencedMatch.call(this, api);
+    const hook = FencedBlockTokenizer.fencedBlockMatch.call(this, api);
     return Object.assign(Object.assign({}, hook), { isContainingBlock: false });
 };
 
 const parse = function () {
     return {
-        parse: token => {
+        parse: tokens => tokens.map(token => {
             const infoString = token.infoString;
             let i = 0;
             const lang = [];
@@ -32,12 +32,13 @@ const parse = function () {
             const contents = coreTokenizer.mergeContentLinesFaithfully(token.lines);
             const node = {
                 type: ast.CodeType,
+                position: token.position,
                 lang: character.calcEscapedStringFromNodePoints(lang, 0, lang.length, true),
                 meta: character.calcEscapedStringFromNodePoints(infoString, i, infoString.length, true),
                 value: character.calcStringFromNodePoints(contents),
             };
             return node;
-        },
+        }),
     };
 };
 

package/lib/esm/index.js

@@ -1,16 +1,16 @@
-import FencedBlockTokenizer, { fencedMatch } from '@yozora/tokenizer-fenced-block';
+import FencedBlockTokenizer, { fencedBlockMatch } from '@yozora/tokenizer-fenced-block';
 import { CodeType } from '@yozora/ast';
 import { isUnicodeWhitespaceCharacter, calcEscapedStringFromNodePoints, calcStringFromNodePoints, AsciiCodePoint } from '@yozora/character';
 import { eatOptionalWhitespaces, mergeContentLinesFaithfully, TokenizerPriority } from '@yozora/core-tokenizer';
 
 const match = function (api) {
-    const hook = fencedMatch.call(this, api);
+    const hook = fencedBlockMatch.call(this, api);
     return Object.assign(Object.assign({}, hook), { isContainingBlock: false });
 };
 
 const parse = function () {
     return {
-        parse: token => {
+        parse: tokens => tokens.map(token => {
             const infoString = token.infoString;
             let i = 0;
             const lang = [];
@@ -24,12 +24,13 @@ const parse = function () {
             const contents = mergeContentLinesFaithfully(token.lines);
             const node = {
                 type: CodeType,
+                position: token.position,
                 lang: calcEscapedStringFromNodePoints(lang, 0, lang.length, true),
                 meta: calcEscapedStringFromNodePoints(infoString, i, infoString.length, true),
                 value: calcStringFromNodePoints(contents),
             };
             return node;
-        },
+        }),
     };
 };
 

package/lib/types/index.d.ts

@@ -2,4 +2,4 @@ export { match as fencedCodeMatch } from './match';
 export { parse as fencedCodeParse } from './parse';
 export { FencedCodeTokenizer, FencedCodeTokenizer as default } from './tokenizer';
 export { uniqueName as FencedCodeTokenizerName } from './types';
-export type { IHookContext as IFencedCodeHookContext, IToken as IFencedCodeToken, ITokenizerProps as IFencedCodeTokenizerProps, } from './types';
+export type { IThis as IFencedCodeHookContext, IToken as IFencedCodeToken, ITokenizerProps as IFencedCodeTokenizerProps, } from './types';

package/lib/types/match.d.ts

@@ -1,5 +1,5 @@
 import type { IMatchBlockHookCreator } from '@yozora/core-tokenizer';
-import type { IHookContext, IToken, T } from './types';
+import type { IThis, IToken, T } from './types';
 /**
  * A code fence is a sequence of at least three consecutive backtick characters
  * (`) or tildes (~). (Tildes and backticks cannot be mixed.) A fenced code
@@ -8,4 +8,4 @@ import type { IHookContext, IToken, T } from './types';
  * @see https://github.com/syntax-tree/mdast#code
  * @see https://github.github.com/gfm/#code-fence
  */
-export declare const match: IMatchBlockHookCreator<T, IToken, IHookContext>;
+export declare const match: IMatchBlockHookCreator<T, IToken, IThis>;

package/lib/types/parse.d.ts

@@ -1,3 +1,3 @@
 import type { IParseBlockHookCreator } from '@yozora/core-tokenizer';
-import type { IHookContext, INode, IToken, T } from './types';
-export declare const parse: IParseBlockHookCreator<T, IToken, INode, IHookContext>;
+import type { INode, IThis, IToken, T } from './types';
+export declare const parse: IParseBlockHookCreator<T, IToken, INode, IThis>;

package/lib/types/tokenizer.d.ts

@@ -1,13 +1,13 @@
 import type { IBlockTokenizer, IMatchBlockHookCreator, IParseBlockHookCreator } from '@yozora/core-tokenizer';
 import FencedBlockTokenizer from '@yozora/tokenizer-fenced-block';
-import type { IHookContext, INode, IToken, ITokenizerProps, T } from './types';
+import type { INode, IThis, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for FencedCode.
  * @see https://github.com/syntax-tree/mdast#code
  * @see https://github.github.com/gfm/#code-fence
  */
-export declare class FencedCodeTokenizer extends FencedBlockTokenizer<T, INode, IHookContext> implements IBlockTokenizer<T, IToken, INode, IHookContext> {
+export declare class FencedCodeTokenizer extends FencedBlockTokenizer<T, INode, IThis> implements IBlockTokenizer<T, IToken, INode, IThis> {
     constructor(props?: ITokenizerProps);
-    readonly match: IMatchBlockHookCreator<T, IToken, IHookContext>;
-    readonly parse: IParseBlockHookCreator<T, IToken, INode, IHookContext>;
+    readonly match: IMatchBlockHookCreator<T, IToken, IThis>;
+    readonly parse: IParseBlockHookCreator<T, IToken, INode, IThis>;
 }

package/lib/types/types.d.ts

@@ -5,5 +5,5 @@ export declare type T = CodeType;
 export declare type INode = ICode;
 export declare const uniqueName = "@yozora/tokenizer-fenced-code";
 export declare type IToken = IFencedBlockToken<T>;
-export declare type IHookContext = IFencedBlockHookContext<T>;
+export declare type IThis = IFencedBlockHookContext<T>;
 export declare type ITokenizerProps = Partial<IBaseBlockTokenizerProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-fenced-code",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "author": {
     "name": "guanghechen",
     "url": "https://github.com/guanghechen/"
@@ -35,10 +35,10 @@
     "test": "cross-env TS_NODE_FILES=true jest --config ../../jest.config.js --rootDir ."
   },
   "dependencies": {
-    "@yozora/ast": "^2.0.0-alpha.0",
-    "@yozora/character": "^2.0.0-alpha.0",
-    "@yozora/core-tokenizer": "^2.0.0-alpha.0",
-    "@yozora/tokenizer-fenced-block": "^2.0.0-alpha.0"
+    "@yozora/ast": "^2.0.0-alpha.1",
+    "@yozora/character": "^2.0.0-alpha.1",
+    "@yozora/core-tokenizer": "^2.0.0-alpha.1",
+    "@yozora/tokenizer-fenced-block": "^2.0.0-alpha.1"
   },
-  "gitHead": "0171501339c49ffd02ed16a63447fa20a47a29a7"
+  "gitHead": "86202e1d2b03ccfc2ab030517d9d314f7aee7666"
 }