@xyo-network/module-model 2.94.18 → 2.94.20

package/src/ResolveHelper.ts

@@ -0,0 +1,199 @@
+/* eslint-disable max-statements */
+/* eslint-disable complexity */
+import { assertEx } from '@xylabs/assert'
+import { Address } from '@xylabs/hex'
+import { IdLogger, Logger } from '@xylabs/logger'
+import { toJsonString } from '@xylabs/object'
+
+import { asModuleInstance, ModuleFilter, ModuleFilterOptions, ModuleInstance, ModuleResolver } from './instance'
+import { duplicateModules } from './lib'
+import { ModuleIdentifier } from './ModuleIdentifier'
+
+/*
+
+Resolution rules
+
+1. Resolution is always done from the perspective of the module whose resolve function was called.
+
+2. Requesting '*' will return all the modules that the resolver can see.
+
+3. Requesting a simple ModuleName (string w/o ':' separator) will return an immediate child that has that name.
+
+4. Requesting a complex ModuleName (string w/ ':' separator) will resolve the first part and then recursively resolve
+   the remaining name by calling the first part's resolved module's resolve with the remainder of the name.
+
+5. Requesting an Address (string) will return the module with that address, regardless of how distant it is from the module. [limited by maxDepth]
+
+6. Requesting a ModuleFilter will first request all the modules '*' and then filter them based on the filter settings. [Do we need this mode?]
+
+7. When a string is passed as the ModuleIdentifier, do the following:
+    Check if id is complex (contains a ':')
+      a)  If it is complex, go to #4 above
+      b)  Call isAddress in the id to see if it is a valid address.
+        i)  If it is a valid address, go to #5 above
+        ii) If it is not a valid address, go to # 3 above
+
+    Note 1: If someone were to name a module with a valid address, that name will not be resolvable.
+    Note 2: If someone were to name a module with a string containing a ':', that name will not be resolvable.
+
+8. Modules have two resolvers, up and down.
+    a) Up Traversal
+      i)    Every module's upResolver also can call it's parent's upResolver
+      ii)   An upResolver also can see the parent's children's downResolvers
+      iii)  This means that when traversing upResolvers, you can traverse all the way up.
+      iv)   At any point of the up traversal, it can start traversing down to any immediate child, public or private.
+    b) Down Traversal
+      i)    A down traversal is limited to the public children of the module. [The same as scope as calling the 'resolve' function]
+
+*/
+
+export interface ResolveHelperConfig {
+  address: Address
+  dead?: boolean
+  downResolver?: ModuleResolver
+  logger?: Logger
+  module: ModuleInstance
+  upResolver?: ModuleResolver
+}
+
+export class ResolveHelper {
+  static defaultLogger?: Logger
+  static async resolve<T extends ModuleInstance = ModuleInstance>(
+    config: ResolveHelperConfig,
+    all: '*',
+    options?: ModuleFilterOptions<T>,
+  ): Promise<T[]>
+  static async resolve<T extends ModuleInstance = ModuleInstance>(
+    config: ResolveHelperConfig,
+    filter: ModuleFilter,
+    options?: ModuleFilterOptions<T>,
+  ): Promise<T[]>
+  static async resolve<T extends ModuleInstance = ModuleInstance>(
+    config: ResolveHelperConfig,
+    id: ModuleIdentifier,
+    options?: ModuleFilterOptions<T>,
+  ): Promise<T | undefined>
+  static async resolve<T extends ModuleInstance = ModuleInstance>(
+    config: ResolveHelperConfig,
+    idOrFilter: ModuleFilter<T> | ModuleIdentifier = '*',
+    { visibility, maxDepth = 3, required = 'log', ...options }: ModuleFilterOptions<T> = {},
+  ): Promise<T | T[] | undefined> {
+    const { module, logger = this.defaultLogger, dead = false, upResolver, downResolver } = config
+    const log = logger ? new IdLogger(logger, () => `ResolveHelper [${module.id}][${idOrFilter}][${visibility}]`) : undefined
+
+    const downLocalOptions: ModuleFilterOptions<T> = { ...options, direction: 'down', maxDepth, required: false, visibility }
+    const upLocalOptions: ModuleFilterOptions<T> = { ...downLocalOptions, direction: 'up' }
+
+    const childOptions: ModuleFilterOptions<T> = { ...options, maxDepth: maxDepth - 1, required: false, visibility }
+
+    const direction = options?.direction ?? 'all'
+    const up = direction === 'up' || direction === 'all'
+    const down = direction === 'down' || direction === 'all'
+    let result: T | T[] | undefined
+    log?.debug('start', idOrFilter, maxDepth)
+    if (idOrFilter === '*') {
+      if (dead) {
+        log?.warn('failed [dead]', idOrFilter)
+        return []
+      }
+      const modules = [
+        ...(down ? await (downResolver as ModuleResolver).resolve<T>('*', downLocalOptions) : []),
+        ...(up ? await (upResolver as ModuleResolver).resolve<T>('*', upLocalOptions) : []),
+      ]
+        .filter(duplicateModules)
+        .filter((module) => module.address !== config.address)
+
+      if (modules.length > 0) {
+        log?.log('modules [count]', modules.length)
+        log?.debug('modules', toJsonString(modules, 4))
+      }
+
+      if (maxDepth === 0) {
+        return modules
+      }
+      const childModules = (await Promise.all(modules.map(async (module) => await module.resolve<T>('*', childOptions))))
+        .flat()
+        .filter(duplicateModules)
+      return [...modules, ...childModules].filter(duplicateModules)
+    } else {
+      switch (typeof idOrFilter) {
+        case 'string': {
+          if (dead) {
+            return undefined
+          }
+          result =
+            (down && downResolver ? await this.resolveModuleIdentifier<T>(downResolver, idOrFilter) : undefined) ??
+            (up && upResolver ? await this.resolveModuleIdentifier<T>(upResolver, idOrFilter) : undefined)
+          break
+        }
+        default: {
+          if (dead) {
+            return []
+          }
+          const filter: ModuleFilter<T> | undefined = idOrFilter
+          result = [
+            ...(down ? await (downResolver as ModuleResolver).resolve<T>(filter, downLocalOptions) : []),
+            ...(up ? await (upResolver as ModuleResolver).resolve<T>(filter, upLocalOptions) : []),
+          ].filter(duplicateModules)
+          break
+        }
+      }
+    }
+    this.validateRequiredResolve(required, result, idOrFilter, logger)
+    return result
+  }
+
+  //resolves a complex module path to addresses
+  static async resolveModuleIdentifier<T extends ModuleInstance = ModuleInstance>(
+    resolver: ModuleResolver,
+    path: ModuleIdentifier,
+  ): Promise<T | undefined> {
+    const parts = path.split(':')
+    const first = parts.shift()
+    const firstModule = asModuleInstance(
+      assertEx(await resolver.resolve(first, { maxDepth: 1 }), () => `Failed to resolve [${first}]`),
+      () => `Resolved invalid module instance [${first}]`,
+    ) as T
+    if (firstModule) {
+      return parts.length > 0 ? await this.resolveModuleIdentifier<T>(firstModule, parts.join(':')) : firstModule
+    }
+  }
+
+  //translates a complex module path to addresses
+  static async traceModuleIdentifier(resolver: ModuleResolver, path: ModuleIdentifier): Promise<Address[]> {
+    const parts = path.split(':')
+    const first = parts.shift()
+    const firstModule = asModuleInstance(
+      assertEx(await resolver.resolve(first, { maxDepth: 1 }), () => `Failed to resolve [${first}]`),
+      () => `Resolved invalid module instance [${first}]`,
+    )
+    if (firstModule) {
+      return parts.length > 0 ? [firstModule.address, ...(await this.traceModuleIdentifier(firstModule, parts.join(':')))] : [firstModule.address]
+    }
+    return []
+  }
+
+  static validateRequiredResolve(
+    required: boolean | 'warn' | 'log',
+    result: ModuleInstance[] | ModuleInstance | undefined,
+    idOrFilter: ModuleIdentifier | ModuleFilter,
+    logger = this.defaultLogger,
+  ) {
+    const log = logger ? new IdLogger(logger, () => `validateRequiredResolve [${idOrFilter}][${result}]`) : undefined
+    if (required && (result === undefined || (Array.isArray(result) && result.length > 0))) {
+      switch (required) {
+        case 'warn': {
+          log?.warn('resolve failed', idOrFilter)
+          break
+        }
+        case 'log': {
+          log?.log('resolve failed', idOrFilter)
+          break
+        }
+        default: {
+          throw new Error(`resolve failed [${idOrFilter}]`)
+        }
+      }
+    }
+  }
+}

