autoscriptorm 1.0.1 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -66,7 +66,7 @@ main()
66
66
 
67
67
  #### For virtual columns `computedVarToCol` can be used to map column and expression
68
68
 
69
- #### Here is an example of how to create a `DTO`
69
+ #### Here is an example of how to create a `DTO`:
70
70
 
71
71
  ```typescript
72
72
  export type DummyDTOType = DTOType & {
@@ -121,7 +121,7 @@ export class DummyDTO extends DTO<DummyDTOType> {
121
121
 
122
122
  #### `TableDAO` class is responsible for crud operation. So, after creating the `DTO` class it is recommanded to create a `DAO` class for that table.
123
123
 
124
- #### Here is an example of how to create a `DAO`
124
+ #### Here is an example of how to create a `DAO`:
125
125
 
126
126
  ```typescript
127
127
  import { DummyDTO, type DummyDTOType } from "./Dummy1DTO.ts"
@@ -134,7 +134,7 @@ export class DummyDAO extends DAO<DummyDTOType, DummyDTO> {
134
134
  }
135
135
  ```
136
136
 
137
- #### Here is an example of how to use the `DAO` class
137
+ #### Here is an example of how to use the `DAO` class:
138
138
 
139
139
  ```typescript
140
140
  import { configureDB } from 'autoscript'
@@ -228,19 +228,19 @@ async function main() {
228
228
  main()
229
229
  ```
230
230
 
231
- #### For join operation `JoinDAO` class needs to be used. This class can be used to perform `innerJoin`, `leftJoin`, `rightJoin` and `where` operations. Also virtual columns can be added based on multiple tables. Here is an example
231
+ #### For join operation `JoinDAO` class needs to be used. This class can be used to perform `innerJoin`, `leftJoin`, `rightJoin` and `where` operations. Also virtual columns can be added based on multiple tables. Here is an example:
232
232
 
233
233
  ```typescript
234
234
  import { configureDB } from 'autoscript'
235
235
 
236
236
  let result = await new JoinDAO(new Dummy1DAO())
237
- .innerJoin(new Dummy2DAO(), "table1_name1", "table2_name2")
238
- .leftJoin(new Dummy3DAO(), "table2_name2", "table3_name3")
239
- .rightJoin(new Dummy4DAO(), "table4_name4", "table3_name3")
240
- .addComputedColumn("col1", "CONCAT(table1_name1, table2_name2)")
241
- .where("table1_name1", "=", "potato")
237
+ .innerJoin(new Dummy2DAO(), "table1.name1", "table2.name2")
238
+ .leftJoin(new Dummy3DAO(), "table2.name2", "table3.name3")
239
+ .rightJoin(new Dummy4DAO(), "table4.name4", "table3.name3")
240
+ .addComputedColumn("col1", "CONCAT(table1.name1, table2.name2)")
241
+ .where("table1.name1", "=", "potato")
242
242
  .and()
243
- .where("table2_name2", "=", "tomato")
243
+ .where("table2.name2", "=", "tomato")
244
244
  .execute()
245
245
 
246
246
  if(result!=null) {
@@ -255,3 +255,31 @@ main()
255
255
  })
256
256
  }
