orchid-orm 1.5.22 → 1.5.24

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.
Files changed (12) hide show
  1. package/.turbo/turbo-test.log +14 -14
  2. package/.turbo/turbo-test:ci.log +26 -0
  3. package/CHANGELOG.md +13 -0
  4. package/coverage/coverage-summary.json +28 -0
  5. package/dist/index.d.ts +42 -42
  6. package/dist/index.js +1 -1
  7. package/dist/index.js.map +1 -1
  8. package/dist/index.mjs +1 -1
  9. package/dist/index.mjs.map +1 -1
  10. package/jest-setup.ts +1 -1
  11. package/package.json +5 -4
  12. package/src/codegen/utils.ts +6 -1
package/.turbo/turbo-test.log CHANGED
@@ -1,26 +1,26 @@
1
1
 
2
- > orchid-orm@1.5.19 test /home/romeo/dev/my/orchid-orm/packages/orm
2
+ > orchid-orm@1.5.23 test /home/romeo/dev/my/orchid-orm/packages/orm
3
3
  > jest "--coverage" "--coverageReporters" "json-summary"
4
4
 
5
- PASS src/relations/hasAndBelongsToMany.test.ts
6
- PASS src/codegen/updateTableFile/renameTable.test.ts (5.657 s)
7
- PASS src/codegen/updateTableFile/createTable.test.ts (5.458 s)
8
- PASS src/codegen/updateMainFile.test.ts (5.801 s)
9
- PASS src/relations/belongsTo.test.ts (5.811 s)
10
- PASS src/codegen/updateTableFile/changeTable.test.ts (6.179 s)
11
- PASS src/relations/hasMany.test.ts (6.685 s)
12
5
  PASS src/bin/init.test.ts
13
- PASS src/repo.test.ts
6
+ PASS src/codegen/updateTableFile/changeTable.test.ts
7
+ PASS src/relations/hasAndBelongsToMany.test.ts
8
+ PASS src/codegen/updateMainFile.test.ts
9
+ PASS src/relations/belongsTo.test.ts
10
+ PASS src/relations/hasMany.test.ts
11
+ PASS src/codegen/updateTableFile/createTable.test.ts
14
12
  PASS src/relations/hasOne.test.ts
13
+ PASS src/table.test.ts
14
+ PASS src/orm.test.ts
15
+ PASS src/codegen/appCodeUpdater.test.ts
16
+ PASS src/codegen/updateTableFile/renameTable.test.ts
15
17
  PASS src/codegen/createBaseTableFile.test.ts
18
+ PASS src/repo.test.ts
16
19
  PASS src/relations/relations.test.ts
17
- PASS src/codegen/appCodeUpdater.test.ts
18
- PASS src/orm.test.ts
19
20
  PASS src/transaction.test.ts
20
- PASS src/table.test.ts
21
21
 
22
22
  Test Suites: 16 passed, 16 total
23
- Tests: 318 passed, 318 total
23
+ Tests: 319 passed, 319 total
24
24
  Snapshots: 0 total
25
- Time: 10.094 s, estimated 12 s
25
+ Time: 4.516 s
26
26
  Ran all test suites.
package/.turbo/turbo-test:ci.log ADDED
@@ -0,0 +1,26 @@
1
+
2
+ > orchid-orm@1.5.23 test:ci /home/romeo/dev/my/orchid-orm/packages/orm
3
+ > jest --coverage --coverageReporters json-summary
4
+
5
+ PASS src/bin/init.test.ts
6
+ PASS src/relations/belongsTo.test.ts
7
+ PASS src/codegen/updateMainFile.test.ts
8
+ PASS src/relations/hasMany.test.ts
9
+ PASS src/relations/hasOne.test.ts
10
+ PASS src/codegen/updateTableFile/changeTable.test.ts (5.155 s)
11
+ PASS src/relations/hasAndBelongsToMany.test.ts (5.085 s)
12
+ PASS src/transaction.test.ts
13
+ PASS src/codegen/updateTableFile/createTable.test.ts
14
+ PASS src/orm.test.ts
15
+ PASS src/relations/relations.test.ts
16
+ PASS src/codegen/updateTableFile/renameTable.test.ts
17
+ PASS src/table.test.ts
18
+ PASS src/repo.test.ts
19
+ PASS src/codegen/createBaseTableFile.test.ts
20
+ PASS src/codegen/appCodeUpdater.test.ts
21
+
22
+ Test Suites: 16 passed, 16 total
23
+ Tests: 319 passed, 319 total
24
+ Snapshots: 0 total
25
+ Time: 8.385 s
26
+ Ran all test suites.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,18 @@
1
1
  # orchid-orm