package/src/index.ts

@@ -14,6 +14,5 @@ export * from './ModuleQueryHandlerResult'
 export * from './ModuleQueryResult'
 export * from './Payload'
 export * from './Queries'
-export * from './resolveModuleIdentifier'
-export * from './traceModuleIdentifier'
+export * from './ResolveHelper'
 export * from './withModule'

package/dist/browser/resolveModuleIdentifier.d.cts

@@ -1,4 +0,0 @@
-import { ModuleInstance, ModuleResolver } from './instance';
-import { ModuleIdentifier } from './ModuleIdentifier';
-export declare const resolveModuleIdentifier: (resolver: ModuleResolver, path: ModuleIdentifier) => Promise<ModuleInstance | undefined>;
-//# sourceMappingURL=resolveModuleIdentifier.d.ts.map

package/dist/browser/resolveModuleIdentifier.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolveModuleIdentifier.d.ts","sourceRoot":"","sources":["../../src/resolveModuleIdentifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGrD,eAAO,MAAM,uBAAuB,aAAoB,cAAc,QAAQ,gBAAgB,KAAG,QAAQ,cAAc,GAAG,SAAS,CAUlI,CAAA"}

package/dist/browser/resolveModuleIdentifier.d.mts

@@ -1,4 +0,0 @@
-import { ModuleInstance, ModuleResolver } from './instance';
-import { ModuleIdentifier } from './ModuleIdentifier';
-export declare const resolveModuleIdentifier: (resolver: ModuleResolver, path: ModuleIdentifier) => Promise<ModuleInstance | undefined>;
-//# sourceMappingURL=resolveModuleIdentifier.d.ts.map

