@tinybirdco/sdk 0.0.4 → 0.0.7

package/src/cli/commands/init.ts

@@ -4,12 +4,14 @@
 
 import * as fs from "fs";
 import * as path from "path";
+import * as p from "@clack/prompts";
+import pc from "picocolors";
 import {
   hasValidToken,
-  getTinybirdDir,
   getRelativeTinybirdDir,
   getConfigPath,
   updateConfig,
+  type DevMode,
 } from "../config.js";
 import { browserLogin } from "../auth.js";
 import { saveTinybirdToken } from "../env.js";
@@ -40,9 +42,9 @@ export type PageViewsRow = InferRow<typeof pageViews>;
 `;
 
 /**
- * Default starter content for pipes.ts
+ * Default starter content for endpoints.ts
  */
-const PIPES_CONTENT = `import { defineEndpoint, node, t, p, type InferParams, type InferOutputRow } from "@tinybirdco/sdk";
+const ENDPOINTS_CONTENT = `import { defineEndpoint, node, t, p, type InferParams, type InferOutputRow } from "@tinybirdco/sdk";
 
 /**
  * Top pages endpoint - get the most visited pages
@@ -88,7 +90,7 @@ const CLIENT_CONTENT = `/**
  * Tinybird Client
  *
  * This file defines the typed Tinybird client for your project.
- * Add your datasources and pipes here as you create them.
+ * Add your datasources and endpoints here as you create them.
  */
 
 import { createTinybirdClient } from "@tinybirdco/sdk";
@@ -97,7 +99,7 @@ import { createTinybirdClient } from "@tinybirdco/sdk";
 import { pageViews, type PageViewsRow } from "./datasources";
 
 // Import endpoints and their types
