fix(cli): buffer stdin for cip query --stdin

Author: clavery

packages/b2c-cli/bin/dev.js

@@ -27,4 +27,17 @@ if (userWantsTelemetryEnabled) {
 
 import {execute} from '@oclif/core';
 
+function shouldBufferCipQueryStdin(argv) {
+  return argv.includes('cip') && argv.includes('query') && argv.includes('--stdin');
+}
+
+if (shouldBufferCipQueryStdin(process.argv) && !process.stdin.isTTY) {
+  let bufferedInput = '';
+  for await (const chunk of process.stdin) {
+    bufferedInput += typeof chunk === 'string' ? chunk : chunk.toString('utf8');
+  }
+
+  process.env.SFCC_CIP_QUERY_STDIN = bufferedInput;
+}
+
 await execute({development: true, dir: import.meta.url});

packages/b2c-cli/bin/run.js

@@ -14,4 +14,17 @@ try {
 
 import {execute} from '@oclif/core';
 
+function shouldBufferCipQueryStdin(argv) {
+  return argv.includes('cip') && argv.includes('query') && argv.includes('--stdin');
+}
+
+if (shouldBufferCipQueryStdin(process.argv) && !process.stdin.isTTY) {
+  let bufferedInput = '';
+  for await (const chunk of process.stdin) {
+    bufferedInput += typeof chunk === 'string' ? chunk : chunk.toString('utf8');
+  }
+
+  process.env.SFCC_CIP_QUERY_STDIN = bufferedInput;
+}
+
 await execute({dir: import.meta.url});

packages/b2c-cli/src/commands/cip/query.ts

@@ -44,7 +44,7 @@ export default class CipQuery extends CipCommand<typeof CipQuery> {
   };
 
   async run(): Promise<CipQueryCommandResult> {
-    const sql = this.resolveSql();
+    const sql = await this.resolveSql();
 
     this.requireCipCredentials();
     const client = this.getCipClient();
@@ -69,6 +69,21 @@ export default class CipQuery extends CipCommand<typeof CipQuery> {
     return output;
   }
 
+  private async readSqlFromStdin(): Promise<string> {
+    const preBufferedInput = process.env.SFCC_CIP_QUERY_STDIN;
+    if (preBufferedInput !== undefined) {
+      return preBufferedInput;
+    }
+
+    let data = '';
+
+    for await (const chunk of process.stdin) {
+      data += typeof chunk === 'string' ? chunk : chunk.toString('utf8');
+    }
+
+    return data;
+  }
+
   private renderRows(columns: string[], rows: Array<Record<string, unknown>>, format: CipOutputFormat): void {
     if (format === 'csv') {
       process.stdout.write(`${toCsv(columns, rows)}\n`);
@@ -78,7 +93,7 @@ export default class CipQuery extends CipCommand<typeof CipQuery> {
     renderTable(columns, rows);
   }
 
-  private resolveSql(): string {
+  private async resolveSql(): Promise<string> {
     const positionalSql = this.args.sql;
     const hasPositional = Boolean(positionalSql);
     const hasFile = Boolean(this.flags.file);
@@ -97,7 +112,7 @@ export default class CipQuery extends CipCommand<typeof CipQuery> {
     }
 
     const rawSql = hasStdin
-      ? fs.readFileSync(0, 'utf8')
+      ? await this.readSqlFromStdin()
       : hasFile
         ? fs.readFileSync(this.flags.file as string, 'utf8')
         : positionalSql;

packages/b2c-cli/test/commands/cip/query.test.ts

@@ -37,4 +37,15 @@ describe('cip query', () => {
     expect(error).to.not.be.undefined;
     expect(error?.message).to.include('SQL input is empty');
   });
+
+  it('uses pre-buffered stdin fallback when stream is unavailable', async () => {
+    process.env.SFCC_CIP_QUERY_STDIN = 'SELECT 1';
+
+    const {error} = await runCommand(
+      'cip query --stdin --tenant-id zzxy_prd --client-id test --client-secret test --cip-host 127.0.0.1:9',
+    );
+
+    expect(error).to.not.be.undefined;
+    expect(error?.message).to.not.include('SQL input is empty');
+  });
 });