hyperbook 0.73.5 → 0.74.0

package/dist/index.js

@@ -167098,8 +167098,218 @@ var remarkLink_default = (ctx) => () => {
 var import_handlebars = __toESM(require_lib(), 1);
 
 
+
+// src/queryParser.ts
+var tokenize = (source) => {
+  const tokens = [];
+  let i = 0;
+  while (i < source.length) {
+    if (/\s/.test(source[i])) {
+      i++;
+      continue;
+    }
+    if (source[i] === "(" || source[i] === ")") {
+      tokens.push(source[i]);
+      i++;
+      continue;
+    }
+    if (source.slice(i, i + 3).toUpperCase() === "AND" && !/\w/.test(source[i + 3] || "")) {
+      tokens.push("AND");
+      i += 3;
+      continue;
+    }
+    if (source.slice(i, i + 2).toUpperCase() === "OR" && !/\w/.test(source[i + 2] || "")) {
+      tokens.push("OR");
+      i += 2;
+      continue;
+    }
+    if (source.slice(i, i + 3).toUpperCase() === "NOT" && !/\w/.test(source[i + 3] || "")) {
+      tokens.push("NOT");
+      i += 3;
+      continue;
+    }
+    const condMatch = source.slice(i).match(/^([a-zA-Z_][a-zA-Z0-9_]*)\(([^)]*)\)/);
+    if (condMatch) {
+      tokens.push(condMatch[0]);
+      i += condMatch[0].length;
+      continue;
+    }
+    i++;
+  }
+  return tokens;
+};
+var QueryParser = class {
+  constructor(tokens) {
+    this.tokens = tokens;
+    this.pos = 0;
+  }
+  parse() {
+    if (this.tokens.length === 0) {
+      return null;
+    }
+    return this.parseOr();
+  }
+  parseOr() {
+    let left = this.parseAnd();
+    while (this.peek() === "OR") {
+      this.consume("OR");
+      const right = this.parseAnd();
+      left = { type: "OR", left, right };
+    }
+    return left;
+  }
+  parseAnd() {
+    let left = this.parseNot();
+    while (this.peek() === "AND") {
+      this.consume("AND");
+      const right = this.parseNot();
+      left = { type: "AND", left, right };
+    }
+    return left;
+  }
+  parseNot() {
+    if (this.peek() === "NOT") {
+      this.consume("NOT");
+      const operand = this.parseNot();
+      return { type: "NOT", operand };
+    }
+    return this.parsePrimary();
+  }
+  parsePrimary() {
+    const token = this.peek();
+    if (token === "(") {
+      this.consume("(");
+      const node3 = this.parseOr();
+      this.consume(")");
+      return node3;
+    }
+    return this.parseCondition();
+  }
+  parseCondition() {
+    const token = this.next();
+    if (!token) {
+      throw new Error("Unexpected end of query");
+    }
+    const match = token.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\(([^)]*)\)$/);
+    if (!match) {
+      throw new Error(`Invalid condition: ${token}`);
+    }
+    return { type: "condition", field: match[1], regex: match[2] };
+  }
+  peek() {
+    return this.tokens[this.pos];
+  }
+  next() {
+    return this.tokens[this.pos++];
+  }
+  consume(expected) {
+    const token = this.next();
+    if (token !== expected) {
+      throw new Error(`Expected ${expected}, got ${token}`);
+    }
+  }
+};
+var parseQuery = (source) => {
+  const tokens = tokenize(source);
+  const parser = new QueryParser(tokens);
+  return parser.parse();
+};
+var evaluateQuery = (query, page) => {
+  if (query === null) {
+    return true;
+  }
+  switch (query.type) {
+    case "AND":
+      return evaluateQuery(query.left, page) && evaluateQuery(query.right, page);
+    case "OR":
+      return evaluateQuery(query.left, page) || evaluateQuery(query.right, page);
+    case "NOT":
+      return !evaluateQuery(query.operand, page);
+    case "condition":
+      return evaluateCondition(query.field, query.regex, page);
+    default:
+      return false;
+  }
+};
+var evaluateCondition = (field, regex, page) => {
+  const re2 = new RegExp(regex);
+  if (field === "href") {
+    return page.href ? re2.test(page.href) : false;
+  } else if (field === "name") {
+    return re2.test(page.name);
+  } else if (field === "keyword") {
+    if (!page.keywords || !Array.isArray(page.keywords)) {
+      return false;
+    }
+    return page.keywords.some((k) => re2.test(k));
+  } else if (field === "description") {
+    return page.description ? re2.test(page.description) : false;
+  } else {
+    const value = page[field];
+    if (value === void 0 || value === null) {
+      return false;
+    }
+    if (typeof value === "string") {
+      return re2.test(value);
+    } else if (typeof value === "number" || typeof value === "boolean") {
+      return re2.test(String(value));
+    } else if (value instanceof Date) {
+      return re2.test(value.toISOString());
+    } else if (Array.isArray(value)) {
+      return value.some((v) => {
+        if (typeof v === "string") {
+          return re2.test(v);
+        } else if (typeof v === "number" || typeof v === "boolean") {
+          return re2.test(String(v));
+        }
+        return false;
+      });
+    }
+    return false;
+  }
+};
+var compareValues = (val1, val2) => {
+  if (val1 === void 0 || val1 === null) {
+    if (val2 === void 0 || val2 === null) {
+      return 0;
+    } else {
+      return 1;
+    }
+  } else if (val2 === void 0 || val2 === null) {
+    return -1;
+  } else if (typeof val1 === "string" && typeof val2 === "string") {
+    return val1.localeCompare(val2);
+  } else if (typeof val1 === "number" && typeof val2 === "number") {
+    return val1 - val2;
+  } else if (typeof val1 === "boolean" && typeof val2 === "boolean") {
+    return (val1 ? 1 : 0) - (val2 ? 1 : 0);
+  } else if (val1 instanceof Date && val2 instanceof Date) {
+    return val1.getTime() - val2.getTime();
+  } else if (val1 instanceof Date) {
+    return val1.getTime() - new Date(String(val2)).getTime();
+  } else if (val2 instanceof Date) {
+    return new Date(String(val1)).getTime() - val2.getTime();
+  } else {
+    return String(val1).localeCompare(String(val2));
+  }
+};
+var createPageSorter = (orderBy) => {
+  const orderByKey = orderBy?.split(":")[0] || "name";
+  const orderByMode = orderBy?.split(":")[1] || "desc";
+  return (p1, p22) => {
+    const val1 = p1[orderByKey];
+    const val2 = p22[orderByKey];
+    const result = compareValues(val1, val2);
+    if (orderByMode === "desc") {
+      return result * -1;
+    }
+    return result;
+  };
+};
+
+// src/remarkDirectivePagelist.ts
 var getPageList = (sections, pages) => {
-  let pageList = [...pages];
+  let pageList = [...pages.filter((p4) => !p4.isEmpty)];
   for (const section of sections) {
     pageList = [
       ...pageList,
@@ -167132,7 +167342,8 @@ var remarkDirectivePagelist_default = (ctx) => () => {
         const {
           format: format2 = "ul",
           orderBy = "name:asc",
-          source = "href(.*)"
+          source = "href(.*)",
+          limit = null
         } = attributes4;
         expectLeafDirective(node3, file, name);
         registerDirective(file, name, [], ["style.css"], []);
@@ -167140,46 +167351,13 @@ var remarkDirectivePagelist_default = (ctx) => () => {
         data.hProperties = {
           class: "directive-pagelist"
         };
-        const sources = (source?.split(" AND ") || []).map((s3) => ({
-          type: s3.split("(")[0],
-          regex: s3.split("(")[1].split(")")[0] || ""
-        }));
-        let filteredPages = pageList.filter((p4) => {
-          let accept = true;
-          for (let source2 of sources) {
-            if (source2.type === "href") {
-              accept = accept && p4.href?.match(source2.regex) !== null;
-            } else if (source2.type === "name") {
-              accept = accept && p4.name.match(source2.regex) !== null;
-            } else if (source2.type === "keyword") {
-              let foundOne = false;
-              for (let keyword of p4.keywords || []) {
-                if (keyword.match(source2.regex)) {
-                  foundOne = true;
-                  break;
-                }
-              }
-              accept = accept && foundOne;
-            }
-          }
-          return accept;
-        });
-        const orderByKey = orderBy?.split(":")[0] || "name";
-        const orderByMode = orderBy?.split(":")[1] || "desc";
-        filteredPages = filteredPages.sort((p1, p22) => {
-          let result = 0;
-          if (orderByKey === "name") {
-            result = p1.name.localeCompare(p22.name);
-          } else if (orderByKey === "href") {
-            result = (p1.href || "").localeCompare(p22.href || "");
-          } else if (orderByKey === "index") {
-            result = (p1.index || 0) - (p22.index || 0);
-          }
-          if (orderByMode === "desc") {
-            return result * -1;
-          }
-          return result;
-        });
+        const query = parseQuery(source || "href(.*)");
+        let filteredPages = pageList.filter((p4) => evaluateQuery(query, p4));
+        const sorter = createPageSorter(orderBy || "name:asc");
+        filteredPages = filteredPages.sort((p1, p22) => sorter(p1, p22));
+        if (limit !== null) {
+          filteredPages = filteredPages.slice(0, Number(limit));
+        }
         filteredPages = filteredPages.map((p4) => ({
           ...p4,
           href: ctx.makeUrl(p4.href || "", "book")
@@ -173971,7 +174149,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"application/1d-interleaved-parityfec
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"hyperbook","version":"0.73.5","author":"Mike Barkmin","homepage":"https://github.com/openpatch/hyperbook#readme","license":"MIT","bin":{"hyperbook":"./dist/index.js"},"files":["dist"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/openpatch/hyperbook.git","directory":"packages/hyperbook"},"bugs":{"url":"https://github.com/openpatch/hyperbook/issues"},"engines":{"node":">=12.22.0"},"scripts":{"version":"pnpm build","lint":"tsc --noEmit","dev":"ncc build ./index.ts -w -o dist/","build":"rimraf dist && ncc build ./index.ts -o ./dist/ --no-cache --no-source-map-register --external favicons --external sharp && node postbuild.mjs"},"dependencies":{"favicons":"^7.2.0"},"devDependencies":{"create-hyperbook":"workspace:*","@hyperbook/fs":"workspace:*","@hyperbook/markdown":"workspace:*","@hyperbook/types":"workspace:*","@pnpm/exportable-manifest":"1000.0.6","@types/archiver":"6.0.3","@types/async-retry":"1.4.9","@types/cross-spawn":"6.0.6","@types/lunr":"^2.3.7","@types/prompts":"2.4.9","@types/tar":"6.1.13","@types/ws":"^8.5.14","@vercel/ncc":"0.38.3","archiver":"7.0.1","async-retry":"1.3.3","chalk":"5.4.1","chokidar":"4.0.3","commander":"12.1.0","cpy":"11.1.0","cross-spawn":"7.0.6","domutils":"^3.2.2","extract-zip":"^2.0.1","got":"12.6.0","htmlparser2":"^10.0.0","lunr":"^2.3.9","lunr-languages":"^1.14.0","mime":"^4.0.6","prompts":"2.4.2","rimraf":"6.0.1","tar":"7.4.3","update-check":"1.5.4","ws":"^8.18.0"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"hyperbook","version":"0.74.0","author":"Mike Barkmin","homepage":"https://github.com/openpatch/hyperbook#readme","license":"MIT","bin":{"hyperbook":"./dist/index.js"},"files":["dist"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/openpatch/hyperbook.git","directory":"packages/hyperbook"},"bugs":{"url":"https://github.com/openpatch/hyperbook/issues"},"engines":{"node":">=12.22.0"},"scripts":{"version":"pnpm build","lint":"tsc --noEmit","dev":"ncc build ./index.ts -w -o dist/","build":"rimraf dist && ncc build ./index.ts -o ./dist/ --no-cache --no-source-map-register --external favicons --external sharp && node postbuild.mjs"},"dependencies":{"favicons":"^7.2.0"},"devDependencies":{"create-hyperbook":"workspace:*","@hyperbook/fs":"workspace:*","@hyperbook/markdown":"workspace:*","@hyperbook/types":"workspace:*","@pnpm/exportable-manifest":"1000.0.6","@types/archiver":"6.0.3","@types/async-retry":"1.4.9","@types/cross-spawn":"6.0.6","@types/lunr":"^2.3.7","@types/prompts":"2.4.9","@types/tar":"6.1.13","@types/ws":"^8.5.14","@vercel/ncc":"0.38.3","archiver":"7.0.1","async-retry":"1.3.3","chalk":"5.4.1","chokidar":"4.0.3","commander":"12.1.0","cpy":"11.1.0","cross-spawn":"7.0.6","domutils":"^3.2.2","extract-zip":"^2.0.1","got":"12.6.0","htmlparser2":"^10.0.0","lunr":"^2.3.9","lunr-languages":"^1.14.0","mime":"^4.0.6","prompts":"2.4.2","rimraf":"6.0.1","tar":"7.4.3","update-check":"1.5.4","ws":"^8.18.0"}}');
 
 /***/ })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperbook",
-  "version": "0.73.5",
+  "version": "0.74.0",
   "author": "Mike Barkmin",
   "homepage": "https://github.com/openpatch/hyperbook#readme",
   "license": "MIT",
@@ -57,9 +57,9 @@
     "update-check": "1.5.4",
     "ws": "^8.18.0",
     "create-hyperbook": "0.3.0",
-    "@hyperbook/types": "0.18.0",
-    "@hyperbook/markdown": "0.46.2",
-    "@hyperbook/fs": "0.21.2"
+    "@hyperbook/fs": "0.21.2",
+    "@hyperbook/markdown": "0.47.0",
+    "@hyperbook/types": "0.18.0"
   },
   "scripts": {
     "version": "pnpm build",