@yozora/tokenizer-heading 2.0.0-alpha.0 → 2.0.0

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 HeadingTokenizer from '@yozora/tokenizer-heading'
 
-const parser = new DefaultYastParser()
-  .useBlockFallbackTokenizer(new ParagraphTokenizer())
-  .useInlineFallbackTokenizer(new TextTokenizer())
+const parser = new DefaultParser()
+  .useFallbackTokenizer(new ParagraphTokenizer())
+  .useFallbackTokenizer(new TextTokenizer())
   .useTokenizer(new HeadingTokenizer())
 
 // parse source markdown content
@@ -238,7 +238,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
@@ -298,7 +297,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

@@ -30,8 +30,8 @@ const match = function () {
         const token = {
             nodeType: ast.HeadingType,
             position: {
-                start: coreTokenizer.calcStartYastNodePoint(nodePoints, startIndex),
-                end: coreTokenizer.calcEndYastNodePoint(nodePoints, nextIndex - 1),
+                start: coreTokenizer.calcStartPoint(nodePoints, startIndex),
+                end: coreTokenizer.calcEndPoint(nodePoints, nextIndex - 1),
             },
             depth: depth,
             line,
@@ -52,7 +52,7 @@ const match = function () {
 
 const parse = function (api) {
     return {
-        parse: token => {
+        parse: tokens => tokens.map(token => {
             const { nodePoints, firstNonWhitespaceIndex, endIndex } = token.line;
             let [leftIndex, rightIndex] = character.calcTrimBoundaryOfCodePoints(nodePoints, firstNonWhitespaceIndex + token.depth, endIndex);
             let closeCharCount = 0;
@@ -83,14 +83,13 @@ const parse = function (api) {
                     countOfPrecedeSpaces: 0,
                 },
             ];
-            const phrasingContent = api.buildPhrasingContent(lines);
-            const node = {
-                type: ast.HeadingType,
-                depth: token.depth,
-                children: phrasingContent == null ? [] : [phrasingContent],
-            };
+            const contents = coreTokenizer.mergeAndStripContentLines(lines);
+            const children = api.processInlines(contents);
+            const node = api.shouldReservePosition
+                ? { type: ast.HeadingType, position: token.position, depth: token.depth, children }
+                : { type: ast.HeadingType, depth: token.depth, children };
             return node;
-        },
+        }),
     };
 };
 

package/lib/esm/index.js

@@ -1,6 +1,6 @@
 import { HeadingType } from '@yozora/ast';
 import { AsciiCodePoint, isSpaceCharacter, calcTrimBoundaryOfCodePoints, isWhitespaceCharacter } from '@yozora/character';
-import { eatOptionalCharacters, calcStartYastNodePoint, calcEndYastNodePoint, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
+import { eatOptionalCharacters, calcStartPoint, calcEndPoint, mergeAndStripContentLines, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 
 const match = function () {
     return {
@@ -26,8 +26,8 @@ const match = function () {
         const token = {
             nodeType: HeadingType,
             position: {
-                start: calcStartYastNodePoint(nodePoints, startIndex),
-                end: calcEndYastNodePoint(nodePoints, nextIndex - 1),
+                start: calcStartPoint(nodePoints, startIndex),
+                end: calcEndPoint(nodePoints, nextIndex - 1),
             },
             depth: depth,
             line,
@@ -48,7 +48,7 @@ const match = function () {
 
 const parse = function (api) {
     return {
-        parse: token => {
+        parse: tokens => tokens.map(token => {
             const { nodePoints, firstNonWhitespaceIndex, endIndex } = token.line;
             let [leftIndex, rightIndex] = calcTrimBoundaryOfCodePoints(nodePoints, firstNonWhitespaceIndex + token.depth, endIndex);
             let closeCharCount = 0;
@@ -79,14 +79,13 @@ const parse = function (api) {
                     countOfPrecedeSpaces: 0,
                 },
             ];
-            const phrasingContent = api.buildPhrasingContent(lines);
-            const node = {
-                type: HeadingType,
-                depth: token.depth,
-                children: phrasingContent == null ? [] : [phrasingContent],
-            };
+            const contents = mergeAndStripContentLines(lines);
+            const children = api.processInlines(contents);
+            const node = api.shouldReservePosition
+                ? { type: HeadingType, position: token.position, depth: token.depth, children }
+                : { type: HeadingType, depth: token.depth, children };
             return node;
-        },
+        }),
     };
 };
 

package/lib/types/index.d.ts

@@ -2,4 +2,4 @@ export { match as headingMatch } from './match';
 export { parse as headingParse } from './parse';
 export { HeadingTokenizer, HeadingTokenizer as default } from './tokenizer';
 export { uniqueName as HeadingTokenizerName } from './types';
-export type { IHookContext as IHeadingHookContext, IToken as IHeadingToken, ITokenizerProps as IHeadingTokenizerProps, } from './types';
+export type { IThis as IHeadingHookContext, IToken as IHeadingToken, ITokenizerProps as IHeadingTokenizerProps, } 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';
 /**
  * An ATX heading consists of a string of characters, parsed as inline content,
  * between an opening sequence of 1–6 unescaped '#' characters and an optional
@@ -14,4 +14,4 @@ import type { IHookContext, IToken, T } from './types';
  * @see https://github.com/syntax-tree/mdast#heading
  * @see https://github.github.com/gfm/#atx-heading
  */
-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 { BaseBlockTokenizer } from '@yozora/core-tokenizer';
-import type { IHookContext, INode, IToken, ITokenizerProps, T } from './types';
+import type { INode, IThis, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for Heading.
  * @see https://github.com/syntax-tree/mdast#heading
  * @see https://github.github.com/gfm/#atx-heading
  */
-export declare class HeadingTokenizer extends BaseBlockTokenizer<T, IToken, INode, IHookContext> implements IBlockTokenizer<T, IToken, INode, IHookContext> {
+export declare class HeadingTokenizer extends BaseBlockTokenizer<T, IToken, 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

@@ -1,7 +1,7 @@
-import type { HeadingType, IHeading } from '@yozora/ast';
+import type { Heading, HeadingType } from '@yozora/ast';
 import type { IBaseBlockTokenizerProps, IPartialYastBlockToken, IPhrasingContentLine, ITokenizer } from '@yozora/core-tokenizer';
 export declare type T = HeadingType;
-export declare type INode = IHeading;
+export declare type INode = Heading;
 export declare const uniqueName = "@yozora/tokenizer-heading";
 export interface IToken extends IPartialYastBlockToken<T> {
     /**
@@ -13,5 +13,5 @@ export interface IToken extends IPartialYastBlockToken<T> {
      */
     line: Readonly<IPhrasingContentLine>;
 }
-export declare type IHookContext = ITokenizer;
+export declare type IThis = ITokenizer;
 export declare type ITokenizerProps = Partial<IBaseBlockTokenizerProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-heading",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0",
   "author": {
     "name": "guanghechen",
     "url": "https://github.com/guanghechen/"
@@ -35,9 +35,9 @@
     "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/ast": "^2.0.0",
+    "@yozora/character": "^2.0.0",
+    "@yozora/core-tokenizer": "^2.0.0"
   },
-  "gitHead": "0171501339c49ffd02ed16a63447fa20a47a29a7"
+  "gitHead": "65e99d1709fdd1c918465dce6b1e91de96bdab5e"
 }