@xyo-network/module-model 2.102.7 → 2.103.1

package/dist/neutral/index.js

@@ -416,9 +416,12 @@ var isModuleIdentifierPart = /* @__PURE__ */ __name((value) => {
   return isModuleName(value) || isAddress(value);
 }, "isModuleIdentifierPart");
 
+// src/Payload/Address.ts
+var AddressSchema = "network.xyo.address";
+var AddressChildSchema = "network.xyo.address.child";
+
 // src/Payload/AddressPreviousHash.ts
-import { AddressSchema } from "@xyo-network/address-payload-plugin";
-var AddressPreviousHashSchema = `${AddressSchema}.hash.previous`;
+var AddressPreviousHashSchema = "network.xyo.address.hash.previous";
 
 // src/Payload/Description.ts
 var ModuleDescriptionSchema = "network.xyo.module.description";
@@ -496,18 +499,98 @@ var resolveAddressToInstance = /* @__PURE__ */ __name(async (root, address, incl
 }, "resolveAddressToInstance");
 
 // src/ResolveHelper/ResolveHelper.ts
-import { assertEx as assertEx3 } from "@xylabs/assert";
+import { assertEx as assertEx4 } from "@xylabs/assert";
 import { exists } from "@xylabs/exists";
 import { isAddress as isAddress2 } from "@xylabs/hex";
 import { IdLogger } from "@xylabs/logger";
 import { toJsonString as toJsonString2 } from "@xylabs/object";
 
-// src/ResolveHelper/traceModuleIdentifier.ts
+// src/ResolveHelper/resolvePathToInstance.ts
 import { assertEx as assertEx2 } from "@xylabs/assert";
+import { asAddress } from "@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(assertEx2(parts.shift(), () => `First part is invalid [${path}]`), transformers);
+  if (!first) {
+    return void 0;
+  }
+  const firstAddress = 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
+import { assertEx as assertEx3 } from "@xylabs/assert";
 var traceModuleIdentifier = /* @__PURE__ */ __name(async (resolver, path) => {
   const parts = path.split(":");
   const first = parts.shift();
-  const firstModule = asModuleInstance(assertEx2(await resolver.resolve(first, {
+  const firstModule = asModuleInstance(assertEx3(await resolver.resolve(first, {
     maxDepth: 1
   }), () => `Failed to resolve [${first}]`), () => `Resolved invalid module instance [${first}]`);
   if (firstModule) {
@@ -521,15 +604,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 {
@@ -587,7 +661,7 @@ var ResolveHelper = class _ResolveHelper {
           if (dead) {
             return void 0;
           }
-          const id = await this.transformModuleIdentifier(idOrFilter, transformers);
+          const id = await resolvePathToAddress(module, idOrFilter, false, transformers) ?? idOrFilter;
           if (id) {
             const resolvers = [
               [
@@ -638,7 +712,7 @@ var ResolveHelper = class _ResolveHelper {
     }) ?? (first ? await resolver.resolvePrivate(first, {
       maxDepth: firstIsAddress ? 10 : 1
     }) : void 0);
-    const finalModule = required ? assertEx3(resolvedModule, () => `Failed to resolve [${first}] [${firstIsAddress}]`) : resolvedModule;
+    const finalModule = required ? assertEx4(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;
@@ -671,75 +745,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
-import { assertEx as assertEx4 } from "@xylabs/assert";
-import { asAddress } from "@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(assertEx4(parts.shift(), () => `First part is invalid [${path}]`), transformers);
-  if (!first) {
-    return void 0;
-  }
-  const firstAddress = 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) => {
@@ -751,7 +756,9 @@ var WithFactory = {
 var withModule = WithFactory.create(isModule);
 var withModuleInstance = WithFactory.create(isModuleInstance);
 export {
+  AddressChildSchema,
   AddressPreviousHashSchema,
+  AddressSchema,
   DeadModuleError,
   DisallowedModuleIdentifierCharacters,
   IsAttachableModuleInstanceFactory,
@@ -824,6 +831,7 @@ export {
   resolvePathToInstance,
   serializable,
   serializableField,
+  transformModuleIdentifier,
   withModule,
   withModuleInstance
 };