semola 0.5.2 → 0.5.3

package/dist/lib/errors/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../../../src/lib/errors/index.ts"],"mappings":";;;cAEa,EAAA,MAAS,IAAA,EAAM,CAAA,qBAAC,CAAA;AAAA,cAIhB,GAAA,aAAiB,WAAA,EAAa,IAAA,EAAM,CAAA,EAAG,OAAA;EAAA;;;cAIvC,cAAA,MAAqB,EAAA,QAAU,CAAA,gDAAC,CAAA;AAAA,cAShC,UAAA,MAAuB,OAAA,EAAS,OAAA,CAAQ,CAAA,MAAE,OAAA,iBAAA,OAAA,CAAA,CAAA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../../../src/lib/errors/index.ts"],"mappings":";;;cAEa,EAAA,MAAS,IAAA,EAAM,CAAA,qBAAC,CAAA;AAAA,cAIhB,GAAA,aAAiB,WAAA,EAAa,IAAA,EAAM,CAAA,EAAG,OAAA;EAAA;;;cAIvC,cAAA,UAAyB,KAAA,EACpC,EAAA,QAAU,CAAA,qBACO,CAAA,cAAe,CAAA;AAAA,cASrB,UAAA,UAA2B,KAAA,EACtC,OAAA,EAAS,OAAA,CAAQ,CAAA,MAChB,OAAA,iBAAwB,CAAA,cAAe,CAAA"}

package/dist/lib/errors/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":[],"sources":["../../../src/lib/errors/index.ts"],"sourcesContent":["import type { CommonError } from \"./types.js\";\n\nexport const ok = <T>(data: T) => {\n  return [null, data] as const;\n};\n\nexport const err = <T extends CommonError>(type: T, message: string) => {\n  return [{ type, message }, null] as const;\n};\n\nexport const mightThrowSync = <T>(fn: () => T) => {\n  try {\n    const result = fn();\n    return [null, result] as const;\n  } catch (error) {\n    return [error, null] as const;\n  }\n};\n\nexport const mightThrow = async <T>(promise: Promise<T>) => {\n  try {\n    const data = await promise;\n    return [null, data] as const;\n  } catch (error) {\n    return [error, null] as const;\n  }\n};\n"],"mappings":";AAEA,MAAa,MAAS,SAAY;AAChC,QAAO,CAAC,MAAM,KAAK;;AAGrB,MAAa,OAA8B,MAAS,YAAoB;AACtE,QAAO,CAAC;EAAE;EAAM;EAAS,EAAE,KAAK;;AAGlC,MAAa,kBAAqB,OAAgB;AAChD,KAAI;AAEF,SAAO,CAAC,MADO,IAAI,CACE;UACd,OAAO;AACd,SAAO,CAAC,OAAO,KAAK;;;AAIxB,MAAa,aAAa,OAAU,YAAwB;AAC1D,KAAI;AAEF,SAAO,CAAC,MADK,MAAM,QACA;UACZ,OAAO;AACd,SAAO,CAAC,OAAO,KAAK"}
+{"version":3,"file":"index.mjs","names":[],"sources":["../../../src/lib/errors/index.ts"],"sourcesContent":["import type { CommonError } from \"./types.js\";\n\nexport const ok = <T>(data: T) => {\n  return [null, data] as const;\n};\n\nexport const err = <T extends CommonError>(type: T, message: string) => {\n  return [{ type, message }, null] as const;\n};\n\nexport const mightThrowSync = <T, E = Error>(\n  fn: () => T,\n): readonly [null, T] | readonly [E, null] => {\n  try {\n    const result = fn();\n    return [null, result] as const;\n  } catch (error) {\n    return [error as E, null] as const;\n  }\n};\n\nexport const mightThrow = async <T, E = Error>(\n  promise: Promise<T>,\n): Promise<readonly [null, T] | readonly [E, null]> => {\n  try {\n    const data = await promise;\n    return [null, data] as const;\n  } catch (error) {\n    return [error as E, null] as const;\n  }\n};\n"],"mappings":";AAEA,MAAa,MAAS,SAAY;AAChC,QAAO,CAAC,MAAM,KAAK;;AAGrB,MAAa,OAA8B,MAAS,YAAoB;AACtE,QAAO,CAAC;EAAE;EAAM;EAAS,EAAE,KAAK;;AAGlC,MAAa,kBACX,OAC4C;AAC5C,KAAI;AAEF,SAAO,CAAC,MADO,IAAI,CACE;UACd,OAAO;AACd,SAAO,CAAC,OAAY,KAAK;;;AAI7B,MAAa,aAAa,OACxB,YACqD;AACrD,KAAI;AAEF,SAAO,CAAC,MADK,MAAM,QACA;UACZ,OAAO;AACd,SAAO,CAAC,OAAY,KAAK"}

package/dist/lib/i18n/index.cjs

