@liveblocks/core 3.1.1 → 3.1.2

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.1.1";
+var PKG_VERSION = "3.1.2";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -1087,6 +1087,9 @@ function quote(input) {
 }
 
 // src/lib/url.ts
+var PLACEHOLDER_BASE_URL = "https://localhost:9999";
+var ABSOLUTE_URL_REGEX = /^[a-zA-Z][a-zA-Z\d+\-.]*?:/;
+var TRAILING_SLASH_URL_REGEX = /\/(?:(?:\?|#).*)?$/;
 function toURLSearchParams(params) {
   const result = new URLSearchParams();
   for (const [key, value] of Object.entries(params)) {
@@ -1108,6 +1111,53 @@ function url(strings, ...values2) {
     (result, str, i) => result + encodeURIComponent(_nullishCoalesce(values2[i - 1], () => ( ""))) + str
   );
 }
+function sanitizeUrl(url2) {
+  if (url2.startsWith("www.")) {
+    url2 = "https://" + url2;
+  }
+  try {
+    const isAbsolute = ABSOLUTE_URL_REGEX.test(url2);
+    const urlObject = new URL(
+      url2,
+      isAbsolute ? void 0 : PLACEHOLDER_BASE_URL
+    );
+    if (urlObject.protocol !== "http:" && urlObject.protocol !== "https:") {
+      return null;
+    }
+    const hasTrailingSlash = TRAILING_SLASH_URL_REGEX.test(url2);
+    const sanitizedUrl = (
+      // 1. Origin, only for absolute URLs
+      (isAbsolute ? urlObject.origin : "") + // 2. Pathname, with a trailing slash if the original URL had one
+      (urlObject.pathname === "/" ? (
+        // 2.a. Domain-only URLs, they always have their pathname set to "/"
+        hasTrailingSlash ? "/" : ""
+      ) : (
+        // 2.b. URLs with a path
+        hasTrailingSlash && !urlObject.pathname.endsWith("/") ? urlObject.pathname + "/" : urlObject.pathname
+      )) + // 3. Search params
+      urlObject.search + // 4. Hash
+      urlObject.hash
+    );
+    return sanitizedUrl !== "" ? sanitizedUrl : null;
+  } catch (e4) {
+    return null;
+  }
+}
+function generateUrl(url2, params, hash) {
+  const isAbsolute = ABSOLUTE_URL_REGEX.test(url2);
+  const urlObject = new URL(url2, isAbsolute ? void 0 : PLACEHOLDER_BASE_URL);
+  if (params !== void 0) {
+    for (const [param, value] of Object.entries(params)) {
+      if (value) {
+        urlObject.searchParams.set(param, String(value));
+      }
+    }
+  }
+  if (!urlObject.hash && hash !== void 0) {
+    urlObject.hash = `#${hash}`;
+  }
+  return isAbsolute ? urlObject.href : urlObject.href.replace(PLACEHOLDER_BASE_URL, "");
+}
 
 // src/api-client.ts
 function createApiClient({
@@ -2099,7 +2149,7 @@ var HttpClient = class {
     let body;
     try {
       body = await response.json();
-    } catch (e4) {
+    } catch (e5) {
       body = {};
     }
     return body;
@@ -3228,7 +3278,7 @@ var ManagedSocket = class {
   getStatus() {
     try {
       return toNewConnectionStatus(this.#machine);
-    } catch (e5) {
+    } catch (e6) {
       return "initial";
     }
   }
@@ -9973,14 +10023,6 @@ var MarkdownSafeString = class {
 function markdown(strings, ...values2) {
   return new MarkdownSafeString(strings, values2);
 }
-function toAbsoluteUrl(url2) {
-  if (url2.startsWith("http://") || url2.startsWith("https://")) {
-    return url2;
-  } else if (url2.startsWith("www.")) {
-    return "https://" + url2;
-  }
-  return;
-}
 var stringifyCommentBodyPlainElements = {
   paragraph: ({ children }) => children,
   text: ({ element }) => element.text,
@@ -10076,11 +10118,22 @@ async function stringifyCommentBody(body, options) {
             ] : [];
           }
           if (isCommentBodyLink(inline)) {
+            const href = sanitizeUrl(inline.url);
+            if (href === null) {
+              return [
+                elements.text(
+                  {
+                    element: { text: _nullishCoalesce(inline.text, () => ( inline.url)) }
+                  },
+                  inlineIndex
+                )
+              ];
+            }
             return [
               elements.link(
                 {
                   element: inline,
-                  href: _nullishCoalesce(toAbsoluteUrl(inline.url), () => ( inline.url))
+                  href
                 },
                 inlineIndex
               )
@@ -10105,22 +10158,6 @@ async function stringifyCommentBody(body, options) {
   return blocks.join(separator);
 }
 
-// src/comments/comment-url.ts
-var PLACEHOLDER_BASE_URL = "https://localhost:9999";
-var ABSOLUTE_URL_REGEX = /^[a-zA-Z][a-zA-Z\d+\-.]*?:/;
-function generateCommentUrl({
-  roomUrl,
-  commentId
-}) {
-  const isAbsolute = ABSOLUTE_URL_REGEX.test(roomUrl);
-  const urlObject = new URL(
-    roomUrl,
-    isAbsolute ? void 0 : PLACEHOLDER_BASE_URL
-  );
-  urlObject.hash = `#${commentId}`;
-  return isAbsolute ? urlObject.href : urlObject.href.replace(PLACEHOLDER_BASE_URL, "");
-}
-
 // src/crdts/utils.ts
 function toPlainLson(lson) {
   if (lson instanceof LiveObject) {
@@ -10715,5 +10752,5 @@ detectDupes(PKG_NAME, PKG_VERSION, PKG_FORMAT);
 
 
 
-exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.DefaultMap = DefaultMap; exports.Deque = Deque; exports.DerivedSignal = DerivedSignal; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.LiveblocksError = LiveblocksError; exports.MutableSignal = MutableSignal; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.ackOp = ackOp; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.checkBounds = checkBounds; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToSubscriptionData = convertToSubscriptionData; exports.convertToThreadData = convertToThreadData; exports.convertToUserSubscriptionData = convertToUserSubscriptionData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createManagedPool = createManagedPool; exports.createNotificationSettings = createNotificationSettings; exports.createThreadId = createThreadId; exports.defineAiTool = defineAiTool; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.entries = entries; exports.errorIf = errorIf; exports.freeze = freeze; exports.generateCommentUrl = generateCommentUrl; exports.getMentionsFromCommentBody = getMentionsFromCommentBody; exports.getSubscriptionKey = getSubscriptionKey; exports.html = html; exports.htmlSafe = htmlSafe; exports.isChildCrdt = isChildCrdt; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isLiveNode = isLiveNode; exports.isNotificationChannelEnabled = isNotificationChannelEnabled; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.isStartsWithOperator = isStartsWithOperator; exports.kInternal = kInternal; exports.keys = keys; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeAbortController = makeAbortController; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.objectToQuery = objectToQuery; exports.patchLiveObjectKey = patchLiveObjectKey; exports.patchNotificationSettings = patchNotificationSettings; exports.raise = raise; exports.resolveUsersInCommentBody = resolveUsersInCommentBody; exports.shallow = shallow; exports.shallow2 = shallow2; exports.stableStringify = stableStringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toAbsoluteUrl = toAbsoluteUrl; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.withTimeout = withTimeout;
+exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.DefaultMap = DefaultMap; exports.Deque = Deque; exports.DerivedSignal = DerivedSignal; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.LiveblocksError = LiveblocksError; exports.MutableSignal = MutableSignal; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.ackOp = ackOp; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.checkBounds = checkBounds; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToSubscriptionData = convertToSubscriptionData; exports.convertToThreadData = convertToThreadData; exports.convertToUserSubscriptionData = convertToUserSubscriptionData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createManagedPool = createManagedPool; exports.createNotificationSettings = createNotificationSettings; exports.createThreadId = createThreadId; exports.defineAiTool = defineAiTool; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.entries = entries; exports.errorIf = errorIf; exports.freeze = freeze; exports.generateUrl = generateUrl; exports.getMentionsFromCommentBody = getMentionsFromCommentBody; exports.getSubscriptionKey = getSubscriptionKey; exports.html = html; exports.htmlSafe = htmlSafe; exports.isChildCrdt = isChildCrdt; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isLiveNode = isLiveNode; exports.isNotificationChannelEnabled = isNotificationChannelEnabled; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.isStartsWithOperator = isStartsWithOperator; exports.kInternal = kInternal; exports.keys = keys; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeAbortController = makeAbortController; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.objectToQuery = objectToQuery; exports.patchLiveObjectKey = patchLiveObjectKey; exports.patchNotificationSettings = patchNotificationSettings; exports.raise = raise; exports.resolveUsersInCommentBody = resolveUsersInCommentBody; exports.sanitizeUrl = sanitizeUrl; exports.shallow = shallow; exports.shallow2 = shallow2; exports.stableStringify = stableStringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.withTimeout = withTimeout;
 //# sourceMappingURL=index.cjs.map