@praxisjs/di 1.3.13 → 1.3.14

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @praxisjs/di
 
+## 1.3.14
+
+### Patch Changes
+
+- 75115a9: Decorated fields are defined by their innermost decorator. With `@praxisjs/vite-plugin`, `@State()`, `@Prop()`, every built-in field decorator and `createFieldDecorator` bindings install their property directly with the field's initial value instead of replacing a plain value, which kept every instance in V8's slow dictionary mode. New `addClaimableInitializer(context, init)` export for field decorators written against the TC39 API.
+- 75115a9: Field decorators throw a `TypeError` when the class is defined if they decorate an `accessor`, naming the member to fix. Covers `@State()`, `@Prop()`, every built-in field decorator and `createFieldDecorator` bindings. New `assertFieldContext(context, label?)` export for field decorators written against the TC39 API directly.
+- 75115a9: Published packages no longer contain their tests: package builds compile `src` without `src/**/__tests__` (through a `tsconfig.build.json`), and each package's `files` leaves test sources and stale compiled tests out of the tarball. `pnpm typecheck` still type-checks the tests.
+- 75115a9: Performance pass and bug fixes across the feature packages.
+  - `@praxisjs/router`: static paths are matched through an index and dynamic ones with a single regex run; `RouterView` keeps a shared layout mounted across navigations; new `router.isActive(path)` (used by `Link`, so a navigation re-evaluates only the links whose state changed) and `router.destroy()`. Fixes regex characters in route paths (`.`, `(`, `+`...) being treated as patterns, and a router replaced by `createRouter()` still reacting to `popstate`. `@Route` no longer wraps the class, and the field decorators share one accessor.
+  - `@praxisjs/store`: plugin-wrapped actions keep their identity across reads, extensions are bound once, and writing a field inside an effect no longer subscribes the effect to it. `constructor` and inherited `Object.prototype` members are no longer reported as actions. `@Store` caches the singleton.
+  - `@praxisjs/motion`: `@Tween` and `@Spring` share one accessor per field and no longer start a frame loop at construction; `tween()`/`spring()` react to target writes without an effect. Fixes `reset()` leaving a tween marked as playing.
+  - `@praxisjs/di`: cached singletons and tokens resolve without allocating, `@Injectable` registers the class itself instead of a subclass, and a dependency cycle through `inject()` calls in constructors now reports `[DI] Circular dependency detected` instead of overflowing the stack.
+  - `@praxisjs/fsm`: `send()` and `reset()` no longer subscribe the calling effect to the machine state, transitions allocate nothing per send, and `@StateMachine` shares one accessor.
+  - `@praxisjs/head`: tag diffing without `JSON.stringify` or a full `<head>` query per update; updating or removing an entry below the top one leaves the document alone, and removing an unknown id no longer resets the title.
+  - `@praxisjs/content`: each entry is loaded, parsed and rendered once and shared by `getCollection`, `getPage` and `getEntry`; `getEntry` looks the slug up in an index; schema defaults are built once per class.
+
+- 75115a9: Smaller production bundles. The framework and feature packages are marked `"sideEffects": false`, so bundlers leave out the modules an app does not use (`For`/`Index` and `selector()` were kept in every bundle by their shape keepers). `@praxisjs/core`'s graph gates its observer instrumentation on a boolean that minifiers fold away when no observer is ever installed. `@praxisjs/runtime` passes `Index`'s positional update to the list view, so `For`-only apps leave it out, and builds its event prop table from camel-case names. `@praxisjs/devtools` is built one file per module and its decorators check `process.env.NODE_ENV` inline, so `@Trace`/`@Debug` in production code no longer bundle the registry and the panel. `@praxisjs/vite-plugin` serves TypeScript's decorator helpers and the claimed fields' helper from one virtual module (`virtual:praxisjs/decorators`) instead of writing them into every decorated file, and replaces the identical copies `tsc` wrote into ES module libraries.
+- Updated dependencies [75115a9]
+- Updated dependencies [75115a9]
+- Updated dependencies [75115a9]
+- Updated dependencies [75115a9]
+- Updated dependencies [75115a9]
+- Updated dependencies [75115a9]
+- Updated dependencies [75115a9]
+- Updated dependencies [75115a9]
+- Updated dependencies [75115a9]
+- Updated dependencies [75115a9]
+- Updated dependencies [75115a9]
+  - @praxisjs/decorators@2.0.0
+  - @praxisjs/core@2.3.0
+
 ## 1.3.13
 
 ### Patch Changes

