@lightdash/cli 1.251.6 → 1.252.0

package/dist/handlers/compileProject.test.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const common_1 = require("@lightdash/common");
 const promises_1 = tslib_1.__importDefault(require("fs/promises"));
+const node_fetch_1 = require("node-fetch");
 const os_1 = tslib_1.__importDefault(require("os"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const context_1 = require("../dbt/context");
@@ -10,6 +11,7 @@ const manifest_1 = require("../dbt/manifest");
 const validation_1 = require("../dbt/validation");
 const loader_1 = require("../lightdash/loader");
 const compile_1 = require("./compile");
+const apiClient_1 = require("./dbt/apiClient");
 const compile_2 = require("./dbt/compile");
 const getDbtVersion_1 = require("./dbt/getDbtVersion");
 vi.mock('../analytics/analytics');
@@ -26,7 +28,11 @@ vi.mock('../dbt/validation');
 vi.mock('../lightdash/loader');
 vi.mock('./dbt/compile');
 vi.mock('./dbt/getDbtVersion');
-const dbtNode = (uniqueId, resourceType, compiled) => ({
+vi.mock('./dbt/apiClient', async (importOriginal) => ({
+    ...(await importOriginal()),
+    lightdashRawApi: vi.fn(),
+}));
+const dbtNode = (uniqueId, resourceType, compiled, extra = {}) => ({
     unique_id: uniqueId,
     name: uniqueId.split('.').at(-1) ?? uniqueId,
     resource_type: resourceType,
@@ -57,6 +63,7 @@ const dbtNode = (uniqueId, resourceType, compiled) => ({
     relation_name: `"db"."public"."${uniqueId}"`,
     config: { materialized: 'table' },
     compiled,
+    ...extra,
 });
 const manifest = (nodes) => ({
     metadata: {
@@ -125,6 +132,7 @@ describe('compileProject completeness', () => {
             skipped: [],
         }));
         vi.spyOn(console, 'error').mockImplementation(() => undefined);
+        vi.spyOn(console, 'info').mockImplementation(() => undefined);
     });
     afterEach(async () => {
         vi.restoreAllMocks();
@@ -173,7 +181,383 @@ describe('compileProject completeness', () => {
         const result = await (0, compile_1.compileProject)({
             ...compileOptions(tempDir),
             combineManifest: 'external-manifest.json',
+            combineManifestProjectUuid: 'project-uuid',
+        });
+        expect(result.isProjectComplete).toBe(true);
+        expect(result.explores.map((explore) => explore.name)).toEqual([
+            'orders',
+            'compiled',
+        ]);
+        expect(apiClient_1.lightdashRawApi).not.toHaveBeenCalled();
+        expect(console.info).toHaveBeenCalledWith(expect.stringContaining('Combined external manifest from'));
+    });
+    test('projects, merges, and compiles served-only models while preserving local precedence and source identity', async () => {
+        const projectManifest = manifest({
+            'model.test.orders': dbtNode('model.test.orders', 'model', true, {
+                description: 'Local orders description',
+            }),
+        });
+        const servedManifest = (0, common_1.projectMergedManifest)(manifest({
+            'model.test.orders': dbtNode('model.test.orders', 'model', true, {
+                description: 'Served orders description',
+                lightdash_source_name: 'local_source',
+            }),
+            'model.served.customers': dbtNode('model.served.customers', 'model', true, {
+                package_name: 'served',
+                lightdash_source_name: 'served_source',
+            }),
+            'model.served.customer_helper': dbtNode('model.served.customer_helper', 'model', false, {
+                package_name: 'served',
+                lightdash_source_name: 'served_source',
+            }),
+        }));
+        vi.mocked(manifest_1.loadManifest).mockResolvedValue(projectManifest);
+        vi.mocked(apiClient_1.lightdashRawApi).mockResolvedValue(new node_fetch_1.Response(JSON.stringify(servedManifest)));
+        vi.mocked(compile_2.maybeCompileModelsAndJoins).mockResolvedValue({
+            compiledModelIds: ['model.test.orders'],
+            originallySelectedModelIds: undefined,
+        });
+        const result = await (0, compile_1.compileProject)({
+            ...compileOptions(tempDir),
+            combineManifestProjectUuid: 'project-uuid',
+        });
+        expect(result.explores.map((explore) => explore.name)).toEqual([
+            'orders',
+            'customers',
+        ]);
+        expect(result.isProjectComplete).toBe(true);
+        expect(apiClient_1.lightdashRawApi).toHaveBeenCalledWith({
+            method: 'GET',
+            url: '/api/v1/projects/project-uuid/dbt/manifest',
+            body: undefined,
+        });
+        expect(console.info).toHaveBeenCalledWith(expect.stringMatching(/added [1-9]\d* model\(s\)/));
+        const modelsForValidation = vi.mocked(validation_1.validateDbtModel).mock.calls[0][2];
+        const localModel = modelsForValidation.find((model) => model.unique_id === 'model.test.orders');
+        expect(localModel.description).toBe('Local orders description');
+        expect(localModel.lightdash_source_name).toBe('local_source');
+        expect(modelsForValidation.map((model) => model.unique_id)).not.toContain('model.served.customer_helper');
+        expect(vi.mocked(validation_1.validateDbtModel).mock.calls[0][3]).toEqual(new Set(['model.served.customers']));
+    });
+    test('replaces the complete local source while retaining served models from other sources', async () => {
+        const projectManifest = manifest({
+            'model.local.orders': dbtNode('model.local.orders', 'model', true, {
+                description: 'Local orders description',
+            }),
+        });
+        const servedManifest = (0, common_1.projectMergedManifest)(manifest({
+            'model.local.orders': dbtNode('model.local.orders', 'model', true, {
+                description: 'Served orders description',
+                lightdash_source_name: 'local_source',
+            }),
+            'model.local.deleted': dbtNode('model.local.deleted', 'model', true, {
+                lightdash_source_name: 'local_source',
+            }),
+            'model.other.customers': dbtNode('model.other.customers', 'model', true, {
+                lightdash_source_name: 'other_source',
+            }),
+        }));
+        vi.mocked(manifest_1.loadManifest).mockResolvedValue(projectManifest);
+        vi.mocked(apiClient_1.lightdashRawApi).mockResolvedValue(new node_fetch_1.Response(JSON.stringify(servedManifest)));
+        vi.mocked(compile_2.maybeCompileModelsAndJoins).mockResolvedValue({
+            compiledModelIds: ['model.local.orders'],
+            originallySelectedModelIds: undefined,
+        });
+        const result = await (0, compile_1.compileProject)({
+            ...compileOptions(tempDir),
+            combineManifestProjectUuid: 'project-uuid',
         });
         expect(result.isProjectComplete).toBe(true);
+        expect(result.explores.map((explore) => explore.name)).toEqual([
+            'orders',
+            'customers',
+        ]);
+        const modelsForValidation = vi.mocked(validation_1.validateDbtModel).mock.calls[0][2];
+        expect(modelsForValidation).toEqual(expect.arrayContaining([
+            expect.objectContaining({
+                unique_id: 'model.local.orders',
+                description: 'Local orders description',
+                lightdash_source_name: 'local_source',
+            }),
+            expect.objectContaining({
+                unique_id: 'model.other.customers',
+                lightdash_source_name: 'other_source',
+            }),
+        ]));
+        expect(modelsForValidation.map((model) => model.unique_id)).not.toContain('model.local.deleted');
+    });
+    test('additively combines selective local models with compiled served collision candidates', async () => {
+        const projectManifest = manifest({
+            'model.source_a.orders': dbtNode('model.source_a.orders', 'model', true, {
+                description: 'Local selected orders',
+            }),
+            'model.source_a.customers': dbtNode('model.source_a.customers', 'model', true, {
+                description: 'Local unselected customers',
+            }),
+        });
+        const servedManifest = (0, common_1.projectMergedManifest)(manifest({
+            'model.source_a.orders': dbtNode('model.source_a.orders', 'model', true, {
+                description: 'Served selected orders',
+                lightdash_source_name: 'source_a',
+            }),
+            'model.source_a.customers': dbtNode('model.source_a.customers', 'model', true, {
+                description: 'Served unselected customers',
+                lightdash_source_name: 'source_a',
+            }),
+            'model.source_a.deleted': dbtNode('model.source_a.deleted', 'model', true, {
+                lightdash_source_name: 'source_a',
+            }),
+            'model.source_b.customers': dbtNode('model.source_b.customers', 'model', true, {
+                lightdash_source_name: 'source_b',
+            }),
+        }));
+        vi.mocked(manifest_1.loadManifest).mockResolvedValue(projectManifest);
+        vi.mocked(apiClient_1.lightdashRawApi).mockResolvedValue(new node_fetch_1.Response(JSON.stringify(servedManifest)));
+        vi.mocked(compile_2.maybeCompileModelsAndJoins).mockResolvedValue({
+            compiledModelIds: ['model.source_a.orders'],
+            originallySelectedModelIds: ['model.source_a.orders'],
+        });
+        const result = await (0, compile_1.compileProject)({
+            ...compileOptions(tempDir),
+            combineManifestProjectUuid: 'project-uuid',
+        });
+        expect(result.isProjectComplete).toBe(false);
+        const modelsForValidation = vi.mocked(validation_1.validateDbtModel).mock.calls[0][2];
+        expect(modelsForValidation).toEqual(expect.arrayContaining([
+            expect.objectContaining({
+                unique_id: 'model.source_a.orders',
+                description: 'Local selected orders',
+                lightdash_source_name: 'source_a',
+            }),
+            expect.objectContaining({
+                unique_id: 'model.source_a.customers',
+                description: 'Served unselected customers',
+                compiled: true,
+                lightdash_source_name: 'source_a',
+            }),
+            expect.objectContaining({
+                unique_id: 'model.source_a.deleted',
+                lightdash_source_name: 'source_a',
+            }),
+            expect.objectContaining({
+                unique_id: 'model.source_b.customers',
+                lightdash_source_name: 'source_b',
+            }),
+        ]));
+        const unselectedCollisionCandidates = modelsForValidation.filter((model) => model.name === 'customers');
+        expect(unselectedCollisionCandidates.map((model) => ({
+            uniqueId: model.unique_id,
+            sourceName: model.lightdash_source_name,
+        }))).toEqual([
+            {
+                uniqueId: 'model.source_a.customers',
+                sourceName: 'source_a',
+            },
+            {
+                uniqueId: 'model.source_b.customers',
+                sourceName: 'source_b',
+            },
+        ]);
+    });
+    test('rejects automatic combination when overlaps identify multiple local sources', async () => {
+        const projectManifest = manifest({
+            'model.local.orders': dbtNode('model.local.orders', 'model', true),
+            'model.local.customers': dbtNode('model.local.customers', 'model', true),
+        });
+        const servedManifest = manifest({
+            'model.local.orders': dbtNode('model.local.orders', 'model', true, {
+                lightdash_source_name: 'source_a',
+            }),
+            'model.local.customers': dbtNode('model.local.customers', 'model', true, {
+                lightdash_source_name: 'source_c',
+            }),
+        });
+        vi.mocked(manifest_1.loadManifest).mockResolvedValue(projectManifest);
+        vi.mocked(apiClient_1.lightdashRawApi).mockResolvedValue(new node_fetch_1.Response(JSON.stringify(servedManifest)));
+        vi.mocked(compile_2.maybeCompileModelsAndJoins).mockResolvedValue({
+            compiledModelIds: ['model.local.orders', 'model.local.customers'],
+            originallySelectedModelIds: undefined,
+        });
+        await expect((0, compile_1.compileProject)({
+            ...compileOptions(tempDir),
+            combineManifestProjectUuid: 'project-uuid',
+        })).rejects.toThrow('Cannot automatically combine manifest from the server: overlapping local models match multiple Lightdash sources (source_a, source_c)');
+        expect(validation_1.validateDbtModel).not.toHaveBeenCalled();
+    });
+    test('skips automatic combination when the local dbt project is not a served source', async () => {
+        const projectManifest = manifest({
+            'model.local.orders': dbtNode('model.local.orders', 'model', true),
+        });
+        const servedManifest = manifest({
+            'model.served.customers': dbtNode('model.served.customers', 'model', true),
+        });
+        vi.mocked(manifest_1.loadManifest).mockResolvedValue(projectManifest);
+        vi.mocked(apiClient_1.lightdashRawApi).mockResolvedValue(new node_fetch_1.Response(JSON.stringify(servedManifest)));
+        vi.mocked(compile_2.maybeCompileModelsAndJoins).mockResolvedValue({
+            compiledModelIds: ['model.local.orders'],
+            originallySelectedModelIds: undefined,
+        });
+        const result = await (0, compile_1.compileProject)({
+            ...compileOptions(tempDir),
+            combineManifestProjectUuid: 'project-uuid',
+        });
+        expect(result.explores.map((explore) => explore.name)).toEqual([
+            'orders',
+        ]);
+        expect(console.info).toHaveBeenCalledWith(expect.stringContaining('the local dbt project is not a source of this Lightdash project'));
+    });
+    test('explains when a matching served manifest has no compiled models', async () => {
+        const projectManifest = manifest({
+            'model.test.orders': dbtNode('model.test.orders', 'model', true),
+        });
+        const servedManifest = manifest({
+            'model.test.orders': dbtNode('model.test.orders', 'model', false, {
+                lightdash_source_name: 'local_source',
+            }),
+            'model.served.helper': dbtNode('model.served.helper', 'model', false),
+        });
+        vi.mocked(manifest_1.loadManifest).mockResolvedValue(projectManifest);
+        vi.mocked(apiClient_1.lightdashRawApi).mockResolvedValue(new node_fetch_1.Response(JSON.stringify(servedManifest)));
+        vi.mocked(compile_2.maybeCompileModelsAndJoins).mockResolvedValue({
+            compiledModelIds: ['model.test.orders'],
+            originallySelectedModelIds: undefined,
+        });
+        await (0, compile_1.compileProject)({
+            ...compileOptions(tempDir),
+            combineManifestProjectUuid: 'project-uuid',
+        });
+        expect(console.info).toHaveBeenCalledWith(expect.stringContaining('contains no compiled models'));
+    });
+    test('explains when all compiled served models already overlap locally', async () => {
+        const projectManifest = manifest({
+            'model.test.orders': dbtNode('model.test.orders', 'model', true),
+        });
+        const servedManifest = manifest({
+            'model.test.orders': dbtNode('model.test.orders', 'model', true, {
+                lightdash_source_name: 'local_source',
+            }),
+        });
+        vi.mocked(manifest_1.loadManifest).mockResolvedValue(projectManifest);
+        vi.mocked(apiClient_1.lightdashRawApi).mockResolvedValue(new node_fetch_1.Response(JSON.stringify(servedManifest)));
+        vi.mocked(compile_2.maybeCompileModelsAndJoins).mockResolvedValue({
+            compiledModelIds: ['model.test.orders'],
+            originallySelectedModelIds: undefined,
+        });
+        await (0, compile_1.compileProject)({
+            ...compileOptions(tempDir),
+            combineManifestProjectUuid: 'project-uuid',
+        });
+        expect(console.info).toHaveBeenCalledWith(expect.stringContaining('all compiled models already exist in the preview manifest'));
+    });
+    test('notices when no served manifest exists and keeps the local manifest', async () => {
+        vi.mocked(manifest_1.loadManifest).mockResolvedValue(manifest({
+            'model.test.orders': dbtNode('model.test.orders', 'model', true),
+        }));
+        vi.mocked(apiClient_1.lightdashRawApi).mockRejectedValue(new common_1.LightdashError({
+            message: 'Manifest not found',
+            name: 'NotFoundError',
+            statusCode: 404,
+            data: {},
+        }));
+        vi.mocked(compile_2.maybeCompileModelsAndJoins).mockResolvedValue({
+            compiledModelIds: ['model.test.orders'],
+            originallySelectedModelIds: undefined,
+        });
+        const result = await (0, compile_1.compileProject)({
+            ...compileOptions(tempDir),
+            combineManifestProjectUuid: 'project-uuid',
+        });
+        expect(result.explores.map((explore) => explore.name)).toEqual([
+            'orders',
+        ]);
+        expect(console.error).not.toHaveBeenCalledWith(expect.stringContaining('Could not fetch the server manifest'));
+        expect(console.info).toHaveBeenCalledWith(expect.stringContaining('No server manifest found; continuing with the preview manifest'));
+    });
+    test.each([
+        ['a null response', null],
+        ['an array of nodes', { metadata: {}, nodes: [] }],
+        ['array metadata', { metadata: [], nodes: {} }],
+        ['missing metadata', { nodes: {} }],
+    ])('rejects %s from the server manifest endpoint and keeps the local manifest', async (_description, invalidManifest) => {
+        vi.mocked(manifest_1.loadManifest).mockResolvedValue(manifest({
+            'model.test.orders': dbtNode('model.test.orders', 'model', true),
+        }));
+        vi.mocked(apiClient_1.lightdashRawApi).mockResolvedValue(new node_fetch_1.Response(JSON.stringify(invalidManifest)));
+        vi.mocked(compile_2.maybeCompileModelsAndJoins).mockResolvedValue({
+            compiledModelIds: ['model.test.orders'],
+            originallySelectedModelIds: undefined,
+        });
+        const result = await (0, compile_1.compileProject)({
+            ...compileOptions(tempDir),
+            combineManifestProjectUuid: 'project-uuid',
+        });
+        expect(result.explores.map((explore) => explore.name)).toEqual([
+            'orders',
+        ]);
+        expect(console.error).toHaveBeenCalledWith(expect.stringContaining('/api/v1/projects/project-uuid/dbt/manifest returned an invalid manifest'));
+    });
+    test.each([
+        [
+            'an authorization error',
+            new common_1.LightdashError({
+                message: 'Not authorized',
+                name: 'AuthorizationError',
+                statusCode: 401,
+                data: {},
+            }),
+        ],
+        [
+            'a server error',
+            new common_1.LightdashError({
+                message: 'Server unavailable',
+                name: 'InternalServerError',
+                statusCode: 500,
+                data: {},
+            }),
+        ],
+        [
+            'a permission error',
+            new common_1.LightdashError({
+                message: 'Forbidden',
+                name: 'ForbiddenError',
+                statusCode: 403,
+                data: {},
+            }),
+        ],
+        ['a network error', new Error('Connection refused')],
+    ])('warns once and keeps the local manifest after %s', async (_description, error) => {
+        vi.mocked(manifest_1.loadManifest).mockResolvedValue(manifest({
+            'model.test.orders': dbtNode('model.test.orders', 'model', true),
+        }));
+        vi.mocked(apiClient_1.lightdashRawApi).mockRejectedValue(error);
+        vi.mocked(compile_2.maybeCompileModelsAndJoins).mockResolvedValue({
+            compiledModelIds: ['model.test.orders'],
+            originallySelectedModelIds: undefined,
+        });
+        const result = await (0, compile_1.compileProject)({
+            ...compileOptions(tempDir),
+            combineManifestProjectUuid: 'project-uuid',
+        });
+        expect(result.explores.map((explore) => explore.name)).toEqual([
+            'orders',
+        ]);
+        expect(vi
+            .mocked(console.error)
+            .mock.calls.filter(([message]) => String(message).includes('Could not fetch the server manifest'))).toHaveLength(1);
+    });
+    test('does not fetch a served manifest when manifest combining is disabled', async () => {
+        vi.mocked(manifest_1.loadManifest).mockResolvedValue(manifest({
+            'model.test.orders': dbtNode('model.test.orders', 'model', true),
+        }));
+        vi.mocked(compile_2.maybeCompileModelsAndJoins).mockResolvedValue({
+            compiledModelIds: ['model.test.orders'],
+            originallySelectedModelIds: undefined,
+        });
+        await (0, compile_1.compileProject)({
+            ...compileOptions(tempDir),
+            combine: false,
+            combineManifestProjectUuid: 'project-uuid',
+        });
+        expect(apiClient_1.lightdashRawApi).not.toHaveBeenCalled();
     });
 });

package/dist/handlers/compileWarehouseColumnValidation.test.js

@@ -307,6 +307,7 @@ describe('compile warehouse column validation', () => {
                 projectUuid: 'projectUuid',
                 ignoreErrors: true,
                 validateWarehouseColumns: true,
+                batchedDeploy: false,
             });
             const deployRequest = vi
                 .mocked(apiClient_1.lightdashApi)

package/dist/handlers/deploy.d.ts

@@ -13,7 +13,7 @@ type DeployHandlerOptions = DbtCompileOptions & {
     warehouseCredentials?: boolean;
     organizationCredentials?: string;
     assumeYes?: boolean;
-    useBatchedDeploy?: boolean;
+    batchedDeploy?: boolean;
     batchSize?: string;
     parallelBatches?: string;
     gzip?: boolean;

package/dist/handlers/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/handlers/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,OAAO,EACP,YAAY,EASf,MAAM,mBAAmB,CAAC;AA2B3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AASlD,KAAK,oBAAoB,GAAG,iBAAiB,GAAG;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,KAAK,UAAU,GAAG,oBAAoB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AA+QF,eAAO,MAAM,MAAM,aACL,CAAC,OAAO,GAAG,YAAY,CAAC,EAAE,WAC3B,UAAU,KACpB,OAAO,CAAC,IAAI,CA6Id,CAAC;AAiGF,eAAO,MAAM,aAAa,oBAA2B,oBAAoB,kBAuKxE,CAAC"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/handlers/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,OAAO,EACP,YAAY,EASf,MAAM,mBAAmB,CAAC;AA2B3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AASlD,KAAK,oBAAoB,GAAG,iBAAiB,GAAG;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,KAAK,UAAU,GAAG,oBAAoB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AA6RF,eAAO,MAAM,MAAM,aACL,CAAC,OAAO,GAAG,YAAY,CAAC,EAAE,WAC3B,UAAU,KACpB,OAAO,CAAC,IAAI,CA6Id,CAAC;AAiGF,eAAO,MAAM,aAAa,oBAA2B,oBAAoB,kBAuKxE,CAAC"}

package/dist/handlers/deploy.js

@@ -122,13 +122,23 @@ const deployBatched = async (explores, options) => {
     const deployStartTime = Date.now();
     // Start deploy session
     globalState_1.default.log(`Starting deploy session...`);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const startSessionResponse = (await (0, apiClient_1.lightdashApi)({
-        method: 'POST',
-        url: `/api/v2/projects/${options.projectUuid}/deploy`,
-        body: JSON.stringify({}),
-    }));
-    const sessionUuid = startSessionResponse.deploySessionUuid;
+    let sessionUuid;
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const startSessionResponse = (await (0, apiClient_1.lightdashApi)({
+            method: 'POST',
+            url: `/api/v2/projects/${options.projectUuid}/deploy`,
+            body: JSON.stringify({}),
+        }));
+        sessionUuid = startSessionResponse.deploySessionUuid;
+    }
+    catch (error) {
+        if (error instanceof common_1.LightdashError && error.statusCode === 404) {
+            globalState_1.default.log(styles.info('Batched deploy is not supported by this server; falling back to legacy deploy'));
+            return false;
+        }
+        throw error;
+    }
     globalState_1.default.log(styles.success(`Deploy session created: ${sessionUuid}`));
     // Split explores into batches
     const batches = [];
@@ -185,6 +195,7 @@ const deployBatched = async (explores, options) => {
             durationMs: Date.now() - deployStartTime,
         },
     });
+    return true;
 };
 const deploy = async (explores, options) => {
     if (explores.length === 0) {
@@ -228,11 +239,9 @@ const deploy = async (explores, options) => {
     catch (e) {
         console.error(styles.warning(`\nError replacing project table groups: ${(0, common_1.getErrorMessage)(e)}\n`));
     }
-    // Use batched deploy if enabled
-    if (options.useBatchedDeploy) {
-        await deployBatched(deployableExplores, options);
-    }
-    else {
+    const shouldUseLegacyDeploy = options.batchedDeploy === false ||
+        !(await deployBatched(deployableExplores, options));
+    if (shouldUseLegacyDeploy) {
         const deployStartTime = Date.now();
         const deployPayload = JSON.stringify(deployableExplores);
         try {

package/dist/handlers/deploy.test.js

@@ -58,7 +58,7 @@ describe('deploy completeness transport', () => {
         { complete: true, expected: 'true' },
         { complete: false, expected: 'false' },
         { complete: undefined, expected: 'false' },
-    ])('sends complete=$expected on the default upload', async ({ complete, expected }) => {
+    ])('sends complete=$expected when batched deploy is disabled', async ({ complete, expected }) => {
         vi.mocked(apiClient_1.lightdashApi).mockImplementation(async ({ url }) => {
             if (url.includes('/explores?')) {
                 return {
@@ -74,6 +74,7 @@ describe('deploy completeness transport', () => {
         await (0, deploy_1.deploy)([compiledExplore], {
             ...deployOptions,
             complete,
+            batchedDeploy: false,
         });
         expect(apiClient_1.lightdashApi).toHaveBeenCalledWith(expect.objectContaining({
             method: 'PUT',
@@ -81,7 +82,7 @@ describe('deploy completeness transport', () => {
             body: JSON.stringify([compiledExplore]),
         }));
     });
-    test('includes the completeness assertion in every batch body', async () => {
+    test('uses batched deploy by default and includes the completeness assertion in every batch body', async () => {
         vi.mocked(apiClient_1.lightdashApi).mockImplementation(async ({ url }) => {
             if (url.endsWith('/deploy')) {
                 return {
@@ -106,7 +107,6 @@ describe('deploy completeness transport', () => {
         await (0, deploy_1.deploy)([compiledExplore], {
             ...deployOptions,
             complete: false,
-            useBatchedDeploy: true,
         });
         expect(apiClient_1.lightdashApi).toHaveBeenCalledWith({
             method: 'POST',
@@ -118,4 +118,51 @@ describe('deploy completeness transport', () => {
             }),
         });
     });
+    test('falls back to the legacy deploy when session creation returns 404', async () => {
+        vi.mocked(apiClient_1.lightdashApi).mockImplementation(async ({ url }) => {
+            if (url.endsWith('/deploy')) {
+                throw new common_1.LightdashError({
+                    message: 'Not found',
+                    name: 'NotFoundError',
+                    statusCode: 404,
+                    data: {},
+                });
+            }
+            if (url.includes('/explores?')) {
+                return {
+                    exploreCount: 1,
+                    warnings: {
+                        warningCount: 0,
+                        exploresWithWarnings: [],
+                    },
+                };
+            }
+            return null;
+        });
+        await (0, deploy_1.deploy)([compiledExplore], deployOptions);
+        expect(apiClient_1.lightdashApi).toHaveBeenCalledWith({
+            method: 'PUT',
+            url: '/api/v1/projects/project-uuid/explores?complete=false',
+            body: JSON.stringify([compiledExplore]),
+        });
+    });
+    test('propagates non-404 session creation errors', async () => {
+        const serverError = new common_1.LightdashError({
+            message: 'Server unavailable',
+            name: 'InternalServerError',
+            statusCode: 500,
+            data: {},
+        });
+        vi.mocked(apiClient_1.lightdashApi).mockImplementation(async ({ url }) => {
+            if (url.endsWith('/deploy')) {
+                throw serverError;
+            }
+            return null;
+        });
+        await expect((0, deploy_1.deploy)([compiledExplore], deployOptions)).rejects.toBe(serverError);
+        expect(apiClient_1.lightdashApi).not.toHaveBeenCalledWith(expect.objectContaining({
+            method: 'PUT',
+            url: expect.stringContaining('/explores?'),
+        }));
+    });
 });

package/dist/handlers/preview.d.ts

@@ -14,13 +14,15 @@ type PreviewHandlerOptions = DbtCompileOptions & {
     organizationCredentials?: string;
     assumeYes?: boolean;
     warehouseCredentials?: boolean;
-    useBatchedDeploy?: boolean;
+    batchedDeploy?: boolean;
     batchSize?: string;
     parallelBatches?: string;
     expiresIn?: string;
     disableTimestampConversion?: boolean;
     validateWarehouseColumns: boolean;
     partialCompilation?: boolean;
+    combine?: boolean;
+    combineManifestProjectUuid?: string;
 };
 type StopPreviewHandlerOptions = {
     name: string;

package/dist/handlers/preview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../src/handlers/preview.ts"],"names":[],"mappings":"AACA,OAAO,EACH,+BAA+B,EAKlC,MAAM,mBAAmB,CAAC;AAgB3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAOlD,KAAK,qBAAqB,GAAG,iBAAiB,GAAG;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,kBAAkB,EAAE,+BAA+B,CAAC;IACpD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AA2GF,eAAO,MAAM,cAAc,oBACN,qBAAqB,KACvC,OAAO,CAAC,IAAI,CAsSd,CAAC;AAEF,eAAO,MAAM,mBAAmB,oBACX,qBAAqB,KACvC,OAAO,CAAC,IAAI,CAqLd,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAClB,yBAAyB,KACnC,OAAO,CAAC,IAAI,CA0Cd,CAAC"}
+{"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../src/handlers/preview.ts"],"names":[],"mappings":"AACA,OAAO,EACH,+BAA+B,EAKlC,MAAM,mBAAmB,CAAC;AAgB3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAOlD,KAAK,qBAAqB,GAAG,iBAAiB,GAAG;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,kBAAkB,EAAE,+BAA+B,CAAC;IACpD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACvC,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AA2GF,eAAO,MAAM,cAAc,oBACN,qBAAqB,KACvC,OAAO,CAAC,IAAI,CAuSd,CAAC;AAEF,eAAO,MAAM,mBAAmB,oBACX,qBAAqB,KACvC,OAAO,CAAC,IAAI,CAsLd,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAClB,yBAAyB,KACnC,OAAO,CAAC,IAAI,CA0Cd,CAAC"}

package/dist/handlers/preview.js

@@ -132,6 +132,7 @@ const previewHandler = async (originalOptions) => {
     let contentCopyError;
     let contentCopySkipReason;
     const config = await (0, config_1.getConfig)();
+    options.combineManifestProjectUuid = config.context?.project;
     // Validate upstream project before attempting to copy permissions or content
     let upstreamProjectValid = false;
     if (config.context?.project) {
@@ -328,6 +329,7 @@ const startPreviewHandler = async (originalOptions) => {
     });
     const projectName = options.name;
     const config = await (0, config_1.getConfig)();
+    options.combineManifestProjectUuid = config.context?.project;
     // Log current source project info if copying content
     if (!options.skipCopyContent && config.context?.project) {
         console.error(`\n${styles.success('Source project for content:')} ${styles.bold(config.context.projectName || config.context.project)}\n`);