@lightdash/cli 1.260.1 → 1.261.0

package/dist/handlers/download.js

@@ -33,7 +33,7 @@ const selectProject_1 = require("./selectProject");
 const spacesAsCode_1 = require("./spacesAsCode");
 const shouldDownloadAiAgents = ({ includeAll, includeAgents, agents, appsOnly, }) => appsOnly !== true &&
     (includeAll === true || includeAgents === true || agents.length > 0);
-const hasContentFilters = ({ spacesOnly, charts, dashboards, agents, alerts, googleSheets, scheduledDeliveries, virtualViews, externalConnections, apps, }) => !spacesOnly &&
+const hasContentFilters = ({ spacesOnly, charts, dashboards, agents, alerts, googleSheets, scheduledDeliveries, virtualViews, externalConnections, apps, chartTypes, }) => !spacesOnly &&
     [
         charts,
         dashboards,
@@ -44,6 +44,7 @@ const hasContentFilters = ({ spacesOnly, charts, dashboards, agents, alerts, goo
         virtualViews,
         externalConnections,
         apps ?? [],
+        chartTypes ?? [],
     ].some((filters) => filters.length > 0);
 /*
     This function is used to parse the content filters.
@@ -937,6 +938,9 @@ const listAppsViaContentApi = async (projectId) => {
 const downloadHandler = async (options) => {
     globalState_1.default.setVerbose(options.verbose);
     const isOrganizationDownload = options.organization === true;
+    if (options.appsOnly && options.chartTypesOnly) {
+        throw new common_1.ParameterError('--apps-only cannot be combined with --chart-types-only.');
+    }
     // Bare --apps-only means "all apps": imply --include-apps.
     if (options.appsOnly &&
         options.apps === undefined &&
@@ -944,13 +948,36 @@ const downloadHandler = async (options) => {
         options.includeAll !== true) {
         options.includeApps = true;
     }
+    // Bare --chart-types-only means "all chart types" likewise.
+    if (options.chartTypesOnly &&
+        options.chartTypes === undefined &&
+        options.includeChartTypes !== true &&
+        options.includeAll !== true) {
+        options.includeChartTypes = true;
+    }
     const includeAll = options.includeAll === true;
-    const includeApps = !options.spacesOnly && (options.includeApps === true || includeAll);
-    const includeAllOptionalContent = includeAll && !options.appsOnly && !options.spacesOnly;
+    const includeApps = !options.spacesOnly &&
+        !options.chartTypesOnly &&
+        (options.includeApps === true || includeAll);
+    const includeChartTypes = !options.spacesOnly &&
+        !options.appsOnly &&
+        (options.includeChartTypes === true || includeAll);
+    const includeAllOptionalContent = includeAll &&
+        !options.appsOnly &&
+        !options.chartTypesOnly &&
+        !options.spacesOnly;
     const { limit: appsLimit, noEffectWarning: appsLimitWarning } = (0, appsDownload_1.resolveAppsLimit)(options.appsLimit, includeApps);
     if (appsLimitWarning) {
         globalState_1.default.log(styles.warning(appsLimitWarning));
     }
+    const { limit: chartTypesLimit, noEffectWarning: chartTypesLimitWarning } = (0, appsDownload_1.resolveAppsLimit)(options.chartTypesLimit, includeChartTypes, {
+        limitFlag: '--chart-types-limit',
+        includeFlag: '--include-chart-types',
+        refsFlag: '--chart-types',
+    });
+    if (chartTypesLimitWarning) {
+        globalState_1.default.log(styles.warning(chartTypesLimitWarning));
+    }
     if (options.appsOnly) {
         const appsOnlySelection = (0, appsDownload_1.selectAppsToDownload)({
             apps: Array.isArray(options.apps) ? options.apps : undefined,
@@ -959,6 +986,28 @@ const downloadHandler = async (options) => {
         if (appsOnlySelection.mode === 'none') {
             throw new common_1.ParameterError('Nothing to download: --apps-only requires --apps <appReferences...>, --include-apps, or --include-all.');
         }
+        options.chartTypes = undefined;
+        options.skipCharts = true;
+        options.skipDashboards = true;
+        options.skipSpaces = true;
+        options.includeAgents = false;
+        options.includeAlerts = false;
+        options.includeGoogleSheets = false;
+        options.includeScheduledDeliveries = false;
+        options.includeVirtualViews = false;
+        options.includeExternalConnections = false;
+    }
+    if (options.chartTypesOnly) {
+        const chartTypesOnlySelection = (0, appsDownload_1.selectAppsToDownload)({
+            apps: Array.isArray(options.chartTypes)
+                ? options.chartTypes
+                : undefined,
+            includeApps: includeChartTypes,
+        });
+        if (chartTypesOnlySelection.mode === 'none') {
+            throw new common_1.ParameterError('Nothing to download: --chart-types-only requires --chart-types <chartTypeReferences...>, --include-chart-types, or --include-all.');
+        }
+        options.apps = undefined;
         options.skipCharts = true;
         options.skipDashboards = true;
         options.skipSpaces = true;
@@ -978,6 +1027,7 @@ const downloadHandler = async (options) => {
         options.agents = [];
         options.alerts = [];
         options.apps = [];
+        options.chartTypes = [];
         options.googleSheets = [];
         options.scheduledDeliveries = [];
         options.virtualViews = [];
@@ -1054,6 +1104,8 @@ const downloadHandler = async (options) => {
         // Shared across both apps-download steps so two different apps whose
         // names collide under the pre-slug fallback naming don't clobber each other.
         const downloadedAppFolders = new Set();
+        // Chart types live in their own folder, so they track their own names.
+        const downloadedChartTypeFolders = new Set();
         // App slugs referenced by downloaded dashboards' tiles, populated by
         // the Dashboards step and consumed by the Linked data apps step.
         let dashboardAppSlugs = [];
@@ -1314,7 +1366,7 @@ const downloadHandler = async (options) => {
                 output.updateActive(`0 of ${appRefsToDownload.length} downloaded`);
                 const baseDir = (0, contentAsCodePaths_1.getDownloadFolder)(options.path);
                 const appsDir = path.join(baseDir, 'apps');
-                const { successCount, skippedNotBuiltCount, failures } = await (0, appsDownload_1.downloadAppsToDir)({
+                const { successCount, skippedNotBuiltCount, skippedWrongKindCount, failures, } = await (0, appsDownload_1.downloadAppsToDir)({
                     appRefs: appRefsToDownload,
                     projectId,
                     appsDir,
@@ -1325,18 +1377,120 @@ const downloadHandler = async (options) => {
                         url: `/api/v1/ee/projects/${fetchProjectId}/apps/${encodeURIComponent(appRef)}/download`,
                         body: undefined,
                     }),
+                    skipBundle: (manifest) => manifest.template === common_1.DATA_APP_VIZ_TEMPLATE
+                        ? 'this is a custom chart type — download it with --chart-types or --include-chart-types'
+                        : null,
                     onProgress: (processed, total) => output.updateActive(`${processed} of ${total} processed`),
                 });
-                const summary = (0, appsDownload_1.appsDownloadSummary)(successCount, appRefsToDownload.length, failures, appsDir, skippedNotBuiltCount);
+                const summary = (0, appsDownload_1.appsDownloadSummary)(successCount, appRefsToDownload.length, failures, appsDir, skippedNotBuiltCount + skippedWrongKindCount);
                 counts.appsNum = successCount;
-                output.completeItem(`${successCount} downloaded${skippedNotBuiltCount > 0
-                    ? `, ${skippedNotBuiltCount} skipped`
+                output.completeItem(`${successCount} downloaded${skippedNotBuiltCount + skippedWrongKindCount > 0
+                    ? `, ${skippedNotBuiltCount + skippedWrongKindCount} skipped`
                     : ''}${failures.length > 0 ? `, ${failures.length} failed` : ''}`, summary.ok ? undefined : 'warning');
                 if (!summary.ok) {
                     summary.failureLines.forEach((line) => globalState_1.default.log(styles.warning(line)));
                 }
             }
         }
+        // Download custom chart types (enterprise, opt-in via --chart-types /
+        // --include-chart-types / --include-all) into chart-types/, kept
+        // separate from data apps.
+        const chartTypesSelection = (0, appsDownload_1.selectAppsToDownload)({
+            apps: Array.isArray(options.chartTypes)
+                ? options.chartTypes
+                : undefined,
+            includeApps: includeChartTypes,
+        });
+        if (chartTypesSelection.mode !== 'none') {
+            output.startItem('Custom chart types');
+            let chartTypeRefsToDownload;
+            let chartTypeListingError = null;
+            if (chartTypesSelection.mode === 'explicit') {
+                chartTypeRefsToDownload = chartTypesSelection.appRefs;
+            }
+            else {
+                output.updateActive('listing project chart types…');
+                let listedChartTypes = [];
+                try {
+                    const projectChartTypes = await (0, apiClient_1.lightdashApi)({
+                        method: 'GET',
+                        url: `/api/v1/ee/projects/${projectId}/apps/chart-types`,
+                        body: undefined,
+                    });
+                    listedChartTypes = projectChartTypes.map((chartType) => ({
+                        appUuid: chartType.appUuid,
+                        slug: chartType.slug,
+                    }));
+                }
+                catch (listErr) {
+                    if ((0, appsDownload_1.shouldFallBackToSpaceScopedListing)(listErr)) {
+                        // 404: the server predates the chart-types listing
+                        // (or chart types entirely) — nothing to list.
+                        globalState_1.default.log(styles.warning('This server does not support listing custom chart types; pass explicit --chart-types references or upgrade the server.'));
+                        listedChartTypes = [];
+                    }
+                    else if (includeAllOptionalContent) {
+                        chartTypeListingError = (0, common_1.getErrorMessage)(listErr);
+                        listedChartTypes = [];
+                    }
+                    else {
+                        throw listErr;
+                    }
+                }
+                const { appUuids: cappedChartTypeUuids, truncatedCount: chartTypesTruncated, } = (0, appsDownload_1.capListedApps)(listedChartTypes.map((chartType) => chartType.appUuid), chartTypesLimit);
+                if (chartTypesTruncated > 0) {
+                    globalState_1.default.log(styles.warning(`Found ${listedChartTypes.length} custom chart types, downloading the first ${chartTypesLimit}. Pass --chart-types-limit <n> to raise the cap.`));
+                }
+                chartTypeRefsToDownload = [
+                    ...new Set([
+                        ...cappedChartTypeUuids,
+                        ...chartTypesSelection.extraAppRefs,
+                    ]),
+                ];
+            }
+            if (chartTypeRefsToDownload.length === 0) {
+                counts.chartTypesNum = 0;
+                if (chartTypeListingError === null) {
+                    output.completeItem('0 found');
+                }
+                else {
+                    output.completeItem(`listing failed: ${chartTypeListingError}`, 'warning');
+                }
+            }
+            else {
+                output.updateActive(`0 of ${chartTypeRefsToDownload.length} downloaded`);
+                const chartTypesDir = path.join((0, contentAsCodePaths_1.getDownloadFolder)(options.path), 'chart-types');
+                const chartTypesOutcome = await (0, appsDownload_1.downloadAppsToDir)({
+                    appRefs: chartTypeRefsToDownload,
+                    projectId,
+                    appsDir: chartTypesDir,
+                    takenFolders: downloadedChartTypeFolders,
+                    cliVersion: env_1.CLI_VERSION,
+                    fetchApp: (fetchProjectId, appRef) => (0, apiClient_1.lightdashApi)({
+                        method: 'GET',
+                        url: `/api/v1/ee/projects/${fetchProjectId}/apps/${encodeURIComponent(appRef)}/download`,
+                        body: undefined,
+                    }),
+                    skipBundle: (manifest) => manifest.template !== common_1.DATA_APP_VIZ_TEMPLATE
+                        ? 'this is a data app — download it with --apps or --include-apps'
+                        : null,
+                    onProgress: (processed, total) => output.updateActive(`${processed} of ${total} processed`),
+                });
+                const chartTypesSummary = (0, appsDownload_1.appsDownloadSummary)(chartTypesOutcome.successCount, chartTypeRefsToDownload.length, chartTypesOutcome.failures, chartTypesDir, chartTypesOutcome.skippedNotBuiltCount +
+                    chartTypesOutcome.skippedWrongKindCount, 'custom chart type');
+                counts.chartTypesNum = chartTypesOutcome.successCount;
+                const chartTypesSkipped = chartTypesOutcome.skippedNotBuiltCount +
+                    chartTypesOutcome.skippedWrongKindCount;
+                output.completeItem(`${chartTypesOutcome.successCount} downloaded${chartTypesSkipped > 0
+                    ? `, ${chartTypesSkipped} skipped`
+                    : ''}${chartTypesOutcome.failures.length > 0
+                    ? `, ${chartTypesOutcome.failures.length} failed`
+                    : ''}`, chartTypesSummary.ok ? undefined : 'warning');
+                if (!chartTypesSummary.ok) {
+                    chartTypesSummary.failureLines.forEach((line) => globalState_1.default.log(styles.warning(line)));
+                }
+            }
+        }
         // Dashboard-referenced apps not already covered above (explicit
         // --apps ref, or a non-truncated slot in the --include-apps cap).
         const linkedAppSlugs = (0, appsDownload_1.computeLinkedAppSlugs)({
@@ -1359,13 +1513,16 @@ const downloadHandler = async (options) => {
                     url: `/api/v1/ee/projects/${fetchProjectId}/apps/${encodeURIComponent(appRef)}/download`,
                     body: undefined,
                 }),
+                // Dashboard data-app tiles reference apps, never chart types.
+                skipBundle: (manifest) => manifest.template === common_1.DATA_APP_VIZ_TEMPLATE
+                    ? 'this is a custom chart type — dashboard app tiles cannot reference it'
+                    : null,
                 onProgress: (processed, total) => output.updateActive(`${processed} of ${total} processed`),
             });
-            const linkedSummary = (0, appsDownload_1.appsDownloadSummary)(outcome.successCount, linkedAppSlugs.length, outcome.failures, appsDir, outcome.skippedNotBuiltCount);
+            const linkedSkipped = outcome.skippedNotBuiltCount + outcome.skippedWrongKindCount;
+            const linkedSummary = (0, appsDownload_1.appsDownloadSummary)(outcome.successCount, linkedAppSlugs.length, outcome.failures, appsDir, linkedSkipped);
             counts.appsNum = (counts.appsNum ?? 0) + outcome.successCount;
-            output.completeItem(`${outcome.successCount} downloaded${outcome.skippedNotBuiltCount > 0
-                ? `, ${outcome.skippedNotBuiltCount} skipped`
-                : ''}${outcome.failures.length > 0
+            output.completeItem(`${outcome.successCount} downloaded${linkedSkipped > 0 ? `, ${linkedSkipped} skipped` : ''}${outcome.failures.length > 0
                 ? `, ${outcome.failures.length} failed`
                 : ''}`, linkedSummary.ok ? undefined : 'warning');
             if (!linkedSummary.ok) {
@@ -1720,20 +1877,47 @@ const uploadHandler = async (options) => {
     if (options.appsOnly && options.spacesOnly) {
         throw new common_1.ParameterError('--apps-only cannot be combined with --spaces-only.');
     }
+    if (options.appsOnly && options.chartTypesOnly) {
+        throw new common_1.ParameterError('--apps-only cannot be combined with --chart-types-only.');
+    }
+    if (options.chartTypesOnly && options.spacesOnly) {
+        throw new common_1.ParameterError('--chart-types-only cannot be combined with --spaces-only.');
+    }
     if (options.appsOnly &&
         (options.charts.length > 0 || options.dashboards.length > 0)) {
         throw new common_1.ParameterError('--apps-only cannot be combined with --charts or --dashboards.');
     }
+    if (options.chartTypesOnly &&
+        (options.charts.length > 0 || options.dashboards.length > 0)) {
+        throw new common_1.ParameterError('--chart-types-only cannot be combined with --charts or --dashboards.');
+    }
     // Bare --apps-only means "all apps": imply --include-apps.
     if (options.appsOnly &&
         options.apps === undefined &&
         options.includeApps !== true) {
         options.includeApps = true;
     }
+    if (options.appsOnly) {
+        options.chartTypes = undefined;
+        options.includeChartTypes = false;
+    }
+    // Bare --chart-types-only means "all chart types" likewise.
+    if (options.chartTypesOnly &&
+        options.chartTypes === undefined &&
+        options.includeChartTypes !== true) {
+        options.includeChartTypes = true;
+    }
+    if (options.chartTypesOnly) {
+        options.apps = undefined;
+        options.includeApps = false;
+    }
     const isOrganizationUpload = options.organization === true;
-    // --apps-only rides the existing filter machinery: every non-app phase
-    // skips exactly as it does when only app refs are passed.
-    const hasFilters = hasContentFilters(options) || options.appsOnly === true;
+    // --apps-only / --chart-types-only ride the existing filter machinery:
+    // every other phase skips exactly as it does when only those refs are
+    // passed.
+    const hasFilters = hasContentFilters(options) ||
+        options.appsOnly === true ||
+        options.chartTypesOnly === true;
     const shouldReconcileSpaces = !isOrganizationUpload && !options.skipSpaces && !hasFilters;
     let preflightSpaceFiles = [];
     if (shouldReconcileSpaces) {
@@ -1915,8 +2099,10 @@ const uploadHandler = async (options) => {
                 });
             }
         }
-        // Upload data apps (enterprise; explicit --apps/--include-apps, or
-        // auto-pushed for a dashboard's apps). Must land before dashboards.
+        // Upload data apps and custom chart types (enterprise). Data apps:
+        // explicit --apps/--include-apps, or auto-pushed for a dashboard's
+        // apps; must land before dashboards. Chart types: explicit
+        // --chart-types/--include-chart-types, from their own folder.
         const explicitAppReferences = Array.isArray(options.apps)
             ? options.apps
             : [];
@@ -1924,26 +2110,70 @@ const uploadHandler = async (options) => {
         const autoPushAppSlugs = isFilteredWithNoDashboards(hasFilters, options.dashboards)
             ? []
             : selectDashboardAppSlugs(await loadDashboardItems(), options.dashboards);
-        const shouldUploadApps = isExplicitAppSelection || autoPushAppSlugs.length > 0;
-        let appsCreated = 0;
-        let appsUpdated = 0;
-        let appsUnchanged = 0;
-        let appsFailed = 0;
-        let appsSkipped = 0;
-        let eeAppRoutesUnavailable = false;
-        const changesBeforeApps = { ...changes };
-        if (shouldUploadApps && !uploadPermissions.dataApps) {
-            counts.appsNum = 0;
-            output.startItem('Data apps');
-            globalState_1.default.log(styles.warning(`Skipping data apps: create:DataApp or manage:DataApp permission is required for this project (the create:DataApp@preview and manage:DataApp@preview scopes only cover preview projects you created). Dashboard tiles will resolve only if their apps already exist in this project.`));
-            output.completeItem('permission denied', 'warning');
-        }
-        else if (shouldUploadApps) {
-            output.startItem('Data apps');
-            // Explicit refs filter by slug/appUuid; --include-apps uploads all.
-            // A pure auto-push run applies no filter — gated per folder below.
-            let uploadFilter = isExplicitAppSelection
-                ? (0, appsDownload_1.getDataAppUploadFilter)(explicitAppReferences, options.includeApps === true)
+        const explicitChartTypeReferences = Array.isArray(options.chartTypes)
+            ? options.chartTypes
+            : [];
+        const isExplicitChartTypeSelection = options.includeChartTypes === true ||
+            explicitChartTypeReferences.length > 0;
+        const appsPhaseActive = isExplicitAppSelection || autoPushAppSlugs.length > 0;
+        const bundleUploadPhases = [
+            {
+                label: 'Data apps',
+                noun: 'data app',
+                changesPrefix: 'data apps',
+                dirName: 'apps',
+                explicitRefs: explicitAppReferences,
+                includeAllFolders: options.includeApps === true,
+                isExplicitSelection: isExplicitAppSelection,
+                autoPushSlugs: autoPushAppSlugs,
+                useAppSpace: true,
+                isChartTypes: false,
+            },
+            {
+                label: 'Custom chart types',
+                noun: 'custom chart type',
+                changesPrefix: 'chart types',
+                dirName: 'chart-types',
+                explicitRefs: explicitChartTypeReferences,
+                includeAllFolders: options.includeChartTypes === true,
+                isExplicitSelection: isExplicitChartTypeSelection,
+                autoPushSlugs: [],
+                useAppSpace: false,
+                isChartTypes: true,
+            },
+        ];
+        for (const phase of bundleUploadPhases) {
+            const shouldUploadPhase = phase.isExplicitSelection || phase.autoPushSlugs.length > 0;
+            if (!shouldUploadPhase) {
+                // eslint-disable-next-line no-continue
+                continue;
+            }
+            let appsCreated = 0;
+            let appsUpdated = 0;
+            let appsUnchanged = 0;
+            let appsFailed = 0;
+            let appsSkipped = 0;
+            let eeAppRoutesUnavailable = false;
+            const changesBeforeApps = { ...changes };
+            if (!uploadPermissions.dataApps) {
+                if (phase.isChartTypes) {
+                    counts.chartTypesNum = 0;
+                }
+                else {
+                    counts.appsNum = 0;
+                }
+                output.startItem(phase.label);
+                globalState_1.default.log(styles.warning(`Skipping ${phase.changesPrefix}: create:DataApp or manage:DataApp permission is required for this project (the create:DataApp@preview and manage:DataApp@preview scopes only cover preview projects you created). Dashboard tiles will resolve only if their apps already exist in this project.`));
+                output.completeItem('permission denied', 'warning');
+                // eslint-disable-next-line no-continue
+                continue;
+            }
+            output.startItem(phase.label);
+            // Explicit refs filter by slug/appUuid; include-all uploads every
+            // folder. A pure auto-push run applies no filter — gated per
+            // folder below.
+            let uploadFilter = phase.isExplicitSelection
+                ? (0, appsDownload_1.getDataAppUploadFilter)(phase.explicitRefs, phase.includeAllFolders)
                 : null;
             // uuid/URL --apps refs resolve to slugs against the target
             // project's listing so they can match slug-identity local folders.
@@ -1952,7 +2182,9 @@ const uploadHandler = async (options) => {
                 try {
                     const projectApps = await (0, apiClient_1.lightdashApi)({
                         method: 'GET',
-                        url: `/api/v1/ee/projects/${projectId}/apps`,
+                        // Each kind resolves against its own listing — the
+                        // apps listing never includes chart types.
+                        url: `/api/v1/ee/projects/${projectId}/apps${phase.isChartTypes ? '/chart-types' : ''}`,
                         body: undefined,
                     });
                     uploadFilter = (0, appsDownload_1.resolveUploadFilterUuids)(uploadFilter, projectApps);
@@ -1962,9 +2194,10 @@ const uploadHandler = async (options) => {
                 }
             }
             // The server applies the space on creates only; existing apps
-            // keep their space.
+            // keep their space. Chart types are spaceless, so --app-space
+            // never applies to them.
             let appSpaceUuid;
-            if (options.appSpace !== undefined) {
+            if (phase.useAppSpace && options.appSpace !== undefined) {
                 if ((0, uuid_1.validate)(options.appSpace)) {
                     appSpaceUuid = options.appSpace;
                 }
@@ -1977,8 +2210,13 @@ const uploadHandler = async (options) => {
                     appSpaceUuid = (0, appsDownload_1.resolveAppSpaceUuid)(options.appSpace, spaces);
                 }
             }
+            else if (phase.isChartTypes &&
+                options.appSpace !== undefined &&
+                !appsPhaseActive) {
+                globalState_1.default.log(styles.warning('--app-space does not apply to custom chart types — they are project-global and spaceless.'));
+            }
             const baseDir = (0, contentAsCodePaths_1.getDownloadFolder)(options.path);
-            const appsDir = path.join(baseDir, 'apps');
+            const appsDir = path.join(baseDir, phase.dirName);
             let appFolderEntries;
             try {
                 appFolderEntries = await fs_1.promises.readdir(appsDir, {
@@ -1995,9 +2233,14 @@ const uploadHandler = async (options) => {
             }
             const subDirs = appFolderEntries.filter((e) => e.isDirectory());
             if (subDirs.length === 0) {
-                globalState_1.default.log(styles.warning(isExplicitAppSelection
-                    ? `No app folders found in ${appsDir}. Run 'lightdash download --include-apps' first.`
-                    : `No app folders found in ${appsDir} for the dashboard(s) being uploaded. Re-run 'lightdash download' to fetch their apps.`));
+                if (phase.isChartTypes) {
+                    globalState_1.default.log(styles.warning(`No chart type folders found in ${appsDir}. Run 'lightdash download --include-chart-types' first.`));
+                }
+                else {
+                    globalState_1.default.log(styles.warning(phase.isExplicitSelection
+                        ? `No app folders found in ${appsDir}. Run 'lightdash download --include-apps' first.`
+                        : `No app folders found in ${appsDir} for the dashboard(s) being uploaded. Re-run 'lightdash download' to fetch their apps.`));
+                }
             }
             const matchedRefs = new Set();
             const buildWaitState = (0, uploadRetry_1.createBuildLimitWaitState)();
@@ -2008,12 +2251,12 @@ const uploadHandler = async (options) => {
                     const code = await (0, appCodeFiles_1.readBundleFromDir)(folderPath);
                     if (!(0, appsDownload_1.uploadFilterMatches)(uploadFilter, code.manifest)) {
                         const isAutoPushCandidate = code.manifest.slug !== undefined &&
-                            autoPushAppSlugs.includes(code.manifest.slug);
+                            phase.autoPushSlugs.includes(code.manifest.slug);
                         if (isAutoPushCandidate) {
                             globalState_1.default.log(styles.warning(`Skipping app "${subDir.name}" — excluded by --apps, but a dashboard being uploaded references it. Its tile may fail to resolve unless the app already exists in the target project.`));
                         }
                         else {
-                            globalState_1.default.debug(`Skipping app folder "${subDir.name}" (not in filter)`);
+                            globalState_1.default.debug(`Skipping ${phase.noun} folder "${subDir.name}" (not in filter)`);
                         }
                         // eslint-disable-next-line no-continue
                         continue;
@@ -2021,9 +2264,22 @@ const uploadHandler = async (options) => {
                     if (uploadFilter) {
                         (0, appsDownload_1.matchedUploadRefs)(uploadFilter, code.manifest).forEach((ref) => matchedRefs.add(ref));
                     }
-                    if (!isExplicitAppSelection) {
+                    // Folder-kind guard: the manifest governs what the server
+                    // creates, so a bundle filed under the wrong folder would
+                    // silently upload as the wrong kind. Skip and say where
+                    // it belongs instead.
+                    const isVizBundle = code.manifest.template === common_1.DATA_APP_VIZ_TEMPLATE;
+                    if (isVizBundle !== phase.isChartTypes) {
+                        globalState_1.default.log(styles.warning(isVizBundle
+                            ? `Skipping "${subDir.name}": it is a custom chart type — move the folder to chart-types/ and upload with --chart-types or --include-chart-types.`
+                            : `Skipping "${subDir.name}": it is a data app — move the folder to apps/ and upload with --apps or --include-apps.`));
+                        appsSkipped += 1;
+                        // eslint-disable-next-line no-continue
+                        continue;
+                    }
+                    if (!phase.isExplicitSelection) {
                         const isAutoPushCandidate = code.manifest.slug !== undefined &&
-                            autoPushAppSlugs.includes(code.manifest.slug);
+                            phase.autoPushSlugs.includes(code.manifest.slug);
                         if (!isAutoPushCandidate) {
                             // eslint-disable-next-line no-continue
                             continue;
@@ -2156,7 +2412,9 @@ const uploadHandler = async (options) => {
                         globalState_1.default.log(styles.warning((0, appsDownload_1.preSlugServerHint)(subDir.name)));
                     }
                     if (action === 'create') {
-                        globalState_1.default.log(`New app: ${config.context.serverUrl}/projects/${projectId}/apps/${appUuid}`);
+                        globalState_1.default.log(phase.isChartTypes
+                            ? `New chart type: ${config.context.serverUrl}/projects/${projectId}/chart-types/${appUuid}`
+                            : `New app: ${config.context.serverUrl}/projects/${projectId}/apps/${appUuid}`);
                     }
                 }
                 catch (appErr) {
@@ -2165,7 +2423,7 @@ const uploadHandler = async (options) => {
                         : undefined;
                     // Auto-push is flag-free, so a server without the EE app
                     // routes must not fail an upload the user never asked for.
-                    if (!isExplicitAppSelection && status === 404) {
+                    if (!phase.isExplicitSelection && status === 404) {
                         eeAppRoutesUnavailable = true;
                         globalState_1.default.log(styles.warning(`Skipping data apps: the enterprise "data apps" feature is not available on this instance. Dashboard tiles will resolve only if their apps already exist in this project.`));
                         break;
@@ -2190,21 +2448,26 @@ const uploadHandler = async (options) => {
                 }
             }
             if (appsCreated > 0)
-                changes['data apps created'] = appsCreated;
+                changes[`${phase.changesPrefix} created`] = appsCreated;
             if (appsUpdated > 0)
-                changes['data apps updated'] = appsUpdated;
+                changes[`${phase.changesPrefix} updated`] = appsUpdated;
             if (appsUnchanged > 0)
-                changes['data apps unchanged'] = appsUnchanged;
+                changes[`${phase.changesPrefix} unchanged`] = appsUnchanged;
             if (appsFailed > 0)
-                changes['data apps failed'] = appsFailed;
+                changes[`${phase.changesPrefix} failed`] = appsFailed;
             if (appsSkipped > 0)
-                changes['data apps skipped'] = appsSkipped;
-            counts.appsNum =
-                appsCreated +
-                    appsUpdated +
-                    appsUnchanged +
-                    appsFailed +
-                    appsSkipped;
+                changes[`${phase.changesPrefix} skipped`] = appsSkipped;
+            const phaseBundleTotal = appsCreated +
+                appsUpdated +
+                appsUnchanged +
+                appsFailed +
+                appsSkipped;
+            if (phase.isChartTypes) {
+                counts.chartTypesNum = phaseBundleTotal;
+            }
+            else {
+                counts.appsNum = phaseBundleTotal;
+            }
             const appSummary = summarizeUploadChanges(changesBeforeApps, changes);
             if (eeAppRoutesUnavailable) {
                 output.completeItem('not available on this server', 'warning');
@@ -2216,7 +2479,7 @@ const uploadHandler = async (options) => {
                 // App uploads are fire-and-forget per folder, so failures are
                 // logged and tallied rather than thrown — but the process must
                 // still exit non-zero or CI pipelines read the run as green.
-                globalState_1.default.log(styles.error(`${appsFailed} data app upload(s) failed — see errors above.`));
+                globalState_1.default.log(styles.error(`${appsFailed} ${phase.noun} upload(s) failed — see errors above.`));
                 process.exitCode = 1;
             }
         }

package/dist/index.js

@@ -389,6 +389,10 @@ const downloadCommand = commander_1.program
     .option('--include-apps', "Include all of the project's data apps (enterprise), capped at --apps-limit (default: 50)", false)
     .option('--apps-limit <number>', 'Maximum number of data apps downloaded by --include-apps or --include-all (default: 50)', undefined)
     .option('--apps-only', "Download only data apps (implies --skip-charts --skip-dashboards --skip-spaces). Bare --apps-only downloads all the project's apps; pass --apps <appReferences...> to select.", false)
+    .option('--chart-types <chartTypeReferences...>', 'Download only the specified custom chart types, by slug, URL, or UUID (enterprise).')
+    .option('--include-chart-types', "Include all of the project's custom chart types (enterprise), capped at --chart-types-limit (default: 50)", false)
+    .option('--chart-types-limit <number>', 'Maximum number of custom chart types downloaded by --include-chart-types or --include-all (default: 50)', undefined)
+    .option('--chart-types-only', "Download only custom chart types (implies --skip-charts --skip-dashboards --skip-spaces). Bare --chart-types-only downloads all the project's chart types; pass --chart-types <chartTypeReferences...> to select.", false)
     .option('--organization', 'download all organization-scoped resources, including Data App themes, without selecting a project', false);
 downloadCommand.action(withOrganizationMode(download_1.downloadHandler));
 const uploadCommand = commander_1.program
@@ -425,6 +429,9 @@ const uploadCommand = commander_1.program
     .option('--apps <appReferences...>', 'Upload only the specified data apps, by slug (the app folder name), app URL, or UUID (enterprise). URL and UUID refs are resolved against the target project.')
     .option('--include-apps', 'Upload all app folders on disk (enterprise).', false)
     .option('--apps-only', 'Upload only data apps, skipping charts, dashboards, and space reconciliation. Bare --apps-only uploads every app folder; pass --apps <appReferences...> to select.', false)
+    .option('--chart-types <chartTypeReferences...>', 'Upload only the specified custom chart types, by slug (the chart type folder name), URL, or UUID (enterprise). URL and UUID refs are resolved against the target project.')
+    .option('--include-chart-types', 'Upload all chart type folders on disk (enterprise).', false)
+    .option('--chart-types-only', 'Upload only custom chart types, skipping charts, dashboards, and space reconciliation. Bare --chart-types-only uploads every chart type folder; pass --chart-types <chartTypeReferences...> to select.', false)
     .option('--allow-custom-dependencies', 'Approve uploading apps that declare custom dependencies without prompting. Required for non-interactive runs of such uploads.', false)
     .option('--app-space <spaceRef>', 'Space (slug or UUID) for data apps this upload creates. Existing apps keep their space.')
     .option('--create-new', 'Always create a new app from the uploaded code instead of updating the app referenced by lightdash-app.yml. The new app gets a fresh slug.', false)

package/package.json

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