@mablhq/mabl-cli 1.16.11 → 1.16.32

package/resources/pdf-viewer/embeddedPdfDetection.js

@@ -14,6 +14,18 @@ mablEmbeddedPdfDetector = () => {
     document.doctype.name &&
     document.doctype.name.indexOf('html') !== -1
   ) {
+    window.addEventListener(PDFEventType, handle, true);
+
+    // Don't wait for animation to load existing embedded elements
+    Array.from(document.querySelectorAll('object, embed')).forEach(
+      (element) => {
+        handle({
+          target: element,
+          animationName: MABL_PDF_DETECTOR_ANIMATION_NAME,
+        });
+      },
+    );
+
     if (!document.getElementById(MABL_PDF_DETECTOR_STYLE_ID)) {
       const pdfDetectorStyleElem = document.createElement.call(
         document,
@@ -34,7 +46,6 @@ mablEmbeddedPdfDetector = () => {
         document.body.appendChild(pdfDetectorStyleElem);
       }
     }
-    window.addEventListener(PDFEventType, handle, true);
   }
 
   async function handle(event) {
@@ -50,6 +61,13 @@ mablEmbeddedPdfDetector = () => {
       const pdfUrl = pdfElement.src || pdfElement.data;
       const pdfFileName = mablGetPdfFilenameFromUrl(pdfUrl);
 
+      const embeddedPdfMablId = '__mabl_pdf_viewer_' + idSanitize(pdfFileName);
+      // Mark the embedded PDF element so that we can find it to replace it later
+      pdfElement.setAttribute(
+        MABL_EMBEDDED_PDF_DETECTED_FLAG,
+        embeddedPdfMablId,
+      );
+
       // Signal embedded PDF detection and pending download
       // Wait for the event to be acknowledged before starting the download
       await window.dispatchMablEvent({
@@ -62,13 +80,6 @@ mablEmbeddedPdfDetector = () => {
       // Trigger a download for the PDF
       mablDownloadEmbeddedPdf(pdfFileName, pdfUrl);
 
-      const embeddedPdfMablId = '__mabl_pdf_viewer_' + idSanitize(pdfFileName);
-      // Mark the embedded PDF element so that we can find it to replace it later
-      pdfElement.setAttribute(
-        MABL_EMBEDDED_PDF_DETECTED_FLAG,
-        embeddedPdfMablId,
-      );
-
       // Trigger replacement of the embedded PDF with an interactable version served by PDF server
       window.dispatchMablEvent({
         type: MESSAGE_TYPE_EMBEDDED_PDF_MARKED,

package/util/logUtils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatTimestamp = exports.valueToString = exports.logWebUIAndCliOutput = exports.findResultSeverityToLogLevel = exports.logCliOutput = exports.logInternal = void 0;
+exports.formatTimestamp = exports.valueToString = exports.logWebUIAndCliOutput = exports.logWebUI = exports.findResultSeverityToLogLevel = exports.logCliOutput = exports.logInternal = void 0;
 const mablscriptFind_1 = require("../mablscriptFind");
 const loggingProvider_1 = require("../providers/logging/loggingProvider");
 const moment_1 = __importDefault(require("moment"));
@@ -43,6 +43,12 @@ function findResultSeverityToLogLevel(severity) {
     }
 }
 exports.findResultSeverityToLogLevel = findResultSeverityToLogLevel;
+function logWebUI(logLine, logLevel, executionContext, metadata) {
+    metadata = metadata ? JSON.parse(JSON.stringify(metadata)) : {};
+    metadata.shouldOutputInConsole = false;
+    logWebUIAndCliOutput(logLine, logLevel, executionContext, metadata);
+}
+exports.logWebUI = logWebUI;
 function logWebUIAndCliOutput(logLine, logLevel, executionContext, metadata) {
     switch (logLevel) {
         case loggingProvider_1.LogLevel.Error:

package/util/resourceUtil.js

@@ -22,15 +22,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findNodeModulesDirectory = exports.findDirectory = exports.findResource = void 0;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
-function findResource(pathInResource) {
-    const unpackedPath = path.normalize(path.resolve(`${__dirname}/../../resources/${pathInResource}`));
-    const packedPath = path.normalize(path.resolve(`${__dirname}/../resources/${pathInResource}`));
-    if (fs.existsSync(unpackedPath)) {
-        return unpackedPath;
+function findResource(pathInResource, resourcesPathOverride) {
+    const pathsToCheck = [];
+    if (resourcesPathOverride) {
+        pathsToCheck.push(`${resourcesPathOverride}/${pathInResource}`);
     }
-    return packedPath;
+    pathsToCheck.push(`${__dirname}/../../resources/${pathInResource}`);
+    pathsToCheck.push(`${__dirname}/../resources/${pathInResource}`);
+    const foundPath = pathsToCheck
+        .map((p) => path.normalize(path.resolve(p)))
+        .find(safeExistSync);
+    if (foundPath) {
+        return foundPath;
+    }
+    return path.normalize(pathsToCheck[0]);
 }
 exports.findResource = findResource;
+function safeExistSync(path) {
+    try {
+        return fs.existsSync(path);
+    }
+    catch {
+        return false;
+    }
+}
 function findDirectory(pathFromBase) {
     const unpackedPath = path.normalize(path.resolve(`${__dirname}/../../${pathFromBase}`));
     const packedPath = path.normalize(path.resolve(`${__dirname}/../${pathFromBase}`));