3.0.1

.gitignore

@@ -1,5 +1,20 @@
 .nogit/
-node_modules/
+
+# artifacts
 coverage/
 public/
 pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_*/
+
+# custom

.gitlab-ci.yml

@@ -1,16 +1,16 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
 
 # ====================
 # security stage
@@ -18,109 +18,114 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
+  only:
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
-snyk:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci command npm install -g snyk
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
-  - docker
-  - notpriv
+    - docker
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
+  tags:
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
 
-testLTS:
+testStable:
   stage: test
   script:
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - docker
 
-testSTABLE:
+testBuild:
   stage: test
   script:
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - docker
 
 release:
   stage: release
   script:
-  - npmci node install stable
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
+  only:
+    - tags
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
+    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci node install lts
+    - npmci command npm install -g @gitzone/tsdoc
+    - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -128,15 +133,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
-  allow_failure: true
-
-windowsCompatibility:
-  image: stefanscherer/node-windows:10-build-tools
-  stage: metadata
-  script:
-  - npm install & npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - windows
+      - public
   allow_failure: true

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

dist/index.d.ts

@@ -1,24 +0,0 @@
-import { SemVer } from 'semver';
-export declare class SmartVersion {
-    semver: SemVer;
-    versionString: string;
-    update: {
-        patch: () => void;
-        minor: () => void;
-        major: () => void;
-    };
-    constructor(semVerStringArg: string);
-    readonly major: number;
-    readonly minor: number;
-    readonly patch: number;
-    greaterThan(smartVersionArg: SmartVersion): boolean;
-    /**
-     * compares the version of this against a string
-     */
-    greaterThanString(versionStringArg: any): boolean;
-    lessThan(smartVersionArg: SmartVersion): boolean;
-    /**
-     * compares the version of this against a string
-     */
-    lessThanString(versionStringArg: any): boolean;
-}

dist/index.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const plugins = require("./smartversion.plugins");
-class SmartVersion {
-    constructor(semVerStringArg) {
-        this.update = {
-            patch: () => {
-                this.semver.patch = this.semver.patch + 1;
-            },
-            minor: () => {
-                this.semver.minor = this.semver.minor + 1;
-            },
-            major: () => {
-                this.semver.major = this.semver.major + 1;
-            }
-        };
-        this.semver = new plugins.semver.SemVer(semVerStringArg);
-        this.versionString = this.semver.version;
-    }
-    get major() {
-        return this.semver.major;
-    }
-    get minor() {
-        return this.semver.minor;
-    }
-    get patch() {
-        return this.semver.patch;
-    }
-    greaterThan(smartVersionArg) {
-        return this.greaterThanString(smartVersionArg.versionString);
-    }
-    /**
-     * compares the version of this against a string
-     */
-    greaterThanString(versionStringArg) {
-        return plugins.semver.gt(this.versionString, versionStringArg);
-    }
-    lessThan(smartVersionArg) {
-        return this.lessThanString(smartVersionArg.versionString);
-    }
-    /**
-     * compares the version of this against a string
-     */
-    lessThanString(versionStringArg) {
-        return plugins.semver.lt(this.versionString, versionStringArg);
-    }
-}
-exports.SmartVersion = SmartVersion;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGtEQUFpRDtBQUlqRDtJQWVFLFlBQWEsZUFBdUI7UUFacEMsV0FBTSxHQUFHO1lBQ1AsS0FBSyxFQUFFO2dCQUNMLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQTtZQUMzQyxDQUFDO1lBQ0QsS0FBSyxFQUFFO2dCQUNMLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQTtZQUMzQyxDQUFDO1lBQ0QsS0FBSyxFQUFFO2dCQUNMLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQTtZQUMzQyxDQUFDO1NBQ0YsQ0FBQTtRQUdDLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUMsQ0FBQTtRQUN4RCxJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFBO0lBQzFDLENBQUM7SUFFRCxJQUFJLEtBQUs7UUFDUCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUE7SUFDMUIsQ0FBQztJQUVELElBQUksS0FBSztRQUNQLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQTtJQUMxQixDQUFDO0lBRUQsSUFBSSxLQUFLO1FBQ1AsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFBO0lBQzFCLENBQUM7SUFFRCxXQUFXLENBQUUsZUFBNkI7UUFDeEMsTUFBTSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLENBQUE7SUFDOUQsQ0FBQztJQUVEOztPQUVHO0lBQ0gsaUJBQWlCLENBQUUsZ0JBQWdCO1FBQ2pDLE1BQU0sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLGdCQUFnQixDQUFDLENBQUE7SUFDaEUsQ0FBQztJQUVELFFBQVEsQ0FBRSxlQUE2QjtRQUNyQyxNQUFNLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLENBQUE7SUFDM0QsQ0FBQztJQUVEOztPQUVHO0lBQ0gsY0FBYyxDQUFFLGdCQUFnQjtRQUM5QixNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLGFBQWEsRUFBRSxnQkFBZ0IsQ0FBQyxDQUFBO0lBQ2hFLENBQUM7Q0FFRjtBQXRERCxvQ0FzREMifQ==

