Merge branch 'main' into feature/generate-adaptive-cards

microsoft · Jan 15, 2025 · 86ad2ba · 86ad2ba
2 parents b3b7a8f + 56b335c
commit 86ad2ba
Show file tree

Hide file tree

Showing 12 changed files with 113 additions and 69 deletions.
diff --git a/.github/policies/branch-protection.yml b/.github/policies/branch-protection.yml
@@ -19,7 +19,7 @@ configuration:
       # Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
       requireCodeOwnersReview: true
       # Are commits required to be signed. boolean.
-      requiresCommitSignatures: true
+      requiresCommitSignatures: false
       # Are conversations required to be resolved before merging? boolean
       requiresConversationResolution: true
       # Are merge commits prohibited from being pushed to this branch. boolean

diff --git a/it/typescript/package-lock.json b/it/typescript/package-lock.json
diff --git a/it/typescript/package.json b/it/typescript/package.json
@@ -20,12 +20,12 @@
   "devDependencies": {
     "@es-exec/esbuild-plugin-start": "^0.0.5",
     "@stylistic/eslint-plugin-ts": "^2.13.0",
-    "@types/node": "^22.10.5",
-    "@typescript-eslint/eslint-plugin": "^8.19.1",
-    "@typescript-eslint/parser": "^8.19.1",
+    "@types/node": "^22.10.6",
+    "@typescript-eslint/eslint-plugin": "^8.20.0",
+    "@typescript-eslint/parser": "^8.20.0",
     "esbuild": "^0.24.2",
     "eslint": "^9.18.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^10.0.1",
     "minimist": "^1.2.8",
     "prettier": "^3.4.2",
     "typescript": "^4.9.5"

diff --git a/scripts/update-vscode-releases.ps1 b/scripts/update-vscode-releases.ps1
@@ -39,8 +39,9 @@ if ($version -like "*-preview.*") {
   $updatedPatchVersion += (Get-Date).ToString("yyMMdd") + $sequenceNumber
 }
 else {
-  if ($updatedPatchVersion -eq "1") {
-    $updatedPatchVersion = "100000002"
+  $updatedPatchVersionAsNumber = 0;
+  if ([int]::TryParse($updatedPatchVersion, [ref]$updatedPatchVersionAsNumber)) {
+    $updatedPatchVersion = "10000000$($updatedPatchVersionAsNumber + 1)"
   }
   elseif ([string]::IsNullOrWhiteSpace($updatedPatchVersion)) {
     $updatedPatchVersion = "100000001"

diff --git a/vscode/microsoft-kiota/CHANGELOG.md b/vscode/microsoft-kiota/CHANGELOG.md
@@ -6,8 +6,12 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
+- Added dart generation to Visual Studio Code extension.
+
 ### Changed
 
+- Fixed a bug in the VS Code extension deeplink with the API Center extension [#6004](https://github.com/microsoft/kiota/issues/6004)
+
 ## [1.22.100000001] - 2025-01-10
 
 ### Added

diff --git a/vscode/microsoft-kiota/package.json b/vscode/microsoft-kiota/package.json
@@ -83,6 +83,25 @@
           ],
           "description": "%kiota.generate.deserializer.description%"
         },
+        "kiota.generate.serializer.Dart": {
+          "type": "array",
+          "default": [
+            "microsoft_kiota_serialization_json/microsoft_kiota_serialization_json.JsonSerializationWriterFactory",
+            "microsoft_kiota_serialization_form/microsoft_kiota_serialization_form.FormSerializationWriterFactory",
+            "microsoft_kiota_serialization_text/microsoft_kiota_serialization_text.TextSerializationWriterFactory",
+            "microsoft_kiota_serialization_multipart/microsoft_kiota_serialization_multipart.MultipartSerializationWriterFactory"
+          ],
+          "description": "%kiota.generate.serializer.description%"
+        },
+        "kiota.generate.deserializer.Dart": {
+          "type": "array",
+          "default": [
+            "microsoft_kiota_serialization_json/microsoft_kiota_serialization_json.JsonParseNodeFactory",
+            "microsoft_kiota_serialization_text/microsoft_kiota_serialization_text.TextParseNodeFactory",
+            "microsoft_kiota_serialization_form/microsoft_kiota_serialization_form.FormParseNodeFactory"
+          ],
+          "description": "%kiota.generate.deserializer.description%"
+        },
         "kiota.generate.serializer.Go": {
           "type": "array",
           "default": [
@@ -125,31 +144,37 @@
           "type": "array",
           "default": [
             "Microsoft\\Kiota\\Serialization\\Json\\JsonSerializationWriterFactory",
-            "Microsoft\\Kiota\\Serialization\\Text\\TextSerializationWriterFactory"
+            "Microsoft\\Kiota\\Serialization\\Text\\TextSerializationWriterFactory",
+            "Microsoft\\Kiota\\Serialization\\Form\\FormSerializationWriterFactory",
+            "Microsoft\\Kiota\\Serialization\\Multipart\\MultipartSerializationWriterFactory"
           ],
           "description": "%kiota.generate.serializer.description%"
         },
         "kiota.generate.deserializer.PHP": {
           "type": "array",
           "default": [
             "Microsoft\\Kiota\\Serialization\\Json\\JsonParseNodeFactory",
-            "Microsoft\\Kiota\\Serialization\\Text\\TextParseNodeFactory"
+            "Microsoft\\Kiota\\Serialization\\Text\\TextParseNodeFactory",
+            "Microsoft\\Kiota\\Serialization\\Form\\FormParseNodeFactory"
           ],
           "description": "%kiota.generate.deserializer.description%"
         },
         "kiota.generate.serializer.Python": {
           "type": "array",
           "default": [
             "kiota_serialization_json.json_serialization_writer_factory.JsonSerializationWriterFactory",
-            "kiota_serialization_text.text_serialization_writer_factory.TextSerializationWriterFactory"
+            "kiota_serialization_text.text_serialization_writer_factory.TextSerializationWriterFactory",
+            "kiota_serialization_form.form_serialization_writer_factory.FormSerializationWriterFactory",
+            "kiota_serialization_multipart.multipart_serialization_writer_factory.MultipartSerializationWriterFactory"
           ],
           "description": "%kiota.generate.serializer.description%"
         },
         "kiota.generate.deserializer.Python": {
           "type": "array",
           "default": [
             "kiota_serialization_json.json_parse_node_factory.JsonParseNodeFactory",
-            "kiota_serialization_text.text_parse_node_factory.TextParseNodeFactory"
+            "kiota_serialization_text.text_parse_node_factory.TextParseNodeFactory",
+            "kiota_serialization_form.form_parse_node_factory.FormParseNodeFactory"
           ],
           "description": "%kiota.generate.deserializer.description%"
         },
@@ -547,4 +572,4 @@
       "sha256": "2525D4A8C3ED4972C05E57E4DB2D244E1A708325CE4A5CFB24822D9FD7BB7ED3"
     }
   ]
-}
+}
diff --git a/vscode/microsoft-kiota/src/handlers/uriHandler.ts b/vscode/microsoft-kiota/src/handlers/uriHandler.ts
@@ -1,10 +1,12 @@
-import * as vscode from 'vscode';
 import TelemetryReporter from '@vscode/extension-telemetry';
