@lightdash/cli 2.606.7 → 2.606.8

package/dist/handlers/ordinary/harness.mocks.d.ts

@@ -34,9 +34,5 @@ export declare class OrdinaryServer {
 export declare const personalConfig: (serverUrl: string) => Config;
 export declare const saveConfig: (home: string, config: Config) => Promise<string>;
 export declare const request: (method: string, url: string, body?: string) => RecordedRequest;
-export declare const runOrdinaryCli: (home: string, args: string[]) => Promise<{
-    code: number | null;
-    stdout: string;
-    stderr: string;
-}>;
+export declare const runOrdinaryCli: (home: string, args: string[]) => Promise<import("../../testing/cliProcess").CliProcessResult>;
 //# sourceMappingURL=harness.mocks.d.ts.map

package/dist/handlers/ordinary/harness.mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"harness.mocks.d.ts","sourceRoot":"","sources":["../../../src/handlers/ordinary/harness.mocks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,KAAK,mBAAmB,EAAE,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AAO3E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,MAAM,eAAe,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,MAAM,MAAM,KAAK,GAAG;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,qBAAa,cAAc;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAC/C,QAAQ,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAM;IAC1C,QAAQ,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAM;IAC7C,QAAQ,CAAC,UAAU,EAAE,eAAe,EAAE,CAAM;IAC5C,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,CAAM;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,GAAG,SAAM;IACT,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAQ;IACtC,cAgEC;IACK,KAAK,kBAQV;IACK,cAAc,CAAC,KAAK,EAAE,MAAM,iBAWjC;IACK,KAAK,kBAMV;IACD,cAAc,SAGb;CACJ;AACD,eAAO,MAAM,cAAc,cAAe,MAAM,KAAG,MAcjD,CAAC;AACH,eAAO,MAAM,UAAU,SAAgB,MAAM,UAAU,MAAM,oBAK5D,CAAC;AACF,eAAO,MAAM,OAAO,WACR,MAAM,OACT,MAAM,oBAEZ,eAKD,CAAC;AAEH,eAAO,MAAM,cAAc,SAAgB,MAAM,QAAQ,MAAM,EAAE;UAsB/C,MAAM,GAAG,IAAI;YACX,MAAM;YACN,MAAM;EAuBzB,CAAC"}
+{"version":3,"file":"harness.mocks.d.ts","sourceRoot":"","sources":["../../../src/handlers/ordinary/harness.mocks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,mBAAmB,EAAE,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AAG3E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,MAAM,MAAM,eAAe,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,MAAM,MAAM,KAAK,GAAG;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,qBAAa,cAAc;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAC/C,QAAQ,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAM;IAC1C,QAAQ,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAM;IAC7C,QAAQ,CAAC,UAAU,EAAE,eAAe,EAAE,CAAM;IAC5C,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,CAAM;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,GAAG,SAAM;IACT,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAQ;IACtC,cAgEC;IACK,KAAK,kBAQV;IACK,cAAc,CAAC,KAAK,EAAE,MAAM,iBAWjC;IACK,KAAK,kBAMV;IACD,cAAc,SAGb;CACJ;AACD,eAAO,MAAM,cAAc,cAAe,MAAM,KAAG,MAcjD,CAAC;AACH,eAAO,MAAM,UAAU,SAAgB,MAAM,UAAU,MAAM,oBAK5D,CAAC;AACF,eAAO,MAAM,OAAO,WACR,MAAM,OACT,MAAM,oBAEZ,eAKD,CAAC;AAEH,eAAO,MAAM,cAAc,SAAgB,MAAM,QAAQ,MAAM,EAAE,iEAkBhE,CAAC"}

package/dist/handlers/ordinary/harness.mocks.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runOrdinaryCli = exports.request = exports.saveConfig = exports.personalConfig = exports.OrdinaryServer = void 0;
 const tslib_1 = require("tslib");
-const child_process_1 = require("child_process");
 const events_1 = require("events");
 const fs_1 = require("fs");
 const http_1 = require("http");
 const yaml = tslib_1.__importStar(require("js-yaml"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const timers_1 = require("timers");
+const cliProcess_1 = require("../../testing/cliProcess");
 class OrdinaryServer {
     received = new events_1.EventEmitter();
     requests = [];
@@ -141,9 +140,8 @@ const request = (method, url, body = '') => ({
 exports.request = request;
 const runOrdinaryCli = async (home, args) => {
     const entry = path_1.default.join(home, 'ordinary-entry.cjs');
-    const analytics = path_1.default.resolve(__dirname, '../../analytics/analytics.ts');
-    const index = path_1.default.resolve(__dirname, '../../index.ts');
-    await fs_1.promises.writeFile(entry, `const { LightdashAnalytics } = require(${JSON.stringify(analytics)}); LightdashAnalytics.track = async () => {}; LightdashAnalytics.identify = async () => {}; require(${JSON.stringify(index)});`);
+    const analytics = path_1.default.join(path_1.default.dirname(cliProcess_1.compiledCliEntry), 'analytics/analytics.js');
+    await fs_1.promises.writeFile(entry, `const { LightdashAnalytics } = require(${JSON.stringify(analytics)}); LightdashAnalytics.track = async () => {}; LightdashAnalytics.identify = async () => {}; require(${JSON.stringify(cliProcess_1.compiledCliEntry)});`);
     const env = {
         ...process.env,
         HOME: home,
@@ -151,30 +149,6 @@ const runOrdinaryCli = async (home, args) => {
         FORCE_COLOR: '0',
         CI: 'true',
     };
-    const child = (0, child_process_1.spawn)(process.execPath, ['--import', 'tsx', entry, ...args], {
-        env,
-        stdio: ['ignore', 'pipe', 'pipe'],
-    });
-    let timer;
-    try {
-        return await new Promise((resolve, reject) => {
-            timer = (0, timers_1.setTimeout)(() => reject(new Error('Ordinary CLI child timed out after 20s')), 20_000);
-            let stdout = '';
-            let stderr = '';
-            child.stdout.on('data', (chunk) => {
-                stdout += String(chunk);
-            });
-            child.stderr.on('data', (chunk) => {
-                stderr += String(chunk);
-            });
-            child.on('error', reject);
-            child.on('close', (code) => resolve({ code, stdout, stderr }));
-        });
-    }
-    finally {
-        (0, timers_1.clearTimeout)(timer);
-        if (child.exitCode === null && child.signalCode === null)
-            child.kill('SIGKILL');
-    }
+    return (0, cliProcess_1.runCliProcess)({ args, env, entry, timeoutMs: 20_000 });
 };
 exports.runOrdinaryCli = runOrdinaryCli;

package/dist/testing/cliProcess.d.ts

@@ -0,0 +1,17 @@
+export declare const compiledCliEntry: string;
+export type CliProcessResult = {
+    code: number | null;
+    stdout: string;
+    stderr: string;
+};
+type CliProcessOptions = {
+    args: string[];
+    env: NodeJS.ProcessEnv;
+    cwd?: string;
+    entry?: string;
+    preload?: string;
+    timeoutMs?: number;
+};
+export declare const runCliProcess: ({ args, env, cwd, entry, preload, timeoutMs, }: CliProcessOptions) => Promise<CliProcessResult>;
+export {};
+//# sourceMappingURL=cliProcess.d.ts.map

package/dist/testing/cliProcess.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cliProcess.d.ts","sourceRoot":"","sources":["../../src/testing/cliProcess.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB,QAAiD,CAAC;AAI/E,MAAM,MAAM,gBAAgB,GAAG;IAC3B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACrB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,aAAa,mDAOvB,iBAAiB,KAAG,OAAO,CAAC,gBAAgB,CA0CzC,CAAC"}

package/dist/testing/cliProcess.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runCliProcess = exports.compiledCliEntry = void 0;
+const tslib_1 = require("tslib");
+const child_process_1 = require("child_process");
+const os_1 = require("os");
+const path_1 = tslib_1.__importDefault(require("path"));
+const timers_1 = require("timers");
+exports.compiledCliEntry = path_1.default.resolve(__dirname, '../../dist/index.js');
+// Shared across spawns so each child skips recompiling the CLI's module graph.
+const compileCache = path_1.default.join((0, os_1.tmpdir)(), 'lightdash-cli-test-compile-cache');
+const runCliProcess = ({ args, env, cwd, entry = exports.compiledCliEntry, preload, timeoutMs = 30_000, }) => new Promise((resolve, reject) => {
+    const child = (0, child_process_1.spawn)(process.execPath, [
+        ...(preload === undefined ? [] : ['--require', preload]),
+        ...(entry.endsWith('.ts')
+            ? ['--import', require.resolve('tsx')]
+            : []),
+        entry,
+        ...args,
+    ], {
+        cwd,
+        env: { ...env, NODE_COMPILE_CACHE: compileCache },
+        stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    let stdout = '';
+    let stderr = '';
+    const timeout = (0, timers_1.setTimeout)(() => {
+        child.kill('SIGKILL');
+        reject(new Error(`CLI child timed out after ${timeoutMs}ms: ${args.join(' ')}`));
+    }, timeoutMs);
+    child.stdout.on('data', (data) => {
+        stdout += String(data);
+    });
+    child.stderr.on('data', (data) => {
+        stderr += String(data);
+    });
+    child.on('error', (error) => {
+        (0, timers_1.clearTimeout)(timeout);
+        reject(error);
+    });
+    child.on('close', (code) => {
+        (0, timers_1.clearTimeout)(timeout);
+        resolve({ code, stdout, stderr });
+    });
+});
+exports.runCliProcess = runCliProcess;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/cli",
-  "version": "2.606.7",
+  "version": "2.606.8",
   "description": "Lightdash CLI tool",
   "license": "MIT",
   "repository": {
@@ -22,8 +22,8 @@
     "@actions/core": "1.11.1",
     "@aws-sdk/credential-providers": "3.995.0",
     "@casl/ability": "6.8.0",
-    "@lightdash/common": "2.606.7",
-    "@lightdash/warehouses": "2.606.7",
+    "@lightdash/common": "2.606.8",
+    "@lightdash/warehouses": "2.606.8",
     "@sidvind/better-ajv-errors": "7.0.0",
     "@types/columnify": "1.5.1",
     "ajv": "8.18.0",