@tachybase/utils 0.23.40 → 0.23.47

package/lib/registry.js

@@ -23,9 +23,8 @@ __export(registry_exports, {
 });
 module.exports = __toCommonJS(registry_exports);
 const _Registry = class _Registry {
-  map = /* @__PURE__ */ new Map();
-  options;
   constructor(options = { override: false }) {
+    this.map = /* @__PURE__ */ new Map();
     this.options = options;
   }
   register(key, value) {

package/lib/typedi/container-instance.class.js

@@ -2,7 +2,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
@@ -17,7 +16,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var container_instance_class_exports = {};
 __export(container_instance_class_exports, {
   ContainerInstance: () => ContainerInstance
@@ -29,42 +27,40 @@ var import_cannot_instantiate_value = require("./error/cannot-instantiate-value.
 var import_service_not_found = require("./error/service-not-found.error");
 var import_token = require("./token.class");
 const _ContainerInstance = class _ContainerInstance {
-  /** Container instance id. */
-  id;
-  /** Metadata for all registered services in this container. */
-  metadataMap = /* @__PURE__ */ new Map();
-  /**
-   * Services registered with 'multiple: true' are saved as simple services
-   * with a generated token and the mapping between the original ID and the
-   * generated one is stored here. This is handled like this to allow simplifying
-   * the inner workings of the service instance.
-   */
-  multiServiceIds = /* @__PURE__ */ new Map();
-  /**
-   * All registered handlers. The @Inject() decorator uses handlers internally to mark a property for injection.
-   **/
-  handlers = [];
-  static get default() {
-    if (!this._default) {
-      this._default = new _ContainerInstance("default");
-      import_container_registry.ContainerRegistry.registerContainer(this._default);
-    }
-    return this._default;
-  }
-  /**
-   * Indicates if the container has been disposed or not.
-   * Any function call should fail when called after being disposed.
-   *
-   * NOTE: Currently not in used
-   */
-  disposed = false;
   constructor(id) {
+    /** Metadata for all registered services in this container. */
+    this.metadataMap = /* @__PURE__ */ new Map();
+    /**
+     * Services registered with 'multiple: true' are saved as simple services
+     * with a generated token and the mapping between the original ID and the
+     * generated one is stored here. This is handled like this to allow simplifying
+     * the inner workings of the service instance.
+     */
+    this.multiServiceIds = /* @__PURE__ */ new Map();
+    /**
+     * All registered handlers. The @Inject() decorator uses handlers internally to mark a property for injection.
+     **/
+    this.handlers = [];
+    /**
+     * Indicates if the container has been disposed or not.
+     * Any function call should fail when called after being disposed.
+     *
+     * NOTE: Currently not in used
+     */
+    this.disposed = false;
     this.id = id;
     if (id !== "default") {
       import_container_registry.ContainerRegistry.registerContainer(this);
       this.handlers = _ContainerInstance.default.handlers || [];
     }
   }
+  static get default() {
+    if (!this._default) {
+      this._default = new _ContainerInstance("default");
+      import_container_registry.ContainerRegistry.registerContainer(this._default);
+    }
+    return this._default;
+  }
   /**
    * Checks if the service with given name or type is registered service container.
    * Optionally, parameters can be passed in case if instance is initialized in the container for the first time.
@@ -337,11 +333,6 @@ const _ContainerInstance = class _ContainerInstance {
   }
 };
 __name(_ContainerInstance, "ContainerInstance");
-/**
- * The default global container. By default services are registered into this
- * container when registered via `Container.set()` or `@Service` decorator.
- */
-__publicField(_ContainerInstance, "_default");
 let ContainerInstance = _ContainerInstance;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/typedi/container-registry.class.js

@@ -2,7 +2,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
@@ -17,7 +16,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var container_registry_class_exports = {};
 __export(container_registry_class_exports, {
   ContainerRegistry: () => ContainerRegistry
@@ -89,7 +87,7 @@ __name(_ContainerRegistry, "ContainerRegistry");
  *
  * This map doesn't contains the default container.
  */
-__publicField(_ContainerRegistry, "containerMap", /* @__PURE__ */ new Map());
+_ContainerRegistry.containerMap = /* @__PURE__ */ new Map();
 let ContainerRegistry = _ContainerRegistry;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/typedi/error/cannot-inject-value.error.js

@@ -26,8 +26,8 @@ const _CannotInjectValueError = class _CannotInjectValueError extends Error {
     super();
     this.target = target;
     this.propertyName = propertyName;
+    this.name = "CannotInjectValueError";
   }
-  name = "CannotInjectValueError";
   get message() {
     return `Cannot inject value into "${this.target.constructor.name}.${this.propertyName}". Please make sure you setup reflect-metadata properly and you don't use interfaces without service tokens as injection value.`;
   }

package/lib/typedi/error/cannot-instantiate-value.error.js

@@ -23,15 +23,12 @@ __export(cannot_instantiate_value_error_exports, {
 module.exports = __toCommonJS(cannot_instantiate_value_error_exports);
 var import_token = require("../token.class");
 const _CannotInstantiateValueError = class _CannotInstantiateValueError extends Error {
-  name = "CannotInstantiateValueError";
-  /** Normalized identifier name used in the error message. */
-  normalizedIdentifier = "<UNKNOWN_IDENTIFIER>";
-  get message() {
-    return `Cannot instantiate the requested value for the "${this.normalizedIdentifier}" identifier. The related metadata doesn't contain a factory or a type to instantiate.`;
-  }
   constructor(identifier) {
     var _a, _b;
     super();
+    this.name = "CannotInstantiateValueError";
+    /** Normalized identifier name used in the error message. */
+    this.normalizedIdentifier = "<UNKNOWN_IDENTIFIER>";
     if (typeof identifier === "string") {
       this.normalizedIdentifier = identifier;
     } else if (identifier instanceof import_token.Token) {
@@ -40,6 +37,9 @@ const _CannotInstantiateValueError = class _CannotInstantiateValueError extends
       this.normalizedIdentifier = identifier.name ? `MaybeConstructable<${identifier.name}>` : `MaybeConstructable<${(_b = identifier.prototype) == null ? void 0 : _b.name}>`;
     }
   }
+  get message() {
+    return `Cannot instantiate the requested value for the "${this.normalizedIdentifier}" identifier. The related metadata doesn't contain a factory or a type to instantiate.`;
+  }
 };
 __name(_CannotInstantiateValueError, "CannotInstantiateValueError");
 let CannotInstantiateValueError = _CannotInstantiateValueError;

package/lib/typedi/error/service-not-found.error.js

@@ -23,15 +23,12 @@ __export(service_not_found_error_exports, {
 module.exports = __toCommonJS(service_not_found_error_exports);
 var import_token = require("../token.class");
 const _ServiceNotFoundError = class _ServiceNotFoundError extends Error {
-  name = "ServiceNotFoundError";
-  /** Normalized identifier name used in the error message. */
-  normalizedIdentifier = "<UNKNOWN_IDENTIFIER>";
-  get message() {
-    return `Service with "${this.normalizedIdentifier}" identifier was not found in the container. Register it before usage via explicitly calling the "Container.set" function or using the "@Service()" decorator.`;
-  }
   constructor(identifier) {
     var _a, _b;
     super();
+    this.name = "ServiceNotFoundError";
+    /** Normalized identifier name used in the error message. */
+    this.normalizedIdentifier = "<UNKNOWN_IDENTIFIER>";
     if (typeof identifier === "string") {
       this.normalizedIdentifier = identifier;
     } else if (identifier instanceof import_token.Token) {
@@ -40,6 +37,9 @@ const _ServiceNotFoundError = class _ServiceNotFoundError extends Error {
       this.normalizedIdentifier = identifier.name ? `MaybeConstructable<${identifier.name}>` : `MaybeConstructable<${(_b = identifier.prototype) == null ? void 0 : _b.name}>`;
     }
   }
+  get message() {
+    return `Service with "${this.normalizedIdentifier}" identifier was not found in the container. Register it before usage via explicitly calling the "Container.set" function or using the "@Service()" decorator.`;
+  }
 };
 __name(_ServiceNotFoundError, "ServiceNotFoundError");
 let ServiceNotFoundError = _ServiceNotFoundError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/utils",
-  "version": "0.23.40",
+  "version": "0.23.47",
   "license": "Apache-2.0",
   "exports": {
     ".": {