257
257
  ```
258
+
259
+ #### If in any case execute cannot be called instantly, `AnyJoinDAO` type will be needed to chain methods later. But this cause typescript from tracking types. Here is an example:
260
+
261
+ ```typescript
262
+ import { type AnyJoinDAO, configureDB } from 'autoscript'
263
+
264
+ let joinDAO: AnyJoinDAO = new JoinDAO(new Dummy1DAO())
265
+ .innerJoin(new Dummy2DAO(), "table1.name1", "table2.name2")
266
+
267
+ if(/*SomeLogic*/) {
268
+ joinDAO = joinDAO
269
+ .leftJoin(new Dummy3DAO(), "table2.name2", "table3.name3")
270
+ .rightJoin(new Dummy4DAO(), "table4.name4", "table3.name3")
271
+ }
272
+
273
+ result = await joinDAO.execute()
274
+
275
+ if(result!=null) {
276
+ result.map(e => {
277
+ console.log(
278
+ (e[0] as Dummy1DTO).getAsObject(),
279
+ (e[1] as Dummy2DTO).getAsObject(),
280
+ (e[2] as Dummy3DTO).getAsObject(),
281
+ (e[3] as Dummy4DTO).getAsObject()
282
+ )
283
+ })
284
+ }
285
+ ```
package/dist/index.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { configureDB } from "./utils/DB.js";
2
2
  import { type DTOType, DTO } from "./utils/DTO.js";
3
3
  import { DAO } from "./utils/DAO.js";
4
- import { JoinDAO } from "./utils/JoinDAO.js";
4
+ import { type AnyJoinDAO, JoinDAO } from "./utils/JoinDAO.js";
5
5
  import query from "./utils/Query.js";
6
- export { query, configureDB, type DTOType, DTO, DAO, JoinDAO };
6
+ export { query, configureDB, type DTOType, DTO, DAO, JoinDAO, type AnyJoinDAO };
7
7
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,KAAK,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,KAAK,MAAM,kBAAkB,CAAA;AAEpC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,KAAK,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,KAAK,UAAU,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC7D,OAAO,KAAK,MAAM,kBAAkB,CAAA;AAEpC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,UAAU,EAAE,CAAA"}
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAgB,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,KAAK,MAAM,kBAAkB,CAAA;AAEpC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAgB,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAgB,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAmB,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC7D,OAAO,KAAK,MAAM,kBAAkB,CAAA;AAEpC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAgB,GAAG,EAAE,GAAG,EAAE,OAAO,EAAmB,CAAA"}
@@ -9,6 +9,7 @@ type Join<T extends DTOType, TDTO extends DTO<T>, T1 extends DTOType, TDTO1 exte
9
9
  ]>;
10
10
  type ColType<L extends any[], T extends DTOType, T1 extends DTOType> = keyof ((L["length"] extends 1 ? TablePrefix<T, 1> : T) & TablePrefix<T1, [...L, unknown]["length"]>);
11
11
  type ColWithTablePrefix<L extends any[], T extends DTOType> = keyof (L["length"] extends 1 ? TablePrefix<T, 1> : T);
12
+ export type AnyJoinDAO = JoinDAO<any, any, any, any>;
12
13
  export declare class JoinDAO<T extends DTOType, TDTO extends DTO<T>, R extends string, L extends any[] = [TDTO]> {
13
14
  private query;
14
15
  private params;
@@ -32,7 +33,7 @@ export declare class JoinDAO<T extends DTOType, TDTO extends DTO<T>, R extends s
32
33
  where(column: ColWithTablePrefix<L, T>, operator: "=" | "!=" | "<>" | "<" | ">" | "<=" | ">=" | "like" | "in" | "not in" | "is null" | "is not null", value?: string | number | boolean | Date | null | (string | number | boolean | Date)[]): this;
33
34
  and(): this;
34
35
  or(): this;
35
- orderBy(column: ColWithTablePrefix<L, T> | R, sort?: "ASC" | "DESC"): this;
36
+ orderBy(column: ColWithTablePrefix<L, T>, sort?: "ASC" | "DESC"): this;
36
37
  limit(value: number): this;
37
38
  offset(value: number): this;
38
39
  queryBuilder(limit?: number, offset?: number): {
@@ -1 +1 @@
1
- {"version":3,"file":"JoinDAO.d.ts","sourceRoot":"","sources":["../../src/utils/JoinDAO.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JoinDAO.d.ts","sourceRoot":"","sources":["../../src/utils/JoinDAO.ts"],"names":[],"mappings":"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"}
@@ -29,7 +29,7 @@ export class JoinDAO {
29
29
  queryParams.forEach(e => this.params.push(e));
30
30
  }
31
31
  varNameToColumn(col, dtoList) {
32
- let match = col.match(/^table(\d+)\.(.+$)/);
32
+ let match = col.match(/^table(\d+)\.([a-zA-Z0-9._-]+)$/);
33
33
  if (match) {
34
34
  let index = match[1];
35
35
  let varName = match[2];
@@ -108,7 +108,8 @@ export class JoinDAO {
108
108
  return this;
109
109
  }
110
110
  orderBy(column, sort = "ASC") {
111
- this.orderArray.push(`${column} ${sort}`);
111
+ let columnName = this.varNameToColumn(column, this.dtoList);
112
+ this.orderArray.push(`${columnName} ${sort}`);
112
113
  return this;
113
114
  }
114
115
  limit(value) {
@@ -1 +1 @@
1
- {"version":3,"file":"JoinDAO.js","sourceRoot":"","sources":["../../src/utils/JoinDAO.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JoinDAO.js","sourceRoot":"","sources":["../../src/utils/JoinDAO.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "autoscriptorm",
3
- "version": "1.0.1",
3
+ "version": "1.0.3",
4
4
  "description": "A Typescript ORM for PostgreSQL",
5
5
  "license": "ISC",
6
6
  "author": "alvi",