@codiac.io/codiac-cli 1.2.172 → 1.2.174

package/lib/ops/LocalOps.js

@@ -11,7 +11,6 @@ const figlet = require("figlet");
 const rimraf = require("rimraf");
 const _ = require("lodash");
 const escapeStringRegexp = require("escape-string-regexp");
-const semver = require("semver");
 const fse = require("fs-extra");
 // Ours
 const codiac_common_1 = require("@codiac.io/codiac-common");
@@ -28,6 +27,7 @@ const cli_context_repo_1 = require("./data/cli-context-repo");
 const npm_config_repo_1 = require("./data/npm-config-repo");
 const dx_constants_1 = require("./dx-constants");
 const _1 = require(".");
+const workspace_versioner_1 = require("./workspace-versioner");
 let LocalOps = class LocalOps {
     // constructor(private ioc: Container, public codiacVersion: string, private _projectRoot: string, private _cfgRepo: CliContextRepo, private ux: IUserInputProvider, private styler: IOutputStyler, private logger: IBetterLogger) {
     //   this._cliExec = new CliExec(logger);
@@ -121,6 +121,12 @@ let LocalOps = class LocalOps {
         }
         return this._logger;
     }
+    get _workspaceVersioner() {
+        if (this.__workspaceVersioner === undefined) {
+            this.__workspaceVersioner = this.ioc.get(workspace_versioner_1.WorkspaceVersioner);
+        }
+        return this.__workspaceVersioner;
+    }
     // --------------------------------------------------------------------
     //  END LAZY-LOADED PROPERTIES
     // ====================================================================
@@ -1987,10 +1993,11 @@ let LocalOps = class LocalOps {
                             if (this.cliConfig.addBranchNameToPrereleases === true) {
                                 let currentBranch = yield this.gitCurrentBranchNameFor(this._projectRoot);
                                 if (this.isMainBranch(currentBranch) === false) {
-                                    cfg.codeVersion = this.addPrereleaseId(cfg.codeVersion, currentBranch);
+                                    increment.preId = currentBranch;
+                                    // cfg.codeVersion = this.addPrereleaseId(cfg.codeVersion, currentBranch);
                                 }
                             }
-                            let codeVersion = yield this.incrementCodeVersion(cfg, increment);
+                            let codeVersion = yield this._workspaceVersioner.incrementCodeVersion(cfg, increment);
                             yield this.npmIncrementVersion(increment);
                         }
                     }
@@ -2002,66 +2009,6 @@ let LocalOps = class LocalOps {
             }));
         });
     }
