Feature: dependent assertions as dependencies

core/actions/assertion.ts

@@ -56,7 +56,8 @@ export const IAssertionConfigProperties = strictKeysOf<IAssertionConfig>()([
   "name",
   "schema",
   "tags",
-  "type"
+  "type",
+  "dependOnDependencyAssertions"
 ]);
 
 /**
@@ -151,7 +152,9 @@ export class Assertion extends ActionBuilder<dataform.Assertion> {
   public dependencies(value: Resolvable | Resolvable[]) {
     const newDependencies = Array.isArray(value) ? value : [value];
     newDependencies.forEach(resolvable => {
-      this.proto.dependencyTargets.push(resolvableAsTarget(resolvable));
+      const resolvableTarget = resolvableAsTarget(resolvable);
+      this.session.actionAssertionMap.set(resolvableTarget, this.proto.target);
+      this.proto.dependencyTargets.push(resolvableTarget);
     });
     return this;
   }

core/actions/operation.ts

@@ -22,7 +22,8 @@ import {
   resolveActionsConfigFilename,
   setNameAndTarget,
   strictKeysOf,
-  toResolvable
+  toResolvable,
+  isSameTarget
 } from "df/core/utils";
 import { dataform } from "df/protos/ts";
 
@@ -59,7 +60,8 @@ export const IIOperationConfigProperties = strictKeysOf<IOperationConfig>()([
   "name",
   "schema",
   "tags",
-  "type"
+  "type",
+  "dependOnDependencyAssertions"
 ]);
 
 /**
@@ -75,6 +77,10 @@ export class Operation extends ActionBuilder<dataform.Operation> {
   // We delay contextification until the final compile step, so hold these here for now.
   private contextableQueries: Contextable<ICommonContext, string | string[]>;
 
+  // This is Action level flag. If set to true, we will add assertions from all the depenedncies of
+  // current action as dependencies. 
+  public dependOnDependencyAssertions: boolean = false;
+
   constructor(
     session?: Session,
     config?: dataform.ActionConfig.OperationConfig,
@@ -118,6 +124,9 @@ export class Operation extends ActionBuilder<dataform.Operation> {
       IIOperationConfigProperties,
       "operation config"
     );
+    if (config.dependOnDependencyAssertions) {
+      this.setDependOnDependencyAssertions(config.dependOnDependencyAssertions);
+    }
     if (config.dependencies) {
       this.dependencies(config.dependencies);
     }
@@ -156,7 +165,19 @@ export class Operation extends ActionBuilder<dataform.Operation> {
   public dependencies(value: Resolvable | Resolvable[]) {
     const newDependencies = Array.isArray(value) ? value : [value];
     newDependencies.forEach(resolvable => {
-      this.proto.dependencyTargets.push(resolvableAsTarget(resolvable));
+      let dependencyTarget = resolvableAsTarget(resolvable);
+      dependencyTarget.includeDependentAssertions = dependencyTarget.includeDependentAssertions===undefined ? this.dependOnDependencyAssertions : dependencyTarget.includeDependentAssertions;
+      const existingDependencies = this.proto.dependencyTargets.filter(dependency => isSameTarget(dependencyTarget, dependency) && dependency.includeDependentAssertions !== dependencyTarget.includeDependentAssertions)
+      if (existingDependencies.length !== 0){
+          this.session.compileError(
+            `Conflicting "includeDependentAssertions" flag not allowed. Dependency ${dependencyTarget.name} have different value set for this flag.`,
+             this.proto.fileName,
+             this.proto.target
+          )
+          return this;
+      }
+
+      this.proto.dependencyTargets.push(dependencyTarget);
     });
     return this;
   }
@@ -228,6 +249,11 @@ export class Operation extends ActionBuilder<dataform.Operation> {
     return this;
   }
 
+  public setDependOnDependencyAssertions(dependOnDependencyAssertions: boolean){
+    this.dependOnDependencyAssertions = dependOnDependencyAssertions;
+    return this;
+  }
+
   /**
    * @hidden
    */

core/actions/table.ts

@@ -25,7 +25,8 @@ import {
   strictKeysOf,
   tableTypeStringToEnum,
   toResolvable,
-  validateQueryString
+  validateQueryString,
+  isSameTarget
 } from "df/core/utils";
 import { dataform } from "df/protos/ts";
 
@@ -221,7 +222,8 @@ export const ITableConfigProperties = () =>
     "database",
     "columns",
     "description",
-    "materialized"
+    "materialized",
+    "dependOnDependencyAssertions"
   ]);
 
 /**
@@ -265,6 +267,10 @@ export class Table extends ActionBuilder<dataform.Table> {
   private uniqueKeyAssertions: Assertion[] = [];
   private rowConditionsAssertion: Assertion;
 
+  // This is Action level flag. If set to true, we will add assertions from all the depenedncies of
+  // current action as dependencies. 
+  public dependOnDependencyAssertions: boolean = false;
+
   constructor(
     session?: Session,
     tableTypeConfig?:
@@ -444,6 +450,9 @@ export class Table extends ActionBuilder<dataform.Table> {
     if (config.type) {
       this.type(config.type);
     }
+    if (config.dependOnDependencyAssertions) {
+      this.setDependOnDependencyAssertions(config.dependOnDependencyAssertions);
+    }
     if (config.dependencies) {
       this.dependencies(config.dependencies);
     }
@@ -553,7 +562,19 @@ export class Table extends ActionBuilder<dataform.Table> {
   public dependencies(value: Resolvable | Resolvable[]) {
     const newDependencies = Array.isArray(value) ? value : [value];
     newDependencies.forEach(resolvable => {
-      this.proto.dependencyTargets.push(resolvableAsTarget(resolvable));
+      let dependencyTarget = resolvableAsTarget(resolvable);
+      dependencyTarget.includeDependentAssertions = dependencyTarget.includeDependentAssertions===undefined ? this.dependOnDependencyAssertions : dependencyTarget.includeDependentAssertions;
+      const existingDependencies = this.proto.dependencyTargets.filter(dependency => isSameTarget(dependencyTarget, dependency) && dependency.includeDependentAssertions !== dependencyTarget.includeDependentAssertions)
+      if (existingDependencies.length !== 0){
+          this.session.compileError(
+            `Conflicting "includeDependentAssertions" flag not allowed. Dependency ${dependencyTarget.name} have different value set for this flag.`,
+             this.proto.fileName,
+             this.proto.target
+          )
+          return this;
+      }
+
+      this.proto.dependencyTargets.push(dependencyTarget);
     });
 
     return this;
@@ -676,6 +697,11 @@ export class Table extends ActionBuilder<dataform.Table> {
     return this;
   }
 
+  public setDependOnDependencyAssertions(dependOnDependencyAssertions: boolean){
+    this.dependOnDependencyAssertions = dependOnDependencyAssertions;
+    return this;
+  }
+
   /**
    * @hidden
    */

core/common.ts

@@ -133,6 +133,11 @@ export interface IDependenciesConfig {
    * dependencies, then it should be set to `true`.
    */
   hermetic?: boolean;
+
+  /**
+   * If this flag is set to true, assertions depenedent upon any of the dependencies are added as depenedencies as well.
+   */
+  dependOnDependencyAssertions?: boolean;
 }
 
 /**
@@ -219,6 +224,8 @@ export interface ITarget {
   schema?: string;
 
   name?: string;
+
+  IncludeDependentAssertions?: boolean;
 }
 
 /**