package/dist/browser/resolveModuleIdentifier.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolveModuleIdentifier.d.ts","sourceRoot":"","sources":["../../src/resolveModuleIdentifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGrD,eAAO,MAAM,uBAAuB,aAAoB,cAAc,QAAQ,gBAAgB,KAAG,QAAQ,cAAc,GAAG,SAAS,CAUlI,CAAA"}

package/dist/browser/resolveModuleIdentifier.d.ts

@@ -1,4 +0,0 @@
-import { ModuleInstance, ModuleResolver } from './instance';
-import { ModuleIdentifier } from './ModuleIdentifier';
-export declare const resolveModuleIdentifier: (resolver: ModuleResolver, path: ModuleIdentifier) => Promise<ModuleInstance | undefined>;
-//# sourceMappingURL=resolveModuleIdentifier.d.ts.map

package/dist/browser/resolveModuleIdentifier.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolveModuleIdentifier.d.ts","sourceRoot":"","sources":["../../src/resolveModuleIdentifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGrD,eAAO,MAAM,uBAAuB,aAAoB,cAAc,QAAQ,gBAAgB,KAAG,QAAQ,cAAc,GAAG,SAAS,CAUlI,CAAA"}

package/dist/browser/traceModuleIdentifier.d.cts

@@ -1,5 +0,0 @@
-import { Address } from '@xylabs/hex';
-import { ModuleResolver } from './instance';
-import { ModuleIdentifier } from './ModuleIdentifier';
-export declare const traceModuleIdentifier: (resolver: ModuleResolver, path: ModuleIdentifier) => Promise<Address[]>;
-//# sourceMappingURL=traceModuleIdentifier.d.ts.map

package/dist/browser/traceModuleIdentifier.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"traceModuleIdentifier.d.ts","sourceRoot":"","sources":["../../src/traceModuleIdentifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,OAAO,EAAoB,cAAc,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGrD,eAAO,MAAM,qBAAqB,aAAoB,cAAc,QAAQ,gBAAgB,KAAG,QAAQ,OAAO,EAAE,CAW/G,CAAA"}

package/dist/browser/traceModuleIdentifier.d.mts