@@ -19,12 +19,17 @@ var I18n = class {
 		const currentTranslations = this.locales[this.currentLocale];
 		const defaultTranslations = this.locales[this.defaultLocale];
 		const translation = this.getNestedValue(currentTranslations, key) ?? this.getNestedValue(defaultTranslations, key);
+		if (typeof translation !== "string") return key;
 		if (!translation) return key;
 		const paramObj = params[0];
 		return this.substituteParams(translation, paramObj);
 	}
 	getNestedValue(obj, path) {
-		return path.split(".").reduce((current, key) => current?.[key], obj);
+		return path.split(".").reduce((current, key) => {
+			if (typeof current !== "object") return;
+			if (current === null) return;
+			return current[key];
+		}, obj);
 	}
 	substituteParams(template, params) {
 		if (!params) return template;

package/dist/lib/i18n/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","names":[],"sources":["../../../src/lib/i18n/index.ts"],"mappings":";;;cAEa,IAAA,wBACY,MAAA,SAAe,MAAA,iDACT,QAAA;EAAA,QAErB,OAAA;EAAA,QACA,aAAA;EAAA,QACA,aAAA;cAEW,MAAA;IACjB,aAAA,EAAe,cAAA;IACf,OAAA,EAAS,QAAA;EAAA;EAOJ,SAAA,CAAU,MAAA,QAAc,QAAA;EAIxB,SAAA,CAAA,SAAS,QAAA;EAIT,SAAA,cAAuB,WAAA,CAAY,QAAA,CAAS,cAAA,GAAA,CACjD,GAAA,EAAK,IAAA,KACF,MAAA,EAAQ,gBAAA,CACT,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA,mBACrC,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA,mBAErC,MAAA,wBAGJ,gBAAA,CACE,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA,mBACrC,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA;EAAA,QAoB/C,cAAA;EAAA,QAOA,gBAAA;AAAA"}
+{"version":3,"file":"index.d.cts","names":[],"sources":["../../../src/lib/i18n/index.ts"],"mappings":";;;cAEa,IAAA,wBACY,MAAA,SAAe,MAAA,iDACT,QAAA;EAAA,QAErB,OAAA;EAAA,QACA,aAAA;EAAA,QACA,aAAA;cAEW,MAAA;IACjB,aAAA,EAAe,cAAA;IACf,OAAA,EAAS,QAAA;EAAA;EAOJ,SAAA,CAAU,MAAA,QAAc,QAAA;EAIxB,SAAA,CAAA,SAAS,QAAA;EAIT,SAAA,cAAuB,WAAA,CAAY,QAAA,CAAS,cAAA,GAAA,CACjD,GAAA,EAAK,IAAA,KACF,MAAA,EAAQ,gBAAA,CACT,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA,mBACrC,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA,mBAErC,MAAA,wBAGJ,gBAAA,CACE,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA,mBACrC,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA;EAAA,QAwB/C,cAAA;EAAA,QAiBA,gBAAA;AAAA"}

package/dist/lib/i18n/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../../../src/lib/i18n/index.ts"],"mappings":";;;cAEa,IAAA,wBACY,MAAA,SAAe,MAAA,iDACT,QAAA;EAAA,QAErB,OAAA;EAAA,QACA,aAAA;EAAA,QACA,aAAA;cAEW,MAAA;IACjB,aAAA,EAAe,cAAA;IACf,OAAA,EAAS,QAAA;EAAA;EAOJ,SAAA,CAAU,MAAA,QAAc,QAAA;EAIxB,SAAA,CAAA,SAAS,QAAA;EAIT,SAAA,cAAuB,WAAA,CAAY,QAAA,CAAS,cAAA,GAAA,CACjD,GAAA,EAAK,IAAA,KACF,MAAA,EAAQ,gBAAA,CACT,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA,mBACrC,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA,mBAErC,MAAA,wBAGJ,gBAAA,CACE,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA,mBACrC,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA;EAAA,QAoB/C,cAAA;EAAA,QAOA,gBAAA;AAAA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../../../src/lib/i18n/index.ts"],"mappings":";;;cAEa,IAAA,wBACY,MAAA,SAAe,MAAA,iDACT,QAAA;EAAA,QAErB,OAAA;EAAA,QACA,aAAA;EAAA,QACA,aAAA;cAEW,MAAA;IACjB,aAAA,EAAe,cAAA;IACf,OAAA,EAAS,QAAA;EAAA;EAOJ,SAAA,CAAU,MAAA,QAAc,QAAA;EAIxB,SAAA,CAAA,SAAS,QAAA;EAIT,SAAA,cAAuB,WAAA,CAAY,QAAA,CAAS,cAAA,GAAA,CACjD,GAAA,EAAK,IAAA,KACF,MAAA,EAAQ,gBAAA,CACT,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA,mBACrC,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA,mBAErC,MAAA,wBAGJ,gBAAA,CACE,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA,mBACrC,cAAA,CAAe,QAAA,CAAS,cAAA,GAAiB,IAAA;EAAA,QAwB/C,cAAA;EAAA,QAiBA,gBAAA;AAAA"}

package/dist/lib/i18n/index.mjs

@@ -18,12 +18,17 @@ var I18n = class {
 		const currentTranslations = this.locales[this.currentLocale];
 		const defaultTranslations = this.locales[this.defaultLocale];
 		const translation = this.getNestedValue(currentTranslations, key) ?? this.getNestedValue(defaultTranslations, key);
+		if (typeof translation !== "string") return key;
 		if (!translation) return key;
 		const paramObj = params[0];
 		return this.substituteParams(translation, paramObj);
 	}
 	getNestedValue(obj, path) {
-		return path.split(".").reduce((current, key) => current?.[key], obj);
+		return path.split(".").reduce((current, key) => {
+			if (typeof current !== "object") return;
+			if (current === null) return;
+			return current[key];
+		}, obj);
 	}
 	substituteParams(template, params) {
 		if (!params) return template;

package/dist/lib/i18n/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":[],"sources":["../../../src/lib/i18n/index.ts"],"sourcesContent":["import type { BuildParamObject, GetNestedValue, NestedKeyOf } from \"./types.js\";\n\nexport class I18n<\n  const TLocales extends Record<string, Record<string, unknown>>,\n  TDefaultLocale extends keyof TLocales,\n> {\n  private locales: TLocales;\n  private currentLocale: keyof TLocales;\n  private defaultLocale: TDefaultLocale;\n\n  public constructor(config: {\n    defaultLocale: TDefaultLocale;\n    locales: TLocales;\n  }) {\n    this.defaultLocale = config.defaultLocale;\n    this.currentLocale = config.defaultLocale;\n    this.locales = config.locales;\n  }\n\n  public setLocale(locale: keyof TLocales) {\n    this.currentLocale = locale;\n  }\n\n  public getLocale() {\n    return this.currentLocale;\n  }\n\n  public translate<TKey extends NestedKeyOf<TLocales[TDefaultLocale]>>(\n    key: TKey,\n    ...params: BuildParamObject<\n      GetNestedValue<TLocales[TDefaultLocale], TKey> extends string\n        ? GetNestedValue<TLocales[TDefaultLocale], TKey>\n        : never\n    > extends Record<string, never>\n      ? []\n      : [\n          BuildParamObject<\n            GetNestedValue<TLocales[TDefaultLocale], TKey> extends string\n              ? GetNestedValue<TLocales[TDefaultLocale], TKey>\n              : never\n          >,\n        ]\n  ) {\n    const currentTranslations = this.locales[this.currentLocale];\n    const defaultTranslations = this.locales[this.defaultLocale];\n\n    const translation =\n      this.getNestedValue(currentTranslations, key) ??\n      this.getNestedValue(defaultTranslations, key);\n\n    if (!translation) {\n      return key;\n    }\n\n    const paramObj = params[0] as Record<string, unknown> | undefined;\n    return this.substituteParams(translation, paramObj);\n  }\n\n  private getNestedValue(\n    obj: Record<string, unknown> | undefined,\n    path: string,\n  ) {\n    return path.split(\".\").reduce((current: any, key) => current?.[key], obj);\n  }\n\n  private substituteParams(template: string, params?: Record<string, unknown>) {\n    if (!params) return template;\n\n    return template.replace(/\\{(\\w+):(\\w+)\\}/g, (_match, name) => {\n      return String(params[name]);\n    });\n  }\n}\n"],"mappings":";AAEA,IAAa,OAAb,MAGE;CACA;CACA;CACA;CAEA,YAAmB,QAGhB;AACD,OAAK,gBAAgB,OAAO;AAC5B,OAAK,gBAAgB,OAAO;AAC5B,OAAK,UAAU,OAAO;;CAGxB,UAAiB,QAAwB;AACvC,OAAK,gBAAgB;;CAGvB,YAAmB;AACjB,SAAO,KAAK;;CAGd,UACE,KACA,GAAG,QAaH;EACA,MAAM,sBAAsB,KAAK,QAAQ,KAAK;EAC9C,MAAM,sBAAsB,KAAK,QAAQ,KAAK;EAE9C,MAAM,cACJ,KAAK,eAAe,qBAAqB,IAAI,IAC7C,KAAK,eAAe,qBAAqB,IAAI;AAE/C,MAAI,CAAC,YACH,QAAO;EAGT,MAAM,WAAW,OAAO;AACxB,SAAO,KAAK,iBAAiB,aAAa,SAAS;;CAGrD,eACE,KACA,MACA;AACA,SAAO,KAAK,MAAM,IAAI,CAAC,QAAQ,SAAc,QAAQ,UAAU,MAAM,IAAI;;CAG3E,iBAAyB,UAAkB,QAAkC;AAC3E,MAAI,CAAC,OAAQ,QAAO;AAEpB,SAAO,SAAS,QAAQ,qBAAqB,QAAQ,SAAS;AAC5D,UAAO,OAAO,OAAO,MAAM;IAC3B"}
+{"version":3,"file":"index.mjs","names":[],"sources":["../../../src/lib/i18n/index.ts"],"sourcesContent":["import type { BuildParamObject, GetNestedValue, NestedKeyOf } from \"./types.js\";\n\nexport class I18n<\n  const TLocales extends Record<string, Record<string, unknown>>,\n  TDefaultLocale extends keyof TLocales,\n> {\n  private locales: TLocales;\n  private currentLocale: keyof TLocales;\n  private defaultLocale: TDefaultLocale;\n\n  public constructor(config: {\n    defaultLocale: TDefaultLocale;\n    locales: TLocales;\n  }) {\n    this.defaultLocale = config.defaultLocale;\n    this.currentLocale = config.defaultLocale;\n    this.locales = config.locales;\n  }\n\n  public setLocale(locale: keyof TLocales) {\n    this.currentLocale = locale;\n  }\n\n  public getLocale() {\n    return this.currentLocale;\n  }\n\n  public translate<TKey extends NestedKeyOf<TLocales[TDefaultLocale]>>(\n    key: TKey,\n    ...params: BuildParamObject<\n      GetNestedValue<TLocales[TDefaultLocale], TKey> extends string\n        ? GetNestedValue<TLocales[TDefaultLocale], TKey>\n        : never\n    > extends Record<string, never>\n      ? []\n      : [\n          BuildParamObject<\n            GetNestedValue<TLocales[TDefaultLocale], TKey> extends string\n              ? GetNestedValue<TLocales[TDefaultLocale], TKey>\n              : never\n          >,\n        ]\n  ) {\n    const currentTranslations = this.locales[this.currentLocale];\n    const defaultTranslations = this.locales[this.defaultLocale];\n\n    const translation =\n      this.getNestedValue(currentTranslations, key) ??\n      this.getNestedValue(defaultTranslations, key);\n\n    if (typeof translation !== \"string\") {\n      return key;\n    }\n\n    if (!translation) {\n      return key;\n    }\n\n    const paramObj = params[0] as Record<string, unknown> | undefined;\n    return this.substituteParams(translation, paramObj);\n  }\n\n  private getNestedValue(\n    obj: Record<string, unknown> | undefined,\n    path: string,\n  ) {\n    return path.split(\".\").reduce((current: unknown, key: string) => {\n      if (typeof current !== \"object\") {\n        return undefined;\n      }\n\n      if (current === null) {\n        return undefined;\n      }\n\n      return (current as Record<string, unknown>)[key];\n    }, obj);\n  }\n\n  private substituteParams(template: string, params?: Record<string, unknown>) {\n    if (!params) return template;\n\n    return template.replace(/\\{(\\w+):(\\w+)\\}/g, (_match, name) => {\n      return String(params[name]);\n    });\n  }\n}\n"],"mappings":";AAEA,IAAa,OAAb,MAGE;CACA;CACA;CACA;CAEA,YAAmB,QAGhB;AACD,OAAK,gBAAgB,OAAO;AAC5B,OAAK,gBAAgB,OAAO;AAC5B,OAAK,UAAU,OAAO;;CAGxB,UAAiB,QAAwB;AACvC,OAAK,gBAAgB;;CAGvB,YAAmB;AACjB,SAAO,KAAK;;CAGd,UACE,KACA,GAAG,QAaH;EACA,MAAM,sBAAsB,KAAK,QAAQ,KAAK;EAC9C,MAAM,sBAAsB,KAAK,QAAQ,KAAK;EAE9C,MAAM,cACJ,KAAK,eAAe,qBAAqB,IAAI,IAC7C,KAAK,eAAe,qBAAqB,IAAI;AAE/C,MAAI,OAAO,gBAAgB,SACzB,QAAO;AAGT,MAAI,CAAC,YACH,QAAO;EAGT,MAAM,WAAW,OAAO;AACxB,SAAO,KAAK,iBAAiB,aAAa,SAAS;;CAGrD,eACE,KACA,MACA;AACA,SAAO,KAAK,MAAM,IAAI,CAAC,QAAQ,SAAkB,QAAgB;AAC/D,OAAI,OAAO,YAAY,SACrB;AAGF,OAAI,YAAY,KACd;AAGF,UAAQ,QAAoC;KAC3C,IAAI;;CAGT,iBAAyB,UAAkB,QAAkC;AAC3E,MAAI,CAAC,OAAQ,QAAO;AAEpB,SAAO,SAAS,QAAQ,qBAAqB,QAAQ,SAAS;AAC5D,UAAO,OAAO,OAAO,MAAM;IAC3B"}

