Scoped Binding

packages/lunox-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunoxjs/auth",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Lunox Authentication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/lunox-build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunoxjs/build",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Lunox helper for rollup",
   "main": "index.js",
   "files": [

packages/lunox-core/.eslintignore

@@ -2,3 +2,4 @@ dist/
 client/
 bin/
 .tsup/
+test/

packages/lunox-core/.prettierignore

@@ -7,3 +7,4 @@ src/View/Vite*.ts
 *.yaml
 coverage/
 storage/
+test/

packages/lunox-core/global.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 /// <reference types="vite/client" />
-/// <reference types="@lunoxjs/test/global" />
+/// <reference types="../lunox-test/global" />
 
 import type {
   Application,

packages/lunox-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunoxjs/core",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Laravel-Flavoured NodeJs framework",
   "bin": {
     "lunox": "./bin/lunox.cjs"
@@ -101,4 +101,4 @@
     "vitest": "^0.34.6"
   },
   "type": "module"
-}
+}

packages/lunox-core/src/Console/Kernel.ts

@@ -1,4 +1,4 @@
-import {version} from "../../package.json"
+import { version } from "../../package.json";
 import LoadConfiguration from "../Foundation/Bootstrap/LoadConfiguration";
 import type { Bootstrapper } from "../Contracts/Foundation/Bootstrapper";
 import type Application from "../Foundation/Application";
