4.0.15

.gitea/workflows/default_tags.yaml

@@ -119,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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartstring",
-  "version": "4.0.8",
+  "version": "4.0.15",
   "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,27 +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",
-    "@push.rocks/tapbundle": "^5.0.8",
+    "@push.rocks/tapbundle": "^5.0.15",
-    "@types/node": "^20.3.1"
+    "@types/node": "^20.11.24"
   },
   "dependencies": {
     "@push.rocks/isounique": "^1.0.5",
-    "@push.rocks/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/**/*",

test/test.normalize.both.ts

@@ -2,15 +2,16 @@ 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
   `
   );

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartstring',
-  version: '4.0.8',
+  version: '4.0.15',
   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

@@ -5,10 +5,6 @@ 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

@@ -3,9 +3,12 @@
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
     "target": "ES2022",
-    "module": "ES2022",
+    "module": "NodeNext",
-    "moduleResolution": "nodenext",
+    "moduleResolution": "NodeNext",
     "esModuleInterop": true,
-    "verbatimModuleSyntax": true,
+    "verbatimModuleSyntax": true
-  }
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
 }