@astrojs/db 0.16.0 → 0.16.1

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.
@@ -1,7 +1,7 @@
1
1
  import type { ColumnBaseConfig, ColumnDataType } from 'drizzle-orm';
2
2
  import type { SQLiteColumn, SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core';
3
3
  import type { ColumnsConfig, DBColumn, OutputColumnsConfig } from '../core/types.js';
4
- type GeneratedConfig<T extends ColumnDataType = ColumnDataType> = Pick<ColumnBaseConfig<T, string>, 'name' | 'tableName' | 'notNull' | 'hasDefault'>;
4
+ type GeneratedConfig<T extends ColumnDataType = ColumnDataType> = Pick<ColumnBaseConfig<T, string>, 'name' | 'tableName' | 'notNull' | 'hasDefault' | 'hasRuntimeDefault' | 'isPrimaryKey'>;
5
5
  type AstroText<T extends GeneratedConfig<'string'>> = SQLiteColumn<T & {
6
6
  data: string;
7
7
  dataType: 'string';
@@ -9,9 +9,9 @@ type AstroText<T extends GeneratedConfig<'string'>> = SQLiteColumn<T & {
9
9
  driverParam: string;
10
10
  enumValues: never;
11
11
  baseColumn: never;
12
- isPrimaryKey: boolean;
13
12
  isAutoincrement: boolean;
14
- hasRuntimeDefault: boolean;
13
+ identity: undefined;
14
+ generated: undefined;
15
15
  }>;
16
16
  type AstroDate<T extends GeneratedConfig<'custom'>> = SQLiteColumn<T & {
17
17
  data: Date;
@@ -20,9 +20,9 @@ type AstroDate<T extends GeneratedConfig<'custom'>> = SQLiteColumn<T & {
20
20
  driverParam: string;
21
21
  enumValues: never;
22
22
  baseColumn: never;
23
- isPrimaryKey: boolean;
24
23
  isAutoincrement: boolean;
25
- hasRuntimeDefault: boolean;
24
+ identity: undefined;
25
+ generated: undefined;
26
26
  }>;
27
27
  type AstroBoolean<T extends GeneratedConfig<'boolean'>> = SQLiteColumn<T & {
28
28
  data: boolean;
@@ -31,9 +31,9 @@ type AstroBoolean<T extends GeneratedConfig<'boolean'>> = SQLiteColumn<T & {
31
31
  driverParam: number;
32
32
  enumValues: never;
33
33
  baseColumn: never;
34
- isPrimaryKey: boolean;
35
34
  isAutoincrement: boolean;
36
- hasRuntimeDefault: boolean;
35
+ identity: undefined;
36
+ generated: undefined;
37
37
  }>;
38
38
  type AstroNumber<T extends GeneratedConfig<'number'>> = SQLiteColumn<T & {
39
39
  data: number;
@@ -42,9 +42,9 @@ type AstroNumber<T extends GeneratedConfig<'number'>> = SQLiteColumn<T & {
42
42
  driverParam: number;
43
43
  enumValues: never;
44
44
  baseColumn: never;
45
- isPrimaryKey: boolean;
46
45
  isAutoincrement: boolean;
47
- hasRuntimeDefault: boolean;
46
+ identity: undefined;
47
+ generated: undefined;
48
48
  }>;
49
49
  type AstroJson<T extends GeneratedConfig<'custom'>> = SQLiteColumn<T & {
50
50
  data: unknown;
@@ -53,9 +53,9 @@ type AstroJson<T extends GeneratedConfig<'custom'>> = SQLiteColumn<T & {
53
53
  driverParam: string;
54
54
  enumValues: never;
55
55
  baseColumn: never;
56
- isPrimaryKey: boolean;
57
56
  isAutoincrement: boolean;
58
- hasRuntimeDefault: boolean;
57
+ identity: undefined;
58
+ generated: undefined;
59
59
  }>;
60
60
  type Column<T extends DBColumn['type'], S extends GeneratedConfig> = T extends 'boolean' ? AstroBoolean<S> : T extends 'number' ? AstroNumber<S> : T extends 'text' ? AstroText<S> : T extends 'date' ? AstroDate<S> : T extends 'json' ? AstroJson<S> : never;
61
61
  export type Table<TTableName extends string, TColumns extends OutputColumnsConfig | ColumnsConfig> = SQLiteTableWithColumns<{
@@ -66,11 +66,17 @@ export type Table<TTableName extends string, TColumns extends OutputColumnsConfi
66
66
  [K in Extract<keyof TColumns, string>]: Column<TColumns[K]['type'], {
67
67
  tableName: TTableName;
68
68
  name: K;
69
+ isPrimaryKey: TColumns[K]['schema'] extends {
70
+ primaryKey: true;
71
+ } ? true : false;
69
72
  hasDefault: TColumns[K]['schema'] extends {
70
73
  default: NonNullable<unknown>;
71
74
  } ? true : TColumns[K]['schema'] extends {
72
75
  primaryKey: true;
73
76
  } ? true : false;
77
+ hasRuntimeDefault: TColumns[K]['schema'] extends {
78
+ default: NonNullable<unknown>;
79
+ } ? true : false;
74
80
  notNull: TColumns[K]['schema']['optional'] extends true ? false : true;
75
81
  }>;
76
82
  };
@@ -27,7 +27,7 @@ function printHelp({
27
27
  message.push(
28
28
  linebreak(),
29
29
  ` ${bgGreen(black(` ${commandName} `))} ${green(
30
- `v${"0.16.0"}`
30
+ `v${"0.16.1"}`
31
31
  )} ${headline}`
32
32
  );
33
33
  }
@@ -1,7 +1,7 @@
1
1
  import type { ColumnBaseConfig, ColumnDataType } from 'drizzle-orm';
2
2
  import type { SQLiteColumn, SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core';
3
3
  import type { ColumnsConfig, DBColumn, OutputColumnsConfig } from '../core/types.js';
4
- type GeneratedConfig<T extends ColumnDataType = ColumnDataType> = Pick<ColumnBaseConfig<T, string>, 'name' | 'tableName' | 'notNull' | 'hasDefault'>;
4
+ type GeneratedConfig<T extends ColumnDataType = ColumnDataType> = Pick<ColumnBaseConfig<T, string>, 'name' | 'tableName' | 'notNull' | 'hasDefault' | 'hasRuntimeDefault' | 'isPrimaryKey'>;
5
5
  type AstroText<T extends GeneratedConfig<'string'>> = SQLiteColumn<T & {
6
6
  data: string;
7
7
  dataType: 'string';
@@ -9,9 +9,9 @@ type AstroText<T extends GeneratedConfig<'string'>> = SQLiteColumn<T & {
9
9
  driverParam: string;
10
10
  enumValues: never;
11
11
  baseColumn: never;
12
- isPrimaryKey: boolean;
13
12
  isAutoincrement: boolean;
14
- hasRuntimeDefault: boolean;
13
+ identity: undefined;
14
+ generated: undefined;
15
15
  }>;
16
16
  type AstroDate<T extends GeneratedConfig<'custom'>> = SQLiteColumn<T & {
17
17
  data: Date;
@@ -20,9 +20,9 @@ type AstroDate<T extends GeneratedConfig<'custom'>> = SQLiteColumn<T & {
20
20
  driverParam: string;
21
21
  enumValues: never;
22
22
  baseColumn: never;
23
- isPrimaryKey: boolean;
24
23
  isAutoincrement: boolean;
25
- hasRuntimeDefault: boolean;
24
+ identity: undefined;
25
+ generated: undefined;
26
26
  }>;
27
27
  type AstroBoolean<T extends GeneratedConfig<'boolean'>> = SQLiteColumn<T & {
28
28
  data: boolean;
@@ -31,9 +31,9 @@ type AstroBoolean<T extends GeneratedConfig<'boolean'>> = SQLiteColumn<T & {
31
31
  driverParam: number;
32
32
  enumValues: never;
33
33
  baseColumn: never;
34
- isPrimaryKey: boolean;
35
34
  isAutoincrement: boolean;
36
- hasRuntimeDefault: boolean;
35
+ identity: undefined;
36
+ generated: undefined;
37
37
  }>;
38
38
  type AstroNumber<T extends GeneratedConfig<'number'>> = SQLiteColumn<T & {
39
39
  data: number;
@@ -42,9 +42,9 @@ type AstroNumber<T extends GeneratedConfig<'number'>> = SQLiteColumn<T & {
42
42
  driverParam: number;
43
43
  enumValues: never;
44
44
  baseColumn: never;
45
- isPrimaryKey: boolean;
46
45
  isAutoincrement: boolean;
47
- hasRuntimeDefault: boolean;
46
+ identity: undefined;
47
+ generated: undefined;
48
48
  }>;
49
49
  type AstroJson<T extends GeneratedConfig<'custom'>> = SQLiteColumn<T & {
50
50
  data: unknown;
@@ -53,9 +53,9 @@ type AstroJson<T extends GeneratedConfig<'custom'>> = SQLiteColumn<T & {
53
53
  driverParam: string;
54
54
  enumValues: never;
55
55
  baseColumn: never;
56
- isPrimaryKey: boolean;
57
56
  isAutoincrement: boolean;
58
- hasRuntimeDefault: boolean;
57
+ identity: undefined;
58
+ generated: undefined;
59
59
  }>;
60
60
  type Column<T extends DBColumn['type'], S extends GeneratedConfig> = T extends 'boolean' ? AstroBoolean<S> : T extends 'number' ? AstroNumber<S> : T extends 'text' ? AstroText<S> : T extends 'date' ? AstroDate<S> : T extends 'json' ? AstroJson<S> : never;
61
61
  export type Table<TTableName extends string, TColumns extends OutputColumnsConfig | ColumnsConfig> = SQLiteTableWithColumns<{
@@ -66,11 +66,17 @@ export type Table<TTableName extends string, TColumns extends OutputColumnsConfi
66
66
  [K in Extract<keyof TColumns, string>]: Column<TColumns[K]['type'], {
67
67
  tableName: TTableName;
68
68
  name: K;
69
+ isPrimaryKey: TColumns[K]['schema'] extends {
70
+ primaryKey: true;
71
+ } ? true : false;
69
72
  hasDefault: TColumns[K]['schema'] extends {
70
73
  default: NonNullable<unknown>;
71
74
  } ? true : TColumns[K]['schema'] extends {
72
75
  primaryKey: true;
73
76
  } ? true : false;
77
+ hasRuntimeDefault: TColumns[K]['schema'] extends {
78
+ default: NonNullable<unknown>;
79
+ } ? true : false;
74
80
  notNull: TColumns[K]['schema']['optional'] extends true ? false : true;
75
81
  }>;
76
82
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@astrojs/db",
3
- "version": "0.16.0",
3
+ "version": "0.16.1",
4
4
  "description": "Add libSQL support to your Astro site",
5
5
  "license": "MIT",
6
6
  "repository": {