@podlite/schema 0.0.13 → 0.0.15

package/lib/plugin-formatting-codes.js

@@ -49,9 +49,10 @@ const middle = () => tree => {
             const conf = (0, config_1.default)(n, ctx);
             const isCodeBlock = 'name' in n && n.name === 'code';
             const isDataBlock = 'name' in n && n.name === 'data';
+            const isMarkdownBlock = 'name' in n && n.name === 'markdown';
             const allowValues = conf.getAllValues('allow');
             // for code block not parse content by default
-            if ((isCodeBlock || isDataBlock) && allowValues.length == 0)
+            if ((isCodeBlock || isDataBlock || isMarkdownBlock) && allowValues.length == 0)
                 return n;
             const allowed = allowValues.sort();
             const transformer = (0, makeTransformer_1.default)({

package/lib/types.d.ts

@@ -61,9 +61,11 @@ export interface RulesStrict {
     table_row: RuleHandler<TableRow>;
     table_cell: RuleHandler<TableCell>;
     table_head: RuleHandler<TableHead>;
+    toc: RuleHandler<BlockToc>;
     ':toc': RuleHandler<Toc>;
     ':toc-list': RuleHandler<TocList>;
     ':toc-item': RuleHandler<TocItem>;
+    markdown: RuleHandler<BlockMarkdown>;
     Diagram: RuleHandler<BlockDiagram>;
     Image: RuleHandler<BlockNamed>;
 }
@@ -284,6 +286,12 @@ export interface BlockPara extends Block {
 export interface BlockCode extends Block {
     name: 'code';
 }
+export interface BlockToc extends Block {
+    name: 'toc';
+}
+export interface BlockMarkdown extends Block {
+    name: 'markdown';
+}
 export interface BlockNested extends Block {
     name: 'nested';
 }
@@ -328,7 +336,7 @@ export interface BlockDiagram extends Omit<BlockNamed, 'content'> {
     };
 }
 export declare type FormattingCodes = FormattingCodeA | FormattingCodeC | FormattingCodeB | FormattingCodeD | FormattingCodeE | FormattingCodeI | FormattingCodeL | FormattingCodeN | FormattingCodeX | FormattingCodeZ | FormattingCodeV | FormattingCodeS | FormattingCodeAny;
-export declare type PodNode = Ambient | BlockPod | BlockData | BlockCode | BlankLine | BlockNested | BlockOutput | BlockInput | BlockPara | BlockHead | BlockComment | BlockDefn | string | Para | Text | Code | BlockNamed | BlockAny | Verbatim | BlockTable | List | BlockConfig | BlockItem | Alias | BlockImage | Image | RootBlock | Separator | BlockCaption | FormattingCodes | Toc;
+export declare type PodNode = Ambient | BlockPod | BlockData | BlockCode | BlankLine | BlockNested | BlockMarkdown | BlockOutput | BlockInput | BlockPara | BlockHead | BlockComment | BlockDefn | string | Para | Text | Code | BlockNamed | BlockAny | Verbatim | BlockTable | List | BlockConfig | BlockItem | Alias | BlockToc | BlockImage | Image | RootBlock | Separator | BlockCaption | FormattingCodes | Toc;
 export declare type Node = PodNode;
 export declare type AstTree = Array<PodNode>;
 export declare type PodliteDocument = RootBlock;

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@podlite/schema",
-  "version": "0.0.13",
-  "description": "podlite schema",
+  "version": "0.0.15",
+  "description": "AST tools for Podlite markup language",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "MIT",
   "files": [
     "lib/**/*.js",
     "lib/**/*.d.ts",
+    "esm",
     "schema/*",
     "README.md",
     "CHANGELOG.md"
@@ -19,16 +20,17 @@
   "publishConfig": {
     "access": "public",
     "main": "lib/index.js",
-    "types": "./lib/index.d.ts"
+    "types": "./lib/index.d.ts",
+    "module": "./esm/index.js"
   },
   "scripts": {
-    "clean": "rm -rf lib esm tsconfig.tsbuildinfo",
-    "build": "run-s build:pegjs build:ts build:ast ",
+    "clean": "rm -rf lib esm *.tsbuildinfo",
+    "build": "run-s build:pegjs build_lib build:ast ",
+    "build_lib": "yarn g:build",
     "build:ast": "ts-node scripts/make-ast-scheme.ts",
-    "build:ts": "yarn g:tsc --build $INIT_CWD",
-    "build:esm": "yarn g:tsctest -p tsconfig.esm.json",
     "build:pegjs": "pegjs -o src/grammar.js src/grammar.pegjs && pegjs -o src/grammarfc.js src/grammarfc.pegjs",
     "watch": "npx nodemon -e js,ts --exec 'yarn' build",
+    "watch:pegjs": "npx nodemon -e pegjs --exec 'yarn' build:pegjs",
     "test": "yarn g:jest  --passWithNoTests"
   },
   "keywords": [
@@ -51,5 +53,6 @@
     "ts-node": "^9.1.1",
     "typescript": "4.5.5",
     "typescript-json-schema": "0.53.0"
-  }
+  },
+  "module": "./esm/index.js"
 }

package/schema/AstTree.json

@@ -213,6 +213,12 @@
                 {
                     "$ref": "#/definitions/BlockCode"
                 },
+                {
+                    "$ref": "#/definitions/BlockToc"
+                },
+                {
+                    "$ref": "#/definitions/BlockMarkdown"
+                },
                 {
                     "$ref": "#/definitions/BlockNested"
                 },
@@ -1264,6 +1270,12 @@
                             {
                                 "$ref": "#/definitions/BlockCode"
                             },
+                            {
+                                "$ref": "#/definitions/BlockToc"
+                            },
+                            {
+                                "$ref": "#/definitions/BlockMarkdown"
+                            },
                             {
                                 "$ref": "#/definitions/BlockNested"
                             },
@@ -1941,6 +1953,110 @@
                 "type"
             ]
         },
