@lightdash/cli 0.1456.1 → 0.1457.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Telescope Technologies Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/dbt/models.d.ts

@@ -1,4 +1,4 @@
-import { DbtDoc, DbtManifest, DbtModelNode } from '@lightdash/common';
+import { DbtDoc, DbtModelNode } from '@lightdash/common';
 import { WarehouseClient, WarehouseTableSchema } from '@lightdash/warehouses';
 import { YamlSchema } from './schema';
 type CompiledModel = {
@@ -29,7 +29,6 @@ export declare const findAndUpdateModelYaml: ({ model, table, docs, includeMeta,
     updatedYml: YamlSchema;
     outputFilePath: string;
 }>;
-export declare const getModelsFromManifest: (manifest: DbtManifest) => DbtModelNode[];
 export declare const getCompiledModels: (models: DbtModelNode[], args: {
     select: string[] | undefined;
     exclude: string[] | undefined;

package/dist/dbt/models.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCompiledModels = exports.getModelsFromManifest = exports.findAndUpdateModelYaml = exports.isDocBlock = exports.getWarehouseTableForModel = void 0;
+exports.getCompiledModels = exports.findAndUpdateModelYaml = exports.isDocBlock = exports.getWarehouseTableForModel = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@lightdash/common");
 const execa_1 = tslib_1.__importDefault(require("execa"));
@@ -191,19 +191,6 @@ const findAndUpdateModelYaml = async ({ model, table, docs, includeMeta, project
     };
 };
 exports.findAndUpdateModelYaml = findAndUpdateModelYaml;
-const getModelsFromManifest = (manifest) => {
-    const models = Object.values(manifest.nodes).filter((node) => node.resource_type === 'model' &&
-        node.config?.materialized !== 'ephemeral');
-    if (!(0, common_1.isSupportedDbtAdapter)(manifest.metadata)) {
-        throw new common_1.ParseError(`dbt adapter not supported. Lightdash does not support adapter ${manifest.metadata.adapter_type}`, {});
-    }
-    const adapterType = manifest.metadata.adapter_type;
-    return models
-        .filter((model) => model.config?.materialized &&
-        model.config.materialized !== 'ephemeral')
-        .map((model) => (0, common_1.normaliseModelDatabase)(model, adapterType));
-};
-exports.getModelsFromManifest = getModelsFromManifest;
 const getCompiledModels = async (models, args) => {
     let allModelIds = models.map((model) => model.unique_id);
     if (args.select || args.exclude) {

package/dist/handlers/compile.js

@@ -8,7 +8,6 @@ const uuid_1 = require("uuid");
 const analytics_1 = require("../analytics/analytics");
 const context_1 = require("../dbt/context");
 const manifest_1 = require("../dbt/manifest");
-const models_1 = require("../dbt/models");
 const validation_1 = require("../dbt/validation");
 const globalState_1 = tslib_1.__importDefault(require("../globalState"));
 const styles = tslib_1.__importStar(require("../styles"));
@@ -42,8 +41,8 @@ const compile = async (options) => {
     const compiledModelIds = await (0, compile_1.maybeCompileModelsAndJoins)({ targetDir: context.targetDir }, options);
     const manifest = await (0, manifest_1.loadManifest)({ targetDir: context.targetDir });
     const manifestVersion = (0, common_1.getDbtManifestVersion)(manifest);
-    const manifestModels = (0, models_1.getModelsFromManifest)(manifest);
-    const compiledModels = (0, compile_1.getCompiledModels)(manifestModels, compiledModelIds);
+    const manifestModels = (0, common_1.getModelsFromManifest)(manifest);
+    const compiledModels = (0, common_1.getCompiledModels)(manifestModels, compiledModelIds);
     const adapterType = manifest.metadata.adapter_type;
     const { valid: validModels, invalid: failedExplores } = await (0, validation_1.validateDbtModel)(adapterType, manifestVersion, compiledModels);
     if (failedExplores.length > 0) {

package/dist/handlers/dbt/compile.d.ts

@@ -1,4 +1,3 @@
-import { DbtModelNode } from '@lightdash/common';
 import { LoadManifestArgs } from '../../dbt/manifest';
 export type DbtCompileOptions = {
     profilesDir: string | undefined;
@@ -19,5 +18,4 @@ export type DbtCompileOptions = {
     useDbtList: boolean | undefined;
 };
 export declare const dbtCompile: (options: DbtCompileOptions) => Promise<void>;
-export declare function getCompiledModels(manifestModels: DbtModelNode[], compiledModelIds?: string[]): DbtModelNode[];
 export declare function maybeCompileModelsAndJoins(loadManifestOpts: LoadManifestArgs, initialOptions: DbtCompileOptions): Promise<string[] | undefined>;

package/dist/handlers/dbt/compile.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maybeCompileModelsAndJoins = exports.getCompiledModels = exports.dbtCompile = void 0;
+exports.maybeCompileModelsAndJoins = exports.dbtCompile = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@lightdash/common");
 const execa_1 = tslib_1.__importDefault(require("execa"));
 const lodash_1 = require("lodash");
 const manifest_1 = require("../../dbt/manifest");
-const models_1 = require("../../dbt/models");
 const globalState_1 = tslib_1.__importDefault(require("../../globalState"));
 const getDbtVersion_1 = require("./getDbtVersion");
 const dbtCompileArgs = [
@@ -53,15 +52,6 @@ const dbtCompile = async (options) => {
     }
 };
 exports.dbtCompile = dbtCompile;
-function getCompiledModels(manifestModels, compiledModelIds) {
-    return manifestModels.filter((model) => {
-        if (compiledModelIds) {
-            return compiledModelIds.includes(model.unique_id);
-        }
-        return model.compiled;
-    });
-}
-exports.getCompiledModels = getCompiledModels;
 const getJoinedModelsRecursively = (modelNode, allModelNodes, visited = new Set()) => {
     if (visited.has(modelNode.name)) {
         globalState_1.default.debug(`Already visited ${modelNode.name}. Skipping.`);
@@ -148,8 +138,8 @@ async function maybeCompileModelsAndJoins(loadManifestOpts, initialOptions) {
     }
     // Load manifest and get all models
     const manifest = await (0, manifest_1.loadManifest)(loadManifestOpts);
-    const allManifestModels = (0, models_1.getModelsFromManifest)(manifest);
-    const currCompiledModels = getCompiledModels(allManifestModels, compiledModelIds);
+    const allManifestModels = (0, common_1.getModelsFromManifest)(manifest);
+    const currCompiledModels = (0, common_1.getCompiledModels)(allManifestModels, compiledModelIds);
     // Get models and their joined models
     const requiredModels = new Set(currCompiledModels.reduce((acc, model) => {
         const joinedModelNames = getJoinedModelsRecursively(model, allManifestModels, new Set(acc));

package/dist/handlers/generate.js

@@ -59,7 +59,7 @@ const generateHandler = async (options) => {
         startOfWeek: options.startOfWeek,
     });
     const manifest = await (0, manifest_1.loadManifest)({ targetDir: context.targetDir });
-    const models = (0, models_1.getModelsFromManifest)(manifest);
+    const models = (0, common_1.getModelsFromManifest)(manifest);
     const compiledModels = await (0, models_1.getCompiledModels)(models, {
         projectDir: dbtVersion.isDbtCloudCLI ? undefined : absoluteProjectPath,
         profilesDir: dbtVersion.isDbtCloudCLI

package/package.json

@@ -1,58 +1,59 @@
 {
-    "name": "@lightdash/cli",
-    "version": "0.1456.1",
-    "license": "MIT",
-    "bin": {
-        "lightdash": "dist/index.js"
-    },
-    "files": [
-        "dist/**/*",
-        "track.sh"
-    ],
-    "dependencies": {
-        "@actions/core": "^1.11.1",
-        "@lightdash/common": "workspace:*",
-        "@lightdash/warehouses": "workspace:*",
-        "@types/columnify": "^1.5.1",
-        "ajv": "^8.11.0",
-        "ajv-formats": "^2.1.1",
-        "better-ajv-errors": "^1.2.0",
-        "chalk": "4.1.2",
-        "chokidar": "^3.5.3",
-        "columnify": "^1.6.0",
-        "commander": "^9.2.0",
-        "execa": "^5",
-        "google-auth-library": "^8.5.1",
-        "inquirer": "^8.2.4",
-        "js-yaml": "^4.1.0",
-        "lodash": "^4.17.21",
-        "node-fetch": "^2.7.0",
-        "nunjucks": "^3.2.3",
-        "ora": "5.4.1",
-        "parse-node-version": "^2.0.0",
-        "unique-names-generator": "^4.7.1",
-        "uuid": "^11.0.3"
-    },
-    "description": "Lightdash CLI tool",
-    "devDependencies": {
-        "@types/inquirer": "^8.2.1",
-        "@types/js-yaml": "^4.0.9",
-        "@types/lodash": "^4.14.185",
-        "@types/node-fetch": "2.x",
-        "@types/nunjucks": "^3.2.1",
-        "@types/parse-node-version": "^1.0.0",
-        "@types/uuid": "^10.0.0"
-    },
-    "scripts": {
-        "test": "jest",
-        "build": "tsc --build tsconfig.json",
-        "linter": "eslint -c .eslintrc.js --ignore-path ./../../.gitignore",
-        "formatter": "prettier --config .prettierrc.js --ignore-unknown --ignore-path ./../../.gitignore",
-        "lint": "pnpm run linter ./src",
-        "fix-lint": "pnpm run linter ./src --fix",
-        "format": "pnpm run formatter ./src --check",
-        "fix-format": "pnpm run formatter ./src --write",
-        "preinstall": "bash track.sh started || echo 'skipping preinstall'",
-        "postinstall": "bash track.sh completed || echo 'skipping postinstall'"
-    }
-}
+  "name": "@lightdash/cli",
+  "version": "0.1457.0",
+  "license": "MIT",
+  "bin": {
+    "lightdash": "dist/index.js"
+  },
+  "files": [
+    "dist/**/*",
+    "track.sh"
+  ],
+  "dependencies": {
+    "@actions/core": "^1.11.1",
+    "@types/columnify": "^1.5.1",
+    "ajv": "^8.11.0",
+    "ajv-formats": "^2.1.1",
+    "better-ajv-errors": "^1.2.0",
+    "chalk": "4.1.2",
+    "chokidar": "^3.5.3",
+    "columnify": "^1.6.0",
+    "commander": "^9.2.0",
+    "execa": "^5",
+    "google-auth-library": "^8.5.1",
+    "inquirer": "^8.2.4",
+    "js-yaml": "^4.1.0",
+    "lodash": "^4.17.21",
+    "node-fetch": "^2.7.0",
+    "nunjucks": "^3.2.3",
+    "ora": "5.4.1",
+    "parse-node-version": "^2.0.0",
+    "unique-names-generator": "^4.7.1",
+    "uuid": "^11.0.3",
+    "@lightdash/common": "0.1457.0",
+    "@lightdash/warehouses": "0.1457.0"
+  },
+  "description": "Lightdash CLI tool",
+  "devDependencies": {
+    "@types/inquirer": "^8.2.1",
+    "@types/js-yaml": "^4.0.9",
+    "@types/lodash": "^4.14.185",
+    "@types/node-fetch": "2.x",
+    "@types/nunjucks": "^3.2.1",
+    "@types/parse-node-version": "^1.0.0",
+    "@types/uuid": "^10.0.0"
+  },
+  "scripts": {
+    "test": "jest",
+    "build": "tsc --build tsconfig.json",
+    "linter": "eslint -c .eslintrc.js --ignore-path ./../../.gitignore",
+    "formatter": "prettier --config .prettierrc.js --ignore-unknown --ignore-path ./../../.gitignore",
+    "lint": "pnpm run linter ./src",
+    "fix-lint": "pnpm run linter ./src --fix",
+    "format": "pnpm run formatter ./src --check",
+    "fix-format": "pnpm run formatter ./src --write",
+    "preinstall": "bash track.sh started || echo 'skipping preinstall'",
+    "postinstall": "bash track.sh completed || echo 'skipping postinstall'",
+    "release": "pnpm publish --no-git-checks"
+  }
+}