@type32/tauri-sqlite-orm 0.1.18-6 → 0.1.18-7

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 (5) hide show
  1. package/dist/index.d.mts +7 -6
  2. package/dist/index.d.ts +7 -6
  3. package/dist/index.js +1 -1
  4. package/dist/index.mjs +1 -1
  5. package/package.json +1 -1
package/dist/index.d.mts CHANGED
@@ -33,7 +33,7 @@ declare class SQLiteColumn<TName extends string = string, TType extends ColumnDa
33
33
  notNull(): SQLiteColumn<TName, TType, TMode, true, THasDefault, TAutoincrement>;
34
34
  default(value: ColumnValueTypes<TType, TMode>): SQLiteColumn<TName, TType, TMode, TNotNull, true, TAutoincrement>;
35
35
  $defaultFn(fn: () => ColumnValueTypes<TType, TMode>): SQLiteColumn<TName, TType, TMode, TNotNull, true, TAutoincrement>;
36
- primaryKey(): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
36
+ primaryKey(): SQLiteColumn<TName, TType, TMode, true, THasDefault, TAutoincrement>;
37
37
  autoincrement(): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, true>;
38
38
  unique(): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
39
39
  references<T extends AnyTable, K extends keyof T["_"]["columns"] & string>(ref: T, column: K): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
@@ -52,11 +52,12 @@ type AnyTable = Table<Record<string, AnySQLiteColumn>, string>;
52
52
  type InferSelectModel<T extends AnyTable> = {
53
53
  [K in keyof T["_"]["columns"]]: ExtractColumnType<T["_"]["columns"][K]>;
54
54
  };
55
- type RequiredColumns<TColumns extends Record<string, AnySQLiteColumn>> = {
56
- [K in keyof TColumns]: TColumns[K]["_"]["notNull"] extends true ? TColumns[K]["_"]["hasDefault"] extends true ? never : K : never;
57
- }[keyof TColumns];
55
+ type IsOptionalOnInsert<C extends AnySQLiteColumn> = C["_"]["notNull"] extends false ? true : C["_"]["hasDefault"] extends true ? true : C["_"]["autoincrement"] extends true ? true : false;
58
56
  type OptionalColumns<TColumns extends Record<string, AnySQLiteColumn>> = {
59
- [K in keyof TColumns]: TColumns[K]["_"]["notNull"] extends true ? TColumns[K]["_"]["hasDefault"] extends true ? K : never : K;
57
+ [K in keyof TColumns]: IsOptionalOnInsert<TColumns[K]> extends true ? K : never;
58
+ }[keyof TColumns];
59
+ type RequiredColumns<TColumns extends Record<string, AnySQLiteColumn>> = {
60
+ [K in keyof TColumns]: IsOptionalOnInsert<TColumns[K]> extends true ? never : K;
60
61
  }[keyof TColumns];
