@podlite/schema 0.0.24 → 0.0.26

package/esm/types.d.ts

@@ -54,6 +54,7 @@ export interface RulesStrict {
     nested: RuleHandler<BlockNested>;
     output: RuleHandler<BlockOutput>;
     input: RuleHandler<BlockInput>;
+    include: RuleHandler<BlockInclude>;
     picture: RuleHandler<BlockPicture>;
     image: RuleHandler<BlockImage>;
     ':image': RuleHandler<Image>;
@@ -310,6 +311,9 @@ export interface BlockOutput extends Block {
 export interface BlockInput extends Block {
     name: 'input';
 }
+export interface BlockInclude extends Block {
+    name: 'include';
+}
 export interface BlockPara extends Block {
     name: 'para';
 }
@@ -378,7 +382,7 @@ export interface BlockFormula extends Omit<BlockNamed, 'content'> {
     content: [Verbatim];
 }
 export declare type FormattingCodes = FormattingCodeA | FormattingCodeC | FormattingCodeB | FormattingCodeD | FormattingCodeE | FormattingCodeF | FormattingCodeI | FormattingCodeL | FormattingCodeN | FormattingCodeX | FormattingCodeZ | FormattingCodeV | FormattingCodeS | FormattingCodeAny;
-export declare type PodNode = Ambient | BlockPod | BlockData | BlockFormula | BlockCode | BlankLine | BlockNested | BlockMarkdown | BlockOutput | BlockInput | BlockPara | BlockHead | BlockComment | BlockDefn | string | Para | Text | Code | BlockNamed | BlockAny | Verbatim | BlockTable | List | BlockConfig | BlockItem | Alias | BlockToc | BlockPicture | BlockImage | Image | RootBlock | Separator | BlockCaption | FormattingCodes | Toc;
+export declare type PodNode = Ambient | BlockPod | BlockData | BlockFormula | BlockCode | BlankLine | BlockNested | BlockMarkdown | BlockOutput | BlockInput | BlockInclude | BlockPara | BlockHead | BlockComment | BlockDefn | string | Para | Text | Code | BlockNamed | BlockAny | Verbatim | BlockTable | List | BlockConfig | BlockItem | Alias | BlockToc | BlockPicture | 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/ast-helpers.d.ts

@@ -1,2 +1,4 @@
+import { Node } from './types';
 export declare const getNodeId: (node: any, ctx: any) => any;
+export declare const getSafeNodeId: (node: Node, ctx: any) => string | null;
 export declare const makeAttrs: (node: any, ctx?: import("./helpers/config").Context) => import("./helpers/config").Attr;

package/lib/ast-helpers.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeAttrs = exports.getNodeId = void 0;
+exports.makeAttrs = exports.getSafeNodeId = exports.getNodeId = void 0;
 const config_1 = __importDefault(require("./helpers/config"));
 const getNodeId = (node, ctx) => {
     const conf = (0, config_1.default)(node, ctx);
@@ -13,5 +13,7 @@ const getNodeId = (node, ctx) => {
     return node.id;
 };
 exports.getNodeId = getNodeId;
+const getSafeNodeId = (node, ctx) => (0, exports.getNodeId)(node, ctx)?.toString().replace(/\s/g, '-');
+exports.getSafeNodeId = getSafeNodeId;
 exports.makeAttrs = config_1.default;
 //# sourceMappingURL=ast-helpers.js.map

package/lib/blocks-helpers.d.ts

@@ -17,7 +17,7 @@ export declare const mkVerbatim: (text: any) => {
     type: string;
     value: any;
 };
-export declare const mkToc: (content: TocList, title?: string) => Toc;
+export declare const mkToc: (content: TocList, title?: string, location?: Location) => Toc;
 export declare const mkTocList: (content: Array<TocItem | TocList>, level: number) => TocList;
 export declare const mkTocItem: (content: PodNode) => TocItem;
 export declare const mkCaption: (content: Array<Node>) => BlockCaption;

package/lib/blocks-helpers.js

@@ -46,8 +46,8 @@ const mkVerbatim = text => {
 };
 exports.mkVerbatim = mkVerbatim;
 // Table of contents helpers
-const mkToc = (content, title) => {
-    return (0, exports.mkNode)({ type: 'toc', title, content });
+const mkToc = (content, title, location) => {
+    return (0, exports.mkNode)({ type: 'toc', title, content, location });
 };
 exports.mkToc = mkToc;
 const mkTocList = (content, level) => {

package/lib/grammar.js

@@ -283,7 +283,8 @@ function peg$parse(input, options) {
             config: [],
             location: location()
         };
-    }, peg$c159 = function (vmargin, name, content) {
+    }, peg$c159 = function (vmargin, name, first_line, content_rest) {
+        const content = (first_line === "\n" ? "" : first_line) + content_rest;
         return {
             margin: vmargin,
             type: 'block',
@@ -1263,6 +1264,45 @@ function peg$parse(input, options) {
         }
         return s0;
     }
+    function peg$parseraw_text_until_eol() {
+        var s0, s1, s2, s3;
+        s0 = peg$currPos;
+        s1 = peg$currPos;
+        s2 = [];
+        s3 = peg$parseText();
+        if (s3 !== peg$FAILED) {
+            while (s3 !== peg$FAILED) {
+                s2.push(s3);
+                s3 = peg$parseText();
+            }
+        }
+        else {
+            s2 = peg$FAILED;
+        }
+        if (s2 !== peg$FAILED) {
+            s1 = input.substring(s1, peg$currPos);
+        }
+        else {
+            s1 = s2;
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parseEOL();
+            if (s2 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c34();
+                s0 = s1;
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
     function peg$parseerror_para() {
         var s0, s1, s2, s3, s4, s5;
         s0 = peg$currPos;
@@ -5406,7 +5446,7 @@ function peg$parse(input, options) {
                     if (s4 !== peg$FAILED) {
                         s5 = peg$parseemptyline();
                         if (s5 === peg$FAILED) {
-                            s5 = null;
+                            s5 = peg$parseraw_text_until_eol();
                         }
                         if (s5 !== peg$FAILED) {
                             s6 = peg$currPos;
@@ -5476,7 +5516,7 @@ function peg$parse(input, options) {
                             }
                             if (s6 !== peg$FAILED) {
                                 peg$savedPos = s0;
-                                s1 = peg$c159(s1, s3, s6);
+                                s1 = peg$c159(s1, s3, s5, s6);
                                 s0 = s1;
                             }
                             else {
@@ -6359,6 +6399,7 @@ function peg$parse(input, options) {
             'defn',
             'formula',
             'head',
+            'include',
             'input',
             'item',
             'markdown',

package/lib/types.d.ts

@@ -54,6 +54,7 @@ export interface RulesStrict {
     nested: RuleHandler<BlockNested>;
     output: RuleHandler<BlockOutput>;
     input: RuleHandler<BlockInput>;
+    include: RuleHandler<BlockInclude>;
     picture: RuleHandler<BlockPicture>;
     image: RuleHandler<BlockImage>;
     ':image': RuleHandler<Image>;
@@ -310,6 +311,9 @@ export interface BlockOutput extends Block {
 export interface BlockInput extends Block {
     name: 'input';
 }
+export interface BlockInclude extends Block {
+    name: 'include';
+}
 export interface BlockPara extends Block {
     name: 'para';
 }
@@ -378,7 +382,7 @@ export interface BlockFormula extends Omit<BlockNamed, 'content'> {
     content: [Verbatim];
 }
 export declare type FormattingCodes = FormattingCodeA | FormattingCodeC | FormattingCodeB | FormattingCodeD | FormattingCodeE | FormattingCodeF | FormattingCodeI | FormattingCodeL | FormattingCodeN | FormattingCodeX | FormattingCodeZ | FormattingCodeV | FormattingCodeS | FormattingCodeAny;
-export declare type PodNode = Ambient | BlockPod | BlockData | BlockFormula | BlockCode | BlankLine | BlockNested | BlockMarkdown | BlockOutput | BlockInput | BlockPara | BlockHead | BlockComment | BlockDefn | string | Para | Text | Code | BlockNamed | BlockAny | Verbatim | BlockTable | List | BlockConfig | BlockItem | Alias | BlockToc | BlockPicture | BlockImage | Image | RootBlock | Separator | BlockCaption | FormattingCodes | Toc;
+export declare type PodNode = Ambient | BlockPod | BlockData | BlockFormula | BlockCode | BlankLine | BlockNested | BlockMarkdown | BlockOutput | BlockInput | BlockInclude | BlockPara | BlockHead | BlockComment | BlockDefn | string | Para | Text | Code | BlockNamed | BlockAny | Verbatim | BlockTable | List | BlockConfig | BlockItem | Alias | BlockToc | BlockPicture | 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,9 +1,13 @@
 {
   "name": "@podlite/schema",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "AST tools for Podlite markup language",
   "main": "lib/index.js",
   "license": "MIT",
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/podlite"
+  },
   "files": [
     "lib/**/*.js",
     "lib/**/*.d.ts",

package/schema/AstTree.json

@@ -141,6 +141,9 @@
                 {
                     "$ref": "#/definitions/BlockInput"
                 },
+                {
+                    "$ref": "#/definitions/BlockInclude"
+                },
                 {
                     "$ref": "#/definitions/BlockPara"
                 },
@@ -740,6 +743,58 @@
                 "type"
             ]
         },
+        "BlockInclude": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string",
+                    "enum": [
+                        "include"
+                    ]
+                },
+                "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"
+            ]
+        },
         "BlockPara": {
             "type": "object",
             "properties": {
@@ -1007,6 +1062,9 @@
                             {
                                 "$ref": "#/definitions/BlockInput"
                             },
+                            {
+                                "$ref": "#/definitions/BlockInclude"
+                            },
                             {
                                 "$ref": "#/definitions/BlockPara"
                             },

package/schema/PodliteDocument.json

@@ -141,6 +141,9 @@
                 {
                     "$ref": "#/definitions/BlockInput"
                 },
+                {
+                    "$ref": "#/definitions/BlockInclude"
+                },
                 {
                     "$ref": "#/definitions/BlockPara"
                 },
@@ -740,6 +743,58 @@
                 "type"
             ]
         },
+        "BlockInclude": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string",
+                    "enum": [
+                        "include"
+                    ]
+                },
+                "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"
+            ]
+        },
         "BlockPara": {
             "type": "object",
             "properties": {
@@ -1007,6 +1062,9 @@
                             {
                                 "$ref": "#/definitions/BlockInput"
                             },
+                            {
+                                "$ref": "#/definitions/BlockInclude"
+                            },
                             {
                                 "$ref": "#/definitions/BlockPara"
                             },