Skip to content

Commit

Permalink
feat: rename OrmClient for Orm
Browse files Browse the repository at this point in the history
#0
  • Loading branch information
FlavioLionelRita committed Nov 19, 2023
1 parent a1aad60 commit daf068a
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 24 deletions.
8 changes: 4 additions & 4 deletions src/dev/labs/northwind/client/lambdaLab.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import { ormClient } from '../../../../lib'
import { orm } from '../../../../lib'
import { Orders } from './model'

async function execute () {
try {
ormClient.init('http://localhost:9291')
orm.init('http://localhost:9291')
const query = (id:number)=> Orders.filter(p =>p.id==id)
.include(p=>[p.customer.map(p=>p.name),p.details
.include(p=>p.product
.include(p=>p.category.map(p=>p.name))
.map(p=>p.name))
.map(p=>[p.quantity,p.unitPrice])])
const data = {id: 10248 }
const sentence = await ormClient.sentence(query, { stage: 'default'})
const sentence = await orm.sentence(query, { stage: 'default'})
console.log(JSON.stringify(sentence,null,2))
const result = await ormClient.execute(query, data,{ stage: 'default'})
const result = await orm.execute(query, data,{ stage: 'default'})
console.log(JSON.stringify(result,null,2))
} catch (error: any) {
console.error(error)
Expand Down
8 changes: 4 additions & 4 deletions src/dev/labs/northwind/client/queryLab.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { ormClient } from '../../../../lib'
import { orm } from '../../../../lib'

async function execute () {
try {
ormClient.init('http://localhost:9291')
orm.init('http://localhost:9291')
const query = 'Orders.filter(p =>p.id==id).include(p=>[p.customer.map(p=>p.name),p.details.include(p=>p.product.include(p=>p.category.map(p=>p.name)).map(p=>p.name)).map(p=>[p.quantity,p.unitPrice])])'
const data = {id: 10248 }
const sentence = await ormClient.sentence(query, { stage: 'default'})
const sentence = await orm.sentence(query, { stage: 'default'})
console.log(JSON.stringify(sentence,null,2))
const result = await ormClient.execute(query, data,{ stage: 'default'})
const result = await orm.execute(query, data,{ stage: 'default'})
console.log(JSON.stringify(result,null,2))
} catch (error: any) {
console.error(error)
Expand Down
2 changes: 1 addition & 1 deletion src/lib/application/ports/IOrm.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/ban-types */
import { MetadataSentence, QueryOptions, Metadata, MetadataModel, MetadataConstraint, MetadataParameter } from '../../domain'

export interface IOrmClient
export interface IOrm
{
host:string
init (host?: string):Promise<void>
Expand Down
4 changes: 2 additions & 2 deletions src/lib/domain/actions.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { MetadataSentence, MetadataParameter, MetadataModel, MetadataConstraint, Metadata } from './model'
import { IOrmClient } from '../application/ports/IOrm'
import { IOrm } from '../application/ports/IOrm'

export class ExpressionActions {
private orm
private name
private stage
constructor (name: string, orm:IOrmClient, stage?:string) {
constructor (name: string, orm:IOrm, stage?:string) {
this.name = name
this.stage = stage
this.orm = orm
Expand Down
6 changes: 3 additions & 3 deletions src/lib/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { OrmClient } from './infrastructure/adapters/orm'
import { Orm } from './infrastructure/adapters/orm'
export * from './application'
export * from './infrastructure'
export * from './domain'
export { OrmClient } from './infrastructure/adapters/orm'
export const ormClient = OrmClient.instance
export { Orm } from './infrastructure/adapters/orm'
export const orm = Orm.instance
10 changes: 5 additions & 5 deletions src/lib/infrastructure/adapters/orm.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/ban-types */

import { IOrmClient, ExpressionApi } from '../../application'
import { IOrm, ExpressionApi } from '../../application'
import { Configuration, MetadataSentence, QueryOptions, Metadata, MetadataModel, MetadataConstraint, MetadataParameter } from '../../domain'
import { AxiosResponse } from 'axios'
import { expressions } from '3xpr'
Expand All @@ -9,9 +9,9 @@ import { SentenceLibrary } from '..'
/**
* Facade through which you can access all the functionalities of the library.
*/
export class OrmClient implements IOrmClient {
export class Orm implements IOrm {
// eslint-disable-next-line no-use-before-define
private static _instance: OrmClient
private static _instance: Orm
public host: string
private configuration?:Configuration
private expressionApi?: ExpressionApi
Expand All @@ -23,9 +23,9 @@ export class OrmClient implements IOrmClient {
/**
* Singleton
*/
public static get instance (): OrmClient {
public static get instance (): IOrm {
if (!this._instance) {
this._instance = new OrmClient()
this._instance = new Orm()
}
return this._instance
}
Expand Down
10 changes: 5 additions & 5 deletions src/lib/infrastructure/repository.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { IOrmClient } from '../application/ports/IOrm'
import { OrmClient } from './adapters/orm'
import { IOrm } from '../application/ports/IOrm'
import { Orm } from './adapters/orm'
import { Queryable } from '../domain/queryable'
import { ExpressionActions } from '../domain/actions'

export class Repository<TEntity, TQuery> {
public name:string
public stage?:string
private orm:IOrmClient
constructor (name: string, stage?:string, Orm?:IOrmClient) {
private orm:IOrm
constructor (name: string, stage?:string, orm?:IOrm) {
this.name = name
this.stage = stage
this.orm = Orm || OrmClient.instance
this.orm = orm || Orm.instance
}

protected async _execute (
Expand Down

0 comments on commit daf068a

Please sign in to comment.