4.0.10

.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

.gitlab-ci.yml

@@ -1,140 +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
-
-before_script:
-  - npm install -g @shipzone/npmci
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - 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
-  allow_failure: true
-
-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
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-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
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  only:
-    - tags
-  script:
-    - npmci command npm install -g typescript
-    - npmci npm prepare
-    - npmci npm install
-  tags:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  stage: metadata
-  script:
-    - npmci node install lts
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command tsdoc
-  tags:
-    - lossless
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

npmextra.json

@@ -12,10 +12,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "smartstring",
       "description": "handle strings in smart ways. TypeScript ready.",
-      "npmPackagename": "@pushrocks/smartstring",
+      "npmPackagename": "@push.rocks/smartstring",
       "license": "MIT"
     }
   }

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/smartstring",
+  "name": "@push.rocks/smartstring",
-  "version": "4.0.0",
+  "version": "4.0.10",
   "private": false,
   "description": "handle strings in smart ways. TypeScript ready.",
   "main": "dist_ts/index.js",
@@ -8,11 +8,12 @@
   "type": "module",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild --web --allowimplicitany)"
+    "build": "(tsbuild --web --allowimplicitany)",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://gitlab.com/pushrocks/smartstring.git"
+    "url": "git+https://gitlab.com/push.rocks/smartstring.git"
   },
   "keywords": [
     "regex",
@@ -21,29 +22,27 @@
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://gitlab.com/pushrocks/smartstring/issues"
+    "url": "https://gitlab.com/push.rocks/smartstring/issues"
   },
-  "homepage": "https://gitlab.com/pushrocks/smartstring#readme",
+  "homepage": "https://gitlab.com/push.rocks/smartstring#readme",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.59",
+    "@git.zone/tsbuild": "^2.1.66",
-    "@gitzone/tsrun": "^1.2.31",
+    "@git.zone/tsrun": "^1.2.42",
-    "@gitzone/tstest": "^1.0.69",
+    "@git.zone/tstest": "^1.0.84",
-    "@pushrocks/tapbundle": "^5.0.2",
+    "@push.rocks/tapbundle": "^5.0.15",
-    "@types/node": "^17.0.21",
+    "@types/node": "^20.10.5"
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/isounique": "^1.0.5",
+    "@push.rocks/isounique": "^1.0.5",
-    "@pushrocks/smartenv": "^5.0.0",
+    "@push.rocks/smartenv": "^5.0.12",
-    "@types/randomatic": "^3.1.3",
+    "@types/randomatic": "^3.1.5",
     "buffer": "^6.0.3",
-    "crypto-random-string": "^4.0.0",
+    "crypto-random-string": "^5.0.0",
-    "js-base64": "^3.7.2",
+    "js-base64": "^3.7.5",
     "normalize-newline": "^4.1.0",
     "randomatic": "^3.1.1",
     "strip-indent": "^4.0.0",
-    "url": "^0.11.0"
+    "url": "^0.11.3"
   },
   "files": [
     "ts/**/*",

readme.md

@@ -1,27 +1,26 @@
-# @pushrocks/smartstring
+# @push.rocks/smartstring
 handle strings in smart ways. TypeScript ready.
 
 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartstring)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/smartstring)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/smartstring)
+* [gitlab.com (source)](https://gitlab.com/push.rocks/smartstring)
-* [github.com (source mirror)](https://github.com/pushrocks/smartstring)
+* [github.com (source mirror)](https://github.com/push.rocks/smartstring)
-* [docs (typedoc)](https://pushrocks.gitlab.io/smartstring/)
+* [docs (typedoc)](https://push.rocks.gitlab.io/smartstring/)
 
 ## Status for master
 
 Status Category | Status Badge
 -- | --
-GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartstring/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/push.rocks/smartstring/badges/master/pipeline.svg)](https://lossless.cloud)
-GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartstring/badges/master/coverage.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/push.rocks/smartstring/badges/master/coverage.svg)](https://lossless.cloud)
-npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartstring)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/smartstring)](https://lossless.cloud)
-Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartstring)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/push.rocks/smartstring)](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/smartstring)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@push.rocks/smartstring)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartstring)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/smartstring)](https://lossless.cloud)
-BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartstring)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/smartstring)](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
 
@@ -71,7 +70,6 @@ We are always happy for code contributions. If you are not the code contributing
 
 For further information read the linked docs at the top of this readme.
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
 | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.base64.both.ts

@@ -1,16 +1,23 @@
 import * as smartstring from '../ts/index.js';
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect } from '@push.rocks/tapbundle';
 
 // Base64
 let testBase64: smartstring.Base64;
+
 tap.test('expect create a valid instance of Base64', async () => {
   testBase64 = new smartstring.Base64('somestring', 'string');
   expect(testBase64).toBeInstanceOf(smartstring.Base64);
 });
+
 tap.test('expect read output a file as base64 and base64uri', async () => {
   expect(testBase64.base64String).not.toEqual(testBase64.base64UriString);
   let testBase64_2 = new smartstring.Base64(testBase64.base64UriString, 'base64uri');
   expect(testBase64_2.simpleString).toEqual(testBase64.simpleString);
 });
 
+tap.test('should test for a valid base64 token', async () => {
+  const result = smartstring.base64.isBase64('dGVzdA==');
+  expect(result).toBeTrue();
+});
+
 tap.start();

test/test.docker.both.ts

