Skip to content

Commit 65fa1f9

Browse files
skywing918Kyle Zhang
andauthored
emitter output replace package-dir (#11938)
* update logic * up --------- Co-authored-by: Kyle Zhang <v-zhanh@microsoft.com>
1 parent 08116d2 commit 65fa1f9

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

tools/js-sdk-release-tools/src/common/utils.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,18 @@ export async function loadTspConfig(typeSpecDirectory: string): Promise<Exclude<
207207
// e.g. sdk/mongocluster/arm-mongocluster
208208
export async function getGeneratedPackageDirectory(typeSpecDirectory: string, sdkRepoRoot: string): Promise<string> {
209209
const tspConfig = await resolveOptions(typeSpecDirectory);
210+
const emitterOptions = tspConfig.options?.[emitterName];
211+
// Try to get package directory from emitter-output-dir first
212+
const emitterOutputDir = emitterOptions?.['emitter-output-dir'];
213+
if (emitterOutputDir) {
214+
// emitterOutputDir from resolved options should already be an absolute path
215+
// Convert to relative path from sdkRepoRoot for consistency
216+
const relativePath = path.relative(sdkRepoRoot, emitterOutputDir);
217+
return posix.normalize(relativePath);
218+
}
219+
210220
let packageDir = tspConfig.configFile.parameters?.["package-dir"]?.default;
211221
let serviceDir = tspConfig.configFile.parameters?.["service-dir"]?.default;
212-
const emitterOptions = tspConfig.options?.[emitterName];
213222
const serviceDirFromEmitter = emitterOptions?.['service-dir'];
214223
if (serviceDirFromEmitter) {
215224
serviceDir = serviceDirFromEmitter;
@@ -228,7 +237,6 @@ export async function getGeneratedPackageDirectory(typeSpecDirectory: string, sd
228237
return packageDirFromRoot;
229238
}
230239

231-
232240
export async function runCommand(
233241
command: string,
234242
args: readonly string[],

tools/js-sdk-release-tools/src/mlc/clientGenerator/utils/typeSpecUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { join } from 'path';
22
import { ModularClientPackageOptions } from '../../../common/types.js';
3-
import { getGeneratedPackageDirectory, generateRepoDataInTspLocation, runCommand, runCommandOptions } from '../../../common/utils.js';
3+
import { generateRepoDataInTspLocation, runCommand } from '../../../common/utils.js';
44
import { logger } from '../../../utils/logger.js';
55
import pkg from '@npmcli/package-json';
66
const { load } = pkg;

0 commit comments

Comments
 (0)