3.0.3

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install pnpm and npmci
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+
+      - name: Run npm prepare
+        run: npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build

.gitea/workflows/default_tags.yaml

@@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Release
+        run: |
+          npmci node install stable
+          npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @git.zone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -1,119 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
-
-stages:
-- security
-- test
-- release
-- metadata
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  script:
-  - npmci git mirror
-  tags:
-  - docker
-  - notpriv
-
-snyk:
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install -g snyk
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
-  tags:
-  - docker
-  - notpriv
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - priv
-
-testBuild:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci command npm run build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-
-release:
-  stage: release
-  script:
-  - npmci node install stable
-  - npmci npm publish
-  only:
-  - tags
-  tags:
-  - docker
-  - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  script:
-    - npmci command npm install -g tslint typescript
-    - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-  tags:
-  - docker
-  - priv
-
-trigger:
-  stage: metadata
-  script:
-  - npmci trigger
-  only:
-  - tags
-  tags:
-  - docker
-  - notpriv
-
-pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
-  stage: metadata
-  script:
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command tsdoc
-  tags:
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-    - public
-  allow_failure: true

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "npm test",
+      "name": "Run npm test",
+      "request": "launch",
+      "type": "node-terminal"
+    }
+  ]
+}

.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"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

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

package.json

@@ -1,36 +1,50 @@
 {
-  "name": "@pushrocks/smartversion",
-  "version": "2.0.1",
+  "name": "@push.rocks/smartversion",
+  "version": "3.0.3",
   "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)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.24",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.7.5"
+    "@git.zone/tsbuild": "^2.1.61",
+    "@git.zone/tsrun": "^1.2.32",
+    "@git.zone/tstest": "^1.0.70",
+    "@push.rocks/tapbundle": "^5.0.8",
+    "@types/node": "^20.11.25"
   },
   "dependencies": {
-    "@types/semver": "^6.0.2",
-    "semver": "^6.3.0"
+    "@types/semver": "^7.3.9",
+    "semver": "^7.3.5"
   },
   "files": [
-    "ts/*",
-    "ts_web/*",
-    "dist/*",
-    "dist_web/*",
-    "dist_ts_web/*",
-    "assets/*",
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
-  ]
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitlab.com/push.rocks/smartversion.git"
+  },
+  "bugs": {
+    "url": "https://gitlab.com/push.rocks/smartversion/issues"
+  },
+  "homepage": "https://gitlab.com/push.rocks/smartversion#readme"
 }

readme.md

@@ -1,31 +1,36 @@
-# @pushrocks/smartversion
-handle semver with easy
+# @push.rocks/smartversion
+handle semver with ease
 
 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartversion)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/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/@pushrocks/smartversion.svg)](https://www.npmjs.com/package/@pushrocks/smartversion)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartversion/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartversion)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+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/@push.rocks/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/@push.rocks/smartversion)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/smartversion)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/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.
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+## Contribution
 
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
+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.
 

test/test.ts

@@ -1,21 +1,36 @@
-import { expect, tap } from '@pushrocks/tapbundle';
-import * as smartversion from '../ts/index';
+import { expect, tap } from '@push.rocks/tapbundle';
+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/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@push.rocks/smartversion',
+  version: '3.0.3',
+  description: 'handle semver with ease'
+}

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}.${0}`);
+    return newInstance;
+  }
+
+  public getNewMajorVersion() {
+    const newInstance = new SmartVersion(`${this.semver.major + 1}.${0}.${0}`);
+    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 };

tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "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"
-}