npm - @malloy-publisher/server - Versions diffs - 0.0.169 → 0.0.171 - Mend

@malloy-publisher/server 0.0.169 → 0.0.171

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/dist/app/index.html CHANGED Viewed

@@ -12,7 +12,7 @@
          href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap"
       />
       <title>Malloy Publisher</title>
-     <script type="module" crossorigin src="/assets/index-C-0P3N7Y.js"></script>
+     <script type="module" crossorigin src="/assets/index-DUmIwFQ_.js"></script>
      <link rel="stylesheet" crossorigin href="/assets/index-CMlGQMcl.css">
    </head>
    <body>

package/dist/server.js CHANGED Viewed

@@ -196699,7 +196699,8 @@ var require_dist_cjs75 = __commonJS((exports2) => {
 // ../../node_modules/@malloydata/render-validator/dist/fake-dom.js
 var require_fake_dom = __commonJS((exports2) => {
   Object.defineProperty(exports2, "__esModule", { value: true });
-  exports2.ensureFakeDom = ensureFakeDom;
+  exports2.installFakeDom = installFakeDom;
+  exports2.removeFakeDom = removeFakeDom;
   var noop2 = () => {};
   class Node {
@@ -196770,17 +196771,24 @@ var require_fake_dom = __commonJS((exports2) => {
       return new Text(text);
     }
   }
-  function ensureFakeDom() {
+  var installed = false;
+  var hadDocument = false;
+  var hadNavigator = false;
+  var hadWindow = false;
+  function installFakeDom() {
     const g = globalThis;
-    if (typeof g.document === "undefined") {
+    hadDocument = typeof g.document !== "undefined";
+    hadNavigator = typeof g.navigator !== "undefined";
+    hadWindow = typeof g.window !== "undefined";
+    if (!hadDocument) {
       g.document = new Document;
     }
-    if (typeof g.navigator === "undefined") {
+    if (!hadNavigator) {
       g.navigator = { userAgent: "" };
     } else if (typeof g.navigator.userAgent === "undefined") {
       g.navigator.userAgent = "";
     }
-    if (typeof g.window === "undefined") {
+    if (!hadWindow) {
       g.window = Object.assign(g, {
         addEventListener: noop2,
         removeEventListener: noop2,
@@ -196789,18 +196797,40 @@ var require_fake_dom = __commonJS((exports2) => {
         cancelAnimationFrame: noop2
       });
     }
+    installed = true;
+  }
+  function removeFakeDom() {
+    if (!installed)
+      return;
+    const g = globalThis;
+    if (!hadWindow) {
+      delete g.window;
+      delete g.addEventListener;
+      delete g.removeEventListener;
+      delete g.getComputedStyle;
+      delete g.requestAnimationFrame;
+      delete g.cancelAnimationFrame;
+    }
+    if (!hadDocument) {
+      delete g.document;
+    }
+    if (!hadNavigator) {
+      delete g.navigator;
+    }
+    installed = false;
   }
-  ensureFakeDom();
 });
 // ../../node_modules/@malloydata/render-validator/dist/index.js
 var require_dist10 = __commonJS((exports2) => {
   Object.defineProperty(exports2, "__esModule", { value: true });
   exports2.validateRenderTags = validateRenderTags;
-  require_fake_dom();
-  var render_1 = require("@malloydata/render");
+  var { installFakeDom, removeFakeDom } = require_fake_dom();
+  installFakeDom();
+  var { MalloyRenderer } = require("@malloydata/render");
+  removeFakeDom();
   function validateRenderTags(result) {
-    const renderer = new render_1.MalloyRenderer;
+    const renderer = new MalloyRenderer;
     const viz = renderer.createViz();
     viz.setResult(result);
     return viz.getLogs();
@@ -222397,7 +222427,7 @@ class PackageController {
     } else if (packageLocation.startsWith("gs://")) {
       await this.projectStore.downloadGcsDirectory(packageLocation, projectName, absoluteTargetPath, isCompressedFile);
     } else if (packageLocation.startsWith("s3://")) {
-      await this.projectStore.downloadS3Directory(packageLocation, projectName, absoluteTargetPath);
+      await this.projectStore.downloadS3Directory(packageLocation, projectName, absoluteTargetPath, isCompressedFile);
     }
     if (packageLocation.startsWith("/")) {
       await this.projectStore.mountLocalDirectory(packageLocation, absoluteTargetPath, projectName, packageName);
@@ -222406,6 +222436,7 @@ class PackageController {
 }
 // src/controller/query.controller.ts
+var import_render_validator = __toESM(require_dist10());
 function bigIntReplacer(_key, value) {
   if (typeof value === "bigint") {
     return Number(value);
@@ -222426,8 +222457,7 @@ class QueryController {
       throw new ModelNotFoundError(`${modelPath} does not exist`);
     } else {
       const { result, compactResult } = await model.getQueryResults(sourceName, queryName, query);
-      const { validateRenderTags } = await Promise.resolve().then(() => __toESM(require_dist10()));
-      const renderLogs = validateRenderTags(result);
+      const renderLogs = import_render_validator.validateRenderTags(result);
       return {
         result: compactJson ? JSON.stringify(compactResult, bigIntReplacer) : JSON.stringify(result),
         resource: `${API_PREFIX}/projects/${projectName}/packages/${packageName}/models/${modelPath}/query`,
@@ -230990,7 +231020,7 @@ class ProjectStore {
     if (this.isS3URL(location)) {
       try {
         logger.info(`Downloading S3 directory from "${location}" to "${targetPath}"`);
-        await this.downloadS3Directory(location, projectName, targetPath);
+        await this.downloadS3Directory(location, projectName, targetPath, isCompressedFile);
         return;
       } catch (error) {
         const errorData = this.extractErrorDataFromError(error);
@@ -231067,10 +231097,33 @@ class ProjectStore {
     }
     logger.info(`Downloaded GCS directory ${gcsPath} to ${absoluteDirPath}`);
   }
-  async downloadS3Directory(s3Path, projectName, absoluteDirPath) {
+  async downloadS3Directory(s3Path, projectName, absoluteDirPath, isCompressedFile = false) {
     const trimmedPath = s3Path.slice(5);
     const [bucketName, ...prefixParts] = trimmedPath.split("/");
     const prefix = prefixParts.join("/");
+    if (isCompressedFile) {
+      const zipFilePath = `${absoluteDirPath}.zip`;
+      await fs7.promises.mkdir(path8.dirname(zipFilePath), {
+        recursive: true
+      });
+      const command = new import_client_s32.GetObjectCommand({
+        Bucket: bucketName,
+        Key: prefix
+      });
+      const item = await this.s3Client.send(command);
+      if (!item.Body) {
+        throw new ProjectNotFoundError(`Project ${projectName} not found in ${s3Path}`);
+      }
+      const file = fs7.createWriteStream(zipFilePath);
+      item.Body.transformToWebStream().pipeTo(import_stream5.Writable.toWeb(file));
+      await new Promise((resolve3, reject) => {
+        file.on("error", reject);
+        file.on("finish", resolve3);
+      });
+      await this.unzipProject(zipFilePath);
+      logger.info(`Downloaded S3 zip file ${s3Path} to ${absoluteDirPath}`);
+      return;
+    }
     const objects = await this.s3Client.listObjectsV2({
       Bucket: bucketName,
       Prefix: prefix
@@ -231108,6 +231161,7 @@ class ProjectStore {
         file.on("finish", resolve3);
       });
     }));
+    logger.info(`Downloaded S3 directory ${s3Path} to ${absoluteDirPath}`);
   }
   parseGitHubUrl(githubUrl) {
     const httpsRegex = /github\.com\/(?<owner>[^/]+)\/(?<repoName>[^/]+)(?<packagePath>\/[^/]+)*/;
@@ -234997,8 +235051,8 @@ function registerExecuteQueryTool(mcpServer, projectStore) {
     try {
       if (query) {
         const { result } = await model.getQueryResults(undefined, undefined, query);
-        const { validateRenderTags } = await Promise.resolve().then(() => __toESM(require_dist10()));
-        const renderLogs = validateRenderTags(result);
+        const { validateRenderTags: validateRenderTags2 } = await Promise.resolve().then(() => __toESM(require_dist10()));
+        const renderLogs = validateRenderTags2(result);
         const baseUriComponents = {
           project: projectName,
           package: packageName,
@@ -235033,8 +235087,8 @@ ${JSON.stringify(renderLogs, null, 2)}`
         return { isError: false, content };
       } else if (queryName) {
         const { result } = await model.getQueryResults(sourceName, queryName, undefined);
-        const { validateRenderTags } = await Promise.resolve().then(() => __toESM(require_dist10()));
-        const renderLogs = validateRenderTags(result);
+        const { validateRenderTags: validateRenderTags2 } = await Promise.resolve().then(() => __toESM(require_dist10()));
+        const renderLogs = validateRenderTags2(result);
         const baseUriComponents = {
           project: projectName,
           package: packageName,

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/server",
    "description": "Malloy Publisher Server",
-   "version": "0.0.169",
+   "version": "0.0.171",
    "main": "dist/server.js",
    "bin": {
       "malloy-publisher": "dist/server.js"
@@ -30,15 +30,15 @@
    "dependencies": {
       "@aws-sdk/client-s3": "^3.958.0",
       "@google-cloud/storage": "^7.16.0",
-      "@malloydata/db-bigquery": "^0.0.354",
-      "@malloydata/db-duckdb": "^0.0.354",
-      "@malloydata/db-mysql": "^0.0.354",
-      "@malloydata/db-postgres": "^0.0.354",
-      "@malloydata/db-snowflake": "^0.0.354",
-      "@malloydata/db-trino": "^0.0.354",
-      "@malloydata/malloy": "^0.0.354",
-      "@malloydata/malloy-sql": "^0.0.354",
-      "@malloydata/render-validator": "^0.0.354",
+      "@malloydata/db-bigquery": "^0.0.358",
+      "@malloydata/db-duckdb": "^0.0.358",
+      "@malloydata/db-mysql": "^0.0.358",
+      "@malloydata/db-postgres": "^0.0.358",
+      "@malloydata/db-snowflake": "^0.0.358",
+      "@malloydata/db-trino": "^0.0.358",
+      "@malloydata/malloy": "^0.0.358",
+      "@malloydata/malloy-sql": "^0.0.358",
+      "@malloydata/render-validator": "^0.0.358",
       "@modelcontextprotocol/sdk": "^1.13.2",
       "@opentelemetry/api": "^1.9.0",
       "@opentelemetry/auto-instrumentations-node": "^0.57.0",

package/src/controller/package.controller.ts CHANGED Viewed

@@ -113,6 +113,7 @@ export class PackageController {
             packageLocation,
             projectName,
             absoluteTargetPath,
+            isCompressedFile,
          );
       }

package/src/controller/query.controller.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { validateRenderTags } from "@malloydata/render-validator";
 import { components } from "../api";
 import { API_PREFIX } from "../constants";
 import { ModelNotFoundError } from "../errors";
@@ -41,11 +42,6 @@ export class QueryController {
             queryName,
             query,
          );
-         // Lazy import since this creates a FakeDOM global which
-         // can confuse other imports.
-         const { validateRenderTags } = await import(
-            "@malloydata/render-validator"
-         );
          const renderLogs = validateRenderTags(result);
          return {
             result: compactJson

package/src/service/project_store.ts CHANGED Viewed

@@ -1112,7 +1112,12 @@ export class ProjectStore {
             logger.info(
                `Downloading S3 directory from "${location}" to "${targetPath}"`,
             );
-            await this.downloadS3Directory(location, projectName, targetPath);
+            await this.downloadS3Directory(
+               location,
+               projectName,
+               targetPath,
+               isCompressedFile,
+            );
             return;
          } catch (error) {
             const errorData = this.extractErrorDataFromError(error);
@@ -1242,10 +1247,43 @@ export class ProjectStore {
       s3Path: string,
       projectName: string,
       absoluteDirPath: string,
+      isCompressedFile: boolean = false,
    ) {
       const trimmedPath = s3Path.slice(5);
       const [bucketName, ...prefixParts] = trimmedPath.split("/");
       const prefix = prefixParts.join("/");
+      if (isCompressedFile) {
+         // Download the single zip file
+         const zipFilePath = `${absoluteDirPath}.zip`;
+         await fs.promises.mkdir(path.dirname(zipFilePath), {
+            recursive: true,
+         });
+         const command = new GetObjectCommand({
+            Bucket: bucketName,
+            Key: prefix,
+         });
+         const item = await this.s3Client.send(command);
+         if (!item.Body) {
+            throw new ProjectNotFoundError(
+               `Project ${projectName} not found in ${s3Path}`,
+            );
+         }
+         const file = fs.createWriteStream(zipFilePath);
+         item.Body.transformToWebStream().pipeTo(Writable.toWeb(file));
+         await new Promise<void>((resolve, reject) => {
+            file.on("error", reject);
+            file.on("finish", resolve);
+         });
+         // Extract the zip file
+         await this.unzipProject(zipFilePath);
+         logger.info(`Downloaded S3 zip file ${s3Path} to ${absoluteDirPath}`);
+         return;
+      }
+      // Original behavior: download directory contents
       const objects = await this.s3Client.listObjectsV2({
          Bucket: bucketName,
          Prefix: prefix,
@@ -1291,6 +1329,7 @@ export class ProjectStore {
             });
          }),
       );
+      logger.info(`Downloaded S3 directory ${s3Path} to ${absoluteDirPath}`);
    }
    private parseGitHubUrl(