package/dist/lib/logging/index.cjs

@@ -0,0 +1,18 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_index = require("../../logging/formatter/index.cjs");
+const require_index$1 = require("../../logging/core/index.cjs");
+const require_types = require("../../logging/core/types.cjs");
+const require_index$2 = require("../../logging/provider/index.cjs");
+exports.AbstractLogger = require_index$1.AbstractLogger;
+exports.BaseFormatter = require_index.BaseFormatter;
+exports.ConsoleProvider = require_index$2.ConsoleProvider;
+exports.FileProvider = require_index$2.FileProvider;
+exports.Formatter = require_index.Formatter;
+exports.JSONFormatter = require_index.JSONFormatter;
+exports.LogLevel = require_types.LogLevel;
+exports.Logger = require_index$1.Logger;
+exports.LoggerProvider = require_index$2.LoggerProvider;
+exports.dmyFormat = require_index.dmyFormat;
+exports.isoDateFormat = require_index.isoDateFormat;
+exports.isoDateTimeFormat = require_index.isoDateTimeFormat;
+exports.mdyFormat = require_index.mdyFormat;

package/dist/lib/logging/index.d.cts

@@ -0,0 +1,7 @@
+import { LogDataType, LogLevel, LogLevelType, LogMessageType } from "../../logging/core/types.cjs";
+import { DateFmtFnType } from "../../logging/formatter/types.cjs";
+import { BaseFormatter, Formatter, JSONFormatter, dmyFormat, isoDateFormat, isoDateTimeFormat, mdyFormat } from "../../logging/formatter/index.cjs";
+import { FileProviderOptions, ProviderOptions, SizeBasedPolicyType, TimeBasedPolicyType } from "../../logging/provider/types.cjs";
+import { ConsoleProvider, FileProvider, LoggerProvider } from "../../logging/provider/index.cjs";
+import { AbstractLogger, Logger } from "../../logging/core/index.cjs";
+export { AbstractLogger, BaseFormatter, ConsoleProvider, type DateFmtFnType, FileProvider, type FileProviderOptions, Formatter, JSONFormatter, type LogDataType, LogLevel, type LogLevelType, type LogMessageType, Logger, LoggerProvider, type ProviderOptions, type SizeBasedPolicyType, type TimeBasedPolicyType, dmyFormat, isoDateFormat, isoDateTimeFormat, mdyFormat };

package/dist/lib/logging/index.d.mts

@@ -0,0 +1,7 @@
+import { LogDataType, LogLevel, LogLevelType, LogMessageType } from "../../logging/core/types.mjs";
+import { DateFmtFnType } from "../../logging/formatter/types.mjs";
+import { BaseFormatter, Formatter, JSONFormatter, dmyFormat, isoDateFormat, isoDateTimeFormat, mdyFormat } from "../../logging/formatter/index.mjs";
+import { FileProviderOptions, ProviderOptions, SizeBasedPolicyType, TimeBasedPolicyType } from "../../logging/provider/types.mjs";
+import { ConsoleProvider, FileProvider, LoggerProvider } from "../../logging/provider/index.mjs";
+import { AbstractLogger, Logger } from "../../logging/core/index.mjs";
+export { AbstractLogger, BaseFormatter, ConsoleProvider, type DateFmtFnType, FileProvider, type FileProviderOptions, Formatter, JSONFormatter, type LogDataType, LogLevel, type LogLevelType, type LogMessageType, Logger, LoggerProvider, type ProviderOptions, type SizeBasedPolicyType, type TimeBasedPolicyType, dmyFormat, isoDateFormat, isoDateTimeFormat, mdyFormat };

package/dist/lib/logging/index.mjs

@@ -0,0 +1,5 @@
+import { BaseFormatter, Formatter, JSONFormatter, dmyFormat, isoDateFormat, isoDateTimeFormat, mdyFormat } from "../../logging/formatter/index.mjs";
+import { AbstractLogger, Logger } from "../../logging/core/index.mjs";
+import { LogLevel } from "../../logging/core/types.mjs";
+import { ConsoleProvider, FileProvider, LoggerProvider } from "../../logging/provider/index.mjs";
+export { AbstractLogger, BaseFormatter, ConsoleProvider, FileProvider, Formatter, JSONFormatter, LogLevel, Logger, LoggerProvider, dmyFormat, isoDateFormat, isoDateTimeFormat, mdyFormat };

package/dist/lib/orm/index.cjs

