@lightdash/cli 0.3422.1 → 0.3423.0

package/dist/handlers/download.test.js

@@ -13,7 +13,7 @@ vitest_1.vi.mock('./dbt/apiClient', async (importOriginal) => ({
     ...(await importOriginal()),
     lightdashApi: vitest_1.vi.fn(),
 }));
-const { assertUniqueSpacePaths, downloadSpaces, getDashboardChartSlugs, getFlatSpaceFileNames, readAiAgentFiles, readSpaceFiles, readSpaceNames, sanitizeChartForDownload, shouldFallBackToEmbeddedSpaces, shouldDownloadAiAgents, upsertSpaces, upsertVirtualViews, validateSpaceIdentity, writeSpaceFiles, } = download_1.testHelpers;
+const { assertUniqueSpacePaths, downloadSpaces, getDashboardChartSlugs, getFlatSpaceFileNames, readAiAgentFiles, readSpaceFiles, readSpaceNames, sanitizeChartForDownload, shouldFallBackToEmbeddedSpaces, shouldDownloadAiAgents, summarizeUploadChanges, upsertSpaces, upsertVirtualViews, validateSpaceIdentity, writeSpaceFiles, } = download_1.testHelpers;
 const makeLooseDashboard = (slug, chartSlugs) => ({
     slug,
     name: slug,
@@ -31,6 +31,24 @@ const writeFolderDashboard = async (baseDir, slug, chartSlugs) => {
     const yaml = `contentType: dashboard\nname: ${slug}\nslug: ${slug}\nspaceSlug: test-space\ntiles:\n${tilesYaml}\nversion: 1\n`;
     await fs_1.promises.writeFile(path.join(baseDir, 'dashboards', `${slug}.yml`), yaml);
 };
+describe('summarizeUploadChanges', () => {
+    it('reports only phase deltas and warns when resources fail', () => {
+        expect(summarizeUploadChanges({ 'charts created': 1, 'spaces skipped': 3 }, {
+            'charts created': 3,
+            'spaces skipped': 3,
+            'charts skipped': 2,
+            'charts with errors': 1,
+        })).toEqual({
+            detail: '2 created, 2 skipped, 1 with errors',
+            variant: 'warning',
+        });
+    });
+    it('reports an empty phase without inventing a resource count', () => {
+        expect(summarizeUploadChanges({}, {})).toEqual({
+            detail: 'no changes',
+        });
+    });
+});
 const pivotedSeries = (pivotValue, overrides = {}) => ({
     type: common_1.CartesianSeriesType.BAR,
     encode: {
@@ -378,7 +396,9 @@ spaceName: Finance
 version: 1
 `);
         try {
-            await (0, download_1.downloadContent)(['pivoted-chart'], 'charts', 'project-uuid', 'project', tmpDir, false, false, false, false, false);
+            const onProgress = vitest_1.vi.fn();
+            await (0, download_1.downloadContent)(['pivoted-chart'], 'charts', 'project-uuid', 'project', tmpDir, false, false, false, false, false, onProgress);
+            expect(onProgress).toHaveBeenCalledWith('1 of 1 charts downloaded');
             await expect(readSpaceFiles(tmpDir)).resolves.toEqual([
                 expect.objectContaining({
                     filePath: existingFile,

package/dist/handlers/organizationContent/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/handlers/organizationContent/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AA0B3C,KAAK,0BAA0B,GAAG;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AA6BF,eAAO,MAAM,4BAA4B,GAAI,aAAa,MAAM,KAAG,MAClC,CAAC;AAElC,eAAO,MAAM,2BAA2B,GAAU,yBAG/C,0BAA0B,KAAG,OAAO,CAAC,IAAI,CA0H3C,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAU,sCAI7C,0BAA0B,KAAG,OAAO,CAAC,IAAI,CAgK3C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/handlers/organizationContent/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AA0B3C,KAAK,0BAA0B,GAAG;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAkBF,eAAO,MAAM,4BAA4B,GAAI,aAAa,MAAM,KAAG,MAClC,CAAC;AAElC,eAAO,MAAM,2BAA2B,GAAU,yBAG/C,0BAA0B,KAAG,OAAO,CAAC,IAAI,CA2F3C,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAU,sCAI7C,0BAA0B,KAAG,OAAO,CAAC,IAAI,CA0I3C,CAAC"}

package/dist/handlers/organizationContent/index.js

@@ -20,12 +20,6 @@ const isPartialUploadError = resource_1.isCodeResourcePhaseError;
 const isGroupServiceDisabledError = (error) => error instanceof common_1.LightdashError &&
     error.statusCode === 403 &&
     error.message === 'Group service is not enabled';
-const getElapsedMilliseconds = (startedAt) => Date.now() - startedAt;
-const measureAction = async (action) => {
-    const startedAt = Date.now();
-    const value = await action();
-    return { value, durationMs: getElapsedMilliseconds(startedAt) };
-};
 const getOrganizationContentFolder = (customPath) => (0, contentAsCodePaths_1.getDownloadFolder)(customPath);
 exports.getOrganizationContentFolder = getOrganizationContentFolder;
 const downloadOrganizationContent = async ({ customPath, config, }) => {
@@ -46,44 +40,29 @@ const downloadOrganizationContent = async ({ customPath, config, }) => {
     const output = (0, contentAsCodeOutput_1.createContentAsCodeOutput)({
         operation: 'download',
         scope: 'organization',
-        initialLabel: 'Custom roles',
     });
     try {
-        const { value: customRolesTotal, durationMs: customRolesDurationMs } = await measureAction(() => (0, customRoles_1.downloadCustomRoles)(organizationUuid, organizationContentPath));
-        output.completeItem({
+        const customRolesTotal = await output.runItem({
             label: 'Custom roles',
-            detail: `${customRolesTotal} downloaded`,
-            durationMs: customRolesDurationMs,
-        }, 'Users');
-        const { value: usersTotal, durationMs: usersDurationMs } = await measureAction(() => (0, users_1.downloadUsers)(organizationUuid, organizationContentPath));
-        output.completeItem({
+            action: () => (0, customRoles_1.downloadCustomRoles)(organizationUuid, organizationContentPath),
+            detail: (total) => `${total} downloaded`,
+        });
+        const usersTotal = await output.runItem({
             label: 'Users',
-            detail: `${usersTotal} downloaded`,
-            durationMs: usersDurationMs,
-        }, 'Groups');
-        const groupsStartedAt = Date.now();
+            action: () => (0, users_1.downloadUsers)(organizationUuid, organizationContentPath),
+            detail: (total) => `${total} downloaded`,
+        });
         let groupsTotal = 0;
-        let groupsDurationMs;
+        output.startItem('Groups');
         try {
             groupsTotal = await (0, groups_1.downloadGroups)(organizationUuid, organizationContentPath);
-            groupsDurationMs = getElapsedMilliseconds(groupsStartedAt);
-            output.completeItem({
-                label: 'Groups',
-                detail: `${groupsTotal} downloaded`,
-                durationMs: groupsDurationMs,
-            }, null);
+            output.completeItem(`${groupsTotal} downloaded`);
         }
         catch (error) {
-            groupsDurationMs = getElapsedMilliseconds(groupsStartedAt);
             if (!isGroupServiceDisabledError(error)) {
                 throw error;
             }
-            output.completeItem({
-                label: 'Groups',
-                detail: 'service unavailable',
-                durationMs: groupsDurationMs,
-                variant: 'warning',
-            }, null);
+            output.completeItem('service unavailable', 'warning');
             globalState_1.default.debug('> Warning: groups were not downloaded because the group service is not enabled');
         }
         const renderedSummary = output.complete(organizationContentPath, (Date.now() - start) / 1000);
@@ -137,10 +116,10 @@ const uploadOrganizationContent = async ({ customPath, config, sendInvites = fal
     const output = (0, contentAsCodeOutput_1.createContentAsCodeOutput)({
         operation: 'upload',
         scope: 'organization',
-        initialLabel: 'Custom roles',
     });
     try {
-        const { value: summary, durationMs: customRolesDurationMs } = await measureAction(() => (0, customRoles_1.uploadCustomRoles)(organizationUuid, organizationContentPath));
+        output.startItem('Custom roles');
+        const summary = await (0, customRoles_1.uploadCustomRoles)(organizationUuid, organizationContentPath);
         const summaryMessage = (0, customRoles_1.formatCustomRoleUploadSummary)(summary);
         if (summary.failed > 0) {
             summary.failures.forEach(({ message }) => globalState_1.default.log(styles.error(message)));
@@ -149,12 +128,9 @@ const uploadOrganizationContent = async ({ customPath, config, sendInvites = fal
             globalState_1.default.log(styles.warning(`Skipped users and ${skippedGroups} groups because custom roles failed`));
             throw createCustomRolePartialUploadError(`Processed custom roles: ${summaryMessage}`);
         }
-        output.completeItem({
-            label: 'Custom roles',
-            detail: summaryMessage,
-            durationMs: customRolesDurationMs,
-        }, 'Users');
-        const { value: userSummary, durationMs: usersDurationMs } = await measureAction(() => (0, users_1.uploadUsers)(organizationUuid, organizationContentPath, sendInvites));
+        output.completeItem(summaryMessage);
+        output.startItem('Users');
+        const userSummary = await (0, users_1.uploadUsers)(organizationUuid, organizationContentPath, sendInvites);
         const userSummaryMessage = (0, users_1.formatUserUploadSummary)(userSummary);
         if (userSummary.failed > 0) {
             userSummary.failures.forEach(({ message }) => globalState_1.default.log(styles.error(message)));
@@ -163,23 +139,16 @@ const uploadOrganizationContent = async ({ customPath, config, sendInvites = fal
             globalState_1.default.log(styles.warning(`Skipped ${skippedGroups} groups because users failed`));
             throw createUserPartialUploadError(`Processed users: ${userSummaryMessage}`);
         }
-        output.completeItem({
-            label: 'Users',
-            detail: userSummaryMessage,
-            durationMs: usersDurationMs,
-        }, 'Groups');
-        const { value: groupSummary, durationMs: groupsDurationMs } = await measureAction(() => (0, groups_1.uploadGroups)(organizationUuid, organizationContentPath));
+        output.completeItem(userSummaryMessage);
+        output.startItem('Groups');
+        const groupSummary = await (0, groups_1.uploadGroups)(organizationUuid, organizationContentPath);
         const groupSummaryMessage = (0, groups_1.formatGroupUploadSummary)(groupSummary);
         if (groupSummary.failed > 0) {
             groupSummary.failures.forEach(({ message }) => globalState_1.default.log(styles.error(message)));
             output.prepareForFailureDetails();
             throw createGroupPartialUploadError(`Processed groups: ${groupSummaryMessage}`);
         }
-        output.completeItem({
-            label: 'Groups',
-            detail: groupSummaryMessage,
-            durationMs: groupsDurationMs,
-        }, null);
+        output.completeItem(groupSummaryMessage);
         const renderedSummary = output.complete(organizationContentPath, (Date.now() - start) / 1000);
         if (!renderedSummary) {
             globalState_1.default.log(styles.success(`Uploaded organization content from ${organizationContentPath}`));

package/dist/handlers/organizationContent/index.test.js

@@ -28,6 +28,7 @@ describe('organization content download', () => {
     const spinner = {
         start: vi.fn(),
         succeed: vi.fn(),
+        warn: vi.fn(),
         stop: vi.fn(),
         fail: vi.fn(),
     };
@@ -55,7 +56,7 @@ describe('organization content download', () => {
             data: {},
         }));
         await expect((0, index_1.downloadOrganizationContent)({ config })).resolves.toBeUndefined();
-        expect(spinner.stop).toHaveBeenCalledOnce();
+        expect(spinner.warn).toHaveBeenCalledOnce();
         expect(spinner.fail).not.toHaveBeenCalled();
         expect(globalState_1.default.debug).toHaveBeenCalledWith('> Warning: groups were not downloaded because the group service is not enabled');
     });
@@ -74,6 +75,7 @@ describe('organization content upload sequencing', () => {
     const spinner = {
         start: vi.fn(),
         succeed: vi.fn(),
+        warn: vi.fn(),
         stop: vi.fn(),
         fail: vi.fn(),
     };

package/dist/terminal/contentAsCodeOutput.d.ts

@@ -14,25 +14,35 @@ export type ContentAsCodeOutputProps = {
 };
 type ContentAsCodeProgressProps = Pick<ContentAsCodeOutputProps, 'operation' | 'scope' | 'items'> & {
     activeLabel: string;
+    activeDetail?: string;
 };
 type ContentAsCodeFailureProps = Pick<ContentAsCodeOutputProps, 'operation' | 'scope' | 'elapsedSeconds' | 'items'> & {
     failedItem: Omit<ContentAsCodeOutputItem, 'variant'>;
 };
 export declare const formatDurationTag: (durationMs: number) => string;
 export declare const formatContentAsCodeAction: ({ label, detail, durationMs, }: Pick<ContentAsCodeOutputItem, "label" | "detail" | "durationMs">) => string;
-export declare const formatContentAsCodeProgress: ({ operation, scope, items, activeLabel, }: ContentAsCodeProgressProps) => string;
+export declare const formatContentAsCodeProgress: ({ operation, scope, items, activeLabel, activeDetail, }: ContentAsCodeProgressProps) => string;
 export declare const formatContentAsCodeFailure: ({ operation, scope, elapsedSeconds, items, failedItem, }: ContentAsCodeFailureProps) => string;
 export declare const formatContentAsCodeComplete: ({ operation, scope, path, elapsedSeconds, items, }: ContentAsCodeOutputProps) => string;
 export declare const canRenderContentAsCodeTree: () => boolean;
+export declare const logContentAsCodeDiscovery: (message: string) => void;
 export declare const renderContentAsCodeComplete: (props: ContentAsCodeOutputProps) => boolean;
-type CreateContentAsCodeOutputProps = Pick<ContentAsCodeOutputProps, 'operation' | 'scope'> & {
-    initialLabel: string;
+type CreateContentAsCodeOutputProps = Pick<ContentAsCodeOutputProps, 'operation' | 'scope'>;
+type RunContentAsCodeItemProps<T> = {
+    label: string;
+    action: () => Promise<T>;
+    detail: (value: T) => string;
+    variant?: (value: T) => ContentAsCodeOutputVariant | undefined;
 };
-export declare const createContentAsCodeOutput: ({ operation, scope, initialLabel, }: CreateContentAsCodeOutputProps) => {
-    completeItem: (item: ContentAsCodeOutputItem, nextLabel: string | null) => void;
+export declare const createContentAsCodeOutput: ({ operation, scope, }: CreateContentAsCodeOutputProps) => {
+    startItem: (label: string, detail?: string) => void;
+    updateActive: (detail: string) => void;
+    completeItem: (detail: string, variant?: ContentAsCodeOutputVariant) => void;
+    runItem: <T>({ label, action, detail, variant, }: RunContentAsCodeItemProps<T>) => Promise<T>;
     prepareForFailureDetails: () => void;
     complete: (path: string, elapsedSeconds: number) => boolean;
     fail: (detail: string, elapsedSeconds: number, showFallback: boolean) => void;
 };
+export type ContentAsCodeOutput = ReturnType<typeof createContentAsCodeOutput>;
 export {};
 //# sourceMappingURL=contentAsCodeOutput.d.ts.map

package/dist/terminal/contentAsCodeOutput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contentAsCodeOutput.d.ts","sourceRoot":"","sources":["../../src/terminal/contentAsCodeOutput.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,0BAA0B,GAAG,SAAS,GAAG,SAAS,CAAC;AAE/D,MAAM,MAAM,uBAAuB,GAAG;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,0BAA0B,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACnC,SAAS,EAAE,UAAU,GAAG,QAAQ,CAAC;IACjC,KAAK,EAAE,cAAc,GAAG,SAAS,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,uBAAuB,EAAE,CAAC;CACpC,CAAC;AAEF,KAAK,0BAA0B,GAAG,IAAI,CAClC,wBAAwB,EACxB,WAAW,GAAG,OAAO,GAAG,OAAO,CAClC,GAAG;IACA,WAAW,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,KAAK,yBAAyB,GAAG,IAAI,CACjC,wBAAwB,EACxB,WAAW,GAAG,OAAO,GAAG,gBAAgB,GAAG,OAAO,CACrD,GAAG;IACA,UAAU,EAAE,IAAI,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;CACxD,CAAC;AAkBF,eAAO,MAAM,iBAAiB,GAAI,YAAY,MAAM,WACR,CAAC;AAE7C,eAAO,MAAM,yBAAyB,GAAI,gCAIvC,IAAI,CAAC,uBAAuB,EAAE,OAAO,GAAG,QAAQ,GAAG,YAAY,CAAC,WAG3B,CAAC;AAczC,eAAO,MAAM,2BAA2B,GAAI,2CAKzC,0BAA0B,WAU5B,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,0DAMxC,yBAAyB,WAY3B,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,oDAMzC,wBAAwB,WAW1B,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,OAOzC,CAAC;AAEN,eAAO,MAAM,2BAA2B,GACpC,OAAO,wBAAwB,KAChC,OAOF,CAAC;AAEF,KAAK,8BAA8B,GAAG,IAAI,CACtC,wBAAwB,EACxB,WAAW,GAAG,OAAO,CACxB,GAAG;IACA,YAAY,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,qCAIvC,8BAA8B;yBAkCf,uBAAuB,aAClB,MAAM,GAAG,IAAI;;qBAmBX,MAAM,kBAAkB,MAAM,KAAG,OAAO;mBAc7C,MAAM,kBACE,MAAM,gBACR,OAAO;CAuBhC,CAAC"}
+{"version":3,"file":"contentAsCodeOutput.d.ts","sourceRoot":"","sources":["../../src/terminal/contentAsCodeOutput.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,0BAA0B,GAAG,SAAS,GAAG,SAAS,CAAC;AAE/D,MAAM,MAAM,uBAAuB,GAAG;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,0BAA0B,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACnC,SAAS,EAAE,UAAU,GAAG,QAAQ,CAAC;IACjC,KAAK,EAAE,cAAc,GAAG,SAAS,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,uBAAuB,EAAE,CAAC;CACpC,CAAC;AAEF,KAAK,0BAA0B,GAAG,IAAI,CAClC,wBAAwB,EACxB,WAAW,GAAG,OAAO,GAAG,OAAO,CAClC,GAAG;IACA,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,KAAK,yBAAyB,GAAG,IAAI,CACjC,wBAAwB,EACxB,WAAW,GAAG,OAAO,GAAG,gBAAgB,GAAG,OAAO,CACrD,GAAG;IACA,UAAU,EAAE,IAAI,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;CACxD,CAAC;AAkBF,eAAO,MAAM,iBAAiB,GAAI,YAAY,MAAM,WACR,CAAC;AAE7C,eAAO,MAAM,yBAAyB,GAAI,gCAIvC,IAAI,CAAC,uBAAuB,EAAE,OAAO,GAAG,QAAQ,GAAG,YAAY,CAAC,WAG3B,CAAC;AAczC,eAAO,MAAM,2BAA2B,GAAI,yDAMzC,0BAA0B,WAe5B,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,0DAMxC,yBAAyB,WAY3B,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,oDAMzC,wBAAwB,WAW1B,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,OAOzC,CAAC;AAEN,eAAO,MAAM,yBAAyB,GAAI,SAAS,MAAM,KAAG,IAM3D,CAAC;AAEF,eAAO,MAAM,2BAA2B,GACpC,OAAO,wBAAwB,KAChC,OAOF,CAAC;AAEF,KAAK,8BAA8B,GAAG,IAAI,CACtC,wBAAwB,EACxB,WAAW,GAAG,OAAO,CACxB,CAAC;AAEF,KAAK,yBAAyB,CAAC,CAAC,IAAI;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,CAAC;IAC7B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,0BAA0B,GAAG,SAAS,CAAC;CAClE,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,uBAGvC,8BAA8B;uBASH,MAAM,WAAW,MAAM;2BAwBnB,MAAM;2BAcxB,MAAM,YACJ,0BAA0B;cAkBjB,CAAC,uCAKrB,yBAAyB,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CAAC;;qBAiBvB,MAAM,kBAAkB,MAAM,KAAG,OAAO;mBAc7C,MAAM,kBACE,MAAM,gBACR,OAAO;CA0BhC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC"}

package/dist/terminal/contentAsCodeOutput.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createContentAsCodeOutput = exports.renderContentAsCodeComplete = exports.canRenderContentAsCodeTree = exports.formatContentAsCodeComplete = exports.formatContentAsCodeFailure = exports.formatContentAsCodeProgress = exports.formatContentAsCodeAction = exports.formatDurationTag = void 0;
+exports.createContentAsCodeOutput = exports.renderContentAsCodeComplete = exports.logContentAsCodeDiscovery = exports.canRenderContentAsCodeTree = exports.formatContentAsCodeComplete = exports.formatContentAsCodeFailure = exports.formatContentAsCodeProgress = exports.formatContentAsCodeAction = exports.formatDurationTag = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const globalState_1 = tslib_1.__importDefault(require("../globalState"));
@@ -21,10 +21,11 @@ const formatTreeItem = ({ label, detail, durationMs, variant = 'success', }) =>
     const status = variant === 'success' ? chalk_1.default.green('✓') : chalk_1.default.yellow('⚠');
     return `  ${TREE_CONNECTOR} ${status} ${chalk_1.default.bold(label)} ${chalk_1.default.gray(`· ${detail}`)} ${(0, exports.formatDurationTag)(durationMs)}`;
 };
-const formatContentAsCodeProgress = ({ operation, scope, items, activeLabel, }) => {
+const formatContentAsCodeProgress = ({ operation, scope, items, activeLabel, activeDetail, }) => {
     const header = `${chalk_1.default.bold(getOperationLabel(operation, 'running'))} content as code ${chalk_1.default.gray(`(${scope})`)}`;
     const completedItems = items.map(formatTreeItem);
-    const activeItem = `  ${TREE_CONNECTOR} ${chalk_1.default.yellow('◐')} ${chalk_1.default.bold(activeLabel)} ${chalk_1.default.gray(`· ${getOperationLabel(operation, 'running').toLowerCase()}…`)}`;
+    const activeItem = `  ${TREE_CONNECTOR} ${chalk_1.default.yellow('◐')} ${chalk_1.default.bold(activeLabel)} ${chalk_1.default.gray(`· ${activeDetail ??
+        `${getOperationLabel(operation, 'running').toLowerCase()}…`}`)}`;
     return [header, ...completedItems, activeItem].join('\n');
 };
 exports.formatContentAsCodeProgress = formatContentAsCodeProgress;
@@ -49,6 +50,15 @@ const canRenderContentAsCodeTree = () => Boolean(process.stderr.isTTY &&
     process.env.NO_UNICODE !== '1' &&
     process.env.NO_UNICODE !== 'true');
 exports.canRenderContentAsCodeTree = canRenderContentAsCodeTree;
+const logContentAsCodeDiscovery = (message) => {
+    if ((0, exports.canRenderContentAsCodeTree)()) {
+        globalState_1.default.debug(message);
+    }
+    else {
+        globalState_1.default.log(message);
+    }
+};
+exports.logContentAsCodeDiscovery = logContentAsCodeDiscovery;
 const renderContentAsCodeComplete = (props) => {
     if (!(0, exports.canRenderContentAsCodeTree)()) {
         return false;
@@ -57,52 +67,80 @@ const renderContentAsCodeComplete = (props) => {
     return true;
 };
 exports.renderContentAsCodeComplete = renderContentAsCodeComplete;
-const createContentAsCodeOutput = ({ operation, scope, initialLabel, }) => {
+const createContentAsCodeOutput = ({ operation, scope, }) => {
     const useTree = (0, exports.canRenderContentAsCodeTree)();
     const items = [];
-    let activeLabel = initialLabel;
+    let activeLabel = 'Content';
+    let activeDetail;
     let activeStartedAt = Date.now();
     const runningLabel = getOperationLabel(operation, 'running');
-    const spinner = globalState_1.default.startSpinner(useTree
-        ? (0, exports.formatContentAsCodeProgress)({
-            operation,
-            scope,
-            items,
-            activeLabel,
-        })
-        : `${runningLabel} ${activeLabel.toLowerCase()}`);
-    const setActive = (label) => {
+    let spinner;
+    const startItem = (label, detail) => {
         activeLabel = label;
+        activeDetail = detail;
         activeStartedAt = Date.now();
+        const text = useTree
+            ? (0, exports.formatContentAsCodeProgress)({
+                operation,
+                scope,
+                items,
+                activeLabel,
+                activeDetail,
+            })
+            : `${runningLabel} ${activeLabel.toLowerCase()}`;
+        if (!spinner) {
+            spinner = globalState_1.default.startSpinner(text);
+            return;
+        }
         if (useTree) {
+            spinner.text = text;
+        }
+        else {
+            spinner.start(text);
+        }
+    };
+    const updateActive = (detail) => {
+        activeDetail = detail;
+        if (useTree && spinner) {
             spinner.text = (0, exports.formatContentAsCodeProgress)({
                 operation,
                 scope,
                 items,
                 activeLabel,
+                activeDetail,
             });
         }
-        else {
-            spinner.start(`${runningLabel} ${activeLabel.toLowerCase()}`);
-        }
     };
-    return {
-        completeItem: (item, nextLabel) => {
-            items.push(item);
-            if (!useTree) {
-                if (item.variant === 'warning') {
-                    spinner.stop();
-                }
-                else {
-                    spinner.succeed((0, exports.formatContentAsCodeAction)(item));
-                }
+    const completeItem = (detail, variant) => {
+        const item = {
+            label: activeLabel,
+            detail,
+            durationMs: Date.now() - activeStartedAt,
+            variant,
+        };
+        items.push(item);
+        if (!useTree && spinner) {
+            if (item.variant === 'warning') {
+                spinner.warn((0, exports.formatContentAsCodeAction)(item));
             }
-            if (nextLabel !== null) {
-                setActive(nextLabel);
+            else {
+                spinner.succeed((0, exports.formatContentAsCodeAction)(item));
             }
-        },
+        }
+    };
+    const runItem = async ({ label, action, detail, variant, }) => {
+        startItem(label);
+        const value = await action();
+        completeItem(detail(value), variant?.(value));
+        return value;
+    };
+    return {
+        startItem,
+        updateActive,
+        completeItem,
+        runItem,
         prepareForFailureDetails: () => {
-            if (!useTree) {
+            if (!useTree && spinner) {
                 spinner.stop();
             }
         },
@@ -110,7 +148,7 @@ const createContentAsCodeOutput = ({ operation, scope, initialLabel, }) => {
             if (!useTree) {
                 return false;
             }
-            spinner.stop();
+            spinner?.stop();
             return (0, exports.renderContentAsCodeComplete)({
                 operation,
                 scope,
@@ -121,7 +159,7 @@ const createContentAsCodeOutput = ({ operation, scope, initialLabel, }) => {
         },
         fail: (detail, elapsedSeconds, showFallback) => {
             if (useTree) {
-                spinner.fail((0, exports.formatContentAsCodeFailure)({
+                const failure = (0, exports.formatContentAsCodeFailure)({
                     operation,
                     scope,
                     elapsedSeconds,
@@ -131,10 +169,20 @@ const createContentAsCodeOutput = ({ operation, scope, initialLabel, }) => {
                         detail,
                         durationMs: Date.now() - activeStartedAt,
                     },
-                }));
+                });
+                if (spinner) {
+                    spinner.fail(failure);
+                }
+                else {
+                    process.stderr.write(`${failure}\n`);
+                }
             }
             else if (showFallback) {
-                spinner.fail(`Failed to ${operation} ${scope} content: ${detail}`);
+                const failure = `Failed to ${operation} ${scope} content: ${detail}`;
+                if (spinner)
+                    spinner.fail(failure);
+                else
+                    process.stderr.write(`${failure}\n`);
             }
         },
     };

package/dist/terminal/contentAsCodeOutput.test.js

@@ -98,6 +98,7 @@ describe('content as code terminal output', () => {
             text: '',
             start: vi.fn(),
             succeed: vi.fn(),
+            warn: vi.fn(),
             stop: vi.fn(),
             fail: vi.fn(),
         };
@@ -108,13 +109,10 @@ describe('content as code terminal output', () => {
         const output = (0, contentAsCodeOutput_1.createContentAsCodeOutput)({
             operation: 'download',
             scope: 'organization',
-            initialLabel: 'Custom roles',
         });
-        output.completeItem({
-            label: 'Custom roles',
-            detail: '34 downloaded',
-            durationMs: 85,
-        }, 'Users');
+        output.startItem('Custom roles');
+        output.completeItem('34 downloaded');
+        output.startItem('Users');
         expect(spinner.succeed).not.toHaveBeenCalled();
         expect(spinner.text).toContain('└ ◐ Users · downloading…');
         expect(output.complete('/tmp/lightdash', 0.6)).toBe(true);
@@ -127,4 +125,64 @@ describe('content as code terminal output', () => {
         vi.unstubAllEnvs();
         vi.restoreAllMocks();
     });
+    it('updates the active tree item with resource progress', () => {
+        const originalIsTTY = process.stderr.isTTY;
+        Object.defineProperty(process.stderr, 'isTTY', {
+            configurable: true,
+            value: true,
+        });
+        vi.stubEnv('CI', 'false');
+        vi.stubEnv('TERM', 'xterm');
+        vi.stubEnv('NO_UNICODE', 'false');
+        const spinner = {
+            text: '',
+            start: vi.fn(),
+            succeed: vi.fn(),
+            warn: vi.fn(),
+            stop: vi.fn(),
+            fail: vi.fn(),
+        };
+        vi.spyOn(globalState_1.default, 'startSpinner').mockReturnValue(spinner);
+        const output = (0, contentAsCodeOutput_1.createContentAsCodeOutput)({
+            operation: 'download',
+            scope: 'project',
+        });
+        output.startItem('Charts');
+        output.updateActive('25 of 100 downloaded');
+        expect(spinner.text).toContain('└ ◐ Charts · 25 of 100 downloaded');
+        Object.defineProperty(process.stderr, 'isTTY', {
+            configurable: true,
+            value: originalIsTTY,
+        });
+        vi.unstubAllEnvs();
+        vi.restoreAllMocks();
+    });
+    it('hides routine discovery in tree mode unless verbose output is enabled', () => {
+        const originalIsTTY = process.stderr.isTTY;
+        Object.defineProperty(process.stderr, 'isTTY', {
+            configurable: true,
+            value: true,
+        });
+        vi.stubEnv('CI', 'false');
+        vi.stubEnv('TERM', 'xterm');
+        vi.stubEnv('NO_UNICODE', 'false');
+        const debug = vi
+            .spyOn(globalState_1.default, 'debug')
+            .mockImplementation(() => undefined);
+        const log = vi
+            .spyOn(globalState_1.default, 'log')
+            .mockImplementation(() => undefined);
+        (0, contentAsCodeOutput_1.logContentAsCodeDiscovery)('Found 3 chart files');
+        expect(debug).toHaveBeenCalledWith('Found 3 chart files');
+        expect(log).not.toHaveBeenCalled();
+        vi.stubEnv('CI', 'true');
+        (0, contentAsCodeOutput_1.logContentAsCodeDiscovery)('Found 3 chart files');
+        expect(log).toHaveBeenCalledWith('Found 3 chart files');
+        Object.defineProperty(process.stderr, 'isTTY', {
+            configurable: true,
+            value: originalIsTTY,
+        });
+        vi.unstubAllEnvs();
+        vi.restoreAllMocks();
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/cli",
-  "version": "0.3422.1",
+  "version": "0.3423.0",
   "description": "Lightdash CLI tool",
   "license": "MIT",
   "repository": {
@@ -41,8 +41,8 @@
     "unique-names-generator": "4.7.1",
     "uuid": "11.1.1",
     "yaml": "2.8.3",
-    "@lightdash/common": "0.3422.1",
-    "@lightdash/warehouses": "0.3422.1"
+    "@lightdash/common": "0.3423.0",
+    "@lightdash/warehouses": "0.3423.0"
   },
   "devDependencies": {
     "@types/inquirer": "8.2.4",