@podlite/schema 0.0.12 → 0.0.14

package/lib/types.d.ts

@@ -28,8 +28,8 @@ export interface RulesStrict {
     'U<>': RuleHandler<FormattingCodeAny>;
     'Z<>': RuleHandler<FormattingCodeAny>;
     'Delete<>': RuleHandler<FormattingCodeAny>;
-    'pod': RuleHandler<Para>;
-    'root': RuleHandler<RootBlock>;
+    pod: RuleHandler<Para>;
+    root: RuleHandler<RootBlock>;
     ':para': RuleHandler<Para>;
     ':text': RuleHandler<Text>;
     ':blankline': RuleHandler<BlankLine>;
@@ -39,33 +39,35 @@ export interface RulesStrict {
     ':list': RuleHandler<List>;
     ':config': RuleHandler<BlockConfig>;
     ':alias': RuleHandler<Alias>;
-    'data': RuleHandler<BlockData>;
-    'code': RuleHandler<BlockCode>;
-    'para': RuleHandler<BlockPara>;
-    'defn': RuleHandler<BlockDefn>;
-    'nested': RuleHandler<BlockNested>;
-    'output': RuleHandler<BlockOutput>;
-    'input': RuleHandler<BlockInput>;
-    'image': RuleHandler<BlockImage>;
+    data: RuleHandler<BlockData>;
+    code: RuleHandler<BlockCode>;
+    para: RuleHandler<BlockPara>;
+    defn: RuleHandler<BlockDefn>;
+    nested: RuleHandler<BlockNested>;
+    output: RuleHandler<BlockOutput>;
+    input: RuleHandler<BlockInput>;
+    image: RuleHandler<BlockImage>;
     ':image': RuleHandler<Image>;
     'item:block': RuleHandler<BlockItem>;
-    'item': RuleHandler<BlockItem>;
+    item: RuleHandler<BlockItem>;
     'comment:block': RuleHandler<BlockComment>;
-    'comment': RuleHandler<BlockComment>;
+    comment: RuleHandler<BlockComment>;
     'head:block': RuleHandler<BlockHead>;
-    'head': RuleHandler<BlockHead>;
+    head: RuleHandler<BlockHead>;
     ':fcode': RuleHandler<FormattingCodes>;
     'table:block': RuleHandler<BlockTable>;
-    'table': RuleHandler<BlockTable>;
+    table: RuleHandler<BlockTable>;
     ':separator': RuleHandler<Separator>;
-    'table_row': RuleHandler<TableRow>;
-    'table_cell': RuleHandler<TableCell>;
-    'table_head': RuleHandler<TableHead>;
+    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>;
-    'Diagram': RuleHandler<BlockDiagram>;
-    'Image': RuleHandler<BlockNamed>;
+    markdown: RuleHandler<BlockMarkdown>;
+    Diagram: RuleHandler<BlockDiagram>;
+    Image: RuleHandler<BlockNamed>;
 }
 export interface Rules extends RulesStrict {
     [name: string]: RuleHandler;
@@ -114,112 +116,112 @@ export interface RootBlock extends Omit<Block, 'location'> {
     content: AstTree;
 }
 export interface FormattingCodeB {
-    type: "fcode";
-    name: "B";
+    type: 'fcode';
+    name: 'B';
     content?: Array<Node>;
 }
 export interface FormattingCodeC {
-    type: "fcode";
-    name: "C";
+    type: 'fcode';
+    name: 'C';
     content?: Array<FormattingCodes | string>;
 }
 export interface FormattingCodeE {
-    type: "fcode";
-    name: "E";
+    type: 'fcode';
+    name: 'E';
     content: Array<{
-        type: "number";
+        type: 'number';
         value: number;
     }>;
 }
 export interface FormattingCodeN {
-    type: "fcode";
-    name: "N";
+    type: 'fcode';
+    name: 'N';
     content?: Array<FormattingCodes | string>;
 }
 export interface FormattingCodeX {
-    type: "fcode";
-    name: "X";
+    type: 'fcode';
+    name: 'X';
     entry: Array<string> | null;
     content?: Array<FormattingCodes | string>;
 }
 export interface FormattingCodeZ {
-    type: "fcode";
-    name: "Z";
+    type: 'fcode';
+    name: 'Z';
     content?: string;
 }
 export interface FormattingCodeV {
-    type: "fcode";
-    name: "V";
+    type: 'fcode';
+    name: 'V';
     content?: string;
 }
 export interface FormattingCodeS {
-    type: "fcode";
-    name: "S";
+    type: 'fcode';
+    name: 'S';
     content?: string | Text;
 }
 export interface FormattingCodeA {
-    type: "fcode";
-    name: "A";
+    type: 'fcode';
+    name: 'A';
     content: string | Text;
 }
 export interface FormattingCodeD {
-    type: "fcode";
-    name: "D";
+    type: 'fcode';
+    name: 'D';
     synonyms: Array<string>;
     content: string;
 }
 export interface FormattingCodeL {
-    type: "fcode";
-    name: "L";
+    type: 'fcode';
+    name: 'L';
     meta: string | null;
     content: string | Text;
 }
 export interface FormattingCodeI {
-    type: "fcode";
-    name: "I";
+    type: 'fcode';
+    name: 'I';
     meta: string;
     content: string | Text;
 }
 export interface FormattingCodeAny {
-    type: "fcode";
+    type: 'fcode';
     name: string;
     content?: Array<FormattingCodes | string>;
 }
 export interface Ambient {
-    type: "ambient";
+    type: 'ambient';
     text: string;
     location: Location;
 }
 export interface Verbatim {
-    type: "verbatim";
+    type: 'verbatim';
     value: string;
 }
 export interface Text {
-    type: "text";
+    type: 'text';
     value: string;
 }
 export interface Para {
-    type: "para";
+    type: 'para';
     text: string;
     margin: string;
     location: Location;
     content: Array<Node | FormattingCodes>;
 }
 export interface Code {
-    type: "code";
+    type: 'code';
     text: string;
     margin: string;
     location: Location;
     content: Array<Verbatim | string>;
 }
 export interface BlankLine {
-    type: "blankline";
+    type: 'blankline';
 }
 export interface List {
-    type: "list";
+    type: 'list';
     level: string | number;
     content: Array<BlockItem | BlankLine | List>;
-    list: "itemized";
+    list: 'itemized';
 }
 export interface ConfigItemKV {
     [key: string]: string | number | boolean;
@@ -233,13 +235,13 @@ export interface ConfigItem {
 }
 export interface BlockConfig {
     name: string;
-    type: "config";
+    type: 'config';
     config: Array<ConfigItem>;
     margin: string;
 }
 export interface Alias {
     name: string;
-    type: "alias";
+    type: 'alias';
     replacement: Array<string>;
     margin: string;
 }
@@ -248,7 +250,7 @@ export interface Separator {
     text: string;
 }
 export interface Block {
-    type: "block";
+    type: 'block';
     location: Location;
     content: Array<Node>;
     margin: string;
@@ -268,22 +270,28 @@ export interface BlockDefn extends Block {
     name: 'defn';
 }
 export interface BlockItem extends Block {
-    name: "item";
+    name: 'item';
     content: Array<Node>;
     level: string | number;
 }
 export interface BlockOutput extends Block {
-    name: "output";
+    name: 'output';
 }
 export interface BlockInput extends Block {
-    name: "input";
+    name: 'input';
 }
 export interface BlockPara extends Block {
-    name: "para";
+    name: 'para';
 }
 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';
 }
@@ -292,28 +300,28 @@ export interface BlockHead extends Block {
     level: number | string;
 }
 export interface BlockTable extends Omit<Block, 'content'> {
-    name: "table";
+    name: 'table';
     content: Array<TableHead | TableSeparator | TableRow | BlankLine>;
     text?: string;
 }
 export interface TableCell {
-    name: "table_cell";
-    type: "block";
+    name: 'table_cell';
+    type: 'block';
     content: Array<string>;
 }
 export interface TableRow {
-    name: "table_row";
-    type: "block";
+    name: 'table_row';
+    type: 'block';
     content: Array<TableCell>;
 }
 export interface TableHead {
-    name: "table_head";
-    type: "block";
+    name: 'table_head';
+    type: 'block';
     content: Array<TableCell>;
 }
 export interface TableSeparator {
-    "type": "separator";
-    "text": string;
+    type: 'separator';
+    text: string;
 }
 export declare type BlockAny = BlockNamed;
 export interface BlockNamed extends Omit<Block, 'content'> {
@@ -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/lib/types.js

@@ -1,2 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/lib/writer.js

@@ -24,6 +24,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Events = __importStar(require("events"));
 class Writer extends Events.EventEmitter {
+    INDEXTERMS;
+    FOOTNOTES;
+    output;
+    errors;
+    out;
+    ons;
     // write: (p: any) => void;
     // getStr: () => { errors: any; toString: () => any; valueOf: () => any; };
     // errors: any;
@@ -33,9 +39,6 @@ class Writer extends Events.EventEmitter {
     // endWrite: () => void;
     constructor(output) {
         super();
-        this.endWrite = () => {
-            this.emit('end');
-        };
         // save X<> entries
         this.INDEXTERMS = [];
         // save N<> annotates
@@ -45,9 +48,13 @@ class Writer extends Events.EventEmitter {
         this.emit('ready');
     }
     // escape function for output
-    escape(p) { return p; }
+    escape(p) {
+        return p;
+    }
     // write with escape special symbols
-    write(p) { return this.writeRaw(this.escape(p)); }
+    write(p) {
+        return this.writeRaw(this.escape(p));
+    }
     // raw write as is
     writeRaw(str) {
         if ('function' === typeof this.output) {
@@ -61,16 +68,20 @@ class Writer extends Events.EventEmitter {
         return {
             errors: this.errors,
             toString: () => this.out,
-            valueOf: () => this.out
+            valueOf: () => this.out,
         };
     }
     startWrite(tree) {
         // setup events
+        ;
         (this.ons || []).map(a => 
         //@ts-ignore
         super.on(...a));
         this.emit('start', tree);
-        this.addListener('errors', (err) => { this.errors = this.errors || []; this.errors.push(err); });
+        this.addListener('errors', err => {
+            this.errors = this.errors || [];
+            this.errors.push(err);
+        });
     }
     on(...params) {
         // overload 'on' method for reverse setup handlers
@@ -78,6 +89,9 @@ class Writer extends Events.EventEmitter {
         this.ons.unshift([...params]);
         return this;
     }
+    endWrite = () => {
+        this.emit('end');
+    };
     // nesting methods
     _add_nesting(n) { }
     _remove_nesting(n) { }
@@ -89,3 +103,4 @@ class Writer extends Events.EventEmitter {
     }
 }
 exports.default = Writer;
+//# sourceMappingURL=writer.js.map

package/lib/writerHtml.js

@@ -19,9 +19,9 @@ class WriterHTML extends writer_1.default {
             '"': '"',
             "'": ''',
             '/': '/',
-            '`': '`'
+            '`': '`',
         };
-        return (string + '').replace(/[&<>"'\/`]/g, (match) => HTML_CHARS[match]);
+        return (string + '').replace(/[&<>"'\/`]/g, match => HTML_CHARS[match]);
     }
     _add_nesting(n) {
         this.writeRaw('<blockquote>'.repeat(n));
@@ -31,3 +31,4 @@ class WriterHTML extends writer_1.default {
     }
 }
 exports.default = WriterHTML;
+//# sourceMappingURL=writerHtml.js.map

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@podlite/schema",
-  "version": "0.0.12",
-  "description": "podlite schema",
-  "main": "index.js",
+  "version": "0.0.14",
+  "description": "AST tools for Podlite markup language",
+  "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "MIT",
   "files": [
@@ -18,17 +18,18 @@
   "engineStrict": true,
   "publishConfig": {
     "access": "public",
-    "main": "index.js",
-    "module": "index.js",
+    "main": "lib/index.js",
     "types": "./lib/index.d.ts"
   },
   "scripts": {
-    "clean": "rm -rf lib tsconfig.tsbuildinfo",
-    "build": "run-s build:ts build:ast build:pegjs",
+    "clean": "rm -rf lib esm tsconfig.tsbuildinfo",
+    "build": "run-s build:pegjs build:ts build:ast ",
     "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,6 +52,5 @@
     "ts-node": "^9.1.1",
     "typescript": "4.5.5",
     "typescript-json-schema": "0.53.0"
-  },
-  "module": "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": {