@lightdash/cli 0.3408.1 → 0.3409.1

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;AAyB3C,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,CAqF3C,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAU,sCAI7C,0BAA0B,KAAG,OAAO,CAAC,IAAI,CAkI3C,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;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"}

package/dist/handlers/organizationContent/index.js

@@ -6,6 +6,7 @@ const common_1 = require("@lightdash/common");
 const analytics_1 = require("../../analytics/analytics");
 const globalState_1 = tslib_1.__importDefault(require("../../globalState"));
 const styles = tslib_1.__importStar(require("../../styles"));
+const contentAsCodeOutput_1 = require("../../terminal/contentAsCodeOutput");
 const registry_1 = require("../contentAsCode/registry");
 const resource_1 = require("../contentAsCode/resource");
 const contentAsCodePaths_1 = require("../contentAsCodePaths");
@@ -19,6 +20,12 @@ 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, }) => {
@@ -36,27 +43,53 @@ const downloadOrganizationContent = async ({ customPath, config, }) => {
             scope: 'organization',
         },
     });
-    const spinner = globalState_1.default.startSpinner(`Downloading custom roles`);
+    const output = (0, contentAsCodeOutput_1.createContentAsCodeOutput)({
+        operation: 'download',
+        scope: 'organization',
+        initialLabel: 'Custom roles',
+    });
     try {
-        const customRolesTotal = await (0, customRoles_1.downloadCustomRoles)(organizationUuid, organizationContentPath);
-        spinner.succeed(`Downloaded ${customRolesTotal} custom roles`);
-        spinner.start(`Downloading users`);
-        const usersTotal = await (0, users_1.downloadUsers)(organizationUuid, organizationContentPath);
-        spinner.succeed(`Downloaded ${usersTotal} users`);
-        spinner.start(`Downloading groups`);
+        const { value: customRolesTotal, durationMs: customRolesDurationMs } = await measureAction(() => (0, customRoles_1.downloadCustomRoles)(organizationUuid, organizationContentPath));
+        output.completeItem({
+            label: 'Custom roles',
+            detail: `${customRolesTotal} downloaded`,
+            durationMs: customRolesDurationMs,
+        }, 'Users');
+        const { value: usersTotal, durationMs: usersDurationMs } = await measureAction(() => (0, users_1.downloadUsers)(organizationUuid, organizationContentPath));
+        output.completeItem({
+            label: 'Users',
+            detail: `${usersTotal} downloaded`,
+            durationMs: usersDurationMs,
+        }, 'Groups');
+        const groupsStartedAt = Date.now();
         let groupsTotal = 0;
+        let groupsDurationMs;
         try {
             groupsTotal = await (0, groups_1.downloadGroups)(organizationUuid, organizationContentPath);
-            spinner.succeed(`Downloaded ${groupsTotal} groups`);
+            groupsDurationMs = getElapsedMilliseconds(groupsStartedAt);
+            output.completeItem({
+                label: 'Groups',
+                detail: `${groupsTotal} downloaded`,
+                durationMs: groupsDurationMs,
+            }, null);
         }
         catch (error) {
+            groupsDurationMs = getElapsedMilliseconds(groupsStartedAt);
             if (!isGroupServiceDisabledError(error)) {
                 throw error;
             }
-            spinner.stop();
+            output.completeItem({
+                label: 'Groups',
+                detail: 'service unavailable',
+                durationMs: groupsDurationMs,
+                variant: 'warning',
+            }, null);
             globalState_1.default.debug('> Warning: groups were not downloaded because the group service is not enabled');
         }
-        globalState_1.default.log(styles.success(`Downloaded organization content saved to ${organizationContentPath}`));
+        const renderedSummary = output.complete(organizationContentPath, (Date.now() - start) / 1000);
+        if (!renderedSummary) {
+            globalState_1.default.log(styles.success(`Downloaded organization content saved to ${organizationContentPath}`));
+        }
         await analytics_1.LightdashAnalytics.track({
             event: 'download.completed',
             properties: {
@@ -71,7 +104,7 @@ const downloadOrganizationContent = async ({ customPath, config, }) => {
         });
     }
     catch (error) {
-        spinner.fail(`Failed to download organization content: ${(0, common_1.getErrorMessage)(error)}`);
+        output.fail((0, common_1.getErrorMessage)(error), (Date.now() - start) / 1000, true);
         await analytics_1.LightdashAnalytics.track({
             event: 'download.error',
             properties: {
@@ -101,39 +134,56 @@ const uploadOrganizationContent = async ({ customPath, config, sendInvites = fal
             scope: 'organization',
         },
     });
-    const spinner = globalState_1.default.startSpinner(`Uploading custom roles`);
+    const output = (0, contentAsCodeOutput_1.createContentAsCodeOutput)({
+        operation: 'upload',
+        scope: 'organization',
+        initialLabel: 'Custom roles',
+    });
     try {
-        const summary = await (0, customRoles_1.uploadCustomRoles)(organizationUuid, organizationContentPath);
+        const { value: summary, durationMs: customRolesDurationMs } = await measureAction(() => (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)));
-            spinner.stop();
+            output.prepareForFailureDetails();
             const skippedGroups = await (0, groups_1.countDependencySkippedGroups)(organizationContentPath);
             globalState_1.default.log(styles.warning(`Skipped users and ${skippedGroups} groups because custom roles failed`));
             throw createCustomRolePartialUploadError(`Processed custom roles: ${summaryMessage}`);
         }
-        spinner.succeed(`Uploaded custom roles: ${summaryMessage}`);
-        spinner.start(`Uploading users`);
-        const userSummary = await (0, users_1.uploadUsers)(organizationUuid, organizationContentPath, sendInvites);
+        output.completeItem({
+            label: 'Custom roles',
+            detail: summaryMessage,
+            durationMs: customRolesDurationMs,
+        }, 'Users');
+        const { value: userSummary, durationMs: usersDurationMs } = await measureAction(() => (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)));
-            spinner.stop();
+            output.prepareForFailureDetails();
             const skippedGroups = await (0, groups_1.countDependencySkippedGroups)(organizationContentPath);
             globalState_1.default.log(styles.warning(`Skipped ${skippedGroups} groups because users failed`));
             throw createUserPartialUploadError(`Processed users: ${userSummaryMessage}`);
         }
-        spinner.succeed(`Uploaded users: ${userSummaryMessage}`);
-        spinner.start(`Uploading groups`);
-        const groupSummary = await (0, groups_1.uploadGroups)(organizationUuid, organizationContentPath);
+        output.completeItem({
+            label: 'Users',
+            detail: userSummaryMessage,
+            durationMs: usersDurationMs,
+        }, 'Groups');
+        const { value: groupSummary, durationMs: groupsDurationMs } = await measureAction(() => (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)));
-            spinner.stop();
+            output.prepareForFailureDetails();
             throw createGroupPartialUploadError(`Processed groups: ${groupSummaryMessage}`);
         }
