@farris/cli 1.0.18 → 1.0.21

package/ci/cli.js

@@ -22,7 +22,9 @@ cli
         },
         (argv) => {
             const projectPath = argv.project;
-            checkProjectChanges(projectPath);
+            const lastCommit = getLastCommit();
+            console.log(`last commit ${lastCommit}`);
+            checkProjectChanges(projectPath, latestMessage);
         }
     )
     .command(
@@ -32,20 +34,28 @@ cli
             return yargs;
         },
         (argv) => {
+            // 读取预发布工程路径
             const project = argv.project;
+            // 读取commit url地址
             const url = argv.url;
+            // 读取是否预发布全部工程
             const prereleaseAll = argv.all;
             if (prereleaseAll) {
+                console.log('Prerelease all.');
+                // 发布所有变更的项目
                 return publish(url, 'prerelease');
             } else if (project) {
                 let chain = Promise.resolve();
-                chain = chain.then(() => checkProjectChanges(project));
+                const lastCommit = getLastCommit();
+                console.log(`last commit ${lastCommit}`);
+                chain = chain.then(() => checkProjectChanges(project, lastCommit));
                 chain = chain.then((hasChanged) => {
+                    const projectInfo = { 'project': { 'path': project } };
                     if (hasChanged) {
-                        return updateProjectVersion(project, 'prerelease')
+                        return updateProjectVersion(projectInfo, 'prerelease')
                     }
                 });
-            }else{
+            } else {
                 console.log('You must provide param of either --all or --project.')
             }
         }
@@ -64,13 +74,16 @@ cli
                 return publish(url, 'patch');
             } else if (project) {
                 let chain = Promise.resolve();
-                chain = chain.then(() => checkProjectChanges(project));
+                const lastCommit = getLastCommit();
+                console.log(`last commit ${lastCommit}`);
+                chain = chain.then(() => checkProjectChanges(project, lastCommit));
                 chain = chain.then((hasChanged) => {
                     if (hasChanged) {
-                        return updateProjectVersion(project, 'patch')
+                        const projectInfo = { 'project': { 'path': project } };
+                        return updateProjectVersion(projectInfo, 'patch')
                     }
                 });
-            }else{
+            } else {
                 console.log('You must provide param of either --all or --project.')
             }
         }
