set-core-util-dependency-with-binder (#2743)

* set-core-util-dependency-with-binder

* add core-util as dependency

* fix format

* fix smoke test

* fix non branding dependencies

* fix ci

* fix unit test

* fix unit-trst

* fix ci

* core-util as a dependency for modular

* fix ci

* fix ci

* fix ci

* fix unit-test

---------

Co-authored-by: Jiao Di (MSFT) <80496810+v-jiaodi@users.noreply.github.com>

Author: qiaozha

packages/autorest.typescript/test/rlcIntegration/generated/bodyStringRest/package.json

@@ -38,7 +38,6 @@
     "rimraf": "^5.0.5",
     "mkdirp": "^3.0.1",
     "typescript": "~5.5.3",
-    "@azure/core-util": "^1.0.0",
     "@azure/identity": "^4.2.1",
     "autorest": "latest",
     "@azure-tools/test-credential": "^1.1.0",

packages/autorest.typescript/test/smoke/generated/agrifood-data-plane/package.json

@@ -41,7 +41,6 @@
     "rimraf": "^5.0.5",
     "mkdirp": "^3.0.1",
     "typescript": "~5.5.3",
-    "@azure/core-util": "^1.0.0",
     "@azure/identity": "^4.2.1",
     "autorest": "latest",
     "@azure-tools/test-credential": "^1.1.0",

packages/autorest.typescript/test/smoke/generated/anomaly-detector-rest/package.json

@@ -41,7 +41,6 @@
     "rimraf": "^5.0.5",
     "mkdirp": "^3.0.1",
     "typescript": "~5.5.3",
-    "@azure/core-util": "^1.0.0",
     "@azure/identity": "^4.2.1",
     "autorest": "latest",
     "@azure-tools/test-credential": "^1.1.0",

packages/rlc-common/src/metadata/buildPackageFile.ts

@@ -1,27 +1,33 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { buildFlavorlessPackage } from "./packageJson/buildFlavorlessPackage.js";
-import { RLCModel } from "../interfaces.js";
-import { PackageCommonInfoConfig } from "./packageJson/packageCommon.js";
-import { buildAzureMonorepoPackage } from "./packageJson/buildAzureMonorepoPackage.js";
-import { normalizeName, NameType } from "../helpers/nameUtils.js";
-import { getRelativePartFromSrcPath } from "../helpers/pathUtils.js";
+import { NameType, normalizeName } from "../helpers/nameUtils.js";
 import {
   hasPagingOperations,
   hasPollingOperations
 } from "../helpers/operationHelpers.js";
-import { buildAzureStandalonePackage } from "./packageJson/buildAzureStandalonePackage.js";
-import { Project } from "ts-morph";
 import {
-  isAzurePackage,
   isAzureMonorepoPackage,
+  isAzurePackage,
   isAzureStandalonePackage
 } from "../helpers/packageUtil.js";
 
+import { PackageCommonInfoConfig } from "./packageJson/packageCommon.js";
+import { Project } from "ts-morph";
+import { RLCModel } from "../interfaces.js";
+import { buildAzureMonorepoPackage } from "./packageJson/buildAzureMonorepoPackage.js";
+import { buildAzureStandalonePackage } from "./packageJson/buildAzureStandalonePackage.js";
+import { buildFlavorlessPackage } from "./packageJson/buildFlavorlessPackage.js";
+import { getRelativePartFromSrcPath } from "../helpers/pathUtils.js";
+
+interface PackageFileOptions {
+  exports?: Record<string, any>;
+  dependencies?: Record<string, string>;
+}
+
 export function buildPackageFile(
   model: RLCModel,
-  exports?: Record<string, any>
+  { exports, dependencies }: PackageFileOptions = {}
 ) {
   const config: PackageCommonInfoConfig = {
     description: getDescription(model),
@@ -43,7 +49,8 @@ export function buildPackageFile(
     hasLro: hasPollingOperations(model),
     hasPaging: hasPagingOperations(model),
     monorepoPackageDirectory: model.options?.azureOutputDirectory,
-    specSource: model.options?.sourceFrom ?? "TypeSpec"
+    specSource: model.options?.sourceFrom ?? "TypeSpec",
+    dependencies
   };
 
   if (isAzureMonorepoPackage(model)) {

packages/rlc-common/src/metadata/packageJson/azurePackageCommon.ts

@@ -31,9 +31,11 @@ export function getAzureCommonPackageInfo(config: AzurePackageInfoConfig) {
 export function getAzurePackageDependencies({
   hasLro,
   hasPaging,
-  specSource
+  specSource,
+  dependencies
 }: AzurePackageInfoConfig) {
-  let dependencies: Record<string, string> = {
+  let azureDependencies: Record<string, string> = {
+    ...dependencies,
     "@azure-rest/core-client": specSource === "Swagger" ? "^1.4.0" : "^2.1.0",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-rest-pipeline": "^1.5.0",
@@ -42,21 +44,21 @@ export function getAzurePackageDependencies({
   };
 
   if (hasLro) {
-    dependencies = {
-      ...dependencies,
+    azureDependencies = {
+      ...azureDependencies,
       "@azure/core-lro": "^3.0.0",
       "@azure/abort-controller": "^2.1.2"
     };
   }
 
   if (hasPaging) {
-    dependencies = {
-      ...dependencies,
+    azureDependencies = {
+      ...azureDependencies,
       "@azure/core-paging": "^1.5.0"
     };
   }
 
-  return dependencies;
+  return azureDependencies;
 }
 
 function getAzureCjsCommonInfo({
@@ -157,7 +159,6 @@ export function getAzurePackageDevDependencies(config: AzurePackageInfoConfig) {
   const cjsDevDependencies = getAzurePackageCjsDevDependencies(config);
 
   const testDevDependencies = {
-    "@azure/core-util": "^1.0.0",
     "@azure/identity": "^4.2.1"
   };
 

packages/rlc-common/src/metadata/packageJson/buildAzureMonorepoPackage.ts

@@ -1,18 +1,17 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+import {
+  AzurePackageInfoConfig,
+  getAzureCommonPackageInfo,
+  getAzurePackageDependencies,
+  getAzurePackageDevDependencies
+} from "./azurePackageCommon.js";
 import {
   getCommonPackageScripts,
   getPackageCommonInfo
 } from "./packageCommon.js";
 
-import {
-  getAzurePackageDevDependencies,
-  getAzurePackageDependencies,
-  AzurePackageInfoConfig,
-  getAzureCommonPackageInfo
-} from "./azurePackageCommon.js";
-
 export interface AzureMonorepoInfoConfig extends AzurePackageInfoConfig {
   monorepoPackageDirectory?: string;
   clientFilePaths: string[];

packages/rlc-common/src/metadata/packageJson/buildAzureStandalonePackage.ts

@@ -1,18 +1,17 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+import {
+  AzurePackageInfoConfig,
+  getAzureCommonPackageInfo,
+  getAzurePackageDependencies,
+  getAzurePackageDevDependencies
+} from "./azurePackageCommon.js";
 import {
   getCommonPackageScripts,
   getPackageCommonInfo
 } from "./packageCommon.js";
 
-import {
-  getAzurePackageDevDependencies,
-  getAzurePackageDependencies,
-  AzurePackageInfoConfig,
-  getAzureCommonPackageInfo
-} from "./azurePackageCommon.js";
-
 /**
  * Builds the package.json for an Azure package that won't be hosted in the azure-sdk-for-js repo.
  */
@@ -41,7 +40,9 @@ function getAzureStandaloneDependencies(
   config: AzurePackageInfoConfig
 ): Record<string, any> {
   return {
-    dependencies: getAzurePackageDependencies(config),
+    dependencies: {
+      ...getAzurePackageDependencies(config)
+    },
     devDependencies: getStandaloneDevDependencies(config)
   };
 }

packages/rlc-common/src/metadata/packageJson/packageCommon.ts

@@ -10,6 +10,7 @@ export interface PackageCommonInfoConfig {
   withTests: boolean;
   withSamples: boolean;
   exports?: Record<string, any>;
+  dependencies?: Record<string, string>;
   azureArm?: boolean;
 }
 

packages/rlc-common/test/integration/packageJson.spec.ts

@@ -1,13 +1,15 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { expect } from "chai";
+import "mocha";
+
+import { TestModelConfig, createMockModel } from "./mockHelper.js";
 import {
   buildPackageFile,
   updatePackageFile
 } from "../../src/metadata/buildPackageFile.js";
-import "mocha";
-import { createMockModel, TestModelConfig } from "./mockHelper.js";
+
+import { expect } from "chai";
 
 describe("Package file generation", () => {
   describe("Flavor agnostic config", () => {
@@ -71,7 +73,7 @@ describe("Package file generation", () => {
         "./api": "./src/api/index.ts",
         "./models": "./src/models/index.ts"
       };
-      const packageFileContent = buildPackageFile(model, exports);
+      const packageFileContent = buildPackageFile(model, { exports });
       const packageFile = JSON.parse(packageFileContent?.content ?? "{}");
 
       expect(packageFile).to.have.property("tshy");

packages/typespec-test/test/NetworkAnalytics.Management/generated/typespec-ts/package.json

@@ -47,6 +47,7 @@
     "CHANGELOG.md"
   ],
   "dependencies": {
+    "@azure/core-util": "^1.9.2",
     "@azure-rest/core-client": "^2.1.0",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-rest-pipeline": "^1.5.0",
@@ -66,7 +67,6 @@
     "mkdirp": "^3.0.1",
     "typescript": "~5.5.3",
     "tshy": "^2.0.0",
-    "@azure/core-util": "^1.0.0",
     "@azure/identity": "^4.2.1",
     "@vitest/browser": "^2.0.5",
     "@vitest/coverage-istanbul": "^2.0.5",