Merge pull request #1150 from microsoftgraph/dev

main refresh

Author: baywet

.azure-pipelines/generation-pipeline.yml

@@ -83,6 +83,11 @@ resources:
      endpoint: microsoftgraph
      name: microsoftgraph/msgraph-sdk-typescript
      ref: dev
+   - repository: msgraph-beta-sdk-typescript
+     type: github
+     endpoint: microsoftgraph
+     name: microsoftgraph/msgraph-beta-sdk-typescript
+     ref: main
    - repository: msgraph-sdk-python
      type: github
      endpoint: microsoftgraph
@@ -680,7 +685,36 @@ stages:
         - template: generation-templates/typescript-sdk.yml
           parameters:
             repoName: msgraph-sdk-typescript
-            packageName: '@microsoft/msgraph-sdk-javascript'
+            packageName: '@microsoft/msgraph-sdk'
+
+- stage: stage_typescript_sdk_beta
+  dependsOn:
+  - stage_build_and_publish_kiota
+  - stage_beta_openapi
+  condition: |
+    and
+    (
+      eq(dependencies.stage_build_and_publish_kiota.result, 'Succeeded'),
+      in(dependencies.stage_beta_openapi.result, 'Succeeded', 'Skipped')
+    )
+  jobs:
+  - job: typescript_sdk_beta
+    steps:
+    - template: generation-templates/language-generation-kiota.yml
+      parameters:
+        language: 'typescript'
+        version: 'beta'
+        repoName: 'msgraph-beta-sdk-typescript'
+        branchName: $(betaBranch)
+        targetClassName: "GraphBetaBaseServiceClient"
+        targetNamespace: "github.com/microsoftgraph/msgraph-sdk-typescript/"
+        customArguments: "-b -e '/me' -e '/me/**'" # Exclude me and enable backing store
+        cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
+        languageSpecificSteps:
+        - template: generation-templates/typescript-sdk.yml
+          parameters:
+            repoName: msgraph-beta-sdk-typescript
+            packageName: '@microsoft/msgraph-beta-sdk'
 
 - stage: stage_python_v1
   dependsOn:

.azure-pipelines/generation-templates/typescript-sdk.yml

@@ -3,7 +3,7 @@ parameters:
     type: string
   - name: packageName
     type: string
-    default: '@microsoft/msgraph-sdk-javascript'
+    default: '@microsoft/msgraph-sdk'
 
 steps:
 - pwsh: '$(scriptsDirectory)/clean-typescript-files.ps1 -targetDirectory "$(Build.SourcesDirectory)/${{ parameters.repoName }}/packages/" -packageName "${{ parameters.packageName }}"'

GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj

@@ -18,10 +18,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="MSTest.TestAdapter">
-      <Version>3.1.1</Version>
+      <Version>3.2.0</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestFramework">
-      <Version>3.1.1</Version>
+      <Version>3.2.0</Version>
     </PackageReference>
   </ItemGroup>
 </Project>

scripts/clean-typescript-files.ps1

@@ -3,7 +3,7 @@ param (
     [string]
     $targetDirectory,
     [string]
-    $packageName = "@microsoft/msgraph-sdk-javascript"
+    $packageName = "@microsoft/msgraph-sdk"
 )
 Push-Location $targetDirectory
 
@@ -13,15 +13,15 @@ $mainPackageDirectoryPath = Join-Path $targetDirectory -ChildPath $mainPackageDi
 
 Push-Location $mainPackageDirectoryPath
 Get-ChildItem -Directory | ForEach-Object { Remove-Item -r $_.FullName }
-Remove-Item $kiotaLockFileName
+Remove-Item $kiotaLockFileName -ErrorAction SilentlyContinue -Verbose
 Pop-Location
 
 $directories = Get-ChildItem -Directory -Exclude $mainPackageDirectoryName | Where-Object { -not($_.Name.EndsWith("-tests")) }
 foreach ($directory in $directories) {
     Push-Location $directory.FullName
     Get-ChildItem -Directory | ForEach-Object {Remove-Item -r $_.FullName}
 	Remove-Item *.ts -Exclude "index.ts", "*ServiceClient.ts"
-    Remove-Item $kiotaLockFileName
+    Remove-Item $kiotaLockFileName -ErrorAction SilentlyContinue -Verbose
     Pop-Location
 }
 Pop-Location

