@lightdash/cli 1.79.1 → 1.80.0

package/dist/handlers/download.js

@@ -11,6 +11,7 @@ const yaml = tslib_1.__importStar(require("js-yaml"));
 const groupBy_1 = tslib_1.__importDefault(require("lodash/groupBy"));
 const p_limit_1 = tslib_1.__importDefault(require("p-limit"));
 const path = tslib_1.__importStar(require("path"));
+const uuid_1 = require("uuid");
 const analytics_1 = require("../analytics/analytics");
 const config_1 = require("../config");
 const env_1 = require("../env");
@@ -1674,8 +1675,22 @@ const uploadHandler = async (options) => {
     if (options.spacesOnly && options.skipSpaces) {
         throw new common_1.ParameterError('Nothing to upload: --spaces-only cannot be combined with --skip-spaces.');
     }
+    if (options.appsOnly && options.spacesOnly) {
+        throw new common_1.ParameterError('--apps-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.appsOnly &&
+        options.apps === undefined &&
+        options.includeApps !== true) {
+        throw new common_1.ParameterError('Nothing to upload: --apps-only requires --apps <appReferences...> or --include-apps.');
+    }
     const isOrganizationUpload = options.organization === true;
-    const hasFilters = hasContentFilters(options);
+    // --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;
     const shouldReconcileSpaces = !isOrganizationUpload && !options.skipSpaces && !hasFilters;
     let preflightSpaceFiles = [];
     if (shouldReconcileSpaces) {
@@ -1875,37 +1890,41 @@ const uploadHandler = async (options) => {
             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.
-            const uploadFilter = isExplicitAppSelection
+            let uploadFilter = isExplicitAppSelection
                 ? (0, appsDownload_1.getDataAppUploadFilter)(explicitAppReferences, options.includeApps === true)
                 : null;
-            // The manifest always names the source project, so comparing it
-            // to the target would re-push every run — list the target instead.
-            let presence = {
-                kind: 'unknown',
-                targetProjectUuid: projectId,
-            };
-            // Only the auto-push gate below (skipped entirely when explicit)
-            // reads presence, so an explicit run never needs the listing.
-            if (!isExplicitAppSelection && autoPushAppSlugs.length > 0) {
+            // uuid/URL --apps refs resolve to slugs against the target
+            // project's listing so they can match slug-identity local folders.
+            const filterHasUuidRefs = uploadFilter !== null && [...uploadFilter].some(uuid_1.validate);
+            if (filterHasUuidRefs && uploadFilter !== null) {
                 try {
                     const projectApps = await (0, apiClient_1.lightdashApi)({
                         method: 'GET',
                         url: `/api/v1/ee/projects/${projectId}/apps`,
                         body: undefined,
                     });
-                    // An older server answers without slugs; that is not an
-                    // error, but it is not an answer either.
-                    if (projectApps.every((app) => app.slug !== undefined)) {
-                        presence = {
-                            kind: 'known',
-                            slugs: new Set(projectApps.map((app) => app.slug)),
-                        };
-                    }
+                    uploadFilter = (0, appsDownload_1.resolveUploadFilterUuids)(uploadFilter, projectApps);
                 }
                 catch (listErr) {
                     globalState_1.default.debug(`Could not list target project apps: ${(0, common_1.getErrorMessage)(listErr)}`);
                 }
             }
+            // The server applies the space on creates only; existing apps
+            // keep their space.
+            let appSpaceUuid;
+            if (options.appSpace !== undefined) {
+                if ((0, uuid_1.validate)(options.appSpace)) {
+                    appSpaceUuid = options.appSpace;
+                }
+                else {
+                    const spaces = await (0, apiClient_1.lightdashApi)({
+                        method: 'GET',
+                        url: `/api/v1/projects/${projectId}/spaces`,
+                        body: undefined,
+                    });
+                    appSpaceUuid = (0, appsDownload_1.resolveAppSpaceUuid)(options.appSpace, spaces);
+                }
+            }
             const baseDir = (0, contentAsCodePaths_1.getDownloadFolder)(options.path);
             const appsDir = path.join(baseDir, 'apps');
             let appFolderEntries;
@@ -1957,19 +1976,10 @@ const uploadHandler = async (options) => {
                             // eslint-disable-next-line no-continue
                             continue;
                         }
-                        // eslint-disable-next-line no-await-in-loop
-                        const folderChanged = await (0, appCodeFiles_1.appFolderNeedsUpdating)(folderPath, code.manifest);
-                        if (!(0, appsDownload_1.shouldAutoPushApp)({
-                            manifest: code.manifest,
-                            presence,
-                            folderChanged,
-                            force: options.force === true,
-                        })) {
-                            globalState_1.default.debug(`Skipping app "${subDir.name}" — unchanged and already in the target project`);
-                            appsSkipped += 1;
-                            // eslint-disable-next-line no-continue
-                            continue;
-                        }
+                        // Auto-push candidates always POST: the server's
+                        // byte-compare skip is the single unchanged authority,
+                        // and it runs before the build cap, so identical apps
+                        // cost no build slots.
                     }
                     // Read declared dependencies from the app folder (optional).
                     // eslint-disable-next-line no-await-in-loop
@@ -2011,14 +2021,25 @@ const uploadHandler = async (options) => {
                             const warningLines = (0, appCodeFiles_1.buildDepsWarningLines)(customDeps, templateDeps);
                             globalState_1.default.log(styles.warning(`"${subDir.name}" declares custom dependencies that will be installed in the build sandbox:`));
                             warningLines.forEach((line) => globalState_1.default.log(line));
-                            if (process.stdin.isTTY && process.stdout.isTTY) {
+                            if (options.allowCustomDependencies !== true) {
+                                const canPrompt = process.stdin.isTTY === true &&
+                                    process.stdout.isTTY === true &&
+                                    !globalState_1.default.isNonInteractive();
+                                if (!canPrompt) {
+                                    // Fail closed: installing packages in the
+                                    // build sandbox needs explicit approval.
+                                    globalState_1.default.log(styles.error(`Skipping "${subDir.name}": it declares custom dependencies, which need approval. Pass --allow-custom-dependencies to approve in non-interactive runs.`));
+                                    appsFailed += 1;
+                                    // eslint-disable-next-line no-continue
+                                    continue;
+                                }
                                 // eslint-disable-next-line no-await-in-loop
                                 const { proceed } = await output.promptWhilePaused(() => inquirer_1.default.prompt([
                                     {
                                         type: 'confirm',
                                         name: 'proceed',
                                         message: `Upload "${subDir.name}" with custom dependencies?`,
-                                        default: true,
+                                        default: false,
                                     },
                                 ]));
                                 if (!proceed) {
@@ -2028,7 +2049,6 @@ const uploadHandler = async (options) => {
                                     continue;
                                 }
                             }
-                            // Non-TTY: proceed without prompting (upload is deliberate).
                             codeToUpload = (0, appCodeFiles_1.attachDependenciesToCode)(code, customDeps, {
                                 packageJson: rawDeps.packageJson,
                                 lockfile: rawDeps.lockfile,
@@ -2037,6 +2057,7 @@ const uploadHandler = async (options) => {
                         // Empty custom set: upload payload identical to today's format.
                     }
                     const body = (0, appCodeFiles_1.buildImportBody)(codeToUpload, projectId, {
+                        space: appSpaceUuid,
                         createNew: options.createNew === true,
                         force: options.force,
                     });

package/dist/index.js

@@ -413,8 +413,11 @@ const uploadCommand = commander_1.program
     .option('--include-virtual-views', 'Include the virtual views used by the charts and dashboards being uploaded', false)
     .option('--validate', 'Validate charts and dashboards after upload', false)
     .option('--gzip', 'Enable gzip compression for request bodies', false)
-    .option('--apps <appReferences...>', 'Upload only the specified data apps, by slug — the app folder name (enterprise).')
+    .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. Requires --apps <appReferences...> or --include-apps.', 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)
     .option('--organization', 'upload all organization-scoped resources without selecting a project', false)
     .option('--send-invites', 'send invitations to eligible pending users during organization upload', false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/cli",
-  "version": "1.79.1",
+  "version": "1.80.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/warehouses": "1.79.1",
-    "@lightdash/common": "1.79.1"
+    "@lightdash/common": "1.80.0",
+    "@lightdash/warehouses": "1.80.0"
   },
   "devDependencies": {
     "@types/inquirer": "8.2.4",