dist/smartversion.plugins.d.ts

@@ -1,3 +0,0 @@
-import 'typings-global';
-import * as semver from 'semver';
-export { semver };

dist/smartversion.plugins.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("typings-global");
-const semver = require("semver");
-exports.semver = semver;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR2ZXJzaW9uLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHZlcnNpb24ucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF1QjtBQUN2QixpQ0FBZ0M7QUFHOUIsd0JBQU0ifQ==

npmextra.json

@@ -1,9 +1,17 @@
 {
   "npmci": {
-    "globalNpmTools": [],
+    "npmGlobalTools": [],
     "npmAccessLevel": "public"
   },
-  "npmts": {
-    "coverageTreshold": 60
+  "gitzone": {
+    "projectType": "npm",
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartversion",
+      "shortDescription": "handle semver with ease",
+      "npmPackagename": "@pushrocks/smartversion",
+      "license": "MIT"
+    }
   }
 }

package.json

@@ -1,25 +1,43 @@
 {
-  "name": "smartversion",
-  "version": "1.0.4",
+  "name": "@pushrocks/smartversion",
+  "version": "3.0.1",
   "private": false,
-  "description": "handle semver with easy",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "description": "handle semver with ease",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
-    "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "test": "(tstest test/ --web)",
+    "build": "(tsbuild --web)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
-    "@gitzone/tsrun": "^1.1.12",
-    "@gitzone/tstest": "^1.0.15",
-    "@pushrocks/tapbundle": "^3.0.5",
-    "@types/node": "^10.9.4"
+    "@gitzone/tsbuild": "^2.1.61",
+    "@gitzone/tsrun": "^1.2.32",
+    "@gitzone/tstest": "^1.0.70",
+    "@pushrocks/tapbundle": "^5.0.3",
+    "@types/node": "^17.0.27",
+    "tslint": "^6.1.3",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@types/semver": "^5.5.0",
-    "semver": "^5.5.1"
-  }
+    "@types/semver": "^7.3.9",
+    "semver": "^7.3.5"
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
+  ]
 }

readme.md

@@ -1,33 +1,40 @@
-# smartversion
+# @pushrocks/smartversion
+handle semver with ease
 