-        spinner.succeed(`Uploaded groups: ${groupSummaryMessage}`);
-        globalState_1.default.log(styles.success(`Uploaded organization content from ${organizationContentPath}`));
+        output.completeItem({
+            label: 'Groups',
+            detail: groupSummaryMessage,
+            durationMs: groupsDurationMs,
+        }, null);
+        const renderedSummary = output.complete(organizationContentPath, (Date.now() - start) / 1000);
+        if (!renderedSummary) {
+            globalState_1.default.log(styles.success(`Uploaded organization content from ${organizationContentPath}`));
+        }
         await analytics_1.LightdashAnalytics.track({
             event: 'upload.completed',
             properties: {
@@ -156,9 +206,7 @@ const uploadOrganizationContent = async ({ customPath, config, sendInvites = fal
         });
     }
     catch (error) {
-        if (!isPartialUploadError(error)) {
-            spinner.fail(`Failed to upload organization content: ${(0, common_1.getErrorMessage)(error)}`);
-        }
+        output.fail((0, common_1.getErrorMessage)(error), (Date.now() - start) / 1000, !isPartialUploadError(error));
         await analytics_1.LightdashAnalytics.track({
             event: 'upload.error',
             properties: {

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

@@ -59,6 +59,11 @@ describe('organization content download', () => {
         expect(spinner.fail).not.toHaveBeenCalled();
         expect(globalState_1.default.debug).toHaveBeenCalledWith('> Warning: groups were not downloaded because the group service is not enabled');
     });
+    it('reports a duration for every downloaded resource', async () => {
+        await (0, index_1.downloadOrganizationContent)({ config });
+        expect(spinner.succeed).toHaveBeenCalledTimes(3);
+        spinner.succeed.mock.calls.forEach(([message]) => expect(message).toMatch(/\(\d+ms\)$/));
+    });
     it('still fails for other group download errors', async () => {
         vi.mocked(groups_1.downloadGroups).mockRejectedValue(new Error('Network error'));
         await expect((0, index_1.downloadOrganizationContent)({ config })).rejects.toThrow('Network error');
@@ -139,6 +144,11 @@ describe('organization content upload sequencing', () => {
             'groups:end',
         ]);
     });
+    it('reports a duration for every uploaded resource', async () => {
+        await (0, index_1.uploadOrganizationContent)({ config });
+        expect(spinner.succeed).toHaveBeenCalledTimes(3);
+        spinner.succeed.mock.calls.forEach(([message]) => expect(message).toMatch(/\(\d+ms\)$/));
+    });
     it('does not start users or groups when custom roles fail', async () => {
         vi.mocked(customRoles_1.uploadCustomRoles).mockResolvedValue(customRoleSummary(1));
         await expect((0, index_1.uploadOrganizationContent)({ config })).rejects.toThrow('Processed custom roles');

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

@@ -1 +1 @@
-{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../../src/handlers/organizationContent/users.ts"],"names":[],"mappings":"AACA,OAAO,EAUH,KAAK,UAAU,EAClB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAIH,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC9B,MAAM,2BAA2B,CAAC;AAGnC,MAAM,MAAM,iBAAiB,GAAG,eAAe,CAAC;AAEhD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,sBAAsB,CAAC,UAAU,CAkBjE,CAAC;AAIF,eAAO,MAAM,cAAc,GAAI,yBAAyB,MAAM,KAAG,MACI,CAAC;AAEtE,eAAO,MAAM,uBAAuB,GAAI,SAAS,iBAAiB,KAAG,MAiBpE,CAAC;AAEF,eAAO,MAAM,aAAa,GACtB,yBAAyB,MAAM,KAChC,OAAO,CAAC,OAAO,EAAE,CAOnB,CAAC;AAkCF,eAAO,MAAM,WAAW,GACpB,kBAAkB,MAAM,EACxB,yBAAyB,MAAM,EAC/B,cAAa,OAAe,KAC7B,OAAO,CAAC,iBAAiB,CAgG3B,CAAC;AAEF,eAAO,MAAM,aAAa,GACtB,kBAAkB,MAAM,EACxB,yBAAyB,MAAM,KAChC,OAAO,CAAC,MAAM,CAcX,CAAC"}
+{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../../src/handlers/organizationContent/users.ts"],"names":[],"mappings":"AACA,OAAO,EAUH,KAAK,UAAU,EAClB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAIH,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC9B,MAAM,2BAA2B,CAAC;AAGnC,MAAM,MAAM,iBAAiB,GAAG,eAAe,CAAC;AAEhD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,sBAAsB,CAAC,UAAU,CAkBjE,CAAC;AAIF,eAAO,MAAM,cAAc,GAAI,yBAAyB,MAAM,KAAG,MACI,CAAC;AAEtE,eAAO,MAAM,uBAAuB,GAAI,SAAS,iBAAiB,KAAG,MAMrD,CAAC;AAEjB,eAAO,MAAM,aAAa,GACtB,yBAAyB,MAAM,KAChC,OAAO,CAAC,OAAO,EAAE,CAOnB,CAAC;AAkCF,eAAO,MAAM,WAAW,GACpB,kBAAkB,MAAM,EACxB,yBAAyB,MAAM,EAC/B,cAAa,OAAe,KAC7B,OAAO,CAAC,iBAAiB,CAgG3B,CAAC;AAEF,eAAO,MAAM,aAAa,GACtB,kBAAkB,MAAM,EACxB,yBAAyB,MAAM,KAChC,OAAO,CAAC,MAAM,CAcX,CAAC"}

package/dist/handlers/organizationContent/users.js

@@ -28,22 +28,12 @@ exports.USER_CODE_RESOURCE = {
 };
 const getUsersFolder = (organizationContentPath) => path.join(organizationContentPath, exports.USER_CODE_RESOURCE.folderName);
 exports.getUsersFolder = getUsersFolder;
-const formatUserUploadSummary = (summary) => {
-    const invitationSummary = [
-        `${summary.invited} invited`,
-        `${summary.skippedAuthenticated +
-            summary.skippedDisabled +
-            summary.skippedValidInvite} invitation-skipped`,
-    ];
-    return [
-        `${summary.created} created`,
-        `${summary.updated} updated`,
-        `${summary.unchanged} unchanged`,
-        `${summary.awaitingAuthentication} awaiting authentication`,
-        invitationSummary.join(', '),
-        `${summary.failed} failed`,
-    ].join(', ');
-};
+const formatUserUploadSummary = (summary) => [
+    `${summary.created} created`,
+    `${summary.updated} updated`,
+    `${summary.unchanged} unchanged`,
+    `${summary.failed} failed`,
+].join(', ');
 exports.formatUserUploadSummary = formatUserUploadSummary;
 const readUserFiles = async (organizationContentPath) => {
     const result = await (0, resource_1.readCodeResourceFiles)({

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

@@ -35,6 +35,20 @@ describe('users as code', () => {
         vitest_1.vi.restoreAllMocks();
         await fs_1.promises.rm(tmpDir, { recursive: true, force: true });
     });
+    it('formats upload results using CRUD statuses only', () => {
+        expect((0, users_1.formatUserUploadSummary)({
+            created: 1,
+            updated: 2,
+            unchanged: 3,
+            awaitingAuthentication: 4,
+            invited: 5,
+            skippedAuthenticated: 6,
+            skippedDisabled: 7,
+            skippedValidInvite: 8,
+            failed: 9,
+            failures: [],
+        })).toBe('1 created, 2 updated, 3 unchanged, 9 failed');
+    });
     it('downloads deterministic portable users and preserves unknown YAML', async () => {
         const folder = (0, users_1.getUsersFolder)(tmpDir);
         await fs_1.promises.mkdir(folder, { recursive: true });

package/dist/terminal/contentAsCodeOutput.d.ts

@@ -0,0 +1,38 @@
+export type ContentAsCodeOutputVariant = 'success' | 'warning';
+export type ContentAsCodeOutputItem = {
+    label: string;
+    detail: string;
+    durationMs: number;
+    variant?: ContentAsCodeOutputVariant;
+};
+export type ContentAsCodeOutputProps = {
+    operation: 'download' | 'upload';
+    scope: 'organization' | 'project';
+    path: string;
+    elapsedSeconds: number;
+    items: ContentAsCodeOutputItem[];
+};
+type ContentAsCodeProgressProps = Pick<ContentAsCodeOutputProps, 'operation' | 'scope' | 'items'> & {
+    activeLabel: 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 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 renderContentAsCodeComplete: (props: ContentAsCodeOutputProps) => boolean;
+type CreateContentAsCodeOutputProps = Pick<ContentAsCodeOutputProps, 'operation' | 'scope'> & {
+    initialLabel: string;
+};
+export declare const createContentAsCodeOutput: ({ operation, scope, initialLabel, }: CreateContentAsCodeOutputProps) => {
+    completeItem: (item: ContentAsCodeOutputItem, nextLabel: string | null) => void;
+    prepareForFailureDetails: () => void;
+    complete: (path: string, elapsedSeconds: number) => boolean;
+    fail: (detail: string, elapsedSeconds: number, showFallback: boolean) => void;
+};
+export {};
+//# sourceMappingURL=contentAsCodeOutput.d.ts.map

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

@@ -0,0 +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"}

package/dist/terminal/contentAsCodeOutput.js

@@ -0,0 +1,142 @@
+"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;
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const globalState_1 = tslib_1.__importDefault(require("../globalState"));
+const ACTION_LABEL_WIDTH = 14;
+const TREE_CONNECTOR = chalk_1.default.gray('└');
+const getDurationLabel = (durationMs) => `(${Math.round(durationMs)}ms)`;
+const getOperationLabel = (operation, tense) => {
+    if (operation === 'download') {
+        return tense === 'running' ? 'Downloading' : 'Downloaded';
+    }
+    return tense === 'running' ? 'Uploading' : 'Uploaded';
+};
+const formatDurationTag = (durationMs) => chalk_1.default.gray(getDurationLabel(durationMs));
+exports.formatDurationTag = formatDurationTag;
+const formatContentAsCodeAction = ({ label, detail, durationMs, }) => `${chalk_1.default.bold(label.padEnd(ACTION_LABEL_WIDTH))} ${chalk_1.default.gray(detail)} ${(0, exports.formatDurationTag)(durationMs)}`;
+exports.formatContentAsCodeAction = formatContentAsCodeAction;
+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 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()}…`)}`;
+    return [header, ...completedItems, activeItem].join('\n');
+};
+exports.formatContentAsCodeProgress = formatContentAsCodeProgress;
+const formatContentAsCodeFailure = ({ operation, scope, elapsedSeconds, items, failedItem, }) => {
+    const operationLabel = operation === 'download' ? 'download' : 'upload';
+    const header = `${chalk_1.default.bold(`Failed to ${operationLabel}`)} content as code ${chalk_1.default.gray(`(${scope}) · ${elapsedSeconds.toFixed(1)}s`)}`;
+    const failed = `  ${TREE_CONNECTOR} ${chalk_1.default.red('×')} ${chalk_1.default.bold(failedItem.label)} ${chalk_1.default.red(`· ${failedItem.detail}`)} ${chalk_1.default.red(getDurationLabel(failedItem.durationMs))}`;
+    return [header, ...items.map(formatTreeItem), failed].join('\n');
+};
+exports.formatContentAsCodeFailure = formatContentAsCodeFailure;
+const formatContentAsCodeComplete = ({ operation, scope, path, elapsedSeconds, items, }) => {
+    const operationLabel = getOperationLabel(operation, 'complete');
+    const pathLabel = operation === 'download' ? 'Saved to' : 'Read from';
+    const header = `${chalk_1.default.green('✓')} ${chalk_1.default.bold(operationLabel)} content as code ${chalk_1.default.gray(`(${scope}) · ${elapsedSeconds.toFixed(1)}s`)}`;
+    const pathItem = `  ${TREE_CONNECTOR} ${chalk_1.default.gray(pathLabel)} ${chalk_1.default.bold(path)}`;
+    return [header, ...items.map(formatTreeItem), pathItem].join('\n');
+};
+exports.formatContentAsCodeComplete = formatContentAsCodeComplete;
+const canRenderContentAsCodeTree = () => Boolean(process.stderr.isTTY &&
+    process.env.CI !== 'true' &&
+    process.env.TERM !== 'dumb' &&
+    process.env.NO_UNICODE !== '1' &&
+    process.env.NO_UNICODE !== 'true');
+exports.canRenderContentAsCodeTree = canRenderContentAsCodeTree;
+const renderContentAsCodeComplete = (props) => {
+    if (!(0, exports.canRenderContentAsCodeTree)()) {
+        return false;
+    }
+    process.stderr.write(`${(0, exports.formatContentAsCodeComplete)(props)}\n`);
+    return true;
+};
+exports.renderContentAsCodeComplete = renderContentAsCodeComplete;
+const createContentAsCodeOutput = ({ operation, scope, initialLabel, }) => {
+    const useTree = (0, exports.canRenderContentAsCodeTree)();
+    const items = [];
+    let activeLabel = initialLabel;
+    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) => {
+        activeLabel = label;
+        activeStartedAt = Date.now();
+        if (useTree) {
+            spinner.text = (0, exports.formatContentAsCodeProgress)({
+                operation,
+                scope,
+                items,
+                activeLabel,
+            });
+        }
+        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));
+                }
+            }
+            if (nextLabel !== null) {
+                setActive(nextLabel);
+            }
+        },
+        prepareForFailureDetails: () => {
+            if (!useTree) {
+                spinner.stop();
+            }
+        },
+        complete: (path, elapsedSeconds) => {
+            if (!useTree) {
+                return false;
+            }
+            spinner.stop();
+            return (0, exports.renderContentAsCodeComplete)({
+                operation,
+                scope,
+                path,
+                elapsedSeconds,
+                items,
+            });
+        },
+        fail: (detail, elapsedSeconds, showFallback) => {
+            if (useTree) {
+                spinner.fail((0, exports.formatContentAsCodeFailure)({
+                    operation,
+                    scope,
+                    elapsedSeconds,
+                    items,
+                    failedItem: {
+                        label: activeLabel,
+                        detail,
+                        durationMs: Date.now() - activeStartedAt,
+                    },
+                }));
+            }
+            else if (showFallback) {
+                spinner.fail(`Failed to ${operation} ${scope} content: ${detail}`);
+            }
+        },
+    };
+};
+exports.createContentAsCodeOutput = createContentAsCodeOutput;

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=contentAsCodeOutput.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"contentAsCodeOutput.test.d.ts","sourceRoot":"","sources":["../../src/terminal/contentAsCodeOutput.test.ts"],"names":[],"mappings":""}

package/dist/terminal/contentAsCodeOutput.test.js

@@ -0,0 +1,130 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const globalState_1 = tslib_1.__importDefault(require("../globalState"));
+const contentAsCodeOutput_1 = require("./contentAsCodeOutput");
+describe('content as code terminal output', () => {
+    it('formats fallback actions with aligned labels and muted metadata', () => {
+        const output = (0, contentAsCodeOutput_1.formatContentAsCodeAction)({
+            label: 'Custom roles',
+            detail: '34 downloaded',
+            durationMs: 245,
+        });
+        expect(output).toContain('Custom roles   34 downloaded (245ms)');
+    });
+    it('formats running progress as a tree', () => {
+        const output = (0, contentAsCodeOutput_1.formatContentAsCodeProgress)({
+            operation: 'download',
+            scope: 'organization',
+            activeLabel: 'Groups',
+            items: [
+                {
+                    label: 'Custom roles',
+                    detail: '34 downloaded',
+                    durationMs: 85,
+                },
+                {
+                    label: 'Users',
+                    detail: '9 downloaded',
+                    durationMs: 107,
+                },
+            ],
+        });
+        expect(output).toContain('Downloading content as code (organization)');
+        expect(output).toContain('└ ✓ Custom roles · 34 downloaded (85ms)');
+        expect(output).toContain('└ ✓ Users · 9 downloaded (107ms)');
+        expect(output).toContain('└ ◐ Groups · downloading…');
+    });
+    it('renders one borderless completion tree', () => {
+        const output = (0, contentAsCodeOutput_1.formatContentAsCodeComplete)({
+            operation: 'upload',
+            scope: 'organization',
+            path: '/tmp/lightdash',
+            elapsedSeconds: 1.2,
+            items: [
+                {
+                    label: 'Custom roles',
+                    detail: '1 created, 2 unchanged',
+                    durationMs: 245,
+                },
+                { label: 'Users', detail: '4 updated', durationMs: 31 },
+                {
+                    label: 'Groups',
+                    detail: 'service unavailable',
+                    durationMs: 12,
+                    variant: 'warning',
+                },
+            ],
+        });
+        expect(output).toContain('✓ Uploaded content as code (organization) · 1.2s');
+        expect(output).toContain('└ ✓ Custom roles');
+        expect(output).toContain('(245ms)');
+        expect(output).toContain('└ ⚠ Groups');
+        expect(output).toContain('└ Read from /tmp/lightdash');
+        expect(output).not.toMatch(/[╭╮╰╯│─]/);
+    });
+    it('formats failures with completed and failed tree rows', () => {
+        const output = (0, contentAsCodeOutput_1.formatContentAsCodeFailure)({
+            operation: 'download',
+            scope: 'organization',
+            elapsedSeconds: 0.4,
+            items: [
+                {
+                    label: 'Custom roles',
+                    detail: '34 downloaded',
+                    durationMs: 85,
+                },
+            ],
+            failedItem: {
+                label: 'Users',
+                detail: '403 forbidden',
+                durationMs: 52,
+            },
+        });
+        expect(output).toContain('Failed to download content as code (organization) · 0.4s');
+        expect(output).toContain('└ ✓ Custom roles · 34 downloaded (85ms)');
+        expect(output).toContain('└ × Users · 403 forbidden (52ms)');
+    });
+    it('replaces running progress with one persistent completion tree', () => {
+        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(),
+            stop: vi.fn(),
+            fail: vi.fn(),
+        };
+        vi.spyOn(globalState_1.default, 'startSpinner').mockReturnValue(spinner);
+        const write = vi
+            .spyOn(process.stderr, 'write')
+            .mockImplementation(() => true);
+        const output = (0, contentAsCodeOutput_1.createContentAsCodeOutput)({
+            operation: 'download',
+            scope: 'organization',
+            initialLabel: 'Custom roles',
+        });
+        output.completeItem({
+            label: 'Custom roles',
+            detail: '34 downloaded',
+            durationMs: 85,
+        }, 'Users');
+        expect(spinner.succeed).not.toHaveBeenCalled();
+        expect(spinner.text).toContain('└ ◐ Users · downloading…');
+        expect(output.complete('/tmp/lightdash', 0.6)).toBe(true);
+        expect(spinner.stop).toHaveBeenCalledOnce();
+        expect(write).toHaveBeenCalledOnce();
+        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.3408.1",
+  "version": "0.3409.1",
   "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.3408.1",
-    "@lightdash/warehouses": "0.3408.1"
+    "@lightdash/common": "0.3409.1",
+    "@lightdash/warehouses": "0.3409.1"
   },
   "devDependencies": {
     "@types/inquirer": "8.2.4",