-import { topPages, type TopPagesParams, type TopPagesOutput } from "./pipes";
+import { topPages, type TopPagesParams, type TopPagesOutput } from "./endpoints";
 
 // Create the typed Tinybird client
 export const tinybird = createTinybirdClient({
@@ -112,17 +114,82 @@ export type { PageViewsRow, TopPagesParams, TopPagesOutput };
 export { pageViews, topPages };
 `;
 
+const TINYBIRD_CI_WORKFLOW = `name: Tinybird CI
+
+on:
+  pull_request:
+    paths:
+      - "tinybird.json"
+      - "src/tinybird/**"
+      - "tinybird/**"
+      - "**/*.datasource"
+      - "**/*.pipe"
+
+jobs:
+  tinybird:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "pnpm"
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm run tinybird:deploy -- --check
+        env:
+          TINYBIRD_TOKEN: \${{ secrets.TINYBIRD_TOKEN }}
+`;
+
+const TINYBIRD_CD_WORKFLOW = `name: Tinybird CD
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "tinybird.json"
+      - "src/tinybird/**"
+      - "tinybird/**"
+      - "**/*.datasource"
+      - "**/*.pipe"
+
+jobs:
+  tinybird:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "pnpm"
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm run tinybird:deploy
+        env:
+          TINYBIRD_TOKEN: \${{ secrets.TINYBIRD_TOKEN }}
+`;
+
+const TINYBIRD_GITLAB_CI = `stages:\n  - tinybird\n\ntinybird_ci:\n  stage: tinybird\n  image: node:20\n  rules:\n    - changes:\n        - tinybird.json\n        - src/tinybird/**\n        - tinybird/**\n        - **/*.datasource\n        - **/*.pipe\n  script:\n    - corepack enable\n    - pnpm install --frozen-lockfile\n    - pnpm run tinybird:deploy -- --check\n  variables:\n    TINYBIRD_TOKEN: \${TINYBIRD_TOKEN}\n\ntinybird_cd:\n  stage: tinybird\n  image: node:20\n  rules:\n    - if: '$CI_COMMIT_BRANCH == \"main\"'\n      changes:\n        - tinybird.json\n        - src/tinybird/**\n        - tinybird/**\n        - **/*.datasource\n        - **/*.pipe\n  script:\n    - corepack enable\n    - pnpm install --frozen-lockfile\n    - pnpm run tinybird:deploy\n  variables:\n    TINYBIRD_TOKEN: \${TINYBIRD_TOKEN}\n`;
+
 /**
  * Default config content generator
  */
-function createDefaultConfig(tinybirdDir: string) {
+function createDefaultConfig(
+  tinybirdDir: string,
+  devMode: DevMode,
+  additionalIncludes: string[] = []
+) {
+  const include = [
+    `${tinybirdDir}/datasources.ts`,
+    `${tinybirdDir}/endpoints.ts`,
+    ...additionalIncludes,
+  ];
   return {
-    include: [
-      `${tinybirdDir}/datasources.ts`,
-      `${tinybirdDir}/pipes.ts`,
-    ],
+    include,
     token: "${TINYBIRD_TOKEN}",
     baseUrl: "https://api.tinybird.co",
+    devMode,
   };
 }
 
@@ -136,6 +203,22 @@ export interface InitOptions {
   force?: boolean;
   /** Skip the login flow */
   skipLogin?: boolean;
+  /** Development mode - if provided, skip interactive prompt */
+  devMode?: DevMode;
+  /** Client path - if provided, skip interactive prompt */
+  clientPath?: string;
+  /** Skip prompts for existing datafiles - for testing */
+  skipDatafilePrompt?: boolean;
+  /** Auto-include existing datafiles without prompting - for testing */
+  includeExistingDatafiles?: boolean;
+  /** Skip GitHub Actions workflow prompts */
+  skipWorkflowPrompt?: boolean;
+  /** Include Tinybird CI workflow */
+  includeCiWorkflow?: boolean;
+  /** Include Tinybird CD workflow */
+  includeCdWorkflow?: boolean;
+  /** Git provider for workflow templates */
+  workflowProvider?: "github" | "gitlab";
 }
 
 /**
@@ -156,6 +239,72 @@ export interface InitResult {
   workspaceName?: string;
   /** User email after login */
   userEmail?: string;
+  /** Selected development mode */
+  devMode?: DevMode;
+  /** Selected client path */
+  clientPath?: string;
+  /** Existing datafiles that were added to config */
+  existingDatafiles?: string[];
+  /** Whether a Tinybird CI workflow was created */
+  ciWorkflowCreated?: boolean;
+  /** Whether a Tinybird CD workflow was created */
+  cdWorkflowCreated?: boolean;
+  /** Git provider used for workflow templates */
+  workflowProvider?: "github" | "gitlab";
+}
+
+/**
+ * Find existing .datasource and .pipe files in the repository
+ *
+ * @param cwd - Working directory to search from
+ * @param maxDepth - Maximum directory depth to search (default: 5)
+ * @returns Array of relative file paths
+ */
+export function findExistingDatafiles(
+  cwd: string,
+  maxDepth: number = 5
+): string[] {
+  const files: string[] = [];
+
+  function searchDir(dir: string, depth: number): void {
+    if (depth > maxDepth) return;
+
+    let entries: fs.Dirent[];
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return; // Skip directories we can't read
+    }
+
+    for (const entry of entries) {
+      const fullPath = path.join(dir, entry.name);
+
+      // Skip node_modules and hidden directories
+      if (
+        entry.isDirectory() &&
+        (entry.name === "node_modules" ||
+          entry.name.startsWith(".") ||
+          entry.name === "dist" ||
+          entry.name === "build")
+      ) {
+        continue;
+      }
+
+      if (entry.isDirectory()) {
+        searchDir(fullPath, depth + 1);
+      } else if (
+        entry.isFile() &&
+        (entry.name.endsWith(".datasource") || entry.name.endsWith(".pipe"))
+      ) {
+        // Convert to relative path
+        const relativePath = path.relative(cwd, fullPath);
+        files.push(relativePath);
+      }
+    }
+  }
+
+  searchDir(cwd, 0);
+  return files.sort();
 }
 
 /**
@@ -163,7 +312,7 @@ export interface InitResult {
  *
  * Creates:
  * - tinybird.json in the project root
- * - src/tinybird/ folder with datasources.ts, pipes.ts, and client.ts
+ * - src/tinybird/ folder with datasources.ts, endpoints.ts, and client.ts
  *
  * @param options - Init options
  * @returns Init result
@@ -175,14 +324,219 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
 
   const created: string[] = [];
   const skipped: string[] = [];
+  let didPrompt = false;
+  let existingDatafiles: string[] = [];
+  let ciWorkflowCreated = false;
+  let cdWorkflowCreated = false;
+  let workflowProvider = options.workflowProvider;
+
+  // Check for existing .datasource and .pipe files
+  const foundDatafiles = findExistingDatafiles(cwd);
+
+  // Determine devMode - prompt if not provided
+  let devMode: DevMode = options.devMode ?? "branch";
+
+  if (!options.devMode) {
+    // Show interactive prompt for workflow selection
+    p.intro(pc.cyan("tinybird init"));
+
+    const workflowChoice = await p.select({
+      message: "How do you want to develop with Tinybird?",
+      options: [
+        {
+          value: "branch",
+          label: "Branches",
+          hint: "Use Tinybird Cloud with git-based branching",
+        },
+        {
+          value: "local",
+          label: "Tinybird Local",
+          hint: "Run your own Tinybird instance locally",
+        },
+      ],
+    });
+
+    if (p.isCancel(workflowChoice)) {
+      p.cancel("Operation cancelled");
+      return {
+        success: false,
+        created: [],
+        skipped: [],
+        error: "Cancelled by user",
+      };
+    }
+
+    didPrompt = true;
+    devMode = workflowChoice as DevMode;
+  }
 
   // Determine tinybird folder path based on project structure
-  const tinybirdDir = getTinybirdDir(cwd);
-  const relativeTinybirdDir = getRelativeTinybirdDir(cwd);
+  const defaultRelativePath = getRelativeTinybirdDir(cwd);
+  let relativeTinybirdDir = options.clientPath ?? defaultRelativePath;
+
+  if (!options.clientPath && !options.devMode) {
+    // Ask user to confirm or change the client path
+    const clientPathChoice = await p.text({
+      message: "Where should we create Tinybird definitions?",
+      placeholder: defaultRelativePath,
+      defaultValue: defaultRelativePath,
+    });
+
+    if (p.isCancel(clientPathChoice)) {
+      p.cancel("Operation cancelled");
+      return {
+        success: false,
+        created: [],
+        skipped: [],
+        error: "Cancelled by user",
+      };
+    }
+
+    didPrompt = true;
+    relativeTinybirdDir = clientPathChoice || defaultRelativePath;
+  }
+
+  const skipWorkflowPrompt =
+    options.skipWorkflowPrompt ??
+    (options.devMode !== undefined || options.clientPath !== undefined);
+  let includeCiWorkflow = options.includeCiWorkflow ?? false;
+  let includeCdWorkflow = options.includeCdWorkflow ?? false;
+  const shouldPromptWorkflows =
+    !skipWorkflowPrompt && options.includeCiWorkflow === undefined;
+  const shouldPromptProvider = !skipWorkflowPrompt && !workflowProvider;
+
+  if (shouldPromptProvider && shouldPromptWorkflows) {
+    const providerChoice = await p.select({
+      message: "Which git provider are you using?",
+      options: [
+        { value: "github", label: "GitHub" },
+        { value: "gitlab", label: "GitLab" },
+      ],
+    });
+
+    if (p.isCancel(providerChoice)) {
+      p.cancel("Operation cancelled");
+      return {
+        success: false,
+        created: [],
+        skipped: [],
+        error: "Cancelled by user",
+      };
+    }
+
+    didPrompt = true;
+    workflowProvider = providerChoice as "github" | "gitlab";
+  }
+
+  if (shouldPromptWorkflows) {
+    const confirmWorkflows = await p.confirm({
+      message: "Create CI/CD workflows for Tinybird?",
+      initialValue: true,
+    });
+
+    if (p.isCancel(confirmWorkflows)) {
+      p.cancel("Operation cancelled");
+      return {
+        success: false,
+        created: [],
+        skipped: [],
+        error: "Cancelled by user",
+      };
+    }
+
+    didPrompt = true;
+    includeCiWorkflow = confirmWorkflows;
+    includeCdWorkflow = confirmWorkflows;
+  }
+
+  if (shouldPromptProvider && !shouldPromptWorkflows && !workflowProvider) {
+    const providerChoice = await p.select({
+      message: "Which git provider are you using?",
+      options: [
+        { value: "github", label: "GitHub" },
+        { value: "gitlab", label: "GitLab" },
+      ],
+    });
+
+    if (p.isCancel(providerChoice)) {
+      p.cancel("Operation cancelled");
+      return {
+        success: false,
+        created: [],
+        skipped: [],
+        error: "Cancelled by user",
+      };
+    }
+
+    didPrompt = true;
+    workflowProvider = providerChoice as "github" | "gitlab";
+  }
+  if ((includeCiWorkflow || includeCdWorkflow) && !workflowProvider) {
+    workflowProvider = "github";
+  }
+
+  // Ask about existing datafiles if found
+  if (foundDatafiles.length > 0 && !options.skipDatafilePrompt) {
+    const includeDatafiles =
+      options.includeExistingDatafiles ??
+      (await (async () => {
+        didPrompt = true;
+        return promptForExistingDatafiles(foundDatafiles);
+      })());
+
+    if (includeDatafiles) {
+      existingDatafiles = foundDatafiles;
+    }
+  } else if (options.includeExistingDatafiles && foundDatafiles.length > 0) {
+    existingDatafiles = foundDatafiles;
+  }
+
+  if (didPrompt) {
+    const devModeLabel = devMode === "local" ? "Tinybird Local" : "Branches";
+    const datafileSummary =
+      foundDatafiles.length > 0
+        ? existingDatafiles.length > 0
+          ? `${existingDatafiles.length} included`
+          : "none included"
+        : "none found";
+    let workflowSummary = "none";
+    if (includeCiWorkflow || includeCdWorkflow) {
+      workflowSummary =
+        workflowProvider === "gitlab"
+          ? "GitLab (.gitlab-ci.yml)"
+          : "GitHub Actions (tinybird-ci.yaml, tinybird-cd.yaml)";
+    }
+
+    const summaryLines = [
+      `Mode: ${devModeLabel}`,
+      `Definitions: ${relativeTinybirdDir}/`,
+      `Existing datafiles: ${datafileSummary}`,
+      `Workflows: ${workflowSummary}`,
+    ];
+
+    p.note(summaryLines.join("\n"), "Installation Summary");
+
+    const confirmInit = await p.confirm({
+      message: "Proceed with initialization?",
+      initialValue: true,
+    });
+
+    if (p.isCancel(confirmInit) || !confirmInit) {
+      p.cancel("Init cancelled.");
+      return {
+        success: false,
+        created: [],
+        skipped: [],
+        error: "Cancelled by user",
+      };
+    }
+  }
+
+  const tinybirdDir = path.join(cwd, relativeTinybirdDir);
 
   // File paths
   const datasourcesPath = path.join(tinybirdDir, "datasources.ts");
-  const pipesPath = path.join(tinybirdDir, "pipes.ts");
+  const endpointsPath = path.join(tinybirdDir, "endpoints.ts");
   const clientPath = path.join(tinybirdDir, "client.ts");
 
   // Create config file (tinybird.json)
@@ -191,7 +545,11 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
     skipped.push("tinybird.json");
   } else {
     try {
-      const config = createDefaultConfig(relativeTinybirdDir);
+      const config = createDefaultConfig(
+        relativeTinybirdDir,
+        devMode,
+        existingDatafiles
+      );
       fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
       created.push("tinybird.json");
     } catch (error) {
@@ -212,7 +570,9 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
       success: false,
       created,
       skipped,
-      error: `Failed to create ${relativeTinybirdDir} folder: ${(error as Error).message}`,
+      error: `Failed to create ${relativeTinybirdDir} folder: ${
+        (error as Error).message
+      }`,
     };
   }
 
@@ -233,19 +593,19 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
     }
   }
 
-  // Create pipes.ts
-  if (fs.existsSync(pipesPath) && !force) {
-    skipped.push(`${relativeTinybirdDir}/pipes.ts`);
+  // Create endpoints.ts
+  if (fs.existsSync(endpointsPath) && !force) {
+    skipped.push(`${relativeTinybirdDir}/endpoints.ts`);
   } else {
     try {
-      fs.writeFileSync(pipesPath, PIPES_CONTENT);
-      created.push(`${relativeTinybirdDir}/pipes.ts`);
+      fs.writeFileSync(endpointsPath, ENDPOINTS_CONTENT);
+      created.push(`${relativeTinybirdDir}/endpoints.ts`);
     } catch (error) {
       return {
         success: false,
         created,
         skipped,
-        error: `Failed to create pipes.ts: ${(error as Error).message}`,
+        error: `Failed to create endpoints.ts: ${(error as Error).message}`,
       };
     }
   }
@@ -288,8 +648,16 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
         modified = true;
       }
 
+      if (!packageJson.scripts["tinybird:deploy"]) {
+        packageJson.scripts["tinybird:deploy"] = "tinybird deploy";
+        modified = true;
+      }
+
       if (modified) {
-        fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + "\n");
+        fs.writeFileSync(
+          packageJsonPath,
+          JSON.stringify(packageJson, null, 2) + "\n"
+        );
         created.push("package.json (added tinybird scripts)");
       }
     } catch {
@@ -297,6 +665,94 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
     }
   }
 
+  const workflowsDir = path.join(cwd, ".github", "workflows");
+  const ciWorkflowPath = path.join(workflowsDir, "tinybird-ci.yaml");
+  const cdWorkflowPath = path.join(workflowsDir, "tinybird-cd.yaml");
+  const gitlabWorkflowPath = path.join(cwd, ".gitlab-ci.yml");
+
+  if (includeCiWorkflow || includeCdWorkflow) {
+    if (workflowProvider === "github") {
+      try {
+        fs.mkdirSync(workflowsDir, { recursive: true });
+      } catch (error) {
+        return {
+          success: false,
+          created,
+          skipped,
+          error: `Failed to create .github/workflows folder: ${
+            (error as Error).message
+          }`,
+        };
+      }
+    }
+
+    if (workflowProvider === "gitlab") {
+      if (fs.existsSync(gitlabWorkflowPath) && !force) {
+        skipped.push(".gitlab-ci.yml");
+      } else {
+        try {
+          fs.writeFileSync(gitlabWorkflowPath, TINYBIRD_GITLAB_CI);
+          created.push(".gitlab-ci.yml");
+          ciWorkflowCreated = includeCiWorkflow;
+          cdWorkflowCreated = includeCdWorkflow;
+        } catch (error) {
+          return {
+            success: false,
+            created,
+            skipped,
+            error: `Failed to create .gitlab-ci.yml: ${
+              (error as Error).message
+            }`,
+          };
+        }
+      }
+    }
+  }
+
+  if (workflowProvider === "github") {
+    if (includeCiWorkflow) {
+      if (fs.existsSync(ciWorkflowPath) && !force) {
+        skipped.push(".github/workflows/tinybird-ci.yaml");
+      } else {
+        try {
+          fs.writeFileSync(ciWorkflowPath, TINYBIRD_CI_WORKFLOW);
+          created.push(".github/workflows/tinybird-ci.yaml");
+          ciWorkflowCreated = true;
+        } catch (error) {
+          return {
+            success: false,
+            created,
+            skipped,
+            error: `Failed to create tinybird-ci.yaml: ${
+              (error as Error).message
+            }`,
+          };
+        }
+      }
+    }
+
+    if (includeCdWorkflow) {
+      if (fs.existsSync(cdWorkflowPath) && !force) {
+        skipped.push(".github/workflows/tinybird-cd.yaml");
+      } else {
+        try {
+          fs.writeFileSync(cdWorkflowPath, TINYBIRD_CD_WORKFLOW);
+          created.push(".github/workflows/tinybird-cd.yaml");
+          cdWorkflowCreated = true;
+        } catch (error) {
+          return {
+            success: false,
+            created,
+            skipped,
+            error: `Failed to create tinybird-cd.yaml: ${
+              (error as Error).message
+            }`,
+          };
+        }
+      }
+    }
+  }
+
   // Check if login is needed
   if (!skipLogin && !hasValidToken(cwd)) {
     console.log("\nNo authentication found. Starting login flow...\n");
@@ -312,8 +768,9 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
         }
 
         // If custom base URL, update tinybird.json
-        if (authResult.baseUrl && authResult.baseUrl !== "https://api.tinybird.co") {
-          updateConfig(configPath, { baseUrl: authResult.baseUrl });
+        const baseUrl = authResult.baseUrl ?? "https://api.tinybird.co";
+        if (baseUrl !== "https://api.tinybird.co") {
+          updateConfig(configPath, { baseUrl });
         }
 
         return {
@@ -323,15 +780,31 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
           loggedIn: true,
           workspaceName: authResult.workspaceName,
           userEmail: authResult.userEmail,
+          devMode,
+          clientPath: relativeTinybirdDir,
+          existingDatafiles:
+            existingDatafiles.length > 0 ? existingDatafiles : undefined,
+          ciWorkflowCreated,
+          cdWorkflowCreated,
+          workflowProvider,
         };
       } catch (error) {
         // Login succeeded but saving credentials failed
-        console.error(`Warning: Failed to save credentials: ${(error as Error).message}`);
+        console.error(
+          `Warning: Failed to save credentials: ${(error as Error).message}`
+        );
         return {
           success: true,
           created,
           skipped,
           loggedIn: false,
+          devMode,
+          clientPath: relativeTinybirdDir,
+          existingDatafiles:
+            existingDatafiles.length > 0 ? existingDatafiles : undefined,
+          ciWorkflowCreated,
+          cdWorkflowCreated,
+          workflowProvider,
         };
       }
     } else {
@@ -341,6 +814,13 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
         created,
         skipped,
         loggedIn: false,
+        devMode,
+        clientPath: relativeTinybirdDir,
+        existingDatafiles:
+          existingDatafiles.length > 0 ? existingDatafiles : undefined,
+        ciWorkflowCreated,
+        cdWorkflowCreated,
+        workflowProvider,
       };
     }
   }
@@ -349,5 +829,47 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
     success: true,
     created,
     skipped,
+    devMode,
+    clientPath: relativeTinybirdDir,
+    existingDatafiles:
+      existingDatafiles.length > 0 ? existingDatafiles : undefined,
+    ciWorkflowCreated,
+    cdWorkflowCreated,
+    workflowProvider,
   };
 }
+
+/**
+ * Prompt user about including existing datafiles
+ */
+async function promptForExistingDatafiles(
+  datafiles: string[]
+): Promise<boolean> {
+  const datasourceCount = datafiles.filter((f) =>
+    f.endsWith(".datasource")
+  ).length;
+  const pipeCount = datafiles.filter((f) => f.endsWith(".pipe")).length;
+
+  const parts: string[] = [];
+  if (datasourceCount > 0) {
+    parts.push(
+      `${datasourceCount} .datasource file${datasourceCount > 1 ? "s" : ""}`
+    );
+  }
+  if (pipeCount > 0) {
+    parts.push(`${pipeCount} .pipe file${pipeCount > 1 ? "s" : ""}`);
+  }
+
+  const confirmInclude = await p.confirm({
+    message: `Found ${parts.join(
+      " and "
+    )} in your project. Include them in tinybird.json?`,
+    initialValue: true,
+  });
+
+  if (p.isCancel(confirmInclude)) {
+    return false;
+  }
+
+  return confirmInclude;
+}