-handle semver with easy
-
-## Availabililty
-
-[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartversion)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartversion)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartversion)
-[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartversion/)
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartversion)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartversion)
+* [github.com (source mirror)](https://github.com/pushrocks/smartversion)
+* [docs (typedoc)](https://pushrocks.gitlab.io/smartversion/)
 
 ## Status for master
 
-[![build status](https://GitLab.com/pushrocks/smartversion/badges/master/build.svg)](https://GitLab.com/pushrocks/smartversion/commits/master)
-[![coverage report](https://GitLab.com/pushrocks/smartversion/badges/master/coverage.svg)](https://GitLab.com/pushrocks/smartversion/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/smartversion.svg)](https://www.npmjs.com/package/smartversion)
-[![Dependency Status](https://david-dm.org/pushrocks/smartversion.svg)](https://david-dm.org/pushrocks/smartversion)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartversion/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartversion/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/smartversion/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartversion)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartversion/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartversion/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartversion)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartversion)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartversion)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartversion)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartversion)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
 Use TypeScript for best in class instellisense.
 
-For further information read the linked docs at the top of this README.
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
+For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
 
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.ts

@@ -1,21 +1,36 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as smartversion from '../ts/index';
+import * as smartversion from '../ts/index.js';
 
-let localSmartVersion: smartversion.SmartVersion;
 tap.test('should create a valid SmartVersion', async () => {
-  localSmartVersion = new smartversion.SmartVersion('3.2.1');
-  expect(localSmartVersion).to.be.instanceof(smartversion.SmartVersion);
+  const localSmartVersion = new smartversion.SmartVersion('3.2.1');
+  expect(localSmartVersion).toBeInstanceOf(smartversion.SmartVersion);
+  // tslint:disable-next-line:no-unused-expression
+  expect(localSmartVersion.greaterThanString('4.0.0')).toBeFalse();
+  // tslint:disable-next-line:no-unused-expression
+  expect(localSmartVersion.greaterThanString('3.0.0')).toBeTrue();
+  // tslint:disable-next-line:no-unused-expression
+  expect(localSmartVersion.lessThanString('v4.0.0')).toBeTrue();
+  // tslint:disable-next-line:no-unused-expression
+  expect(localSmartVersion.lessThanString('v3.0.0')).toBeFalse();
 });
 
-tap.test('should correctly classify greater and less than', async () => {
-  // tslint:disable-next-line:no-unused-expression
-  expect(localSmartVersion.greaterThanString('4.0.0')).to.be.false;
-  // tslint:disable-next-line:no-unused-expression
-  expect(localSmartVersion.greaterThanString('3.0.0')).to.be.true;
-  // tslint:disable-next-line:no-unused-expression
-  expect(localSmartVersion.lessThanString('v4.0.0')).to.be.true;
-  // tslint:disable-next-line:no-unused-expression
-  expect(localSmartVersion.lessThanString('v3.0.0')).to.be.false;
+tap.test('should create a valid SmartVersion', async () => {
+  const localSmartVersion = smartversion.SmartVersion.fromFuzzyString('4');
+  expect(localSmartVersion).toBeInstanceOf(smartversion.SmartVersion);
+  console.log(localSmartVersion.versionString);
 });
 
+tap.test('should create a valid SmartVersion', async () => {
+  const localSmartVersion = smartversion.SmartVersion.fromFuzzyString('4.x');
+  const bestMatch = localSmartVersion.getBestMatch(['4.0.1', '4.7.5', '4.3.0']);
+  console.log(bestMatch);
+  expect(bestMatch).toEqual('4.7.5');
+});
+
+tap.test('should create a patch version', async () => {
+  const versInstance =  smartversion.SmartVersion.fromFuzzyString('1.2.3');
+  const newVersion = versInstance.getNewPatchVersion();
+  console.log(newVersion.versionString);
+})
+
 tap.start();

ts/index.ts

@@ -1,58 +1,100 @@
-import * as plugins from './smartversion.plugins';
-
-import { SemVer } from 'semver';
+import * as plugins from './smartversion.plugins.js';
 
 export class SmartVersion {
-  semver: SemVer;
-  versionString: string;
-  update = {
-    patch: () => {
-      this.semver.patch = this.semver.patch + 1;
-    },
-    minor: () => {
-      this.semver.minor = this.semver.minor + 1;
-    },
-    major: () => {
-      this.semver.major = this.semver.major + 1;
-    }
-  };
-
-  constructor(semVerStringArg: string) {
-    this.semver = new plugins.semver.SemVer(semVerStringArg);
-    this.versionString = this.semver.version;
+  public static fromFuzzyString(fuzzyString: string): SmartVersion {
+    return new SmartVersion(plugins.semver.minVersion(fuzzyString).version, fuzzyString);
   }
 
-  get major() {
+  public originalVersionString: string;
+  public semver: plugins.semver.SemVer;
+  public get versionString(): string {
+    return this.semver.version;
+  };
+
+  constructor(semVerStringArg: string, originalStringArg?: string) {
+    this.originalVersionString = originalStringArg;
+    this.semver = new plugins.semver.SemVer(semVerStringArg);
+  }
+
+  public get major() {
     return this.semver.major;
   }
 
-  get minor() {
+  public get minor() {
     return this.semver.minor;
   }
 
-  get patch() {
+  public get patch() {
     return this.semver.patch;
   }
 
-  greaterThan(smartVersionArg: SmartVersion) {
+  public greaterThan(smartVersionArg: SmartVersion) {
     return this.greaterThanString(smartVersionArg.versionString);
   }
 
   /**
    * compares the version of this against a string
    */
-  greaterThanString(versionStringArg) {
+  public greaterThanString(versionStringArg: string) {
     return plugins.semver.gt(this.versionString, versionStringArg);
   }
 
-  lessThan(smartVersionArg: SmartVersion) {
+  public lessThan(smartVersionArg: SmartVersion) {
     return this.lessThanString(smartVersionArg.versionString);
   }
 
   /**
    * compares the version of this against a string
    */
-  lessThanString(versionStringArg) {
+  public lessThanString(versionStringArg: string) {
     return plugins.semver.lt(this.versionString, versionStringArg);
   }
+
+  /**
+   * tries to get the best match from a range of available versions
+   */
+  public getBestMatch(availableVersions: string[]): string {
+    let bestMatchingVersion: string;
+    for (const versionArg of availableVersions) {
+      if (!plugins.semver.satisfies(versionArg, this.originalVersionString)) {
+        continue;
+      }
+      if(!bestMatchingVersion) {
+        bestMatchingVersion = versionArg;
+      } else {
+        if (plugins.semver.lt(bestMatchingVersion, versionArg)) {
+          bestMatchingVersion = versionArg;
+        }
+      }
+    }
+    return bestMatchingVersion;
+  }
+
+  public getNewPatchVersion() {
+    const newInstance = new SmartVersion(`${this.semver.major}.${this.semver.minor}.${this.semver.patch + 1}`);
+    return newInstance;
+  }
+
+  public getNewMinorVersion() {
+    const newInstance = new SmartVersion(`${this.semver.major}.${this.semver.minor + 1}.${this.semver.patch}`);
+    return newInstance;
+  }
+
+  public getNewMajorVersion() {
+    const newInstance = new SmartVersion(`${this.semver.major + 1}.${this.semver.minor}.${this.semver.patch}`);
+    return newInstance;
+  }
+
+  public getNewVersion(typeArg: 'patch' | 'minor' | 'major') {
+    switch (typeArg) {
+      case 'patch':
+        return this.getNewPatchVersion();
+      case 'minor':
+        return this.getNewMinorVersion();
+      case 'major':
+        return this.getNewMajorVersion();
+      default:
+        throw new Error('unknown new version type.');
+    }
+  }
 }

ts/smartversion.plugins.ts

@@ -1,3 +1,3 @@
-import * as semver from 'semver';
+import semver from 'semver';
 
 export { semver };

tslint.json

@@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
 }