@yozora/tokenizer-indented-code 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 IndentedCodeTokenizer from '@yozora/tokenizer-indented-code'
 
-const parser = new DefaultYastParser()
-  .useBlockFallbackTokenizer(new ParagraphTokenizer())
-  .useInlineFallbackTokenizer(new TextTokenizer())
+const parser = new DefaultParser()
+  .useFallbackTokenizer(new ParagraphTokenizer())
+  .useFallbackTokenizer(new TextTokenizer())
   .useTokenizer(new IndentedCodeTokenizer())
 
 // parse source markdown content
@@ -231,7 +231,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
@@ -291,7 +290,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.CodeType,
             position: {
-                start: coreTokenizer.calcStartYastNodePoint(nodePoints, startIndex),
-                end: coreTokenizer.calcEndYastNodePoint(nodePoints, nextIndex - 1),
+                start: coreTokenizer.calcStartPoint(nodePoints, startIndex),
+                end: coreTokenizer.calcEndPoint(nodePoints, nextIndex - 1),
             },
             lines: [
                 {
@@ -61,28 +61,30 @@ const match = function () {
     }
 };
 
-const parse = () => ({
-    parse: token => {
-        const { lines } = token;
-        let startLineIndex = 0, endLineIndex = lines.length;
-        for (; startLineIndex < endLineIndex; ++startLineIndex) {
-            const line = lines[startLineIndex];
-            if (line.firstNonWhitespaceIndex < line.endIndex)
-                break;
-        }
-        for (; startLineIndex < endLineIndex; --endLineIndex) {
-            const line = lines[endLineIndex - 1];
-            if (line.firstNonWhitespaceIndex < line.endIndex)
-                break;
-        }
-        const contents = coreTokenizer.mergeContentLinesFaithfully(lines, startLineIndex, endLineIndex);
-        const node = {
-            type: ast.CodeType,
-            value: character.calcStringFromNodePoints(contents),
-        };
-        return node;
-    },
-});
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            const { lines } = token;
+            let startLineIndex = 0, endLineIndex = lines.length;
+            for (; startLineIndex < endLineIndex; ++startLineIndex) {
+                const line = lines[startLineIndex];
+                if (line.firstNonWhitespaceIndex < line.endIndex)
+                    break;
+            }
+            for (; startLineIndex < endLineIndex; --endLineIndex) {
+                const line = lines[endLineIndex - 1];
+                if (line.firstNonWhitespaceIndex < line.endIndex)
+                    break;
+            }
+            const contents = coreTokenizer.mergeContentLinesFaithfully(lines, startLineIndex, endLineIndex);
+            const value = character.calcStringFromNodePoints(contents);
+            const node = api.shouldReservePosition
+                ? { type: ast.CodeType, position: token.position, value }
+                : { type: ast.CodeType, value };
+            return node;
+        }),
+    };
+};
 
 const uniqueName = '@yozora/tokenizer-indented-code';
 

package/lib/esm/index.js

@@ -1,6 +1,6 @@
 import { CodeType } from '@yozora/ast';
 import { AsciiCodePoint, VirtualCodePoint, calcStringFromNodePoints } from '@yozora/character';
-import { calcStartYastNodePoint, calcEndYastNodePoint, mergeContentLinesFaithfully, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
+import { calcStartPoint, calcEndPoint, mergeContentLinesFaithfully, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 
 const match = function () {
     return {
@@ -26,8 +26,8 @@ const match = function () {
         const token = {
             nodeType: CodeType,
             position: {
-                start: calcStartYastNodePoint(nodePoints, startIndex),
-                end: calcEndYastNodePoint(nodePoints, nextIndex - 1),
+                start: calcStartPoint(nodePoints, startIndex),
+                end: calcEndPoint(nodePoints, nextIndex - 1),
             },
             lines: [
                 {
@@ -57,28 +57,30 @@ const match = function () {
     }
 };
 
-const parse = () => ({
-    parse: token => {
-        const { lines } = token;
-        let startLineIndex = 0, endLineIndex = lines.length;
-        for (; startLineIndex < endLineIndex; ++startLineIndex) {
-            const line = lines[startLineIndex];
-            if (line.firstNonWhitespaceIndex < line.endIndex)
-                break;
-        }
-        for (; startLineIndex < endLineIndex; --endLineIndex) {
-            const line = lines[endLineIndex - 1];
-            if (line.firstNonWhitespaceIndex < line.endIndex)
-                break;
-        }
-        const contents = mergeContentLinesFaithfully(lines, startLineIndex, endLineIndex);
-        const node = {
-            type: CodeType,
-            value: calcStringFromNodePoints(contents),
-        };
-        return node;
-    },
-});
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            const { lines } = token;
+            let startLineIndex = 0, endLineIndex = lines.length;
+            for (; startLineIndex < endLineIndex; ++startLineIndex) {
+                const line = lines[startLineIndex];
+                if (line.firstNonWhitespaceIndex < line.endIndex)
+                    break;
+            }
+            for (; startLineIndex < endLineIndex; --endLineIndex) {
+                const line = lines[endLineIndex - 1];
+                if (line.firstNonWhitespaceIndex < line.endIndex)
+                    break;
+            }
+            const contents = mergeContentLinesFaithfully(lines, startLineIndex, endLineIndex);
+            const value = calcStringFromNodePoints(contents);
+            const node = api.shouldReservePosition
+                ? { type: CodeType, position: token.position, value }
+                : { type: CodeType, value };
+            return node;
+        }),
+    };
+};
 
 const uniqueName = '@yozora/tokenizer-indented-code';
 

package/lib/types/index.d.ts

@@ -2,4 +2,4 @@ export { match as indentedCodeMatch } from './match';
 export { parse as indentedCodeParse } from './parse';
 export { IndentedCodeTokenizer, IndentedCodeTokenizer as default } from './tokenizer';
 export { uniqueName as IndentedCodeTokenizerName } from './types';
-export type { IHookContext as IIndentedCodeHookContext, IToken as IIndentedCodeToken, ITokenizerProps as IIndentedCodeTokenizerProps, } from './types';
+export type { IThis as IIndentedCodeHookContext, IToken as IIndentedCodeToken, ITokenizerProps as IIndentedCodeTokenizerProps, } 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 indented code block is composed of one or more indented chunks
  * separated by blank lines. An indented chunk is a sequence of non-blank
@@ -9,4 +9,4 @@ import type { IHookContext, IToken, T } from './types';
  *
  * @see https://github.github.com/gfm/#indented-code-block
  */
-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,12 +1,12 @@
 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 IndentedCode.
  * @see https://github.github.com/gfm/#indented-code-block
  */
-export declare class IndentedCodeTokenizer extends BaseBlockTokenizer<T, IToken, INode, IHookContext> implements IBlockTokenizer<T, IToken, INode, IHookContext> {
+export declare class IndentedCodeTokenizer 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 { CodeType, ICode } from '@yozora/ast';
+import type { Code, CodeType } from '@yozora/ast';
 import type { IBaseBlockTokenizerProps, IPartialYastBlockToken, IPhrasingContentLine, ITokenizer } from '@yozora/core-tokenizer';
 export declare type T = CodeType;
-export declare type INode = ICode;
+export declare type INode = Code;
 export declare const uniqueName = "@yozora/tokenizer-indented-code";
 export interface IToken extends IPartialYastBlockToken<T> {
     /**
@@ -9,5 +9,5 @@ export interface IToken extends IPartialYastBlockToken<T> {
      */
     lines: 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-indented-code",
-  "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"
 }