2
2
 
3
+ ## 1.5.24
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+ - pqb@0.9.13
9
+
10
+ ## 1.5.23
11
+
12
+ ### Patch Changes
13
+
14
+ - Fix relative path resolution on windows for orm codegen
15
+
3
16
  ## 1.5.22
4
17
 
5
18
  ### Patch Changes
package/coverage/coverage-summary.json ADDED
@@ -0,0 +1,28 @@
1
+ {"total": {"lines":{"total":1405,"covered":1370,"skipped":0,"pct":97.5},"statements":{"total":1542,"covered":1472,"skipped":0,"pct":95.46},"functions":{"total":352,"covered":334,"skipped":0,"pct":94.88},"branches":{"total":631,"covered":557,"skipped":0,"pct":88.27},"branchesTrue":{"total":0,"covered":0,"skipped":0,"pct":100}}
2
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/orm.ts": {"lines":{"total":24,"covered":23,"skipped":0,"pct":95.83},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":26,"covered":25,"skipped":0,"pct":96.15},"branches":{"total":5,"covered":4,"skipped":0,"pct":80}}
3
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/repo.ts": {"lines":{"total":19,"covered":19,"skipped":0,"pct":100},"functions":{"total":5,"covered":5,"skipped":0,"pct":100},"statements":{"total":20,"covered":20,"skipped":0,"pct":100},"branches":{"total":1,"covered":1,"skipped":0,"pct":100}}
4
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/table.ts": {"lines":{"total":14,"covered":14,"skipped":0,"pct":100},"functions":{"total":9,"covered":9,"skipped":0,"pct":100},"statements":{"total":15,"covered":15,"skipped":0,"pct":100},"branches":{"total":3,"covered":3,"skipped":0,"pct":100}}
5
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/transaction.ts": {"lines":{"total":15,"covered":15,"skipped":0,"pct":100},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":15,"covered":15,"skipped":0,"pct":100},"branches":{"total":3,"covered":3,"skipped":0,"pct":100}}
6
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/utils.ts": {"lines":{"total":6,"covered":6,"skipped":0,"pct":100},"functions":{"total":5,"covered":5,"skipped":0,"pct":100},"statements":{"total":9,"covered":9,"skipped":0,"pct":100},"branches":{"total":2,"covered":1,"skipped":0,"pct":50}}
7
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/bin/init.ts": {"lines":{"total":150,"covered":147,"skipped":0,"pct":98},"functions":{"total":24,"covered":22,"skipped":0,"pct":91.66},"statements":{"total":160,"covered":156,"skipped":0,"pct":97.5},"branches":{"total":59,"covered":59,"skipped":0,"pct":100}}
8
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/appCodeUpdater.ts": {"lines":{"total":18,"covered":17,"skipped":0,"pct":94.44},"functions":{"total":7,"covered":6,"skipped":0,"pct":85.71},"statements":{"total":19,"covered":18,"skipped":0,"pct":94.73},"branches":{"total":5,"covered":3,"skipped":0,"pct":60}}
9
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/createBaseTableFile.ts": {"lines":{"total":7,"covered":7,"skipped":0,"pct":100},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":9,"covered":9,"skipped":0,"pct":100},"branches":{"total":1,"covered":1,"skipped":0,"pct":100}}
10
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/fileChanges.ts": {"lines":{"total":16,"covered":16,"skipped":0,"pct":100},"functions":{"total":7,"covered":7,"skipped":0,"pct":100},"statements":{"total":16,"covered":16,"skipped":0,"pct":100},"branches":{"total":9,"covered":8,"skipped":0,"pct":88.88}}
11
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/testUtils.ts": {"lines":{"total":18,"covered":18,"skipped":0,"pct":100},"functions":{"total":9,"covered":9,"skipped":0,"pct":100},"statements":{"total":24,"covered":24,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
12
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/tsUtils.ts": {"lines":{"total":46,"covered":42,"skipped":0,"pct":91.3},"functions":{"total":15,"covered":15,"skipped":0,"pct":100},"statements":{"total":51,"covered":45,"skipped":0,"pct":88.23},"branches":{"total":36,"covered":27,"skipped":0,"pct":75}}
13
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/updateMainFile.ts": {"lines":{"total":90,"covered":84,"skipped":0,"pct":93.33},"functions":{"total":9,"covered":9,"skipped":0,"pct":100},"statements":{"total":97,"covered":88,"skipped":0,"pct":90.72},"branches":{"total":36,"covered":26,"skipped":0,"pct":72.22}}
14
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/utils.ts": {"lines":{"total":5,"covered":5,"skipped":0,"pct":100},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":6,"covered":6,"skipped":0,"pct":100},"branches":{"total":4,"covered":4,"skipped":0,"pct":100}}
15
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/updateTableFile/changeTable.ts": {"lines":{"total":248,"covered":240,"skipped":0,"pct":96.77},"functions":{"total":25,"covered":24,"skipped":0,"pct":96},"statements":{"total":281,"covered":255,"skipped":0,"pct":90.74},"branches":{"total":146,"covered":118,"skipped":0,"pct":80.82}}
16
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/updateTableFile/createTable.ts": {"lines":{"total":21,"covered":20,"skipped":0,"pct":95.23},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":22,"covered":21,"skipped":0,"pct":95.45},"branches":{"total":3,"covered":2,"skipped":0,"pct":66.66}}
17
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/updateTableFile/renameTable.ts": {"lines":{"total":30,"covered":30,"skipped":0,"pct":100},"functions":{"total":4,"covered":3,"skipped":0,"pct":75},"statements":{"total":36,"covered":32,"skipped":0,"pct":88.88},"branches":{"total":22,"covered":18,"skipped":0,"pct":81.81}}
18
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/updateTableFile/updateTableFile.ts": {"lines":{"total":11,"covered":11,"skipped":0,"pct":100},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":12,"covered":12,"skipped":0,"pct":100},"branches":{"total":7,"covered":7,"skipped":0,"pct":100}}
19
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/relations/belongsTo.ts": {"lines":{"total":111,"covered":111,"skipped":0,"pct":100},"functions":{"total":28,"covered":28,"skipped":0,"pct":100},"statements":{"total":114,"covered":114,"skipped":0,"pct":100},"branches":{"total":69,"covered":68,"skipped":0,"pct":98.55}}
20
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/relations/hasAndBelongsToMany.ts": {"lines":{"total":128,"covered":128,"skipped":0,"pct":100},"functions":{"total":41,"covered":41,"skipped":0,"pct":100},"statements":{"total":136,"covered":136,"skipped":0,"pct":100},"branches":{"total":31,"covered":30,"skipped":0,"pct":96.77}}
21
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/relations/hasMany.ts": {"lines":{"total":97,"covered":97,"skipped":0,"pct":100},"functions":{"total":33,"covered":33,"skipped":0,"pct":100},"statements":{"total":102,"covered":102,"skipped":0,"pct":100},"branches":{"total":37,"covered":35,"skipped":0,"pct":94.59}}
22
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/relations/hasOne.ts": {"lines":{"total":82,"covered":82,"skipped":0,"pct":100},"functions":{"total":27,"covered":27,"skipped":0,"pct":100},"statements":{"total":86,"covered":86,"skipped":0,"pct":100},"branches":{"total":35,"covered":35,"skipped":0,"pct":100}}
23
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/relations/relations.ts": {"lines":{"total":98,"covered":93,"skipped":0,"pct":94.89},"functions":{"total":10,"covered":10,"skipped":0,"pct":100},"statements":{"total":101,"covered":96,"skipped":0,"pct":95.04},"branches":{"total":52,"covered":45,"skipped":0,"pct":86.53}}
24
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/relations/utils.ts": {"lines":{"total":34,"covered":34,"skipped":0,"pct":100},"functions":{"total":11,"covered":11,"skipped":0,"pct":100},"statements":{"total":39,"covered":39,"skipped":0,"pct":100},"branches":{"total":38,"covered":38,"skipped":0,"pct":100}}
25
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/test-utils/test-db.ts": {"lines":{"total":5,"covered":5,"skipped":0,"pct":100},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":8,"covered":8,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
26
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/test-utils/test-tables.ts": {"lines":{"total":59,"covered":53,"skipped":0,"pct":89.83},"functions":{"total":45,"covered":33,"skipped":0,"pct":73.33},"statements":{"total":74,"covered":62,"skipped":0,"pct":83.78},"branches":{"total":2,"covered":2,"skipped":0,"pct":100}}
27
+ ,"/home/romeo/dev/my/orchid-orm/packages/orm/src/test-utils/test-utils.ts": {"lines":{"total":53,"covered":53,"skipped":0,"pct":100},"functions":{"total":21,"covered":20,"skipped":0,"pct":95.23},"statements":{"total":64,"covered":63,"skipped":0,"pct":98.43},"branches":{"total":25,"covered":19,"skipped":0,"pct":76}}
28
+ }
package/dist/index.d.ts CHANGED
@@ -67,9 +67,9 @@ declare type OrchidORM<T extends TableClasses> = {
67
67
  $queryBuilder: Db;
68
68
  $close(): Promise<void>;
69
69
  };
