firebase
diff --git a/‎.github/workflows/node-test.yml‎
Lines changed: 7 additions & 2 deletions b/‎.github/workflows/node-test.yml‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎CHANGELOG.md‎
Lines changed: 16 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 16 additions & 0 deletions
diff --git a/‎firebase-vscode/CHANGELOG.md‎
Lines changed: 6 additions & 0 deletions b/‎firebase-vscode/CHANGELOG.md‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎firebase-vscode/package-lock.json‎
Lines changed: 9 additions & 0 deletions b/‎firebase-vscode/package-lock.json‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎firebase-vscode/src/data-connect/code-lens-provider.ts‎
Lines changed: 89 additions & 71 deletions b/‎firebase-vscode/src/data-connect/code-lens-provider.ts‎
Lines changed: 89 additions & 71 deletions
diff --git a/‎firebase-vscode/src/data-connect/execution/execution.ts‎
Lines changed: 0 additions & 4 deletions b/‎firebase-vscode/src/data-connect/execution/execution.ts‎
Lines changed: 0 additions & 4 deletions
@@ -85,7 +85,7 @@ jobs:
   #     - name: Setup Java JDK
   #       uses: actions/setup-java@v3.3.0
   #       with:
-  #         java-version: 17
+  #         java-version: 21
   #         distribution: temurin
 
   #     - uses: actions/checkout@v4
@@ -211,6 +211,11 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: npm
           cache-dependency-path: npm-shrinkwrap.json
+      - name: Setup Java JDK
+        uses: actions/setup-java@v3.3.0
+        with:
+          java-version: 21
+          distribution: temurin
       - name: Setup Chrome
         uses: browser-actions/setup-chrome@v1.7.2
         with:
@@ -270,7 +275,7 @@ jobs:
       - name: Setup Java JDK
         uses: actions/setup-java@v3.3.0
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - uses: actions/checkout@v4
 
