4.0.14

.gitea/workflows/default_nottags.yaml

@@ -7,13 +7,13 @@ on:
 
 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

.gitea/workflows/default_tags.yaml

@@ -7,13 +7,13 @@ on:
 
 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
@@ -23,13 +23,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-    - name: Install pnpm and npmci
+      - name: Prepare
         run: |
           pnpm install -g pnpm
           pnpm install -g @shipzone/npmci
-
+          npmci npm prepare
-    - name: Run npm prepare
-      run: npmci npm prepare
 
       - name: Audit production dependencies
         run: |
@@ -53,6 +51,12 @@ jobs:
     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
@@ -75,6 +79,12 @@ jobs:
     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
@@ -91,10 +101,15 @@ jobs:
     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 prepare
           npmci npm install
 
       - name: Trigger
@@ -104,6 +119,6 @@ jobs:
         run: |
           npmci node install stable
           npmci npm install
-        pnpm install -g @gitzone/tsdoc
+          pnpm install -g @git.zone/tsdoc
           npmci command tsdoc
         continue-on-error: true

.gitlab-ci.yml

@@ -1,128 +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
-# ====================
-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 stable 
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command npm run buildDocs
-  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.7",
+  "version": "4.0.14",
   "private": false,
   "description": "handle strings in smart ways. TypeScript ready.",
   "main": "dist_ts/index.js",
@@ -13,7 +13,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://gitlab.com/pushrocks/smartstring.git"
+    "url": "git+https://gitlab.com/push.rocks/smartstring.git"
   },
   "keywords": [
     "regex",
@@ -22,29 +22,25 @@
   "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.66",
+    "@git.zone/tsbuild": "^2.1.72",
-    "@gitzone/tsrun": "^1.2.42",
+    "@git.zone/tsrun": "^1.2.42",
-    "@gitzone/tstest": "^1.0.74",
+    "@git.zone/tstest": "^1.0.86",
-    "@pushrocks/tapbundle": "^5.0.8",
+    "@push.rocks/tapbundle": "^5.0.15",
-    "@types/node": "^20.3.1",
+    "@types/node": "^20.11.24"
-    "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.5",
+    "@push.rocks/smartenv": "^5.0.12",
-    "@types/randomatic": "^3.1.3",
+    "@types/randomatic": "^3.1.5",
-    "buffer": "^6.0.3",
     "crypto-random-string": "^5.0.0",
-    "js-base64": "^3.7.5",
+    "js-base64": "^3.7.7",
-    "normalize-newline": "^4.1.0",
     "randomatic": "^3.1.1",
     "strip-indent": "^4.0.0",
-    "url": "^0.11.1"
+    "url": "^0.11.3"
   },
   "files": [
     "ts/**/*",

readme.md

@@ -1,26 +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)
 
 ## Usage
 

test/test.base64.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';
 
 // Base64
 let testBase64: smartstring.Base64;

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,16 +1,17 @@
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect } from '@push.rocks/tapbundle';
 
 import * as smartstring from '../ts/index.js';
 
-tap.test('should normalize a string', async () => {
+tap.test('should normalize a string', async (toolsArg) => {
   const testString = `
     myawesome string;
       is indented with two spaces
   `;
   const normalizedString = smartstring.normalize.standard(testString);
+  console.log(normalizedString);
+  
   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

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@pushrocks/smartstring',
+  name: '@push.rocks/smartstring',
-  version: '4.0.7',
+  version: '4.0.14',
   description: 'handle strings in smart ways. TypeScript ready.'
 }

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 = result.replace(/\r\n/g, '\n'); // 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,14 +1,10 @@
 // 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 };
 
-import { Buffer } from 'buffer';
-if (smartenvInstance.isBrowser) {
-  globalThis.Buffer = Buffer;
-}
 import * as url from 'url';
 export { url };
 
@@ -16,7 +12,6 @@ export { url };
 import { Base64 as jsBase64 } from 'js-base64';
 
 import stripIndent from 'strip-indent';
-import normalizeNewline from 'normalize-newline';
 import randomatic from 'randomatic';
 
-export { jsBase64, stripIndent, normalizeNewline, randomatic };
+export { jsBase64, stripIndent, randomatic };

ts/smartstring.type.ts

@@ -1,8 +1,12 @@
 import * as plugins from './smartstring.plugins.js';
 import * as base64 from './smartstring.base64.js';
 
-export const isUtf8 = (stringArg: string) => {
+export const isUtf8 = (stringArg: string): boolean => {
-  const bytes = Buffer.from(stringArg);
+  // Convert string to a Uint8Array. In browsers, this will be a bit more complex
+  // because we need to convert the string to a binary representation first.
+  const encoder = new TextEncoder();
+  const bytes = encoder.encode(stringArg);
+
   let i = 0;
   while (i < bytes.length) {
     if (
@@ -33,12 +37,14 @@ export const isUtf8 = (stringArg: string) => {
         0xa0 <= bytes[i + 1] &&
         bytes[i + 1] <= 0xbf &&
         0x80 <= bytes[i + 2] &&
-        bytes[i + 2] <= 0xbf) || // straight 3-byte
+        bytes[i + 2] <= 0xbf) ||
+      // straight 3-byte
       (((0xe1 <= bytes[i] && bytes[i] <= 0xec) || bytes[i] === 0xee || bytes[i] === 0xef) &&
         0x80 <= bytes[i + 1] &&
         bytes[i + 1] <= 0xbf &&
         0x80 <= bytes[i + 2] &&
-        bytes[i + 2] <= 0xbf) || // excluding surrogates
+        bytes[i + 2] <= 0xbf) ||
+      // excluding surrogates
       (bytes[i] === 0xed &&
         0x80 <= bytes[i + 1] &&
         bytes[i + 1] <= 0x9f &&
@@ -57,7 +63,8 @@ export const isUtf8 = (stringArg: string) => {
         0x80 <= bytes[i + 2] &&
         bytes[i + 2] <= 0xbf &&
         0x80 <= bytes[i + 3] &&
-        bytes[i + 3] <= 0xbf) || // planes 4-15
+        bytes[i + 3] <= 0xbf) ||
+      // planes 4-15
       (0xf1 <= bytes[i] &&
         bytes[i] <= 0xf3 &&
         0x80 <= bytes[i + 1] &&
@@ -65,7 +72,8 @@ export const isUtf8 = (stringArg: string) => {
         0x80 <= bytes[i + 2] &&
         bytes[i + 2] <= 0xbf &&
         0x80 <= bytes[i + 3] &&
-        bytes[i + 3] <= 0xbf) || // plane 16
+        bytes[i + 3] <= 0xbf) ||
+      // plane 16
       (bytes[i] === 0xf4 &&
         0x80 <= bytes[i + 1] &&
         bytes[i + 1] <= 0x8f &&
@@ -84,6 +92,7 @@ export const isUtf8 = (stringArg: string) => {
   return true;
 };
 
+
 export const isBase64 = (stringArg: string) => {
   const notBase64 = /[^A-Z0-9+\/=]/i;
   const len = stringArg.length;

tsconfig.json

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