@ditojs/utils 1.22.0 → 1.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/utils",
-  "version": "1.22.0",
+  "version": "1.23.0",
   "type": "module",
   "description": "Dito.js Utility Functions – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/utils",
@@ -14,9 +14,6 @@
     "src/",
     "types/"
   ],
-  "scripts": {
-    "types": "tsc --noEmit types/index.d.ts"
-  },
   "engines": {
     "node": ">= 18.0.0",
     "yarn": ">= 1.0.0"
@@ -32,8 +29,12 @@
     "punycode": "^2.3.0"
   },
   "devDependencies": {
-    "typescript": "^4.9.4"
+    "typescript": "^4.9.5"
   },
   "types": "types",
-  "gitHead": "e1693edb8bf18e074606a842f2f2bacc1d2856cb"
-}
+  "gitHead": "3258fd030226062efa6837bfc5e5a761e80cead5",
+  "scripts": {
+    "types": "tsc --noEmit types/index.d.ts"
+  },
+  "readme": "# Dito.js Utility Functions\n\nDito.js is a declarative and modern web framework with a focus on API driven\ndevelopment, based on Koa.js, Objection.js and Vue.js\n\nReleased in 2018 under the MIT license, with support by https://lineto.com/\n"
+}

package/src/string/deindent.js

@@ -1,9 +1,12 @@
-import os from 'os'
 import { asArray } from '../base/index.js'
 
 // ES6 string tag that strips indentation from multi-line strings
 // Based on, and further improved from https://github.com/dmnd/dedent
 export function deindent(strings, ...values) {
+  // Small helper to determine the actual line-break used in the strings, based
+  // on the  line-breaks encountered.
+  const getLineBreak = line => line.match(/^(\n|\r\n|\r)/)?.[1] || '\n'
+
   strings = asArray(strings)
   // First, perform interpolation
   let parts = []
@@ -21,16 +24,18 @@ export function deindent(strings, ...values) {
       if (lines.length > 1) {
         // Determine the indent by finding the immediately preceding white-space
         // up to the previous line-break or the beginning of the string.
-        // (?:^|[\n\r])  # Start at either the beginning or the prev line break.
-        // (?:[\n\r]*)   # Skip the line break
-        // (\s+)         # Collect the indenting white-space...
-        // (?:[^\n\r]*)$ # ...up to the end or the next word, but in last line,
-        // by making sure no line breaks follow until the end.
+        // (?:^[\n\r]*|[\n\r])  # Start at either the beginning or the previous
+        //                      # line break.
+        // (?:[\n\r]*)          # The line break
+        // (\s+)                # Collect the indenting white-space...
+        // (?:[^\n\r]*)$        # ...up to the end or the next word, but in last
+        //                      # line, by making sure no line breaks follow
+        //                      # until the end.
         const str = parts.join('')
-        const match = str.match(/(?:^|[\n\r])(?:[\n\r]*)(\s+)(?:[^\n\r]*)$/)
+        const match = str.match(/((?:^[\n\r]*|[\n\r])(?:[\n\r]*))(\s+)(?:[^\n\r]*)$/)
+        const [, lineBreaks = '', indent = ''] = match || []
         parts = [str]
-        const indent = match?.[1] || ''
-        parts.push(lines.join(`${os.EOL}${indent}`))
+        parts.push(lines.join(`${getLineBreak(lineBreaks)}${indent}`))
       } else {
         parts.push(value)
       }
@@ -42,7 +47,11 @@ export function deindent(strings, ...values) {
   // const value = `
   //   content...
   //   ` // line break at the end remains
-  if (!lines[0]) lines.shift()
+  let offset = 0
+  if (!lines[0]) {
+    lines.shift()
+    offset++
+  }
   let indent = Infinity
   for (const line of lines) {
     const match = line.match(/^(\s*)\S+/)
@@ -50,5 +59,7 @@ export function deindent(strings, ...values) {
       indent = Math.min(indent, match[1].length)
     }
   }
-  return lines.map(line => line.slice(indent)).join(os.EOL)
+  const index = lines[0].length + offset
+  const lineBreak = getLineBreak(str.slice(index, index + 2))
+  return lines.map(line => line.slice(indent)).join(lineBreak)
 }