scripts/copy-typescript-sdk-models.ps1

@@ -6,7 +6,7 @@ param (
     [string]
     $sourceDirectory,
     [string]
-    $packageName = "@microsoft/msgraph-sdk-javascript"
+    $packageName = "@microsoft/msgraph-sdk"
 )
 
 Write-Host "Path to repo models directory: $targetDirectory"

scripts/create-typescript-root-package.ps1

@@ -11,14 +11,13 @@ param (
     [Parameter(Mandatory = $true)]
     [string]
     $targetDirectory,
-    [Parameter(Mandatory = $true)]
     [string]
     $sourcePathSegment = "appCatalogs",
     [string]
-    $packageName = "@microsoft/msgraph-sdk-javascript"
+    $packageName = "@microsoft/msgraph-sdk"
 )
 Push-Location $targetDirectory
-$finalPackageName = "$packageName-$rootPathSegment"
+$finalPackageName = "$packageName-$($rootPathSegment.Substring(0, 1).ToLower())$($rootPathSegment.Substring(1))"
 $sourceLocation = "packages/$($packageName.Split('/')[1])-$sourcePathSegment/"
 $targetLocation = "packages/$($finalPackageName.Split('/')[1])/"
 npx lerna create $finalPackageName --yes
@@ -47,11 +46,17 @@ foreach($directory in $directoriesToRemove) {
     Remove-Item -r "$targetLocation/$directory"
 }
 
+$indexFilePath = Join-Path $targetLocation -ChildPath "index.ts"
+$indexFileContent = Get-Content $indexFilePath -Raw
+$indexFileContent = $indexFileContent.Replace($sourcePathSegment, $rootPathSegment).Replace("$($sourcePathSegment.Substring(0,1).ToUpper())$($sourcePathSegment.Substring(1))", "$($rootPathSegment.Substring(0,1).ToUpper())$($rootPathSegment.Substring(1))")
+$indexFileContent | Set-Content $indexFilePath -NoNewLine
+
 $sourcePackageJson = Get-Content -Raw "$sourceLocation/package.json" | ConvertFrom-Json
 $targetPackageJson = Get-Content -Raw "$targetLocation/package.json" | ConvertFrom-Json
 $targetPackageJson = $targetPackageJson | Select-Object -ExcludeProperty "directories", "files"
-$targetPackageJson.description = $sourcePackageJson.description
-$targetPackageJson.keywords = $sourcePackageJson.keywords
+$targetPackageJson.author = "Microsoft <[email protected]>"
+$targetPackageJson.description = "$($rootPathSegment.Substring(0, 1).ToUpper())$($rootPathSegment.Substring(1)) fluent API for Microsoft Graph"
+$targetPackageJson.keywords = @("Microsoft", "Graph", "msgraph", "API", "SDK", $rootPathSegment)
 $targetPackageJson.license = $sourcePackageJson.license
 $targetPackageJson.main = $sourcePackageJson.main
 $targetPackageJson.name = $finalPackageName.ToLower() #doing this here to the directory name follows the original name casing
@@ -72,16 +77,13 @@ $dependencies = @(
     "@microsoft/kiota-serialization-text"
 )
 foreach($dependency in $dependencies) {
-    npm i $dependency -w $finalPackageName -S
-    npm i $dependency -w $finalPackageName -S
+    npm i -S $dependency -w $finalPackageName.ToLower()
 }
 
 $devDependencies = @("typescript")
 
 foreach($dependency in $devDependencies) {
-    npm i $dependency -w $finalPackageName -D
-    npm i $dependency -w $finalPackageName -D
+    npm i -D $dependency -w $finalPackageName.ToLower()
 }
-#doing it twice otherwise the dependency is not saved for som reason
 
 Pop-Location