-    /** Prefixes the prerelease version segment
-     * with the given prerelease identifier.
-     *
-     * using format:  `[major].[minor].[patch]-[id].[prereleaseNumber]`
-     *
-     * eg:  `1.2.3`  remains  `1.2.3`
-     * eg:  `1.2.3-4`  becomes  `1.2.3-thisBranch.4`
-     * eg:  `1.2.3-toro.4`  becomes  `1.2.3-thisBranch.4`   */
-    addPrereleaseId(version, prereleaseId) {
-        let output = version;
-        let parts = semver.parse(version);
-        // let ultimateId = /[^\w\d\.-]/g.exec(id); 
-        let ultimateId = prereleaseId.replace(/[^\w\d\.-]|_/g, "-");
-        console.log(ultimateId);
-        if (parts) {
-            let pre = parts.prerelease; // semver.prerelease(version);
-            if (pre === null) {
-                // CASE 0) no prerelease at all.
-            }
-            else {
-                let newPre;
-                let newBuild = [...parts.build];
-                if (pre.length == 1) {
-                    if (typeof pre[0] === 'number') {
-                        // CASE 1) prerelease is a number
-                        output = `${ultimateId}.${pre[0]}`;
-                        newPre = [ultimateId, 0];
-                        newBuild = [];
-                    }
-                    else {
-                        // CASE 2) just a string body - no numeric suffix
-                        newPre = [ultimateId, 0];
-                        newBuild = [];
-                    }
-                }
-                else if (pre.length == 2) {
-                    // CASE 3) string body with numeric suffix
-                    if (pre[0] === ultimateId) {
-                        // CASE 3A) id already in prerelease
-                        newPre = [...pre]; // id is already in the prerelease; keep it as is.
-                    }
-                    else {
-                        // CASE 3B) given version has a diff prerelease id
-                        newPre = [ultimateId, 0];
-                        newBuild = [];
-                    }
-                }
-                else {
-                    // more than two segments in prerelease?  
-                    // Is this the case when a build number is attached?  eg:  [id].[number]+[build] 
-                    newPre = [...pre]; // not supporting this case yet...  
-                }
-                output = `${parts.major}.${parts.minor}.${parts.patch}`;
-                if (newPre.length > 0) {
-                    output = output.concat(`-${newPre.join(".")}${newBuild.length > 0 ? "+" + newBuild.join(".") : ""}`);
-                }
-            }
-        }
-        return output;
-    }
     /** Bumps the version as specified.
      * NOTE!!!  Currently uses npm for this!
      *
@@ -2092,6 +2039,10 @@ let LocalOps = class LocalOps {
                             this.logger.notice(`Incrementing ${"patch"} version number...`);
                             yield this._cliExec.execAsyncStdOut(`npm version patch ${dontCommitIt}`, { cwd: this._projectRoot });
                         }
+                        else if (newVersion.preId) {
+                            this.logger.notice(`Incrementing ${"prerelease"} id and version number...`);
+                            yield this._cliExec.execAsyncStdOut(`npm version prerelease --preid ${newVersion.preId} ${dontCommitIt}`, { cwd: this._projectRoot });
+                        }
                         else if (newVersion.prerelease) {
                             this.logger.notice(`Incrementing ${"prerelease"} version number...`);
                             yield this._cliExec.execAsyncStdOut(`npm version prerelease ${dontCommitIt}`, { cwd: this._projectRoot });
@@ -2105,97 +2056,83 @@ let LocalOps = class LocalOps {
             }));
         });
     }
-    /** Increments the project code version number by the given increment.
-     *  Retains existing version number if no increment is specified.
-     *  Writes changes to the project config (aka: codiac.json).
-     *  Throws if existing version is invalid.
-     *
-     * @param cfg Project config doc (aka: codiac.json deserialized)
-     */
-    incrementCodeVersion(cfg, increment) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                try {
-                    let newVersion = this.incrementVersion(cfg.codeVersion, increment);
-                    if (newVersion != cfg.codeVersion) {
-                        cfg.codeVersion = newVersion;
-                        yield this._projCfgRepo.updateProjectConfigFile(cfg);
-                    }
-                    resolve(cfg);
-                }
-                catch (err) {
-                    reject(err);
-                }
-            }));
-        });
-    }
-    /** Increments the version number of the given image export by the given increment.
-     *  Retains existing version number if no increment is specified.
-     *  Sets to the default init version number if the imageExport doesnt yet have a version declared.
-     *  Writes changes to the project config (aka: codiac.json).
-     *  Throws if existing version is invalid.
-     *
-     * @param cfg Project config doc (aka: codiac.json deserialized)
-     */
-    incrementImageVersion(imageExport, cfg, increment) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!imageExport.version)
-                        imageExport.version = dx_constants_1.DxConstants.DEFAULT_INIT_IMAGE_VERSION;
-                    let newVersion = this.incrementVersion(imageExport.version, increment);
-                    if (newVersion != imageExport.version) {
-                        imageExport.version = newVersion;
-                        if (!cfg.images)
-                            cfg.images = {};
-                        cfg.images[imageExport.name] = imageExport;
-                        yield this._projCfgRepo.updateProjectConfigFile(cfg);
-                    }
-                    resolve(imageExport);
-                }
-                catch (err) {
-                    reject(err);
-                }
-            }));
-        });
-    }
-    /** Increments the given semantic version nnumber by the given increment.
-     *  Returns existing version number if no increment is specified.
-     *  Throws if existing version is invalid.
-     */
-    incrementVersion(existing, increment) {
-        try {
-            let newVersion = existing;
-            if (increment) {
-                if (increment.fullName) {
-                    this.logger.notice(`Applying new version number ${this.styler.hilite(increment.fullName)}...`);
-                    newVersion = increment.fullName;
-                }
-                else if (increment.major) {
-                    this.logger.notice(`Incrementing ${"major"} version number...`);
-                    newVersion = semver.inc(existing, "major");
-                }
-                else if (increment.minor) {
-                    this.logger.notice(`Incrementing ${"minor"} version number...`);
-                    newVersion = semver.inc(existing, "minor");
-                }
-                else if (increment.patch) {
-                    this.logger.notice(`Incrementing ${"patch"} version number...`);
-                    newVersion = semver.inc(existing, "patch");
-                }
-                else if (increment.prerelease) {
-                    this.logger.notice(`Incrementing ${"prerelease"} version number...`);
-                    newVersion = semver.inc(existing, "prerelease");
-                }
-                if (newVersion == null)
-                    throw new contracts_1.CodiacError(`Cannot increment; current version number [${existing}] is not a valid semantic version.`);
-            }
-            return newVersion;
-        }
-        catch (err) {
-            throw err;
-        }
-    }
+    // /** Increments the project code version number by the given increment.
+    //  *  Retains existing version number if no increment is specified.
+    //  *  Writes changes to the project config (aka: codiac.json).
+    //  *  Throws if existing version is invalid.
+    //  * 
+    //  * @param cfg Project config doc (aka: codiac.json deserialized)
+    //  */
+    // private async incrementCodeVersion(cfg: ProjectConfig, increment: VersionBump): Promise<ProjectConfig> {
+    //   return new Promise<ProjectConfig>(async (resolve, reject) => {
+    //     try {
+    //       let newVersion = this._imageVersioner.incrementVersion(cfg.codeVersion, increment);
+    //       if (newVersion != cfg.codeVersion) {
+    //         cfg.codeVersion = newVersion;
+    //         await this._projCfgRepo.updateProjectConfigFile(cfg);
+    //       }
+    //       resolve(cfg);
+    //     } catch (err) {
+    //       reject(err);
+    //     }
+    //   });
+    // }
+    // /** Increments the version number of the given image export by the given increment.
+    //  *  Retains existing version number if no increment is specified.
+    //  *  Sets to the default init version number if the imageExport doesnt yet have a version declared.
+    //  *  Writes changes to the project config (aka: codiac.json).
+    //  *  Throws if existing version is invalid.
+    //  * 
+    //  * @param cfg Project config doc (aka: codiac.json deserialized)
+    //  */
+    // private async incrementImageVersion(imageExport: ImageExport, cfg: ProjectConfig, increment: VersionBump): Promise<ImageExport> {
+    //   return new Promise<ImageExport>(async (resolve, reject) => {
+    //     try {
+    //       if (!imageExport.version) imageExport.version = DxConstants.DEFAULT_INIT_IMAGE_VERSION;
+    //       let newVersion = this.incrementVersion(imageExport.version, increment);
+    //       if (newVersion != imageExport.version) {
+    //         imageExport.version = newVersion;
+    //         if (!cfg.images) cfg.images = {};
+    //         cfg.images[imageExport.name] = imageExport;
+    //         await this._projCfgRepo.updateProjectConfigFile(cfg);
+    //       }
+    //       resolve(imageExport);
+    //     } catch (err) {
+    //       reject(err);
+    //     }
+    //   });
+    // }
+    // /** Increments the given semantic version nnumber by the given increment.
+    //  *  Returns existing version number if no increment is specified.
+    //  *  Throws if existing version is invalid.
+    //  */
+    // public incrementVersion(existing: string, increment: VersionBump): string {
+    //   try {
+    //     let newVersion: string | null = existing;
+    //     if (increment) {
+    //       if (increment.fullName) {
+    //         this.logger.notice(`Applying new version number ${this.styler.hilite(increment.fullName)}...`);
+    //         newVersion = increment.fullName;
+    //       } else if (increment.major) {
+    //         this.logger.notice(`Incrementing ${"major"} version number...`);
+    //         newVersion = semver.inc(existing, "major");
+    //       } else if (increment.minor) {
+    //         this.logger.notice(`Incrementing ${"minor"} version number...`);
+    //         newVersion = semver.inc(existing, "minor");
+    //       } else if (increment.patch) {
+    //         this.logger.notice(`Incrementing ${"patch"} version number...`);
+    //         newVersion = semver.inc(existing, "patch");
+    //       } else if (increment.prerelease) {
+    //         this.logger.notice(`Incrementing ${"prerelease"} version number...`);
+    //         newVersion = semver.inc(existing, "prerelease");
+    //       }
+    //       if (newVersion == null) throw new CodiacError(`Cannot increment; current version number [${existing}] is not a valid semantic version.`);
+    //     }
+    //     return newVersion;
+    //   } catch (err) {
+    //     throw err;
+    //   }
+    // }
     /**
      * @param subm The sourced dependency project to build.
      * @param clear (Optional: defaults to false) Clears the output folder before build.
@@ -2339,10 +2276,11 @@ let LocalOps = class LocalOps {
                                         if (this.cliConfig.addBranchNameToPrereleases === true) {
                                             let currentBranch = yield this.gitCurrentBranchNameFor(this._projectRoot);
                                             if (this.isMainBranch(currentBranch) === false) {
-                                                imageExport.version = this.addPrereleaseId(imageExport.version, currentBranch);
+                                                versionBump.preId = currentBranch;
+                                                // imageExport.version = this.addPrereleaseId(imageExport.version, currentBranch);
                                             }
                                         }
-                                        imageExport = yield this.incrementImageVersion(imageExport, cfg, versionBump);
+                                        imageExport = yield this._workspaceVersioner.incrementImageVersion(imageExport, cfg, versionBump);
                                     }
                                     let versionStamp = imageExport.version || projectVersion; // <---- ImageExports can have their own versions, otherwise fall back to project code version.
                                     yield this.buildSingleImage(imageExport, versionStamp, noCache, buildContext, targetStage);