70
- declare const orchidORM: <T extends TableClasses>({ log, logger, autoPreparedStatements, noPrimaryKey, ...options }: (Omit<AdapterOptions, "log"> | {
70
+ declare const orchidORM: <T extends TableClasses>({ log, logger, autoPreparedStatements, noPrimaryKey, ...options }: ({
71
71
  adapter: Adapter;
72
- }) & QueryLogOptions & {
72
+ } | Omit<AdapterOptions, "log">) & QueryLogOptions & {
73
73
  autoPreparedStatements?: boolean | undefined;
74
74
  noPrimaryKey?: NoPrimaryKeyOption | undefined;
75
75
  }, tables: T) => OrchidORM<T>;
@@ -192,8 +192,8 @@ declare const createBaseTable: <CT extends ColumnTypesBase>(options?: {
192
192
  xml: () => pqb.XMLColumn;
193
193
  json: <Type extends pqb.JSONTypeAny>(schemaOrFn: Type | ((j: {
194
194
  set: <Value extends pqb.JSONTypeAny>(valueType: Value) => pqb.JSONSet<Value>;
195
- tuple: <T_1 extends pqb.JSONTupleItems | [], Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest) => pqb.JSONTuple<T_1, Rest>;
196
- union: <T_2 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_2) => pqb.JSONUnion<T_2>;
195
+ tuple: <T_1 extends [] | pqb.JSONTupleItems, Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest | undefined) => pqb.JSONTuple<T_1, Rest>;
196
+ union: <T_1 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_1) => pqb.JSONUnion<T_1>;
197
197
  any: () => pqb.JSONAny;
198
198
  bigint: () => pqb.JSONBigInt;
199
199
  boolean: () => pqb.JSONBoolean;
@@ -208,47 +208,47 @@ declare const createBaseTable: <CT extends ColumnTypesBase>(options?: {
208
208
  void: () => pqb.JSONVoid;
209
209
  array: <Type_1 extends pqb.JSONTypeAny>(element: Type_1) => pqb.JSONArray<Type_1, "many">;
210
210
  discriminatedUnion: <Discriminator extends string, DiscriminatorValue extends pqb.Primitive, Types extends [pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, ...pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>[]]>(discriminator: Discriminator, options: Types) => pqb.JSONDiscriminatedUnion<Discriminator, DiscriminatorValue, Types[number]>;
211
- enum: <U_1 extends string, T_3 extends [U_1, ...U_1[]]>(options: T_3) => pqb.JSONEnum<U_1, T_3>;
212
- instanceOf: <T_4 extends new (...args: any[]) => any>(cls: T_4) => pqb.JSONInstanceOf<T_4>;
211
+ enum: <U_1 extends string, T_2 extends [U_1, ...U_1[]]>(options: T_2) => pqb.JSONEnum<U_1, T_2>;
212
+ instanceOf: <T_3 extends new (...args: any[]) => any>(cls: T_3) => pqb.JSONInstanceOf<T_3>;
213
213
  intersection: <Left extends pqb.JSONTypeAny, Right extends pqb.JSONTypeAny>(left: Left, right: Right) => pqb.JSONIntersection<Left, Right>;
214
- lazy: <T_5 extends pqb.JSONTypeAny>(fn: () => T_5) => pqb.JSONLazy<T_5>;
215
- literal: <T_6 extends pqb.Primitive>(value: T_6) => pqb.JSONLiteral<T_6>;
214
+ lazy: <T_4 extends pqb.JSONTypeAny>(fn: () => T_4) => pqb.JSONLazy<T_4>;
215
+ literal: <T_5 extends pqb.Primitive>(value: T_5) => pqb.JSONLiteral<T_5>;
216
216
  map: <Key extends pqb.JSONTypeAny, Value_1 extends pqb.JSONTypeAny>(keyType: Key, valueType: Value_1) => pqb.JSONMap<Key, Value_1>;
217
- nativeEnum: <T_7 extends pqb.EnumLike>(givenEnum: T_7) => pqb.JSONNativeEnum<T_7>;
218
- nullable: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullable<T_8>;
219
- nullish: <T_9 extends pqb.JSONTypeAny>(type: T_9) => pqb.JSONNullish<T_9>;
220
- object: <T_10 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_10) => pqb.JSONObject<T_10, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
217
+ nativeEnum: <T_6 extends pqb.EnumLike>(givenEnum: T_6) => pqb.JSONNativeEnum<T_6>;
218
+ nullable: <T_7 extends pqb.JSONTypeAny>(type: T_7) => pqb.JSONNullable<T_7>;
219
+ nullish: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullish<T_8>;
220
+ object: <T_9 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_9) => pqb.JSONObject<T_9, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_9]: T_9[k_1]["type"]; }> extends infer T_10 extends object ? { [k in keyof T_10]: pqb.addQuestionMarks<{ [k_1_1 in keyof T_9]: T_9[k_1_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1_2 in keyof T_9]: T_9[k_1_2]["type"]; }> extends infer T_10_1 extends object ? { [k_2 in keyof T_10_1]: pqb.addQuestionMarks<{ [k_1_3 in keyof T_9]: T_9[k_1_3]["type"]; }>[k_2]; } : never) & {
221
221
  [k: string]: Catchall["type"];
222
- } extends infer T_12 extends object ? { [k_2 in keyof T_12]: ((pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
222
+ } extends infer T_11 extends object ? { [k_2 in keyof T_11]: ((pqb.addQuestionMarks<{ [k_1_4 in keyof T_9]: T_9[k_1_4]["type"]; }> extends infer T_10_2 extends object ? { [k_3 in keyof T_10_2]: pqb.addQuestionMarks<{ [k_1_5 in keyof T_9]: T_9[k_1_5]["type"]; }>[k_3]; } : never) & {
223
223
  [k: string]: Catchall["type"];
224
224
  })[k_2]; } : never>;
225
- optional: <T_13 extends pqb.JSONTypeAny>(type: T_13) => pqb.JSONOptional<T_13>;
225
+ optional: <T_12 extends pqb.JSONTypeAny>(type: T_12) => pqb.JSONOptional<T_12>;
226
226
  record: typeof pqb.record;
227
227
  }) => Type)) => pqb.JSONColumn<Type>;
