Merge branch 'master' into json-secrets-support

Author: taeold

firebase-vscode/.gitignore

@@ -6,4 +6,5 @@ resources/dist
 .wdio-vscode-service
 logs
 !*.tgz
-prebuilt-extensions
+prebuilt-extensions
+data-connect-test-*/

firebase-vscode/CHANGELOG.md

@@ -1,7 +1,14 @@
 ## NEXT
 
+- [Fixed] Populate correct default values of missing required variables.
+- [Added] Display the execution variables and auth params used.
+- [Added] Allow rerun any executions in the history.
+
+## 1.9.0
+
 - [Added] Refine / Generate Operation Code Lens.
 - [Added] Support run "firebase init" without login and project.
+- Update internal `firebase-tools` dependency to 14.19.1
 
 ## 1.8.0
 

firebase-vscode/common/messaging/protocol.ts

@@ -11,15 +11,21 @@ import { EmulatorsStatus, RunningEmulatorInfo } from "./types";
 import { ExecutionResult } from "graphql";
 import { SerializedError } from "../error";
 
-export enum UserMockKind {
+export enum AuthParamsKind {
   ADMIN = "admin",
   UNAUTHENTICATED = "unauthenticated",
   AUTHENTICATED = "authenticated",
 }
-export type UserMock =
-  | { kind: UserMockKind.ADMIN | UserMockKind.UNAUTHENTICATED }
+
+export const EXAMPLE_CLAIMS = `{
+  "email_verified": true,
+  "sub": "exampleUserId"
+}`;
+
+export type AuthParams =
+  | { kind: AuthParamsKind.ADMIN | AuthParamsKind.UNAUTHENTICATED }
   | {
-      kind: UserMockKind.AUTHENTICATED;
+      kind: AuthParamsKind.AUTHENTICATED;
       claims: string;
     };
 
@@ -84,13 +90,13 @@ export interface WebviewToExtensionParamsMap {
 
   selectEmulatorImportFolder: {};
 
-  definedDataConnectArgs: string;
+  /** Execution parameters */
+  defineVariables: string;
+  defineAuthParams: AuthParams;
 
   /** Prompts the user to select a directory in which to place the quickstart */
   chooseQuickstartDir: {};
 
-  notifyAuthUserMockChange: UserMock;
-
   /** Deploy connectors/services to production */
   "fdc.deploy": void;
 
@@ -130,10 +136,11 @@ export interface WebviewToExtensionParamsMap {
 }
 
 export interface DataConnectResults {
-  query: string;
   displayName: string;
-  results?: ExecutionResult | SerializedError;
-  args?: string;
+  query: string;
+  results: ExecutionResult | SerializedError;
+  variables: string;
+  auth: AuthParams;
 }
 
 export type ValueOrError<T> =
@@ -185,13 +192,11 @@ export interface ExtensionToWebviewParamsMap {
    */
   notifyPreviewChannelResponse: { id: string };
 
-  // data connect specific
-  notifyDataConnectArgs: string;
-
+  /** Update execution parameters and results panels */
+  notifyVariables: { variables: string, fixes: string[] };
+  notifyAuthParams: AuthParams;
   notifyDataConnectResults: DataConnectResults;
 
-  notifyLastOperation: string;
-
   notifyIsLoadingUser: boolean;
 
   notifyDocksLink: string;

firebase-vscode/package-lock.json

@@ -4,7 +4,7 @@
   "publisher": "GoogleCloudTools",
   "icon": "./resources/firebase_dataconnect_logo.png",
   "description": "Firebase Data Connect for VSCode",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "engines": {
     "vscode": "^1.69.0"
   },
@@ -158,20 +158,21 @@
       "firebase-data-connect-execution-view": [
         {
           "type": "webview",
-          "id": "data-connect-execution-configuration",
-          "name": "Configuration",
-          "when": "firebase-vscode.fdc.enabled"
-        },
-        {
-          "id": "data-connect-execution-history",
-          "name": "History",
+          "id": "data-connect-execution-parameters",
+          "name": "Parameters",
           "when": "firebase-vscode.fdc.enabled"
         },
         {
           "type": "webview",
           "id": "data-connect-execution-results",
           "name": "Results",
           "when": "firebase-vscode.fdc.enabled"
+        },
+        {
+          "id": "data-connect-execution-history",
+          "name": "History",
+          "when": "firebase-vscode.fdc.enabled",
+          "visibility": "collapsed"
         }
       ]
     },

firebase-vscode/package.json

@@ -21,12 +21,24 @@ export enum DATA_CONNECT_EVENT_NAME {
   PROJECT_SELECTED = "project_selected",
   RUN_LOCAL = "run_local",
   RUN_PROD = "run_prod",
+  RUN_PROD_MUTATION_WARNING = "run_prod_mutation_warning",
+  RUN_PROD_MUTATION_WARNING_REJECTED = "run_prod_mutation_warning_rejected",
+  RUN_PROD_MUTATION_WARNING_ACKED = "run_prod_mutation_warning_acked",
+  RUN_PROD_MUTATION_WARNING_ACKED_ALWAYS = "run_prod_mutation_warning_acked_always",
+  RUN_AUTH_ADMIN = "run_auth_admin",
+  RUN_AUTH_UNAUTHENTICATED = "run_auth_unauthenticated",
+  RUN_AUTH_AUTHENTICATED = "run_auth_authenticated",
+  RUN_UNDEFINED_VARIABLES = "run_undefined_variables",
+  RUN_MISSING_VARIABLES = "run_missing_variables",
   GENERATE_OPERATION = "generate_operation",
+  GIF_TOS_MODAL = "gif_tos_modal",
+  GIF_TOS_MODAL_ACKED = "gif_tos_modal_acked",
+  GIF_TOS_MODAL_CLICKED = "gif_tos_modal_clicked",
+  GIF_TOS_MODAL_REJECTED = "gif_tos_modal_rejected",
   ADD_DATA = "add_data",
   READ_DATA = "read_data",
   MOVE_TO_CONNECTOR = "move_to_connector",
   START_EMULATOR_FROM_EXECUTION = "start_emulator_from_execution",
-  REFUSE_START_EMULATOR_FROM_EXECUTION = "refuse_start_emulator_from_execution",
   INIT = "init",
   INIT_SDK = "init_sdk",
   INIT_SDK_CLI = "init_sdk_cli",
@@ -36,11 +48,6 @@ export enum DATA_CONNECT_EVENT_NAME {
   SESSION_CHAR_COUNT = "session_char_count",
   EMULATOR_EXPORT = "emulator_export",
   SETUP_FIREBASE_BINARY = "setup_firebase_binary",
-  GEMINI_ERROR = "gemini_error",
-  GEMINI_OPERATION_CALL = "gemini_operation_call",
-  GEMINI_SCHEMA_CALL = "gemini_schema_call",
-  GEMINI_SUCCESS = "gemini_success",
-  TRY_GEMINI_CLICKED = "try_gemini_clicked",
   TRY_FIREBASE_AGENT_CLICKED = "try_firebase_agent_in_gemini_clicked",
   MCP_DOCS_CLICKED = "mcp_docs_clicked",
   GIF_TOS_CLICKED = "gif_tos_clicked",

firebase-vscode/src/analytics.ts

@@ -284,16 +284,16 @@ function getDefaultScalarValueNode(type: string): ValueNode | undefined {
   }
 }
 
-export function getDefaultScalarValue(type: string): string {
+export function getDefaultScalarValue(type: string): any {
   switch (type) {
     case "Boolean":
-      return "false";
+      return false;
     case "Date":
       return new Date().toISOString().substring(0, 10);
     case "Float":
-      return "0";
+      return 0.0;
     case "Int":
-      return "0";
+      return 0;
     case "Int64":
       return "0";
     case "String":
@@ -303,8 +303,8 @@ export function getDefaultScalarValue(type: string): string {
     case "UUID":
       return "11111111222233334444555555555555";
     case "Vector":
-      return "[]";
+      return [1.1, 2.2, 3.3];
     default:
-      return "";
+      return undefined;
   }
 }

firebase-vscode/src/auth/service.ts

@@ -1,11 +1,9 @@
-import {
-  gemini,
-  gemini as geminiToolModule,
-} from "../../../../src/init/features/aitools/gemini";
+import { gemini as geminiToolModule } from "../../../../src/init/features/aitools/gemini";
 import * as vscode from "vscode";
 import { firebaseConfig } from "../config";
 import { ExtensionBrokerImpl } from "../../extension-broker";
 import { AnalyticsLogger, DATA_CONNECT_EVENT_NAME } from "../../analytics";
+import { configstore } from "../../../../src/configstore";
 
 const GEMINI_EXTENSION_ID = "google.geminicodeassist";
 
@@ -49,6 +47,7 @@ async function ensureGeminiExtension(): Promise<boolean> {
 
 // Writes MCP config, then opens up Gemini with a new chat
 async function openGeminiChat() {
+  configstore.set("gemini", true);
   writeToGeminiConfig();
   await vscode.commands.executeCommand("cloudcode.gemini.chatView.focus");
   await vscode.commands.executeCommand("geminicodeassist.agent.chat.new");

firebase-vscode/src/data-connect/ad-hoc-mutations.ts

@@ -1,12 +1,11 @@
 import * as vscode from "vscode";
 import { Kind, parse } from "graphql";
-import { OperationLocation } from "./types";
 import { Disposable } from "vscode";
 
 import { Signal } from "@preact/signals-core";
 import { dataConnectConfigs, firebaseRC } from "./config";
 import { EmulatorsController } from "../core/emulators";
-import { GenerateOperationInput } from "./execution/execution";
+import { ExecutionInput, GenerateOperationInput } from "./execution/execution";
 import { findCommentsBlocks } from "../utils/find_comments";
 
 export enum InstanceType {
@@ -91,31 +90,40 @@ export class OperationCodeLensProvider extends ComputedCodeLensProvider {
         const line = x.loc.startToken.line - 1;
         const range = new vscode.Range(line, 0, line, 0);
         const position = new vscode.Position(line, 0);
-        const operationLocation: OperationLocation = {
-          document: documentText,
-          documentPath: document.fileName,
-          position: position,
-        };
-        const service = fdcConfigs.findEnclosingServiceForPath(
-          document.fileName,
-        );
+        const service = fdcConfigs.findEnclosingServiceForPath(document.fileName);
         if (service) {
-          codeLenses.push(
-            new vscode.CodeLens(range, {
-              title: `$(play) Run (local)`,
-              command: "firebase.dataConnect.executeOperation",
-              tooltip: "Execute the operation (⌘+enter or Ctrl+Enter)",
-              arguments: [x, operationLocation, InstanceType.LOCAL],
-            }),
-          );
+          {
+            const arg: ExecutionInput = {
+              operationAst: x,
+              document: documentText,
+              documentPath: document.fileName,
+              position: position,
+              instance: InstanceType.LOCAL,
+            };
+            codeLenses.push(
+              new vscode.CodeLens(range, {
+                title: `$(play) Run (local)`,
+                command: "firebase.dataConnect.executeOperation",
+                tooltip: "Execute the operation (⌘+enter or Ctrl+Enter)",
+                arguments: [arg],
+              }),
+            );
+          }
 
           if (projectId) {
+            const arg: ExecutionInput = {
+              operationAst: x,
+              document: documentText,
+              documentPath: document.fileName,
+              position: position,
+              instance: InstanceType.PRODUCTION,
+            };
             codeLenses.push(
               new vscode.CodeLens(range, {
                 title: `$(play) Run (Production – Project: ${projectId})`,
                 command: "firebase.dataConnect.executeOperation",
                 tooltip: "Execute the operation (⌘+enter or Ctrl+Enter)",
-                arguments: [x, operationLocation, InstanceType.PRODUCTION],
+                arguments: [arg],
               }),
             );
           }