@@ -0,0 +1,20 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_column = require("../../orm/column.cjs");
+const require_config = require("../../orm/migration/config.cjs");
+const require_orm = require("../../orm/orm.cjs");
+const require_relation = require("../../orm/relation.cjs");
+const require_table = require("../../orm/table.cjs");
+exports.boolean = require_column.boolean;
+exports.createOrm = require_orm.createOrm;
+exports.createTable = require_table.createTable;
+exports.date = require_column.date;
+exports.defineConfig = require_config.defineConfig;
+exports.enumColumn = require_column.enumeration;
+exports.enumeration = require_column.enumeration;
+exports.json = require_column.json;
+exports.jsonb = require_column.jsonb;
+exports.many = require_relation.many;
+exports.number = require_column.number;
+exports.one = require_relation.one;
+exports.string = require_column.string;
+exports.uuid = require_column.uuid;

package/dist/lib/orm/index.d.cts

@@ -0,0 +1,7 @@
+import { createTable } from "../../orm/table.cjs";
+import { CreateInput, CreateManyInput, DeleteBuilderInput, DeleteInput, DeleteManyInput, Dialect, DialectAdapter, FindFirstInput, FindManyInput, FindUniqueInput, InsertInput, JoinNode, OrderDirection, SelectInput, SelectPlan, TableRow, TinyTableClient, UpdateBuilderInput, UpdateInput, UpdateManyInput, WhereNode } from "../../orm/types.cjs";
+import { boolean, date, enumeration, json, jsonb, number, string, uuid } from "../../orm/column.cjs";
+import { defineConfig } from "../../orm/migration/config.cjs";
+import { createOrm } from "../../orm/orm.cjs";
+import { many, one } from "../../orm/relation.cjs";
+export { type CreateInput, type CreateManyInput, type DeleteBuilderInput, type DeleteInput, type DeleteManyInput, type Dialect, type DialectAdapter, type FindFirstInput, type FindManyInput, type FindUniqueInput, type InsertInput, type JoinNode, type OrderDirection, type SelectInput, type SelectPlan, type TableRow, type TinyTableClient, type UpdateBuilderInput, type UpdateInput, type UpdateManyInput, type WhereNode, boolean, createOrm, createTable, date, defineConfig, enumeration as enumColumn, enumeration, json, jsonb, many, number, one, string, uuid };

package/dist/lib/orm/index.d.mts

@@ -0,0 +1,7 @@
+import { createTable } from "../../orm/table.mjs";
+import { CreateInput, CreateManyInput, DeleteBuilderInput, DeleteInput, DeleteManyInput, Dialect, DialectAdapter, FindFirstInput, FindManyInput, FindUniqueInput, InsertInput, JoinNode, OrderDirection, SelectInput, SelectPlan, TableRow, TinyTableClient, UpdateBuilderInput, UpdateInput, UpdateManyInput, WhereNode } from "../../orm/types.mjs";
+import { boolean, date, enumeration, json, jsonb, number, string, uuid } from "../../orm/column.mjs";
+import { defineConfig } from "../../orm/migration/config.mjs";
+import { createOrm } from "../../orm/orm.mjs";
+import { many, one } from "../../orm/relation.mjs";
+export { type CreateInput, type CreateManyInput, type DeleteBuilderInput, type DeleteInput, type DeleteManyInput, type Dialect, type DialectAdapter, type FindFirstInput, type FindManyInput, type FindUniqueInput, type InsertInput, type JoinNode, type OrderDirection, type SelectInput, type SelectPlan, type TableRow, type TinyTableClient, type UpdateBuilderInput, type UpdateInput, type UpdateManyInput, type WhereNode, boolean, createOrm, createTable, date, defineConfig, enumeration as enumColumn, enumeration, json, jsonb, many, number, one, string, uuid };

package/dist/lib/orm/index.mjs

@@ -0,0 +1,6 @@
+import { boolean, date, enumeration, json, jsonb, number, string, uuid } from "../../orm/column.mjs";
+import { defineConfig } from "../../orm/migration/config.mjs";
+import { createOrm } from "../../orm/orm.mjs";
+import { many, one } from "../../orm/relation.mjs";
+import { createTable } from "../../orm/table.mjs";
+export { boolean, createOrm, createTable, date, defineConfig, enumeration as enumColumn, enumeration, json, jsonb, many, number, one, string, uuid };

package/dist/lib/prompts/index.d.cts

@@ -2,22 +2,22 @@ import { PromptRuntime } from "../../prompts/core/types.cjs";
 import { ConfirmOptions, InputOptions, MultiselectOptions, NumberOptions, PasswordOptions, PromptErrorType, SelectChoice, SelectOptions } from "../../prompts/types.cjs";
 
 //#region src/lib/prompts/index.d.ts
