Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions packages/cli/plugin-bff/src/utils/clientGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,13 @@ async function setPackage(

mergePackageJson(packageJson, addFiles, typesVersions, exports);

await fs.promises.writeFile(
packagePath,
JSON.stringify(packageJson, null, 2),
);
const handle = await fs.promises.open(packagePath, 'w');
try {
await handle.write(JSON.stringify(packageJson, null, 2));
await handle.write('\n');
} finally {
await handle.close();
}
} catch (error) {
logger.error(`package.json update failed: ${error}`);
}
Expand Down Expand Up @@ -275,7 +278,11 @@ async function clientGenerator(draftOptions: APILoaderOptions) {
logger.error(`Client bundle generate failed: ${error}`);
}

setPackage(sourceList, draftOptions.appDir, draftOptions.relativeDistPath);
await setPackage(
sourceList,
draftOptions.appDir,
draftOptions.relativeDistPath,
);
}

export default clientGenerator;
43 changes: 43 additions & 0 deletions packages/cli/plugin-bff/tests/clientGenerator.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import os from 'os';
import path from 'path';
import { fs } from '@modern-js/utils';
import clientGenerator from '../src/utils/clientGenerator';

describe('clientGenerator', () => {
it('writes package.json with a trailing newline', async () => {
const appDir = await fs.mkdtemp(path.join(os.tmpdir(), 'bff-client-gen-'));
const lambdaDir = path.join(appDir, 'api', 'lambda');

try {
await fs.mkdir(lambdaDir, { recursive: true });
await fs.writeFile(
path.join(lambdaDir, 'user.ts'),
'export default function handler() {}',
);
await fs.writeFile(
path.join(appDir, 'package.json'),
JSON.stringify({ name: 'test-app' }, null, 2),
);

await clientGenerator({
prefix: '/api',
appDir,
apiDir: path.join(appDir, 'api'),
lambdaDir,
existLambda: false,
relativeDistPath: 'dist',
relativeApiPath: 'api',
});

const packageContent = await fs.readFile(
path.join(appDir, 'package.json'),
'utf8',
);

expect(packageContent.endsWith('\n')).toBe(true);
expect(JSON.parse(packageContent).exports).toHaveProperty('./api/user');
} finally {
await fs.remove(appDir);
}
});
});