scripts/fix-typescript-fluent-packages-imports.ps1

@@ -3,7 +3,7 @@ param (
     [string]
     $targetDirectory,
     [string]
-    $packageName = "@microsoft/msgraph-sdk-javascript"
+    $packageName = "@microsoft/msgraph-sdk"
 )
 Push-Location $targetDirectory
 if (Test-Path .\models) {

scripts/generate-open-api.ps1

@@ -57,7 +57,7 @@ Write-Host $command
 try {
     Invoke-Expression "$command"
     # temporary fix for the server url https://github.com/microsoftgraph/msgraph-metadata/issues/124
-    $content = get-content $outputFile
+    $content = Get-Content $outputFile -Raw
     $updatedContent = $content -replace "http://localhost", "https://graph.microsoft.com/$endpointVersion"
     Set-Content $outputFile $updatedContent -NoNewline
     if(Test-Path $oldOutputFile)

scripts/generate-typescript.ps1

@@ -9,7 +9,7 @@ param (
     [string]
     $targetDirectory,
     [string]
-    $packageName = "@microsoft/msgraph-sdk-javascript",
+    $packageName = "@microsoft/msgraph-sdk",
     [string]
     $kiotaPath = "kiota",
     [string]
@@ -25,9 +25,9 @@ $rootSegments = Get-ChildItem -Directory -Exclude $modelsPackageDirectoryName -P
 foreach($rootSegment in $rootSegments) {
     $fluentAPIPackageDirectoryPath = "$targetDirectory/$modelsPackageDirectoryName-$rootSegment"
     Write-Host "generating segment $rootSegment"
-    Invoke-Expression "$kiotaPath generate -o $fluentAPIPackageDirectoryPath -d $descriptionPath -c $($rootSegment.Substring(0,1).ToUpper() + $rootSegment.Substring(1))ServiceClient -l TypeScript -n github.com/microsoftgraph/msgraph-sdk-typescript/ -e '/me' -e '/me/**' -i '/$rootSegment' -i '/$rootSegment/**'$additionalArguments"
-    .\scripts\fix-typescript-fluent-packages-imports.ps1 -targetDirectory $fluentAPIPackageDirectoryPath -packageName $packageName
+    Invoke-Expression "$kiotaPath generate -o $fluentAPIPackageDirectoryPath -d $descriptionPath -c $($rootSegment.Substring(0,1).ToUpper() + $rootSegment.Substring(1))ServiceClient -l TypeScript -n github.com/microsoftgraph/msgraph-sdk-typescript/ -e '/me' -e '/me/**' -i '/$rootSegment' -i '/$rootSegment/**' $additionalArguments"
+    Invoke-Expression "$PSScriptRoot\fix-typescript-fluent-packages-imports.ps1 -targetDirectory '$fluentAPIPackageDirectoryPath' -packageName '$packageName'"
 }
 $modelsPackagePath = "$targetDirectory/$modelsPackageDirectoryName"
 Invoke-Expression "$kiotaPath generate -o $modelsPackagePath -d $descriptionPath -c $clientName -l TypeScript -n github.com/microsoftgraph/msgraph-sdk-typescript/ -e '/me' -e '/me/**' $additionalArguments"
-.\scripts\remove-typescript-fluent-api-from-main-package.ps1 -targetDirectory $modelsPackagePath
+Invoke-Expression "$PSScriptRoot\remove-typescript-fluent-api-from-main-package.ps1 -targetDirectory '$modelsPackagePath'"

scripts/remove-typescript-fluent-api-from-main-package.ps1

@@ -4,6 +4,6 @@ param (
     $targetDirectory
 )
 Push-Location $targetDirectory
-Remove-Item *.ts -Verbose -Exclude "index.ts", "graphServiceClient.ts"
+Remove-Item *.ts -Verbose -Exclude "index.ts", "graphServiceClient.ts", "graphBetaServiceClient.ts"
 Get-ChildItem -Directory -Exclude models | ForEach-Object {Remove-Item -r $_.FullName}
 Pop-Location