@@ -1,5 +0,0 @@
-import { Address } from '@xylabs/hex';
-import { ModuleResolver } from './instance';
-import { ModuleIdentifier } from './ModuleIdentifier';
-export declare const traceModuleIdentifier: (resolver: ModuleResolver, path: ModuleIdentifier) => Promise<Address[]>;
-//# sourceMappingURL=traceModuleIdentifier.d.ts.map

package/dist/browser/traceModuleIdentifier.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"traceModuleIdentifier.d.ts","sourceRoot":"","sources":["../../src/traceModuleIdentifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,OAAO,EAAoB,cAAc,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGrD,eAAO,MAAM,qBAAqB,aAAoB,cAAc,QAAQ,gBAAgB,KAAG,QAAQ,OAAO,EAAE,CAW/G,CAAA"}

package/dist/browser/traceModuleIdentifier.d.ts

@@ -1,5 +0,0 @@
-import { Address } from '@xylabs/hex';
-import { ModuleResolver } from './instance';
-import { ModuleIdentifier } from './ModuleIdentifier';
-export declare const traceModuleIdentifier: (resolver: ModuleResolver, path: ModuleIdentifier) => Promise<Address[]>;
-//# sourceMappingURL=traceModuleIdentifier.d.ts.map

package/dist/browser/traceModuleIdentifier.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"traceModuleIdentifier.d.ts","sourceRoot":"","sources":["../../src/traceModuleIdentifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,OAAO,EAAoB,cAAc,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGrD,eAAO,MAAM,qBAAqB,aAAoB,cAAc,QAAQ,gBAAgB,KAAG,QAAQ,OAAO,EAAE,CAW/G,CAAA"}

package/dist/node/resolveModuleIdentifier.d.cts

@@ -1,4 +0,0 @@
-import { ModuleInstance, ModuleResolver } from './instance';
-import { ModuleIdentifier } from './ModuleIdentifier';
-export declare const resolveModuleIdentifier: (resolver: ModuleResolver, path: ModuleIdentifier) => Promise<ModuleInstance | undefined>;
-//# sourceMappingURL=resolveModuleIdentifier.d.ts.map

package/dist/node/resolveModuleIdentifier.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolveModuleIdentifier.d.ts","sourceRoot":"","sources":["../../src/resolveModuleIdentifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGrD,eAAO,MAAM,uBAAuB,aAAoB,cAAc,QAAQ,gBAAgB,KAAG,QAAQ,cAAc,GAAG,SAAS,CAUlI,CAAA"}

package/dist/node/resolveModuleIdentifier.d.mts

@@ -1,4 +0,0 @@
-import { ModuleInstance, ModuleResolver } from './instance';
-import { ModuleIdentifier } from './ModuleIdentifier';
-export declare const resolveModuleIdentifier: (resolver: ModuleResolver, path: ModuleIdentifier) => Promise<ModuleInstance | undefined>;
-//# sourceMappingURL=resolveModuleIdentifier.d.ts.map

package/dist/node/resolveModuleIdentifier.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolveModuleIdentifier.d.ts","sourceRoot":"","sources":["../../src/resolveModuleIdentifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGrD,eAAO,MAAM,uBAAuB,aAAoB,cAAc,QAAQ,gBAAgB,KAAG,QAAQ,cAAc,GAAG,SAAS,CAUlI,CAAA"}

package/dist/node/resolveModuleIdentifier.d.ts

@@ -1,4 +0,0 @@
-import { ModuleInstance, ModuleResolver } from './instance';
-import { ModuleIdentifier } from './ModuleIdentifier';
-export declare const resolveModuleIdentifier: (resolver: ModuleResolver, path: ModuleIdentifier) => Promise<ModuleInstance | undefined>;
-//# sourceMappingURL=resolveModuleIdentifier.d.ts.map

package/dist/node/resolveModuleIdentifier.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolveModuleIdentifier.d.ts","sourceRoot":"","sources":["../../src/resolveModuleIdentifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGrD,eAAO,MAAM,uBAAuB,aAAoB,cAAc,QAAQ,gBAAgB,KAAG,QAAQ,cAAc,GAAG,SAAS,CAUlI,CAAA"}

package/dist/node/traceModuleIdentifier.d.cts

@@ -1,5 +0,0 @@
-import { Address } from '@xylabs/hex';
-import { ModuleResolver } from './instance';
-import { ModuleIdentifier } from './ModuleIdentifier';
-export declare const traceModuleIdentifier: (resolver: ModuleResolver, path: ModuleIdentifier) => Promise<Address[]>;
-//# sourceMappingURL=traceModuleIdentifier.d.ts.map