-declare const input: (options: InputOptions, runtime?: PromptRuntime) => Promise<readonly [{
+declare const input: (options: InputOptions, runtime?: PromptRuntime) => Promise<readonly [null, string] | readonly [{
   readonly type: string;
   readonly message: string;
-}, null] | readonly [null, string]>;
-declare const password: (options: PasswordOptions, runtime?: PromptRuntime) => Promise<readonly [{
+}, null]>;
+declare const password: (options: PasswordOptions, runtime?: PromptRuntime) => Promise<readonly [null, string] | readonly [{
   readonly type: string;
   readonly message: string;
-}, null] | readonly [null, string]>;
-declare const confirm: (options: ConfirmOptions, runtime?: PromptRuntime) => Promise<readonly [{
+}, null]>;
+declare const confirm: (options: ConfirmOptions, runtime?: PromptRuntime) => Promise<readonly [null, boolean] | readonly [{
   readonly type: string;
   readonly message: string;
-}, null] | readonly [null, boolean]>;
-declare const number: (options: NumberOptions, runtime?: PromptRuntime) => Promise<readonly [{
+}, null]>;
+declare const number: (options: NumberOptions, runtime?: PromptRuntime) => Promise<readonly [null, number] | readonly [{
   readonly type: string;
   readonly message: string;
-}, null] | readonly [null, number]>;
+}, null]>;
 declare const select: <TValue extends string>(options: SelectOptions<TValue>, runtime?: PromptRuntime) => Promise<readonly [{
   readonly type: string;
   readonly message: string;

package/dist/lib/prompts/index.d.mts

@@ -2,22 +2,22 @@ import { PromptRuntime } from "../../prompts/core/types.mjs";
 import { ConfirmOptions, InputOptions, MultiselectOptions, NumberOptions, PasswordOptions, PromptErrorType, SelectChoice, SelectOptions } from "../../prompts/types.mjs";
 
 //#region src/lib/prompts/index.d.ts
-declare const input: (options: InputOptions, runtime?: PromptRuntime) => Promise<readonly [{
+declare const input: (options: InputOptions, runtime?: PromptRuntime) => Promise<readonly [null, string] | readonly [{
   readonly type: string;
   readonly message: string;
-}, null] | readonly [null, string]>;
-declare const password: (options: PasswordOptions, runtime?: PromptRuntime) => Promise<readonly [{
+}, null]>;
+declare const password: (options: PasswordOptions, runtime?: PromptRuntime) => Promise<readonly [null, string] | readonly [{
   readonly type: string;
   readonly message: string;
-}, null] | readonly [null, string]>;
-declare const confirm: (options: ConfirmOptions, runtime?: PromptRuntime) => Promise<readonly [{
+}, null]>;
+declare const confirm: (options: ConfirmOptions, runtime?: PromptRuntime) => Promise<readonly [null, boolean] | readonly [{
   readonly type: string;
   readonly message: string;
-}, null] | readonly [null, boolean]>;
-declare const number: (options: NumberOptions, runtime?: PromptRuntime) => Promise<readonly [{
+}, null]>;
+declare const number: (options: NumberOptions, runtime?: PromptRuntime) => Promise<readonly [null, number] | readonly [{
   readonly type: string;
   readonly message: string;
-}, null] | readonly [null, number]>;
+}, null]>;
 declare const select: <TValue extends string>(options: SelectOptions<TValue>, runtime?: PromptRuntime) => Promise<readonly [{
   readonly type: string;
   readonly message: string;

package/dist/lib/pubsub/index.cjs

@@ -4,9 +4,45 @@ const require_lib_errors_index = require("../errors/index.cjs");
 var PubSub = class {
 	options;
 	isSubscribed = false;
+	nextHandlerId = 0;
+	handlers = /* @__PURE__ */ new Map();
+	unsubscribeInFlight = null;
+	subscribeInFlight = null;
 	constructor(options) {
 		this.options = options;
 	}
+	async onMessage(message, channel) {
+		const [parseError, parsed] = require_lib_errors_index.mightThrowSync(() => JSON.parse(message));
+		if (parseError) return;
+		if (!parsed) return;
+		const handlers = Array.from(this.handlers.values());
+		for (const handler of handlers) await require_lib_errors_index.mightThrow(Promise.resolve().then(() => handler(parsed, channel)));
+	}
+	async unsubscribeHandler(handlerId) {
+		const inFlightUnsubscribe = this.unsubscribeInFlight;
+		if (inFlightUnsubscribe) await inFlightUnsubscribe;
+		const handler = this.handlers.get(handlerId);
+		if (!handler) return require_lib_errors_index.err("UnsubscribeError", "Not subscribed");
+		this.handlers.delete(handlerId);
+		if (this.handlers.size > 0) return require_lib_errors_index.ok(true);
+		this.isSubscribed = false;
+		this.unsubscribeInFlight = require_lib_errors_index.mightThrow(this.options.subscriber.unsubscribe(this.options.channel));
+		const unsubscribeInFlight = this.unsubscribeInFlight;
+		if (!unsubscribeInFlight) {
+			this.handlers.set(handlerId, handler);
+			this.isSubscribed = true;
+			return require_lib_errors_index.err("UnsubscribeError", `Unable to unsubscribe from ${this.options.channel}`);
+		}
+		const [unsubscribeError] = await unsubscribeInFlight;
+		if (unsubscribeError) {
+			this.handlers.set(handlerId, handler);
+			this.isSubscribed = true;
+			this.unsubscribeInFlight = null;
+			return require_lib_errors_index.err("UnsubscribeError", `Unable to unsubscribe from ${this.options.channel}`);
+		}
+		this.unsubscribeInFlight = null;
+		return require_lib_errors_index.ok(true);
+	}
 	async publish(message) {
 		const [stringifyError, stringified] = require_lib_errors_index.mightThrowSync(() => JSON.stringify(message));
 		if (stringifyError || !stringified) return require_lib_errors_index.err("SerializationError", "Unable to serialize message");
@@ -15,33 +51,66 @@ var PubSub = class {
 		return require_lib_errors_index.ok(count);
 	}
 	async subscribe(handler) {
-		if (this.isActive()) return require_lib_errors_index.err("SubscribeError", "Already subscribed");
-		this.isSubscribed = true;
-		const wrappedHandler = async (message, channel) => {
-			const [parseError, parsed] = require_lib_errors_index.mightThrowSync(() => JSON.parse(message));
-			if (parseError) return;
-			if (!parsed) return;
-			await require_lib_errors_index.mightThrow(Promise.resolve(handler(parsed, channel)));
-		};
-		const [subscribeError, count] = await require_lib_errors_index.mightThrow(this.options.subscriber.subscribe(this.options.channel, wrappedHandler));
+		const inFlightUnsubscribe = this.unsubscribeInFlight;
+		if (inFlightUnsubscribe) await inFlightUnsubscribe;
+		const handlerId = this.nextHandlerId;
+		this.nextHandlerId += 1;
+		this.handlers.set(handlerId, handler);
+		if (this.isActive()) return require_lib_errors_index.ok(() => this.unsubscribeHandler(handlerId));
+		const inFlightSubscribe = this.subscribeInFlight;
+		if (inFlightSubscribe) {
+			const [inFlightError] = await inFlightSubscribe;
+			if (inFlightError || !this.isSubscribed) {
+				this.handlers.delete(handlerId);
+				return require_lib_errors_index.err("SubscribeError", `Unable to subscribe to ${this.options.channel}`);
+			}
+			return require_lib_errors_index.ok(() => this.unsubscribeHandler(handlerId));
+		}
+		this.subscribeInFlight = require_lib_errors_index.mightThrow(this.options.subscriber.subscribe(this.options.channel, async (message, channel) => this.onMessage(message, channel)));
+		const subscribeInFlight = this.subscribeInFlight;
+		if (!subscribeInFlight) {
+			this.handlers.delete(handlerId);
+			return require_lib_errors_index.err("SubscribeError", `Unable to subscribe to ${this.options.channel}`);
+		}
+		const [subscribeError, count] = await subscribeInFlight;
+		this.subscribeInFlight = null;
 		if (subscribeError) {
-			this.isSubscribed = false;
+			this.handlers.delete(handlerId);
 			return require_lib_errors_index.err("SubscribeError", `Unable to subscribe to ${this.options.channel}`);
 		}
-		return require_lib_errors_index.ok(count);
+		if (!count) {
+			this.handlers.delete(handlerId);
+			return require_lib_errors_index.err("SubscribeError", `Unable to subscribe to ${this.options.channel}`);
+		}
+		this.isSubscribed = true;
+		return require_lib_errors_index.ok(() => this.unsubscribeHandler(handlerId));
 	}
 	async unsubscribe() {
+		const inFlightUnsubscribe = this.unsubscribeInFlight;
+		if (inFlightUnsubscribe) await inFlightUnsubscribe;
 		if (!this.isActive()) return require_lib_errors_index.err("UnsubscribeError", "Not subscribed");
+		const handlers = new Map(this.handlers);
+		this.handlers.clear();
 		this.isSubscribed = false;
-		const [unsubscribeError] = await require_lib_errors_index.mightThrow(this.options.subscriber.unsubscribe(this.options.channel));
+		this.unsubscribeInFlight = require_lib_errors_index.mightThrow(this.options.subscriber.unsubscribe(this.options.channel));
+		const unsubscribeInFlight = this.unsubscribeInFlight;
+		if (!unsubscribeInFlight) {
+			this.handlers = handlers;
+			this.isSubscribed = true;
+			return require_lib_errors_index.err("UnsubscribeError", `Unable to unsubscribe from ${this.options.channel}`);
+		}
+		const [unsubscribeError] = await unsubscribeInFlight;
 		if (unsubscribeError) {
+			this.handlers = handlers;
 			this.isSubscribed = true;
+			this.unsubscribeInFlight = null;
 			return require_lib_errors_index.err("UnsubscribeError", `Unable to unsubscribe from ${this.options.channel}`);
 		}
+		this.unsubscribeInFlight = null;
 		return require_lib_errors_index.ok(true);
 	}
 	isActive() {
-		return this.isSubscribed;
+		return this.handlers.size > 0 && this.isSubscribed;
 	}
 };
 //#endregion

package/dist/lib/pubsub/index.d.cts

@@ -4,22 +4,31 @@ import { MessageHandler, PubSubOptions } from "../../pubsub/types.cjs";
 declare class PubSub<T extends Record<string, unknown>> {
   private options;
   private isSubscribed;
+  private nextHandlerId;
+  private handlers;
+  private unsubscribeInFlight;
+  private subscribeInFlight;
   constructor(options: PubSubOptions);
-  publish(message: T): Promise<readonly [null, number | null] | readonly [{
+  private onMessage;
+  private unsubscribeHandler;
+  publish(message: T): Promise<readonly [{
     readonly type: "SerializationError";
     readonly message: string;
   }, null] | readonly [{
     readonly type: "PublishError";
     readonly message: string;
-  }, null]>;
-  subscribe(handler: MessageHandler<T>): Promise<readonly [null, number | null] | readonly [{
+  }, null] | readonly [null, number]>;
+  subscribe(handler: MessageHandler<T>): Promise<readonly [null, () => Promise<readonly [{
+    readonly type: "UnsubscribeError";
+    readonly message: string;
+  }, null] | readonly [null, boolean]>] | readonly [{
     readonly type: "SubscribeError";
     readonly message: string;
   }, null]>;
-  unsubscribe(): Promise<readonly [null, boolean] | readonly [{
+  unsubscribe(): Promise<readonly [{
     readonly type: "UnsubscribeError";
     readonly message: string;
-  }, null]>;
+  }, null] | readonly [null, boolean]>;
   isActive(): boolean;
 }
 //#endregion

package/dist/lib/pubsub/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","names":[],"sources":["../../../src/lib/pubsub/index.ts"],"mappings":";;;cAGa,MAAA,WAAiB,MAAA;EAAA,QACpB,OAAA;EAAA,QACA,YAAA;cAEW,OAAA,EAAS,aAAA;EAIf,OAAA,CAAQ,OAAA,EAAS,CAAA,GAAC,OAAA;IAAA;;;;;;EAuBlB,SAAA,CAAU,OAAA,EAAS,cAAA,CAAe,CAAA,IAAE,OAAA;IAAA;;;EAgCpC,WAAA,CAAA,GAAW,OAAA;IAAA;;;EAuBjB,QAAA,CAAA;AAAA"}
+{"version":3,"file":"index.d.cts","names":[],"sources":["../../../src/lib/pubsub/index.ts"],"mappings":";;;cAGa,MAAA,WAAiB,MAAA;EAAA,QACpB,OAAA;EAAA,QACA,YAAA;EAAA,QACA,aAAA;EAAA,QACA,QAAA;EAAA,QACA,mBAAA;EAAA,QAGA,iBAAA;cAIW,OAAA,EAAS,aAAA;EAAA,QAId,SAAA;EAAA,QAaA,kBAAA;EAuDD,OAAA,CAAQ,OAAA,EAAS,CAAA,GAAC,OAAA;IAAA;;;;;;EAuBlB,SAAA,CAAU,OAAA,EAAS,cAAA,CAAe,CAAA,IAAE,OAAA,uBAAA,OAAA;IAAA;;;;;;EA8EpC,WAAA,CAAA,GAAW,OAAA;IAAA;;;EAmDjB,QAAA,CAAA;AAAA"}

package/dist/lib/pubsub/index.d.mts

@@ -4,22 +4,31 @@ import { MessageHandler, PubSubOptions } from "../../pubsub/types.mjs";
 declare class PubSub<T extends Record<string, unknown>> {
   private options;
   private isSubscribed;
+  private nextHandlerId;
+  private handlers;
+  private unsubscribeInFlight;
+  private subscribeInFlight;
   constructor(options: PubSubOptions);
-  publish(message: T): Promise<readonly [null, number | null] | readonly [{
+  private onMessage;
+  private unsubscribeHandler;
+  publish(message: T): Promise<readonly [{
     readonly type: "SerializationError";
     readonly message: string;
   }, null] | readonly [{
     readonly type: "PublishError";
     readonly message: string;
-  }, null]>;
-  subscribe(handler: MessageHandler<T>): Promise<readonly [null, number | null] | readonly [{
+  }, null] | readonly [null, number]>;
+  subscribe(handler: MessageHandler<T>): Promise<readonly [null, () => Promise<readonly [{
+    readonly type: "UnsubscribeError";
+    readonly message: string;
+  }, null] | readonly [null, boolean]>] | readonly [{
     readonly type: "SubscribeError";
     readonly message: string;
   }, null]>;
-  unsubscribe(): Promise<readonly [null, boolean] | readonly [{
+  unsubscribe(): Promise<readonly [{
     readonly type: "UnsubscribeError";
     readonly message: string;
-  }, null]>;
+  }, null] | readonly [null, boolean]>;
   isActive(): boolean;
 }
 //#endregion

package/dist/lib/pubsub/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../../../src/lib/pubsub/index.ts"],"mappings":";;;cAGa,MAAA,WAAiB,MAAA;EAAA,QACpB,OAAA;EAAA,QACA,YAAA;cAEW,OAAA,EAAS,aAAA;EAIf,OAAA,CAAQ,OAAA,EAAS,CAAA,GAAC,OAAA;IAAA;;;;;;EAuBlB,SAAA,CAAU,OAAA,EAAS,cAAA,CAAe,CAAA,IAAE,OAAA;IAAA;;;EAgCpC,WAAA,CAAA,GAAW,OAAA;IAAA;;;EAuBjB,QAAA,CAAA;AAAA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../../../src/lib/pubsub/index.ts"],"mappings":";;;cAGa,MAAA,WAAiB,MAAA;EAAA,QACpB,OAAA;EAAA,QACA,YAAA;EAAA,QACA,aAAA;EAAA,QACA,QAAA;EAAA,QACA,mBAAA;EAAA,QAGA,iBAAA;cAIW,OAAA,EAAS,aAAA;EAAA,QAId,SAAA;EAAA,QAaA,kBAAA;EAuDD,OAAA,CAAQ,OAAA,EAAS,CAAA,GAAC,OAAA;IAAA;;;;;;EAuBlB,SAAA,CAAU,OAAA,EAAS,cAAA,CAAe,CAAA,IAAE,OAAA,uBAAA,OAAA;IAAA;;;;;;EA8EpC,WAAA,CAAA,GAAW,OAAA;IAAA;;;EAmDjB,QAAA,CAAA;AAAA"}

package/dist/lib/pubsub/index.mjs

@@ -3,9 +3,45 @@ import { err, mightThrow, mightThrowSync, ok } from "../errors/index.mjs";
 var PubSub = class {
 	options;
 	isSubscribed = false;
+	nextHandlerId = 0;
+	handlers = /* @__PURE__ */ new Map();
+	unsubscribeInFlight = null;
+	subscribeInFlight = null;
 	constructor(options) {
 		this.options = options;
 	}
+	async onMessage(message, channel) {
+		const [parseError, parsed] = mightThrowSync(() => JSON.parse(message));
+		if (parseError) return;
+		if (!parsed) return;
+		const handlers = Array.from(this.handlers.values());
+		for (const handler of handlers) await mightThrow(Promise.resolve().then(() => handler(parsed, channel)));
+	}
+	async unsubscribeHandler(handlerId) {
+		const inFlightUnsubscribe = this.unsubscribeInFlight;
+		if (inFlightUnsubscribe) await inFlightUnsubscribe;
+		const handler = this.handlers.get(handlerId);
+		if (!handler) return err("UnsubscribeError", "Not subscribed");
+		this.handlers.delete(handlerId);
+		if (this.handlers.size > 0) return ok(true);
+		this.isSubscribed = false;
+		this.unsubscribeInFlight = mightThrow(this.options.subscriber.unsubscribe(this.options.channel));
+		const unsubscribeInFlight = this.unsubscribeInFlight;
+		if (!unsubscribeInFlight) {
+			this.handlers.set(handlerId, handler);
+			this.isSubscribed = true;
+			return err("UnsubscribeError", `Unable to unsubscribe from ${this.options.channel}`);
+		}
+		const [unsubscribeError] = await unsubscribeInFlight;
+		if (unsubscribeError) {
+			this.handlers.set(handlerId, handler);
+			this.isSubscribed = true;
+			this.unsubscribeInFlight = null;
+			return err("UnsubscribeError", `Unable to unsubscribe from ${this.options.channel}`);
+		}
+		this.unsubscribeInFlight = null;
+		return ok(true);
+	}
 	async publish(message) {
 		const [stringifyError, stringified] = mightThrowSync(() => JSON.stringify(message));
 		if (stringifyError || !stringified) return err("SerializationError", "Unable to serialize message");
@@ -14,33 +50,66 @@ var PubSub = class {
 		return ok(count);
 	}
 	async subscribe(handler) {
-		if (this.isActive()) return err("SubscribeError", "Already subscribed");
-		this.isSubscribed = true;
-		const wrappedHandler = async (message, channel) => {
-			const [parseError, parsed] = mightThrowSync(() => JSON.parse(message));
-			if (parseError) return;
-			if (!parsed) return;
-			await mightThrow(Promise.resolve(handler(parsed, channel)));
-		};
-		const [subscribeError, count] = await mightThrow(this.options.subscriber.subscribe(this.options.channel, wrappedHandler));
+		const inFlightUnsubscribe = this.unsubscribeInFlight;
+		if (inFlightUnsubscribe) await inFlightUnsubscribe;
+		const handlerId = this.nextHandlerId;
+		this.nextHandlerId += 1;
+		this.handlers.set(handlerId, handler);
+		if (this.isActive()) return ok(() => this.unsubscribeHandler(handlerId));
+		const inFlightSubscribe = this.subscribeInFlight;
+		if (inFlightSubscribe) {
+			const [inFlightError] = await inFlightSubscribe;
+			if (inFlightError || !this.isSubscribed) {
+				this.handlers.delete(handlerId);
+				return err("SubscribeError", `Unable to subscribe to ${this.options.channel}`);
+			}
+			return ok(() => this.unsubscribeHandler(handlerId));
+		}
+		this.subscribeInFlight = mightThrow(this.options.subscriber.subscribe(this.options.channel, async (message, channel) => this.onMessage(message, channel)));
+		const subscribeInFlight = this.subscribeInFlight;
+		if (!subscribeInFlight) {
+			this.handlers.delete(handlerId);
+			return err("SubscribeError", `Unable to subscribe to ${this.options.channel}`);
+		}
+		const [subscribeError, count] = await subscribeInFlight;
+		this.subscribeInFlight = null;
 		if (subscribeError) {
-			this.isSubscribed = false;
+			this.handlers.delete(handlerId);
 			return err("SubscribeError", `Unable to subscribe to ${this.options.channel}`);
 		}
-		return ok(count);
+		if (!count) {
+			this.handlers.delete(handlerId);
+			return err("SubscribeError", `Unable to subscribe to ${this.options.channel}`);
+		}
+		this.isSubscribed = true;
+		return ok(() => this.unsubscribeHandler(handlerId));
 	}
 	async unsubscribe() {
+		const inFlightUnsubscribe = this.unsubscribeInFlight;
+		if (inFlightUnsubscribe) await inFlightUnsubscribe;
 		if (!this.isActive()) return err("UnsubscribeError", "Not subscribed");
+		const handlers = new Map(this.handlers);
+		this.handlers.clear();
 		this.isSubscribed = false;
-		const [unsubscribeError] = await mightThrow(this.options.subscriber.unsubscribe(this.options.channel));
+		this.unsubscribeInFlight = mightThrow(this.options.subscriber.unsubscribe(this.options.channel));
+		const unsubscribeInFlight = this.unsubscribeInFlight;
+		if (!unsubscribeInFlight) {
+			this.handlers = handlers;
+			this.isSubscribed = true;
+			return err("UnsubscribeError", `Unable to unsubscribe from ${this.options.channel}`);
+		}
+		const [unsubscribeError] = await unsubscribeInFlight;
 		if (unsubscribeError) {
+			this.handlers = handlers;
 			this.isSubscribed = true;
+			this.unsubscribeInFlight = null;
 			return err("UnsubscribeError", `Unable to unsubscribe from ${this.options.channel}`);
 		}
+		this.unsubscribeInFlight = null;
 		return ok(true);
 	}
 	isActive() {
-		return this.isSubscribed;
+		return this.handlers.size > 0 && this.isSubscribed;
 	}
 };
 //#endregion

package/dist/lib/pubsub/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":[],"sources":["../../../src/lib/pubsub/index.ts"],"sourcesContent":["import { err, mightThrow, mightThrowSync, ok } from \"../errors/index.js\";\nimport type { MessageHandler, PubSubOptions } from \"./types.js\";\n\nexport class PubSub<T extends Record<string, unknown>> {\n  private options: PubSubOptions;\n  private isSubscribed = false;\n\n  public constructor(options: PubSubOptions) {\n    this.options = options;\n  }\n\n  public async publish(message: T) {\n    const [stringifyError, stringified] = mightThrowSync(() =>\n      JSON.stringify(message),\n    );\n\n    if (stringifyError || !stringified) {\n      return err(\"SerializationError\", \"Unable to serialize message\");\n    }\n\n    const [publishError, count] = await mightThrow(\n      this.options.publisher.publish(this.options.channel, stringified),\n    );\n\n    if (publishError) {\n      return err(\n        \"PublishError\",\n        `Unable to publish to ${this.options.channel}`,\n      );\n    }\n\n    return ok(count);\n  }\n\n  public async subscribe(handler: MessageHandler<T>) {\n    if (this.isActive()) {\n      return err(\"SubscribeError\", \"Already subscribed\");\n    }\n\n    this.isSubscribed = true;\n\n    const wrappedHandler = async (message: string, channel: string) => {\n      const [parseError, parsed] = mightThrowSync<T>(() => JSON.parse(message));\n\n      if (parseError) return;\n      if (!parsed) return;\n\n      await mightThrow(Promise.resolve(handler(parsed, channel)));\n    };\n\n    const [subscribeError, count] = await mightThrow(\n      this.options.subscriber.subscribe(this.options.channel, wrappedHandler),\n    );\n\n    if (subscribeError) {\n      this.isSubscribed = false;\n\n      return err(\n        \"SubscribeError\",\n        `Unable to subscribe to ${this.options.channel}`,\n      );\n    }\n\n    return ok(count);\n  }\n\n  public async unsubscribe() {\n    if (!this.isActive()) {\n      return err(\"UnsubscribeError\", \"Not subscribed\");\n    }\n\n    this.isSubscribed = false;\n\n    const [unsubscribeError] = await mightThrow(\n      this.options.subscriber.unsubscribe(this.options.channel),\n    );\n\n    if (unsubscribeError) {\n      this.isSubscribed = true;\n\n      return err(\n        \"UnsubscribeError\",\n        `Unable to unsubscribe from ${this.options.channel}`,\n      );\n    }\n\n    return ok(true);\n  }\n\n  public isActive() {\n    return this.isSubscribed;\n  }\n}\n"],"mappings":";;AAGA,IAAa,SAAb,MAAuD;CACrD;CACA,eAAuB;CAEvB,YAAmB,SAAwB;AACzC,OAAK,UAAU;;CAGjB,MAAa,QAAQ,SAAY;EAC/B,MAAM,CAAC,gBAAgB,eAAe,qBACpC,KAAK,UAAU,QAAQ,CACxB;AAED,MAAI,kBAAkB,CAAC,YACrB,QAAO,IAAI,sBAAsB,8BAA8B;EAGjE,MAAM,CAAC,cAAc,SAAS,MAAM,WAClC,KAAK,QAAQ,UAAU,QAAQ,KAAK,QAAQ,SAAS,YAAY,CAClE;AAED,MAAI,aACF,QAAO,IACL,gBACA,wBAAwB,KAAK,QAAQ,UACtC;AAGH,SAAO,GAAG,MAAM;;CAGlB,MAAa,UAAU,SAA4B;AACjD,MAAI,KAAK,UAAU,CACjB,QAAO,IAAI,kBAAkB,qBAAqB;AAGpD,OAAK,eAAe;EAEpB,MAAM,iBAAiB,OAAO,SAAiB,YAAoB;GACjE,MAAM,CAAC,YAAY,UAAU,qBAAwB,KAAK,MAAM,QAAQ,CAAC;AAEzE,OAAI,WAAY;AAChB,OAAI,CAAC,OAAQ;AAEb,SAAM,WAAW,QAAQ,QAAQ,QAAQ,QAAQ,QAAQ,CAAC,CAAC;;EAG7D,MAAM,CAAC,gBAAgB,SAAS,MAAM,WACpC,KAAK,QAAQ,WAAW,UAAU,KAAK,QAAQ,SAAS,eAAe,CACxE;AAED,MAAI,gBAAgB;AAClB,QAAK,eAAe;AAEpB,UAAO,IACL,kBACA,0BAA0B,KAAK,QAAQ,UACxC;;AAGH,SAAO,GAAG,MAAM;;CAGlB,MAAa,cAAc;AACzB,MAAI,CAAC,KAAK,UAAU,CAClB,QAAO,IAAI,oBAAoB,iBAAiB;AAGlD,OAAK,eAAe;EAEpB,MAAM,CAAC,oBAAoB,MAAM,WAC/B,KAAK,QAAQ,WAAW,YAAY,KAAK,QAAQ,QAAQ,CAC1D;AAED,MAAI,kBAAkB;AACpB,QAAK,eAAe;AAEpB,UAAO,IACL,oBACA,8BAA8B,KAAK,QAAQ,UAC5C;;AAGH,SAAO,GAAG,KAAK;;CAGjB,WAAkB;AAChB,SAAO,KAAK"}
+{"version":3,"file":"index.mjs","names":[],"sources":["../../../src/lib/pubsub/index.ts"],"sourcesContent":["import { err, mightThrow, mightThrowSync, ok } from \"../errors/index.js\";\nimport type { MessageHandler, PubSubOptions } from \"./types.js\";\n\nexport class PubSub<T extends Record<string, unknown>> {\n  private options: PubSubOptions;\n  private isSubscribed = false;\n  private nextHandlerId = 0;\n  private handlers = new Map<number, MessageHandler<T>>();\n  private unsubscribeInFlight: Promise<\n    readonly [null, unknown] | readonly [unknown, null]\n  > | null = null;\n  private subscribeInFlight: Promise<\n    readonly [null, number] | readonly [unknown, null]\n  > | null = null;\n\n  public constructor(options: PubSubOptions) {\n    this.options = options;\n  }\n\n  private async onMessage(message: string, channel: string) {\n    const [parseError, parsed] = mightThrowSync<T>(() => JSON.parse(message));\n\n    if (parseError) return;\n    if (!parsed) return;\n\n    const handlers = Array.from(this.handlers.values());\n\n    for (const handler of handlers) {\n      await mightThrow(Promise.resolve().then(() => handler(parsed, channel)));\n    }\n  }\n\n  private async unsubscribeHandler(handlerId: number) {\n    const inFlightUnsubscribe = this.unsubscribeInFlight;\n\n    if (inFlightUnsubscribe) {\n      await inFlightUnsubscribe;\n    }\n\n    const handler = this.handlers.get(handlerId);\n\n    if (!handler) {\n      return err(\"UnsubscribeError\", \"Not subscribed\");\n    }\n\n    this.handlers.delete(handlerId);\n\n    if (this.handlers.size > 0) {\n      return ok(true);\n    }\n\n    this.isSubscribed = false;\n\n    this.unsubscribeInFlight = mightThrow(\n      this.options.subscriber.unsubscribe(this.options.channel),\n    );\n\n    const unsubscribeInFlight = this.unsubscribeInFlight;\n\n    if (!unsubscribeInFlight) {\n      this.handlers.set(handlerId, handler);\n      this.isSubscribed = true;\n\n      return err(\n        \"UnsubscribeError\",\n        `Unable to unsubscribe from ${this.options.channel}`,\n      );\n    }\n\n    const [unsubscribeError] = await unsubscribeInFlight;\n\n    if (unsubscribeError) {\n      this.handlers.set(handlerId, handler);\n      this.isSubscribed = true;\n      this.unsubscribeInFlight = null;\n\n      return err(\n        \"UnsubscribeError\",\n        `Unable to unsubscribe from ${this.options.channel}`,\n      );\n    }\n\n    this.unsubscribeInFlight = null;\n\n    return ok(true);\n  }\n\n  public async publish(message: T) {\n    const [stringifyError, stringified] = mightThrowSync(() =>\n      JSON.stringify(message),\n    );\n\n    if (stringifyError || !stringified) {\n      return err(\"SerializationError\", \"Unable to serialize message\");\n    }\n\n    const [publishError, count] = await mightThrow(\n      this.options.publisher.publish(this.options.channel, stringified),\n    );\n\n    if (publishError) {\n      return err(\n        \"PublishError\",\n        `Unable to publish to ${this.options.channel}`,\n      );\n    }\n\n    return ok(count);\n  }\n\n  public async subscribe(handler: MessageHandler<T>) {\n    const inFlightUnsubscribe = this.unsubscribeInFlight;\n\n    if (inFlightUnsubscribe) {\n      await inFlightUnsubscribe;\n    }\n\n    const handlerId = this.nextHandlerId;\n\n    this.nextHandlerId += 1;\n    this.handlers.set(handlerId, handler);\n\n    if (this.isActive()) {\n      return ok(() => this.unsubscribeHandler(handlerId));\n    }\n\n    const inFlightSubscribe = this.subscribeInFlight;\n\n    if (inFlightSubscribe) {\n      const [inFlightError] = await inFlightSubscribe;\n\n      if (inFlightError || !this.isSubscribed) {\n        this.handlers.delete(handlerId);\n\n        return err(\n          \"SubscribeError\",\n          `Unable to subscribe to ${this.options.channel}`,\n        );\n      }\n\n      return ok(() => this.unsubscribeHandler(handlerId));\n    }\n\n    this.subscribeInFlight = mightThrow(\n      this.options.subscriber.subscribe(\n        this.options.channel,\n        async (message, channel) => this.onMessage(message, channel),\n      ),\n    );\n\n    const subscribeInFlight = this.subscribeInFlight;\n\n    if (!subscribeInFlight) {\n      this.handlers.delete(handlerId);\n\n      return err(\n        \"SubscribeError\",\n        `Unable to subscribe to ${this.options.channel}`,\n      );\n    }\n\n    const [subscribeError, count] = await subscribeInFlight;\n\n    this.subscribeInFlight = null;\n\n    if (subscribeError) {\n      this.handlers.delete(handlerId);\n\n      return err(\n        \"SubscribeError\",\n        `Unable to subscribe to ${this.options.channel}`,\n      );\n    }\n\n    if (!count) {\n      this.handlers.delete(handlerId);\n\n      return err(\n        \"SubscribeError\",\n        `Unable to subscribe to ${this.options.channel}`,\n      );\n    }\n\n    this.isSubscribed = true;\n\n    return ok(() => this.unsubscribeHandler(handlerId));\n  }\n\n  public async unsubscribe() {\n    const inFlightUnsubscribe = this.unsubscribeInFlight;\n\n    if (inFlightUnsubscribe) {\n      await inFlightUnsubscribe;\n    }\n\n    if (!this.isActive()) {\n      return err(\"UnsubscribeError\", \"Not subscribed\");\n    }\n\n    const handlers = new Map(this.handlers);\n\n    this.handlers.clear();\n\n    this.isSubscribed = false;\n\n    this.unsubscribeInFlight = mightThrow(\n      this.options.subscriber.unsubscribe(this.options.channel),\n    );\n\n    const unsubscribeInFlight = this.unsubscribeInFlight;\n\n    if (!unsubscribeInFlight) {\n      this.handlers = handlers;\n      this.isSubscribed = true;\n\n      return err(\n        \"UnsubscribeError\",\n        `Unable to unsubscribe from ${this.options.channel}`,\n      );\n    }\n\n    const [unsubscribeError] = await unsubscribeInFlight;\n\n    if (unsubscribeError) {\n      this.handlers = handlers;\n      this.isSubscribed = true;\n      this.unsubscribeInFlight = null;\n\n      return err(\n        \"UnsubscribeError\",\n        `Unable to unsubscribe from ${this.options.channel}`,\n      );\n    }\n\n    this.unsubscribeInFlight = null;\n\n    return ok(true);\n  }\n\n  public isActive() {\n    return this.handlers.size > 0 && this.isSubscribed;\n  }\n}\n"],"mappings":"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"}