@azure-tools/rlc-common 0.52.3 → 0.53.0

package/src/metadata/buildTestConfig.ts

@@ -1,25 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { Project } from "ts-morph";
 import { RLCModel } from "../interfaces.js";
 import { getPackageName } from "./utils.js";
 
-const highLevelTsTestConfig: Record<string, any> = {
-  references: [
-    {
-      path: "./tsconfig.test.node.json"
-    },
-    {
-      path: "./tsconfig.browser.config.json"
-    }
-  ],
-  compilerOptions: {
-    composite: true
-  },
-  files: []
-};
-
 function shouldGenerateTestConfig(model: RLCModel): boolean {
   const isAzureSdkForJs = model.options?.azureSdkForJs ?? false;
   return !(
@@ -29,83 +13,60 @@ function shouldGenerateTestConfig(model: RLCModel): boolean {
   );
 }
 
+/**
+ * Builds config/tsconfig.test.browser.json — extends eng/tsconfigs/test.browser.json
+ */
 export function buildTestBrowserTsConfig(model: RLCModel) {
   if (!shouldGenerateTestConfig(model)) {
     return;
   }
 
-  const browserFilePath = "tsconfig.browser.config.json";
-  const project = new Project();
   const name = getPackageName(model);
 
-  const browserContent: Record<string, any> = {
-    extends: "../../../tsconfig.browser.base.json",
-    compilerOptions: {
-      paths: {
-        [name]: ["./dist/browser/index.d.ts"],
-        [`${name}/*`]: ["./dist/browser/*"],
-        "$internal/*": ["./dist/browser/*"]
-      }
-    }
-  };
-
-  const browserConfigFile = project.createSourceFile(
-    browserFilePath,
-    JSON.stringify(browserContent, null, 2),
-    {
-      overwrite: true
-    }
-  );
-
   return {
-    path: browserFilePath,
-    content: browserConfigFile.getFullText()
+    path: "config/tsconfig.test.browser.json",
+    content: JSON.stringify(
+      {
+        extends: "../../../../eng/tsconfigs/test.browser.json",
+        compilerOptions: {
+          paths: {
+            [name]: ["../src/index.ts"],
+            [`${name}/*`]: ["../src/*"],
+            "$internal/*": ["../src/*"]
+          }
+        }
+      },
+      null,
+      2
+    )
   };
 }
 
+/**
+ * Builds config/tsconfig.test.node.json — extends eng/tsconfigs/test.node.json
+ */
 export function buildTestNodeTsConfig(model: RLCModel) {
   if (!shouldGenerateTestConfig(model)) {
     return;
   }
 
-  const testNodeFilePath = "tsconfig.test.node.json";
-  const project = new Project();
   const name = getPackageName(model);
 
-  const testNodeContent: Record<string, any> = {
-    extends: "../../../tsconfig.test.node.base.json",
-    compilerOptions: {
-      paths: {
-        [name]: ["./src/index.ts"],
-        [`${name}/*`]: ["./src/*"],
-        "$internal/*": ["./src/*"]
-      }
-    }
-  };
-
-  const testNodeConfigFile = project.createSourceFile(
-    testNodeFilePath,
-    JSON.stringify(testNodeContent, null, 2),
-    {
-      overwrite: true
-    }
-  );
-
-  return {
-    path: testNodeFilePath,
-    content: testNodeConfigFile.getFullText()
-  };
-}
-
-export function buildTestMainTsConfig(model: RLCModel) {
-  if (!shouldGenerateTestConfig(model)) {
-    return;
-  }
-
-  const testFilePath = "tsconfig.test.json";
-
   return {
-    path: testFilePath,
-    content: JSON.stringify(highLevelTsTestConfig, null, 2)
+    path: "config/tsconfig.test.node.json",
+    content: JSON.stringify(
+      {
+        extends: "../../../../eng/tsconfigs/test.node.json",
+        compilerOptions: {
+          paths: {
+            [name]: ["../src/index.ts"],
+            [`${name}/*`]: ["../src/*"],
+            "$internal/*": ["../src/*"]
+          }
+        }
+      },
+      null,
+      2
+    )
   };
 }

package/src/metadata/buildTsConfig.ts

@@ -4,112 +4,87 @@
 import { Project } from "ts-morph";
 import { RLCModel } from "../interfaces.js";
 
-const restLevelTsConfigInAzureSdkForJs: () => Record<string, any> =
-  function () {
-    return {
-      references: [
-        {
-          path: "./tsconfig.src.json"
-        }
-      ]
-    };
-  };
-const tsSrcConfigInAzureSdkForJs = `{
-    extends: "../../../tsconfig.lib.json"
-  }`;
-
-const tsSampleConfigInAzureSdkForJs: (clientPackageName: string) => string =
-  function (clientPackageName) {
-    return `{
-    extends: "../../../tsconfig.samples.base.json",
-    compilerOptions: {
-      paths: {
-        "${clientPackageName}": ["./dist/esm"]
-      }
-    }
-  }`;
-  };
-
-const tsTestConfigInAzureSdkForJs = `{
-    extends: ["./tsconfig.src.json", "../../../tsconfig.test.base.json"]
-  }`;
-
-const restLevelTsConfigNotInAzureSdkForJs: (
-  model: RLCModel
-) => Record<string, any> = function (model: RLCModel) {
-  const { options } = model;
-  return {
-    compilerOptions: {
-      target: "ES2017",
-      module: options?.moduleKind === "esm" ? "NodeNext" : "es6",
-      lib: [],
-      declaration: true,
-      declarationMap: true,
-      inlineSources: true,
-      sourceMap: true,
-      importHelpers: true,
-      strict: true,
-      alwaysStrict: true,
-      noUnusedLocals: true,
-      noUnusedParameters: true,
-      noImplicitReturns: true,
-      noFallthroughCasesInSwitch: true,
-      forceConsistentCasingInFileNames: true,
-      moduleResolution: options?.moduleKind === "esm" ? "NodeNext" : "node",
-      allowSyntheticDefaultImports: true,
-      esModuleInterop: true,
-      outDir: options?.moduleKind === "cjs" ? "./dist-esm" : undefined,
-      declarationDir: options?.moduleKind === "cjs" ? "./types" : undefined
-    },
-    include: ["src/**/*.ts"]
-  };
-};
-
+/**
+ * Builds the root tsconfig.json.
+ *
+ * For azureSdkForJs packages, emits project references pointing into the
+ * `config/` subfolder (following the eng/tsconfigs pattern).
+ */
 export function buildTsConfig(model: RLCModel) {
   const { packageDetails, azureSdkForJs } = model.options || {};
   const { generateTest, generateSample } = model.options || {};
-  // Take the undefined as true by default
   const clientPackageName = packageDetails?.name ?? "";
   const project = new Project();
-  const restLevelTsConfig = azureSdkForJs
-    ? restLevelTsConfigInAzureSdkForJs()
-    : restLevelTsConfigNotInAzureSdkForJs(model);
 
-  if (!azureSdkForJs) {
+  let tsConfig: Record<string, any>;
+
+  if (azureSdkForJs) {
+    const references: { path: string }[] = [
+      { path: "./config/tsconfig.src.esm.json" },
+      { path: "./config/tsconfig.src.browser.json" },
+      { path: "./config/tsconfig.src.react-native.json" },
+      { path: "./config/tsconfig.src.cjs.json" }
+    ];
+
     if (generateTest) {
-      restLevelTsConfig.include.push("test/**/*.ts");
+      references.push(
+        { path: "./config/tsconfig.test.node.json" },
+        { path: "./config/tsconfig.test.browser.json" }
+      );
     }
+
     if (generateSample) {
-      restLevelTsConfig.include.push("samples-dev/**/*.ts");
-      restLevelTsConfig.compilerOptions["paths"] = {};
-      restLevelTsConfig.compilerOptions["paths"][clientPackageName] = [
-        "./src/index"
-      ];
+      references.push({ path: "./config/tsconfig.samples.json" });
     }
-  } else {
-    if (generateSample) {
-      restLevelTsConfig.references.push({
-        path: "./tsconfig.samples.json"
-      });
+
+    if (generateTest) {
+      references.push({ path: "./config/tsconfig.snippets.json" });
     }
 
+    tsConfig = { references, files: [] };
+  } else {
+    const { options } = model;
+    tsConfig = {
+      compilerOptions: {
+        target: "ES2017",
+        module: options?.moduleKind === "esm" ? "NodeNext" : "es6",
+        lib: [],
+        declaration: true,
+        declarationMap: true,
+        inlineSources: true,
+        sourceMap: true,
+        importHelpers: true,
+        strict: true,
+        alwaysStrict: true,
+        noUnusedLocals: true,
+        noUnusedParameters: true,
+        noImplicitReturns: true,
+        noFallthroughCasesInSwitch: true,
+        forceConsistentCasingInFileNames: true,
+        moduleResolution: options?.moduleKind === "esm" ? "NodeNext" : "node",
+        allowSyntheticDefaultImports: true,
+        esModuleInterop: true,
+        outDir: options?.moduleKind === "cjs" ? "./dist-esm" : undefined,
+        declarationDir: options?.moduleKind === "cjs" ? "./types" : undefined
+      },
+      include: ["src/**/*.ts"]
+    };
+
     if (generateTest) {
-      restLevelTsConfig.references.push({
-        path: "./tsconfig.test.json"
-      });
-      restLevelTsConfig.references.push({
-        path: "./tsconfig.snippets.json"
-      });
+      tsConfig.include.push("test/**/*.ts");
+    }
+    if (generateSample) {
+      tsConfig.include.push("samples-dev/**/*.ts");
+      tsConfig.compilerOptions["paths"] = {};
+      tsConfig.compilerOptions["paths"][clientPackageName] = ["./src/index"];
     }
   }
 
   const filePath = "tsconfig.json";
   const configFile = project.createSourceFile(
     filePath,
-    JSON.stringify(restLevelTsConfig, null, 2),
-    {
-      overwrite: true
-    }
+    JSON.stringify(tsConfig, null, 2),
+    { overwrite: true }
   );
   return {
     path: filePath,
@@ -117,34 +92,106 @@ export function buildTsConfig(model: RLCModel) {
   };
 }
 
-export function buildTsSrcConfig() {
+/**
+ * Builds config/tsconfig.src.esm.json — extends eng/tsconfigs/src.esm.json
+ */
+export function buildTsSrcEsmConfig() {
   return {
-    path: "tsconfig.src.json",
-    content: tsSrcConfigInAzureSdkForJs
+    path: "config/tsconfig.src.esm.json",
+    content: JSON.stringify(
+      {
+        extends: "../../../../eng/tsconfigs/src.esm.json",
+        include: ["../src/index.ts"]
+      },
+      null,
+      2
+    )
   };
 }
 
-export function buildTsSampleConfig(model: RLCModel) {
-  const { packageDetails } = model.options || {};
+/**
+ * Builds config/tsconfig.src.browser.json — extends eng/tsconfigs/src.browser.json
+ */
+export function buildTsSrcBrowserConfig() {
+  return {
+    path: "config/tsconfig.src.browser.json",
+    content: JSON.stringify(
+      {
+        extends: "../../../../eng/tsconfigs/src.browser.json",
+        include: ["../src/index.ts"]
+      },
+      null,
+      2
+    )
+  };
+}
+
+/**
+ * Builds config/tsconfig.src.react-native.json — extends eng/tsconfigs/src.react-native.json
+ */
+export function buildTsSrcReactNativeConfig() {
+  return {
+    path: "config/tsconfig.src.react-native.json",
+    content: JSON.stringify(
+      {
+        extends: "../../../../eng/tsconfigs/src.react-native.json",
+        include: ["../src/index.ts"]
+      },
+      null,
+      2
+    )
+  };
+}
+
+/**
+ * Builds config/tsconfig.src.cjs.json — extends eng/tsconfigs/src.cjs.json
+ */
+export function buildTsSrcCjsConfig() {
   return {
-    path: "tsconfig.samples.json",
-    content: tsSampleConfigInAzureSdkForJs(packageDetails?.name ?? "")
+    path: "config/tsconfig.src.cjs.json",
+    content: JSON.stringify(
+      {
+        extends: "../../../../eng/tsconfigs/src.cjs.json",
+        include: ["../src/index.ts"]
+      },
+      null,
+      2
+    )
   };
 }
 
-export function buildTsTestConfig() {
+/**
+ * Builds config/tsconfig.samples.json — extends eng/tsconfigs/samples.json
+ */
+export function buildTsSampleConfig(model: RLCModel) {
+  const { packageDetails } = model.options || {};
+  const clientPackageName = packageDetails?.name ?? "";
   return {
-    path: "tsconfig.test.json",
-    content: tsTestConfigInAzureSdkForJs
+    path: "config/tsconfig.samples.json",
+    content: JSON.stringify(
+      {
+        extends: "../../../../eng/tsconfigs/samples.json",
+        compilerOptions: {
+          paths: {
+            [clientPackageName]: ["../dist/esm"]
+          }
+        }
+      },
+      null,
+      2
+    )
   };
 }
 
+/**
+ * Builds config/tsconfig.snippets.json — extends eng/tsconfigs/snippets.json
+ */
 export function buildTsSnippetsConfig() {
   return {
-    path: "tsconfig.snippets.json",
+    path: "config/tsconfig.snippets.json",
     content: JSON.stringify(
       {
-        extends: ["../../../tsconfig.snippets.base.json"]
+        extends: "../../../../eng/tsconfigs/snippets.json"
       },
       null,
       2

package/src/metadata/buildVitestConfig.ts

@@ -3,29 +3,17 @@
 
 import { RLCModel } from "../interfaces.js";
 
-const nodeConfig = `
-import viteConfig from "../../../vitest.shared.config.ts";
+const nodeConfig = `import viteConfig from "../../../vitest.shared.config.ts";
 
-export default viteConfig;`;
+export default viteConfig;
+`;
 
-const browserConfig = `
-import viteConfig from "../../../vitest.browser.shared.config.ts";
-
-export default viteConfig;`;
-
-const esmConfig = `
-import { mergeConfig } from "vitest/config";
-import vitestConfig from "./vitest.config.ts";
-import vitestEsmConfig from "../../../vitest.esm.shared.config.ts";
-
-export default mergeConfig(
-  vitestConfig,
-  vitestEsmConfig
-);`;
+const browserConfig = `export { default } from "../../../eng/vitestconfigs/browser.config.ts";
+`;
 
 export function buildVitestConfig(
   model: RLCModel,
-  platform: "browser" | "node" | "esm"
+  platform: "browser" | "node"
 ) {
   if (
     model.options?.generateMetadata === false ||
@@ -44,10 +32,5 @@ export function buildVitestConfig(
         path: "vitest.config.ts",
         content: nodeConfig
       };
-    case "esm":
-      return {
-        path: "vitest.esm.config.ts",
-        content: esmConfig
-      };
   }
 }

package/src/metadata/buildWarpConfig.ts

@@ -2,13 +2,19 @@
 // Licensed under the MIT License.
 
 import { RLCModel } from "../interfaces.js";
-import { isAzureMonorepoPackage } from "../helpers/packageUtil.js";
 
 export interface WarpConfigOptions {
   /** Source-level exports, e.g. { ".": "./src/index.ts", "./models": "./src/models/index.ts" } */
   exports?: Record<string, string>;
 }
 
+/** Default exports included in every warp config. */
+const BASE_EXPORTS: Record<string, string> = {
+  "./package.json": "./package.json",
+  ".": "./src/index.ts"
+};
+
+/** Full inline warp config template. */
 export const WarpConfigTemplate = `# warp.config.yml — build configuration
 
 exports:
@@ -16,41 +22,38 @@ exports:
 
 targets:
   - name: browser
-    tsconfig: "../../../tsconfig.src.browser.json"
-    polyfillSuffix: "-browser"
+    tsconfig: "./config/tsconfig.src.browser.json"
 
   - name: react-native
-    tsconfig: "../../../tsconfig.src.react-native.json"
-    polyfillSuffix: "-react-native"
+    tsconfig: "./config/tsconfig.src.react-native.json"
 
   - name: esm
     condition: import
-    tsconfig: "../../../tsconfig.src.esm.json"
+    tsconfig: "./config/tsconfig.src.esm.json"
 
   - name: commonjs
     condition: require
-    tsconfig: "../../../tsconfig.src.cjs.json"
+    tsconfig: "./config/tsconfig.src.cjs.json"
+    moduleType: commonjs
 `;
 
 /**
- * Builds a warp.config.yml file for Azure SDK monorepo packages.
- * Only generated when azureSdkForJs is true.
+ * Builds a self-contained warp.config.yml file.
+ *
+ * Emits a full inline config with all exports and targets.
+ * Polyfill resolution (browser/react-native file substitution) is handled
+ * via package.json `imports` subpath imports (#platform/*).
  */
 export function buildWarpConfig(
   model: RLCModel,
   { exports }: WarpConfigOptions = {}
 ) {
-  if (!isAzureMonorepoPackage(model)) {
-    return;
-  }
-
   if (model.options?.moduleKind !== "esm") {
     return;
   }
 
   const allExports: Record<string, string> = {
-    "./package.json": "./package.json",
-    ".": "./src/index.ts",
+    ...BASE_EXPORTS,
     ...exports
   };
 
@@ -60,8 +63,5 @@ export function buildWarpConfig(
 
   const content = WarpConfigTemplate.replace("{{exports}}", exportsContent);
 
-  return {
-    path: "warp.config.yml",
-    content
-  };
+  return { path: "warp.config.yml", content };
 }

package/src/metadata/packageJson/buildAzureMonorepoPackage.ts

@@ -95,12 +95,17 @@ export function getAzureMonorepoPackageInfo(
   config: AzureMonorepoInfoConfig
 ): Record<string, any> {
   const commonPackageInfo = getPackageCommonInfo(config);
+  const repositoryDirectory = config.monorepoPackageDirectory ?? "sdk/";
 
   return {
     ...commonPackageInfo,
     ...getAzureCommonPackageInfo(config),
     "sdk-type": `${config.azureArm ? "mgmt" : "client"}`,
-    repository: "github:Azure/azure-sdk-for-js",
+    repository: {
+      type: "git",
+      url: "git+https://github.com/Azure/azure-sdk-for-js",
+      directory: repositoryDirectory
+    },
     bugs: {
       url: "https://github.com/Azure/azure-sdk-for-js/issues"
     },
@@ -154,8 +159,8 @@ function getAzureMonorepoScripts(config: AzureMonorepoInfoConfig) {
   const esmScripts = getEsmScripts(config);
   const skipLinting = config.azureArm && config.isModularLibrary;
   const buildSampleScripts = config.azureArm
-    ? "tsc -p tsconfig.samples.json && dev-tool samples publish -f"
-    : "tsc -p tsconfig.samples.json";
+    ? "tsc -p config/tsconfig.samples.json && dev-tool samples publish -f"
+    : "tsc -p config/tsconfig.samples.json";
   return {
     ...getCommonPackageScripts(),
     "build:samples": config.withSamples ? buildSampleScripts : "echo skipped",

package/src/metadata/packageJson/packageCommon.ts

@@ -113,10 +113,19 @@ function getEsmEntrypointInformation(config: PackageCommonInfoConfig) {
       types: "./dist/commonjs/index.d.ts",
       browser: "./dist/browser/index.js",
       "react-native": "./dist/react-native/index.js",
+      imports: {
+        "#platform/*.js": {
+          browser: "./src/*-browser.mjs",
+          "react-native": "./src/*-react-native.mjs",
+          default: "./src/*.js"
+        }
+      },
       exports: resolveWarpExports(config.exports)
     };
   }
 
+  // Non-monorepo packages use tshy which manages polyfill resolution
+  // via esmDialects — do NOT add imports here.
   return {
     tshy: getTshyConfig(config),
     type: "module",