package/dist/node/traceModuleIdentifier.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"traceModuleIdentifier.d.ts","sourceRoot":"","sources":["../../src/traceModuleIdentifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,OAAO,EAAoB,cAAc,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGrD,eAAO,MAAM,qBAAqB,aAAoB,cAAc,QAAQ,gBAAgB,KAAG,QAAQ,OAAO,EAAE,CAW/G,CAAA"}

package/dist/node/traceModuleIdentifier.d.mts

@@ -1,5 +0,0 @@
-import { Address } from '@xylabs/hex';
-import { ModuleResolver } from './instance';
-import { ModuleIdentifier } from './ModuleIdentifier';
-export declare const traceModuleIdentifier: (resolver: ModuleResolver, path: ModuleIdentifier) => Promise<Address[]>;
-//# sourceMappingURL=traceModuleIdentifier.d.ts.map

package/dist/node/traceModuleIdentifier.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"traceModuleIdentifier.d.ts","sourceRoot":"","sources":["../../src/traceModuleIdentifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,OAAO,EAAoB,cAAc,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGrD,eAAO,MAAM,qBAAqB,aAAoB,cAAc,QAAQ,gBAAgB,KAAG,QAAQ,OAAO,EAAE,CAW/G,CAAA"}

package/dist/node/traceModuleIdentifier.d.ts

@@ -1,5 +0,0 @@
-import { Address } from '@xylabs/hex';
-import { ModuleResolver } from './instance';
-import { ModuleIdentifier } from './ModuleIdentifier';
-export declare const traceModuleIdentifier: (resolver: ModuleResolver, path: ModuleIdentifier) => Promise<Address[]>;
-//# sourceMappingURL=traceModuleIdentifier.d.ts.map

package/dist/node/traceModuleIdentifier.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"traceModuleIdentifier.d.ts","sourceRoot":"","sources":["../../src/traceModuleIdentifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,OAAO,EAAoB,cAAc,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGrD,eAAO,MAAM,qBAAqB,aAAoB,cAAc,QAAQ,gBAAgB,KAAG,QAAQ,OAAO,EAAE,CAW/G,CAAA"}

package/src/resolveModuleIdentifier.ts

@@ -1,17 +0,0 @@
-import { assertEx } from '@xylabs/assert'
-
-import { asModuleInstance, ModuleInstance, ModuleResolver } from './instance'
-import { ModuleIdentifier } from './ModuleIdentifier'
-
-//resolves a complex module path to addresses
-export const resolveModuleIdentifier = async (resolver: ModuleResolver, path: ModuleIdentifier): Promise<ModuleInstance | undefined> => {
-  const parts = path.split(':')
-  const first = parts.shift()
-  const firstModule = asModuleInstance(
-    assertEx(await resolver.resolve(first, { maxDepth: 1 }), () => `Failed to resolve [${first}]`),
-    () => `Resolved invalid module instance [${first}]`,
-  )
-  if (firstModule) {
-    return parts.length > 0 ? await resolveModuleIdentifier(firstModule, parts.join(':')) : firstModule
-  }
-}

package/src/traceModuleIdentifier.ts

@@ -1,19 +0,0 @@
-import { assertEx } from '@xylabs/assert'
-import { Address } from '@xylabs/hex'
-
-import { asModuleInstance, ModuleResolver } from './instance'
-import { ModuleIdentifier } from './ModuleIdentifier'
-
-//translates a complex module path to addresses
-export const traceModuleIdentifier = async (resolver: ModuleResolver, path: ModuleIdentifier): Promise<Address[]> => {
-  const parts = path.split(':')
-  const first = parts.shift()
-  const firstModule = asModuleInstance(
-    assertEx(await resolver.resolve(first, { maxDepth: 1 }), () => `Failed to resolve [${first}]`),
-    () => `Resolved invalid module instance [${first}]`,
-  )
-  if (firstModule) {
-    return parts.length > 0 ? [firstModule.address, ...(await traceModuleIdentifier(firstModule, parts.join(':')))] : [firstModule.address]
-  }
-  return []
-}