package/dist/container.d.ts

@@ -21,7 +21,7 @@ export declare class Container {
     register<T>(target: Constructor<T>, options?: InjectableOptions): this;
     registerValue<T>(token: Token<T>, value: T): this;
     registerFactory<T>(token: Token<T>, factory: (container: Container) => T): this;
-    resolve<T>(target: Constructor<T> | Token<T>, resolutionStack?: Set<Constructor<unknown> | Token<unknown>>): T;
+    resolve<T>(target: Constructor<T> | Token<T>, resolutionStack?: Set<Constructor | Token<unknown>>): T;
     private instantiate;
     createChild(): Container;
 }

package/dist/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG,WAAW,GAAG,WAAW,CAAC;AAE9C,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAGD,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,OAAO,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAEjE,qBAAa,KAAK,CAAC,EAAE;IACnB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;gBACjB,WAAW,EAAE,MAAM;IAG/B,QAAQ;CAGT;AAED,wBAAgB,KAAK,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAEtD;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoD;IAC7E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAY;gBAExB,MAAM,CAAC,EAAE,SAAS;IAI9B,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,GAAE,iBAAsB,GAAG,IAAI;IAQ1E,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI;IAKjD,eAAe,CAAC,CAAC,EACf,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EACf,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,CAAC,GACnC,IAAI;IAKP,OAAO,CAAC,CAAC,EACP,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACjC,eAAe,6CAA0C,GACxD,CAAC;IAwCJ,OAAO,CAAC,WAAW;IAWnB,WAAW,IAAI,SAAS;CAGzB;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG,WAAW,GAAG,WAAW,CAAC;AAE9C,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAGD,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,OAAO,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAEjE,qBAAa,KAAK,CAAC,EAAE;IACnB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;gBACjB,WAAW,EAAE,MAAM;IAG/B,QAAQ;CAGT;AAED,wBAAgB,KAAK,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAEtD;AAMD,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoD;IAC7E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAY;gBAExB,MAAM,CAAC,EAAE,SAAS;IAI9B,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,GAAE,iBAAsB,GAAG,IAAI;IAQ1E,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI;IAKjD,eAAe,CAAC,CAAC,EACf,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EACf,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,CAAC,GACnC,IAAI;IAKP,OAAO,CAAC,CAAC,EACP,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACjC,eAAe,GAAE,GAAG,CAAC,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,CAAa,GAC7D,CAAC;IAyCJ,OAAO,CAAC,WAAW;IAWnB,WAAW,IAAI,SAAS;CAGzB;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"}

package/dist/container.js

