@fable-org/fable-library-ts 1.4.3 → 1.5.0

package/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 1.5.0 - 2024-09-19
+
+### Added
+
+* [JS/TS] Add support for `OrdinalIgnoreCase` overload for `String.EndsWith` (#3892) (by @goswinr)
+* [JS/TS] Add `uri.Port`, `uri.IsDefaultPort` (by @MangelMaxime)
+
+### Fixed
+
+* [JS/TS] Fix escaping of `{` and `}` in FormattableString (#3890) (by @roboz0r)
+* [JS/TS] Fix `uri.Host` to return the host name without the port (by @MangelMaxime)
+* [JS/TS] Fix TypeScript compilation by resolving type of `jsOptions` (#3894) (by @ManngelMaxime)
+
 ## 1.4.3 - 2024-09-04
 
 * [JS/TS] Fixed Decimal comparisons (#3884) (by @ncave)

package/String.ts

@@ -64,12 +64,25 @@ export function compareTo(x: string, y: string) {
 }
 
 export function startsWith(str: string, pattern: string, ic: number) {
+  if (ic === StringComparison.Ordinal) { // to avoid substring allocation
+    return str.startsWith(pattern);
+  }
   if (str.length >= pattern.length) {
     return cmp(str.substr(0, pattern.length), pattern, ic) === 0;
   }
   return false;
 }
 
+export function endsWith(str: string, pattern: string, ic: number) {
+  if (ic === StringComparison.Ordinal) { // to avoid substring allocation
+    return str.endsWith(pattern);
+  }
+  if (str.length >= pattern.length) {
+    return cmp(str.substr(str.length - pattern.length, pattern.length), pattern, ic) === 0;
+  }
+  return false;
+}
+
 export function indexOfAny(str: string, anyOf: string[], ...args: number[]) {
   if (str == null || str === "") {
     return -1;
@@ -87,7 +100,7 @@ export function indexOfAny(str: string, anyOf: string[], ...args: number[]) {
   }
   const endIndex = startIndex + length
   const anyOfAsStr = "".concat.apply("", anyOf);
-  for (let i=startIndex; i<endIndex; i++) {
+  for (let i = startIndex; i < endIndex; i++) {
     if (anyOfAsStr.indexOf(str[i]) > -1) {
       return i;
     }
@@ -374,10 +387,6 @@ export function format(str: string | object, ...args: any[]) {
   });
 }
 
-export function endsWith(str: string, search: string) {
-  const idx = str.lastIndexOf(search);
-  return idx >= 0 && idx === str.length - search.length;
-}
 
 export function initialize(n: number, f: (i: number) => string) {
   if (n < 0) {
@@ -587,7 +596,11 @@ export function fmtWith(fmts: string[]) {
 }
 
 export function getFormat(s: FormattableString) {
+  const strs = s.strs.map((value) => value.replace(/{/g, '{{').replace(/}/g, '}}'));
+
   return s.fmts
-    ? s.strs.reduce((acc, newPart, index) => acc + `{${String(index - 1) + s.fmts![index - 1]}}` + newPart)
-    : s.strs.reduce((acc, newPart, index) => acc + `{${index - 1}}` + newPart);
+    ? strs
+      .reduce((acc, newPart, index) => acc + `{${String(index - 1) + s.fmts![index - 1]}}` + newPart)
+    : strs
+      .reduce((acc, newPart, index) => acc + `{${index - 1}}` + newPart);
 }

package/Uri.ts

@@ -177,7 +177,13 @@ export class Uri {
   }
 
   get host() {
-    return this.asUrl().host;
+    const host = this.asUrl().host;
+
+    if (host.includes(":")) {
+      return host.split(":")[0];
+    } else {
+      return host;
+    }
   }
 
   get absolutePath() {
@@ -188,6 +194,20 @@ export class Uri {
     return this.asUrl().search;
   }
 
+  get isDefaultPort() {
+    return this.port === 80;
+  }
+
+  get port() {
+    const port = this.asUrl().port;
+
+    if (port === "") {
+      return 80;
+    } else {
+      return parseInt(port);
+    }
+  }
+
   get pathAndQuery() {
     const url = this.asUrl();
     return url.pathname + url.search;

package/Util.ts

@@ -588,8 +588,8 @@ export function createObj(fields: Iterable<[string, any]>) {
   return obj;
 }
 
-export function jsOptions(mutator: (x: object) => void): object {
-  const opts = {};
+export function jsOptions<T>(mutator: (x: T) => void): T {
+  const opts = {} as T;
   mutator(opts);
   return opts;
 }

package/package.json

@@ -3,7 +3,7 @@
   "private": false,
   "type": "module",
   "name": "@fable-org/fable-library-ts",
-  "version": "1.4.3",
+  "version": "1.5.0",
   "description": "Core library used by F# projects compiled with fable.io",
   "author": "Fable Contributors",
   "license": "MIT",