npm package diff

Package: @forge/cli-shared

Versions: 8.0.0-next.10-experimental-97e4b11 - 8.0.0-next.12

File: package/out/app-logs/graphql-client.js

Index: package/out/app-logs/graphql-client.js
===================================================================
--- package/out/app-logs/graphql-client.js
+++ package/out/app-logs/graphql-client.js
@@ -33,9 +33,9 @@
             ...this.extractInvocationInfo(result.metadata),
             logs: result.lines.map(sanitizeLogLine)
         };
     }
-    async viewAppLogsV2(details, invocationMap, totalRecieved) {
+    async viewAppLogsV2(details, invocationMap, logLinesWithInvocation, totalRecieved) {
         const query = `
       query forge_cli_getApplicationLogsV2(
         $appId: String!,
         $environmentId: String!,
@@ -78,35 +78,50 @@
         if (!result || !result.appLogsWithMetaData || !result.appLogsWithMetaData.appLogs) {
             throw new MissingAppLogsError();
         }
         for (const logLine of result.appLogsWithMetaData.appLogs) {
-            let logsMetadata = invocationMap.get(logLine.invocationId);
-            if (!logsMetadata) {
-                logsMetadata = {
-                    id: logLine.invocationId,
-                    appVersion: logLine.appVersion,
-                    function: logLine.functionKey || undefined,
-                    trigger: undefined,
-                    logs: []
-                };
+            if (details.grouped) {
+                let logsMetadata = invocationMap.get(logLine.invocationId);
+                if (!logsMetadata) {
+                    logsMetadata = {
+                        id: logLine.invocationId,
+                        appVersion: logLine.appVersion,
+                        function: logLine.functionKey || undefined,
+                        trigger: undefined,
+                        logs: []
+                    };
+                }
+                logsMetadata.logs.push({
+                    message: logLine.message || undefined,
+                    other: logLine.other ? JSON.parse(logLine.other) : [],
+                    level: logLine.lvl || undefined,
+                    timestamp: logLine.ts
+                });
+                invocationMap.set(logLine.invocationId, logsMetadata);
             }
-            logsMetadata.logs.push({
-                message: logLine.message || undefined,
-                other: logLine.other ? JSON.parse(logLine.other) : [],
-                level: logLine.lvl || undefined,
-                timestamp: logLine.ts
+            logLinesWithInvocation.push({
+                id: logLine.invocationId,
+                appVersion: logLine.appVersion,
+                function: logLine.functionKey || undefined,
+                logs: [
+                    {
+                        message: logLine.message || undefined,
+                        other: logLine.other ? JSON.parse(logLine.other) : [],
+                        level: logLine.lvl || undefined,
+                        timestamp: logLine.ts
+                    }
+                ]
             });
-            invocationMap.set(logLine.invocationId, logsMetadata);
         }
         const serverSideMaxLimit = result.appLogsWithMetaData.appLogs.length;
         totalRecieved += serverSideMaxLimit;
         if (result.appLogsWithMetaData.hasNextPage && details.maxLimit > totalRecieved) {
             details.offset = details.offset + serverSideMaxLimit;
             details.limit = details.limit - serverSideMaxLimit;
-            return this.viewAppLogsV2(details, invocationMap, totalRecieved);
+            return this.viewAppLogsV2(details, invocationMap, logLinesWithInvocation, totalRecieved);
         }
         const invocations = [...invocationMap.values()];
-        return invocations;
+        return details.grouped ? invocations : logLinesWithInvocation;
     }
     async viewAppLogs(details) {
         const query = `
       query forge_cli_getApplicationLogs($appId: ID!, $environmentId: [ID!]!, $limit: Int!, $contextAri: [ID!], $startTime: String) {