@@ -10,6 +10,9 @@ export class Token {
 export function token(description) {
     return new Token(description);
 }
+// Shared by every resolution: a constructor that calls `inject()` starts a new resolve() call, and a
+// cycle running through it must still be caught instead of overflowing the stack.
+const resolving = new Set();
 export class Container {
     services = new Map();
     parent;
@@ -31,35 +34,39 @@ export class Container {
         this.services.set(token, factory(this));
         return this;
     }
-    resolve(target, resolutionStack = new Set()) {
+    resolve(target, resolutionStack = resolving) {
         const key = target;
-        if (resolutionStack.has(key)) {
+        if (resolutionStack.size !== 0 && resolutionStack.has(key)) {
             const chain = [...resolutionStack, key]
                 .map((k) => (k instanceof Token ? k.toString() : k.name))
                 .join(" → ");
             throw new Error(`[DI] Circular dependency detected: ${chain}`);
         }
+        const entry = this.services.get(key);
+        if (target instanceof Token) {
+            if (entry !== undefined)
+                return entry;
+            if (this.parent)
+                return this.parent.resolve(target, resolutionStack);
+            throw new Error(`[DI] Token not registered: ${target.toString()}`);
+        }
+        if (!entry) {
+            if (this.parent)
+                return this.parent.resolve(target, resolutionStack);
+            throw new Error(`[DI] Service not registered: ${target.name}`);
+        }
+        const descriptor = entry;
+        const singleton = descriptor.scope === "singleton";
+        if (singleton && descriptor.instance !== undefined)
+            return descriptor.instance;
+        // Only a key that is being constructed goes on the stack, so delegating to a parent is never
+        // mistaken for a cycle.
         resolutionStack.add(key);
         try {
-            const entry = this.services.get(key);
-            if (target instanceof Token) {
-                if (entry !== undefined)
-                    return entry;
-                if (this.parent)
-                    return this.parent.resolve(target);
-                throw new Error(`[DI] Token not registered: ${target.toString()}`);
-            }
-            if (!entry) {
-                if (this.parent)
-                    return this.parent.resolve(target);
-                throw new Error(`[DI] Service not registered: ${target.name}`);
-            }
-            const descriptor = entry;
-            if (descriptor.scope === "singleton") {
-                descriptor.instance ??= this.instantiate(descriptor.target);
-                return descriptor.instance;
-            }
-            return this.instantiate(descriptor.target);
+            const instance = this.instantiate(descriptor.target);
+            if (singleton)
+                descriptor.instance = instance;
+            return instance;
         }
         finally {
             resolutionStack.delete(key);

package/dist/container.js.map

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

package/dist/decorators.d.ts

@@ -1,7 +1,9 @@
 import { type Container, Token, type Constructor, type InjectableOptions } from "./container";
+type DIFieldDecorator = (_value: undefined, context: ClassFieldDecoratorContext<any>) => void;
 export declare function Injectable(options?: InjectableOptions): (value: Constructor, _context: ClassDecoratorContext) => void;
 export declare function Scope(configure?: (c: Container) => void): (cls: new (...args: any[]) => any, _ctx: ClassDecoratorContext) => any;
-export declare function Inject<T>(dep: Constructor<T> | Token<T>): (_value: undefined, context: ClassFieldDecoratorContext<any>) => void;
+export declare function Inject<T>(dep: Constructor<T> | Token<T>): DIFieldDecorator;
 export declare function inject<T>(dep: Constructor<T> | Token<T>): T;
-export declare function InjectContainer(): (_value: undefined, context: ClassFieldDecoratorContext<any>) => void;
+export declare function InjectContainer(): DIFieldDecorator;
+export {};
 //# sourceMappingURL=decorators.d.ts.map

package/dist/decorators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,KAAK,SAAS,EAAE,KAAK,EAAE,KAAK,WAAW,EAAE,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AA0BzG,wBAAgB,UAAU,CAAC,OAAO,GAAE,iBAAsB,GAEmB,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,qBAAqB,KAAK,IAAI,CACzI;AA8BD,wBAAgB,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,KAAK,IAAI,GAEkB,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,IAAI,EAAE,qBAAqB,KAAK,GAAG,CAC/I;AAID,wBAAgB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAsCrC,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,0BAA0B,CAAC,GAAG,CAAC,KAAK,IAAI,CACvF;AAID,wBAAgB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAE3D;AAID,wBAAgB,eAAe,IAkBZ,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,0BAA0B,CAAC,GAAG,CAAC,KAAK,IAAI,CACvF"}
+{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,KAAK,SAAS,EAAE,KAAK,EAAE,KAAK,WAAW,EAAE,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAKzG,KAAK,gBAAgB,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,0BAA0B,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;AAY9F,wBAAgB,UAAU,CAAC,OAAO,GAAE,iBAAsB,IACvC,OAAO,WAAW,EAAE,UAAU,qBAAqB,KAAG,IAAI,CAG5E;AA8BD,wBAAgB,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,KAAK,IAAI,GAEkB,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,IAAI,EAAE,qBAAqB,KAAK,GAAG,CAC/I;AAQD,wBAAgB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAqC1E;AAID,wBAAgB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAE3D;AAYD,wBAAgB,eAAe,IAAI,gBAAgB,CAQlD"}

package/dist/decorators.js

@@ -1,27 +1,16 @@
-import { createFieldDecorator, createClassDecorator, ClassBehavior } from "@praxisjs/decorators";
+import { createClassDecorator, ClassBehavior, addClaimableInitializer, assertFieldContext } from "@praxisjs/decorators";
 import { container, Token } from "./container";
-// Maps instances to their scoped child containers (set by @Scope).
-const scopedContainers = new WeakMap();
+// The child container @Scope creates for an instance.
+const SCOPE = Symbol("praxis.di.scope");
 function resolveFrom(instance) {
-    return scopedContainers.get(instance) ?? container;
+    return instance[SCOPE] ?? container;
 }
 // ── @Injectable ───────────────────────────────────────────────────────────────
-class InjectableBehavior extends ClassBehavior {
-    options;
-    constructor(options) {
-        super();
-        this.options = options;
-    }
-    create(_instance) {
-        return {};
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    initialize(Enhanced, _original) {
-        container.register(Enhanced, this.options);
-    }
-}
+// Registration is all it does, so the class itself is registered rather than a per-instance subclass.
 export function Injectable(options = {}) {
-    return createClassDecorator(new InjectableBehavior(options));
+    return function (value, _context) {
+        container.register(value, options);
+    };
 }
 // ── @Scope ────────────────────────────────────────────────────────────────────
 /**
@@ -46,7 +35,7 @@ class ScopeBehavior extends ClassBehavior {
     create(instance) {
         const child = container.createChild();
         this.configure?.(child);
-        scopedContainers.set(instance, child);
+        instance[SCOPE] = child;
         return {};
     }
 }
@@ -55,62 +44,64 @@ export function Scope(configure) {
     return createClassDecorator(new ScopeBehavior(configure));
 }
 // ── @Inject ───────────────────────────────────────────────────────────────────
+function depName(dep) {
+    return dep instanceof Token ? dep.toString() : dep.name;
+}
 export function Inject(dep) {
-    const cache = new WeakMap();
-    return createFieldDecorator({
-        bind(_instance, name, _initialValue) {
-            return {
-                descriptor: {
-                    get() {
-                        if (!cache.has(this)) {
-                            const c = resolveFrom(this);
-                            let resolved;
-                            try {
-                                resolved = c.resolve(dep);
-                            }
-                            catch (err) {
-                                throw new Error(`[Inject] Failed to resolve "${dep instanceof Token
-                                    ? dep.toString()
-                                    : dep.name}" in "${this.constructor.name}.${name}": ${err.message}`);
-                            }
-                            cache.set(this, resolved);
-                        }
-                        return cache.get(this);
-                    },
-                    set(_value) {
-                        if (process.env.NODE_ENV !== "production") {
-                            console.warn(`[Inject] "${name}" is managed by the DI container and cannot be assigned directly.`);
-                        }
-                    },
-                },
-            };
-        },
-        // DI decorators work on any class, not just StatefulComponent
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    });
+    return function (_value, context) {
+        assertFieldContext(context);
+        const name = String(context.name);
+        // The resolved service lives on the instance under this symbol; the accessor is shared.
+        const slot = Symbol(`praxis.inject.${name}`);
+        const descriptor = {
+            get() {
+                const cached = this[slot];
+                if (cached !== undefined)
+                    return cached;
+                let resolved;
+                try {
+                    resolved = resolveFrom(this).resolve(dep);
+                }
+                catch (err) {
+                    throw new Error(`[Inject] Failed to resolve "${depName(dep)}" in "${this.constructor.name}.${name}": ${err.message}`);
+                }
+                this[slot] = resolved;
+                return resolved;
+            },
+            set(_value) {
+                if (process.env.NODE_ENV !== "production") {
+                    console.warn(`[Inject] "${name}" is managed by the DI container and cannot be assigned directly.`);
+                }
+            },
+            enumerable: true,
+            configurable: true,
+        };
+        addClaimableInitializer(context, function () {
+            // Reserving the slot up front keeps every instance of the class on the same shape.
+            this[slot] = undefined;
+            Object.defineProperty(this, context.name, descriptor);
+        });
+    };
 }
 // ── inject() ──────────────────────────────────────────────────────────────────
 export function inject(dep) {
     return container.resolve(dep);
 }
 // ── @InjectContainer ──────────────────────────────────────────────────────────
+const containerDescriptor = {
+    get() {
+        return resolveFrom(this);
+    },
+    enumerable: true,
+    configurable: true,
+};
 export function InjectContainer() {
-    const cache = new WeakMap();
-    return createFieldDecorator({
-        bind(_instance, _name, _initialValue) {
-            return {
-                descriptor: {
-                    get() {
-                        if (!cache.has(this)) {
-                            cache.set(this, resolveFrom(this));
-                        }
-                        return cache.get(this);
-                    },
-                },
-            };
-        },
-        // DI decorators work on any class, not just StatefulComponent
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    });
+    return function (_value, context) {
+        assertFieldContext(context);
+        const name = context.name;
+        addClaimableInitializer(context, function () {
+            Object.defineProperty(this, name, containerDescriptor);
+        });
+    };
 }
 //# sourceMappingURL=decorators.js.map

package/dist/decorators.js.map

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

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@praxisjs/di",
-  "version": "1.3.13",
+  "version": "1.3.14",
   "type": "module",
+  "sideEffects": false,
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
@@ -10,16 +11,24 @@
       "types": "./dist/index.d.ts"
     }
   },
+  "files": [
+    "dist",
+    "src",
+    "!dist/**/__tests__",
+    "!src/**/__tests__",
+    "CHANGELOG.md"
+  ],
   "dependencies": {
-    "@praxisjs/core": "2.2.0",
-    "@praxisjs/decorators": "1.7.0"
+    "@praxisjs/core": "2.3.0",
+    "@praxisjs/decorators": "2.0.0"
   },
   "devDependencies": {
     "@types/node": "^25.9.1",
     "typescript": "^6.0.3"
   },
   "scripts": {
-    "build": "tsc",
-    "dev": "tsc --watch"
+    "build": "tsc -p tsconfig.build.json",
+    "dev": "tsc -p tsconfig.build.json --watch",
+    "typecheck": "tsc --noEmit"
   }
 }

package/src/container.ts

@@ -27,6 +27,10 @@ export function token<T>(description: string): Token<T> {
   return new Token<T>(description);
 }
 
+// Shared by every resolution: a constructor that calls `inject()` starts a new resolve() call, and a
+// cycle running through it must still be caught instead of overflowing the stack.
+const resolving = new Set<Constructor | Token<unknown>>();
+
 export class Container {
   private readonly services = new Map<Constructor | Token<unknown>, unknown>();
   private readonly parent?: Container;
@@ -58,42 +62,43 @@ export class Container {
 
   resolve<T>(
     target: Constructor<T> | Token<T>,
-    resolutionStack = new Set<Constructor | Token<unknown>>(),
+    resolutionStack: Set<Constructor | Token<unknown>> = resolving,
   ): T {
     const key = target as Constructor | Token<unknown>;
 
-    if (resolutionStack.has(key)) {
+    if (resolutionStack.size !== 0 && resolutionStack.has(key)) {
       const chain = [...resolutionStack, key]
         .map((k) => (k instanceof Token ? k.toString() : k.name))
         .join(" → ");
       throw new Error(`[DI] Circular dependency detected: ${chain}`);
     }
 
-    resolutionStack.add(key);
-    try {
-      const entry = this.services.get(key);
+    const entry = this.services.get(key);
 
-      if (target instanceof Token) {
-        if (entry !== undefined) return entry as T;
-        if (this.parent) return this.parent.resolve(target);
-        throw new Error(`[DI] Token not registered: ${target.toString()}`);
-      }
-
-      if (!entry) {
-        if (this.parent) return this.parent.resolve(target);
-        throw new Error(
-          `[DI] Service not registered: ${(target as Constructor).name}`,
-        );
-      }
+    if (target instanceof Token) {
+      if (entry !== undefined) return entry as T;
+      if (this.parent) return this.parent.resolve(target, resolutionStack);
+      throw new Error(`[DI] Token not registered: ${target.toString()}`);
+    }
 
-      const descriptor = entry as ServiceDescriptor;
+    if (!entry) {
+      if (this.parent) return this.parent.resolve(target, resolutionStack);
+      throw new Error(
+        `[DI] Service not registered: ${(target as Constructor).name}`,
+      );
+    }
 
-      if (descriptor.scope === "singleton") {
-        descriptor.instance ??= this.instantiate(descriptor.target);
-        return descriptor.instance as T;
-      }
+    const descriptor = entry as ServiceDescriptor;
+    const singleton = descriptor.scope === "singleton";
+    if (singleton && descriptor.instance !== undefined) return descriptor.instance as T;
 
-      return this.instantiate(descriptor.target) as T;
+    // Only a key that is being constructed goes on the stack, so delegating to a parent is never
+    // mistaken for a cycle.
+    resolutionStack.add(key);
+    try {
+      const instance = this.instantiate(descriptor.target);
+      if (singleton) descriptor.instance = instance;
+      return instance as T;
     } finally {
       resolutionStack.delete(key);
     }