equipped 5.0.0 → 5.0.1

package/lib/events/index.js

@@ -1,21 +1,5 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./base"), exports);
-__exportStar(require("./pipes"), exports);
-__exportStar(require("./types/kafka"), exports);
-__exportStar(require("./types/rabbitmq"), exports);
+export * from './base';
+export * from './pipes';
+export * from './types/kafka';
+export * from './types/rabbitmq';
 //# sourceMappingURL=index.js.map

package/lib/events/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/events/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAsB;AACtB,0CAAuB;AACvB,gDAA6B;AAC7B,mDAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/events/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,SAAS,CAAA;AACvB,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA"}

package/lib/events/pipes.js

@@ -1,22 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.kafkaConfigPipe = exports.rabbitmqConfigPipe = void 0;
-const valleyed_1 = require("valleyed");
-exports.rabbitmqConfigPipe = valleyed_1.v
+import { v } from 'valleyed';
+export const rabbitmqConfigPipe = v
     .object({
-    uri: valleyed_1.v.string(),
-    eventColumnName: valleyed_1.v.string(),
+    uri: v.string(),
+    eventColumnName: v.string(),
 })
     .meta({ title: 'Rabbitmq Config', $refId: 'RabbitmqConfig' });
-exports.kafkaConfigPipe = valleyed_1.v.object({
-    brokers: valleyed_1.v.array(valleyed_1.v.string()),
-    ssl: valleyed_1.v.optional(valleyed_1.v.boolean()),
-    sasl: valleyed_1.v.optional(valleyed_1.v.object({
-        mechanism: valleyed_1.v.is('plain'),
-        username: valleyed_1.v.string(),
-        password: valleyed_1.v.string(),
+export const kafkaConfigPipe = v.object({
+    brokers: v.array(v.string()),
+    ssl: v.optional(v.boolean()),
+    sasl: v.optional(v.object({
+        mechanism: v.is('plain'),
+        username: v.string(),
+        password: v.string(),
     })),
-    confluent: valleyed_1.v.optional(valleyed_1.v.boolean()),
-    clientId: valleyed_1.v.optional(valleyed_1.v.string()),
+    confluent: v.optional(v.boolean()),
+    clientId: v.optional(v.string()),
 });
 //# sourceMappingURL=pipes.js.map

package/lib/events/pipes.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipes.js","sourceRoot":"","sources":["../../src/events/pipes.ts"],"names":[],"mappings":";;;AAAA,uCAAwC;AAE3B,QAAA,kBAAkB,GAAG,YAAC;KACjC,MAAM,CAAC;IACP,GAAG,EAAE,YAAC,CAAC,MAAM,EAAE;IACf,eAAe,EAAE,YAAC,CAAC,MAAM,EAAE;CAC3B,CAAC;KACD,IAAI,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAA;AAEjD,QAAA,eAAe,GAAG,YAAC,CAAC,MAAM,CAAC;IACvC,OAAO,EAAE,YAAC,CAAC,KAAK,CAAC,YAAC,CAAC,MAAM,EAAE,CAAC;IAC5B,GAAG,EAAE,YAAC,CAAC,QAAQ,CAAC,YAAC,CAAC,OAAO,EAAE,CAAC;IAC5B,IAAI,EAAE,YAAC,CAAC,QAAQ,CACf,YAAC,CAAC,MAAM,CAAC;QACR,SAAS,EAAE,YAAC,CAAC,EAAE,CAAC,OAAgB,CAAC;QACjC,QAAQ,EAAE,YAAC,CAAC,MAAM,EAAE;QACpB,QAAQ,EAAE,YAAC,CAAC,MAAM,EAAE;KACpB,CAAC,CACF;IACD,SAAS,EAAE,YAAC,CAAC,QAAQ,CAAC,YAAC,CAAC,OAAO,EAAE,CAAC;IAClC,QAAQ,EAAE,YAAC,CAAC,QAAQ,CAAC,YAAC,CAAC,MAAM,EAAE,CAAC;CAChC,CAAC,CAAA"}
+{"version":3,"file":"pipes.js","sourceRoot":"","sources":["../../src/events/pipes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,CAAC,EAAE,MAAM,UAAU,CAAA;AAExC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC;KACjC,MAAM,CAAC;IACP,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;IACf,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE;CAC3B,CAAC;KACD,IAAI,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAA;AAE9D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5B,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC5B,IAAI,EAAE,CAAC,CAAC,QAAQ,CACf,CAAC,CAAC,MAAM,CAAC;QACR,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,OAAgB,CAAC;QACjC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;QACpB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;KACpB,CAAC,CACF;IACD,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAClC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CAChC,CAAC,CAAA"}

package/lib/events/types/kafka.js

@@ -1,46 +1,27 @@
-"use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _KafkaEventBus_instances, _KafkaEventBus_client, _KafkaEventBus_confluent, _KafkaEventBus_admin, _KafkaEventBus_getAdmin, _KafkaEventBus_createTopic, _KafkaEventBus_deleteGroup;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.KafkaEventBus = void 0;
-const kafka_javascript_1 = __importDefault(require("@confluentinc/kafka-javascript"));
-const kafkajs_1 = __importDefault(require("kafkajs"));
-const instance_1 = require("../../instance");
-const utilities_1 = require("../../utilities");
-const base_1 = require("../base");
-class KafkaEventBus extends base_1.EventBus {
+import Confluent from '@confluentinc/kafka-javascript';
+import Kafka from 'kafkajs';
+import { Instance } from '../../instance';
+import { Random, parseJSONValue } from '../../utilities';
+import { DefaultSubscribeOptions, EventBus } from '../base';
+export class KafkaEventBus extends EventBus {
+    #client;
+    #confluent;
+    #admin;
     constructor(config) {
         super();
-        _KafkaEventBus_instances.add(this);
-        _KafkaEventBus_client.set(this, void 0);
-        _KafkaEventBus_confluent.set(this, void 0);
-        _KafkaEventBus_admin.set(this, void 0);
         const { confluent = false, ...kafkaSettings } = config;
-        __classPrivateFieldSet(this, _KafkaEventBus_confluent, confluent, "f");
-        __classPrivateFieldSet(this, _KafkaEventBus_client, confluent
-            ? new kafka_javascript_1.default.KafkaJS.Kafka({
-                kafkaJS: { ...kafkaSettings, logLevel: kafka_javascript_1.default.KafkaJS.logLevel.NOTHING },
+        this.#confluent = confluent;
+        this.#client = confluent
+            ? new Confluent.KafkaJS.Kafka({
+                kafkaJS: { ...kafkaSettings, logLevel: Confluent.KafkaJS.logLevel.NOTHING },
             })
-            : new kafkajs_1.default.Kafka({ ...kafkaSettings, logLevel: kafkajs_1.default.logLevel.NOTHING }), "f");
+            : new Kafka.Kafka({ ...kafkaSettings, logLevel: Kafka.logLevel.NOTHING });
     }
     createPublisher(topicName, options = {}) {
-        const topic = options.skipScope ? topicName : instance_1.Instance.get().getScopedName(topicName);
+        const topic = options.skipScope ? topicName : Instance.get().getScopedName(topicName);
         return async (data) => {
             try {
-                const producer = __classPrivateFieldGet(this, _KafkaEventBus_client, "f").producer();
+                const producer = this.#client.producer();
                 await producer.connect();
                 await producer.send({
                     topic,
@@ -54,46 +35,47 @@ class KafkaEventBus extends base_1.EventBus {
         };
     }
     createSubscriber(topicName, onMessage, options = {}) {
-        options = { ...base_1.DefaultSubscribeOptions, ...options };
-        const topic = options.skipScope ? topicName : instance_1.Instance.get().getScopedName(topicName);
+        options = { ...DefaultSubscribeOptions, ...options };
+        const topic = options.skipScope ? topicName : Instance.get().getScopedName(topicName);
         const subscribe = async () => {
-            await __classPrivateFieldGet(this, _KafkaEventBus_instances, "m", _KafkaEventBus_createTopic).call(this, topic);
+            await this.#createTopic(topic);
             const groupId = options.fanout
-                ? instance_1.Instance.get().getScopedName(`${instance_1.Instance.get().settings.app.id}-fanout-${utilities_1.Random.string(10)}`)
+                ? Instance.get().getScopedName(`${Instance.get().settings.app.id}-fanout-${Random.string(10)}`)
                 : topic;
-            const consumer = __classPrivateFieldGet(this, _KafkaEventBus_client, "f").consumer(__classPrivateFieldGet(this, _KafkaEventBus_confluent, "f") ? { kafkaJS: { groupId } } : { groupId });
+            const consumer = this.#client.consumer(this.#confluent ? { kafkaJS: { groupId } } : { groupId });
             await consumer.connect();
             await consumer.subscribe({ topic });
             await consumer.run({
                 eachMessage: async ({ message }) => {
-                    instance_1.Instance.resolveBeforeCrash(async () => {
+                    Instance.resolveBeforeCrash(async () => {
                         if (!message.value)
                             return;
-                        await onMessage((0, utilities_1.parseJSONValue)(message.value.toString()));
+                        await onMessage(parseJSONValue(message.value.toString()));
                     });
                 },
             });
             if (options.fanout)
-                instance_1.Instance.on('close', async () => {
+                Instance.on('close', async () => {
                     await consumer.disconnect();
-                    await __classPrivateFieldGet(this, _KafkaEventBus_instances, "m", _KafkaEventBus_deleteGroup).call(this, groupId);
+                    await this.#deleteGroup(groupId);
                 }, 10);
         };
-        instance_1.Instance.on('start', subscribe, 2);
+        Instance.on('start', subscribe, 2);
     }
-}
-exports.KafkaEventBus = KafkaEventBus;
-_KafkaEventBus_client = new WeakMap(), _KafkaEventBus_confluent = new WeakMap(), _KafkaEventBus_admin = new WeakMap(), _KafkaEventBus_instances = new WeakSet(), _KafkaEventBus_getAdmin = async function _KafkaEventBus_getAdmin() {
-    if (!__classPrivateFieldGet(this, _KafkaEventBus_admin, "f")) {
-        __classPrivateFieldSet(this, _KafkaEventBus_admin, __classPrivateFieldGet(this, _KafkaEventBus_client, "f").admin(), "f");
-        await __classPrivateFieldGet(this, _KafkaEventBus_admin, "f").connect();
+    async #getAdmin() {
+        if (!this.#admin) {
+            this.#admin = this.#client.admin();
+            await this.#admin.connect();
+        }
+        return this.#admin;
+    }
+    async #createTopic(topic) {
+        const admin = await this.#getAdmin();
+        await admin.createTopics({ topics: [{ topic }], timeout: 5000 });
     }
-    return __classPrivateFieldGet(this, _KafkaEventBus_admin, "f");
-}, _KafkaEventBus_createTopic = async function _KafkaEventBus_createTopic(topic) {
-    const admin = await __classPrivateFieldGet(this, _KafkaEventBus_instances, "m", _KafkaEventBus_getAdmin).call(this);
-    await admin.createTopics({ topics: [{ topic }], timeout: 5000 });
-}, _KafkaEventBus_deleteGroup = async function _KafkaEventBus_deleteGroup(groupId) {
-    const admin = await __classPrivateFieldGet(this, _KafkaEventBus_instances, "m", _KafkaEventBus_getAdmin).call(this);
-    await admin.deleteGroups([groupId]).catch(() => { });
-};
+    async #deleteGroup(groupId) {
+        const admin = await this.#getAdmin();
+        await admin.deleteGroups([groupId]).catch(() => { });
+    }
+}
 //# sourceMappingURL=kafka.js.map

package/lib/events/types/kafka.js.map

@@ -1 +1 @@
-{"version":3,"file":"kafka.js","sourceRoot":"","sources":["../../../src/events/types/kafka.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kafka.js","sourceRoot":"","sources":["../../../src/events/types/kafka.ts"],"names":[],"mappings":"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"}

package/lib/events/types/rabbitmq.js

@@ -1,56 +1,41 @@
-"use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _RabbitMQEventBus_client, _RabbitMQEventBus_columnName;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RabbitMQEventBus = void 0;
-const amqp_connection_manager_1 = require("amqp-connection-manager");
-const instance_1 = require("../../instance");
-const utilities_1 = require("../../utilities");
-const base_1 = require("../base");
-class RabbitMQEventBus extends base_1.EventBus {
+import { connect } from 'amqp-connection-manager';
+import { Instance } from '../../instance';
+import { Random, parseJSONValue } from '../../utilities';
+import { DefaultSubscribeOptions, EventBus } from '../base';
+export class RabbitMQEventBus extends EventBus {
+    #client;
+    #columnName;
     constructor(config) {
         super();
-        _RabbitMQEventBus_client.set(this, void 0);
-        _RabbitMQEventBus_columnName.set(this, void 0);
-        __classPrivateFieldSet(this, _RabbitMQEventBus_columnName, config.eventColumnName, "f");
-        __classPrivateFieldSet(this, _RabbitMQEventBus_client, (0, amqp_connection_manager_1.connect)([config.uri]).createChannel({
+        this.#columnName = config.eventColumnName;
+        this.#client = connect([config.uri]).createChannel({
             json: false,
             setup: async (channel) => {
-                await channel.assertExchange(__classPrivateFieldGet(this, _RabbitMQEventBus_columnName, "f"), 'direct', { durable: true });
+                await channel.assertExchange(this.#columnName, 'direct', { durable: true });
                 await channel.prefetch(1);
             },
-        }), "f");
+        });
     }
     createPublisher(topicName, options = {}) {
-        const topic = options.skipScope ? topicName : instance_1.Instance.get().getScopedName(topicName);
-        return async (data) => await __classPrivateFieldGet(this, _RabbitMQEventBus_client, "f").publish(__classPrivateFieldGet(this, _RabbitMQEventBus_columnName, "f"), topic, JSON.stringify(data), { persistent: true });
+        const topic = options.skipScope ? topicName : Instance.get().getScopedName(topicName);
+        return async (data) => await this.#client.publish(this.#columnName, topic, JSON.stringify(data), { persistent: true });
     }
     createSubscriber(topicName, onMessage, options = {}) {
-        options = { ...base_1.DefaultSubscribeOptions, ...options };
-        const topic = options.skipScope ? topicName : instance_1.Instance.get().getScopedName(topicName);
+        options = { ...DefaultSubscribeOptions, ...options };
+        const topic = options.skipScope ? topicName : Instance.get().getScopedName(topicName);
         const subscribe = async () => {
-            await __classPrivateFieldGet(this, _RabbitMQEventBus_client, "f").addSetup(async (channel) => {
+            await this.#client.addSetup(async (channel) => {
                 const queueName = options.fanout
-                    ? instance_1.Instance.get().getScopedName(`${instance_1.Instance.get().settings.app.id}-fanout-${utilities_1.Random.string(10)}`)
+                    ? Instance.get().getScopedName(`${Instance.get().settings.app.id}-fanout-${Random.string(10)}`)
                     : topic;
                 const { queue } = await channel.assertQueue(queueName, { durable: !options.fanout, exclusive: options.fanout });
-                await channel.bindQueue(queue, __classPrivateFieldGet(this, _RabbitMQEventBus_columnName, "f"), topic);
+                await channel.bindQueue(queue, this.#columnName, topic);
                 channel.consume(queue, async (msg) => {
-                    instance_1.Instance.resolveBeforeCrash(async () => {
+                    Instance.resolveBeforeCrash(async () => {
                         if (!msg)
                             return;
                         try {
-                            await onMessage((0, utilities_1.parseJSONValue)(msg.content.toString()));
+                            await onMessage(parseJSONValue(msg.content.toString()));
                             channel.ack(msg);
                         }
                         catch {
@@ -60,9 +45,7 @@ class RabbitMQEventBus extends base_1.EventBus {
                 }, { noAck: false });
             });
         };
-        instance_1.Instance.on('start', subscribe, 2);
+        Instance.on('start', subscribe, 2);
     }
 }
-exports.RabbitMQEventBus = RabbitMQEventBus;
-_RabbitMQEventBus_client = new WeakMap(), _RabbitMQEventBus_columnName = new WeakMap();
 //# sourceMappingURL=rabbitmq.js.map

package/lib/events/types/rabbitmq.js.map

@@ -1 +1 @@
-{"version":3,"file":"rabbitmq.js","sourceRoot":"","sources":["../../../src/events/types/rabbitmq.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rabbitmq.js","sourceRoot":"","sources":["../../../src/events/types/rabbitmq.ts"],"names":[],"mappings":"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"}

package/lib/index.js

@@ -1,18 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./instance"), exports);
+export * from './instance';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA"}

package/lib/instance/hooks.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runHooks = runHooks;
-async function runHooks(hooks, onError = (error) => {
+export async function runHooks(hooks, onError = (error) => {
     throw error;
 }) {
     const grouped = hooks.reduce((acc, cur) => {

package/lib/instance/hooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/instance/hooks.ts"],"names":[],"mappings":";;AAIA,4BA0BC;AA1BM,KAAK,UAAU,QAAQ,CAC7B,KAAmB,EACnB,UAAkC,CAAC,KAAK,EAAE,EAAE;IAC3C,MAAM,KAAK,CAAA;AACZ,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAA+B,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACvE,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA;QAChC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAA;QAC5B,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAClB,OAAO,GAAG,CAAA;IACX,CAAC,EAAE,EAAE,CAAC,CAAA;IACN,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SACjC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;SACzC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;IAC5B,KAAK,MAAM,KAAK,IAAI,MAAM;QACzB,MAAM,OAAO,CAAC,GAAG,CAChB,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YACrB,IAAI,CAAC;gBACJ,IAAI,OAAO,CAAC,CAAC,EAAE,KAAK,UAAU;oBAAE,OAAO,MAAM,CAAC,CAAC,EAAE,EAAE,CAAA;gBACnD,OAAO,MAAM,CAAC,CAAC,EAAE,CAAA;YAClB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,OAAO,OAAO,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAA;YACvE,CAAC;QACF,CAAC,CAAC,CACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/instance/hooks.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC7B,KAAmB,EACnB,UAAkC,CAAC,KAAK,EAAE,EAAE;IAC3C,MAAM,KAAK,CAAA;AACZ,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAA+B,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACvE,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA;QAChC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAA;QAC5B,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAClB,OAAO,GAAG,CAAA;IACX,CAAC,EAAE,EAAE,CAAC,CAAA;IACN,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SACjC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;SACzC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;IAC5B,KAAK,MAAM,KAAK,IAAI,MAAM;QACzB,MAAM,OAAO,CAAC,GAAG,CAChB,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YACrB,IAAI,CAAC;gBACJ,IAAI,OAAO,CAAC,CAAC,EAAE,KAAK,UAAU;oBAAE,OAAO,MAAM,CAAC,CAAC,EAAE,EAAE,CAAA;gBACnD,OAAO,MAAM,CAAC,CAAC,EAAE,CAAA;YAClB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,OAAO,OAAO,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAA;YACvE,CAAC;QACF,CAAC,CAAC,CACF,CAAA;AACH,CAAC"}

package/lib/instance/index.js

@@ -1,71 +1,73 @@
-"use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _a, _Instance_instance, _Instance_hooks, _Instance_registerOnExitHandler;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Instance = void 0;
-const valleyed_1 = require("valleyed");
-const hooks_1 = require("./hooks");
-const settings_1 = require("./settings");
-const errors_1 = require("../errors");
-class Instance extends valleyed_1.DataClass {
+import { DataClass } from 'valleyed';
+import { runHooks } from './hooks';
+import { instanceSettingsPipe, mapSettingsToInstance } from './settings';
+import { EquippedError } from '../errors';
+export class Instance extends DataClass {
+    static #instance;
+    static #hooks = {};
+    envs;
+    settings;
     constructor(envs, settings) {
-        super((0, settings_1.mapSettingsToInstance)(settings));
-        __classPrivateFieldSet(_a, _a, this, "f", _Instance_instance);
+        super(mapSettingsToInstance(settings));
+        Instance.#instance = this;
         this.envs = Object.freeze(envs);
         this.settings = Object.freeze(settings);
-        __classPrivateFieldGet(_a, _a, "m", _Instance_registerOnExitHandler).call(_a);
+        Instance.#registerOnExitHandler();
     }
     getScopedName(name, key = '.') {
         return [this.settings.app.name, name].join(key);
     }
     async start() {
         try {
-            await (0, hooks_1.runHooks)(__classPrivateFieldGet(_a, _a, "f", _Instance_hooks)['setup'] ?? []);
-            await (0, hooks_1.runHooks)(__classPrivateFieldGet(_a, _a, "f", _Instance_hooks)['start'] ?? []);
+            await runHooks(Instance.#hooks['setup'] ?? []);
+            await runHooks(Instance.#hooks['start'] ?? []);
         }
         catch (error) {
-            _a.crash(new errors_1.EquippedError(`Error starting instance`, {}, error));
+            Instance.crash(new EquippedError(`Error starting instance`, {}, error));
         }
     }
     static create(envsPipe, settings) {
-        if (__classPrivateFieldGet(_a, _a, "f", _Instance_instance))
-            throw _a.crash(new errors_1.EquippedError('An instance has already been created. Use that instead', {}));
+        if (Instance.#instance)
+            throw Instance.crash(new EquippedError('An instance has already been created. Use that instead', {}));
         const envValidity = envsPipe.validate(process.env);
         if (!envValidity.valid) {
-            _a.crash(new errors_1.EquippedError(`Environment variables are not valid\n${envValidity.error.toString()}`, {
+            Instance.crash(new EquippedError(`Environment variables are not valid\n${envValidity.error.toString()}`, {
                 messages: envValidity.error.messages,
             }));
         }
-        const settingsValidity = (0, settings_1.instanceSettingsPipe)().validate(settings(envValidity.value));
+        const settingsValidity = instanceSettingsPipe().validate(settings(envValidity.value));
         if (!settingsValidity.valid) {
-            _a.crash(new errors_1.EquippedError(`Settings are not valid\n${settingsValidity.error.toString()}`, {
+            Instance.crash(new EquippedError(`Settings are not valid\n${settingsValidity.error.toString()}`, {
                 messages: settingsValidity.error.messages,
             }));
         }
-        return new _a(envValidity.value, settingsValidity.value);
+        return new Instance(envValidity.value, settingsValidity.value);
     }
     static get() {
-        if (!__classPrivateFieldGet(_a, _a, "f", _Instance_instance))
-            return _a.crash(new errors_1.EquippedError('Has not been initialized. Make sure an instance has been created before you get an instance', {}));
-        return __classPrivateFieldGet(_a, _a, "f", _Instance_instance);
+        if (!Instance.#instance)
+            return Instance.crash(new EquippedError('Has not been initialized. Make sure an instance has been created before you get an instance', {}));
+        return Instance.#instance;
     }
     static on(event, cb, order) {
-        __classPrivateFieldGet(_a, _a, "f", _Instance_hooks)[event] ??= [];
-        __classPrivateFieldGet(_a, _a, "f", _Instance_hooks)[event].push({ cb, order });
+        Instance.#hooks[event] ??= [];
+        Instance.#hooks[event].push({ cb, order });
+    }
+    static #registerOnExitHandler() {
+        const signals = {
+            SIGHUP: 1,
+            SIGINT: 2,
+            SIGTERM: 15,
+        };
+        Object.entries(signals).forEach(([signal, code]) => {
+            process.on(signal, async () => {
+                await runHooks(Instance.#hooks['close'] ?? [], () => { });
+                process.exit(128 + code);
+            });
+        });
     }
     static resolveBeforeCrash(cb) {
         const value = cb();
-        _a.on('close', async () => await value, 10);
+        Instance.on('close', async () => await value, 10);
         return value;
     }
     static crash(error) {
@@ -73,20 +75,4 @@ class Instance extends valleyed_1.DataClass {
         process.exit(1);
     }
 }
-exports.Instance = Instance;
-_a = Instance, _Instance_registerOnExitHandler = function _Instance_registerOnExitHandler() {
-    const signals = {
-        SIGHUP: 1,
-        SIGINT: 2,
-        SIGTERM: 15,
-    };
-    Object.entries(signals).forEach(([signal, code]) => {
-        process.on(signal, async () => {
-            await (0, hooks_1.runHooks)(__classPrivateFieldGet(_a, _a, "f", _Instance_hooks)['close'] ?? [], () => { });
-            process.exit(128 + code);
-        });
-    });
-};
-_Instance_instance = { value: void 0 };
-_Instance_hooks = { value: {} };
 //# sourceMappingURL=index.js.map

package/lib/instance/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/instance/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/instance/index.ts"],"names":[],"mappings":"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"}