@@ -1,5 +1,5 @@
 import * as smartstring from '../ts/index.js';
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect } from '@push.rocks/tapbundle';
 
 // Docker
 tap.test('expect create a Env Object', async () => {

test/test.domain.both.ts

@@ -1,5 +1,5 @@
 import * as smartstring from '../ts/index.js';
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect } from '@push.rocks/tapbundle';
 
 // Domain
 let testDomain: smartstring.Domain;

test/test.git.both.ts

@@ -1,5 +1,5 @@
 import * as smartstring from '../ts/index.js';
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect } from '@push.rocks/tapbundle';
 
 // git
 let testGit: smartstring.GitRepo;

test/test.indent.both.ts

@@ -1,5 +1,5 @@
 import * as smartstring from '../ts/index.js';
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect } from '@push.rocks/tapbundle';
 
 // indent
 let testString = `

test/test.normalize.both.ts

@@ -1,4 +1,4 @@
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect } from '@push.rocks/tapbundle';
 
 import * as smartstring from '../ts/index.js';
 
@@ -9,8 +9,7 @@ tap.test('should normalize a string', async () => {
   `;
   const normalizedString = smartstring.normalize.standard(testString);
   expect(normalizedString).toEqual(
-    `
+    `myawesome string;
-myawesome string;
   is indented with two spaces
   `
   );

test/test.type.both.ts

@@ -1,4 +1,4 @@
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect } from '@push.rocks/tapbundle';
 import * as smartstring from '../ts/index.js';
 
 tap.test('should state valuid utf8', async () => {

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@push.rocks/smartstring',
+  version: '4.0.10',
+  description: 'handle strings in smart ways. TypeScript ready.'
+}

ts/smartstring.base64.ts

@@ -3,14 +3,14 @@ import * as plugins from './smartstring.plugins.js';
 /**
  * the type for base 64
  */
-export type TBase64Input = 'string' | 'base64' | 'base64uri';
+export type TStringInputType = 'string' | 'base64' | 'base64uri';
 
 /**
  * handle base64 strings
  */
 export class Base64 {
   private refString: string;
-  constructor(inputStringArg, typeArg: TBase64Input) {
+  constructor(inputStringArg, typeArg: TStringInputType) {
     switch (typeArg) {
       case 'string': // easiest case
         this.refString = inputStringArg;
@@ -66,4 +66,14 @@ export let base64 = {
   decode: (stringArg: string) => {
     return plugins.jsBase64.decode(stringArg);
   },
+
+  /**
+   *
+   * @param stringArg
+   * checks wether the string is base64 encoded
+   */
+  isBase64: (stringArg: string) => {
+    const regex = /^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$/;
+    return regex.test(stringArg);
+  },
 };

ts/smartstring.git.ts

@@ -26,7 +26,7 @@ export class GitRepo {
  * ---------------------------------------------- */
 const gitRegex = function (stringArg: string) {
   const regexString =
-    /([a-zA-Z0-9\-\.]*)(?:\/|\:)([a-zA-Z0-9\-\.]*)(?:\/)([a-zA-Z0-9\-\.]*)(?:\.git)/;
+    /([a-zA-Z0-9\-_\.]*)(?:\/|\:)([a-zA-Z0-9\-_\.]*)(?:\/)([a-zA-Z0-9\-_\.]*)(?:\.git)/;
   let regexMatches = regexString.exec(stringArg);
   return regexMatches;
 };

ts/smartstring.normalize.ts

@@ -10,13 +10,42 @@ export const replaceAll = (stringArg: string, searchPattern: string, replacement
   return stringArg.replace(new RegExp(searchPattern, 'g'), replacementString);
 };
 
+export interface INormalizeOptions {
+  stripLeadingTrailingEmptyLines?: boolean;
+  stripAllEmptyLines?: boolean;
+  stripIndent?: boolean;
+  normalizeNewline?: boolean;
+  replaceTabs?: boolean;
+}
+
 /**
- * normalizes a string
+ * Normalizes a string
  * @param stringArg
+ * @param options
  */
-export const standard = (stringArg: string): string => {
+export const standard = (stringArg: string, options?: INormalizeOptions): string => {
-  let fix1 = plugins.stripIndent(stringArg); // fix indention
+  let result = stringArg;
-  let fix2 = plugins.normalizeNewline(fix1); // fix newlines
+
-  let fix3 = replaceAll(fix2, '\t/', ' '); // fix tabs
+  if (!options || options.stripIndent) {
-  return fix3;
+    result = plugins.stripIndent(result); // fix indention
+  }
+
+  if (!options || options.normalizeNewline) {
+    result = plugins.normalizeNewline(result); // fix newlines
+  }
+
+  if (!options || options.replaceTabs) {
+    result = replaceAll(result, '\t/', ' '); // fix tabs
+  }
+
+  if (!options || options.stripLeadingTrailingEmptyLines) {
+    result = result.replace(/^\s*[\r\n]/gm, '').replace(/\s*[\r\n]$/gm, '');
+  }
+
+  if (!options || options.stripAllEmptyLines) {
+    result = result.replace(/^\s*[\r\n]/gm, '');
+  }
+
+  return result;
 };
+

ts/smartstring.plugins.ts

@@ -1,7 +1,7 @@
 // node native
-import * as smartenv from '@pushrocks/smartenv';
+import * as smartenv from '@push.rocks/smartenv';
 const smartenvInstance = new smartenv.Smartenv();
-import * as isounique from '@pushrocks/isounique';
+import * as isounique from '@push.rocks/isounique';
 
 export { isounique };
 

tsconfig.json

@@ -1,7 +1,11 @@
 {
   "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
     "target": "ES2022",
     "module": "ES2022",
-    "moduleResolution": "nodenext"
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true,
   }
 }