+import * as vscode from 'vscode';
 
+import { treeViewId } from '../constants';
 import { OpenApiTreeProvider } from "../providers/openApiTreeProvider";
+import { updateTreeViewIcons } from '../util';
 import { validateDeepLinkQueryParams } from '../utilities/deep-linking';
 import { openTreeViewWithProgress } from '../utilities/progress';
-import { setDeepLinkParams, getDeepLinkParams } from './deepLinkParamsHandler';
+import { getDeepLinkParams, setDeepLinkParams } from './deepLinkParamsHandler';
 
 export class UriHandler {
   constructor(private context: vscode.ExtensionContext, private openApiTreeProvider: OpenApiTreeProvider) { }
@@ -26,7 +28,10 @@ export class UriHandler {
 
       let deepLinkParams = getDeepLinkParams();
       if (deepLinkParams.descriptionurl) {
-        await openTreeViewWithProgress(() => this.openApiTreeProvider.setDescriptionUrl(deepLinkParams.descriptionurl!));
+        await openTreeViewWithProgress(async () => {
+          await this.openApiTreeProvider.setDescriptionUrl(deepLinkParams.descriptionurl!);
+          await updateTreeViewIcons(treeViewId, true, false);
+        });
         return;
       }
     }

diff --git a/vscode/microsoft-kiota/src/kiotaInterop/index.ts b/vscode/microsoft-kiota/src/kiotaInterop/index.ts
@@ -122,6 +122,8 @@ export function generationLanguageToString(language: KiotaGenerationLanguage): s
             return "Ruby";
         case KiotaGenerationLanguage.CLI:
             return "CLI";
+        case KiotaGenerationLanguage.Dart:
+            return "Dart";
         default:
             throw new Error("unknown language");
     }
@@ -137,6 +139,7 @@ export const allGenerationLanguages = [
     KiotaGenerationLanguage.CLI,
     KiotaGenerationLanguage.Swift,
     KiotaGenerationLanguage.TypeScript,
+    KiotaGenerationLanguage.Dart,
 ];
 
 /**

diff --git a/vscode/microsoft-kiota/src/test/suite/commands/generateClientCommand.test.ts b/vscode/microsoft-kiota/src/test/suite/commands/generateClientCommand.test.ts
@@ -65,7 +65,8 @@ let extensionSettings = {
         [KiotaGenerationLanguage.Python]: { serializers: [], deserializers: [] },
         [KiotaGenerationLanguage.Ruby]: { serializers: [], deserializers: [] },
         [KiotaGenerationLanguage.Swift]: { serializers: [], deserializers: [] },
-        [KiotaGenerationLanguage.TypeScript]: { serializers: [], deserializers: [] }
+        [KiotaGenerationLanguage.TypeScript]: { serializers: [], deserializers: [] },
+        [KiotaGenerationLanguage.Dart]: { serializers: [], deserializers: [] }
     },
 };
 

diff --git a/vscode/microsoft-kiota/src/types/enums.ts b/vscode/microsoft-kiota/src/types/enums.ts
@@ -26,6 +26,8 @@ export enum KiotaGenerationLanguage {
     Ruby = 7,
     // eslint-disable-next-line @typescript-eslint/naming-convention
     CLI = 8,
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    Dart = 9,
 };
 
 export enum KiotaPluginType {

diff --git a/vscode/microsoft-kiota/src/types/extensionSettings.ts b/vscode/microsoft-kiota/src/types/extensionSettings.ts
@@ -20,6 +20,7 @@ export function getExtensionSettings(extensionId: string): ExtensionSettings {
             [KiotaGenerationLanguage.Ruby]: getLanguageSerializationConfiguration(extensionId, "Ruby"),
             [KiotaGenerationLanguage.Swift]: getLanguageSerializationConfiguration(extensionId, "Swift"),
             [KiotaGenerationLanguage.TypeScript]: getLanguageSerializationConfiguration(extensionId, "TypeScript"),
+            [KiotaGenerationLanguage.Dart]: getLanguageSerializationConfiguration(extensionId, "Dart"),
         },
     };
 }