+        "BlockToc": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string",
+                    "enum": [
+                        "toc"
+                    ]
+                },
+                "type": {
+                    "type": "string",
+                    "enum": [
+                        "block"
+                    ]
+                },
+                "location": {
+                    "$ref": "#/definitions/Location"
+                },
+                "content": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/PodNode"
+                    }
+                },
+                "margin": {
+                    "type": "string"
+                },
+                "config": {
+                    "type": "array",
+                    "items": {
+                        "anyOf": [
+                            {
+                                "$ref": "#/definitions/BrokenConfigItem"
+                            },
+                            {
+                                "$ref": "#/definitions/ConfigItem"
+                            }
+                        ]
+                    }
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "content",
+                "location",
+                "margin",
+                "name",
+                "type"
+            ]
+        },
+        "BlockMarkdown": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string",
+                    "enum": [
+                        "markdown"
+                    ]
+                },
+                "type": {
+                    "type": "string",
+                    "enum": [
+                        "block"
+                    ]
+                },
+                "location": {
+                    "$ref": "#/definitions/Location"
+                },
+                "content": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/PodNode"
+                    }
+                },
+                "margin": {
+                    "type": "string"
+                },
+                "config": {
+                    "type": "array",
+                    "items": {
+                        "anyOf": [
+                            {
+                                "$ref": "#/definitions/BrokenConfigItem"
+                            },
+                            {
+                                "$ref": "#/definitions/ConfigItem"
+                            }
+                        ]
+                    }
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "content",
+                "location",
+                "margin",
+                "name",
+                "type"
+            ]
+        },
         "BlockNested": {
             "type": "object",
             "properties": {

package/schema/PodliteDocument.json

@@ -213,6 +213,12 @@
                 {
                     "$ref": "#/definitions/BlockCode"
                 },
+                {
+                    "$ref": "#/definitions/BlockToc"
+                },
+                {
+                    "$ref": "#/definitions/BlockMarkdown"
+                },
                 {
                     "$ref": "#/definitions/BlockNested"
                 },
@@ -1264,6 +1270,12 @@
                             {
                                 "$ref": "#/definitions/BlockCode"
                             },
+                            {
+                                "$ref": "#/definitions/BlockToc"
+                            },
+                            {
+                                "$ref": "#/definitions/BlockMarkdown"
+                            },
                             {
                                 "$ref": "#/definitions/BlockNested"
                             },
@@ -1941,6 +1953,110 @@
                 "type"
             ]
         },
+        "BlockToc": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string",
+                    "enum": [
+                        "toc"
+                    ]
+                },
+                "type": {
+                    "type": "string",
+                    "enum": [
+                        "block"
+                    ]
+                },
+                "location": {
+                    "$ref": "#/definitions/Location"
+                },
+                "content": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/PodNode"
+                    }
+                },
+                "margin": {
+                    "type": "string"
+                },
+                "config": {
+                    "type": "array",
+                    "items": {
+                        "anyOf": [
+                            {
+                                "$ref": "#/definitions/BrokenConfigItem"
+                            },
+                            {
+                                "$ref": "#/definitions/ConfigItem"
+                            }
+                        ]
+                    }
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "content",
+                "location",
+                "margin",
+                "name",
+                "type"
+            ]
+        },
+        "BlockMarkdown": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string",
+                    "enum": [
+                        "markdown"
+                    ]
+                },
+                "type": {
+                    "type": "string",
+                    "enum": [
+                        "block"
+                    ]
+                },
+                "location": {
+                    "$ref": "#/definitions/Location"
+                },
+                "content": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/PodNode"
+                    }
+                },
+                "margin": {
+                    "type": "string"
+                },
+                "config": {
+                    "type": "array",
+                    "items": {
+                        "anyOf": [
+                            {
+                                "$ref": "#/definitions/BrokenConfigItem"
+                            },
+                            {
+                                "$ref": "#/definitions/ConfigItem"
+                            }
+                        ]
+                    }
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "content",
+                "location",
+                "margin",
+                "name",
+                "type"
+            ]
+        },
         "BlockNested": {
             "type": "object",
             "properties": {