@takeshape/util 11.76.0 → 11.76.2

package/dist/common/takeshape-id.d.ts

@@ -1,11 +1,17 @@
 /**
  * AKA TID. A unique ID that refers to an object in the TakeShape data index.
  */
-export type TakeShapeID = `tid:${string}`;
-export type ParsedTakeshapeID = {
-    service: string;
+export type TakeShapeId = `tid:${string}`;
+/**
+ * Pattern to match a TakeShapeId. Note that colons are allowed in the ID part of the TID.
+ * For example, `tid:rick:Character:gid://foo` is valid and the ID part is `gid://foo`.
+ */
+export declare const TID_REGEX: RegExp;
+export type ParsedTakeShapeId = {
+    shapeRef: string;
+    serviceId: string;
     shapeName: string;
     id: string;
 };
-export declare const parseTakeShapeID: (tid: string) => ParsedTakeshapeID;
-export declare const extractTakeShapeIDs: (input: string) => TakeShapeID[];
+export declare const parseTid: (tid: string) => ParsedTakeShapeId;
+export declare const extractTids: (input: string) => TakeShapeId[];

package/dist/common/takeshape-id.js

@@ -1,25 +1,26 @@
 /**
- * Pattern to match a TakeShapeID. Note that colons are allowed in the ID part of the TID.
+ * Pattern to match a TakeShapeId. Note that colons are allowed in the ID part of the TID.
  * For example, `tid:rick:Character:gid://foo` is valid and the ID part is `gid://foo`.
  */
-const TID_REGEX = /\btid:([^:\s]+):([^:\s]+):([^\s]+)/g;
-export const parseTakeShapeID = (tid) => {
-    const [prefix, service, shapeName, ...rest] = tid.split(':');
-    if (prefix !== 'tid') {
-        throw new Error(`Invalid TID: ${tid}`);
+export const TID_REGEX = /\btid:([^:\s]+):([^:\s]+):([\w\\/:-_~]+)/;
+export const parseTid = (tid) => {
+    const match = TID_REGEX.exec(tid);
+    if (!match) {
+        throw new Error(`Invalid TID: "${tid}"`);
     }
+    const [, serviceId, shapeName, id] = match;
     return {
-        service,
+        shapeRef: `${serviceId}:${shapeName}`,
+        serviceId: serviceId,
         shapeName,
-        id: rest.join(':')
+        id
     };
 };
-export const extractTakeShapeIDs = (input) => {
-    const matches = [];
-    let match = TID_REGEX.exec(input);
-    while (match !== null) {
-        matches.push(match[0]);
-        match = TID_REGEX.exec(input);
+export const extractTids = (input) => {
+    const ids = [];
+    const matches = input.matchAll(new RegExp(TID_REGEX.source, 'g'));
+    for (const match of matches) {
+        ids.push(match[0]);
     }
-    return matches;
+    return ids;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/util",
-  "version": "11.76.0",
+  "version": "11.76.2",
   "description": "Shared utilities",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -46,7 +46,7 @@
     "tiny-invariant": "^1.2.0",
     "uint8array-extras": "^1.4.0",
     "url-parse": "^1.5.3",
-    "@takeshape/routing": "11.76.0"
+    "@takeshape/routing": "11.76.2"
   },
   "devDependencies": {
     "@types/classnames": "^2.2.9",