@podlite/schema 0.0.36 → 0.0.38

package/lib/helpers/config.d.ts

@@ -4,6 +4,7 @@ export declare type Context = {
 export interface Attr {
     getAllValues: (name: any) => any;
     getFirstValue: (name: any) => any;
+    getMapValue: (name: string) => Record<string, string | number | boolean> | undefined;
     asHash: () => {};
     (): {};
     exists(name: string): boolean;

package/lib/helpers/config.js

@@ -43,6 +43,14 @@ const makeAttrs = (node, ctx = {}) => {
     resfn.getFirstValue = name => {
         return resfn.exists(name) ? resfn.getAllValues(name)[0] : undefined;
     };
+    /**
+     * return first map-typed value (from `:attr{ k=>v, ... }` syntax) or
+     * undefined when the attribute is absent or not a map value
+     */
+    resfn.getMapValue = name => {
+        const first = resfn.getFirstValue(name);
+        return first && typeof first === 'object' && !Array.isArray(first) ? first : undefined;
+    };
     /**
      * return key: val
      *

package/lib/plugin-tables.d.ts

@@ -1,5 +1,2 @@
 declare const _default: () => (tree: any) => any;
-/**
- *  Main transforms
- */
 export default _default;

package/lib/plugin-tables.js

@@ -82,9 +82,35 @@ const extractColumnsByTemplate = (text, template) => {
 /**
  *  Main transforms
  */
+const wrapImplicitCells = rowNode => {
+    if (!Array.isArray(rowNode.content) || rowNode.content.length === 0)
+        return rowNode;
+    const hasNonCell = rowNode.content.some(c => c && c.type === 'block' && c.name !== 'cell' && c.name !== 'blankline');
+    if (!hasNonCell)
+        return rowNode;
+    const wrapped = rowNode.content.map(c => {
+        if (!c || c.type !== 'block')
+            return c;
+        if (c.name === 'cell' || c.name === 'blankline')
+            return c;
+        return { type: 'block', name: 'cell', content: [c], margin: c.margin || '' };
+    });
+    return { ...rowNode, content: wrapped };
+};
+const isStructured = tableNode => Array.isArray(tableNode.content) &&
+    tableNode.content.some(c => c && c.type === 'block' && (c.name === 'row' || c.name === 'cell'));
 exports.default = () => tree => {
     const transformer = (0, makeTransformer_1.default)({
         table: node => {
+            // structured mode: transform row children (wrap implicit cells)
+            if (isStructured(node)) {
+                const transformedContent = (node.content || []).map(c => {
+                    if (c && c.name === 'row')
+                        return wrapImplicitCells(c);
+                    return c;
+                });
+                return { ...node, content: transformedContent };
+            }
             let rows = [];
             const collectValues = row => {
                 rows.push(row.value);
@@ -116,9 +142,12 @@ exports.default = () => tree => {
                 },
             })(node);
             const columnTemplate = makeMask(lines, separators);
-            const makeBlock = (name, content, ...attr) => {
-                return { ...attr, name, type: 'block', content: Array.isArray(content) ? content : [content] };
+            const makeBlock = (name, content, extra = {}) => {
+                return { ...extra, name, type: 'block', content: Array.isArray(content) ? content : [content] };
             };
+            const makeRow = cells => makeBlock('row', cells);
+            const makeHeaderRow = cells => makeBlock('row', cells, { config: [{ name: 'header', value: true, type: 'boolean' }] });
+            const makeCell = text => makeBlock('cell', { type: 'text', value: text });
             // make columns
             const res = (0, makeTransformer_1.default)({
                 'row:text': row => {
@@ -126,16 +155,16 @@ exports.default = () => tree => {
                         // split each text row into lines
                         const textRowsLines = flattenDeep([row.value].map(splitToLines));
                         return textRowsLines.map(rowValue => {
-                            const res = extractColumnsByTemplate(rowValue, columnTemplate);
-                            return makeBlock('table_row', res.map(col => makeBlock('table_cell', { type: 'text', value: col })));
+                            const cols = extractColumnsByTemplate(rowValue, columnTemplate);
+                            return makeRow(cols.map(makeCell));
                         });
                     }
-                    const res = extractColumnsByTemplate(row.value, columnTemplate);
-                    return makeBlock('table_row', res.map(col => makeBlock('table_cell', { type: 'text', value: col })));
+                    const cols = extractColumnsByTemplate(row.value, columnTemplate);
+                    return makeRow(cols.map(makeCell));
                 },
                 'head:text': head => {
-                    const res = extractColumnsByTemplate(head.value, columnTemplate);
-                    return makeBlock('table_head', res.map(col => makeBlock('table_cell', { type: 'text', value: col })));
+                    const cols = extractColumnsByTemplate(head.value, columnTemplate);
+                    return makeHeaderRow(cols.map(makeCell));
                 },
             })(node);
             return res;

package/lib/types.d.ts

@@ -24,7 +24,9 @@ export interface RulesStrict {
     'D<>': RuleHandler<FormattingCodeD>;
     'E<>': RuleHandler<FormattingCodeE>;
     'F<>': RuleHandler<FormattingCodeF>;
+    'H<>': RuleHandler<FormattingCodeAny>;
     'I<>': RuleHandler<FormattingCodeI>;
+    'J<>': RuleHandler<FormattingCodeAny>;
     'K<>': RuleHandler<FormattingCodeAny>;
     'R<>': RuleHandler<FormattingCodeAny>;
     'T<>': RuleHandler<FormattingCodeAny>;
@@ -35,7 +37,7 @@ export interface RulesStrict {
     'L<>': RuleHandler<FormattingCodeL>;
     'U<>': RuleHandler<FormattingCodeAny>;
     'Z<>': RuleHandler<FormattingCodeAny>;
-    'Delete<>': RuleHandler<FormattingCodeAny>;
+    'O<>': RuleHandler<FormattingCodeAny>;
     pod: RuleHandler<Para>;
     root: RuleHandler<RootBlock>;
     ':para': RuleHandler<Para>;
@@ -68,9 +70,8 @@ export interface RulesStrict {
     'table:block': RuleHandler<BlockTable>;
     table: RuleHandler<BlockTable>;
     ':separator': RuleHandler<Separator>;
-    table_row: RuleHandler<TableRow>;
-    table_cell: RuleHandler<TableCell>;
-    table_head: RuleHandler<TableHead>;
+    row: RuleHandler<TableRow>;
+    cell: RuleHandler<TableCell>;
     toc: RuleHandler<BlockToc>;
     ':toc': RuleHandler<Toc>;
     ':toc-list': RuleHandler<TocList>;
@@ -100,6 +101,7 @@ export interface Image {
 export interface Toc {
     type: 'toc';
     title?: string;
+    folded?: boolean;
     foldedLevels?: Record<number, boolean>;
     content: TocList;
 }
@@ -342,17 +344,17 @@ export interface BlockTable extends Omit<Block, 'content'> {
     text?: string;
 }
 export interface TableCell {
-    name: 'table_cell';
+    name: 'cell';
     type: 'block';
     content: Array<string>;
 }
 export interface TableRow {
-    name: 'table_row';
+    name: 'row';
     type: 'block';
     content: Array<TableCell>;
 }
 export interface TableHead {
-    name: 'table_head';
+    name: 'row';
     type: 'block';
     content: Array<TableCell>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@podlite/schema",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "description": "AST tools and schema for Podlite markup language — validate, traverse, and transform document trees",
   "main": "lib/index.js",
   "homepage": "https://podlite.org",
@@ -68,7 +68,7 @@
     "@types/node": "^17.0.7",
     "glob": "^7.2.0",
     "npm-run-all": "^4.1.5",
-    "pegmill": "0.1.0",
+    "pegmill": "0.1.2",
     "ts-node": "^9.1.1",
     "typescript": "4.5.5",
     "typescript-json-schema": "0.53.0"

package/schema/AstTree.json

@@ -1521,7 +1521,7 @@
                 "name": {
                     "type": "string",
                     "enum": [
-                        "table_row"
+                        "row"
                     ]
                 },
                 "type": {
@@ -1549,7 +1549,7 @@
                 "name": {
                     "type": "string",
                     "enum": [
-                        "table_cell"
+                        "cell"
                     ]
                 },
                 "type": {
@@ -1577,7 +1577,7 @@
                 "name": {
                     "type": "string",
                     "enum": [
-                        "table_head"
+                        "row"
                     ]
                 },
                 "type": {
@@ -2688,6 +2688,9 @@
                 "title": {
                     "type": "string"
                 },
+                "folded": {
+                    "type": "boolean"
+                },
                 "foldedLevels": {
                     "type": "object",
                     "additionalProperties": false,

package/schema/PodliteDocument.json

@@ -1521,7 +1521,7 @@
                 "name": {
                     "type": "string",
                     "enum": [
-                        "table_row"
+                        "row"
                     ]
                 },
                 "type": {
@@ -1549,7 +1549,7 @@
                 "name": {
                     "type": "string",
                     "enum": [
-                        "table_cell"
+                        "cell"
                     ]
                 },
                 "type": {
@@ -1577,7 +1577,7 @@
                 "name": {
                     "type": "string",
                     "enum": [
-                        "table_head"
+                        "row"
                     ]
                 },
                 "type": {
@@ -2688,6 +2688,9 @@
                 "title": {
                     "type": "string"
                 },
+                "folded": {
+                    "type": "boolean"
+                },
                 "foldedLevels": {
                     "type": "object",
                     "additionalProperties": false,