@matdata/yasqe 5.9.0 → 5.10.0

package/src/scss/buttons.scss

@@ -89,15 +89,40 @@
     }
     .yasqe_sharePopup {
       position: absolute;
-      padding: 4px;
+      padding: 12px;
       margin-left: 0px;
       background-color: #fff;
       border: 1px solid #e3e3e3;
-      border-radius: 2px;
-      box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-      width: 600px;
+      border-radius: 4px;
+      box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+      width: auto;
+      min-width: 300px;
+      max-width: 400px;
       height: auto;
       display: flex;
+      flex-direction: column;
+      gap: 8px;
+
+      .yasqe_sharePopup_title {
+        font-weight: 600;
+        font-size: 14px;
+        color: #333;
+        margin-bottom: 4px;
+      }
+
+      .yasqe_sharePopup_buttons {
+        display: flex;
+        flex-direction: column;
+        gap: 6px;
+      }
+
+      .yasqe_shareBtn {
+        width: 100%;
+        text-align: left;
+        justify-content: flex-start;
+        padding: 8px 12px;
+        font-size: 13px;
+      }
 
       .inputWrapper {
         flex-grow: 100;
@@ -129,6 +154,13 @@
       textarea {
         width: 100%;
       }
+
+      .shortlinkErr {
+        color: #d32f2f;
+        font-size: 12px;
+        padding: 8px;
+        display: block;
+      }
     }
     .yasqe_queryButton {
       display: inline-block;
@@ -440,3 +472,74 @@
     }
   }
 }