@@ -105,7 +105,7 @@ class Kernel {
     // register all commands to artisan
     await Promise.all(
       files.map(async (f) => {
-        const _command = (await import(pathToFileURL(f).href, {with: {type: "macro"}}))
+        const _command = (await import(pathToFileURL(f).href))
           .default as Class<Command>;
         const commandInstance = new _command();
         this.registerCommand(commandInstance);

packages/lunox-core/src/Container/Container.ts

@@ -1,4 +1,5 @@
 import type { CallBack, Concrete } from "../Contracts";
+import { Als } from "../Support/Facades";
 
 interface Binding {
   concrete: Concrete;
@@ -12,6 +13,8 @@ class Container {
   /** The container's bindings. */
   protected bindings: Record<string | symbol, Binding> = {};
 
+  protected scopedInstances: (string | symbol)[] = [];
+
   /** Register a binding with the container. */
   public bind(abstract: string | symbol, concrete: Concrete, shared = false) {
     this.bindings[abstract] = { concrete, shared };
@@ -22,6 +25,14 @@ class Container {
     this.bind(abstract, concrete, true);
   }
 
+  /** Register scoped binding in container.
+   * it's just like singleton but scoped to current request
+   */
+  public scoped(abstract: string | symbol, concrete: Concrete) {
+    this.scopedInstances.push(abstract);
+    this.singleton(abstract, concrete);
+  }
+
   /** Instantiate a concrete instance of the given type. */
   build<T>(abstract: string | symbol, params: Record<string, any> = {}): T {
     const concrete = this.bindings[abstract].concrete;
@@ -38,9 +49,13 @@ class Container {
     } else {
       instance = (concrete as CallBack)();
     }
-    if (this.bindings[abstract].shared) {
+    const isScoped = this.scopedInstances.includes(abstract);
+    if (this.bindings[abstract].shared && !isScoped) {
       this.instances[abstract] = instance;
     }
+    if (isScoped) {
+      Als.getStore()?.set(abstract, instance);
+    }
     return instance as T;
   }
 
@@ -50,6 +65,12 @@ class Container {
       if (this.instances[abstract] && Object.keys(params).length == 0) {
         return this.instances[abstract] as T;
       }
+      if (this.scopedInstances.includes(abstract)) {
+        const scopedInstance = Als.getStore()?.get(abstract);
+        if (scopedInstance) {
+          return scopedInstance;
+        }
+      }
       return this.build<T>(abstract, params);
     } catch (error) {
       let message = "";

packages/lunox-core/src/Encryption/Encrypter.ts

@@ -46,7 +46,7 @@ class Encrypter {
     const serializedValue = needSerialize ? JSON.stringify(value) : value;
     try {
       const ivBuffer = crypto.randomBytes(
-        Encrypter.supportedCiphers[this.cipher].ivLength
+        Encrypter.supportedCiphers[this.cipher].ivLength,
       );
       const iv = Encrypter.base64Encode(ivBuffer);
 

packages/lunox-core/src/Foundation/Application.ts

@@ -11,6 +11,7 @@ class Application extends Container {
   protected _basePath!: string;
 
   protected isBooted = false;
+  protected configFiles: Record<string, any> = {};
 
   public get config(): Repository {
     return this.make(Repository.symbol);

packages/lunox-core/src/Foundation/Bootstrap/LoadConfiguration.ts

@@ -36,11 +36,8 @@ class LoadConfiguration implements Bootstrapper {
       files.map(async (f) => {
         repository.set(
           f.replace(app.getExt(), "").replace(path.sep, "."),
-          (
-            await import(pathToFileURL(path.join(configPath, f)).href, {
-              with: { type: "macro" },
-            })
-          ).default || {},
+          (await import(pathToFileURL(path.join(configPath, f)).href))
+            .default || {},
         );
       }),
     );

packages/lunox-core/src/Foundation/Http/Kernel.ts

@@ -515,7 +515,7 @@ const parseFormData = async (req: ServerRequest, request: Request) => {
     (prev, key) => {
       const file = files[key];
       if (!file) return prev;
-      if(!key.endsWith("[]") && file.length == 1){
+      if (!key.endsWith("[]") && file.length == 1) {
         prev[key] = new UploadedFile(file[0]);
         return prev;
       }

packages/lunox-core/test/Feature/request.test.ts

@@ -14,7 +14,33 @@ describe("Request Test", () => {
       agent.get("/api/request-1"),
       agent.get("/api/request-2"),
     ]);
-    expect(responses[0].body).toMatchObject({});
-    expect(responses[1].body).toMatchObject({ foo: "bar" });
+    expect(responses[0].body).toMatchObject({count:{
+      bind: {
+        init:0,
+        last:0
+      },
+      singleton:{
+        init:-10,
+        last:-15
+      },
+      scoped:{
+        init:0,
+        last:-10
+      }
+    }});
+    expect(responses[1].body).toMatchObject({ foo: "bar", count:{
+      bind: {
+        init:0,
+        last:0
+      },
+      singleton:{
+        init:-10,
+        last:-5
+      },
+      scoped:{
+        init:0,
+        last: 5
+      }
+    }});
   });
 });

packages/lunox-core/test/app/Counter.ts

@@ -0,0 +1,13 @@
+class Counter {
+  protected count = 0;
+  increment(step: number = 1) {
+    this.count += step;
+  }
+  decrement(step: number = 1) {
+    this.count -= step;
+  }
+  getCount() {
+    return this.count;
+  }
+}
+export default Counter;

packages/lunox-core/test/app/Providers/ScopeServecProvider.ts

@@ -0,0 +1,11 @@
+import { ServiceProvider } from "../../../src";
+import Counter from "../Counter";
+
+class ScopeServiceProvider extends ServiceProvider {
+  async register(): Promise<void> {
+    this.app.scoped("scopedCounter", Counter)
+    this.app.bind("counter", Counter)
+    this.app.singleton("singletonCounter", Counter)
+  }
+}
+export default ScopeServiceProvider;

packages/lunox-core/test/config/app.ts

@@ -1,6 +1,7 @@
 import { EncryptionServiceProvider } from "../../src";
 import type { AppConfig } from "../../src/Contracts/Config";
 import RouteServiceProvider from "../app/Providers/RouteServiceProvider";
+import ScopeServiceProvider from "../app/Providers/ScopeServecProvider";
 
 const app: AppConfig = {
   name: "Lunox App",
@@ -12,6 +13,7 @@ const app: AppConfig = {
     EncryptionServiceProvider,
     // app service providers
     RouteServiceProvider,
+    ScopeServiceProvider
   ],
 };
 export default app;

packages/lunox-core/test/routes/api.ts

@@ -1,6 +1,7 @@
 import { Request } from "../../src";
 import { Response, Route } from "../../src/Support/Facades";
 import fs from "fs";
+import Counter from "../app/Counter";
 
 Route.get("/", () => {
   return Response.make({
@@ -10,13 +11,59 @@ Route.get("/", () => {
 });
 
 Route.get("/request-1", async () => {
+  const count = {
+    bind: {
+      init:0,
+      last:0
+    },
+    singleton: {
+      init:0,
+      last:0
+    },
+    scoped: {
+      init:0,
+      last:0
+    }
+  }
+   count.bind.init = app<Counter>("counter").getCount();
+   count.singleton.init = app<Counter>("singletonCounter").getCount();
+   count.scoped.init = app<Counter>("scopedCounter").getCount();
   await wait(500);
-  return Response.make(request().all());
+  app<Counter>("counter").decrement(10);
+  app<Counter>("singletonCounter").decrement(10);
+  app<Counter>("scopedCounter").decrement(10);
+  count.bind.last = app<Counter>("counter").getCount();
+  count.singleton.last = app<Counter>("singletonCounter").getCount();
+  count.scoped.last = app<Counter>("scopedCounter").getCount();
+  return Response.make({ ...request().all(), count });
 });
 
 Route.get("/request-2", async () => {
+  const count = {
+    bind: {
+      init:0,
+      last:0
+    },
+    singleton: {
+      init:0,
+      last:0
+    },
+    scoped: {
+      init:0,
+      last:0
+    }
+  }
+   count.bind.init = app<Counter>("counter").getCount();
+   count.singleton.init = app<Counter>("singletonCounter").getCount();
+   count.scoped.init = app<Counter>("scopedCounter").getCount();
+  app<Counter>("counter").increment(5);
+  app<Counter>("singletonCounter").increment(5);
+  app<Counter>("scopedCounter").increment(5);
+  count.bind.last = app<Counter>("counter").getCount();
+  count.singleton.last = app<Counter>("singletonCounter").getCount();
+  count.scoped.last = app<Counter>("scopedCounter").getCount();
   request().merge({ foo: "bar" });
-  return Response.make(request().all());
+  return Response.make({ ...request().all(), count });
 });
 Route.post("/", () => "halo");
 Route.post("/upload", handleUpload);

packages/lunox-create/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-lunox-app",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Create Lunox app",
   "main": "index.js",
   "bin": {

packages/lunox-drizzle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunoxjs/drizzle",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Lunox Database Manager using Drizzle",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/lunox-eloquent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunoxjs/eloquent",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Lunox Database ORM using Objection and Knex",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/lunox-event-drizzle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunoxjs/event-drizzle",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Drizzle Connection for @lunoxjs/event",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/lunox-event-typeorm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunoxjs/event-typeorm",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Typeorm Connection for @lunoxjs/event",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/lunox-event/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunoxjs/event",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Lunox Event Manager",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/lunox-filesystem/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunoxjs/filesystem",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Lunox Filesystem",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/lunox-mail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunoxjs/mail",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Lunox Mail Manager",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/lunox-prisma/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunoxjs/prisma",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Lunox Database Manager using Prisma ORM",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/lunox-session/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunoxjs/session",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Lunox Session",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/lunox-test/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunoxjs/test",
-  "version": "2.0.0-beta.3.6.5",
+  "version": "2.0.0-beta.3.6.5.1",
   "description": "Lunox Unit Test",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",