refactor(maker-base): extract Windows-specific version normalization …

…to a method on the maker base class

packages/maker/appx/src/MakerAppX.ts

@@ -123,10 +123,9 @@ export default class MakerAppX extends MakerBase<MakerAppXConfig> {
  );
  }
 
- if (opts.packageVersion.match(/-/)) {
+ if (opts.packageVersion.includes('-')) {
  if (opts.makeVersionWinStoreCompatible) {
- const noBeta = opts.packageVersion.replace(/-.*/, '');
- opts.packageVersion = `${noBeta}.0`;
+ opts.packageVersion = this.normalizeWindowsVersion(opts.packageVersion);
  } else {
  throw new Error(
  "Windows Store version numbers don't support semver beta tags. To "

packages/maker/base/src/Maker.ts

@@ -162,4 +162,13 @@ export default abstract class Maker<C> implements IForgeMaker {
  return false;
  }
  }
+
+ /**
+ * Normalize the given semver-formatted version to a 4-part dot delimited version number without
+ * prerelease information for use in Windows apps.
+ */
+ normalizeWindowsVersion(version: string): string {
+ const noPrerelease = version.replace(/-.*/, '');
+ return `${noPrerelease}.0`;
+ }
 }

packages/maker/base/test/version_spec.ts

@@ -0,0 +1,22 @@
+import { expect } from 'chai';
+
+import MakerBase from '../src/Maker';
+
+class MakerImpl extends MakerBase<{}> {
+ name = 'test';
+
+ defaultPlatforms = [];
+}
+
+describe('normalizeWindowsVersion', () => {
+ const maker = new MakerImpl({}, []);
+
+ it('removes everything after the dash', () => {
+ for (const version of ['1.0.0-alpha', '1.0.0-alpha.1', '1.0.0-0.3.7', '1.0.0-x.7.z.92']) {
+ expect(maker.normalizeWindowsVersion(version)).to.equal('1.0.0.0');
+ }
+ });
+ it('does not truncate the version when there is no dash', () => {
+ expect(maker.normalizeWindowsVersion('2.0.0')).to.equal('2.0.0.0');
+ });
+});