+
+// Toast notification styles - scoped with yasqe_ prefix
+// These are appended to document.body and must be outside .yasqe selector
+// The yasqe_ prefix prevents naming conflicts with other components
+.yasqe_toast {
+  position: fixed;
+  bottom: 20px;
+  right: 20px;
+  background-color: #323232;
+  color: #fff;
+  padding: 12px 20px;
+  border-radius: 4px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
+  z-index: 10000;
+  font-size: 14px;
+  max-width: 400px;
+  animation: yasqe_toast-fadein 0.3s ease-in;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+
+  &.yasqe_toast-warning {
+    background-color: #ffc107;
+    color: #000;
+    padding: 14px 20px;
+    box-shadow: 0 3px 10px rgba(255, 193, 7, 0.4);
+
+    .yasqe_toast-icon {
+      display: flex;
+      align-items: center;
+      flex-shrink: 0;
+
+      svg {
+        width: 24px;
+        height: 24px;
+        fill: #000;
+      }
+    }
+  }
+
+  .yasqe_toast-message {
+    flex: 1;
+  }
+
+  &.yasqe_toast-fadeout {
+    animation: yasqe_toast-fadeout 0.3s ease-out;
+    opacity: 0;
+  }
+}
+
+@keyframes yasqe_toast-fadein {
+  from {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+@keyframes yasqe_toast-fadeout {
+  from {
+    opacity: 1;
+    transform: translateY(0);
+  }
+  to {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+}

package/src/sparql.ts

@@ -360,38 +360,250 @@ export function getAcceptHeader(yasqe: Yasqe, _config: Config["requestConfig"])
   }
   return acceptHeader;
 }
-export function getAsCurlString(yasqe: Yasqe, _config?: Config["requestConfig"]) {
-  let ajaxConfig = getAjaxConfig(yasqe, getRequestConfigSettings(yasqe, _config));
-  if (!ajaxConfig) return "";
-  let url = ajaxConfig.url;
-  if (ajaxConfig.url.indexOf("http") !== 0) {
-    //this is either a relative or absolute url, which is not supported by CURL.
-    //Add domain, schema, etc etc
-    url = `${window.location.protocol}//${window.location.host}`;
-    if (ajaxConfig.url.indexOf("/") === 0) {
-      //its an absolute path
-      url += ajaxConfig.url;
+/**
+ * Helper to normalize URL for command-line tools
+ */
+function normalizeUrl(url: string): string {
+  if (url.indexOf("http") !== 0) {
+    // Relative or absolute URL - add domain, schema, etc
+    let fullUrl = `${window.location.protocol}//${window.location.host}`;
+    if (url.indexOf("/") === 0) {
+      // Absolute path
+      fullUrl += url;
     } else {
-      //relative, so append current location to url first
-      url += window.location.pathname + ajaxConfig.url;
+      // Relative path - ensure proper path joining
+      let basePath = window.location.pathname;
+      // If pathname does not end with "/", treat it as a file and use its directory
+      if (!basePath.endsWith("/")) {
+        const lastSlashIndex = basePath.lastIndexOf("/");
+        basePath = lastSlashIndex >= 0 ? basePath.substring(0, lastSlashIndex + 1) : "/";
+      }
+      fullUrl += basePath + url;
+    }
+    return fullUrl;
+  }
+  return url;
+}
+
+/**
+ * Check if ajax config contains authentication credentials
+ */
+export function hasAuthenticationCredentials(ajaxConfig: PopulatedAjaxConfig): boolean {
+  if (!ajaxConfig) return false;
+
+  // Check for Authorization header (Bearer, Basic, OAuth2)
+  if (ajaxConfig.headers && ajaxConfig.headers["Authorization"]) {
+    return true;
+  }
+
+  // Check for API Key headers - use more specific patterns to avoid false positives
+  if (ajaxConfig.headers) {
+    for (const headerName in ajaxConfig.headers) {
+      const lowerHeader = headerName.toLowerCase();
+      // Match common authentication header patterns with stricter rules to avoid false positives
+      // Only match headers that are clearly authentication-related
+      if (
+        lowerHeader.startsWith("x-api-key") ||
+        lowerHeader.startsWith("x-auth-") ||
+        lowerHeader === "apikey" ||
+        lowerHeader === "api-key" ||
+        // Only match token headers that end with "token" or have "auth" in the middle
+        (lowerHeader.endsWith("-token") && lowerHeader.startsWith("x-")) ||
+        (lowerHeader.includes("-auth-") && lowerHeader.includes("token"))
+      ) {
+        return true;
+      }
     }
   }
+
+  return false;
+}
+
+/**
+ * Escape single quotes for shell commands by replacing ' with '\''
+ */
+function escapeShellString(str: string): string {
+  return str.replace(/'/g, "'\\''");
+}
+
+/**
+ * Generate cURL command string
+ */
+export function getAsCurlString(yasqe: Yasqe, _config?: Config["requestConfig"]) {
+  let ajaxConfig = getAjaxConfig(yasqe, getRequestConfigSettings(yasqe, _config));
+  if (!ajaxConfig) return "";
+
+  let url = normalizeUrl(ajaxConfig.url);
   const segments: string[] = ["curl"];
 
   if (ajaxConfig.reqMethod === "GET") {
     url += `?${queryString.stringify(ajaxConfig.args)}`;
-    segments.push(url);
+    segments.push(`'${escapeShellString(url)}'`);
   } else if (ajaxConfig.reqMethod === "POST") {
-    segments.push(url);
-    segments.push("--data", queryString.stringify(ajaxConfig.args));
+    segments.push(`'${escapeShellString(url)}'`);
+    const data = queryString.stringify(ajaxConfig.args);
+    segments.push("--data", `'${escapeShellString(data)}'`);
   } else {
-    // I don't expect to get here but let's be sure
     console.warn("Unexpected request-method", ajaxConfig.reqMethod);
-    segments.push(url);
+    segments.push(`'${escapeShellString(url)}'`);
   }
+
   segments.push("-X", ajaxConfig.reqMethod);
+
+  // Add Accept header if present
+  if (ajaxConfig.accept) {
+    segments.push("-H", `'Accept: ${escapeShellString(ajaxConfig.accept)}'`);
+  }
+
+  for (const header in ajaxConfig.headers) {
+    segments.push("-H", `'${escapeShellString(header)}: ${escapeShellString(ajaxConfig.headers[header])}'`);
+  }
+
+  return segments.join(" \\\n  ");
+}
+
+/**
+ * Escape PowerShell string by handling special characters
+ */
+function escapePowerShellString(str: string): string {
+  // Escape backtick, double quote, and dollar sign
+  return str.replace(/`/g, "``").replace(/"/g, '`"').replace(/\$/g, "`$");
+}
+
+/**
+ * Generate PowerShell command string
+ */
+export function getAsPowerShellString(yasqe: Yasqe, _config?: Config["requestConfig"]): string {
+  let ajaxConfig = getAjaxConfig(yasqe, getRequestConfigSettings(yasqe, _config));
+  if (!ajaxConfig) return "";
+
+  let url = normalizeUrl(ajaxConfig.url);
+  const lines: string[] = [];
+
+  // Determine output file extension based on Accept header
+  const acceptHeader = ajaxConfig.accept;
+  let fileExtension = "json"; // default
+  if (acceptHeader) {
+    if (acceptHeader.includes("text/turtle") || acceptHeader.includes("application/x-turtle")) {
+      fileExtension = "ttl";
+    } else if (acceptHeader.includes("application/rdf+xml")) {
+      fileExtension = "xml";
+    } else if (acceptHeader.includes("application/n-triples")) {
+      fileExtension = "nt";
+    } else if (acceptHeader.includes("application/ld+json")) {
+      fileExtension = "jsonld";
+    } else if (acceptHeader.includes("text/csv")) {
+      fileExtension = "csv";
+    } else if (acceptHeader.includes("text/tab-separated-values")) {
+      fileExtension = "tsv";
+    }
+  }
+
+  // Build headers object, including Accept header
+  const headersLines: string[] = [];
+  if (acceptHeader) {
+    headersLines.push(`    "Accept" = "${escapePowerShellString(acceptHeader)}"`);
+  }
+  for (const header in ajaxConfig.headers) {
+    headersLines.push(
+      `    "${escapePowerShellString(header)}" = "${escapePowerShellString(ajaxConfig.headers[header])}"`,
+    );
+  }
+
+  if (ajaxConfig.reqMethod === "GET") {
+    url += `?${queryString.stringify(ajaxConfig.args)}`;
+    lines.push("$params = @{");
+    lines.push(`    Uri = "${escapePowerShellString(url)}"`);
+    lines.push(`    Method = "Get"`);
+    if (headersLines.length > 0) {
+      lines.push("    Headers = @{");
+      lines.push(headersLines.join("\n"));
+      lines.push("    }");
+    }
+    lines.push(`    OutFile = "result.${fileExtension}"`);
+    lines.push("}");
+  } else if (ajaxConfig.reqMethod === "POST") {
+    const body = queryString.stringify(ajaxConfig.args);
+    lines.push("$params = @{");
+    lines.push(`    Uri = "${escapePowerShellString(url)}"`);
+    lines.push(`    Method = "Post"`);
+    if (headersLines.length > 0) {
+      lines.push("    Headers = @{");
+      lines.push(headersLines.join("\n"));
+      lines.push("    }");
+    }
+    lines.push(`    ContentType = "application/x-www-form-urlencoded"`);
+    lines.push(`    Body = "${escapePowerShellString(body)}"`);
+    lines.push(`    OutFile = "result.${fileExtension}"`);
+    lines.push("}");
+  } else {
+    // Handle other methods (PUT, DELETE, etc.)
+    console.warn("Unexpected request-method for PowerShell", ajaxConfig.reqMethod);
+    const body = queryString.stringify(ajaxConfig.args);
+    lines.push("$params = @{");
+    lines.push(`    Uri = "${url}"`);
+    lines.push(`    Method = "${ajaxConfig.reqMethod}"`);
+    if (headersLines.length > 0) {
+      lines.push("    Headers = @{");
+      lines.push(headersLines.join("\n"));
+      lines.push("    }");
+    }
+    if (body) {
+      lines.push(`    ContentType = "application/x-www-form-urlencoded"`);
+      lines.push(`    Body = "${body.replace(/"/g, '`"')}"`);
+    }
+    lines.push(`    OutFile = "result.${fileExtension}"`);
+    lines.push("}");
+  }
+
+  lines.push("");
+  lines.push("Invoke-WebRequest @params");
+
+  return lines.join("\n");
+}
+
+/**
+ * Generate wget command string
+ */
+export function getAsWgetString(yasqe: Yasqe, _config?: Config["requestConfig"]): string {
+  let ajaxConfig = getAjaxConfig(yasqe, getRequestConfigSettings(yasqe, _config));
+  if (!ajaxConfig) return "";
+
+  let url = normalizeUrl(ajaxConfig.url);
+  const segments: string[] = ["wget"];
+
+  if (ajaxConfig.reqMethod === "GET") {
+    url += `?${queryString.stringify(ajaxConfig.args)}`;
+    segments.push(`'${escapeShellString(url)}'`);
+  } else if (ajaxConfig.reqMethod === "POST") {
+    segments.push(`'${escapeShellString(url)}'`);
+    const data = queryString.stringify(ajaxConfig.args);
+    segments.push("--post-data", `'${escapeShellString(data)}'`);
+  } else {
+    // Handle other methods
+    console.warn("Unexpected request-method for wget", ajaxConfig.reqMethod);
+    segments.push(`'${escapeShellString(url)}'`);
+    const data = queryString.stringify(ajaxConfig.args);
+    if (data) {
+      segments.push("--post-data", `'${escapeShellString(data)}'`);
+    }
+  }
+
+  // Only add --method for non-GET requests
+  if (ajaxConfig.reqMethod !== "GET") {
+    segments.push("--method", ajaxConfig.reqMethod);
+  }
+
+  // Add Accept header if present
+  if (ajaxConfig.accept) {
+    segments.push("--header", `'Accept: ${escapeShellString(ajaxConfig.accept)}'`);
+  }
+
   for (const header in ajaxConfig.headers) {
-    segments.push(`-H  '${header}: ${ajaxConfig.headers[header]}'`);
+    segments.push("--header", `'${escapeShellString(header)}: ${escapeShellString(ajaxConfig.headers[header])}'`);
   }
-  return segments.join(" ");
+
+  segments.push("-O -");
+
+  return segments.join(" \\\n  ");
 }