@@ -84,8 +97,9 @@ cli
         (argv) => {
             const project = argv.project;
             let chain = Promise.resolve();
-
-            chain = chain.then(() => checkProjectChanges(project));
+            const lastCommit = getLastCommit();
+            console.log(`last commit ${lastCommit}`);
+            chain = chain.then(() => checkProjectChanges(project, lastCommit));
             chain = chain.then((hasChanged) => {
                 if (hasChanged) {
                     return publish(project)
@@ -137,12 +151,13 @@ function hasTags() {
 
 /**
  * 检查指定工程目录下是否存在变更文件
- * @param {string} projectPath 目标工程路径
+ * @param {string} projectInfo 目标工程信息
+ * @param {string} lastCommit 最后提交标识
  * @returns 检查结果
  */
-function checkProjectChanges(projectPath) {
-    const lastCommit = getLastCommit();
-    console.log(`last commit ${lastCommit}`);
+function checkProjectChanges(projectInfo, lastCommit) {
+    const projectPath = projectInfo.project.path;
+    const packageName = projectInfo.package.name || projectPath;
     return childProcess
         // 使用 git diff 命令查询自上传提交以来，目标工程路径下是否有变更的文件
         .exec("git", ["diff", "--name-only", lastCommit, projectPath])
@@ -152,9 +167,10 @@ function checkProjectChanges(projectPath) {
             // 根据文件个数确定是否存在变更
             const hasChanges = changedFiles.length > 0;
             if (hasChanges) {
-                console.log(`${projectPath} has changed sence last commit ${lastCommit}.`)
+                projectInfo.workspace.hasChanged = hasChanges;
+                console.log(`${packageName} has changed sence last commit ${lastCommit}.`)
             } else {
-                console.log(`Did not detect any changes from ${projectPath} sence last commit ${lastCommit}.`)
+                console.log(`${packageName} has not changed.`)
             }
             // 返回检测结果
             return hasChanges;
@@ -163,11 +179,15 @@ function checkProjectChanges(projectPath) {
 
 /**
  * 更新指定工程的预发布版本
- * @param {string} projectPath 目标工程路径
+ * @param {string} projectInfo 目标工程信息
  * @returns 更新后的版本
  */
-function updateProjectVersion(projectPath, updateVersionType) {
+function updateProjectVersion(projectInfo, updateVersionType) {
     let npmCommandArray = [];
+    const projectPath = projectInfo.project.path;
+    if (!projectPath) {
+        throw new Error(`update project version error: you must provide project path by project info object.`)
+    }
     switch (updateVersionType) {
         case 'prerelease':
             npmCommandArray = ['version', 'prerelease', '--preid=beta', '--prefix', projectPath];
@@ -198,6 +218,29 @@ function updateProjectVersion(projectPath, updateVersionType) {
         })
 }
 
+function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType) {
+    let npmCommandArray = [];
+    switch (updateVersionType) {
+        case 'prerelease':
+            npmCommandArray = ['version', 'prerelease', '--preid=beta'];
+            break;
+        case 'patch':
+            npmCommandArray = ['version', 'patch'];
+            break;
+        case 'minor':
+            npmCommandArray = ['version', 'minor'];
+            break;
+        case 'major':
+            npmCommandArray = ['version', 'major'];
+            break;
+    }
+    childProcess.execSync('npm', npmCommandArray);
+    const packageJsonFilePath = `./package.json`;
+    const packageConfig = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
+    console.log(`update MonoWorkspace version to v${packageConfig.version}`);
+    monoWorkspace.version = packageConfig.version;
+}
+
 function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
     const versionMessage = Object.keys(updatedVersions).reduce((latestMessage, packageName, index, originalArray) => {
         const version = updatedVersions[packageName];
@@ -238,11 +281,12 @@ function buildWorkspace(workspace) {
     // lerna run build --scope=@farris/ide-framework
 }
 
-function tagMonoWorkspace(monoWorkspace, commitUrl) {
+function addTagToMonoWorkspace(monoWorkspace, commitUrl) {
     // const tagMessage = builderVersionChangeMessage('Publish npm packages ', monoWorkspace.updateResult, '.');
-    const date = moment(new Date());
-    const tagVersion = `v${date.format('YYYYMMDDHHmmss')}`;
-    childProcess.execSync('git', ['tag', tagVersion, '-m', 'Publish npm packages. [skip ci]']);
+    // const date = moment(new Date());
+    // const tagVersion = `v${date.format('YYYYMMDDHHmmss')}`;
+    const monoWorkspaceVersion = monoWorkspace.version;
+    childProcess.execSync('git', ['tag', monoWorkspaceVersion, '-m', 'Publish npm packages. [skip ci]']);
     // 提交变更集
     if (commitUrl) {
         console.log(`git push --tags ${commitUrl}`);
@@ -258,47 +302,67 @@ function tagMonoWorkspace(monoWorkspace, commitUrl) {
  * @param {string} projectPath 目标工程路径
  * @returns 发布结果
  */
-// function publish(projectPath) {
-//     // 读取目标工程的package.json文件
-//     const ngPackageJsonFilePath = `${projectPath}/ng-package.json`;
-//     const ngPackageConfig = JSON.parse(fs.readFileSync(ngPackageJsonFilePath, 'utf-8'));
-//     const dest = ngPackageConfig.dest;
-//     const packagePath = path.normalize(`${projectPath}/${dest}`);
-//     // 调用 npm publish 发布指定路径下的npm包
-//     return childProcess.exec('npm', ['publish', packagePath])
-// }
+function publishToNpmRepository(projectPath) {
+    // 读取目标工程的package.json文件
+    const ngPackageJsonFilePath = `${projectPath}/ng-package.json`;
+    const ngPackageConfig = JSON.parse(fs.readFileSync(ngPackageJsonFilePath, 'utf-8'));
+    const dest = ngPackageConfig.dest;
+    const packagePath = path.normalize(`${projectPath}/${dest}`);
+    // 调用 npm publish 发布指定路径下的npm包
+    return childProcess.exec('npm', ['publish', packagePath])
+}
 
+/**
+ * 将所有变更发布为新的npm包
+ * @param {string} commitUrl commit api 地址
+ */
 function publish(commitUrl, updateVersionType) {
+    // 初始化当前工作目录下的多代码仓库项目
     const monoRepoProject = new Project(process.cwd());
     let chain = Promise.resolve();
+    // 1. 提取当前多代码仓库中的所有子项目，创建多项目工作区
     chain = chain.then(() => {
+        // 提取所有子项目
         return monoRepoProject.getPackages()
             .then(packages => {
+                // 创建并返回多项目工作区
                 const monoWorkspace = { packages };
                 return monoWorkspace;
             })
     });
+    // 2. 读取多项目工作区下的Angular工作区和所有Angular项目
     chain = chain.then((monoWorkspace) => {
+        // 提取所有子仓库项目
         const packages = monoWorkspace.packages;
+        // 初始化Angular工作区集合
         monoWorkspace.workspaces = [];
+        // 初始化Angular工程集合
         monoWorkspace.projects = [];
+        // 遍历所有子仓库
         packages.forEach(packageJson => {
+            // 读取Angular工作区路径
             const workspacePath = packageJson.location;
+            // 读取Angular工作区下的angular.json文件内容
             const angularJson = readAngularJson(workspacePath)
+            // 构造Angular工作区
             const workspace = readWorkspace(angularJson, packageJson);
+            // 记录Angular工作区对象
             monoWorkspace.workspaces.push(workspace);
+            // 遍历Angular工作区下的Angular项目，归集到根工作区中
             workspace.projects.reduce((monoWorkspace, projectInfo) => {
                 monoWorkspace.projects.push(projectInfo);
                 return monoWorkspace;
             }, monoWorkspace);
-            // .forEach((projectInfo) => monoWorkspace.projects.push(projectInfo));
         });
         return monoWorkspace;
     });
+    // 3. 检查代码提交记录，获取自上次发布以来所有发生变化的Angular工程
     chain = chain.then(monoWorkspace => {
         const projects = monoWorkspace.projects;
         const checkProjects = projects.map((projectInfo) => {
-            let checkPromise = checkProjectChanges(projectInfo.project.path);
+            const lastCommit = getLastCommit();
+            console.log(`last commit ${lastCommit}`); Í
+            let checkPromise = checkProjectChanges(projectInfo, lastCommit);
             let changedPromise = checkPromise.then(hasChanged => {
                 projectInfo.hasChanged = hasChanged;
                 return Promise.resolve(projectInfo);
@@ -311,9 +375,13 @@ function publish(commitUrl, updateVersionType) {
                 return Promise.resolve(monoWorkspace);
             });
     });
+    // 4. 更新所有变更项目预发布版本，提交代码仓库，供发布时使用
     chain = chain.then(monoWorkspace => {
         const changedProjects = monoWorkspace.changedProjects;
-        const prereleasePromise = changedProjects.map(projectInfo => updateProjectVersion(projectInfo.project.path, updateVersionType));
+        const prereleasePromise = changedProjects.map(projectInfo => updateProjectVersion(projectInfo, updateVersionType));
+        if (changedProjects) {
+
+        }
         return Promise.all(prereleasePromise)
             .then((results) => {
                 results.reduce((workspace, updateResult) => {
@@ -321,24 +389,30 @@ function publish(commitUrl, updateVersionType) {
                     Object.assign(workspace.updateResult, updateResult);
                     return workspace;
                 }, monoWorkspace);
+                updateMonoWorkspaceVersion(monoWorkspace, updateVersionType);
                 const updatedVersions = monoWorkspace.updateResult;
                 commitChanges(updatedVersions, commitUrl);
                 return Promise.resolve(monoWorkspace);
             });
     });
+    // 5. 编译所有Angular工作区
     chain = chain.then(monoWorkspace => {
-        const buildPromises = monoWorkspace.workspaces.map((workspace) => buildWorkspace(workspace));
+        const buildPromises = monoWorkspace.workspaces
+            .filter(workspace => workspace.hasChanged)
+            .map((workspace) => buildWorkspace(workspace));
         return Promise.all(buildPromises)
             .then((results) => {
+                console.log(results.stdout);
                 return Promise.resolve(monoWorkspace);
             });
     });
+    // 6. 将变更项目的内容发布为npm包，并增加发布Tag标签
     chain = chain.then(monoWorkspace => {
         const changedProjects = monoWorkspace.changedProjects;
-        const publishPromises = changedProjects.map(projectInfo => publish(projectInfo.project.path));
+        const publishPromises = changedProjects.map(projectInfo => publishToNpmRepository(projectInfo.project.path));
         Promise.all(publishPromises)
             .then(() => {
-                return tagMonoWorkspace(monoWorkspace, commitUrl);
+                return addTagToMonoWorkspace(monoWorkspace, commitUrl);
             });
     });
 }
@@ -355,13 +429,13 @@ function readWorkspace(angularJson, packageJson) {
     const workspace = {
         packageName,
         path: workspacePath,
-        projects: []
+        projects: [],
+        hasChanged: false
     };
     Object.keys(projects)
         .reduce((workspace, projectName) => {
-            const projectInfo = readProjectInfo(projectName, projects[projectName], workspacePath);
+            const projectInfo = readProjectInfo(projectName, projects[projectName], workspace);
             if (projectInfo) {
-                // workspace.set(projectName, projectInfo);
                 workspace.projects.push(projectInfo);
             }
             return workspace;
@@ -369,8 +443,8 @@ function readWorkspace(angularJson, packageJson) {
     return workspace;
 }
 
-function readProjectInfo(projectName, project, workspacePath) {
-    const projectPath = path.normalize(`${workspacePath}/${project.root}`);
+function readProjectInfo(projectName, project, workspace) {
+    const projectPath = path.normalize(`${workspace.path}/${project.root}`);
     const projectType = project.projectType;
     if (projectType === 'library') {
         const packageJsonPath = path.normalize(`${projectPath}/package.json`);
@@ -380,6 +454,7 @@ function readProjectInfo(projectName, project, workspacePath) {
         const ngPackage = JSON.parse(fs.readFileSync(ngPackagePath, 'utf-8'));
         const packagePath = path.normalize(`${projectPath}/${ngPackage.dest}`);
         return {
+            workspace,
             project: {
                 name: projectName,
                 path: projectPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farris/cli",
-  "version": "1.0.18",
+  "version": "1.0.21",
   "description": "Farris command line interface",
   "main": "index.js",
   "scripts": {