@x12i/memorix-retrieval 1.5.0 → 1.6.2

package/dist/explorer/entity-graph.js

@@ -1,6 +1,8 @@
 import { discoverMemorixEntities, entityDescriptorConnections, loadMemorixEntityDescriptorByName, } from "../descriptors/discover-entities.js";
 import { listEntityContentTypeKeys, memorixContentTypeLabel, primaryEntityContentType, } from "../descriptors/content-type-labels.js";
-import { resolveMemorixDbNameForEntity } from "../mongo/resolve-db.js";
+import { resolveMemorixCollectionName } from "../data/collection-name.js";
+import { resolveMemorixDbName } from "../mongo/env.js";
+import { resolveEntityTarget, resolveMemorixDbNameForEntity, } from "../mongo/resolve-db.js";
 import { countMemorixEntityContentTypeDocuments } from "./raw-reads.js";
 function resolveScopedNamespace(client, override) {
     if (override !== undefined)
@@ -14,13 +16,20 @@ function resolveScopedNamespace(client, override) {
 function errMsg(error) {
     return error instanceof Error ? error.message : String(error);
 }
+function resolveMemorixDatabaseNames(client) {
+    const entity = resolveMemorixDbName("entity", client.processEnv);
+    const event = resolveMemorixDbName("event", client.processEnv);
+    return { entity, event, combined: `${entity} + ${event}` };
+}
 export async function buildMemorixEntityGraph(client, options = {}) {
     const discoveryResult = await discoverMemorixEntities(client);
     const scopedNamespace = resolveScopedNamespace(client, options.scopedNamespace);
     const cataloxClient = Boolean(client.catalox.listCatalogItems);
+    const { entity: entitiesDb, event: eventsDb, combined: memorixDbCombined } = resolveMemorixDatabaseNames(client);
     const discovery = {
         source: discoveryResult.source,
-        memorixDb: "",
+        memorixDb: memorixDbCombined,
+        memorixDatabases: { entity: entitiesDb, event: eventsDb },
         scopedNamespace,
         entitiesCatalogId: discoveryResult.catalogId,
         cataloxAppId: client.appId,
@@ -28,8 +37,8 @@ export async function buildMemorixEntityGraph(client, options = {}) {
         hint: discoveryResult.hint,
     };
     const entities = [];
-    let memorixDb = "";
     for (const summary of discoveryResult.summaries) {
+        const listable = Boolean(summary.defaultListDescriptorId && summary.defaultItemDescriptorId);
         let entity;
         try {
             entity = await loadMemorixEntityDescriptorByName(client, summary.entityName);
@@ -38,6 +47,8 @@ export async function buildMemorixEntityGraph(client, options = {}) {
             entities.push({
                 entityName: summary.entityName,
                 label: summary.label,
+                target: "entity",
+                memorixDatabase: entitiesDb,
                 defaultListDescriptorId: summary.defaultListDescriptorId,
                 defaultItemDescriptorId: summary.defaultItemDescriptorId,
                 count: 0,
@@ -46,108 +57,159 @@ export async function buildMemorixEntityGraph(client, options = {}) {
                 connectedEntityTypes: 0,
                 contentTypesWithData: 0,
                 drillable: false,
-                countErrors: { contentTypes: errMsg(e) },
+                contentTypes: [],
+                countErrors: { descriptor: errMsg(e) },
+                listable,
             });
             continue;
         }
-        if (!memorixDb) {
-            memorixDb = resolveMemorixDbNameForEntity(entity, client);
-        }
-        const primaryType = primaryEntityContentType(entity);
-        const contentTypes = listEntityContentTypeKeys(entity);
+        const target = resolveEntityTarget(entity);
+        const memorixDatabase = resolveMemorixDbNameForEntity(entity, client);
         const countErrors = {};
-        let primaryCount = 0;
-        let narrativesCount = 0;
-        let contentTypesWithData = 0;
-        const contentTypeCountErrors = [];
-        try {
-            primaryCount = await countMemorixEntityContentTypeDocuments(client, {
-                entityName: summary.entityName,
-                contentType: primaryType,
-            });
-        }
-        catch (e) {
-            countErrors.scoped = errMsg(e);
-        }
-        if (entity.contentTypes.narratives) {
+        const contentTypes = [];
+        for (const key of listEntityContentTypeKeys(entity)) {
+            let collection = "";
             try {
-                narrativesCount = await countMemorixEntityContentTypeDocuments(client, {
-                    entityName: summary.entityName,
-                    contentType: "narratives",
-                });
+                collection = resolveMemorixCollectionName(entity, key, client.processEnv);
             }
-            catch (e) {
-                countErrors.narratives = errMsg(e);
+            catch (err) {
+                const msg = errMsg(err);
+                contentTypes.push({
+                    key,
+                    label: memorixContentTypeLabel(key),
+                    collection: "",
+                    database: memorixDatabase,
+                    target,
+                    count: 0,
+                    status: "error",
+                    error: msg,
+                });
+                countErrors[key] = msg;
+                continue;
             }
-        }
-        for (const contentType of contentTypes) {
             try {
-                const ctCount = await countMemorixEntityContentTypeDocuments(client, {
+                const count = await countMemorixEntityContentTypeDocuments(client, {
                     entityName: summary.entityName,
-                    contentType,
+                    contentType: key,
+                });
+                contentTypes.push({
+                    key,
+                    label: memorixContentTypeLabel(key),
+                    collection,
+                    database: memorixDatabase,
+                    target,
+                    count,
+                    status: count > 0 ? "populated" : "empty",
                 });
-                if (ctCount > 0)
-                    contentTypesWithData += 1;
             }
-            catch (e) {
-                contentTypeCountErrors.push(`${contentType}: ${errMsg(e)}`);
+            catch (err) {
+                const msg = errMsg(err);
+                contentTypes.push({
+                    key,
+                    label: memorixContentTypeLabel(key),
+                    collection,
+                    database: memorixDatabase,
+                    target,
+                    count: 0,
+                    status: "error",
+                    error: msg,
+                });
+                countErrors[key] = msg;
             }
         }
-        if (contentTypeCountErrors.length) {
-            countErrors.contentTypes = contentTypeCountErrors.join("; ");
-        }
-        const connections = entityDescriptorConnections(entity);
-        const narrativeRefs = narrativesCount > 0
+        const primary = primaryEntityContentType(entity);
+        const primarySlice = contentTypes.find((c) => c.key === primary);
+        const narrativesSlice = contentTypes.find((c) => c.key === "narratives");
+        const primaryCount = primarySlice?.count ?? 0;
+        const narrativeRefs = (narrativesSlice?.count ?? 0) > 0
             ? [{ id: "memorix:narratives", title: "Memorix narratives collection" }]
             : [];
+        const connections = entityDescriptorConnections(entity);
         entities.push({
             entityName: summary.entityName,
             label: summary.label,
+            target,
+            memorixDatabase,
             defaultListDescriptorId: summary.defaultListDescriptorId,
             defaultItemDescriptorId: summary.defaultItemDescriptorId,
             count: primaryCount,
             narratives: narrativeRefs,
             connections,
             connectedEntityTypes: new Set(connections.map((c) => c.targetEntityName)).size,
-            contentTypesWithData,
+            contentTypesWithData: contentTypes.filter((c) => c.status === "populated").length,
             drillable: primaryCount > 0 || narrativeRefs.length > 0,
+            contentTypes,
             ...(Object.keys(countErrors).length ? { countErrors } : {}),
+            listable,
         });
     }
-    discovery.memorixDb = memorixDb;
     return {
-        memorixDb,
+        memorixDb: memorixDbCombined,
         entities,
         discovery,
     };
 }
 export async function buildMemorixEntitySlices(client, entityName) {
     const entity = await loadMemorixEntityDescriptorByName(client, entityName);
-    const contentTypes = listEntityContentTypeKeys(entity);
+    const target = resolveEntityTarget(entity);
+    const memorixDatabase = resolveMemorixDbNameForEntity(entity, client);
+    const contentTypeKeys = listEntityContentTypeKeys(entity);
     const slices = [];
     const sliceCountFailures = [];
     let step = 0;
-    for (const contentType of contentTypes) {
+    for (const contentType of contentTypeKeys) {
+        let collection = "";
+        try {
+            collection = resolveMemorixCollectionName(entity, contentType, client.processEnv);
+        }
+        catch (e) {
+            sliceCountFailures.push({ contentType, error: errMsg(e) });
+            slices.push({
+                contentType,
+                label: memorixContentTypeLabel(contentType),
+                count: 0,
+                step: step++,
+                collection: "",
+                database: memorixDatabase,
+                target,
+                status: "error",
+            });
+            continue;
+        }
         try {
             const count = await countMemorixEntityContentTypeDocuments(client, {
                 entityName,
                 contentType,
             });
-            if (count > 0) {
-                slices.push({
-                    contentType,
-                    label: memorixContentTypeLabel(contentType),
-                    count,
-                    step: step++,
-                });
-            }
+            slices.push({
+                contentType,
+                label: memorixContentTypeLabel(contentType),
+                count,
+                step: step++,
+                collection,
+                database: memorixDatabase,
+                target,
+                status: count > 0 ? "populated" : "empty",
+            });
         }
         catch (e) {
             sliceCountFailures.push({ contentType, error: errMsg(e) });
+            slices.push({
+                contentType,
+                label: memorixContentTypeLabel(contentType),
+                count: 0,
+                step: step++,
+                collection,
+                database: memorixDatabase,
+                target,
+                status: "error",
+            });
         }
     }
     return {
         entityName,
+        target,
+        memorixDatabase,
         slices,
         ...(sliceCountFailures.length ? { sliceCountFailures } : {}),
     };

package/dist/explorer/entity-graph.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-graph.js","sourceRoot":"","sources":["../../src/explorer/entity-graph.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity-graph.js","sourceRoot":"","sources":["../../src/explorer/entity-graph.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,2BAA2B,EAC3B,iCAAiC,GAClC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,wBAAwB,GACzB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,mBAAmB,EACnB,6BAA6B,GAC9B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,sCAAsC,EAAE,MAAM,gBAAgB,CAAC;AAiFxE,SAAS,sBAAsB,CAC7B,MAA8B,EAC9B,QAAwB;IAExB,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAC5C,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC;IAC9B,OAAO,CACL,GAAG,CAAC,wBAAwB,EAAE,IAAI,EAAE;QACpC,GAAG,CAAC,gBAAgB,EAAE,IAAI,EAAE;QAC5B,GAAG,CAAC,iBAAiB,EAAE,IAAI,EAAE;QAC7B,IAAI,CACL,CAAC;AACJ,CAAC;AAED,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,2BAA2B,CAAC,MAA8B;IAKjE,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IACjE,MAAM,KAAK,GAAG,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAC/D,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,KAAK,EAAE,EAAE,CAAC;AAC7D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,MAA8B,EAC9B,UAA0C,EAAE;IAE5C,MAAM,eAAe,GAAG,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAChF,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/D,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GACxE,2BAA2B,CAAC,MAAM,CAAC,CAAC;IAEtC,MAAM,SAAS,GAAgC;QAC7C,MAAM,EAAE,eAAe,CAAC,MAAM;QAC9B,SAAS,EAAE,iBAAiB;QAC5B,gBAAgB,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE;QACzD,eAAe;QACf,iBAAiB,EAAE,eAAe,CAAC,SAAS;QAC5C,YAAY,EAAE,MAAM,CAAC,KAAK;QAC1B,aAAa;QACb,IAAI,EAAE,eAAe,CAAC,IAAI;KAC3B,CAAC;IAEF,MAAM,QAAQ,GAA+B,EAAE,CAAC;IAEhD,KAAK,MAAM,OAAO,IAAI,eAAe,CAAC,SAAS,EAAE,CAAC;QAChD,MAAM,QAAQ,GAAG,OAAO,CACtB,OAAO,CAAC,uBAAuB,IAAI,OAAO,CAAC,uBAAuB,CACnE,CAAC;QAEF,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,iCAAiC,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAC/E,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,QAAQ,CAAC,IAAI,CAAC;gBACZ,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,QAAQ;gBAChB,eAAe,EAAE,UAAU;gBAC3B,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;gBACxD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;gBACxD,KAAK,EAAE,CAAC;gBACR,UAAU,EAAE,EAAE;gBACd,WAAW,EAAE,EAAE;gBACf,oBAAoB,EAAE,CAAC;gBACvB,oBAAoB,EAAE,CAAC;gBACvB,SAAS,EAAE,KAAK;gBAChB,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE;gBACtC,QAAQ;aACT,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,eAAe,GAAG,6BAA6B,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtE,MAAM,WAAW,GAA2B,EAAE,CAAC;QAC/C,MAAM,YAAY,GAAoC,EAAE,CAAC;QAEzD,KAAK,MAAM,GAAG,IAAI,yBAAyB,CAAC,MAAM,CAAC,EAAE,CAAC;YACpD,IAAI,UAAU,GAAG,EAAE,CAAC;YACpB,IAAI,CAAC;gBACH,UAAU,GAAG,4BAA4B,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAC5E,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBACxB,YAAY,CAAC,IAAI,CAAC;oBAChB,GAAG;oBACH,KAAK,EAAE,uBAAuB,CAAC,GAAG,CAAC;oBACnC,UAAU,EAAE,EAAE;oBACd,QAAQ,EAAE,eAAe;oBACzB,MAAM;oBACN,KAAK,EAAE,CAAC;oBACR,MAAM,EAAE,OAAO;oBACf,KAAK,EAAE,GAAG;iBACX,CAAC,CAAC;gBACH,WAAW,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;gBACvB,SAAS;YACX,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,MAAM,sCAAsC,CAAC,MAAM,EAAE;oBACjE,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,WAAW,EAAE,GAAG;iBACjB,CAAC,CAAC;gBACH,YAAY,CAAC,IAAI,CAAC;oBAChB,GAAG;oBACH,KAAK,EAAE,uBAAuB,CAAC,GAAG,CAAC;oBACnC,UAAU;oBACV,QAAQ,EAAE,eAAe;oBACzB,MAAM;oBACN,KAAK;oBACL,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO;iBAC1C,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBACxB,YAAY,CAAC,IAAI,CAAC;oBAChB,GAAG;oBACH,KAAK,EAAE,uBAAuB,CAAC,GAAG,CAAC;oBACnC,UAAU;oBACV,QAAQ,EAAE,eAAe;oBACzB,MAAM;oBACN,KAAK,EAAE,CAAC;oBACR,MAAM,EAAE,OAAO;oBACf,KAAK,EAAE,GAAG;iBACX,CAAC,CAAC;gBACH,WAAW,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;YACzB,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC;QACjE,MAAM,eAAe,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,YAAY,CAAC,CAAC;QACzE,MAAM,YAAY,GAAG,YAAY,EAAE,KAAK,IAAI,CAAC,CAAC;QAC9C,MAAM,aAAa,GACjB,CAAC,eAAe,EAAE,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC;YAC/B,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,oBAAoB,EAAE,KAAK,EAAE,+BAA+B,EAAE,CAAC;YACxE,CAAC,CAAC,EAAE,CAAC;QAET,MAAM,WAAW,GAAG,2BAA2B,CAAC,MAAM,CAAC,CAAC;QAExD,QAAQ,CAAC,IAAI,CAAC;YACZ,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM;YACN,eAAe;YACf,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,KAAK,EAAE,YAAY;YACnB,UAAU,EAAE,aAAa;YACzB,WAAW;YACX,oBAAoB,EAAE,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI;YAC9E,oBAAoB,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,MAAM;YACjF,SAAS,EAAE,YAAY,GAAG,CAAC,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC;YACvD,YAAY;YACZ,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,SAAS,EAAE,iBAAiB;QAC5B,QAAQ;QACR,SAAS;KACV,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,MAA8B,EAC9B,UAAkB;IAElB,MAAM,MAAM,GAAG,MAAM,iCAAiC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,eAAe,GAAG,6BAA6B,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtE,MAAM,eAAe,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAyB,EAAE,CAAC;IACxC,MAAM,kBAAkB,GAAoD,EAAE,CAAC;IAC/E,IAAI,IAAI,GAAG,CAAC,CAAC;IAEb,KAAK,MAAM,WAAW,IAAI,eAAe,EAAE,CAAC;QAC1C,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC;YACH,UAAU,GAAG,4BAA4B,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACpF,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,kBAAkB,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC3D,MAAM,CAAC,IAAI,CAAC;gBACV,WAAW;gBACX,KAAK,EAAE,uBAAuB,CAAC,WAAW,CAAC;gBAC3C,KAAK,EAAE,CAAC;gBACR,IAAI,EAAE,IAAI,EAAE;gBACZ,UAAU,EAAE,EAAE;gBACd,QAAQ,EAAE,eAAe;gBACzB,MAAM;gBACN,MAAM,EAAE,OAAO;aAChB,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,sCAAsC,CAAC,MAAM,EAAE;gBACjE,UAAU;gBACV,WAAW;aACZ,CAAC,CAAC;YACH,MAAM,CAAC,IAAI,CAAC;gBACV,WAAW;gBACX,KAAK,EAAE,uBAAuB,CAAC,WAAW,CAAC;gBAC3C,KAAK;gBACL,IAAI,EAAE,IAAI,EAAE;gBACZ,UAAU;gBACV,QAAQ,EAAE,eAAe;gBACzB,MAAM;gBACN,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO;aAC1C,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,kBAAkB,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC3D,MAAM,CAAC,IAAI,CAAC;gBACV,WAAW;gBACX,KAAK,EAAE,uBAAuB,CAAC,WAAW,CAAC;gBAC3C,KAAK,EAAE,CAAC;gBACR,IAAI,EAAE,IAAI,EAAE;gBACZ,UAAU;gBACV,QAAQ,EAAE,eAAe;gBACzB,MAAM;gBACN,MAAM,EAAE,OAAO;aAChB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO;QACL,UAAU;QACV,MAAM;QACN,eAAe;QACf,MAAM;QACN,GAAG,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC7D,CAAC;AACJ,CAAC"}

package/dist/explorer/health.d.ts

@@ -1,6 +1,7 @@
 import type { MemorixRetrievalClient } from "../client/types.js";
 export type MemorixRetrievalHealth = {
     ok: boolean;
+    dataTier: "xronox" | "mongo" | "none";
     memorixDb: string | null;
     mongoUriConfigured: boolean;
     pingMs?: number;

package/dist/explorer/health.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/explorer/health.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAIjE,MAAM,MAAM,sBAAsB,GAAG;IACnC,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CAAC,sBAAsB,CAAC,CA2EjC"}
+{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/explorer/health.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAIjE,MAAM,MAAM,sBAAsB,GAAG;IACnC,EAAE,EAAE,OAAO,CAAC;IACZ,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IACtC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CAAC,sBAAsB,CAAC,CA4IjC"}

package/dist/explorer/health.js

@@ -13,9 +13,60 @@ export async function getMemorixRetrievalHealth(client) {
     catch {
         mongoUriConfigured = false;
     }
+    const dataTier = client.xronox
+        ? "xronox"
+        : client.getMongo
+            ? "mongo"
+            : "none";
+    const xronoxAdapter = client.xronox;
+    if (xronoxAdapter?.selfTest) {
+        const started = Date.now();
+        try {
+            const result = await xronoxAdapter.selfTest({ testConnectivity: true });
+            const pingMs = Date.now() - started;
+            let memorixDb = null;
+            if (discovery.summaries[0]) {
+                const { loadMemorixEntityDescriptorByName } = await import("../descriptors/discover-entities.js");
+                const { resolveMemorixDbNameForEntity } = await import("../mongo/resolve-db.js");
+                try {
+                    const entity = await loadMemorixEntityDescriptorByName(client, discovery.summaries[0].entityName);
+                    memorixDb = resolveMemorixDbNameForEntity(entity, client);
+                }
+                catch {
+                    memorixDb = null;
+                }
+            }
+            return {
+                ok: result.passed !== false && discovery.summaries.length > 0,
+                dataTier,
+                memorixDb,
+                mongoUriConfigured,
+                pingMs,
+                discoverySample,
+                cataloxAppId: client.appId,
+                entitiesCatalogId: discovery.catalogId,
+                discoverySource: discovery.source,
+                ...(discovery.hint ? { error: discovery.hint } : {}),
+            };
+        }
+        catch (e) {
+            return {
+                ok: false,
+                dataTier,
+                memorixDb: null,
+                mongoUriConfigured,
+                discoverySample,
+                cataloxAppId: client.appId,
+                entitiesCatalogId: discovery.catalogId,
+                discoverySource: discovery.source,
+                error: e instanceof Error ? e.message : String(e),
+            };
+        }
+    }
     if (!client.getMongo) {
         return {
             ok: discovery.summaries.length > 0,
+            dataTier,
             memorixDb: null,
             mongoUriConfigured,
             discoverySample,
@@ -44,6 +95,7 @@ export async function getMemorixRetrievalHealth(client) {
         }
         return {
             ok: true,
+            dataTier,
             memorixDb,
             mongoUriConfigured,
             pingMs,
@@ -57,6 +109,7 @@ export async function getMemorixRetrievalHealth(client) {
     catch (e) {
         return {
             ok: false,
+            dataTier,
             memorixDb: null,
             mongoUriConfigured,
             discoverySample,

package/dist/explorer/health.js.map

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

package/dist/explorer/raw-reads.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"raw-reads.d.ts","sourceRoot":"","sources":["../../src/explorer/raw-reads.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAEL,wBAAwB,EACxB,4BAA4B,EAC5B,+BAA+B,EAChC,MAAM,sBAAsB,CAAC;AAO9B,MAAM,MAAM,0BAA0B,GAAG;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AA+BF,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,sBAAsB,EAC9B,MAAM,EAAE,IAAI,CACV,0BAA0B,EAC1B,YAAY,GAAG,aAAa,GAAG,QAAQ,GAAG,YAAY,CACvD,GACA,OAAO,CAAC,MAAM,CAAC,CAajB;AAED,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,sBAAsB,EAC9B,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC,0BAA0B,CAAC,CA4CrC;AAED,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,sBAAsB,EAC9B,MAAM,EAAE;IACN,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB,GACA,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAezC;AAED,OAAO,EACL,4BAA4B,EAC5B,+BAA+B,EAC/B,wBAAwB,GACzB,CAAC"}
+{"version":3,"file":"raw-reads.d.ts","sourceRoot":"","sources":["../../src/explorer/raw-reads.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAGjE,OAAO,EAEL,wBAAwB,EACxB,4BAA4B,EAC5B,+BAA+B,EAChC,MAAM,sBAAsB,CAAC;AAK9B,MAAM,MAAM,0BAA0B,GAAG;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AA+BF,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,sBAAsB,EAC9B,MAAM,EAAE,IAAI,CACV,0BAA0B,EAC1B,YAAY,GAAG,aAAa,GAAG,QAAQ,GAAG,YAAY,CACvD,GACA,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,sBAAsB,EAC9B,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC,0BAA0B,CAAC,CA0CrC;AAED,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,sBAAsB,EAC9B,MAAM,EAAE;IACN,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB,GACA,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAezC;AAED,OAAO,EACL,4BAA4B,EAC5B,+BAA+B,EAC/B,wBAAwB,GACzB,CAAC"}

package/dist/explorer/raw-reads.js

@@ -1,9 +1,8 @@
 import { resolveMemorixCollectionName } from "../data/collection-name.js";
+import { memorixCount } from "../data/memorix-count.js";
 import { memorixLabelSearchFilter, mergeMemorixMongoFilters, resolveMemorixRecordIdFilter, serializeMemorixDocumentForJson, } from "../data/record-id.js";
 import { loadMemorixEntityDescriptorByName } from "../descriptors/discover-entities.js";
 import { memorixRead } from "../data/memorix-read.js";
-import { countMemorixCollection } from "../mongo/read-collection.js";
-import { resolveMemorixDbNameForEntity } from "../mongo/resolve-db.js";
 async function resolveEntityAndCollection(client, entityName, contentType) {
     const entity = await loadMemorixEntityDescriptorByName(client, entityName);
     if (!entity.contentTypes[contentType]) {
@@ -18,21 +17,14 @@ function buildQuery(searchText, extraFilter) {
 export async function countMemorixEntityContentTypeDocuments(client, params) {
     const { entity, collection } = await resolveEntityAndCollection(client, params.entityName, params.contentType);
     const query = buildQuery(params.searchText, params.filter);
-    if (!client.getMongo) {
-        throw new Error("countMemorixEntityContentTypeDocuments requires Mongo access");
-    }
-    const mongo = await client.getMongo();
-    const db = resolveMemorixDbNameForEntity(entity, client);
-    return countMemorixCollection(mongo, { db, collection, query });
+    return memorixCount(client, { entity, source: collection, query });
 }
 export async function listMemorixEntityContentTypeDocuments(client, params) {
     const { entity, collection } = await resolveEntityAndCollection(client, params.entityName, params.contentType);
     const query = buildQuery(params.searchText, params.filter);
     const skip = Math.max(0, params.skip ?? 0);
     const limit = Math.min(client.defaults.maxPageLimit, Math.max(1, params.limit ?? 50));
-    if (params.includeTotal && client.getMongo) {
-        const mongo = await client.getMongo();
-        const db = resolveMemorixDbNameForEntity(entity, client);
+    if (params.includeTotal) {
         const [documents, total] = await Promise.all([
             memorixRead(client, {
                 entity,
@@ -42,7 +34,7 @@ export async function listMemorixEntityContentTypeDocuments(client, params) {
                 skip,
                 limit,
             }),
-            countMemorixCollection(mongo, { db, collection, query }),
+            memorixCount(client, { entity, source: collection, query }),
         ]);
         return {
             documents: documents.map((d) => serializeMemorixDocumentForJson(d)),

package/dist/explorer/raw-reads.js.map

@@ -1 +1 @@
-{"version":3,"file":"raw-reads.js","sourceRoot":"","sources":["../../src/explorer/raw-reads.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"raw-reads.js","sourceRoot":"","sources":["../../src/explorer/raw-reads.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,wBAAwB,EACxB,wBAAwB,EACxB,4BAA4B,EAC5B,+BAA+B,GAChC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAExF,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAkBtD,KAAK,UAAU,0BAA0B,CACvC,MAA8B,EAC9B,UAAkB,EAClB,WAAmB;IAEnB,MAAM,MAAM,GAAG,MAAM,iCAAiC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC3E,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CACb,yBAAyB,WAAW,iBAAiB,UAAU,GAAG,CACnE,CAAC;IACJ,CAAC;IACD,MAAM,UAAU,GAAG,4BAA4B,CAC7C,MAAM,EACN,WAAW,EACX,MAAM,CAAC,UAAU,CAClB,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;AAChC,CAAC;AAED,SAAS,UAAU,CACjB,UAA8B,EAC9B,WAAgD;IAEhD,OAAO,wBAAwB,CAC7B,wBAAwB,CAAC,UAAU,CAAC,EACpC,WAAW,CACZ,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sCAAsC,CAC1D,MAA8B,EAC9B,MAGC;IAED,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,0BAA0B,CAC7D,MAAM,EACN,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,WAAW,CACnB,CAAC;IACF,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3D,OAAO,YAAY,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qCAAqC,CACzD,MAA8B,EAC9B,MAAkC;IAElC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,0BAA0B,CAC7D,MAAM,EACN,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,WAAW,CACnB,CAAC;IACF,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CACpB,MAAM,CAAC,QAAQ,CAAC,YAAY,EAC5B,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAChC,CAAC;IAEF,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC3C,WAAW,CAAC,MAAM,EAAE;gBAClB,MAAM;gBACN,MAAM,EAAE,UAAU;gBAClB,KAAK;gBACL,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,IAAI;gBACJ,KAAK;aACN,CAAC;YACF,YAAY,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;SAC5D,CAAC,CAAC;QACH,OAAO;YACL,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC;YACnE,KAAK;SACN,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE;QAC1C,MAAM;QACN,MAAM,EAAE,UAAU;QAClB,KAAK;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI;QACJ,KAAK;KACN,CAAC,CAAC;IACH,OAAO;QACL,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC;KACpE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mCAAmC,CACvD,MAA8B,EAC9B,MAIC;IAED,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,0BAA0B,CAC7D,MAAM,EACN,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,WAAW,CACnB,CAAC;IACF,MAAM,MAAM,GAAG,4BAA4B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC7D,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE;QACrC,MAAM;QACN,MAAM,EAAE,UAAU;QAClB,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,CAAC;KACT,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAC9B,OAAO,+BAA+B,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,CAAC;AACnD,CAAC;AAED,OAAO,EACL,4BAA4B,EAC5B,+BAA+B,EAC/B,wBAAwB,GACzB,CAAC"}

package/dist/explorer/scoped-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scoped-workspace.d.ts","sourceRoot":"","sources":["../../src/explorer/scoped-workspace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAgBjE,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAQF,wBAAgB,+BAA+B,CAC7C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,GAAG,SAAS,CAOpB;AAED,wBAAgB,gCAAgC,CAC9C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,SAAS,MAAM,EAAE,CAMnB;AAoCD,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,sBAAsB,EAC9B,OAAO,GAAE,IAAI,CAAC,sBAAsB,EAAE,WAAW,GAAG,qBAAqB,CAAM,GAC9E,OAAO,CAAC;IACT,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC3D,CAAC,CAsDD;AAED,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,sBAAsB,EAC9B,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAuHnE;AAED,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,sBAAsB,EAC9B,OAAO,GAAE,IAAI,CACX,sBAAsB,EACtB,WAAW,GAAG,qBAAqB,GAAG,YAAY,CAC9C,GACL,OAAO,CAAC,MAAM,CAAC,CA4CjB"}
+{"version":3,"file":"scoped-workspace.d.ts","sourceRoot":"","sources":["../../src/explorer/scoped-workspace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAejE,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAQF,wBAAgB,+BAA+B,CAC7C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,GAAG,SAAS,CAOpB;AAED,wBAAgB,gCAAgC,CAC9C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,SAAS,MAAM,EAAE,CAMnB;AAoCD,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,sBAAsB,EAC9B,OAAO,GAAE,IAAI,CAAC,sBAAsB,EAAE,WAAW,GAAG,qBAAqB,CAAM,GAC9E,OAAO,CAAC;IACT,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC3D,CAAC,CAyCD;AAED,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,sBAAsB,EAC9B,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA4GnE;AAED,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,sBAAsB,EAC9B,OAAO,GAAE,IAAI,CACX,sBAAsB,EACtB,WAAW,GAAG,qBAAqB,GAAG,YAAY,CAC9C,GACL,OAAO,CAAC,MAAM,CAAC,CAgCjB"}

package/dist/explorer/scoped-workspace.js

@@ -1,10 +1,9 @@
 import { resolveMemorixCollectionName } from "../data/collection-name.js";
+import { memorixCount } from "../data/memorix-count.js";
 import { memorixLabelSearchFilter, mergeMemorixMongoFilters, serializeMemorixDocumentForJson, } from "../data/record-id.js";
 import { discoverMemorixEntities, loadMemorixEntityDescriptorByName, } from "../descriptors/discover-entities.js";
 import { primaryEntityContentType } from "../descriptors/content-type-labels.js";
 import { memorixRead } from "../data/memorix-read.js";
-import { countMemorixCollection } from "../mongo/read-collection.js";
-import { resolveMemorixDbNameForEntity } from "../mongo/resolve-db.js";
 const DEFAULT_NAMESPACE_FIELD_PATHS = [
     "namespace",
     "xmemory.namespace",
@@ -50,25 +49,11 @@ export async function listScopedWorkspaceEntityTypes(client, options = {}) {
             const scoped = await scopedQueryForEntity(client, summary.entityName, namespace, fieldPaths);
             if (!scoped)
                 continue;
-            let count = 0;
-            if (client.getMongo) {
-                const mongo = await client.getMongo();
-                const db = resolveMemorixDbNameForEntity(scoped.entity, client);
-                count = await countMemorixCollection(mongo, {
-                    db,
-                    collection: scoped.collection,
-                    query: scoped.query,
-                });
-            }
-            else {
-                const rows = await memorixRead(client, {
-                    entity: scoped.entity,
-                    source: scoped.collection,
-                    query: scoped.query,
-                    limit: 0,
-                });
-                count = rows.length;
-            }
+            const count = await memorixCount(client, {
+                entity: scoped.entity,
+                source: scoped.collection,
+                query: scoped.query,
+            });
             if (count > 0) {
                 entityTypes.push({ typeKey: summary.entityName, docCount: count });
             }
@@ -101,9 +86,6 @@ export async function listScopedWorkspaceDocuments(client, options = {}) {
         const scoped = await scopedQueryForEntity(client, summary.entityName, namespace, fieldPaths, options.searchText);
         if (!scoped)
             continue;
-        if (options.includeTotal && client.getMongo) {
-            continue;
-        }
         const rows = await memorixRead(client, {
             entity: scoped.entity,
             source: scoped.collection,
@@ -114,16 +96,11 @@ export async function listScopedWorkspaceDocuments(client, options = {}) {
         });
         if (rows.length === 0) {
             if (remainingSkip > 0) {
-                let entityCount = 0;
-                if (client.getMongo) {
-                    const mongo = await client.getMongo();
-                    const db = resolveMemorixDbNameForEntity(scoped.entity, client);
-                    entityCount = await countMemorixCollection(mongo, {
-                        db,
-                        collection: scoped.collection,
-                        query: scoped.query,
-                    });
-                }
+                const entityCount = await memorixCount(client, {
+                    entity: scoped.entity,
+                    source: scoped.collection,
+                    query: scoped.query,
+                });
                 if (entityCount <= remainingSkip) {
                     remainingSkip -= entityCount;
                     continue;
@@ -162,17 +139,15 @@ export async function listScopedWorkspaceDocuments(client, options = {}) {
         }
         remainingSkip = 0;
     }
-    if (options.includeTotal && client.getMongo) {
+    if (options.includeTotal) {
         let total = 0;
         for (const summary of discovery.summaries) {
             const scoped = await scopedQueryForEntity(client, summary.entityName, namespace, fieldPaths, options.searchText);
             if (!scoped)
                 continue;
-            const mongo = await client.getMongo();
-            const db = resolveMemorixDbNameForEntity(scoped.entity, client);
-            total += await countMemorixCollection(mongo, {
-                db,
-                collection: scoped.collection,
+            total += await memorixCount(client, {
+                entity: scoped.entity,
+                source: scoped.collection,
                 query: scoped.query,
             });
         }
@@ -193,24 +168,11 @@ export async function countScopedWorkspaceDocuments(client, options = {}) {
         const scoped = await scopedQueryForEntity(client, summary.entityName, namespace, fieldPaths, options.searchText);
         if (!scoped)
             continue;
-        if (client.getMongo) {
-            const mongo = await client.getMongo();
-            const db = resolveMemorixDbNameForEntity(scoped.entity, client);
-            total += await countMemorixCollection(mongo, {
-                db,
-                collection: scoped.collection,
-                query: scoped.query,
-            });
-        }
-        else {
-            const rows = await memorixRead(client, {
-                entity: scoped.entity,
-                source: scoped.collection,
-                query: scoped.query,
-                limit: 0,
-            });
-            total += rows.length;
-        }
+        total += await memorixCount(client, {
+            entity: scoped.entity,
+            source: scoped.collection,
+            query: scoped.query,
+        });
     }
     return total;
 }