@xyo-network/module-abstract 2.73.4 → 2.74.1

package/package.json

@@ -10,42 +10,34 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^2.10.16",
-    "@xylabs/exists": "^2.10.16",
-    "@xylabs/lodash": "^2.10.16",
-    "@xyo-network/account": "~2.73.4",
-    "@xyo-network/account-model": "~2.73.4",
-    "@xyo-network/address-payload-plugin": "~2.73.4",
-    "@xyo-network/archivist-model": "~2.73.4",
-    "@xyo-network/boundwitness-builder": "~2.73.4",
-    "@xyo-network/boundwitness-model": "~2.73.4",
-    "@xyo-network/config-payload-plugin": "~2.73.4",
-    "@xyo-network/core": "~2.73.4",
-    "@xyo-network/error": "~2.73.4",
-    "@xyo-network/manifest-model": "~2.73.4",
-    "@xyo-network/module-events": "~2.73.4",
-    "@xyo-network/module-model": "~2.73.4",
-    "@xyo-network/module-resolver": "~2.73.4",
-    "@xyo-network/payload-builder": "~2.73.4",
-    "@xyo-network/payload-model": "~2.73.4",
-    "@xyo-network/promise": "~2.73.4",
-    "@xyo-network/query-payload-plugin": "~2.73.4",
-    "@xyo-network/shared": "~2.73.4",
-    "@xyo-network/wallet-model": "~2.73.4"
+    "@xylabs/assert": "^2.11.6",
+    "@xylabs/exists": "^2.11.6",
+    "@xylabs/lodash": "^2.11.6",
+    "@xyo-network/account": "~2.74.1",
+    "@xyo-network/account-model": "~2.74.1",
+    "@xyo-network/address-payload-plugin": "~2.74.1",
+    "@xyo-network/archivist-model": "~2.74.1",
+    "@xyo-network/boundwitness-builder": "~2.74.1",
+    "@xyo-network/boundwitness-model": "~2.74.1",
+    "@xyo-network/config-payload-plugin": "~2.74.1",
+    "@xyo-network/core": "~2.74.1",
+    "@xyo-network/error": "~2.74.1",
+    "@xyo-network/manifest-model": "~2.74.1",
+    "@xyo-network/module-events": "~2.74.1",
+    "@xyo-network/module-model": "~2.74.1",
+    "@xyo-network/module-resolver": "~2.74.1",
+    "@xyo-network/payload-builder": "~2.74.1",
+    "@xyo-network/payload-model": "~2.74.1",
+    "@xyo-network/promise": "~2.74.1",
+    "@xyo-network/query-payload-plugin": "~2.74.1",
+    "@xyo-network/shared": "~2.74.1",
+    "@xyo-network/wallet-model": "~2.74.1"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^2.19.12",
-    "@xylabs/tsconfig": "^2.19.12",
-    "jest": "^29.6.4",
-    "jest-mock-extended": "^3.0.5",
-    "publint": "^0.2.2",
-    "tsup": "^7.2.0",
+    "@xylabs/ts-scripts-yarn3": "^3.0.28",
+    "@xylabs/tsconfig": "^3.0.28",
     "typescript": "^5.2.2"
   },
-  "scripts": {
-    "package-compile": "tsup && publint",
-    "package-recompile": "tsup && publint"
-  },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "docs": "dist/docs.json",
   "types": "dist/index.d.ts",
@@ -86,5 +78,5 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.73.4"
+  "version": "2.74.1"
 }

package/src/AbstractModule.ts

