muggle-string 0.2.1 → 0.2.2

package/out/index.d.ts

@@ -1,28 +1,20 @@
 declare const NO_DATA_SYMBOL: unique symbol;
-export type Segment<T = typeof NO_DATA_SYMBOL> = T extends typeof NO_DATA_SYMBOL ? SegmentWithoutData : SegmentWithData<T>;
-export type SegmentWithoutData = WithString<_SegmentWithoutData>;
-export type SegmentWithData<T = any> = WithString<_SegmentWithData<T>>;
-type WithString<T> = T | string;
-type _SegmentWithoutData = [
+export type Segment<T = typeof NO_DATA_SYMBOL> = WithString<T extends typeof NO_DATA_SYMBOL ? [
     string,
-    // text
     string | undefined,
-    // source
     number | [number, number]
-];
-type _SegmentWithData<T = any> = [
+] : [
     string,
-    // text
     string | undefined,
-    // source
     number | [number, number],
     T
-];
+]>;
+type WithString<T> = T | string;
 export declare function getLength(segments: Segment<any>[]): number;
 export declare function toString<T extends Segment<any>>(segments: T[]): string;
 export declare function create(source: string): Segment[];
-export declare function replace<T extends Segment<any>>(segments: T[], pattern: string | RegExp, ...replacers: (string | ((match: string) => T))[]): void;
-export declare function replaceAll<T extends Segment<any>>(segments: T[], pattern: RegExp, ...replacers: (string | ((match: string) => T))[]): void;
-export declare function replaceSourceRange<T extends Segment<any>>(segments: T[], source: string | undefined, startOffset: number, endOffset: number, ...newSegments: T[]): void;
+export declare function replace<T extends Segment<any>>(segments: T[], pattern: string | RegExp, ...replacers: (T | ((match: string) => T))[]): void;
+export declare function replaceAll<T extends Segment<any>>(segments: T[], pattern: RegExp, ...replacers: (T | ((match: string) => T))[]): void;
+export declare function replaceSourceRange<T extends Segment<any>>(segments: T[], source: string | undefined, startOffset: number, endOffset: number, ...newSegments: T[]): boolean;
 export declare function replaceRange<T extends Segment<any>>(segments: T[], startOffset: number, endOffset: number, ...newSegments: T[]): void;
 export {};

package/out/index.js

@@ -25,7 +25,7 @@ function replace(segments, pattern, ...replacers) {
     if (match && match.index !== undefined) {
         const startOffset = match.index;
         const endOffset = startOffset + match[0].length;
-        replaceRange(segments, startOffset, endOffset, ...replacers.map(replacer => typeof replacer === 'string' ? replacer : replacer(match[0])));
+        replaceRange(segments, startOffset, endOffset, ...replacers.map(replacer => typeof replacer === 'function' ? replacer(match[0]) : replacer));
     }
 }
 exports.replace = replace;
@@ -38,7 +38,7 @@ function replaceAll(segments, pattern, ...replacers) {
         if (match.index !== undefined) {
             const startOffset = match.index + lengthDiff;
             const endOffset = startOffset + match[0].length;
-            replaceRange(segments, startOffset, endOffset, ...replacers.map(replacer => typeof replacer === 'string' ? replacer : replacer(match[0])));
+            replaceRange(segments, startOffset, endOffset, ...replacers.map(replacer => typeof replacer === 'function' ? replacer(match[0]) : replacer));
             const newLength = getLength(segments);
             lengthDiff += newLength - length;
             length = newLength;
@@ -67,11 +67,11 @@ function replaceSourceRange(segments, source, startOffset, endOffset, ...newSegm
                 }
                 combineStrings(inserts);
                 segments.splice(segments.indexOf(segment), 1, ...inserts);
-                return;
+                return true;
             }
         }
     }
-    throw new Error(`Source range not found: ${source} ${startOffset} ${endOffset}`);
+    return false;
 }
 exports.replaceSourceRange = replaceSourceRange;
 function replaceRange(segments, startOffset, endOffset, ...newSegments) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "muggle-string",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [