@xyo-network/module-model 2.103.0 → 2.103.1

package/dist/neutral/index.cjs

@@ -96,6 +96,7 @@ __export(src_exports, {
   resolvePathToInstance: () => resolvePathToInstance,
   serializable: () => serializable,
   serializableField: () => serializableField,
+  transformModuleIdentifier: () => transformModuleIdentifier,
   withModule: () => withModule,
   withModuleInstance: () => withModuleInstance
 });
@@ -599,18 +600,98 @@ var resolveAddressToInstance = /* @__PURE__ */ __name(async (root, address, incl
 }, "resolveAddressToInstance");
 
 // src/ResolveHelper/ResolveHelper.ts
-var import_assert3 = require("@xylabs/assert");
+var import_assert4 = require("@xylabs/assert");
 var import_exists = require("@xylabs/exists");
-var import_hex2 = require("@xylabs/hex");
+var import_hex3 = require("@xylabs/hex");
 var import_logger = require("@xylabs/logger");
 var import_object10 = require("@xylabs/object");
 
-// src/ResolveHelper/traceModuleIdentifier.ts
+// src/ResolveHelper/resolvePathToInstance.ts
 var import_assert2 = require("@xylabs/assert");
+var import_hex2 = require("@xylabs/hex");
+
+// src/ResolveHelper/resolveLocalNameToInstance.ts
+var resolveLocalNameToInstanceUp = /* @__PURE__ */ __name(async (root, modName) => {
+  const parents = await root.parents?.() ?? [];
+  return parents.find((parent) => parent.config.name === modName);
+}, "resolveLocalNameToInstanceUp");
+var resolveLocalNameToInstanceDown = /* @__PURE__ */ __name(async (root, modName, includePrivate = false) => {
+  const privateChildren = (includePrivate ? await root.privateChildren?.() : []) ?? [];
+  const publicChildren = await root.publicChildren?.() ?? [];
+  const children = [
+    ...privateChildren,
+    ...publicChildren
+  ];
+  return children.find((child) => child.config.name === modName);
+}, "resolveLocalNameToInstanceDown");
+var resolveLocalNameToInstanceAll = /* @__PURE__ */ __name(async (root, modName, includePrivate = false) => {
+  return await resolveLocalNameToInstanceDown(root, modName, includePrivate) ?? await resolveLocalNameToInstanceUp(root, modName);
+}, "resolveLocalNameToInstanceAll");
+var resolveLocalNameToInstance = /* @__PURE__ */ __name(async (root, modName, includePrivate = false, direction = "all") => {
+  switch (direction) {
+    case "all": {
+      return await resolveLocalNameToInstanceAll(root, modName, includePrivate);
+    }
+    case "up": {
+      return await resolveLocalNameToInstanceUp(root, modName);
+    }
+    case "down": {
+      return await resolveLocalNameToInstanceDown(root, modName, includePrivate);
+    }
+  }
+}, "resolveLocalNameToInstance");
+
+// src/ResolveHelper/resolveLocalNameToAddress.ts
+var resolveLocalNameToAddressUp = /* @__PURE__ */ __name(async (root, modName) => {
+  return (await resolveLocalNameToInstanceUp(root, modName))?.address;
+}, "resolveLocalNameToAddressUp");
+var resolveLocalNameToAddressDown = /* @__PURE__ */ __name(async (root, modName, includePrivate = false) => {
+  return (await resolveLocalNameToInstanceDown(root, modName, includePrivate))?.address;
+}, "resolveLocalNameToAddressDown");
+var resolveLocalNameToAddressAll = /* @__PURE__ */ __name(async (root, modName, includePrivate = false) => {
+  return (await resolveLocalNameToInstanceAll(root, modName, includePrivate))?.address;
+}, "resolveLocalNameToAddressAll");
+var resolveLocalNameToAddress = /* @__PURE__ */ __name(async (root, modName, includePrivate = false, direction = "all") => {
+  return (await resolveLocalNameToInstance(root, modName, includePrivate, direction))?.address;
+}, "resolveLocalNameToAddress");
+
+// src/ResolveHelper/transformModuleIdentifier.ts
+var transformModuleIdentifier = /* @__PURE__ */ __name(async (id, transformers) => {
+  let result = id;
+  for (const transformer of transformers) {
+    result = await transformer.transform(id);
+  }
+  return result;
+}, "transformModuleIdentifier");
+
+// src/ResolveHelper/resolvePathToInstance.ts
+var resolvePathToInstance = /* @__PURE__ */ __name(async (root, path, includePrivate = false, transformers = ResolveHelper.transformers) => {
+  const parts = path.split(MODULE_PATH_SEPARATOR);
+  const first = await transformModuleIdentifier((0, import_assert2.assertEx)(parts.shift(), () => `First part is invalid [${path}]`), transformers);
+  if (!first) {
+    return void 0;
+  }
+  const firstAddress = (0, import_hex2.asAddress)(first) ?? await resolveLocalNameToAddress(root, first, includePrivate);
+  if (firstAddress) {
+    const firstModule = await resolveAddressToInstance(root, firstAddress, includePrivate);
+    if (firstModule && parts.length > 0) {
+      return resolvePathToInstance(firstModule, parts.join(MODULE_PATH_SEPARATOR));
+    }
+    return firstModule;
+  }
+}, "resolvePathToInstance");
+
+// src/ResolveHelper/resolvePathToAddress.ts
+var resolvePathToAddress = /* @__PURE__ */ __name(async (root, path, includePrivate = false, transformers = ResolveHelper.transformers) => {
+  return (await resolvePathToInstance(root, path, includePrivate, transformers))?.address;
+}, "resolvePathToAddress");
+
+// src/ResolveHelper/traceModuleIdentifier.ts
+var import_assert3 = require("@xylabs/assert");
 var traceModuleIdentifier = /* @__PURE__ */ __name(async (resolver, path) => {
   const parts = path.split(":");
   const first = parts.shift();
-  const firstModule = asModuleInstance((0, import_assert2.assertEx)(await resolver.resolve(first, {
+  const firstModule = asModuleInstance((0, import_assert3.assertEx)(await resolver.resolve(first, {
     maxDepth: 1
   }), () => `Failed to resolve [${first}]`), () => `Resolved invalid module instance [${first}]`);
   if (firstModule) {
@@ -624,15 +705,6 @@ var traceModuleIdentifier = /* @__PURE__ */ __name(async (resolver, path) => {
   return [];
 }, "traceModuleIdentifier");
 
-// src/ResolveHelper/transformModuleIdentifier.ts
-var transformModuleIdentifier = /* @__PURE__ */ __name(async (id, transformers) => {
-  let result = id;
-  for (const transformer of transformers) {
-    result = await transformer.transform(id);
-  }
-  return result;
-}, "transformModuleIdentifier");
-
 // src/ResolveHelper/ResolveHelper.ts
 var ResolveHelper = class _ResolveHelper {
   static {
@@ -690,7 +762,7 @@ var ResolveHelper = class _ResolveHelper {
           if (dead) {
             return void 0;
           }
-          const id = await this.transformModuleIdentifier(idOrFilter, transformers);
+          const id = await resolvePathToAddress(module2, idOrFilter, false, transformers) ?? idOrFilter;
           if (id) {
             const resolvers = [
               [
@@ -735,13 +807,13 @@ var ResolveHelper = class _ResolveHelper {
   static async resolveModuleIdentifier(resolver, path, required) {
     const parts = path.split(":");
     const first = parts.shift();
-    const firstIsAddress = (0, import_hex2.isAddress)(first);
+    const firstIsAddress = (0, import_hex3.isAddress)(first);
     const resolvedModule = await resolver.resolve(first, {
       maxDepth: firstIsAddress ? 10 : 1
     }) ?? (first ? await resolver.resolvePrivate(first, {
       maxDepth: firstIsAddress ? 10 : 1
     }) : void 0);
-    const finalModule = required ? (0, import_assert3.assertEx)(resolvedModule, () => `Failed to resolve [${first}] [${firstIsAddress}]`) : resolvedModule;
+    const finalModule = required ? (0, import_assert4.assertEx)(resolvedModule, () => `Failed to resolve [${first}] [${firstIsAddress}]`) : resolvedModule;
     const firstModule = asModuleInstance(finalModule, () => `Resolved invalid module instance [${first}]`);
     if (firstModule) {
       return parts.length > 0 ? await this.resolveModuleIdentifier(firstModule, parts.join(":")) : firstModule;
@@ -774,75 +846,6 @@ var ResolveHelper = class _ResolveHelper {
   }
 };
 
-// src/ResolveHelper/resolveLocalNameToInstance.ts
-var resolveLocalNameToInstanceUp = /* @__PURE__ */ __name(async (root, modName) => {
-  const parents = await root.parents?.() ?? [];
-  return parents.find((parent) => parent.config.name === modName);
-}, "resolveLocalNameToInstanceUp");
-var resolveLocalNameToInstanceDown = /* @__PURE__ */ __name(async (root, modName, includePrivate = false) => {
-  const privateChildren = (includePrivate ? await root.privateChildren?.() : []) ?? [];
-  const publicChildren = await root.publicChildren?.() ?? [];
-  const children = [
-    ...privateChildren,
-    ...publicChildren
-  ];
-  return children.find((child) => child.config.name === modName);
-}, "resolveLocalNameToInstanceDown");
-var resolveLocalNameToInstanceAll = /* @__PURE__ */ __name(async (root, modName, includePrivate = false) => {
-  return await resolveLocalNameToInstanceDown(root, modName, includePrivate) ?? await resolveLocalNameToInstanceUp(root, modName);
-}, "resolveLocalNameToInstanceAll");
-var resolveLocalNameToInstance = /* @__PURE__ */ __name(async (root, modName, includePrivate = false, direction = "all") => {
-  switch (direction) {
-    case "all": {
-      return await resolveLocalNameToInstanceAll(root, modName, includePrivate);
-    }
-    case "up": {
-      return await resolveLocalNameToInstanceUp(root, modName);
-    }
-    case "down": {
-      return await resolveLocalNameToInstanceDown(root, modName, includePrivate);
-    }
-  }
-}, "resolveLocalNameToInstance");
-
-// src/ResolveHelper/resolveLocalNameToAddress.ts
-var resolveLocalNameToAddressUp = /* @__PURE__ */ __name(async (root, modName) => {
-  return (await resolveLocalNameToInstanceUp(root, modName))?.address;
-}, "resolveLocalNameToAddressUp");
-var resolveLocalNameToAddressDown = /* @__PURE__ */ __name(async (root, modName, includePrivate = false) => {
-  return (await resolveLocalNameToInstanceDown(root, modName, includePrivate))?.address;
-}, "resolveLocalNameToAddressDown");
-var resolveLocalNameToAddressAll = /* @__PURE__ */ __name(async (root, modName, includePrivate = false) => {
-  return (await resolveLocalNameToInstanceAll(root, modName, includePrivate))?.address;
-}, "resolveLocalNameToAddressAll");
-var resolveLocalNameToAddress = /* @__PURE__ */ __name(async (root, modName, includePrivate = false, direction = "all") => {
-  return (await resolveLocalNameToInstance(root, modName, includePrivate, direction))?.address;
-}, "resolveLocalNameToAddress");
-
-// src/ResolveHelper/resolvePathToInstance.ts
-var import_assert4 = require("@xylabs/assert");
-var import_hex3 = require("@xylabs/hex");
-var resolvePathToInstance = /* @__PURE__ */ __name(async (root, path, includePrivate = false, transformers = ResolveHelper.transformers) => {
-  const parts = path.split(MODULE_PATH_SEPARATOR);
-  const first = await transformModuleIdentifier((0, import_assert4.assertEx)(parts.shift(), () => `First part is invalid [${path}]`), transformers);
-  if (!first) {
-    return void 0;
-  }
-  const firstAddress = (0, import_hex3.asAddress)(first) ?? await resolveLocalNameToAddress(root, first, includePrivate);
-  if (firstAddress) {
-    const firstModule = await resolveAddressToInstance(root, firstAddress, includePrivate);
-    if (firstModule && parts.length > 0) {
-      return resolvePathToInstance(firstModule, parts.join(MODULE_PATH_SEPARATOR));
-    }
-    return firstModule;
-  }
-}, "resolvePathToInstance");
-
-// src/ResolveHelper/resolvePathToAddress.ts
-var resolvePathToAddress = /* @__PURE__ */ __name(async (root, path, includePrivate = false, transformers = ResolveHelper.transformers) => {
-  return (await resolvePathToInstance(root, path, includePrivate, transformers))?.address;
-}, "resolvePathToAddress");
-
 // src/withModule.ts
 var WithFactory = {
   create: (typeCheck) => {