wiki-graph 0.8.3 → 0.8.4

package/dist/index.js

@@ -3782,10 +3782,10 @@ async function runArchiveList(args) {
       continuationKind: "source-locators",
       targetUri: objectUri
     });
-    const readPage2 = async (cursor) => await archive.list({
+    const readPage2 = async (cursor) => (await archive.list({
       ...cursor === void 0 ? {} : { cursor },
       ...args.limit === void 0 ? {} : { limit: args.limit }
-    });
+    })).result;
     if (args.all === true) {
       await writeAllSourceLocators(
         readPage2,
@@ -3814,11 +3814,11 @@ async function runArchiveList(args) {
   const context = createArchiveOutputContext(scopedArgs, {
     continuationKind: "collection"
   });
-  const readPage = async (cursor, limit = args.limit) => await archive.list({
+  const readPage = async (cursor, limit = args.limit) => (await archive.list({
     ...createCollectionOptions(scopedArgs),
     ...cursor === void 0 ? {} : { cursor },
     ...limit === void 0 ? {} : { limit }
-  });
+  })).result;
   if (args.all === true) {
     if (args.limit !== void 0) {
       await writeAllFindHits(
@@ -3854,11 +3854,11 @@ async function runArchiveSearch(args) {
   const context = createArchiveOutputContext(scopedArgs);
   const findOptions = createSearchFindOptions(scopedArgs);
   const { archiveKey: _archiveKey, chapters, ...options } = findOptions;
-  const readPage = async (cursor) => await archive.search(scopedArgs.query, {
+  const readPage = async (cursor) => (await archive.search(scopedArgs.query, {
     ...options,
     ...chapters === void 0 ? {} : { chapters },
     ...cursor === void 0 ? {} : { cursor }
-  });
+  })).result;
   try {
     if (args.all === true) {
       await writeAllFindHits(readPage, context, args.format ?? "text");
@@ -3907,7 +3907,7 @@ async function runArchiveRelated(args) {
       targetUri: objectUri
     }
   );
-  const readPage = async (cursor) => await archive.related(objectUri, {
+  const readPage = async (cursor) => (await archive.related(objectUri, {
     ...cursor === void 0 ? {} : { cursor },
     ...createOptionalEvidenceLimit(args),
     ...args.limit === void 0 ? {} : { limit: args.limit },
@@ -3917,7 +3917,7 @@ async function runArchiveRelated(args) {
     ...args.role === void 0 ? {} : { role: args.role },
     ...args.skipUnindexed === true ? { skipUnindexed: true } : {},
     ...createOptionalSourceContext(args)
-  });
+  })).result;
   if (args.all === true) {
     await writeAllRelatedItems(
       readPage,
@@ -3942,7 +3942,7 @@ async function runArchiveEvidence(args) {
       targetUri: objectUri
     }
   );
-  const readPage = async (cursor) => await archive.evidence(objectUri, {
+  const readPage = async (cursor) => (await archive.evidence(objectUri, {
     ...cursor === void 0 ? {} : { cursor },
     ...args.limit === void 0 ? {} : { limit: args.limit },
     ...args.reverse === true ? { order: "doc-desc" } : {},
@@ -3950,7 +3950,7 @@ async function runArchiveEvidence(args) {
     ...args.queryMode === void 0 ? {} : { queryMode: args.queryMode },
     ...args.skipUnindexed === true ? { skipUnindexed: true } : {},
     ...createOptionalSourceContext(args)
-  });
+  })).result;
   if (args.all === true) {
     await writeAllEvidence(
       readPage,
@@ -4012,13 +4012,13 @@ async function runLibraryIndexArchiveCommand(args, target) {
     case "search": {
       const findOptions = createSearchFindOptions(args);
       if (objectUri === void 0) {
-        const search = async (cursor) => await (isArchiveMemberCollection ? libraries.searchArchiveMembers(target, args.query, {
+        const search = async (cursor) => (await (isArchiveMemberCollection ? libraries.searchArchiveMembers(target, args.query, {
           ...findOptions,
           ...cursor === void 0 ? {} : { cursor }
         }) : libraries.search(target, args.query, {
           ...findOptions,
           ...cursor === void 0 ? {} : { cursor }
-        }));
+        }))).result;
         if (args.all === true) {
           await writeAllFindHits(search, context, args.format ?? "text");
           return;
@@ -4032,17 +4032,17 @@ async function runLibraryIndexArchiveCommand(args, target) {
       }
       if (args.all === true) {
         await writeAllFindHits(
-          async (cursor) => await libraries.search(target, args.query, {
+          async (cursor) => (await libraries.search(target, args.query, {
             ...findOptions,
             ...cursor === void 0 ? {} : { cursor }
-          }),
+          })).result,
           context,
           args.format ?? "text"
         );
         return;
       }
       await writeFindHits(
-        await libraries.search(target, args.query, findOptions),
+        (await libraries.search(target, args.query, findOptions)).result,
         context,
         args.format ?? "text"
       );
@@ -4058,10 +4058,10 @@ async function runLibraryIndexArchiveCommand(args, target) {
           if (args.limit !== void 0) {
             await writeAllFindHits(
               async (cursor) => createCollectionFindResult(
-                await libraries.objects(target, {
+                (await libraries.objects(target, {
                   ...createCollectionOptions(args),
                   ...cursor === void 0 ? {} : { cursor }
-                })
+                })).result
               ),
               listContext,
               args.format ?? "text"
@@ -4070,10 +4070,10 @@ async function runLibraryIndexArchiveCommand(args, target) {
           }
           await writeFindHitsWithoutContinuation(
             createCollectionFindResult(
-              await libraries.objects(target, {
+              (await libraries.objects(target, {
                 ...createCollectionOptions(args),
                 limit: ALL_COLLECTION_OUTPUT_LIMIT
-              })
+              })).result
             ),
             listContext,
             args.format ?? "text"
@@ -4082,7 +4082,7 @@ async function runLibraryIndexArchiveCommand(args, target) {
         }
         await writeFindHits(
           createCollectionFindResult(
-            await libraries.objects(target, createCollectionOptions(args))
+            (await libraries.objects(target, createCollectionOptions(args))).result
           ),
           listContext,
           args.format ?? "text"
@@ -4093,10 +4093,10 @@ async function runLibraryIndexArchiveCommand(args, target) {
         if (args.limit !== void 0) {
           await writeAllFindHits(
             async (cursor) => createCollectionFindResult(
-              await libraries.objects(target, {
+              (await libraries.objects(target, {
                 ...createCollectionOptions(args),
                 ...cursor === void 0 ? {} : { cursor }
-              })
+              })).result
             ),
             listContext,
             args.format ?? "text"
@@ -4105,10 +4105,10 @@ async function runLibraryIndexArchiveCommand(args, target) {
         }
         await writeFindHitsWithoutContinuation(
           createCollectionFindResult(
-            await libraries.objects(target, {
+            (await libraries.objects(target, {
               ...createCollectionOptions(args),
               limit: ALL_COLLECTION_OUTPUT_LIMIT
-            })
+            })).result
           ),
           listContext,
           args.format ?? "text"
@@ -4117,7 +4117,9 @@ async function runLibraryIndexArchiveCommand(args, target) {
       }
       await writeFindHits(
         createCollectionFindResult(
-          await libraries.objects(target, createCollectionOptions(args))
+          unwrapPageResult(
+            await libraries.objects(target, createCollectionOptions(args))
+          )
         ),
         listContext,
         args.format ?? "text"
@@ -4132,7 +4134,7 @@ async function runLibraryIndexArchiveCommand(args, target) {
         };
         await writeFindHits(
           createCollectionFindResult(
-            await libraries.objects(target, createCollectionOptions(args))
+            (await libraries.objects(target, createCollectionOptions(args))).result
           ),
           getContext,
           args.format ?? "text"
@@ -4159,7 +4161,7 @@ async function runLibraryIndexArchiveCommand(args, target) {
         continuationKind: "related",
         targetUri: concreteObjectUri
       };
-      const readPage = async (cursor) => await libraries.related(target, concreteObjectUri, {
+      const readPage = async (cursor) => (await libraries.related(target, concreteObjectUri, {
         ...cursor === void 0 ? {} : { cursor },
         ...createOptionalEvidenceLimit(args),
         ...args.limit === void 0 ? {} : { limit: args.limit },
@@ -4169,7 +4171,7 @@ async function runLibraryIndexArchiveCommand(args, target) {
         ...args.role === void 0 ? {} : { role: args.role },
         ...args.skipUnindexed === true ? { skipUnindexed: true } : {},
         ...createOptionalSourceContext(args)
-      });
+      })).result;
       if (args.all === true) {
         await writeAllRelatedItems(
           readPage,
@@ -4195,7 +4197,7 @@ async function runLibraryIndexArchiveCommand(args, target) {
       };
       if (args.all === true) {
         await writeAllEvidence(
-          async (cursor) => await libraries.evidence(target, concreteObjectUri, {
+          async (cursor) => (await libraries.evidence(target, concreteObjectUri, {
             ...cursor === void 0 ? {} : { cursor },
             ...args.limit === void 0 ? {} : { limit: args.limit },
             ...args.reverse === true ? { order: "doc-desc" } : {},
@@ -4203,7 +4205,7 @@ async function runLibraryIndexArchiveCommand(args, target) {
             ...args.queryMode === void 0 ? {} : { queryMode: args.queryMode },
             ...args.skipUnindexed === true ? { skipUnindexed: true } : {},
             ...createOptionalSourceContext(args)
-          }),
+          })).result,
           args.cursor,
           evidenceContext,
           args.format ?? "text"
@@ -4211,7 +4213,7 @@ async function runLibraryIndexArchiveCommand(args, target) {
         return;
       }
       await writeEvidence(
-        await libraries.evidence(target, concreteObjectUri, {
+        (await libraries.evidence(target, concreteObjectUri, {
           ...args.cursor === void 0 ? {} : { cursor: args.cursor },
           ...args.limit === void 0 ? {} : { limit: args.limit },
           ...args.reverse === true ? { order: "doc-desc" } : {},
@@ -4219,7 +4221,7 @@ async function runLibraryIndexArchiveCommand(args, target) {
           ...args.queryMode === void 0 ? {} : { queryMode: args.queryMode },
           ...args.skipUnindexed === true ? { skipUnindexed: true } : {},
           ...createOptionalSourceContext(args)
-        }),
+        })).result,
         evidenceContext,
         args.format ?? "text"
       );
@@ -4243,6 +4245,9 @@ async function runLibraryIndexArchiveCommand(args, target) {
       );
   }
 }
+function unwrapPageResult(value) {
+  return "result" in value ? value.result : value;
+}
 function createSearchFindOptions(args) {
   return createFindOptions(args);
 }
@@ -6439,7 +6444,7 @@ async function writeLibraryScopeCollection(target, json) {
     types: null
   };
   await writeFindHits(
-    createCollectionFindResult(await manager.objects(target)),
+    createCollectionFindResult((await manager.objects(target)).result),
     context,
     json ? "json" : "text"
   );