228
228
  jsonText: () => pqb.JSONTextColumn;
229
229
  array: <Item extends pqb.ColumnType<unknown, pqb.Operators, unknown>>(item: Item) => pqb.ArrayColumn<Item>;
230
- timestamps: <T_14 extends pqb.ColumnType<unknown, pqb.Operators, unknown>>(this: {
231
- timestamp(): T_14;
230
+ timestamps: <T_13 extends pqb.ColumnType<unknown, pqb.Operators, unknown>>(this: {
231
+ timestamp(): T_13;
232
232
  }) => {
233
- createdAt: T_14 & {
233
+ createdAt: T_13 & {
234
234
  hasDefault: true;
235
235
  };
236
- updatedAt: T_14 & {
236
+ updatedAt: T_13 & {
237
237
  hasDefault: true;
238
238
  };
239
239
  };
240
240
  primaryKey(columns: string[], options?: {
241
241
  name?: string | undefined;
242
242
  } | undefined): {};
243
- index(columns: pqb.MaybeArray<string | pqb.IndexColumnOptions>, options?: pqb.IndexOptions): {};
244
- unique(columns: pqb.MaybeArray<string | pqb.IndexColumnOptions>, options?: pqb.IndexOptions): {};
243
+ index(columns: pqb.MaybeArray<string | pqb.IndexColumnOptions>, options?: pqb.IndexOptions | undefined): {};
244
+ unique(columns: pqb.MaybeArray<string | pqb.IndexColumnOptions>, options?: pqb.IndexOptions | undefined): {};
245
245
  foreignKey: {
246
246
  <Table_1 extends pqb.ForeignKeyTableWithColumns, Columns extends [Exclude<keyof InstanceType<Table_1>["columns"]["shape"], number | symbol>, ...Exclude<keyof InstanceType<Table_1>["columns"]["shape"], number | symbol>[]]>(columns: string[], fn: () => Table_1, foreignColumns: Columns, options?: pqb.ForeignKeyOptions | undefined): {};
247
247
  <Table_2 extends string, Columns_1 extends [string, ...string[]]>(columns: string[], table: Table_2, foreignColumns: Columns_1, options?: pqb.ForeignKeyOptions | undefined): {};
248
248
  };
249
249
  } : CT;
250
250
  noPrimaryKey?: boolean | undefined;
251
- setColumns: <T_15 extends ColumnsShape>(fn: (t: ColumnTypesBase extends CT ? {
251
+ setColumns: <T_14 extends ColumnsShape>(fn: (t: ColumnTypesBase extends CT ? {
252
252
  smallint: () => pqb.SmallIntColumn;
253
253
  integer: () => pqb.IntegerColumn;
254
254
  bigint: () => pqb.BigIntColumn;
@@ -292,8 +292,8 @@ declare const createBaseTable: <CT extends ColumnTypesBase>(options?: {
292
292
  xml: () => pqb.XMLColumn;
293
293
  json: <Type extends pqb.JSONTypeAny>(schemaOrFn: Type | ((j: {
294
294
  set: <Value extends pqb.JSONTypeAny>(valueType: Value) => pqb.JSONSet<Value>;
295
- tuple: <T_1 extends pqb.JSONTupleItems | [], Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest) => pqb.JSONTuple<T_1, Rest>;
296
- union: <T_2 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_2) => pqb.JSONUnion<T_2>;
295
+ tuple: <T_1 extends [] | pqb.JSONTupleItems, Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest | undefined) => pqb.JSONTuple<T_1, Rest>;
296
+ union: <T_1 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_1) => pqb.JSONUnion<T_1>;
297
297
  any: () => pqb.JSONAny;
298
298
  bigint: () => pqb.JSONBigInt;
299
299
  boolean: () => pqb.JSONBoolean;
@@ -308,47 +308,47 @@ declare const createBaseTable: <CT extends ColumnTypesBase>(options?: {
308
308
  void: () => pqb.JSONVoid;
309
309
  array: <Type_1 extends pqb.JSONTypeAny>(element: Type_1) => pqb.JSONArray<Type_1, "many">;
310
310
  discriminatedUnion: <Discriminator extends string, DiscriminatorValue extends pqb.Primitive, Types extends [pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, ...pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>[]]>(discriminator: Discriminator, options: Types) => pqb.JSONDiscriminatedUnion<Discriminator, DiscriminatorValue, Types[number]>;
311
- enum: <U_1 extends string, T_3 extends [U_1, ...U_1[]]>(options: T_3) => pqb.JSONEnum<U_1, T_3>;
312
- instanceOf: <T_4 extends new (...args: any[]) => any>(cls: T_4) => pqb.JSONInstanceOf<T_4>;
311
+ enum: <U_1 extends string, T_2 extends [U_1, ...U_1[]]>(options: T_2) => pqb.JSONEnum<U_1, T_2>;
312
+ instanceOf: <T_3 extends new (...args: any[]) => any>(cls: T_3) => pqb.JSONInstanceOf<T_3>;
313
313
  intersection: <Left extends pqb.JSONTypeAny, Right extends pqb.JSONTypeAny>(left: Left, right: Right) => pqb.JSONIntersection<Left, Right>;
314
- lazy: <T_5 extends pqb.JSONTypeAny>(fn: () => T_5) => pqb.JSONLazy<T_5>;
315
- literal: <T_6 extends pqb.Primitive>(value: T_6) => pqb.JSONLiteral<T_6>;
314
+ lazy: <T_4 extends pqb.JSONTypeAny>(fn: () => T_4) => pqb.JSONLazy<T_4>;
315
+ literal: <T_5 extends pqb.Primitive>(value: T_5) => pqb.JSONLiteral<T_5>;
316
316
  map: <Key extends pqb.JSONTypeAny, Value_1 extends pqb.JSONTypeAny>(keyType: Key, valueType: Value_1) => pqb.JSONMap<Key, Value_1>;
317
- nativeEnum: <T_7 extends pqb.EnumLike>(givenEnum: T_7) => pqb.JSONNativeEnum<T_7>;
318
- nullable: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullable<T_8>;
319
- nullish: <T_9 extends pqb.JSONTypeAny>(type: T_9) => pqb.JSONNullish<T_9>;
320
- object: <T_10 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_10) => pqb.JSONObject<T_10, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
317
+ nativeEnum: <T_6 extends pqb.EnumLike>(givenEnum: T_6) => pqb.JSONNativeEnum<T_6>;
318
+ nullable: <T_7 extends pqb.JSONTypeAny>(type: T_7) => pqb.JSONNullable<T_7>;
319
+ nullish: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullish<T_8>;
320
+ object: <T_9 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_9) => pqb.JSONObject<T_9, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_9]: T_9[k_1]["type"]; }> extends infer T_10 extends object ? { [k in keyof T_10]: pqb.addQuestionMarks<{ [k_1_1 in keyof T_9]: T_9[k_1_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1_2 in keyof T_9]: T_9[k_1_2]["type"]; }> extends infer T_10_1 extends object ? { [k_2 in keyof T_10_1]: pqb.addQuestionMarks<{ [k_1_3 in keyof T_9]: T_9[k_1_3]["type"]; }>[k_2]; } : never) & {
321
321
  [k: string]: Catchall["type"];
322
- } extends infer T_12 extends object ? { [k_2 in keyof T_12]: ((pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
322
+ } extends infer T_11 extends object ? { [k_2 in keyof T_11]: ((pqb.addQuestionMarks<{ [k_1_4 in keyof T_9]: T_9[k_1_4]["type"]; }> extends infer T_10_2 extends object ? { [k_3 in keyof T_10_2]: pqb.addQuestionMarks<{ [k_1_5 in keyof T_9]: T_9[k_1_5]["type"]; }>[k_3]; } : never) & {
323
323
  [k: string]: Catchall["type"];
324
324
  })[k_2]; } : never>;
325
- optional: <T_13 extends pqb.JSONTypeAny>(type: T_13) => pqb.JSONOptional<T_13>;
325
+ optional: <T_12 extends pqb.JSONTypeAny>(type: T_12) => pqb.JSONOptional<T_12>;
326
326
  record: typeof pqb.record;
327
327
  }) => Type)) => pqb.JSONColumn<Type>;
328
328
  jsonText: () => pqb.JSONTextColumn;
329
329
  array: <Item extends pqb.ColumnType<unknown, pqb.Operators, unknown>>(item: Item) => pqb.ArrayColumn<Item>;
330
- timestamps: <T_14 extends pqb.ColumnType<unknown, pqb.Operators, unknown>>(this: {
331
- timestamp(): T_14;
330
+ timestamps: <T_13 extends pqb.ColumnType<unknown, pqb.Operators, unknown>>(this: {
331
+ timestamp(): T_13;
332
332
  }) => {
333
- createdAt: T_14 & {
333
+ createdAt: T_13 & {
334
334
  hasDefault: true;
335
335
  };
336
- updatedAt: T_14 & {
336
+ updatedAt: T_13 & {
337
337
  hasDefault: true;
338
338
  };
339
339
  };
340
340
  primaryKey(columns: string[], options?: {
341
341
  name?: string | undefined;
342
342
  } | undefined): {};
343
- index(columns: pqb.MaybeArray<string | pqb.IndexColumnOptions>, options?: pqb.IndexOptions): {};
344
- unique(columns: pqb.MaybeArray<string | pqb.IndexColumnOptions>, options?: pqb.IndexOptions): {};
343
+ index(columns: pqb.MaybeArray<string | pqb.IndexColumnOptions>, options?: pqb.IndexOptions | undefined): {};
344
+ unique(columns: pqb.MaybeArray<string | pqb.IndexColumnOptions>, options?: pqb.IndexOptions | undefined): {};
345
345
  foreignKey: {
346
346
  <Table_1 extends pqb.ForeignKeyTableWithColumns, Columns extends [Exclude<keyof InstanceType<Table_1>["columns"]["shape"], number | symbol>, ...Exclude<keyof InstanceType<Table_1>["columns"]["shape"], number | symbol>[]]>(columns: string[], fn: () => Table_1, foreignColumns: Columns, options?: pqb.ForeignKeyOptions | undefined): {};
347
347
  <Table_2 extends string, Columns_1 extends [string, ...string[]]>(columns: string[], table: Table_2, foreignColumns: Columns_1, options?: pqb.ForeignKeyOptions | undefined): {};
348
348
  };
349
- } : CT) => T_15) => {
350
- shape: T_15;
351
- type: ColumnShapeOutput<T_15>;
349
+ } : CT) => T_14) => {
350
+ shape: T_14;
351
+ type: ColumnShapeOutput<T_14>;
352
352
  };
353
353
  belongsTo<Self extends any, Related extends TableClass<Table>, Scope extends Query, Options extends {
354
354
  primaryKey: keyof InstanceType<Related>["columns"]["shape"];
package/dist/index.js CHANGED
@@ -1591,7 +1591,7 @@ const ts = {
1591
1591
  };
1592
1592
 
1593
1593
  const getImportPath = (from, to) => {
1594
- const rel = path__default["default"].posix.relative(path__default["default"].dirname(from), to);
1594
+ const rel = path__default["default"].relative(path__default["default"].dirname(from), to).split(path__default["default"].sep).join(path__default["default"].posix.sep);
1595
1595
  const importPath = rel.startsWith("./") || rel.startsWith("../") ? rel : `./${rel}`;
1596
1596
  return importPath.replace(/\.[tj]s$/, "");
1597
1597
  };