@@ -15,7 +15,6 @@ import { ModuleManifestPayload, ModuleManifestPayloadSchema } from '@xyo-network
 import {
   AddressPreviousHashPayload,
   AddressPreviousHashSchema,
-  AnyConfigSchema,
   CreatableModule,
   CreatableModuleFactory,
   duplicateModules,
@@ -56,10 +55,7 @@ import { BaseEmitter } from './BaseEmitter'
 import { ModuleErrorBuilder } from './Error'
 import { ModuleConfigQueryValidator, Queryable, SupportedQueryValidator } from './QueryValidator'
 
-export abstract class AbstractModule<
-    TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<ModuleConfig>,
-    TEventData extends ModuleEventData = ModuleEventData,
-  >
+export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams, TEventData extends ModuleEventData = ModuleEventData>
   extends BaseEmitter<TParams, TEventData>
   implements Module<TParams, TEventData>
 {
@@ -190,9 +186,9 @@ export abstract class AbstractModule<
       allowedSchemas.filter((allowedSchema) => allowedSchema === schema).length > 0,
       `Bad Config Schema [Received ${schema}] [Expected ${JSON.stringify(allowedSchemas)}]`,
     )
-    const mutatedConfig: TModule['params']['config'] = { ...params?.config, schema }
+    const mutatedConfig: TModule['params']['config'] = { ...params?.config, schema } as TModule['params']['config']
     params?.logger?.debug(`config: ${JSON.stringify(mutatedConfig, null, 2)}`)
-    const mutatedParams = { ...params, config: mutatedConfig } as TModule['params']
+    const mutatedParams: TModule['params'] = { ...params, config: mutatedConfig } as TModule['params']
 
     const activeLogger = params?.logger ?? AbstractModule.defaultLogger
     const generatedAccount = await AbstractModule.determineAccount({ account, accountDerivationPath, wallet })
@@ -514,6 +510,16 @@ export abstract class AbstractModule<
     return compact([config, configSchema, address, ...queries])
   }
 
+  protected async getArchivist(kind: keyof IndividualArchivistConfig): Promise<ArchivistInstance | undefined> {
+    if (!this.config.archivist) return undefined
+    const filter =
+      typeof this.config.archivist === 'string' || this.config.archivist instanceof String
+        ? (this.config.archivist as string)
+        : (this.config?.archivist?.[kind] as string)
+    const resolved = await this.upResolver.resolve(filter)
+    return asArchivistInstance(resolved)
+  }
+
   protected async initializeQueryAccounts() {
     // Ensure distinct/unique wallet paths
     const paths = Object.values(this.queryAccountPaths).filter(exists)
@@ -646,14 +652,4 @@ export abstract class AbstractModule<
   }
 
   protected writeArchivist = () => this.getArchivist('write')
-
-  private async getArchivist(kind: keyof IndividualArchivistConfig): Promise<ArchivistInstance | undefined> {
-    if (!this.config.archivist) return undefined
-    const filter =
-      typeof this.config.archivist === 'string' || this.config.archivist instanceof String
-        ? (this.config.archivist as string)
-        : (this.config?.archivist?.[kind] as string)
-    const resolved = await this.upResolver.resolve(filter)
-    return asArchivistInstance(resolved)
-  }
 }

package/src/AbstractModuleInstance.ts

@@ -1,23 +1,12 @@
 import { assertEx } from '@xylabs/assert'
 import { AccountInstance } from '@xyo-network/account-model'
 import { ModuleManifestPayload } from '@xyo-network/manifest-model'
-import {
-  AddressPreviousHashPayload,
-  AnyConfigSchema,
-  Module,
-  ModuleConfig,
-  ModuleDescriptionPayload,
-  ModuleEventData,
-  ModuleParams,
-} from '@xyo-network/module-model'
+import { AddressPreviousHashPayload, Module, ModuleDescriptionPayload, ModuleEventData, ModuleParams } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 
 import { AbstractModule } from './AbstractModule'
 
-export abstract class AbstractModuleInstance<
-    TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<ModuleConfig>,
-    TEventData extends ModuleEventData = ModuleEventData,
-  >
+export abstract class AbstractModuleInstance<TParams extends ModuleParams = ModuleParams, TEventData extends ModuleEventData = ModuleEventData>
   extends AbstractModule<TParams, TEventData>
   implements Module<TParams, TEventData>
 {

package/types.d.ts

@@ -0,0 +1,3 @@
+declare module 'rollup-plugin-exclude-dependencies-from-bundle'
+declare module '@haensl/rollup-plugin-local-resolve'
+declare module 'rollup-plugin-progress'

package/tsup.config.ts

@@ -1,16 +0,0 @@
-import { defineConfig } from 'tsup'
-
-// eslint-disable-next-line import/no-default-export
-export default defineConfig({
-  bundle: true,
-  cjsInterop: true,
-  clean: false,
-  dts: {
-    entry: ['src/index.ts'],
-  },
-  entry: ['src/index.ts'],
-  format: ['cjs', 'esm'],
-  sourcemap: true,
-  splitting: false,
-  tsconfig: 'tsconfig.json',
-})