@lightdash/cli 0.3465.1 → 0.3466.0

package/dist/handlers/apps/appsDownload.d.ts

@@ -1,5 +1,6 @@
 import { type DataAppCodeDownload } from '@lightdash/common';
 export declare const DEFAULT_APPS_LIMIT = 50;
+export declare const getDataAppUuidFromReference: (reference: string) => string;
 /**
  * Resolves the --apps-limit flag. Commander passes the raw string (or
  * undefined when the flag was not given, so an explicit flag is

package/dist/handlers/apps/appsDownload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appsDownload.d.ts","sourceRoot":"","sources":["../../../src/handlers/apps/appsDownload.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,mBAAmB,EAC3B,MAAM,mBAAmB,CAAC;AAE3B,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GACzB,UAAU,MAAM,GAAG,SAAS,EAC5B,aAAa,OAAO,KACrB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;CAejD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,kCAAkC,GAAI,KAAK,OAAO,KAAG,OACP,CAAC;AAE5D,MAAM,MAAM,qBAAqB,GAC3B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,GACxC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEpD;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,SAAS;IAC1C,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB,KAAG,qBASH,CAAC;AAEF,eAAO,MAAM,aAAa,GACtB,aAAa,MAAM,EAAE,EACrB,OAAO,MAAM,KACd;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAG7C,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,0BAA0B,GACnC,SAAS,MAAM,EACf,MAAM,mBAAmB,KAC1B,mBAOF,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE,MAAM,MAAM,uBAAuB,GAC7B;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,GACjC,KAAK,OAAO,KACb,uBAoBF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,MAAM;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACvB,KAAG,MAC0O,CAAC;AAE/O;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAG,MAGpB,CAAC;AAEpD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAC7B,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAChC,OAKF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,GAC1B,qBAAqB,MAAM,EAC3B,mBAAmB,MAAM,EACzB,WAAW,OAAO,KACnB,SAAS,GAAG,oBAKd,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC5B,cAAc,MAAM,EACpB,OAAO,MAAM,EACb,UAAU,kBAAkB,EAAE,EAC9B,SAAS,MAAM,EACf,sBAAsB,MAAM,KAC7B;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,EAAE,CAAA;CAiBxD,CAAC"}
+{"version":3,"file":"appsDownload.d.ts","sourceRoot":"","sources":["../../../src/handlers/apps/appsDownload.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,mBAAmB,EAC3B,MAAM,mBAAmB,CAAC;AAG3B,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC,eAAO,MAAM,2BAA2B,GAAI,WAAW,MAAM,KAAG,MAoB/D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GACzB,UAAU,MAAM,GAAG,SAAS,EAC5B,aAAa,OAAO,KACrB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;CAejD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,kCAAkC,GAAI,KAAK,OAAO,KAAG,OACP,CAAC;AAE5D,MAAM,MAAM,qBAAqB,GAC3B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,GACxC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEpD;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,SAAS;IAC1C,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB,KAAG,qBASH,CAAC;AAEF,eAAO,MAAM,aAAa,GACtB,aAAa,MAAM,EAAE,EACrB,OAAO,MAAM,KACd;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAG7C,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,0BAA0B,GACnC,SAAS,MAAM,EACf,MAAM,mBAAmB,KAC1B,mBAOF,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE,MAAM,MAAM,uBAAuB,GAC7B;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,GACjC,KAAK,OAAO,KACb,uBAoBF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,MAAM;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACvB,KAAG,MAC0O,CAAC;AAE/O;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAG,MAGpB,CAAC;AAEpD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAC7B,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAChC,OAKF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,GAC1B,qBAAqB,MAAM,EAC3B,mBAAmB,MAAM,EACzB,WAAW,OAAO,KACnB,SAAS,GAAG,oBAKd,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC5B,cAAc,MAAM,EACpB,OAAO,MAAM,EACb,UAAU,kBAAkB,EAAE,EAC9B,SAAS,MAAM,EACf,sBAAsB,MAAM,KAC7B;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,EAAE,CAAA;CAiBxD,CAAC"}

package/dist/handlers/apps/appsDownload.js

@@ -1,8 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appsDownloadSummary = exports.classifyAppUpload = exports.shouldWarnAllSkipped = exports.computeUpsertedTotal = exports.manifestRetargetHint = exports.classifyAppDownloadError = exports.ensureDownloadedAppContext = exports.capListedApps = exports.selectAppsToDownload = exports.shouldFallBackToSpaceScopedListing = exports.resolveAppsLimit = exports.DEFAULT_APPS_LIMIT = void 0;
+exports.appsDownloadSummary = exports.classifyAppUpload = exports.shouldWarnAllSkipped = exports.computeUpsertedTotal = exports.manifestRetargetHint = exports.classifyAppDownloadError = exports.ensureDownloadedAppContext = exports.capListedApps = exports.selectAppsToDownload = exports.shouldFallBackToSpaceScopedListing = exports.resolveAppsLimit = exports.getDataAppUuidFromReference = exports.DEFAULT_APPS_LIMIT = void 0;
 const common_1 = require("@lightdash/common");
+const uuid_1 = require("uuid");
 exports.DEFAULT_APPS_LIMIT = 50;
+const getDataAppUuidFromReference = (reference) => {
+    let url;
+    try {
+        url = new URL(reference);
+    }
+    catch {
+        return reference;
+    }
+    if (url.protocol !== 'http:' && url.protocol !== 'https:') {
+        return reference;
+    }
+    const pathSegments = url.pathname.split('/').filter(Boolean);
+    const appSegmentIndex = pathSegments.findIndex((segment, index) => (segment === 'apps' || segment === 'app') &&
+        (0, uuid_1.validate)(pathSegments[index + 1]));
+    return appSegmentIndex >= 0 ? pathSegments[appSegmentIndex + 1] : reference;
+};
+exports.getDataAppUuidFromReference = getDataAppUuidFromReference;
 /**
  * Resolves the --apps-limit flag. Commander passes the raw string (or
  * undefined when the flag was not given, so an explicit flag is
@@ -38,7 +56,7 @@ exports.shouldFallBackToSpaceScopedListing = shouldFallBackToSpaceScopedListing;
  * the space-scoped content API on servers that predate it.
  */
 const selectAppsToDownload = (request) => {
-    const explicitUuids = request.apps ?? [];
+    const explicitUuids = (request.apps ?? []).map(exports.getDataAppUuidFromReference);
     if (request.includeApps) {
         return { mode: 'list-all', extraAppUuids: explicitUuids };
     }

package/dist/handlers/apps/appsDownload.test.js

@@ -2,6 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const common_1 = require("@lightdash/common");
 const appsDownload_1 = require("./appsDownload");
+describe('getDataAppUuidFromReference', () => {
+    const appUuid = 'd3afc44c-6f0f-4d9f-a267-fb739efa31dd';
+    const projectUuid = 'd4c8dfd2-98c0-4eb2-8395-d924aee62611';
+    it('keeps a bare app UUID unchanged', () => {
+        expect((0, appsDownload_1.getDataAppUuidFromReference)(appUuid)).toBe(appUuid);
+    });
+    it.each([
+        `https://app.lightdash.cloud/projects/${projectUuid}/apps/${appUuid}`,
+        `https://app.lightdash.cloud/projects/${projectUuid}/apps/${appUuid}/view`,
+        `https://app.lightdash.cloud/projects/${projectUuid}/apps/${appUuid}/versions/2/view?state=filters#preview`,
+        `https://app.lightdash.cloud/embed/${projectUuid}/app/${appUuid}`,
+    ])('extracts the app UUID from %s', (url) => {
+        expect((0, appsDownload_1.getDataAppUuidFromReference)(url)).toBe(appUuid);
+    });
+    it.each([
+        'my-app',
+        `https://app.lightdash.cloud/${appUuid}`,
+        `https://app.lightdash.cloud/projects/${projectUuid}/apps/generate`,
+        `ftp://app.lightdash.cloud/projects/${projectUuid}/apps/${appUuid}`,
+    ])('leaves unsupported references unchanged: %s', (reference) => {
+        expect((0, appsDownload_1.getDataAppUuidFromReference)(reference)).toBe(reference);
+    });
+});
 const makeDownload = () => ({
     manifest: {
         codeVersion: 1,
@@ -43,6 +66,16 @@ describe('selectAppsToDownload', () => {
     it('combines --include-apps with explicitly passed uuids', () => {
         expect((0, appsDownload_1.selectAppsToDownload)({ apps: ['uuid-a'], includeApps: true })).toEqual({ mode: 'list-all', extraAppUuids: ['uuid-a'] });
     });
+    it('normalizes explicit app URLs without listing apps', () => {
+        expect((0, appsDownload_1.selectAppsToDownload)({
+            apps: [
+                'https://app.lightdash.cloud/projects/project-uuid/apps/d3afc44c-6f0f-4d9f-a267-fb739efa31dd/view',
+            ],
+        })).toEqual({
+            mode: 'explicit',
+            appUuids: ['d3afc44c-6f0f-4d9f-a267-fb739efa31dd'],
+        });
+    });
     it('skips apps when neither flag is passed', () => {
         expect((0, appsDownload_1.selectAppsToDownload)({})).toEqual({ mode: 'none' });
         expect((0, appsDownload_1.selectAppsToDownload)({ apps: [] })).toEqual({ mode: 'none' });

package/dist/handlers/download.js

@@ -712,7 +712,7 @@ const downloadHandler = async (options) => {
             includeApps,
         });
         if (appsOnlySelection.mode === 'none') {
-            throw new common_1.ParameterError('Nothing to download: --apps-only requires --apps <appUuids...>, --include-apps, or --include-all.');
+            throw new common_1.ParameterError('Nothing to download: --apps-only requires --apps <appReferences...>, --include-apps, or --include-all.');
         }
         options.skipCharts = true;
         options.skipDashboards = true;

package/dist/index.js

@@ -365,10 +365,10 @@ const downloadCommand = commander_1.program
     .option('--include-scheduled-deliveries', 'include all scheduled deliveries in the download', false)
     .option('--include-all', 'include all optional content in the download', false)
     .option('--strip-pivot-series', 'strip per-value pivot series config from chart YAML for portable downloads', false)
-    .option('--apps <appUuids...>', 'Include specific data apps by UUID (enterprise). Works for apps not added to a space.')
+    .option('--apps <appReferences...>', 'Include specific data apps by UUID or URL (enterprise). Works for apps not added to a space.')
     .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). Requires --apps <appUuids...>, --include-apps, or --include-all.', false)
+    .option('--apps-only', 'Download only data apps (implies --skip-charts --skip-dashboards --skip-spaces). Requires --apps <appReferences...>, --include-apps, or --include-all.', false)
     .option('--organization', 'download all organization-scoped resources without selecting a project', false);
 downloadCommand.action(withOrganizationMode(download_1.downloadHandler));
 const uploadCommand = commander_1.program

package/package.json

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