@podlite/schema 0.0.37 → 0.0.39

package/lib/selectors.js

@@ -0,0 +1,163 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runSelector = exports.parseSelector = void 0;
+const index_1 = require("./index");
+const parseSelector = (selector) => {
+    const trimmed = selector.trim();
+    if (!trimmed)
+        return undefined;
+    // Split on the first '|' — left is source, right is blocks selector
+    const pipeIdx = trimmed.indexOf('|');
+    const sourcePart = (pipeIdx === -1 ? trimmed : trimmed.slice(0, pipeIdx)).trim();
+    const filterPart = pipeIdx === -1 ? '' : trimmed.slice(pipeIdx + 1).trim();
+    const blockFilters = filterPart
+        ? filterPart
+            .split(',')
+            .map(s => s.trim())
+            .filter(Boolean)
+        : [];
+    // Source: scheme:path or scheme:path#anchor
+    const sourceMatch = sourcePart.match(/^([^:]+):([^#]+)(?:#(.+))?$/);
+    if (sourceMatch) {
+        return {
+            scheme: sourceMatch[1],
+            document: sourceMatch[2].trim(),
+            anchor: sourceMatch[3],
+            blockFilters,
+        };
+    }
+    if (blockFilters.length > 0) {
+        return { blockFilters };
+    }
+    return undefined;
+};
+exports.parseSelector = parseSelector;
+// Normalize a path for loose suffix comparison:
+//   'src/foo.podlite'      ~= 'foo.podlite'
+//   './includes/x.podlite' ~= 'includes/x.podlite'
+const normalizePath = (p) => p.replace(/\\/g, '/').replace(/^\.\//, '');
+const isGlobPattern = (s) => /[*?[]/.test(s);
+// Convert a glob pattern to an anchored RegExp.
+//   **/   →  (?:.*/)?   zero or more directory segments (lets **/foo match root-level foo)
+//   **    →  .*         any characters, crosses /
+//   *     →  [^/]*      any characters within a single segment
+//   ?     →  [^/]       single character within a segment
+// Other regex meta characters are escaped.
+const globRegexCache = new Map();
+const globToRegex = (glob) => {
+    const cached = globRegexCache.get(glob);
+    if (cached)
+        return cached;
+    let re = '';
+    let i = 0;
+    while (i < glob.length) {
+        const c = glob[i];
+        const next = glob[i + 1];
+        if (c === '*' && next === '*' && glob[i + 2] === '/') {
+            re += '(?:.*/)?';
+            i += 3;
+        }
+        else if (c === '*' && next === '*') {
+            re += '.*';
+            i += 2;
+        }
+        else if (c === '*') {
+            re += '[^/]*';
+            i += 1;
+        }
+        else if (c === '?') {
+            re += '[^/]';
+            i += 1;
+        }
+        else if (/[\\^$.()+|{}[\]]/.test(c)) {
+            re += '\\' + c;
+            i += 1;
+        }
+        else {
+            re += c;
+            i += 1;
+        }
+    }
+    const compiled = new RegExp(`^${re}$`);
+    globRegexCache.set(glob, compiled);
+    return compiled;
+};
+const filePathMatches = (docFile, target) => {
+    const a = normalizePath(docFile);
+    const b = normalizePath(target);
+    if (isGlobPattern(b)) {
+        const rx = globToRegex(b);
+        if (rx.test(a))
+            return true;
+        // Suffix-tolerant match: allow any parent prefix (consistent with
+        // non-glob suffix matching, so 'src/00-foo/x.pod' matches '00-foo/x.pod').
+        const body = rx.source.slice(1, -1);
+        const rxSuffix = new RegExp(`^(?:.*/)${body}$`);
+        return rxSuffix.test(a);
+    }
+    return a === b || a.endsWith('/' + b) || b.endsWith('/' + a);
+};
+const getDocIDs = (doc) => {
+    const ids = [];
+    (0, index_1.getFromTree)(doc.node, 'NAME', 'TITLE').forEach(block => {
+        const conf = (0, index_1.makeAttrs)(block, {});
+        const title = (0, index_1.getTextContentFromNode)(block).trim();
+        if (conf.exists('id')) {
+            const id = conf.getFirstValue('id');
+            if (id)
+                ids.push(id);
+        }
+        ids.push(title);
+    });
+    return ids;
+};
+function getMapIDsBlocks(srcNode) {
+    const idsMap = new Map();
+    (0, index_1.getFromTree)(srcNode, { type: 'block' }).forEach(i => {
+        const id = (0, index_1.getNodeId)(i, {});
+        if (id)
+            idsMap.set(id, i);
+    });
+    return idsMap;
+}
+const runSelector = (selector, docs) => {
+    const parsed = (0, exports.parseSelector)(selector);
+    if (!parsed)
+        return [];
+    const { scheme, document, anchor, blockFilters } = parsed;
+    let matchedDocs = docs;
+    if (scheme === 'doc' && document) {
+        matchedDocs = docs.filter(doc => getDocIDs(doc).includes(document));
+    }
+    else if (scheme === 'file' && document) {
+        matchedDocs = docs.filter(doc => filePathMatches(doc.file, document));
+    }
+    else if (scheme && scheme !== 'doc' && scheme !== 'file') {
+        return [];
+    }
+    // Anchor takes precedence — single-block-by-id lookup
+    if (anchor) {
+        const collectedBlocks = [];
+        for (const d of matchedDocs) {
+            const idsMap = getMapIDsBlocks(d.node);
+            const block = idsMap.get(anchor);
+            if (block)
+                collectedBlocks.push(block);
+        }
+        return collectedBlocks;
+    }
+    // Block filters — extract blocks by name across matched docs
+    if (blockFilters.length > 0) {
+        const collectedBlocks = [];
+        for (const d of matchedDocs) {
+            for (const name of blockFilters) {
+                collectedBlocks.push(...(0, index_1.getFromTree)(d.node, name));
+            }
+        }
+        return collectedBlocks;
+    }
+    // No anchor, no filter — return whole docs
+    return matchedDocs.map(d => d.node);
+};
+exports.runSelector = runSelector;
+//# sourceMappingURL=selectors.js.map

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.37",
+  "version": "0.0.39",
   "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,