@mindbase/deploy 1.0.1 → 1.1.0

package/bin/shared.ts

@@ -1,6 +1,5 @@
 import { Command } from 'commander';
 import * as clack from '@clack/prompts';
-import { resolve } from 'path';
 import { runApp, runProject, showConfig } from '../src/app.js';
 import { runInit } from '../src/init/app.js';
 import { createServerCommand } from '../src/server/app.js';
@@ -26,12 +25,12 @@ export function createDeployProgram(): Command {
     });
 
   program
-    .command('init')
-    .description('交互式初始化项目部署配置')
-    .action(async () => {
+    .command('init [path]')
+    .description('在 cwd（或指定目录）生成本地 deploy.config.json')
+    .action(async (path?: string) => {
       clack.intro('deploy init');
       try {
-        await runInit(resolve('.'));
+        await runInit(path);
       } catch (err) {
         clack.log.error(`执行失败: ${err}`);
         process.exit(1);
@@ -39,13 +38,13 @@ export function createDeployProgram(): Command {
     });
 
   program
-    .command('run <project>')
-    .description('直接运行指定项目')
-    .option('-s, --server <server>', '覆盖项目默认服务器')
-    .action(async (project: string, options: { server?: string }) => {
+    .command('run [path]')
+    .description('部署单个项目（path 缺省为 cwd，可传目录或 deploy.config.json）')
+    .option('-s, --server <server>', '覆盖项目配置中的 server')
+    .action(async (path: string | undefined, options: { server?: string }) => {
       clack.intro('deploy run');
       try {
-        await runProject(project, options.server);
+        await runProject(path, options.server);
       } catch (err) {
         clack.log.error(`执行失败: ${err}`);
         process.exit(1);
@@ -54,7 +53,7 @@ export function createDeployProgram(): Command {
 
   program
     .command('config')
-    .description('查看配置')
+    .description('查看全局 servers 配置')
     .action(() => {
       showConfig();
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindbase/deploy",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "MindBase 部署工具",
   "type": "module",
   "bin": {
@@ -17,24 +17,24 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "dev": "tsx bin/index.ts",
+    "start": "tsx bin/index.ts",
+    "postinstall": "node scripts/ensure-tsx.cjs"
+  },
   "dependencies": {
     "@clack/prompts": "^0.9.1",
+    "@mindbase/cli-ui": "workspace:*",
     "commander": "^12.0.0",
     "cross-spawn": "^7.0.6",
     "picocolors": "^1.1.1",
     "ssh2-sftp-client": "^9.1.0",
-    "tsx": "^4.19.0",
-    "@mindbase/cli-ui": "1.0.0"
+    "tsx": "^4.19.0"
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.6",
     "@types/node": "^20.0.0",
     "@types/ssh2-sftp-client": "^9.0.4",
     "typescript": "^5.1.3"
-  },
-  "scripts": {
-    "dev": "tsx bin/index.ts",
-    "start": "tsx bin/index.ts",
-    "postinstall": "node scripts/ensure-tsx.cjs"
   }
-}
+}

package/src/app.ts

@@ -1,8 +1,9 @@
 import * as clack from '@clack/prompts';
 import pc from 'picocolors';
+import { relative } from 'path';
 import { noteBox } from '@mindbase/cli-ui';
-import { getConfig, getConfigPath } from './config/manager.js';
-import type { DeployConfig, ProjectConfig } from './config/schema.js';
+import { getConfig, getConfigPath, discoverProjectConfigs, loadProjectConfig } from './config/manager.js';
+import type { ProjectConfig } from './config/schema.js';
 import { connectSftp } from './ssh/client.js';
 import { runSteps } from './script/runner.js';
 
@@ -27,33 +28,47 @@ export function showConfig(): void {
 }
 
 /**
- * 直接运行指定项目
+ * 显示项目配置摘要并让用户确认部署
  */
-export async function runProject(projectId: string, serverOverride?: string): Promise<void> {
-  const config = getConfig();
+async function confirmProjectDeploy(project: ProjectConfig, serverId: string): Promise<boolean> {
+  const summary = [
+    `名称: ${project.name}`,
+    `服务器: ${serverId}`,
+    `本地目录: ${project.localDir}`,
+    `远端目录: ${project.remoteDir}`,
+    `步骤数: ${project.steps.length}`,
+  ].join('\n');
+  noteBox(summary, '即将部署');
+  return handleCancel<boolean>(
+    await clack.confirm({ message: '确认部署？', initialValue: true })
+  );
+}
 
-  const project = config.projects[projectId];
-  if (!project) {
-    clack.log.error(`项目 "${projectId}" 不存在`);
-    const available = Object.keys(config.projects);
-    if (available.length > 0) {
-      clack.log.info(`可用项目: ${available.join(', ')}`);
-    }
-    process.exit(1);
-  }
+/**
+ * 直接运行指定项目（单项目模式）
+ */
+export async function runProject(targetPath?: string, serverOverride?: string): Promise<void> {
+  const project = loadProjectConfig(targetPath);
+  const globalConfig = getConfig();
 
   const serverId = serverOverride || project.server;
-  const serverConfig = config.servers[serverId];
+  const serverConfig = globalConfig.servers[serverId];
   if (!serverConfig) {
-    clack.log.error(`服务器 "${serverId}" 不存在`);
+    clack.log.error(`服务器 "${serverId}" 不存在，请先运行 deploy server add`);
     process.exit(1);
   }
 
   clack.intro(`部署 ${pc.cyan(project.name)} → ${pc.cyan(serverId)}`);
 
+  if (!(await confirmProjectDeploy(project, serverId))) {
+    clack.log.info('已取消');
+    clack.outro('完成');
+    return;
+  }
+
   const spinner = clack.spinner();
   spinner.start('连接服务器...');
-  const sftp = await connectSftp(projectId, serverConfig);
+  const sftp = await connectSftp(project.name, serverConfig);
   spinner.stop('已连接');
 
   try {
@@ -69,87 +84,99 @@ export async function runProject(projectId: string, serverOverride?: string): Pr
 }
 
 /**
- * 交互式主流程：选服务器 → 多选项目 → 依次部署
+ * 交互式主流程：扫描 cwd 下所有 deploy.config.json → 多选 → 按 server 分组部署
  */
 export async function runApp(): Promise<void> {
-  const config = getConfig();
+  const cwd = process.cwd();
+  const discovered = discoverProjectConfigs(cwd);
+  const globalConfig = getConfig();
 
-  // 检查配置
-  const serverIds = Object.keys(config.servers);
-  const projectIds = Object.keys(config.projects);
-
-  if (serverIds.length === 0) {
-    clack.log.error('没有已配置的服务器，请先运行 deploy server add');
+  if (discovered.length === 0) {
+    clack.log.error(`未在 ${cwd} 下找到任何 deploy.config.json，请先运行 deploy init`);
     return;
   }
-  if (projectIds.length === 0) {
-    clack.log.error('没有已配置的项目，请先运行 deploy init');
+
+  // 0 个服务器直接报错
+  if (Object.keys(globalConfig.servers).length === 0) {
+    clack.log.error('没有已配置的服务器，请先运行 deploy server add');
     return;
   }
 
   clack.intro('deploy');
 
-  // 选择服务器
-  const serverId = handleCancel<string>(
-    await clack.select({
-      message: '选择目标服务器',
-      options: serverIds.map((id) => ({
-        value: id,
-        label: `${id} (${config.servers[id].host}:${config.servers[id].port})`,
-      })),
-    })
-  );
+  // 选择项目
+  let selected: { path: string; config: ProjectConfig }[];
+
+  if (discovered.length === 1) {
+    const only = discovered[0];
+    clack.log.info(`仅发现一个项目: ${only.config.name}`);
+    const go = handleCancel<boolean>(
+      await clack.confirm({ message: `是否部署 ${only.config.name}？`, initialValue: true })
+    );
+    if (!go) {
+      clack.outro('已取消');
+      return;
+    }
+    selected = [only];
+  } else {
+    selected = handleCancel<typeof discovered>(
+      await clack.multiselect({
+        message: '选择要部署的项目（空格切换，a 全选）',
+        options: discovered.map((item) => ({
+          value: item,
+          label: `${item.config.name} (${relative(cwd, item.path) || item.path}) → ${pc.dim(item.config.server)}`,
+        })),
+        required: true,
+      })
+    );
+  }
 
-  // 筛选该项目服务器下的项目（或显示全部）
-  const filteredProjects = projectIds.filter(
-    (id) => config.projects[id].server === serverId
-  );
-  const selectableProjects = filteredProjects.length > 0 ? filteredProjects : projectIds;
-
-  // 多选项目
-  const selectedProjects = handleCancel<string[]>(
-    await clack.multiselect({
-      message: '选择要部署的项目（空格切换，a 全选）',
-      options: selectableProjects.map((id) => ({
-        value: id,
-        label: `${config.projects[id].name} (${id})`,
-      })),
-      required: true,
-    })
-  );
+  // 校验所有选中项目的 server 都存在
+  const missingServers = new Set<string>();
+  for (const item of selected) {
+    if (!globalConfig.servers[item.config.server]) {
+      missingServers.add(item.config.server);
+    }
+  }
+  if (missingServers.size > 0) {
+    clack.log.error(`以下服务器未配置: ${[...missingServers].join(', ')}`);
+    clack.outro('已中止');
+    return;
+  }
 
-  // 连接服务器
-  const spinner = clack.spinner();
-  spinner.start(`连接 ${serverId}...`);
-  const serverConfig = config.servers[serverId];
-  const sftp = await connectSftp('deploy', serverConfig);
-  spinner.stop('已连接');
+  // 按 server 分组
+  const groups = new Map<string, { path: string; config: ProjectConfig }[]>();
+  for (const item of selected) {
+    const arr = groups.get(item.config.server) ?? [];
+    arr.push(item);
+    groups.set(item.config.server, arr);
+  }
 
-  try {
-    // 依次部署选中的项目
-    for (const projectId of selectedProjects) {
-      const project = config.projects[projectId];
-      // 运行时使用选中的服务器覆盖项目默认服务器
-      const effectiveProject: ProjectConfig = {
-        ...project,
-        server: serverId,
-      };
-
-      clack.log.step(`开始部署 ${pc.cyan(project.name)}`);
-
-      try {
-        await runSteps(project.steps, effectiveProject, sftp);
-        clack.log.success(`${project.name} 部署完成`);
-      } catch (err) {
-        clack.log.error(`${project.name} 部署失败: ${err}`);
-        const continueDeploy = handleCancel<boolean>(
-          await clack.confirm({ message: '是否继续部署下一个项目？' })
-        );
-        if (!continueDeploy) break;
+  // 依次连接每个 server，组内项目依次部署
+  for (const [serverId, items] of groups) {
+    const serverConfig = globalConfig.servers[serverId];
+    const spinner = clack.spinner();
+    spinner.start(`连接 ${serverId}...`);
+    const sftp = await connectSftp('deploy', serverConfig);
+    spinner.stop('已连接');
+
+    try {
+      for (const { config } of items) {
+        clack.log.step(`开始部署 ${pc.cyan(config.name)} → ${pc.cyan(serverId)}`);
+        try {
+          await runSteps(config.steps, config, sftp);
+          clack.log.success(`${config.name} 部署完成`);
+        } catch (err) {
+          clack.log.error(`${config.name} 部署失败: ${err}`);
+          const cont = handleCancel<boolean>(
+            await clack.confirm({ message: '是否继续部署下一个项目？' })
+          );
+          if (!cont) break;
+        }
       }
+    } finally {
+      await sftp.end();
     }
-  } finally {
-    await sftp.end();
   }
 
   clack.outro('全部完成');

package/src/config/manager.ts

@@ -1,15 +1,32 @@
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
-import { dirname, join } from 'path';
+import { existsSync, readFileSync, writeFileSync, mkdirSync, readdirSync, statSync } from 'fs';
+import { dirname, join, resolve, isAbsolute } from 'path';
 import { homedir } from 'os';
-import type { DeployConfig } from './schema.js';
+import type { GlobalConfig, ProjectConfig } from './schema.js';
 
-/** 默认配置 */
-const defaultConfig: DeployConfig = {
+/** 项目级配置文件名 */
+export const PROJECT_CONFIG_FILE = 'deploy.config.json';
+
+/** 扫描时忽略的目录名 */
+const SCAN_IGNORE_DIRS = new Set([
+  'node_modules',
+  '.git',
+  'dist',
+  'build',
+  'target',
+  '.next',
+  'coverage',
+  '.cache',
+]);
+
+/** 扫描深度上限 */
+const SCAN_MAX_DEPTH = 5;
+
+/** 默认全局配置 */
+const defaultGlobalConfig: GlobalConfig = {
   servers: {},
-  projects: {},
 };
 
-/** 配置文件路径 */
+/** 全局配置目录与文件路径 */
 const CONFIG_DIR = join(homedir(), '.mindbase');
 const CONFIG_PATH = join(CONFIG_DIR, 'deploy.json');
 
@@ -23,34 +40,133 @@ function ensureConfigDir(): void {
 }
 
 /**
- * 读取部署配置
+ * 读取全局配置（servers）
  */
-export function getConfig(): DeployConfig {
+export function getConfig(): GlobalConfig {
   if (!existsSync(CONFIG_PATH)) {
     ensureConfigDir();
-    writeFileSync(CONFIG_PATH, JSON.stringify(defaultConfig, null, 2), 'utf-8');
-    return structuredClone(defaultConfig);
+    writeFileSync(CONFIG_PATH, JSON.stringify(defaultGlobalConfig, null, 2), 'utf-8');
+    return structuredClone(defaultGlobalConfig);
   }
 
   try {
     const content = readFileSync(CONFIG_PATH, 'utf-8');
-    return JSON.parse(content);
+    const parsed = JSON.parse(content);
+    return { servers: parsed.servers ?? {} };
   } catch {
-    return structuredClone(defaultConfig);
+    return structuredClone(defaultGlobalConfig);
   }
 }
 
 /**
- * 写入部署配置
+ * 写入全局配置
  */
-export function setConfig(config: DeployConfig): void {
+export function setConfig(config: GlobalConfig): void {
   ensureConfigDir();
   writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2), 'utf-8');
 }
 
 /**
- * 获取配置文件路径
+ * 获取全局配置文件路径
  */
 export function getConfigPath(): string {
   return CONFIG_PATH;
 }
+
+/**
+ * 解析配置文件实际路径：目录 → 拼 deploy.config.json；文件 → 直接用
+ */
+function resolveConfigFilePath(targetPath?: string): string {
+  const cwd = targetPath ?? process.cwd();
+  const abs = isAbsolute(cwd) ? cwd : resolve(process.cwd(), cwd);
+  const stat = existsSync(abs) ? statSync(abs) : null;
+  if (stat && stat.isFile()) return abs;
+  return join(abs, PROJECT_CONFIG_FILE);
+}
+
+/**
+ * 解析 localDir 为绝对路径（相对配置文件所在目录）
+ */
+function resolveLocalDir(localDir: string, configFilePath: string): string {
+  if (isAbsolute(localDir)) return localDir;
+  return resolve(dirname(configFilePath), localDir);
+}
+
+/**
+ * 加载项目级配置
+ * @param targetPath 目录或文件路径，缺省为 cwd
+ */
+export function loadProjectConfig(targetPath?: string): ProjectConfig {
+  const configFilePath = resolveConfigFilePath(targetPath);
+  if (!existsSync(configFilePath)) {
+    throw new Error(`项目配置文件不存在: ${configFilePath}`);
+  }
+
+  const raw = readFileSync(configFilePath, 'utf-8');
+  const parsed = JSON.parse(raw) as ProjectConfig;
+  parsed.localDir = resolveLocalDir(parsed.localDir ?? '.', configFilePath);
+  return parsed;
+}
+
+/**
+ * 写入项目级配置
+ * @param config 项目配置
+ * @param targetPath 目录或文件路径，缺省为 cwd
+ */
+export function saveProjectConfig(config: ProjectConfig, targetPath?: string): void {
+  const configFilePath = resolveConfigFilePath(targetPath);
+  mkdirSync(dirname(configFilePath), { recursive: true });
+  writeFileSync(configFilePath, JSON.stringify(config, null, 2), 'utf-8');
+}
+
+/** 发现结果 */
+export interface DiscoveredProject {
+  /** 配置文件绝对路径 */
+  path: string;
+  /** 已解析的 ProjectConfig */
+  config: ProjectConfig;
+}
+
+/**
+ * 扫描 rootPath 下所有 deploy.config.json
+ */
+export function discoverProjectConfigs(rootPath?: string): DiscoveredProject[] {
+  const root = rootPath ?? process.cwd();
+  const results: DiscoveredProject[] = [];
+
+  function walk(dir: string, depth: number): void {
+    if (depth > SCAN_MAX_DEPTH) return;
+
+    let entries;
+    try {
+      entries = readdirSync(dir);
+    } catch {
+      return;
+    }
+
+    for (const entry of entries) {
+      if (SCAN_IGNORE_DIRS.has(entry)) continue;
+      const full = join(dir, entry);
+      let stat;
+      try {
+        stat = statSync(full);
+      } catch {
+        continue;
+      }
+
+      if (stat.isDirectory()) {
+        walk(full, depth + 1);
+      } else if (entry === PROJECT_CONFIG_FILE) {
+        try {
+          const config = loadProjectConfig(full);
+          results.push({ path: full, config });
+        } catch {
+          /* 跳过损坏的配置文件 */
+        }
+      }
+    }
+  }
+
+  walk(root, 0);
+  return results;
+}

package/src/config/schema.ts

@@ -79,13 +79,13 @@ export interface PrivateKeyServerConfig {
 /** 服务器配置 */
 export type ServerConfig = PasswordServerConfig | PrivateKeyServerConfig;
 
-/** 项目配置 */
+/** 项目配置（项目级 deploy.config.json） */
 export interface ProjectConfig {
   /** 项目显示名称 */
   name: string;
-  /** 本地目录（绝对路径） */
+  /** 本地目录（绝对路径或相对配置文件的路径，加载时解析为绝对路径） */
   localDir: string;
-  /** 默认目标服务器 ID */
+  /** 目标服务器 ID（引用全局 servers） */
   server: string;
   /** 远端目录 */
   remoteDir: string;
@@ -93,10 +93,8 @@ export interface ProjectConfig {
   steps: Step[];
 }
 
-/** 部署配置文件结构 */
-export interface DeployConfig {
+/** 全局配置结构（~/.mindbase/deploy.json） */
+export interface GlobalConfig {
   /** 服务器列表 */
   servers: Record<string, ServerConfig>;
-  /** 项目列表 */
-  projects: Record<string, ProjectConfig>;
 }

package/src/init/app.ts

@@ -3,8 +3,8 @@ import pc from 'picocolors';
 import { resolve } from 'path';
 import { existsSync, readFileSync } from 'fs';
 import { noteBox } from '@mindbase/cli-ui';
-import { getConfig, setConfig } from '../config/manager.js';
-import type { Step, StepType, ProjectConfig, ServerConfig } from '../config/schema.js';
+import { getConfig, saveProjectConfig } from '../config/manager.js';
+import type { Step, StepType, ProjectConfig } from '../config/schema.js';
 import { connectSftp } from '../ssh/client.js';
 
 /** 取消处理 */
@@ -262,29 +262,21 @@ async function collectStep(): Promise<Step | null> {
 
 /**
  * 运行 deploy init 主流程
+ * @param targetPath 项目目录（缺省 cwd），生成的 deploy.config.json 写入此目录
  */
-export async function runInit(cwd: string): Promise<void> {
+export async function runInit(targetPath?: string): Promise<void> {
   clack.intro('deploy init');
 
+  const cwd = resolve(targetPath ?? '.');
+
   const deployConfig = getConfig();
 
   // 1. 项目名称
   const defaultName = getDefaultProjectName(cwd);
-  const projectId = handleCancel<string>(
-    await clack.text({
-      message: '项目 ID（用于标识）',
-      initialValue: defaultName,
-    })
-  );
-
-  if (deployConfig.projects[projectId]) {
-    clack.log.warn(`项目 "${projectId}" 已存在，将覆盖配置`);
-  }
-
   const name = handleCancel<string>(
     await clack.text({
       message: '项目显示名称',
-      initialValue: projectId,
+      initialValue: defaultName,
     })
   );
 
@@ -307,11 +299,11 @@ export async function runInit(cwd: string): Promise<void> {
     })
   );
 
-  // 4. 本地目录（绝对路径）
+  // 4. 本地目录（用相对路径 ./，便于跨设备/入库）
   const localDir = handleCancel<string>(
     await clack.text({
-      message: '本地目录（绝对路径）',
-      initialValue: cwd,
+      message: '本地目录（相对 deploy.config.json，默认 ./）',
+      initialValue: './',
     })
   );
 
@@ -391,7 +383,7 @@ export async function runInit(cwd: string): Promise<void> {
   // 7. 预览配置
   const projectConfig: ProjectConfig = {
     name,
-    localDir: resolve(localDir),
+    localDir,
     server: serverId,
     remoteDir,
     steps,
@@ -404,9 +396,8 @@ export async function runInit(cwd: string): Promise<void> {
   );
 
   if (confirmSave) {
-    deployConfig.projects[projectId] = projectConfig;
-    setConfig(deployConfig);
-    clack.log.success(`项目 "${projectId}" 配置已保存`);
+    saveProjectConfig(projectConfig, cwd);
+    clack.log.success(`配置已写入 ${resolve(cwd, 'deploy.config.json')}`);
   } else {
     clack.log.info('已取消保存');
   }

package/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.