@podlite/schema 0.0.39 → 0.0.41

package/lib/helpers/parseAttributes.d.ts

@@ -0,0 +1,2 @@
+import { ConfigItem } from '../types';
+export declare function parseAttributes(src: string): ConfigItem[];

package/lib/helpers/parseAttributes.js

@@ -0,0 +1,35 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseAttributes = void 0;
+const parser = __importStar(require("../grammar"));
+function parseAttributes(src) {
+    if (!src || !src.trim())
+        return [];
+    try {
+        return parser.parse(src, { startRule: 'attributesOnly' });
+    }
+    catch {
+        return [];
+    }
+}
+exports.parseAttributes = parseAttributes;
+//# sourceMappingURL=parseAttributes.js.map

package/lib/index.d.ts

@@ -11,6 +11,7 @@ export { makeInterator } from './ast-inerator';
 export { makeTransformer, isNamedBlock, isSemanticBlock } from './helpers/makeTransformer';
 export { toAny } from './exportAny';
 export { makeAttrs } from './helpers/config';
+export { parseAttributes } from './helpers/parseAttributes';
 export { pluginCleanLocation } from './plugin-clean-location';
 export { toAnyRules } from './helpers/plugins';
 export { podlitePluggable, Podlite, PodliteExport, cleanIds, frozenIds } from './pluggableParser';

package/lib/index.js

@@ -25,7 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.version = exports.runSelector = exports.parseSelector = exports.Writer = exports.toMarkdown = exports.toHtml = exports.parse = exports.toTree = exports.isValidateError = exports.validateAst = exports.validateAstTree = exports.validatePodliteAst = exports.getPodContentFromNode = exports.getTextContentFromNode = exports.toAst = exports.frozenIds = exports.cleanIds = exports.podlitePluggable = exports.toAnyRules = exports.pluginCleanLocation = exports.makeAttrs = exports.toAny = exports.isSemanticBlock = exports.isNamedBlock = exports.makeTransformer = exports.makeInterator = void 0;
+exports.version = exports.runSelector = exports.parseSelector = exports.Writer = exports.toMarkdown = exports.toHtml = exports.parse = exports.toTree = exports.isValidateError = exports.validateAst = exports.validateAstTree = exports.validatePodliteAst = exports.getPodContentFromNode = exports.getTextContentFromNode = exports.toAst = exports.frozenIds = exports.cleanIds = exports.podlitePluggable = exports.toAnyRules = exports.pluginCleanLocation = exports.parseAttributes = exports.makeAttrs = exports.toAny = exports.isSemanticBlock = exports.isNamedBlock = exports.makeTransformer = exports.makeInterator = void 0;
 const ajv_1 = __importDefault(require("ajv"));
 const pointer = __importStar(require("json-pointer"));
 const jsonShemes = __importStar(require("../schema"));
@@ -45,6 +45,8 @@ var exportAny_1 = require("./exportAny");
 Object.defineProperty(exports, "toAny", { enumerable: true, get: function () { return exportAny_1.toAny; } });
 var config_1 = require("./helpers/config");
 Object.defineProperty(exports, "makeAttrs", { enumerable: true, get: function () { return config_1.makeAttrs; } });
+var parseAttributes_1 = require("./helpers/parseAttributes");
+Object.defineProperty(exports, "parseAttributes", { enumerable: true, get: function () { return parseAttributes_1.parseAttributes; } });
 var plugin_clean_location_1 = require("./plugin-clean-location");
 Object.defineProperty(exports, "pluginCleanLocation", { enumerable: true, get: function () { return plugin_clean_location_1.pluginCleanLocation; } });
 var plugins_1 = require("./helpers/plugins");

package/lib/plugin-formatting-codes.js

@@ -47,33 +47,20 @@ const middle = () => tree => {
                     content: visiter(n.content, ctx, visiter),
                 };
             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 isPictureBlock = 'name' in n && n.name === 'picture';
-            const isFormulaBlock = 'name' in n && n.name === 'formula';
-            const allowValues = [...conf.getAllValues('allow'), ...(isCodeBlock ? ['NONE'] : [])];
-            if ((0, makeTransformer_2.isNamedBlock)(n.name))
+            const name = 'name' in n ? n.name : '';
+            // Blocks whose content is verbatim by default — fcode parsing only
+            // kicks in when :allow opts in (per spec, "Formatting within code blocks").
+            const isVerbatimDefault = ['code', 'data', 'markdown', 'picture', 'formula'].includes(name);
+            const allowValues = conf.getAllValues('allow');
+            if ((0, makeTransformer_2.isNamedBlock)(name))
                 return n;
-            // for code block not parse content by default
-            if ((isCodeBlock || isDataBlock || isMarkdownBlock || isPictureBlock || isFormulaBlock) &&
-                allowValues.length == 0)
+            if (isVerbatimDefault && allowValues.length === 0)
                 return n;
             const allowed = allowValues.sort();
             const transformer = (0, makeTransformer_1.default)({
-                ':verbatim': (n, ctx) => {
-                    // special case for code block, 'NONE' - flag disabled all markup codes
-                    // do not parse content by default
-                    if (allowed.length == 1 && allowed.includes('NONE'))
-                        return n;
-                    return fcparser.parse(n.value, { allowed });
-                },
-                ':text': (n, ctx) => {
-                    return fcparser.parse(n.value, { allowed });
-                },
-                ':block': (n, ctx) => {
-                    return transformerBlocks(n, { ...ctx });
-                },
+                ':verbatim': (n, ctx) => fcparser.parse(n.value, { allowed }),
+                ':text': (n, ctx) => fcparser.parse(n.value, { allowed }),
+                ':block': (n, ctx) => transformerBlocks(n, { ...ctx }),
             });
             return { ...n, content: transformer(n.content, { ...ctx }) };
         },

