@powerhousedao/common 3.2.0-staging.0 → 3.2.0-staging.1

package/dist/state/utils.js

@@ -1,18 +1,21 @@
-import { atomWithReducer } from "jotai/utils";
 import slug from "slug";
-export function atomWithCompare(initialValue, areEqual) {
-    return atomWithReducer(initialValue, (prev, next) => {
-        if (areEqual(prev, next)) {
-            return prev;
-        }
-        return next;
-    });
+/** Sentinel value for atoms that are not set. */
+export const NOT_SET = "NOT_SET";
+/* Will suspend until the atom is set elsewhere.
+ * Returns a promise that will never resolve of type T.
+ *
+ * Makes use of Jotai's "async forever" pattern as described here https://jotai.org/docs/guides/async#async-forever
+ */
+export function suspendUntilSet() {
+    return new Promise(() => { });
 }
+/** Makes a URL component for a drive. */
 export function makeDriveUrlComponent(drive) {
     if (!drive)
         return "";
     return `/d/${slug(drive.slug)}`;
 }
+/** Makes a URL component for a node. */
 export function makeNodeUrlComponent(node) {
     if (!node)
         return "";
@@ -21,10 +24,15 @@ export function makeNodeUrlComponent(node) {
         return slug(node.id);
     return slug(`${nodeName}-${node.id}`);
 }
+/** Extracts the node slug from a path.
+ *
+ * The path is expected to be in the format `/d/<drive-slug>/<node-slug>`.
+ */
 function extractNodeSlug(path) {
     const match = /^\/d\/[^/]+\/([^/]+)$/.exec(path);
-    return match ? match[1] : null;
+    return match ? match[1] : undefined;
 }
+/** Finds a UUID in a string, used for extracting node ids from node slugs in the URL. */
 function findUuid(input) {
     if (!input)
         return undefined;
@@ -32,6 +40,7 @@ function findUuid(input) {
     const match = uuidRegex.exec(input);
     return match ? match[0] : undefined;
 }
+/** Extracts the node id from a path. */
 export function extractNodeFromPath(path) {
     const nodeSlug = extractNodeSlug(path);
     if (!nodeSlug)
@@ -41,57 +50,59 @@ export function extractNodeFromPath(path) {
         return undefined;
     return uuid;
 }
+/** Extracts the node name, slug, or id from a path. */
+export function extractNodeNameOrSlugOrIdFromPath(path) {
+    const nodeSlug = extractNodeSlug(path);
+    const nodeId = findUuid(nodeSlug);
+    if (nodeId)
+        return nodeId;
+    return nodeSlug;
+}
+/** Extracts the drive slug from a path.
+ * Used for extracting drive ids from drive slugs in the URL.
+ * Expects the path to be in the format `/d/<drive-slug>`.
+ */
 export function extractDriveFromPath(path) {
     const match = /^\/d\/([^/]+)/.exec(path);
     return match ? match[1] : null;
 }
-export async function getReactorDrives(reactor) {
-    if (!reactor)
-        return [];
-    const driveIds = await reactor.getDrives();
-    const drives = await Promise.all(driveIds.map(async (id) => {
-        const drive = await reactor.getDrive(id);
-        return drive;
-    }));
-    console.log("getting reactor drives", drives);
-    return drives;
+/** Legacy function that makes a slug from a node name.
+ * Used for compatibility with the old URL structure in Connect.
+ */
+export function makeNodeSlugFromNodeName(name) {
+    return name.replaceAll(/\s/g, "-");
 }
-export async function getReactorDocuments(reactor) {
+/** Sets the selected drive and node from the URL.
+ *
+ * Both the selected drive id and selected node id begin in the NOT_SET state, so they will suspend unless set by this function or another implementation.
+ *
+ * If the URL is in the format `/d/<drive-slug>`, the selected drive will be set.
+ * If the URL is in the format `/d/<drive-slug>/<node-slug>`, the selected drive and node will be set.
+ */
+export async function setSelectedDriveAndNodeFromUrl(reactor, setSelectedDrive, setSelectedNode, shouldNavigate) {
+    if (typeof window === "undefined")
+        return;
+    if (!shouldNavigate)
+        return;
     if (!reactor)
-        return [];
-    const driveIds = await reactor.getDrives();
-    const documents = (await Promise.all(driveIds.map(async (driveId) => {
-        const documentIds = await reactor.getDocuments(driveId);
-        const documents = await Promise.all(documentIds.map(async (id) => await reactor.getDocument(driveId, id)));
-        return documents;
-    }))).flat();
-    console.log("getting reactor documents", documents);
-    return documents;
+        return;
+    const path = window.location.pathname;
+    const drive = await handleDriveFromUrl(reactor, path, setSelectedDrive);
+    handleNodeFromUrl(drive, path, setSelectedNode);
 }
-export function makeNodes(drives) {
-    const nodes = [];
-    for (const drive of drives) {
-        const driveFolderNode = {
-            id: drive.id,
-            name: drive.state.global.name,
-            kind: "DRIVE",
-            parentFolder: null,
-        };
-        nodes.push(driveFolderNode);
-        for (const n of drive.state.global.nodes) {
-            nodes.push({
-                id: n.id,
-                name: n.name,
-                kind: n.kind.toUpperCase(),
-                parentFolder: n.parentFolder ?? drive.id,
-            });
-        }
-    }
-    return nodes;
+async function handleDriveFromUrl(reactor, path, setSelectedDrive) {
+    const driveSlug = extractDriveFromPath(path);
+    const driveIds = await reactor.getDrives();
+    const drives = await Promise.all(driveIds.map((id) => reactor.getDrive(id)));
+    const drive = drives.find((d) => d.slug === driveSlug || d.id === driveSlug);
+    setSelectedDrive(drive?.id);
+    return drive;
 }
-export function unwrapLoadable(loadable) {
-    if (loadable.state !== "hasData")
-        return undefined;
-    return loadable.data;
+function handleNodeFromUrl(drive, path, setSelectedNode) {
+    const nodeIdOrSlugOrNameFromPath = extractNodeNameOrSlugOrIdFromPath(path);
+    const nodes = drive?.state.global.nodes;
+    const node = nodes?.find((n) => n.id === nodeIdOrSlugOrNameFromPath ||
+        makeNodeSlugFromNodeName(n.name) === nodeIdOrSlugOrNameFromPath);
+    setSelectedNode(node?.id);
 }
 //# sourceMappingURL=utils.js.map

package/dist/state/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../state/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../state/utils.ts"],"names":[],"mappings":"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"}