@vicin/sigil 2.2.1 → 3.1.0

package/dist/index.mjs

@@ -1,9 +1,6 @@
-import { createId } from '@paralleldrive/cuid2';
-
-// src/core/options.ts
+// src/options.ts
 var OPTIONS = {
   labelValidation: null,
-  skipLabelInheritanceCheck: false,
   autofillLabels: true
 };
 var updateSigilOptions = (opts) => {
@@ -12,11 +9,6 @@ var updateSigilOptions = (opts) => {
       throw new Error("'updateSigilOptions.autofillLabels' must be boolean");
     OPTIONS.autofillLabels = opts.autofillLabels;
   }
-  if ("skipLabelInheritanceCheck" in opts) {
-    if (typeof opts.skipLabelInheritanceCheck !== "boolean")
-      throw new Error("'updateSigilOptions.skipLabelInheritanceCheck' must be boolean");
-    OPTIONS.skipLabelInheritanceCheck = opts.skipLabelInheritanceCheck;
-  }
   if ("labelValidation" in opts) {
     const val = opts.labelValidation;
     if (val !== null && typeof val !== "function" && !(val instanceof RegExp))
@@ -26,218 +18,191 @@ var updateSigilOptions = (opts) => {
 };
 var DEFAULT_LABEL_REGEX = /^@[\w-]+(?:\/[\w-]+)*\.[A-Z][A-Za-z0-9]*$/;
 
-// src/core/symbols.ts
-var __SIGIL__ = /* @__PURE__ */ Symbol.for("@Sigil.__SIGIL__");
-var __SIGIL_BASE__ = /* @__PURE__ */ Symbol.for("@Sigil.__SIGIL_BASE__");
-var __DECORATED__ = /* @__PURE__ */ Symbol.for("@Sigil.__DECORATED__");
-var __INHERITANCE_CHECKED__ = /* @__PURE__ */ Symbol.for("@Sigil.__INHERITANCE_CHECKED__");
-var __LABEL__ = /* @__PURE__ */ Symbol.for("@Sigil.__LABEL__");
-var __EFFECTIVE_LABEL__ = /* @__PURE__ */ Symbol.for("@Sigil.__EFFECTIVE_LABEL__");
-var __LABEL_LINEAGE__ = /* @__PURE__ */ Symbol.for("@Sigil.__LABEL_LINEAGE__");
-var __LABEL_SET__ = /* @__PURE__ */ Symbol.for("@Sigil.__LABEL_SET__");
-function decorateCtor(ctor, label, runtime) {
-  if (process.env.NODE_ENV !== "production") {
-    if (isDecorated(ctor))
-      throw new Error(
-        `Constructor ${ctor} is already decorated. if you are using 'withSigilTyped()' & '@WithSigil()' at the same time remove one of them.`
-      );
-  }
-  Object.defineProperty(ctor, __LABEL__, {
-    value: label,
-    configurable: true,
-    enumerable: false,
-    writable: false
-  });
-  if (!(runtime == null ? void 0 : runtime.isInheritanceCheck))
-    Object.defineProperty(ctor, __EFFECTIVE_LABEL__, {
-      value: label,
-      configurable: true,
-      enumerable: false,
-      writable: false
-    });
-  const parent = Object.getPrototypeOf(ctor);
-  const parentChain = parent && parent[__LABEL_LINEAGE__] ? parent[__LABEL_LINEAGE__] : [];
-  const ctorChain = (runtime == null ? void 0 : runtime.isMixin) && label !== "Sigil" ? ["Sigil", ...parentChain, label] : [...parentChain, label];
-  Object.defineProperty(ctor, __LABEL_LINEAGE__, {
-    value: ctorChain,
-    configurable: true,
-    enumerable: false,
-    writable: false
-  });
-  Object.defineProperty(ctor, __LABEL_SET__, {
-    value: new Set(ctorChain),
-    configurable: true,
-    enumerable: false,
-    writable: false
-  });
-  if (!(runtime == null ? void 0 : runtime.isInheritanceCheck)) markDecorated(ctor);
+// src/symbols.ts
+var __SIGIL__ = /* @__PURE__ */ Symbol.for("@vicin/sigil.__SIGIL__");
+var __LABEL__ = /* @__PURE__ */ Symbol.for("@vicin/sigil.__LABEL__");
+var __EFFECTIVE_LABEL__ = /* @__PURE__ */ Symbol.for("@vicin/sigil.__EFFECTIVE_LABEL__");
+var __LINEAGE__ = /* @__PURE__ */ Symbol.for("@vicin/sigil.__LINEAGE__");
+
+// src/helpers.ts
+var AUTO_LABEL_PREFEX = "@Sigil-auto";
+var handledCtors = /* @__PURE__ */ new WeakSet();
+function handleSigil(ctor, label, opts) {
+  if (handledCtors.has(ctor)) return;
+  handledCtors.add(ctor);
+  verifyLabel(ctor, label, opts);
+  const ancLabelsMap = handleAncestors(ctor, opts);
+  if (label && ancLabelsMap.has(label))
+    throw new Error(
+      `[Sigil Error] Attempt to assign label '${label}' to ${ctor.name} but label is already used by parent '${ancLabelsMap.get(label)}', Make sure that every class has a unique label`
+    );
+  sigilify(ctor, label != null ? label : generateRandomLabel(ctor));
 }
-function checkInheritance(ctor, opts) {
-  var _a, _b;
-  if (isInheritanceChecked(ctor) || ((_a = opts == null ? void 0 : opts.skipLabelInheritanceCheck) != null ? _a : OPTIONS.skipLabelInheritanceCheck))
-    return;
-  const ctors = [ctor];
-  let ancestor = Object.getPrototypeOf(ctor);
-  while (isSigilCtor(ancestor)) {
-    ctors.push(ancestor);
-    ancestor = Object.getPrototypeOf(ancestor);
+function handleAncestors(ctor, opts) {
+  var _a;
+  const autofillLabels = (_a = opts == null ? void 0 : opts.autofillLabels) != null ? _a : OPTIONS.autofillLabels;
+  const ancestors = [];
+  let a = Object.getPrototypeOf(ctor);
+  while (a && typeof a === "function" && a.prototype[__SIGIL__]) {
+    ancestors.unshift(a);
+    a = Object.getPrototypeOf(a);
   }
   const labelOwner = /* @__PURE__ */ new Map();
-  for (let i = ctors.length - 1; i >= 0; i--) {
-    const ctor2 = ctors[i];
-    if (!ctor2) continue;
-    let label = ctor2[__LABEL__];
-    if (labelOwner.has(label)) {
-      if (process.env.NODE_ENV !== "production") {
-        if (isDecorated(ctor2) || !((_b = opts == null ? void 0 : opts.autofillLabels) != null ? _b : OPTIONS.autofillLabels))
-          throw new Error(
-            `[Sigil Error] Class "${ctor2.name}" re-uses Sigil label "${label}" from ancestor "${labelOwner.get(label)}". Each Sigil subclass must use a unique label. Did you forget to use "WithSigil(newLabel)" on the subclass?`
-          );
-      }
-      label = generateRandomLabel();
-      decorateCtor(ctor2, label, { isInheritanceCheck: true });
-    }
-    labelOwner.set(label, ctor2.name);
-  }
-  markInheritanceChecked(ctor);
-}
-function verifyLabel(label, opts) {
-  var _a;
-  const labelValidation = (_a = opts == null ? void 0 : opts.labelValidation) != null ? _a : OPTIONS.labelValidation;
-  if (labelValidation) {
-    let valid;
-    if (labelValidation instanceof RegExp) valid = labelValidation.test(label);
-    else valid = labelValidation(label);
-    if (process.env.NODE_ENV !== "production") {
-      if (!valid)
+  for (const a2 of ancestors) {
+    const l = a2.prototype[__LABEL__];
+    if (labelOwner.has(l)) {
+      if (!autofillLabels)
         throw new Error(
-          `[Sigil] Invalid identity label "${label}". Make sure that supplied label matches validation regex or function.`
+          `[Sigil Error] Class '${a2.name}' is not sigilified with 'autofillLabels' setted to 'false', Make sure to sigilify all Sigil classes or set 'autofillLabels' to 'true'`
         );
+      sigilify(a2, generateRandomLabel(a2));
     }
+    labelOwner.set(labelOf(a2), a2.name);
   }
+  return labelOwner;
 }
-function generateRandomLabel() {
-  let label = createId();
-  return `@Sigil.auto-${label}`;
-}
-function markSigil(ctor) {
-  Object.defineProperty(ctor, __SIGIL__, {
-    value: true,
+function sigilify(ctor, label) {
+  var _a;
+  const sym = Symbol.for(label);
+  Object.defineProperty(ctor.prototype, __SIGIL__, {
+    value: sym,
     configurable: false,
     enumerable: false,
     writable: false
   });
-}
-function markSigilBase(ctor) {
-  Object.defineProperty(ctor, __SIGIL_BASE__, {
+  Object.defineProperty(ctor.prototype, sym, {
     value: true,
     configurable: false,
     enumerable: false,
     writable: false
   });
-}
-function markDecorated(ctor) {
-  Object.defineProperty(ctor, __DECORATED__, {
-    value: true,
+  Object.defineProperty(ctor.prototype, __LABEL__, {
+    value: label,
     configurable: false,
     enumerable: false,
     writable: false
   });
-}
-function markInheritanceChecked(ctor) {
-  Object.defineProperty(ctor, __INHERITANCE_CHECKED__, {
-    value: true,
+  if (!label.startsWith(AUTO_LABEL_PREFEX))
+    Object.defineProperty(ctor.prototype, __EFFECTIVE_LABEL__, {
+      value: label,
+      configurable: false,
+      enumerable: false,
+      writable: false
+    });
+  Object.defineProperty(ctor.prototype, __LINEAGE__, {
+    value: /* @__PURE__ */ new Set(["Sigil", ...(_a = lineageOf(ctor)) != null ? _a : [], label]),
     configurable: false,
     enumerable: false,
     writable: false
   });
+  const sigilSym = /* @__PURE__ */ Symbol.for("Sigil");
+  if (ctor.prototype[sigilSym] !== true)
+    Object.defineProperty(ctor.prototype, sigilSym, {
+      value: true,
+      configurable: false,
+      enumerable: false,
+      writable: false
+    });
 }
 function isSigilCtor(ctor) {
-  return typeof ctor === "function" && ctor[__SIGIL__] === true;
+  return typeof ctor === "function" && __SIGIL__ in ctor.prototype;
 }
 function isSigilInstance(inst) {
-  if (!inst || typeof inst !== "object") return false;
-  const ctor = getConstructor(inst);
-  return isSigilCtor(ctor);
+  return !!inst && typeof inst === "object" && __SIGIL__ in inst;
 }
-function isSigilBaseCtor(ctor) {
-  return Object.hasOwn(ctor, __SIGIL_BASE__);
+function hasOwnSigil(ctor) {
+  return typeof ctor === "function" && Object.hasOwn(ctor.prototype, __SIGIL__);
 }
-function isSigilBaseInstance(inst) {
-  if (!inst || typeof inst !== "object") return false;
-  const ctor = getConstructor(inst);
-  return isSigilBaseCtor(ctor);
+function labelOf(ctor) {
+  return ctor.prototype[__LABEL__];
 }
-function isDecorated(ctor) {
-  return Object.hasOwn(ctor, __DECORATED__);
+function lineageOf(ctor) {
+  return ctor.prototype[__LINEAGE__];
 }
-function isInheritanceChecked(ctor) {
-  return Object.hasOwn(ctor, __INHERITANCE_CHECKED__);
+function verifyLabel(ctor, label, opts) {
+  var _a, _b;
+  const labelValidation = (_a = opts == null ? void 0 : opts.labelValidation) != null ? _a : OPTIONS.labelValidation;
+  const autofillLabels = (_b = opts == null ? void 0 : opts.autofillLabels) != null ? _b : OPTIONS.autofillLabels;
+  if (!label) {
+    if (!autofillLabels)
+      throw new Error(
+        `[Sigil Error] Class '${ctor.name}' is not sigilified with 'autofillLabels' setted to 'false', Make sure to sigilify all Sigil classes or set 'autofillLabels' to 'true'`
+      );
+    return;
+  }
+  if (label.startsWith(AUTO_LABEL_PREFEX))
+    throw new Error(`'${AUTO_LABEL_PREFEX}' is a prefex reserved by the library`);
+  if (labelValidation) {
+    let valid;
+    if (labelValidation instanceof RegExp) valid = labelValidation.test(label);
+    else valid = labelValidation(label);
+    if (process.env.NODE_ENV !== "production") {
+      if (!valid)
+        throw new Error(
+          `[Sigil Error] Invalid identity label "${label}". Make sure that supplied label matches validation regex or function`
+        );
+    }
+  }
 }
-function getConstructor(obj) {
-  var _a, _b, _c;
-  if (!obj || typeof obj !== "object") return null;
-  return (_c = (_b = obj.constructor) != null ? _b : (_a = Object.getPrototypeOf(obj)) == null ? void 0 : _a.constructor) != null ? _c : null;
+if (!globalThis.__SigilabelCounter) globalThis.__SigilabelCounter = 0;
+function generateRandomLabel(ctor) {
+  const namePart = ctor && typeof ctor.name === "string" && ctor.name.length ? ctor.name : "C";
+  const counter = globalThis.__SigilabelCounter++;
+  const time = Date.now().toString(36);
+  const rand = Math.random().toString(36).slice(2, 6);
+  return `${AUTO_LABEL_PREFEX}:${namePart}:${time}:${counter.toString(36)}:${rand}`;
 }
 
-// src/core/mixin.ts
+// src/mixin.ts
 function Sigilify(Base, label, opts) {
-  if (isSigilCtor(Base)) throw new Error(`[Sigil Error] 'Sigilify(${label})' already sigilified.`);
-  let l;
-  if (label) {
-    verifyLabel(label, opts);
-    l = label;
-  } else l = generateRandomLabel();
+  if (hasOwnSigil(Base))
+    throw new Error(
+      `[Sigil Error] Class '${Base.name}' with label '${Base.SigilLabel}' is already sigilified`
+    );
   class Sigilified extends Base {
     /**
      * Class-level identity label constant for this sigil constructor.
      */
     static get SigilLabel() {
-      if (!isInheritanceChecked(this)) checkInheritance(this);
-      return this[__LABEL__];
+      var _a;
+      handleSigil(this);
+      return (_a = this.prototype) == null ? void 0 : _a[__LABEL__];
     }
     /**
      * Class-level human-readable label constant for this sigil constructor, last passed label in 'Sigil' chain by developer.
      */
     static get SigilEffectiveLabel() {
-      return this[__EFFECTIVE_LABEL__];
+      var _a;
+      handleSigil(this);
+      return (_a = this.prototype) == null ? void 0 : _a[__EFFECTIVE_LABEL__];
     }
     /**
-     * Copy of the linearized sigil type label chain for the current constructor.
+     * Linearized sigil type label chain for the current constructor.
      *
      * Useful for debugging and performing strict lineage comparisons.
      *
      * @returns An array of labels representing parent → child type labels.
      */
     static get SigilLabelLineage() {
-      var _a;
-      if (!isInheritanceChecked(this)) checkInheritance(this);
-      return [...(_a = this[__LABEL_LINEAGE__]) != null ? _a : []];
+      var _a, _b;
+      handleSigil(this);
+      return [...(_b = (_a = this.prototype) == null ? void 0 : _a[__LINEAGE__]) != null ? _b : []];
     }
     /**
-     * Copy of the sigil type label set for the current constructor.
-     *
-     * Useful for quick membership checks (O(1) lookups) and debugging.
+     * Sigil type label set for the current constructor.
+     * Useful for debugging.
      *
      * @returns A Readonly Set of labels that represent the type lineage.
      */
     static get SigilLabelSet() {
-      if (!isInheritanceChecked(this)) checkInheritance(this);
-      const set = /* @__PURE__ */ new Set();
-      for (const s of this[__LABEL_SET__]) set.add(s);
-      return set;
+      var _a;
+      handleSigil(this);
+      return (_a = this.prototype) == null ? void 0 : _a[__LINEAGE__];
     }
     constructor(...args) {
       super(...args);
-      if (Object.getPrototypeOf(this) !== new.target.prototype)
-        Object.setPrototypeOf(this, new.target.prototype);
-      const ctor = getConstructor(this);
-      if (!ctor) {
-        if (process.env.NODE_ENV !== "production")
-          throw new Error(`[Sigil Error] 'Sigilify(${label})' instance without constructor`);
-        return;
-      }
-      checkInheritance(ctor);
+      const ctor = new.target;
+      handleSigil(ctor);
     }
     /**
      * Runtime predicate indicating whether `obj` is an instance produced by a sigil class.
@@ -249,99 +214,86 @@ function Sigilify(Base, label, opts) {
       return isSigilInstance(obj);
     }
     /**
-     * Check whether `other` is (or inherits from) the type represented by the calling constructor.
+     * Check whether `other` is (or inherits from) the instance represented by the
+     * calling constructor.
      *
      * This replaces `instanceof` so that checks remain valid across bundles/realms
      * and when subclassing.
      *
-     * @typeParam T - The calling constructor type (narrowing the returned instance type).
-     * @param this - The constructor performing the check.
+     * @typeParam T - The specific sigil constructor (`this`).
+     * @param this - The constructor performing the type check.
      * @param other - The object to test.
-     * @returns `true` if `other` is an instance of this type or a subtype.
+     * @returns A type guard asserting `other` is an instance of the constructor.
      */
     static isOfType(other) {
       var _a;
-      if (!isSigilInstance(other)) return false;
-      const otherSet = (_a = getConstructor(other)) == null ? void 0 : _a[__LABEL_SET__];
-      const thisType = this[__LABEL__];
-      return !!otherSet && otherSet.has(thisType);
+      handleSigil(this);
+      if (other == null || typeof other !== "object") return false;
+      return other[(_a = this.prototype) == null ? void 0 : _a[__SIGIL__]] === true;
     }
     /**
-     * Strict lineage check: compares the type label lineage arrays element-by-element.
+     * Check whether `other` is exactly the same instance represented by the
+     * calling constructor.
      *
-     * @typeParam T - The calling constructor type.
-     * @param this - The constructor performing the check.
+     * @typeParam T - The specific sigil constructor (`this`).
+     * @param this - The constructor performing the type check.
      * @param other - The object to test.
-     * @returns `true` if `other` has an identical lineage up to the length of this constructor's lineage.
+     * @returns A type guard asserting `other` is an instance of the constructor.
      */
-    static isOfTypeStrict(other) {
-      var _a;
-      if (!isSigilInstance(other)) return false;
-      const otherLineage = (_a = getConstructor(other)) == null ? void 0 : _a[__LABEL_LINEAGE__];
-      const thisLineage = this[__LABEL_LINEAGE__];
-      return !!otherLineage && thisLineage.every((s, i) => s === otherLineage[i]);
+    static isExactType(other) {
+      var _a, _b, _c;
+      handleSigil(this);
+      if (other == null || typeof other !== "object") return false;
+      if (((_a = this.prototype) == null ? void 0 : _a[__LINEAGE__].size) !== ((_b = other[__LINEAGE__]) == null ? void 0 : _b.size))
+        return false;
+      return other[(_c = this.prototype) == null ? void 0 : _c[__SIGIL__]] === true;
     }
     /**
-     * Check whether `other` is (or inherits from) the type instance.
+     * Check whether `other` is (or inherits from) the instance represented by the
+     * calling constructor.
      *
-     * Allows 'instanceof' like checks but in instances.
+     * This replaces `instanceof` so that checks remain valid across bundles/realms
+     * and when subclassing.
      *
-     * @typeParam T - The instance type.
-     * @param this - The instance performing the check.
+     * @typeParam T - The specific sigil constructor (`this`).
+     * @param this - The constructor performing the type check.
      * @param other - The object to test.
-     * @returns `true` if `other` is the same instance of this type or a subtype.
+     * @returns A type guard asserting `other` is an instance of the constructor.
      */
     isOfType(other) {
-      var _a;
-      if (!isSigilInstance(other)) return false;
-      const otherSet = (_a = getConstructor(other)) == null ? void 0 : _a[__LABEL_SET__];
-      const thisType = getConstructor(this)[__LABEL__];
-      return !!otherSet && otherSet.has(thisType);
+      if (other == null || typeof other !== "object") return false;
+      return other[this[__SIGIL__]] === true;
     }
     /**
-     * Strict lineage check: compares the type label lineage arrays element-by-element.
+     * Check whether `other` is exactly the same instance represented by the
+     * calling constructor.
      *
-     * Allows 'instanceof' like checks but in instances.
-     *
-     * @typeParam T - The instance type.
-     * @param this - The instance performing the check.
+     * @typeParam T - The specific sigil constructor (`this`).
+     * @param this - The constructor performing the type check.
      * @param other - The object to test.
-     * @returns `true` if `other` has an identical lineage up to the length of this instance's lineage.
+     * @returns A type guard asserting `other` is an instance of the constructor.
      */
-    isOfTypeStrict(other) {
-      var _a, _b;
-      if (!isSigilInstance(other)) return false;
-      const otherLineage = (_a = getConstructor(other)) == null ? void 0 : _a[__LABEL_LINEAGE__];
-      const thisLineage = (_b = getConstructor(this)) == null ? void 0 : _b[__LABEL_LINEAGE__];
-      return !!otherLineage && thisLineage.every((s, i) => s === otherLineage[i]);
+    isExactType(other) {
+      var _a;
+      if (other == null || typeof other !== "object") return false;
+      if (this[__LINEAGE__].size !== ((_a = other[__LINEAGE__]) == null ? void 0 : _a.size)) return false;
+      return other[this[__SIGIL__]] === true;
     }
     /**
      * Returns the identity sigil label of this instance's constructor.
      *
-     * @returns The label string if passed (e.g. '@scope/pkg.ClassName'), random label if not passed (e.g. '@Sigil.auto-dq62ib6jnvmmlfbjhxh2937h') or '@Sigil.unknown' if constructor is missing.
+     * @returns The label string if passed (e.g. '@scope/pkg.ClassName'), random label if not passed (e.g. '@Sigil-auto:ClassName:mm2gkdwn:0:g1sq').
      */
     getSigilLabel() {
-      const ctor = getConstructor(this);
-      if (!ctor) {
-        if (process.env.NODE_ENV !== "production")
-          throw new Error(`[Sigil Error] Sigil class instance without constructor`);
-        return "@Sigil.unknown";
-      }
-      return ctor.SigilLabel;
+      return this[__LABEL__];
     }
     /**
      * Returns the human-readable sigil label of this instance's constructor.
      *
-     * @returns The last passed label string (e.g. '@scope/pkg.ClassName') or '@Sigil.unknown' if constructor is missing.
+     * @returns The last passed label string (e.g. '@scope/pkg.ClassName').
      */
     getSigilEffectiveLabel() {
-      const ctor = getConstructor(this);
-      if (!ctor) {
-        if (process.env.NODE_ENV !== "production")
-          throw new Error(`[Sigil Error] Sigil class instance without constructor`);
-        return "@Sigil.unknown";
-      }
-      return ctor.SigilEffectiveLabel;
+      return this[__EFFECTIVE_LABEL__];
     }
     /**
      * Returns a copy of the sigil type label lineage for this instance's constructor.
@@ -349,91 +301,69 @@ function Sigilify(Base, label, opts) {
      * @returns readonly array of labels representing the type lineage.
      */
     getSigilLabelLineage() {
-      const ctor = getConstructor(this);
-      if (!ctor) {
-        if (process.env.NODE_ENV !== "production")
-          throw new Error(`[Sigil Error] Sigil class instance without constructor`);
-        return ["@Sigil.unknown"];
-      }
-      return ctor.SigilLabelLineage;
+      return [...this[__LINEAGE__]];
     }
     /**
-     * Returns a readonly copy of the sigil type label set for this instance's constructor.
+     * Returns a copy of the sigil type label lineage set for this instance's constructor.
      *
-     * @returns A Readonly Set of labels representing the type lineage for O(1) membership tests.
+     * @returns readonly array of labels representing the type lineage.
      */
     getSigilLabelSet() {
-      const ctor = getConstructor(this);
-      if (!ctor) {
-        if (process.env.NODE_ENV !== "production")
-          throw new Error(`[Sigil Error] Sigil class instance without constructor`);
-        return /* @__PURE__ */ new Set(["@Sigil.unknown"]);
-      }
-      return ctor.SigilLabelSet;
+      return this[__LINEAGE__];
     }
   }
-  decorateCtor(Sigilified, l, { isMixin: true });
-  markSigil(Sigilified);
-  markSigilBase(Sigilified);
+  handleSigil(Sigilified, label, opts);
   return Sigilified;
 }
 function SigilifyAbstract(Base, label, opts) {
-  if (isSigilCtor(Base)) throw new Error(`[Sigil Error] 'Sigilify(${label})' already sigilified.`);
-  let l;
-  if (label) {
-    verifyLabel(label, opts);
-    l = label;
-  } else l = generateRandomLabel();
+  if (hasOwnSigil(Base))
+    throw new Error(
+      `[Sigil Error] Base class '${Base.name}' with label '${Base.SigilLabel}' is already sigilified`
+    );
   class Sigilified extends Base {
     /**
      * Class-level identity label constant for this sigil constructor.
      */
     static get SigilLabel() {
-      if (!isInheritanceChecked(this)) checkInheritance(this);
-      return this[__LABEL__];
+      var _a;
+      handleSigil(this);
+      return (_a = this.prototype) == null ? void 0 : _a[__LABEL__];
     }
     /**
      * Class-level human-readable label constant for this sigil constructor, last passed label in 'Sigil' chain by developer.
      */
     static get SigilEffectiveLabel() {
-      return this[__EFFECTIVE_LABEL__];
+      var _a;
+      handleSigil(this);
+      return (_a = this.prototype) == null ? void 0 : _a[__EFFECTIVE_LABEL__];
     }
     /**
-     * Copy of the linearized sigil type label chain for the current constructor.
+     * Linearized sigil type label chain for the current constructor.
      *
      * Useful for debugging and performing strict lineage comparisons.
      *
      * @returns An array of labels representing parent → child type labels.
      */
     static get SigilLabelLineage() {
-      var _a;
-      if (!isInheritanceChecked(this)) checkInheritance(this);
-      return [...(_a = this[__LABEL_LINEAGE__]) != null ? _a : []];
+      var _a, _b;
+      handleSigil(this);
+      return [...(_b = (_a = this.prototype) == null ? void 0 : _a[__LINEAGE__]) != null ? _b : []];
     }
     /**
-     * Copy of the sigil type label set for the current constructor.
-     *
-     * Useful for quick membership checks (O(1) lookups) and debugging.
+     * Sigil type label set for the current constructor.
+     * Useful for debugging.
      *
      * @returns A Readonly Set of labels that represent the type lineage.
      */
     static get SigilLabelSet() {
-      if (!isInheritanceChecked(this)) checkInheritance(this);
-      const set = /* @__PURE__ */ new Set();
-      for (const s of this[__LABEL_SET__]) set.add(s);
-      return set;
+      var _a;
+      handleSigil(this);
+      return (_a = this.prototype) == null ? void 0 : _a[__LINEAGE__];
     }
     constructor(...args) {
       super(...args);
-      if (Object.getPrototypeOf(this) !== new.target.prototype)
-        Object.setPrototypeOf(this, new.target.prototype);
-      const ctor = getConstructor(this);
-      if (!ctor) {
-        if (process.env.NODE_ENV !== "production")
-          throw new Error(`[Sigil Error] 'Sigilify(${label})' instance without constructor`);
-        return;
-      }
-      checkInheritance(ctor);
+      const ctor = new.target;
+      handleSigil(ctor);
     }
     /**
      * Runtime predicate indicating whether `obj` is an instance produced by a sigil class.
@@ -445,107 +375,84 @@ function SigilifyAbstract(Base, label, opts) {
       return isSigilInstance(obj);
     }
     /**
-     * Check whether `other` is (or inherits from) the type represented by the calling constructor.
-     *
-     * Implementation detail:
-     * - Uses the other instance's `__LABEL_SET__` for O(1) membership test.
-     * - O(1) and reliable as long as `OPTIONS.skipLabelInheritanceCheck` is `false`.
+     * Check whether `other` is (or inherits from) the instance represented by the
+     * calling constructor.
      *
      * This replaces `instanceof` so that checks remain valid across bundles/realms
      * and when subclassing.
      *
-     * @typeParam T - The calling constructor type (narrowing the returned instance type).
-     * @param this - The constructor performing the check.
+     * @typeParam T - The specific sigil constructor (`this`).
+     * @param this - The constructor performing the type check.
      * @param other - The object to test.
-     * @returns `true` if `other` is an instance of this type or a subtype.
+     * @returns A type guard asserting `other` is an instance of the constructor.
      */
     static isOfType(other) {
       var _a;
-      if (!isSigilInstance(other)) return false;
-      const otherSet = (_a = getConstructor(other)) == null ? void 0 : _a[__LABEL_SET__];
-      const thisType = this[__LABEL__];
-      return !!otherSet && otherSet.has(thisType);
+      if (other == null || typeof other !== "object") return false;
+      return other[(_a = this.prototype) == null ? void 0 : _a[__SIGIL__]] === true;
     }
     /**
-     * Strict lineage check: compares the type label lineage arrays element-by-element.
+     * Check whether `other` is exactly the same instance represented by the
+     * calling constructor.
      *
-     * Implementation detail:
-     * - Works in O(n) time where n is the depth of the lineage.
-     * - Reliable when `OPTIONS.skipLabelInheritanceCheck` is `false`.
-     *
-     * @typeParam T - The calling constructor type.
-     * @param this - The constructor performing the check.
+     * @typeParam T - The specific sigil constructor (`this`).
+     * @param this - The constructor performing the type check.
      * @param other - The object to test.
-     * @returns `true` if `other` has an identical lineage up to the length of this constructor's lineage.
+     * @returns A type guard asserting `other` is an instance of the constructor.
      */
-    static isOfTypeStrict(other) {
-      var _a;
-      if (!isSigilInstance(other)) return false;
-      const otherLineage = (_a = getConstructor(other)) == null ? void 0 : _a[__LABEL_LINEAGE__];
-      const thisLineage = this[__LABEL_LINEAGE__];
-      return !!otherLineage && thisLineage.every((s, i) => s === otherLineage[i]);
+    static isExactType(other) {
+      var _a, _b, _c;
+      if (other == null || typeof other !== "object") return false;
+      if (((_a = this.prototype) == null ? void 0 : _a[__LINEAGE__].size) !== ((_b = other[__LINEAGE__]) == null ? void 0 : _b.size))
+        return false;
+      return other[(_c = this.prototype) == null ? void 0 : _c[__SIGIL__]] === true;
     }
     /**
-     * Check whether `other` is (or inherits from) the type instance.
+     * Check whether `other` is (or inherits from) the instance represented by the
+     * calling constructor.
      *
-     * Allows 'instanceof' like checks but in instances.
+     * This replaces `instanceof` so that checks remain valid across bundles/realms
+     * and when subclassing.
      *
-     * @typeParam T - The instance type.
-     * @param this - The instance performing the check.
+     * @typeParam T - The specific sigil constructor (`this`).
+     * @param this - The constructor performing the type check.
      * @param other - The object to test.
-     * @returns `true` if `other` is the same instance of this type or a subtype.
+     * @returns A type guard asserting `other` is an instance of the constructor.
      */
     isOfType(other) {
-      var _a;
-      if (!isSigilInstance(other)) return false;
-      const otherSet = (_a = getConstructor(other)) == null ? void 0 : _a[__LABEL_SET__];
-      const thisType = getConstructor(this)[__LABEL__];
-      return !!otherSet && otherSet.has(thisType);
+      if (other == null || typeof other !== "object") return false;
+      return other[this[__SIGIL__]] === true;
     }
     /**
-     * Strict lineage check: compares the type label lineage arrays element-by-element.
+     * Check whether `other` is exactly the same instance represented by the
+     * calling constructor.
      *
-     * Allows 'instanceof' like checks but in instances.
-     *
-     * @typeParam T - The instance type.
-     * @param this - The instance performing the check.
+     * @typeParam T - The specific sigil constructor (`this`).
+     * @param this - The constructor performing the type check.
      * @param other - The object to test.
-     * @returns `true` if `other` has an identical lineage up to the length of this instance's lineage.
+     * @returns A type guard asserting `other` is an instance of the constructor.
      */
-    isOfTypeStrict(other) {
-      var _a, _b;
-      if (!isSigilInstance(other)) return false;
-      const otherLineage = (_a = getConstructor(other)) == null ? void 0 : _a[__LABEL_LINEAGE__];
-      const thisLineage = (_b = getConstructor(this)) == null ? void 0 : _b[__LABEL_LINEAGE__];
-      return !!otherLineage && thisLineage.every((s, i) => s === otherLineage[i]);
+    isExactType(other) {
+      var _a;
+      if (other == null || typeof other !== "object") return false;
+      if (this[__LINEAGE__].size !== ((_a = other[__LINEAGE__]) == null ? void 0 : _a.size)) return false;
+      return other[this[__SIGIL__]] === true;
     }
     /**
      * Returns the identity sigil label of this instance's constructor.
      *
-     * @returns The label string if passed (e.g. '@scope/pkg.ClassName'), random label if not passed (e.g. '@Sigil.auto-dq62ib6jnvmmlfbjhxh2937h') or '@Sigil.unknown' if constructor is missing.
+     * @returns The label string if passed (e.g. '@scope/pkg.ClassName'), random label if not passed (e.g. '@Sigil-auto:ClassName:mm2gkdwn:0:g1sq').
      */
     getSigilLabel() {
-      const ctor = getConstructor(this);
-      if (!ctor) {
-        if (process.env.NODE_ENV !== "production")
-          throw new Error(`[Sigil Error] Sigil class instance without constructor`);
-        return "@Sigil.unknown";
-      }
-      return ctor.SigilLabel;
+      return this[__LABEL__];
     }
     /**
      * Returns the human-readable sigil label of this instance's constructor.
      *
-     * @returns The last passed label string (e.g. '@scope/pkg.ClassName') or '@Sigil.unknown' if constructor is missing.
+     * @returns The last passed label string (e.g. '@scope/pkg.ClassName').
      */
     getSigilEffectiveLabel() {
-      const ctor = getConstructor(this);
-      if (!ctor) {
-        if (process.env.NODE_ENV !== "production")
-          throw new Error(`[Sigil Error] Sigil class instance without constructor`);
-        return "@Sigil.unknown";
-      }
-      return ctor.SigilEffectiveLabel;
+      return this[__EFFECTIVE_LABEL__];
     }
     /**
      * Returns a copy of the sigil type label lineage for this instance's constructor.
@@ -553,92 +460,57 @@ function SigilifyAbstract(Base, label, opts) {
      * @returns readonly array of labels representing the type lineage.
      */
     getSigilLabelLineage() {
-      const ctor = getConstructor(this);
-      if (!ctor) {
-        if (process.env.NODE_ENV !== "production")
-          throw new Error(`[Sigil Error] Sigil class instance without constructor`);
-        return ["@Sigil.unknown"];
-      }
-      return ctor.SigilLabelLineage;
+      return [...this[__LINEAGE__]];
     }
     /**
-     * Returns a readonly copy of the sigil type label set for this instance's constructor.
+     * Returns a copy of the sigil type label lineage set for this instance's constructor.
      *
-     * @returns A Readonly Set of labels representing the type lineage for O(1) membership tests.
+     * @returns readonly array of labels representing the type lineage.
      */
     getSigilLabelSet() {
-      const ctor = getConstructor(this);
-      if (!ctor) {
-        if (process.env.NODE_ENV !== "production")
-          throw new Error(`[Sigil Error] Sigil class instance without constructor`);
-        return /* @__PURE__ */ new Set(["@Sigil.unknown"]);
-      }
-      return ctor.SigilLabelSet;
+      return this[__LINEAGE__];
     }
   }
-  decorateCtor(Sigilified, l, { isMixin: true });
-  markSigil(Sigilified);
-  markSigilBase(Sigilified);
+  handleSigil(Sigilified, label, opts);
   return Sigilified;
 }
 
-// src/core/classes.ts
+// src/classes.ts
 var Sigil = Sigilify(class {
 }, "Sigil");
 var SigilError = Sigilify(Error, "SigilError");
 
-// src/core/decorator.ts
+// src/decorator.ts
 function WithSigil(label, opts) {
-  let l;
-  if (label) {
-    verifyLabel(label, opts);
-    l = label;
-  } else l = generateRandomLabel();
   return function(value, context) {
     if (context.kind !== "class") return;
     if (!isSigilCtor(value))
       throw new Error(
         `[Sigil Error] 'WithSigil' decorator accept only Sigil classes but used on class ${value.name}`
       );
-    decorateCtor(value, l);
-    checkInheritance(value, opts);
+    if (hasOwnSigil(value))
+      throw new Error(
+        `[Sigil Error] Class '${value.name}' with label '${value.SigilLabel}' is already sigilified`
+      );
+    handleSigil(value, label, opts);
   };
 }
 
-// src/core/hof.ts
+// src/hof.ts
 function withSigil(Class, label, opts) {
   var _a;
   if (!isSigilCtor(Class))
     throw new Error(
       `[Sigil Error] 'withSigil' HOF accept only Sigil classes  but used on class ${(_a = Class == null ? void 0 : Class.name) != null ? _a : "unknown"}`
     );
-  let l;
-  if (label) {
-    verifyLabel(label, opts);
-    l = label;
-  } else l = generateRandomLabel();
-  const ctor = Class;
-  decorateCtor(ctor, l);
-  checkInheritance(ctor, opts);
-  return Class;
-}
-function withSigilTyped(Class, label, opts) {
-  var _a;
-  if (!isSigilCtor(Class))
+  if (hasOwnSigil(Class))
     throw new Error(
-      `[Sigil Error] 'withSigilTyped' HOF accept only Sigil classes but used on class ${(_a = Class == null ? void 0 : Class.name) != null ? _a : "unknown"}`
+      `[Sigil Error] Class '${Class.name}' with label '${Class.SigilLabel}' is already sigilified`
     );
-  let l;
-  if (label) {
-    verifyLabel(label, opts);
-    l = label;
-  } else l = generateRandomLabel();
-  const ctor = Class;
-  decorateCtor(ctor, l);
-  checkInheritance(ctor, opts);
+  handleSigil(Class, label, opts);
   return Class;
 }
 
-export { DEFAULT_LABEL_REGEX, Sigil, SigilError, Sigilify, SigilifyAbstract, WithSigil, isDecorated, isInheritanceChecked, isSigilBaseCtor, isSigilBaseInstance, isSigilCtor, isSigilInstance, updateSigilOptions, withSigil, withSigilTyped };
+export { DEFAULT_LABEL_REGEX, Sigil, SigilError, Sigilify, SigilifyAbstract, WithSigil, isSigilCtor, isSigilInstance, updateSigilOptions, withSigil };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map