@@ -0,0 +1,16 @@
+- [BREAKING] Changed `firestore:backups:list --json` to return a `listBackupsResponse` object instead of a raw array of backups.
+- [BREAKING] Removed support for '.bolt' rules files.
+- [BREAKING] Removed support for running emulators with Java versions prior to 21.
+- [BREAKING] Removed deprecated `firebase --open-sesame` and `firebase --close-sesame` commands. Use `firebase experiments:enable` and `firebase experiments:disable` instead.
+- [BREAKING] Enforce strict timeout validation for functions. (#9540)
+- [BREAKING] Update `dataconnect:\*` commands to use flags instead of positional arguments for `--service` & `--location`. Changed output type of `dataconnect:sql:migrate --json` (#9312)
+- [BREAKING] When using 'firebase-tools' as a Node module, `cli.auth.upload` has been renamed to `cli.auth.import` and `cli.appdistribution.testers.delete` has been renamed to `cli.appdistribution.testers.remove`.
+- [BREAKING] Updated Firebase Data Connect emulator version to v3.0.0
+  - [BREAKING] Fixed generated code character case when letters follow numbers (https://github.com/firebase/firebase-tools/issues/9567).
+  - [BREAKING] Dart codegen: Int64 types are now serialized and deserialized using BigInt.
+  - [BREAKING] Kotlin codegen: Removed magic "convenience renames" of keys and counts in selection sets (https://github.com/firebase/firebase-tools/issues/9571).
+  - Eagerly load config upon any requests from VS Code Extensions or Firebase CLI. This ensures the emulator always serve the latest local configs.
+  - Kotlin codegen: Removed vestigial FIREBASE_DATA_CONNECT_GENERATED_FILE section at the bottom of each generated file.
+- Updated Firestore Emulator to v1.20.2, which includes minor bug fixes for Datastore Mode.
+- Improved command loading performance by implementing lazy loading.
+- Add a confirmation in `firebase init dataconnect` before asking for app idea description. (#9282)
@@ -1,5 +1,11 @@
 ## NEXT
 
+- Fixed common code lens rendering issue.
+  - Don't show "Generate query" in schema file.
+  - Don't show "Generate query" for comments within an operation.
+  - Show "Add Data" for @table type only.
+  - Show "View Data" for @table and @view type.
+
 ## 1.10.2
 
 - Update internal `firebase-tools` dependency to 14.27.0
 
@@ -1,5 +1,5 @@
 import * as vscode from "vscode";
-import { Kind, parse } from "graphql";
+import { ExecutableDefinitionNode, Kind, parse } from "graphql";
 import { Disposable } from "vscode";
 
 import { Signal } from "@preact/signals-core";
@@ -72,84 +72,94 @@ export class OperationCodeLensProvider extends ComputedCodeLensProvider {
   ): vscode.CodeLens[] {
     // Wait for configs to be loaded and emulator to be running
     const fdcConfigs = this.watch(dataConnectConfigs)?.tryReadValue;
-    const projectId = this.watch(firebaseRC)?.tryReadValue?.projects.default;
     if (!fdcConfigs) {
       return [];
     }
-
-    const codeLenses: vscode.CodeLens[] = [];
+    const projectId = this.watch(firebaseRC)?.tryReadValue?.projects.default;
 
     const documentText = document.getText();
     // TODO: replace w/ online-parser to work with malformed documents
     const documentNode = parse(documentText);
+    const definitions: ExecutableDefinitionNode[] = [];
+    for (const def of documentNode.definitions) {
+      switch (def.kind) {
+        case Kind.OPERATION_DEFINITION:
+        case Kind.FRAGMENT_DEFINITION:
+          definitions.push(def);
+          break;
+        default:
+          // No code lenses for schema files
+          return [];
+      }
+    }
 
-    for (let i = 0; i < documentNode.definitions.length; i++) {
-      const x = documentNode.definitions[i];
-      if (x.kind === Kind.OPERATION_DEFINITION && x.loc) {
-        // startToken.line is 1-indexed, range is 0-indexed
-        const line = x.loc.startToken.line - 1;
-        const range = new vscode.Range(line, 0, line, 0);
-        const position = new vscode.Position(line, 0);
-        const service = fdcConfigs.findEnclosingServiceForPath(document.fileName);
-        if (service) {
-          {
-            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],
-              }),
-            );
-          }
+    const codeLenses: vscode.CodeLens[] = [];
+    for (let i = 0; i < definitions.length; i++) {
+      const x = definitions[i];
+      if (!x.loc) {
+        throw new Error("Definition has no location");
+      }
+      if (x.kind !== Kind.OPERATION_DEFINITION) {
+        continue;
+      }
+      // startToken.line is 1-indexed, range is 0-indexed
+      const line = x.loc.startToken.line - 1;
+      const range = new vscode.Range(line, 0, line, 0);
+      const position = new vscode.Position(line, 0);
+      const service = fdcConfigs.findEnclosingServiceForPath(document.fileName);
+      if (service) {
+        {
+          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: [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: [arg],
+            }),
+          );
         }
       }
     }
 
-    const comments = findCommentsBlocks(documentText);
+    const comments = findCommentsBlocks(documentText, definitions);
     for (let i = 0; i < comments.length; i++) {
       const c = comments[i];
       const range = new vscode.Range(c.startLine, 0, c.startLine, 0);
-      const queryDoc = documentNode.definitions.find((d) =>
-        d.kind === Kind.OPERATION_DEFINITION &&
-        // startToken.line is 1-indexed, endLine is 0-indexed
-        d.loc?.startToken.line === c.endLine + 2
-      );
       const arg: GenerateOperationInput = {
         projectId,
         document: document,
         description: c.text,
         insertPosition: c.endIndex + 1,
-        existingQuery: queryDoc?.loc ? documentText.substring(c.endIndex + 1, queryDoc.loc.endToken.end) : '',
+        existingQuery: c.queryDoc?.loc ? documentText.substring(c.endIndex + 1, c.queryDoc.loc.endToken.end) : '',
       };
       codeLenses.push(
         new vscode.CodeLens(range, {
-          title: queryDoc ? `$(sparkle) Refine Operation` : `$(sparkle) Generate Operation`,
+          title: c.queryDoc ? `$(sparkle) Refine Operation` : `$(sparkle) Generate Operation`,
           command: "firebase.dataConnect.generateOperation",
           tooltip: "Generate the operation (⌘+enter or Ctrl+Enter)",
           arguments: [arg],
@@ -195,29 +205,37 @@ export class SchemaCodeLensProvider extends ComputedCodeLensProvider {
         //   );
         // }
 
-        codeLenses.push(
-          new vscode.CodeLens(range, {
-            title: `$(database) Add data`,
-            command: "firebase.dataConnect.schemaAddData",
-            tooltip: "Generate a mutation to add data of this type",
-            arguments: [x, documentPath],
-          }),
-        );
+        const isTable = x.directives?.some((d) => d.name.value === "table");
+        const isView = x.directives?.some((d) => d.name.value === "view");
 
-        codeLenses.push(
-          new vscode.CodeLens(range, {
-            title: `$(database) Read data`,
-            command: "firebase.dataConnect.schemaReadData",
-            tooltip: "Generate a query to read data of this type",
-            arguments: [documentNode, x, documentPath],
-          }),
-        );
+        if (isTable) {
+          codeLenses.push(
+            new vscode.CodeLens(range, {
+              title: `$(database) Add data`,
+              command: "firebase.dataConnect.schemaAddData",
+              tooltip: "Generate a mutation to add data of this type",
+              arguments: [x, documentPath],
+            }),
+          );
+        }
+
+        if (isTable || isView) {
+          codeLenses.push(
+            new vscode.CodeLens(range, {
+              title: `$(database) Read data`,
+              command: "firebase.dataConnect.schemaReadData",
+              tooltip: "Generate a query to read data of this type",
+              arguments: [documentNode, x, documentPath],
+            }),
+          );
+        }
       }
     }
 
     return codeLenses;
   }
 }
+
 /**
  * CodeLensProvider for Configure SDK in Connector.yaml
  */
 
@@ -20,17 +20,13 @@ import {
   OperationDefinitionNode,
   OperationTypeNode,
   print,
-  buildClientSchema,
-  validate,
-  parse,
 } from "graphql";
 import { DataConnectService } from "../service";
 import { DataConnectError, toSerializedError } from "../../../common/error";
 import { InstanceType } from "../code-lens-provider";
 import { DATA_CONNECT_EVENT_NAME, AnalyticsLogger } from "../../analytics";
 import { EmulatorsController } from "../../core/emulators";
 import { getConnectorGQLText, insertQueryAt } from "../file-utils";
-import { pluginLogger } from "../../logger-wrapper";
 import * as gif from "../../../../src/gemini/fdcExperience";
 import { ensureGIFApiTos } from "../../../../src/dataconnect/ensureApis";
 import { configstore } from "../../../../src/configstore";