@truto/truto-jsonata 1.0.43 → 1.0.45

package/dist/esm/index.js

@@ -13,7 +13,7 @@ import {
   flattenDeep as flattenDeep3,
   flattenDepth,
   groupBy as groupBy3,
-  join as join2,
+  join as join3,
   keyBy,
   omit as omit2,
   orderBy,
@@ -2193,7 +2193,7 @@ var convertMarkdownToSlack = (text) => {
 var convertMarkdownToSlack_default = convertMarkdownToSlack;
 
 // src/functions/convertNotionToMarkdown.ts
-import { castArray as castArray3, flatten, map as map3, reject, repeat } from "lodash-es";
+import { castArray as castArray3, flatten, join as join2, map as map3, reject, repeat } from "lodash-es";
 var formatPlainText = (x) => {
   if (x) {
     if (x.href) {
@@ -2223,7 +2223,7 @@ var formatPlainText = (x) => {
     return textToReturn;
   }
 };
-var convertNotionToMd = function(block, level = 1) {
+var convertNotionToMd = function(block, level = 1, linkChildPages = false) {
   const n = `
 
 `;
@@ -2235,16 +2235,16 @@ var convertNotionToMd = function(block, level = 1) {
     case "bookmark":
       return `[${data.url}](data.url)${n}`;
     case "bulleted_list_item":
-      childData = map3(block.children, (child) => convertNotionToMd(child, level + 1)).join(repeat("\t", level));
-      return `- ${plainText.join("")}
+      childData = join2(map3(block.children, (child) => convertNotionToMd(child, level + 1, linkChildPages)), repeat("\t", level));
+      return `- ${join2(plainText, "")}
 ` + (childData ? `${repeat("\t", level)}${childData}` : "");
     case "numbered_list_item":
-      childData = map3(block.children, (child) => convertNotionToMd(child, level + 1)).join(repeat("\t", level));
-      return `${block.number}. ${plainText.join("")}
+      childData = join2(map3(block.children, (child) => convertNotionToMd(child, level + 1, linkChildPages)), repeat("\t", level));
+      return `${block.number}. ${join2(plainText, "")}
 ` + (childData ? `${repeat("\t", level)}${childData}` : "");
     case "quote":
     case "callout":
-      return `> ${plainText.join("")}${n}`;
+      return `> ${join2(plainText, "")}${n}`;
     case "code":
       return `\`\`\`${data.language}
 ${plainText}
@@ -2256,51 +2256,60 @@ ${plainText}
     case "equation":
       return data.expression;
     case "paragraph":
-      return plainText.join("") + n;
+      return join2(plainText, "") + n;
     case "video":
     case "pdf":
     case "file":
       return `[${caption.length ? caption : "File"}](${data.file ? data.file.url : data.external ? data.external.url : ""})${n}`;
     case "heading_1":
-      return `# ${plainText.join("")}${n}`;
+      return `# ${join2(plainText, "")}${n}`;
     case "heading_2":
-      return `## ${plainText.join("")}${n}`;
+      return `## ${join2(plainText, "")}${n}`;
     case "heading_3":
-      return `### ${plainText.join("")}${n}`;
+      return `### ${join2(plainText, "")}${n}`;
     case "heading_4":
-      return `#### ${plainText.join("")}${n}`;
+      return `#### ${join2(plainText, "")}${n}`;
     case "heading_5":
-      return `##### ${plainText.join("")}${n}`;
+      return `##### ${join2(plainText, "")}${n}`;
     case "heading_6":
-      return `###### ${plainText.join("")}${n}`;
+      return `###### ${join2(plainText, "")}${n}`;
     case "image":
       return `![${caption.length ? caption : "Image"}](${data.file ? data.file.url : data.external ? data.external.url : ""})${n}`;
+    case "child_page":
+      if (linkChildPages) {
+        const pageTitle = data.title || "Untitled Page";
+        const pageUrl = `https://www.notion.so/${block.id.replace(/-/g, "")}`;
+        return `[${pageTitle}](${pageUrl})${n}`;
+      } else {
+        childData = join2(map3(block.children, (child) => convertNotionToMd(child, level, linkChildPages)), "");
+        return (data.title || "Untitled Page") + n + childData;
+      }
     case "table":
       if (block.children) {
         const firstChild = block.children[0];
         const remainingChildren = block.children.slice(1);
-        const header = `| ${firstChild.table_row.cells.map((x) => x.map((y) => formatPlainText(y)).join("")).join(" | ")} |
+        const header = `| ${join2(firstChild.table_row.cells.map((x) => join2(x.map((y) => formatPlainText(y)), "")), " | ")} |
 `;
         const divider = `|${repeat("---|", data.table_width)}
 `;
-        const rows = remainingChildren.map((row) => {
-          return `| ${row.table_row.cells.map((x) => x.map((y) => formatPlainText(y)).join("")).join(" | ")} |`;
-        }).join(`
+        const rows = join2(remainingChildren.map((row) => {
+          return `| ${join2(row.table_row.cells.map((x) => join2(x.map((y) => formatPlainText(y)), "")), " | ")} |`;
+        }), `
 `);
         return `${header}${divider}${rows}${n}`;
       }
       return `Table as CSV
 `;
     case "table_row":
-      return `| ${data.cells.map((x) => x.map((y) => formatPlainText(y)).join("")).join(" | ")} |
+      return `| ${join2(data.cells.map((x) => join2(x.map((y) => formatPlainText(y)), "")), " | ")} |
 `;
     case "to_do":
-      childData = map3(block.children, (child) => convertNotionToMd(child, level + 1)).join(repeat("\t", level));
-      return `- [${data.checked ? "X" : " "}] ${plainText.join("")}
+      childData = join2(map3(block.children, (child) => convertNotionToMd(child, level + 1, linkChildPages)), repeat("\t", level));
+      return `- [${data.checked ? "X" : " "}] ${join2(plainText, "")}
 ` + (childData ? `${repeat("\t", level)}${childData}` : "");
     default:
-      childData = map3(block.children, (child) => convertNotionToMd(child)).join("");
-      return plainText.join("") + n + childData;
+      childData = join2(map3(block.children, (child) => convertNotionToMd(child, level, linkChildPages)), "");
+      return join2(plainText, "") + n + childData;
   }
 };
 var resolveChildren = function(block, blocks) {
@@ -2350,13 +2359,13 @@ var insertNewLinesBetweenLists = function(blocks) {
     return block;
   }));
 };
-var convertNotionToMarkdown = function(blocks) {
+var convertNotionToMarkdown = function(blocks, linkChildPages = false) {
   const arrayBlocks = insertNewLinesBetweenLists(castArray3(blocks));
   const parentBlocks = reject(arrayBlocks, (block) => block.parent?.type === "block_id");
   const blocksWithChildren = numberOrderedLists(parentBlocks.map((block) => {
     return resolveChildren(block, arrayBlocks);
   }));
-  return blocksWithChildren.map((block) => convertNotionToMd(block)).join("");
+  return join2(blocksWithChildren.map((block) => convertNotionToMd(block, 1, linkChildPages)), "");
 };
 var convertNotionToMarkdown_default = convertNotionToMarkdown;
 
@@ -2932,17 +2941,45 @@ var removeEmptyItems_default = removeEmptyItems;
 
 // src/functions/sign.ts
 var sign = async (text, algorithm = "SHA-256", secret, outputFormat = "hex") => {
-  const key = await crypto.subtle.importKey("raw", new TextEncoder().encode(secret), { name: "HMAC", hash: algorithm }, false, ["sign"]);
+  const upperAlg = String(algorithm ?? "").trim().toUpperCase();
   const encoder = new TextEncoder;
   const data = encoder.encode(text);
-  const hashBuffer = await crypto.subtle.sign("HMAC", key, data);
+  let signatureBuffer;
+  if (upperAlg === "RS256") {
+    const pemKey = secret?.includes("\\n") ? secret.replace(/\\n/g, `
+`) : secret;
+    if (!pemKey || !/-----BEGIN PRIVATE KEY-----/.test(pemKey)) {
+      throw new Error("RS256 requires a PKCS#8 PEM private key (BEGIN PRIVATE KEY)");
+    }
+    const keyDataBase64 = pemKey.replace(/-----BEGIN PRIVATE KEY-----/, "").replace(/-----END PRIVATE KEY-----/, "").replace(/\s/g, "");
+    const binaryKey = Uint8Array.from(atob(keyDataBase64), (c) => c.charCodeAt(0));
+    const rsaAlgorithm = {
+      name: "RSASSA-PKCS1-v1_5",
+      hash: { name: "SHA-256" }
+    };
+    let key;
+    try {
+      key = await crypto.subtle.importKey("pkcs8", binaryKey, rsaAlgorithm, false, ["sign"]);
+    } catch (e) {
+      throw new Error(`RS256 key import failed. Ensure an unencrypted PKCS#8 PEM (BEGIN PRIVATE KEY). Underlying: ${e?.message || e}`);
+    }
+    try {
+      signatureBuffer = await crypto.subtle.sign("RSASSA-PKCS1-v1_5", key, data);
+    } catch (e) {
+      throw new Error(`RS256 signing failed. Ensure the key matches RSASSA-PKCS1-v1_5 and data is correctly encoded. Underlying: ${e?.message || e}`);
+    }
+  } else {
+    const hmacHash = upperAlg || "SHA-256";
+    const key = await crypto.subtle.importKey("raw", new TextEncoder().encode(secret), { name: "HMAC", hash: { name: hmacHash } }, false, ["sign"]);
+    signatureBuffer = await crypto.subtle.sign("HMAC", key, data);
+  }
   if (outputFormat === "hex") {
-    const hashArray = Array.from(new Uint8Array(hashBuffer));
-    return hashArray.map((b) => b.toString(16).padStart(2, "0")).join("");
+    const bytes = Array.from(new Uint8Array(signatureBuffer));
+    return bytes.map((b) => b.toString(16).padStart(2, "0")).join("");
   } else if (outputFormat === "base64") {
-    return arrayBufferToBase64(hashBuffer);
+    return arrayBufferToBase64(signatureBuffer);
   } else if (outputFormat === "base64-urlSafe") {
-    return arrayBufferToBase64(hashBuffer, true);
+    return arrayBufferToBase64(signatureBuffer, true);
   }
 };
 var sign_default = sign;
@@ -3031,40 +3068,95 @@ function zipSqlResponse(columns, data, key) {
 }
 var zipSqlResponse_default = zipSqlResponse;
 
-// src/functions/signJwt.ts
-import { SignJWT, importPKCS8 } from "jose";
-import { isPlainObject as isPlainObject3, isNull, isString as isString4, includes, replace } from "lodash-es";
-function assertObjectPayload(payload) {
-  if (!isPlainObject3(payload) || isNull(payload)) {
-    throw new Error("Payload must be a non-null object");
+// src/functions/convertMdToPdf.ts
+import pRetry3, { AbortError as AbortError3 } from "p-retry";
+import { includes, split, trim } from "lodash-es";
+function getFilenameFromHeaders(resp, fallback) {
+  const cd = resp.headers.get("content-disposition") || "";
+  const matchStar = cd.match(/filename\*=([^;]+)/i);
+  if (matchStar) {
+    const value = trim(matchStar[1]);
+    const parts = split(value, "''");
+    if (parts.length === 2) {
+      try {
+        return decodeURIComponent(parts[1]);
+      } catch {
+        return parts[1];
+      }
+    }
+    return trim(value, `'"`);
   }
+  const match = cd.match(/filename="?([^";]+)"?/i);
+  if (match)
+    return match[1];
+  return fallback || "document.pdf";
 }
-var signJwt = async (payload, key, protectHeaders = {}, signOptions) => {
-  assertObjectPayload(payload);
-  try {
-    let signingKey;
-    const alg = protectHeaders.alg;
-    if (!alg) {
-      throw new Error("Algorithm (alg) must be provided in protectHeaders");
-    }
-    const isAsymmetric = alg.startsWith("RS") || alg.startsWith("ES") || alg.startsWith("PS");
-    if (isAsymmetric) {
-      if (!isString4(key)) {
-        throw new Error("For asymmetric algorithms, key must be a PEM string");
+async function convertMdToPdf(markdown, options = {}, assetHeaders = {}) {
+  const documentParserApiUrl = this.environment.lookup("documentParserApiUrl");
+  const documentParserApiKey = this.environment.lookup("documentParserApiKey");
+  if (!documentParserApiKey) {
+    throw new Error("Document parser API key not found in environment");
+  }
+  if (!documentParserApiUrl) {
+    throw new Error("Document parser API URL not found in environment");
+  }
+  if (!markdown || typeof markdown !== "string") {
+    throw new AbortError3("Markdown content is required and must be a string");
+  }
+  const requestBody = {
+    markdown,
+    options,
+    assetHeaders
+  };
+  return await pRetry3(async () => {
+    const response = await fetch(`${documentParserApiUrl}/md-to-pdf`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${documentParserApiKey}`,
+        "Content-Type": "application/json",
+        Accept: "application/pdf",
+        "User-Agent": "truto"
+      },
+      body: JSON.stringify(requestBody)
+    });
+    if (!response.ok) {
+      if (response.status === 429) {
+        throw new Error("Rate limit exceeded");
       }
-      const pemKey = includes(key, "\\n") ? replace(key, /\\n/g, `
-`) : key;
-      signingKey = await importPKCS8(pemKey, alg);
-    } else {
-      signingKey = isString4(key) ? new TextEncoder().encode(key) : key;
+      if (response.status >= 500) {
+        throw new Error(`Server error: ${response.status}`);
+      }
+      const errorText = await response.text();
+      let errorMessage = `PDF conversion failed (${response.status})`;
+      try {
+        const errorData = JSON.parse(errorText);
+        errorMessage = errorData.error || errorMessage;
+        if (errorData.details) {
+          errorMessage += `: ${errorData.details}`;
+        }
+      } catch {
+        errorMessage += `: ${errorText}`;
+      }
+      throw new AbortError3(errorMessage);
     }
-    const jwtBuilder = new SignJWT(payload).setProtectedHeader({ ...protectHeaders, typ: "JWT" });
-    return await jwtBuilder.sign(signingKey, signOptions);
-  } catch (error) {
-    throw new Error(`JWT signing failed: ${error?.message || String(error)}`);
-  }
-};
-var signJwt_default = signJwt;
+    const contentType = response.headers.get("content-type");
+    if (!contentType || !includes(contentType, "application/pdf")) {
+      throw new AbortError3(`Expected PDF but received: ${contentType}`);
+    }
+    const arrayBuffer = await response.arrayBuffer();
+    const filename = getFilenameFromHeaders(response, options.filename);
+    const blob2 = new Blob([arrayBuffer], { type: "application/pdf" });
+    blob2.name = filename;
+    return blob2;
+  }, {
+    retries: 5,
+    maxTimeout: 30000,
+    minTimeout: 2500,
+    onFailedAttempt: (error) => {
+      console.warn(`PDF conversion attempt ${error.attemptNumber} failed:`, error.message);
+    }
+  });
+}
 
 // src/registerJsonataExtensions.ts
 function registerJsonataExtensions(expression) {
@@ -3091,6 +3183,7 @@ function registerJsonataExtensions(expression) {
   expression.registerFunction("difference", function(arr1, arr2) {
     return difference(arr1, arr2);
   });
+  expression.registerFunction("convertMdToPdf", convertMdToPdf);
   expression.registerFunction("toNumber", toNumber_default);
   expression.registerFunction("jsonParse", jsonParse_default);
   expression.registerFunction("getMimeType", getMimeType_default);
@@ -3103,7 +3196,6 @@ function registerJsonataExtensions(expression) {
   expression.registerFunction("convertMarkdownToHtml", convertMarkdownToHtml_default);
   expression.registerFunction("digest", digest_default);
   expression.registerFunction("sign", sign_default);
-  expression.registerFunction("signJwt", signJwt_default);
   expression.registerFunction("xmlToJs", xmlToJs);
   expression.registerFunction("jsToXml", jsToXml_default);
   expression.registerFunction("generateEmbeddingsCohere", generateEmbeddingsCohere_default);
@@ -3123,7 +3215,7 @@ function registerJsonataExtensions(expression) {
     return compact2(castArray5(arr));
   });
   expression.registerFunction("join", function(arr, separator) {
-    return join2(castArray5(arr), separator);
+    return join3(castArray5(arr), separator);
   });
   expression.registerFunction("orderBy", function(arr, attr, order) {
     return orderBy(castArray5(arr), attr, order);
@@ -3141,7 +3233,7 @@ function registerJsonataExtensions(expression) {
     return chunk2(castArray5(arr), size);
   });
   expression.registerFunction("wrap", function(value, wrapper, endWrapper) {
-    return join2([wrapper, value, endWrapper || wrapper], "");
+    return join3([wrapper, value, endWrapper || wrapper], "");
   });
   expression.registerFunction("parseDocument", parseDocument_default);
   expression.registerFunction("recursiveCharacterTextSplitter", recursiveCharacterTextSplitter);
@@ -3170,4 +3262,4 @@ export {
   trutoJsonata as default
 };
 
-//# debugId=AF69BFF9BD4A50C064756E2164756E21
+//# debugId=CD61DB122C61553664756E2164756E21