package/lib/plugin-tables.js

@@ -81,6 +81,36 @@ function parseTsv(text) {
     const rows = lines.map(line => line.split('\t'));
     return rows.filter(r => !(r.length === 1 && r[0].trim() === ''));
 }
+// Parse a MIME type value into the bare type and a map of parameters
+// (RFC 6838 / RFC 7231 §3.1.1.1). Used to recognise the `header` parameter
+// (RFC 4180 §3) on `:mime-type` of CSV/TSV =data blocks.
+//
+// Examples:
+//   "text/csv"                          → { type: 'text/csv', params: {} }
+//   "text/csv; header=present"          → { type: 'text/csv', params: { header: 'present' } }
+//   "text/csv;charset=utf-8;header=absent" → { ..., params: { charset: 'utf-8', header: 'absent' } }
+function parseMimeType(raw) {
+    if (!raw || typeof raw !== 'string')
+        return { type: '', params: {} };
+    const parts = raw.split(';').map(s => s.trim());
+    const type = (parts.shift() || '').toLowerCase();
+    const params = {};
+    for (const p of parts) {
+        if (!p)
+            continue;
+        const eq = p.indexOf('=');
+        if (eq < 0)
+            continue;
+        const key = p.slice(0, eq).trim().toLowerCase();
+        let value = p.slice(eq + 1).trim();
+        if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
+            value = value.slice(1, -1);
+        }
+        if (key)
+            params[key] = value;
+    }
+    return { type, params };
+}
 // Locate the first `=data` block with a matching `:key` attribute anywhere
 // in the document tree.
 function findDataBlockByKey(tree, key) {
@@ -161,15 +191,16 @@ function buildRowBlock(cells, isHeader) {
     }
     return block;
 }
-// Convert parsed CSV/TSV rows to plain `=row`/`=cell` blocks. The spec is
-// silent on how to mark a header row in `=table data:<key>` references, so
-// no row receives `:header` here. Authors who need a header row can use a
-// structured table with explicit `=begin row :header`, or a Markdown GFM
-// table with a separator line.
-function csvToTableContent(csvRows) {
-    return csvRows.map(row => {
+// Convert parsed CSV/TSV rows to plain `=row`/`=cell` blocks. When
+// `hasHeader` is true (signalled by the `header=present` MIME parameter on
+// the source `=data` block, per RFC 4180 §3), the first row is marked with
+// `:header`. Default behaviour leaves all rows unmarked, matching authors
+// who use a structured table with explicit `=begin row :header` or a
+// Markdown GFM table.
+function csvToTableContent(csvRows, hasHeader = false) {
+    return csvRows.map((row, i) => {
         const cells = row.map(v => buildCellBlock(v.trim()));
-        return buildRowBlock(cells, false);
+        return buildRowBlock(cells, hasHeader && i === 0);
     });
 }
 // ─── Error recovery (design notes Rules 2-4) ───────────────────────────────
@@ -418,7 +449,8 @@ exports.default = () => tree => {
                     console.warn(`[table] no =data block found for data:${ref.target} — rendered as empty`);
                     return { ...node, content: [] };
                 }
-                const mimeType = (0, config_1.default)(dataBlock, {}).getFirstValue('mime-type');
+                const rawMime = (0, config_1.default)(dataBlock, {}).getFirstValue('mime-type');
+                const { type: mimeType, params: mimeParams } = parseMimeType(rawMime);
                 const isCsv = mimeType === 'text/csv';
                 const isTsv = mimeType === 'text/tab-separated-values';
                 if (isCsv || isTsv) {
@@ -428,11 +460,12 @@ exports.default = () => tree => {
                         console.warn(`[table] ${isCsv ? 'CSV' : 'TSV'} parse produced no rows for data:${ref.target} — rendered as empty`);
                         return { ...node, content: [] };
                     }
-                    const filledNode = { ...node, content: csvToTableContent(rows) };
+                    const hasHeader = mimeParams.header === 'present';
+                    const filledNode = { ...node, content: csvToTableContent(rows, hasHeader) };
                     return normalizeCellCounts(filledNode, `table data:${ref.target}`);
                 }
                 // Rule 4: source not tabular → render as code block so content remains visible
-                console.warn(`[table] =data :key<${ref.target}> has non-tabular mime-type ${mimeType || '(none)'} — rendered as =code`);
+                console.warn(`[table] =data :key<${ref.target}> has non-tabular mime-type ${rawMime || '(none)'} — rendered as =code`);
                 return buildCodeFromDataBlock(node, dataBlock);
             }
             // structured mode: transform row children (wrap implicit cells), then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@podlite/schema",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "description": "AST tools and schema for Podlite markup language — validate, traverse, and transform document trees",
   "main": "lib/index.js",
   "homepage": "https://podlite.org",
@@ -40,7 +40,7 @@
     "build": "run-s build:pegjs build_lib build:ast ",
     "build_lib": "yarn g:build",
     "build:ast": "ts-node scripts/make-ast-scheme.ts",
-    "build:pegjs": "pegmill -o src/grammar.js src/grammar.pegjs && pegmill -o src/grammarfc.js src/grammarfc.pegjs",
+    "build:pegjs": "pegmill --allowed-start-rules Document,attributesOnly -o src/grammar.js src/grammar.pegjs && pegmill -o src/grammarfc.js src/grammarfc.pegjs",
     "watch": "npx nodemon -e js,ts --exec 'yarn' build",
     "watch:pegjs": "npx nodemon -e pegmill --exec 'yarn' build:pegjs",
     "test": "yarn g:jest  --passWithNoTests"