61
62
  type InferInsertModel<T extends AnyTable> = {
62
63
  [K in RequiredColumns<T["_"]["columns"]>]: ExtractColumnType<T["_"]["columns"][K]>;
@@ -145,7 +146,7 @@ declare class InsertQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
145
146
  private conflictTarget;
146
147
  private updateSet;
147
148
  constructor(db: Database, table: T);
148
- values(data: Partial<InferInsertModel<T>> | Partial<InferInsertModel<T>>[]): this;
149
+ values(data: InferInsertModel<T> | InferInsertModel<T>[]): this;
149
150
  returning(...columns: (keyof T["_"]["columns"])[]): this;
150
151
  onConflictDoNothing(target?: AnySQLiteColumn | AnySQLiteColumn[]): this;
151
152
  onConflictDoUpdate(config: {
package/dist/index.d.ts CHANGED
@@ -33,7 +33,7 @@ declare class SQLiteColumn<TName extends string = string, TType extends ColumnDa
33
33
  notNull(): SQLiteColumn<TName, TType, TMode, true, THasDefault, TAutoincrement>;
34
34
  default(value: ColumnValueTypes<TType, TMode>): SQLiteColumn<TName, TType, TMode, TNotNull, true, TAutoincrement>;
35
35
  $defaultFn(fn: () => ColumnValueTypes<TType, TMode>): SQLiteColumn<TName, TType, TMode, TNotNull, true, TAutoincrement>;
36
- primaryKey(): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
36
+ primaryKey(): SQLiteColumn<TName, TType, TMode, true, THasDefault, TAutoincrement>;
37
37
  autoincrement(): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, true>;
38
38
  unique(): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
39
39
  references<T extends AnyTable, K extends keyof T["_"]["columns"] & string>(ref: T, column: K): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
@@ -52,11 +52,12 @@ type AnyTable = Table<Record<string, AnySQLiteColumn>, string>;
52
52
  type InferSelectModel<T extends AnyTable> = {
53
53
  [K in keyof T["_"]["columns"]]: ExtractColumnType<T["_"]["columns"][K]>;
54
54
  };
55
- type RequiredColumns<TColumns extends Record<string, AnySQLiteColumn>> = {
56
- [K in keyof TColumns]: TColumns[K]["_"]["notNull"] extends true ? TColumns[K]["_"]["hasDefault"] extends true ? never : K : never;
57
- }[keyof TColumns];
55
+ type IsOptionalOnInsert<C extends AnySQLiteColumn> = C["_"]["notNull"] extends false ? true : C["_"]["hasDefault"] extends true ? true : C["_"]["autoincrement"] extends true ? true : false;
58
56
  type OptionalColumns<TColumns extends Record<string, AnySQLiteColumn>> = {
59
- [K in keyof TColumns]: TColumns[K]["_"]["notNull"] extends true ? TColumns[K]["_"]["hasDefault"] extends true ? K : never : K;
57
+ [K in keyof TColumns]: IsOptionalOnInsert<TColumns[K]> extends true ? K : never;
58
+ }[keyof TColumns];
59
+ type RequiredColumns<TColumns extends Record<string, AnySQLiteColumn>> = {
60
+ [K in keyof TColumns]: IsOptionalOnInsert<TColumns[K]> extends true ? never : K;
60
61
  }[keyof TColumns];
61
62
  type InferInsertModel<T extends AnyTable> = {
62
63
  [K in RequiredColumns<T["_"]["columns"]>]: ExtractColumnType<T["_"]["columns"][K]>;
@@ -145,7 +146,7 @@ declare class InsertQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
145
146
  private conflictTarget;
146
147
  private updateSet;
147
148
  constructor(db: Database, table: T);
148
- values(data: Partial<InferInsertModel<T>> | Partial<InferInsertModel<T>>[]): this;
149
+ values(data: InferInsertModel<T> | InferInsertModel<T>[]): this;
149
150
  returning(...columns: (keyof T["_"]["columns"])[]): this;
150
151
  onConflictDoNothing(target?: AnySQLiteColumn | AnySQLiteColumn[]): this;
151
152
  onConflictDoUpdate(config: {
package/dist/index.js CHANGED
@@ -104,7 +104,7 @@ var SQLiteColumn = class _SQLiteColumn {
104
104
  return new _SQLiteColumn(
105
105
  this._.name,
106
106
  this.type,
107
- { ...this.options, primaryKey: true },
107
+ { ...this.options, primaryKey: true, notNull: true },
108
108
  this._.mode
109
109
  );
110
110
  }
package/dist/index.mjs CHANGED
@@ -41,7 +41,7 @@ var SQLiteColumn = class _SQLiteColumn {
41
41
  return new _SQLiteColumn(
42
42
  this._.name,
43
43
  this.type,
44
- { ...this.options, primaryKey: true },
44
+ { ...this.options, primaryKey: true, notNull: true },
45
45
  this._.mode
46
46
  );
47
47
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@type32/tauri-sqlite-orm",
3
- "version": "0.1.18-6",
3
+ "version": "0.1.18-7",
4
4
  "description": "A Drizzle-like ORM for Tauri v2's SQL JS API plugin.",
5
5
  "main": "./dist/index.js",
6
6
  "module": "./dist/index.mjs",