@xyo-network/location-plugin 2.51.9 → 2.51.10

package/dist/esm/CurrentLocationWitness.js

@@ -4,16 +4,8 @@ import { AbstractWitness } from '@xyo-network/witness';
 import { CurrentLocationWitnessConfigSchema } from './Config';
 export class CurrentLocationWitness extends AbstractWitness {
     static configSchema = CurrentLocationWitnessConfigSchema;
-    _geolocation;
-    constructor(params) {
-        super(params);
-        this._geolocation = params?.geolocation;
-    }
     get geolocation() {
-        return assertEx(this._geolocation, 'No geolocation provided');
-    }
-    static async create(params) {
-        return (await super.create(params));
+        return assertEx(this.params.geolocation, 'No geolocation provided');
     }
     getCurrentPosition() {
         return new Promise((resolve, reject) => {

package/dist/esm/CurrentLocationWitness.js.map

@@ -1 +1 @@
-{"version":3,"file":"CurrentLocationWitness.js","sourceRoot":"","sources":["../../src/CurrentLocationWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAA0B,qBAAqB,EAAmB,cAAc,EAAE,MAAM,sCAAsC,CAAA;AAGrI,OAAO,EAAE,eAAe,EAAiB,MAAM,sBAAsB,CAAA;AAErE,OAAO,EAAgC,kCAAkC,EAAgC,MAAM,UAAU,CAAA;AAEzH,MAAM,OAAO,sBAAuB,SAAQ,eAA4D;IACtG,MAAM,CAAU,YAAY,GAAG,kCAAkC,CAAA;IAEzD,YAAY,CAAa;IAEjC,YAAY,MAAoC;QAC9C,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,YAAY,GAAG,MAAM,EAAE,WAAW,CAAA;IACzC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,yBAAyB,CAAC,CAAA;IAC/D,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAmD;QAC9E,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAA2B,CAAA;IAC/D,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,OAAO,CAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1D,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAClC,CAAC,QAA6B,EAAE,EAAE;gBAChC,OAAO,CAAC,QAAQ,CAAC,CAAA;YACnB,CAAC,EACD,CAAC,KAA+B,EAAE,EAAE;gBAClC,MAAM,CAAC,KAAK,CAAC,CAAA;YACf,CAAC,CACF,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,KAAK,CAAC,OAAO;QACpB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAChD,MAAM,eAAe,GAAoB;YACvC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,IAAI,SAAS;YAC/C,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,gBAAgB,IAAI,SAAS;YAC/D,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ;YAClC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;YACpC,MAAM,EAAE,cAAc;SACvB,CAAA;QACD,MAAM,OAAO,GAA6B,QAAQ,CAAC,MAAM,CAAC,OAAO;YAC/D,CAAC,CAAC;gBACE;oBACE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,IAAI,SAAS;oBAC7C,MAAM,EAAE,qBAAqB;oBAC7B,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,IAAI,SAAS;iBAC1C;aACF;YACH,CAAC,CAAC,EAAE,CAAA;QACN,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,GAAG,OAAO,CAAC,CAAC,CAAA;IACrD,CAAC"}
+{"version":3,"file":"CurrentLocationWitness.js","sourceRoot":"","sources":["../../src/CurrentLocationWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAA0B,qBAAqB,EAAmB,cAAc,EAAE,MAAM,sCAAsC,CAAA;AAErI,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,EAAE,kCAAkC,EAAgC,MAAM,UAAU,CAAA;AAE3F,MAAM,OAAO,sBAAoG,SAAQ,eAAwB;IAC/I,MAAM,CAAU,YAAY,GAAG,kCAAkC,CAAA;IAEjE,IAAI,WAAW;QACb,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,yBAAyB,CAAC,CAAA;IACrE,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,OAAO,CAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1D,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAClC,CAAC,QAA6B,EAAE,EAAE;gBAChC,OAAO,CAAC,QAAQ,CAAC,CAAA;YACnB,CAAC,EACD,CAAC,KAA+B,EAAE,EAAE;gBAClC,MAAM,CAAC,KAAK,CAAC,CAAA;YACf,CAAC,CACF,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,KAAK,CAAC,OAAO;QACpB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAChD,MAAM,eAAe,GAAoB;YACvC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,IAAI,SAAS;YAC/C,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,gBAAgB,IAAI,SAAS;YAC/D,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ;YAClC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;YACpC,MAAM,EAAE,cAAc;SACvB,CAAA;QACD,MAAM,OAAO,GAA6B,QAAQ,CAAC,MAAM,CAAC,OAAO;YAC/D,CAAC,CAAC;gBACE;oBACE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,IAAI,SAAS;oBAC7C,MAAM,EAAE,qBAAqB;oBAC7B,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,IAAI,SAAS;iBAC1C;aACF;YACH,CAAC,CAAC,EAAE,CAAA;QACN,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,GAAG,OAAO,CAAC,CAAC,CAAA;IACrD,CAAC"}

package/dist/esm/Plugin.js

@@ -1,8 +1,8 @@
 import { LocationSchema } from '@xyo-network/location-payload-plugin';
 import { PayloadSetSchema } from '@xyo-network/payload-model';
-import { createPayloadSetPlugin } from '@xyo-network/payloadset-plugin';
+import { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin';
 import { CurrentLocationWitness } from './CurrentLocationWitness';
-export const LocationPlugin = () => createPayloadSetPlugin({ required: { [LocationSchema]: 1 }, schema: PayloadSetSchema }, {
+export const LocationPlugin = () => createPayloadSetWitnessPlugin({ required: { [LocationSchema]: 1 }, schema: PayloadSetSchema }, {
     witness: async (params) => {
         return await CurrentLocationWitness.create(params);
     },

package/dist/esm/Plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;AAErE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,sBAAsB,EAA2B,MAAM,gCAAgC,CAAA;AAGhG,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE,CACjC,sBAAsB,CACpB,EAAE,QAAQ,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAC/D;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,OAAO,MAAM,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;CACF,CACF,CAAA"}
+{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAA;AAE9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE,CACjC,6BAA6B,CAC3B,EAAE,QAAQ,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAC/D;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,OAAO,MAAM,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;CACF,CACF,CAAA"}

package/dist/types/Config.d.ts

@@ -1,11 +1,11 @@
-import { ModuleParams } from '@xyo-network/module';
+import { AnyConfigSchema, ModuleEventData, ModuleParams } from '@xyo-network/module';
 import { XyoWitnessConfig } from '@xyo-network/witness';
 export type CurrentLocationWitnessConfigSchema = 'network.xyo.location.current.config';
 export declare const CurrentLocationWitnessConfigSchema: CurrentLocationWitnessConfigSchema;
 export type CurrentLocationWitnessConfig = XyoWitnessConfig<{
     schema: CurrentLocationWitnessConfigSchema;
 }>;
-export type CurrentLocationWitnessParams = ModuleParams<CurrentLocationWitnessConfig> & {
-    geolocation: Geolocation;
-};
+export type CurrentLocationWitnessParams = ModuleParams<AnyConfigSchema<CurrentLocationWitnessConfig>, ModuleEventData, {
+    geolocation?: Geolocation;
+}>;
 //# sourceMappingURL=Config.d.ts.map

package/dist/types/Config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,MAAM,MAAM,kCAAkC,GAAG,qCAAqC,CAAA;AACtF,eAAO,MAAM,kCAAkC,EAAE,kCAA0E,CAAA;AAE3H,MAAM,MAAM,4BAA4B,GAAG,gBAAgB,CAAC;IAC1D,MAAM,EAAE,kCAAkC,CAAA;CAC3C,CAAC,CAAA;AAEF,MAAM,MAAM,4BAA4B,GAAG,YAAY,CAAC,4BAA4B,CAAC,GAAG;IAAE,WAAW,EAAE,WAAW,CAAA;CAAE,CAAA"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AACpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,MAAM,MAAM,kCAAkC,GAAG,qCAAqC,CAAA;AACtF,eAAO,MAAM,kCAAkC,EAAE,kCAA0E,CAAA;AAE3H,MAAM,MAAM,4BAA4B,GAAG,gBAAgB,CAAC;IAC1D,MAAM,EAAE,kCAAkC,CAAA;CAC3C,CAAC,CAAA;AAEF,MAAM,MAAM,4BAA4B,GAAG,YAAY,CAAC,eAAe,CAAC,4BAA4B,CAAC,EAAE,eAAe,EAAE;IAAE,WAAW,CAAC,EAAE,WAAW,CAAA;CAAE,CAAC,CAAA"}

package/dist/types/CurrentLocationWitness.d.ts

@@ -1,13 +1,9 @@
-import { ModuleParams } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload-model';
-import { AbstractWitness, WitnessParams } from '@xyo-network/witness';
-import { CurrentLocationWitnessConfig, CurrentLocationWitnessParams } from './Config';
-export declare class CurrentLocationWitness extends AbstractWitness<WitnessParams<CurrentLocationWitnessConfig>> {
+import { AbstractWitness } from '@xyo-network/witness';
+import { CurrentLocationWitnessParams } from './Config';
+export declare class CurrentLocationWitness<TParams extends CurrentLocationWitnessParams = CurrentLocationWitnessParams> extends AbstractWitness<TParams> {
     static configSchema: "network.xyo.location.current.config";
-    private _geolocation;
-    constructor(params: CurrentLocationWitnessParams);
     get geolocation(): Geolocation;
-    static create(params?: ModuleParams<CurrentLocationWitnessConfig>): Promise<CurrentLocationWitness>;
     getCurrentPosition(): Promise<GeolocationPosition>;
     observe(): Promise<XyoPayload[]>;
 }

package/dist/types/CurrentLocationWitness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CurrentLocationWitness.d.ts","sourceRoot":"","sources":["../../src/CurrentLocationWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAErE,OAAO,EAAE,4BAA4B,EAAsC,4BAA4B,EAAE,MAAM,UAAU,CAAA;AAEzH,qBAAa,sBAAuB,SAAQ,eAAe,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAC;IACtG,OAAgB,YAAY,wCAAqC;IAEjE,OAAO,CAAC,YAAY,CAAa;gBAErB,MAAM,EAAE,4BAA4B;IAKhD,IAAI,WAAW,IAAI,WAAW,CAE7B;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,4BAA4B,CAAC,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAIlH,kBAAkB;IAaH,OAAO,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;CAoBhD"}
+{"version":3,"file":"CurrentLocationWitness.d.ts","sourceRoot":"","sources":["../../src/CurrentLocationWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,EAAsC,4BAA4B,EAAE,MAAM,UAAU,CAAA;AAE3F,qBAAa,sBAAsB,CAAC,OAAO,SAAS,4BAA4B,GAAG,4BAA4B,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IAC/I,OAAgB,YAAY,wCAAqC;IAEjE,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,kBAAkB;IAaH,OAAO,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;CAoBhD"}

package/dist/types/Plugin.d.ts

@@ -1,19 +1,3 @@
-import { ModuleParams } from '@xyo-network/module';
-import { PayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin';
 import { CurrentLocationWitness } from './CurrentLocationWitness';
-export declare const LocationPlugin: () => PayloadSetWitnessPlugin<CurrentLocationWitness, ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    name?: string | undefined;
-    security?: {
-        allowAnonymous?: boolean | undefined;
-        allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    storeQueries?: boolean | undefined;
-} & {
-    schema: "network.xyo.location.current.config";
-} & {
-    targetSet?: (import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & import("@xyo-network/payload-model").PayloadSet & {
-        schema: "network.xyo.payload.set";
-    }) | undefined;
-}, undefined>>;
+export declare const LocationPlugin: () => import("@xyo-network/payloadset-plugin").PayloadSetWitnessPlugin<CurrentLocationWitness<import("./Config").CurrentLocationWitnessParams>>;
 //# sourceMappingURL=Plugin.d.ts.map

package/dist/types/Plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,EAA0B,uBAAuB,EAAE,MAAM,gCAAgC,CAAA;AAGhG,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,eAAO,MAAM,cAAc;;;;;;;;;;;;;;cAQxB,CAAA"}
+{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,eAAO,MAAM,cAAc,iJAQxB,CAAA"}

package/package.json

@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.7.4",
-    "@xyo-network/location-payload-plugin": "^2.51.9",
-    "@xyo-network/module": "^2.51.9",
-    "@xyo-network/payload-model": "^2.51.9",
-    "@xyo-network/payloadset-plugin": "^2.51.9",
-    "@xyo-network/witness": "^2.51.9"
+    "@xyo-network/location-payload-plugin": "^2.51.10",
+    "@xyo-network/module": "^2.51.10",
+    "@xyo-network/payload-model": "^2.51.10",
+    "@xyo-network/payloadset-plugin": "^2.51.10",
+    "@xyo-network/witness": "^2.51.10"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.16.1",
@@ -55,5 +55,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.51.9"
+  "version": "2.51.10"
 }

package/src/Config.ts

@@ -1,4 +1,4 @@
-import { ModuleParams } from '@xyo-network/module'
+import { AnyConfigSchema, ModuleEventData, ModuleParams } from '@xyo-network/module'
 import { XyoWitnessConfig } from '@xyo-network/witness'
 
 export type CurrentLocationWitnessConfigSchema = 'network.xyo.location.current.config'
@@ -8,4 +8,4 @@ export type CurrentLocationWitnessConfig = XyoWitnessConfig<{
   schema: CurrentLocationWitnessConfigSchema
 }>
 
-export type CurrentLocationWitnessParams = ModuleParams<CurrentLocationWitnessConfig> & { geolocation: Geolocation }
+export type CurrentLocationWitnessParams = ModuleParams<AnyConfigSchema<CurrentLocationWitnessConfig>, ModuleEventData, { geolocation?: Geolocation }>

package/src/CurrentLocationWitness.ts

@@ -1,27 +1,15 @@
 import { assertEx } from '@xylabs/assert'
 import { LocationHeadingPayload, LocationHeadingSchema, LocationPayload, LocationSchema } from '@xyo-network/location-payload-plugin'
-import { ModuleParams } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload-model'
-import { AbstractWitness, WitnessParams } from '@xyo-network/witness'
+import { AbstractWitness } from '@xyo-network/witness'
 
-import { CurrentLocationWitnessConfig, CurrentLocationWitnessConfigSchema, CurrentLocationWitnessParams } from './Config'
+import { CurrentLocationWitnessConfigSchema, CurrentLocationWitnessParams } from './Config'
 
-export class CurrentLocationWitness extends AbstractWitness<WitnessParams<CurrentLocationWitnessConfig>> {
+export class CurrentLocationWitness<TParams extends CurrentLocationWitnessParams = CurrentLocationWitnessParams> extends AbstractWitness<TParams> {
   static override configSchema = CurrentLocationWitnessConfigSchema
 
-  private _geolocation: Geolocation
-
-  constructor(params: CurrentLocationWitnessParams) {
-    super(params)
-    this._geolocation = params?.geolocation
-  }
-
   get geolocation(): Geolocation {
-    return assertEx(this._geolocation, 'No geolocation provided')
-  }
-
-  static override async create(params?: ModuleParams<CurrentLocationWitnessConfig>): Promise<CurrentLocationWitness> {
-    return (await super.create(params)) as CurrentLocationWitness
+    return assertEx(this.params.geolocation, 'No geolocation provided')
   }
 
   getCurrentPosition() {

package/src/Plugin.ts

@@ -1,13 +1,11 @@
 import { LocationSchema } from '@xyo-network/location-payload-plugin'
-import { ModuleParams } from '@xyo-network/module'
 import { PayloadSetSchema } from '@xyo-network/payload-model'
-import { createPayloadSetPlugin, PayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'
+import { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'
 
-import { CurrentLocationWitnessConfig } from './Config'
 import { CurrentLocationWitness } from './CurrentLocationWitness'
 
 export const LocationPlugin = () =>
-  createPayloadSetPlugin<PayloadSetWitnessPlugin<CurrentLocationWitness, ModuleParams<CurrentLocationWitnessConfig>>>(
+  createPayloadSetWitnessPlugin<CurrentLocationWitness>(
     { required: { [LocationSchema]: 1 }, schema: PayloadSetSchema },
     {
       witness: async (params) => {