@alextheman/utility 2.18.0 → 2.19.0

package/dist/index.cjs

@@ -73,6 +73,7 @@ __export(index_exports, {
   randomiseArray: () => randomiseArray_default,
   range: () => range_default,
   removeDuplicates: () => removeDuplicates_default,
+  removeIndents: () => removeIndents_default,
   stringListToArray: () => stringListToArray_default,
   stringToBoolean: () => stringToBoolean_default,
   stripIndents: () => stripIndents_default,
@@ -519,28 +520,78 @@ function interpolateObjects(strings, ...values) {
 }
 var interpolateObjects_default = interpolateObjects;
 
+// src/functions/taggedTemplate/removeIndents.ts
+function calculateTabSize(line, whitespaceLength) {
+  const potentialWhitespacePart = line.slice(0, whitespaceLength);
+  const trimmedString = line.trimStart();
+  if (potentialWhitespacePart.trim() !== "") {
+    return 0;
+  }
+  const tabSize = line.length - (trimmedString.length + whitespaceLength);
+  return tabSize < 0 ? 0 : tabSize;
+}
+function getWhitespaceLength(lines) {
+  const [firstNonEmptyLine] = lines.filter((line) => {
+    return line.trim() !== "";
+  });
+  return firstNonEmptyLine.length - firstNonEmptyLine.trimStart().length;
+}
+function reduceLines(lines, { preserveTabs = true }) {
+  const slicedLines = lines.slice(1);
+  const isFirstLineEmpty = lines[0].trim() === "";
+  const whitespaceLength = getWhitespaceLength(isFirstLineEmpty ? lines : slicedLines);
+  return (isFirstLineEmpty ? slicedLines : lines).map((line) => {
+    const tabSize = calculateTabSize(line, whitespaceLength);
+    return (preserveTabs ? fillArray_default(() => {
+      return " ";
+    }, tabSize).join("") : "") + line.trimStart();
+  }).join("\n");
+}
+function removeIndents(first, ...args) {
+  if (typeof first === "object" && first !== null && !Array.isArray(first)) {
+    const options2 = first;
+    return (strings2, ...interpolations2) => {
+      return removeIndents(strings2, ...interpolations2, options2);
+    };
+  }
+  const strings = first;
+  const options = typeof args[args.length - 1] === "object" && !Array.isArray(args[args.length - 1]) ? args.pop() : {};
+  const interpolations = [...args];
+  const fullString = interpolate_default(strings, ...interpolations);
+  return reduceLines(fullString.split("\n"), options);
+}
+var removeIndents_default = removeIndents;
+
 // src/functions/taggedTemplate/stripIndents.ts
-function calculateTabSize(line) {
-  const defaultWhitespaceLength = 12;
-  const potentialWhitespacePart = line.slice(0, defaultWhitespaceLength);
-  const trimmedString = line.trim();
+function calculateTabSize2(line, whitespaceLength = 12) {
+  const potentialWhitespacePart = line.slice(0, whitespaceLength);
+  const trimmedString = line.trimStart();
   if (potentialWhitespacePart.trim() !== "") {
     return 0;
   }
-  const tabSize = line.length - (trimmedString.length + defaultWhitespaceLength);
+  const tabSize = line.length - (trimmedString.length + whitespaceLength);
   return tabSize < 0 ? 0 : tabSize;
 }
-function reduceLines(lines) {
+function reduceLines2(lines, { whitespaceLength = 12, preserveTabs = true }) {
   return lines.map((line) => {
-    const tabSize = calculateTabSize(line);
-    return fillArray_default(() => {
+    const tabSize = calculateTabSize2(line, whitespaceLength);
+    return (preserveTabs ? fillArray_default(() => {
       return " ";
-    }, tabSize).join("") + line.trim();
+    }, tabSize).join("") : "") + line.trimStart();
   }).join("\n");
 }
-function stripIndents(strings, ...interpolations) {
+function stripIndents(first, ...args) {
+  if (typeof first === "object" && first !== null && !Array.isArray(first)) {
+    const options2 = first;
+    return (strings2, ...interpolations2) => {
+      return stripIndents(strings2, ...interpolations2, options2);
+    };
+  }
+  const strings = first;
+  const options = typeof args[args.length - 1] === "object" && !Array.isArray(args[args.length - 1]) ? args.pop() : {};
+  const interpolations = [...args];
   const fullString = interpolate_default(strings, ...interpolations);
-  return reduceLines(fullString.split("\n"));
+  return reduceLines2(fullString.split("\n"), options);
 }
 var stripIndents_default = stripIndents;
 
@@ -629,6 +680,7 @@ var UUID_default = parseUUID;
   randomiseArray,
   range,
   removeDuplicates,
+  removeIndents,
   stringListToArray,
   stringToBoolean,
   stripIndents,

package/dist/index.d.cts

@@ -115,6 +115,19 @@ declare function interpolate(strings: TemplateStringsArray, ...interpolations: u
 
 declare function interpolateObjects(strings: TemplateStringsArray, ...values: unknown[]): string;
 
+interface RemoveIndentsOptions {
+    preserveTabs?: boolean;
+}
+type RemoveIndentsFunction = (strings: TemplateStringsArray, ...interpolations: unknown[]) => string;
+declare function removeIndents(options: RemoveIndentsOptions): RemoveIndentsFunction;
+declare function removeIndents(strings: TemplateStringsArray, ...interpolations: unknown[]): string;
+
+interface StripIndentsOptions {
+    whitespaceLength?: number;
+    preserveTabs?: boolean;
+}
+type StripIndentsFunction = (strings: TemplateStringsArray, ...interpolations: unknown[]) => string;
+declare function stripIndents(options: StripIndentsOptions): StripIndentsFunction;
 declare function stripIndents(strings: TemplateStringsArray, ...interpolations: unknown[]): string;
 
-export { APIError, type CreateFormDataOptions, type CreateFormDataOptionsNullableResolution, type CreateFormDataOptionsUndefinedOrNullResolution, type DisallowUndefined, type Email, type Env, type FormDataNullableResolutionStrategy as FormDataResolutionStrategy, type HTTPErrorCode, type HTTPErrorCodes, type IgnoreCase, type KebabToCamelOptions, type NonUndefined, type OptionalOnCondition, type RecordKey, type StringListToArrayOptions, type UUID, addDaysToDate, appendSemicolon, camelToKebab, convertFileToBase64, createFormData, createTemplateStringsArray, fillArray, formatDateAndTime, getRandomNumber, getRecordKeys, httpErrorCodeLookup, interpolate, interpolateObjects, isLeapYear, isMonthlyMultiple, isOrdered, isSameDate, kebabToCamel, omitProperties, paralleliseArrays, parseEmail, parseEnv, parseIntStrict, parseUUID, randomiseArray, range, removeDuplicates, stringListToArray, stringToBoolean, stripIndents, truncate, wait };
+export { APIError, type CreateFormDataOptions, type CreateFormDataOptionsNullableResolution, type CreateFormDataOptionsUndefinedOrNullResolution, type DisallowUndefined, type Email, type Env, type FormDataNullableResolutionStrategy as FormDataResolutionStrategy, type HTTPErrorCode, type HTTPErrorCodes, type IgnoreCase, type KebabToCamelOptions, type NonUndefined, type OptionalOnCondition, type RecordKey, type RemoveIndentsFunction, type RemoveIndentsOptions, type StringListToArrayOptions, type StripIndentsFunction, type StripIndentsOptions, type UUID, addDaysToDate, appendSemicolon, camelToKebab, convertFileToBase64, createFormData, createTemplateStringsArray, fillArray, formatDateAndTime, getRandomNumber, getRecordKeys, httpErrorCodeLookup, interpolate, interpolateObjects, isLeapYear, isMonthlyMultiple, isOrdered, isSameDate, kebabToCamel, omitProperties, paralleliseArrays, parseEmail, parseEnv, parseIntStrict, parseUUID, randomiseArray, range, removeDuplicates, removeIndents, stringListToArray, stringToBoolean, stripIndents, truncate, wait };

package/dist/index.d.ts

@@ -115,6 +115,19 @@ declare function interpolate(strings: TemplateStringsArray, ...interpolations: u
 
 declare function interpolateObjects(strings: TemplateStringsArray, ...values: unknown[]): string;
 
+interface RemoveIndentsOptions {
+    preserveTabs?: boolean;
+}
+type RemoveIndentsFunction = (strings: TemplateStringsArray, ...interpolations: unknown[]) => string;
+declare function removeIndents(options: RemoveIndentsOptions): RemoveIndentsFunction;
+declare function removeIndents(strings: TemplateStringsArray, ...interpolations: unknown[]): string;
+
+interface StripIndentsOptions {
+    whitespaceLength?: number;
+    preserveTabs?: boolean;
+}
+type StripIndentsFunction = (strings: TemplateStringsArray, ...interpolations: unknown[]) => string;
+declare function stripIndents(options: StripIndentsOptions): StripIndentsFunction;
 declare function stripIndents(strings: TemplateStringsArray, ...interpolations: unknown[]): string;
 
-export { APIError, type CreateFormDataOptions, type CreateFormDataOptionsNullableResolution, type CreateFormDataOptionsUndefinedOrNullResolution, type DisallowUndefined, type Email, type Env, type FormDataNullableResolutionStrategy as FormDataResolutionStrategy, type HTTPErrorCode, type HTTPErrorCodes, type IgnoreCase, type KebabToCamelOptions, type NonUndefined, type OptionalOnCondition, type RecordKey, type StringListToArrayOptions, type UUID, addDaysToDate, appendSemicolon, camelToKebab, convertFileToBase64, createFormData, createTemplateStringsArray, fillArray, formatDateAndTime, getRandomNumber, getRecordKeys, httpErrorCodeLookup, interpolate, interpolateObjects, isLeapYear, isMonthlyMultiple, isOrdered, isSameDate, kebabToCamel, omitProperties, paralleliseArrays, parseEmail, parseEnv, parseIntStrict, parseUUID, randomiseArray, range, removeDuplicates, stringListToArray, stringToBoolean, stripIndents, truncate, wait };
+export { APIError, type CreateFormDataOptions, type CreateFormDataOptionsNullableResolution, type CreateFormDataOptionsUndefinedOrNullResolution, type DisallowUndefined, type Email, type Env, type FormDataNullableResolutionStrategy as FormDataResolutionStrategy, type HTTPErrorCode, type HTTPErrorCodes, type IgnoreCase, type KebabToCamelOptions, type NonUndefined, type OptionalOnCondition, type RecordKey, type RemoveIndentsFunction, type RemoveIndentsOptions, type StringListToArrayOptions, type StripIndentsFunction, type StripIndentsOptions, type UUID, addDaysToDate, appendSemicolon, camelToKebab, convertFileToBase64, createFormData, createTemplateStringsArray, fillArray, formatDateAndTime, getRandomNumber, getRecordKeys, httpErrorCodeLookup, interpolate, interpolateObjects, isLeapYear, isMonthlyMultiple, isOrdered, isSameDate, kebabToCamel, omitProperties, paralleliseArrays, parseEmail, parseEnv, parseIntStrict, parseUUID, randomiseArray, range, removeDuplicates, removeIndents, stringListToArray, stringToBoolean, stripIndents, truncate, wait };

package/dist/index.js

@@ -454,28 +454,78 @@ function interpolateObjects(strings, ...values) {
 }
 var interpolateObjects_default = interpolateObjects;
 
+// src/functions/taggedTemplate/removeIndents.ts
+function calculateTabSize(line, whitespaceLength) {
+  const potentialWhitespacePart = line.slice(0, whitespaceLength);
+  const trimmedString = line.trimStart();
+  if (potentialWhitespacePart.trim() !== "") {
+    return 0;
+  }
+  const tabSize = line.length - (trimmedString.length + whitespaceLength);
+  return tabSize < 0 ? 0 : tabSize;
+}
+function getWhitespaceLength(lines) {
+  const [firstNonEmptyLine] = lines.filter((line) => {
+    return line.trim() !== "";
+  });
+  return firstNonEmptyLine.length - firstNonEmptyLine.trimStart().length;
+}
+function reduceLines(lines, { preserveTabs = true }) {
+  const slicedLines = lines.slice(1);
+  const isFirstLineEmpty = lines[0].trim() === "";
+  const whitespaceLength = getWhitespaceLength(isFirstLineEmpty ? lines : slicedLines);
+  return (isFirstLineEmpty ? slicedLines : lines).map((line) => {
+    const tabSize = calculateTabSize(line, whitespaceLength);
+    return (preserveTabs ? fillArray_default(() => {
+      return " ";
+    }, tabSize).join("") : "") + line.trimStart();
+  }).join("\n");
+}
+function removeIndents(first, ...args) {
+  if (typeof first === "object" && first !== null && !Array.isArray(first)) {
+    const options2 = first;
+    return (strings2, ...interpolations2) => {
+      return removeIndents(strings2, ...interpolations2, options2);
+    };
+  }
+  const strings = first;
+  const options = typeof args[args.length - 1] === "object" && !Array.isArray(args[args.length - 1]) ? args.pop() : {};
+  const interpolations = [...args];
+  const fullString = interpolate_default(strings, ...interpolations);
+  return reduceLines(fullString.split("\n"), options);
+}
+var removeIndents_default = removeIndents;
+
 // src/functions/taggedTemplate/stripIndents.ts
-function calculateTabSize(line) {
-  const defaultWhitespaceLength = 12;
-  const potentialWhitespacePart = line.slice(0, defaultWhitespaceLength);
-  const trimmedString = line.trim();
+function calculateTabSize2(line, whitespaceLength = 12) {
+  const potentialWhitespacePart = line.slice(0, whitespaceLength);
+  const trimmedString = line.trimStart();
   if (potentialWhitespacePart.trim() !== "") {
     return 0;
   }
-  const tabSize = line.length - (trimmedString.length + defaultWhitespaceLength);
+  const tabSize = line.length - (trimmedString.length + whitespaceLength);
   return tabSize < 0 ? 0 : tabSize;
 }
-function reduceLines(lines) {
+function reduceLines2(lines, { whitespaceLength = 12, preserveTabs = true }) {
   return lines.map((line) => {
-    const tabSize = calculateTabSize(line);
-    return fillArray_default(() => {
+    const tabSize = calculateTabSize2(line, whitespaceLength);
+    return (preserveTabs ? fillArray_default(() => {
       return " ";
-    }, tabSize).join("") + line.trim();
+    }, tabSize).join("") : "") + line.trimStart();
   }).join("\n");
 }
-function stripIndents(strings, ...interpolations) {
+function stripIndents(first, ...args) {
+  if (typeof first === "object" && first !== null && !Array.isArray(first)) {
+    const options2 = first;
+    return (strings2, ...interpolations2) => {
+      return stripIndents(strings2, ...interpolations2, options2);
+    };
+  }
+  const strings = first;
+  const options = typeof args[args.length - 1] === "object" && !Array.isArray(args[args.length - 1]) ? args.pop() : {};
+  const interpolations = [...args];
   const fullString = interpolate_default(strings, ...interpolations);
-  return reduceLines(fullString.split("\n"));
+  return reduceLines2(fullString.split("\n"), options);
 }
 var stripIndents_default = stripIndents;
 
@@ -563,6 +613,7 @@ export {
   randomiseArray_default as randomiseArray,
   range_default as range,
   removeDuplicates_default as removeDuplicates,
+  removeIndents_default as removeIndents,
   stringListToArray_default as stringListToArray,
   stringToBoolean_default as stringToBoolean,
   stripIndents_default as stripIndents,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alextheman/utility",
-  "version": "2.18.0",
+  "version": "2.19.0",
   "description": "Helpful utility functions",
   "repository": {
     "type": "git",