Skip to content

Commit

Permalink
$$$ update $$$
Browse files Browse the repository at this point in the history
  • Loading branch information
darekf77 committed Apr 26, 2024
1 parent 61c856d commit e80a827
Show file tree
Hide file tree
Showing 8 changed files with 348 additions and 132 deletions.
6 changes: 3 additions & 3 deletions src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ async function start(portForBackend?: string) {
// console.log('Helpers.isElectron', Helpers.isElectron)
// console.log('Your server will start on port ' + HOST_BACKEND_PORT);

await UserContext.init(({ controllers }) => {
console.log(controllers)
})
await UserContext.initialize({

})


console.log('DONE')
// const s1 = Firedev.inject(SessionContext.controllers.SessionController);
// const s2 = Firedev.inject(UserContext.controllers.SessionController);
// console.log({ s1, s2 })
Expand Down
25 changes: 11 additions & 14 deletions src/app/example/app.context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,20 @@ import { UserController } from "./user.controller";
import { User } from "./user";
import { SessionRepository } from "./session.repository";
import { SessionProvider } from "./session.provider";
import { TypecodesController } from "./typecode.controller";

// only here init example data works

export const TypecodesContext = Firedev.createContext({
host: 'http://localhost:' + (HOST_BACKEND_PORT + 2),
controllers: { TypecodesController },
});



export const SessionContext = Firedev.createContext({
host: 'http://localhost:' + HOST_BACKEND_PORT,
contexts: { TypecodesContext },
controllers: { SessionController },
entities: { Session },
repositories: { SessionRepository },
Expand All @@ -18,30 +28,17 @@ export const SessionContext = Firedev.createContext({




export const UserContext = Firedev.createContext({
host: 'http://localhost:' + (HOST_BACKEND_PORT + 1),
// contexts: { SessionContext },
contexts: { SessionContext },
controllers: {
...SessionContext.controllers,
UserController
},
entities: {
...SessionContext.entities,
User
},
repositories: {
...SessionContext.repositories,
User
},
providers: {
...SessionContext.providers
}
});

UserContext.init((ctx)=> {
console.log(ctx.controllers)
})

// const sesion = Firedev.inject(UserContext.contexts.SessionContext.controllers.SessionController);
// const sesion2 = Firedev.inject(UserContext.controllers.SessionController);
18 changes: 17 additions & 1 deletion src/app/example/session.controller.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,24 @@
import { Firedev } from "firedev/src";
import { SessionContext, UserContext } from "./app.context";
import { SessionContext, TypecodesContext, UserContext } from "./app.context";
import { UserController } from "./user.controller";
import { TypecodesController } from "./typecode.controller";


export class SessionController {

typecode: TypecodesController;

_() {
this.typecode = SessionContext.contexts.TypecodesContext.on(this).inject.controller.TypecodesController
}

helloFromSession() {
if (SessionContext.scope.isActiveOn(this)) {

}
// if (Firedev.contextFrom(this)?.equals(SessionContext.internalContext)) {

// }
return 'hello from session'
}
}
6 changes: 6 additions & 0 deletions src/app/example/typecode.controller.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export class TypecodesController {

hello() {

}
}
21 changes: 14 additions & 7 deletions src/app/example/user.controller.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
import { Firedev } from "firedev/src";
import { Helpers } from "tnp-core/src";
import { SessionContext } from "./app.context";
import { SessionContext, UserContext } from "./app.context";
import { SessionController } from "./session.controller";
import { User } from "./user";

// @Firedev.Controller({ className: 'UserController', entity: User })
export class UserController {
session: SessionController;

session = Firedev.inject(SessionContext.controllers.SessionController);
_(): void {
//Called after the constructor, initializing input properties, and the first call to ngOnChanges.
//Add 'implements OnInit' to the class.
this.session = SessionContext.on(this).inject.controller.SessionController;

constructor(
private sesionConstr: SessionController
) {
}

simpleHelo() {
return 'simple helo'
}

@Firedev.Http.PUT()
Expand All @@ -24,12 +29,14 @@ export class UserController {
//#endregion
}



//#region @websql
async initExampleDbData(): Promise<void> {
// await this.repository.save(User.from({ name: 'Sam' }))
// await this.repository.save(User.from({ name: 'Samuela' }))
console.log('injected session', this.session)
console.log('injected session constr', this.sesionConstr)
console.log('hello from sesion:', this.session.helloFromSession());
new UserContext.types.entities.User()
}
//#endregion
}
17 changes: 15 additions & 2 deletions src/app/example/user.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
import { Firedev } from "firedev/src";
import { _ } from "tnp-core/src";
import { UserController } from "./user.controller";
import { UserContext } from "./app.context";

// @Firedev.Entity({ className: 'User' })
export class User {

static ctrl: UserController

static _() {
console.log('INTIED')
this.ctrl = UserContext.on(this).inject.controller.UserController;
}

static from(user: Partial<User>) {
return _.merge(new User(), user);
// return _.merge(new UserContext.types.entities.User(), user);
}
public static ctrl?: UserController;

constructor() {
console.log(UserContext.types.entities.User.ctrl.simpleHelo())
}

//#region @websql
@Firedev.Orm.Column.Generated()
//#endregion
Expand Down
Loading

0 comments on commit e80a827

Please sign in to comment.