@kattebak/typespec-drizzle-orm-generator 3.6.0 → 3.8.0
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 +37 -1
- package/dist/assembler.d.ts +1 -0
- package/dist/assembler.d.ts.map +1 -1
- package/dist/assembler.js +10 -6
- package/dist/assembler.js.map +1 -1
- package/dist/codegen/ast-helpers.js +1 -1
- package/dist/codegen/ast-helpers.js.map +1 -1
- package/dist/decorators.d.ts +1 -1
- package/dist/decorators.d.ts.map +1 -1
- package/dist/decorators.js +2 -2
- package/dist/decorators.js.map +1 -1
- package/dist/generators/column-mapper.d.ts.map +1 -1
- package/dist/generators/column-mapper.js +9 -4
- package/dist/generators/column-mapper.js.map +1 -1
- package/dist/generators/describe-generator.js +11 -4
- package/dist/generators/describe-generator.js.map +1 -1
- package/dist/generators/dialect.d.ts +9 -1
- package/dist/generators/dialect.d.ts.map +1 -1
- package/dist/generators/dialect.js +67 -0
- package/dist/generators/dialect.js.map +1 -1
- package/dist/generators/index-generator.d.ts +1 -1
- package/dist/generators/index-generator.d.ts.map +1 -1
- package/dist/generators/index-generator.js +6 -4
- package/dist/generators/index-generator.js.map +1 -1
- package/dist/generators/schema-generator.js +32 -10
- package/dist/generators/schema-generator.js.map +1 -1
- package/dist/generators/types-generator.d.ts +1 -1
- package/dist/generators/types-generator.d.ts.map +1 -1
- package/dist/generators/types-generator.js +22 -5
- package/dist/generators/types-generator.js.map +1 -1
- package/dist/index.d.ts +34 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -1
- package/dist/index.js.map +1 -1
- package/dist/ir/builder.d.ts.map +1 -1
- package/dist/ir/builder.js +19 -7
- package/dist/ir/builder.js.map +1 -1
- package/dist/ir/remit-builder.d.ts +11 -0
- package/dist/ir/remit-builder.d.ts.map +1 -0
- package/dist/ir/remit-builder.js +279 -0
- package/dist/ir/remit-builder.js.map +1 -0
- package/dist/ir/types.d.ts +14 -0
- package/dist/ir/types.d.ts.map +1 -1
- package/package.json +9 -1
- package/tsp/main.tsp +5 -1
package/README.md
CHANGED
|
@@ -212,7 +212,10 @@ model Author {
|
|
|
212
212
|
@uuid("base36", true) // UUID with base36 encoding, auto-generated
|
|
213
213
|
authorId: string;
|
|
214
214
|
|
|
215
|
-
@references(Author.authorId)
|
|
215
|
+
@references(Author.authorId) // foreign key to another entity
|
|
216
|
+
authorId: string;
|
|
217
|
+
|
|
218
|
+
@references(Author.authorId, "CASCADE") // foreign key with ON DELETE policy
|
|
216
219
|
authorId: string;
|
|
217
220
|
|
|
218
221
|
@junction // on model: marks as many-to-many junction table
|
|
@@ -305,6 +308,39 @@ When using `sqlite`, types that don't exist natively in SQLite are mapped to com
|
|
|
305
308
|
| `string` (with length) | `varchar({ length })` | `text({ length })` |
|
|
306
309
|
| TypeSpec `enum` | `pgEnum()` | `text()` (no native enums in SQLite) |
|
|
307
310
|
|
|
311
|
+
## Front-end option
|
|
312
|
+
|
|
313
|
+
Set `frontend` in your `tspconfig.yaml` to choose which TypeSpec vocabulary the emitter reads. Defaults to `drizzle`.
|
|
314
|
+
|
|
315
|
+
| Value | Reads |
|
|
316
|
+
| --------- | -------------------------------------------------------------------- |
|
|
317
|
+
| `drizzle` | This library's own `@table` / `@pk` / `@references` decorators. |
|
|
318
|
+
| `remit` | The ElectroDB vocabulary (`@entity` / `@index`) from `typespec-electrodb-emitter`. |
|
|
319
|
+
|
|
320
|
+
The `remit` front-end maps an ElectroDB model to a table:
|
|
321
|
+
|
|
322
|
+
- **Primary key** is the entity's own identity field, `<entity>Id`, as a single column. The ElectroDB primary index is a DynamoDB access pattern, not the entity's identity, so it becomes an ordinary secondary index. An entity with no `<entity>Id` field keeps the ElectroDB primary composite as its key.
|
|
323
|
+
- Every `@index` becomes a named secondary index.
|
|
324
|
+
- **Enums** are text columns narrowed by a `$type` union, not pgEnums — a store that mirrors a DynamoDB port keeps enum values as strings and avoids an `ALTER TYPE` per new value.
|
|
325
|
+
- A `collection` shared by two or more entities becomes an `ON DELETE CASCADE` foreign key from each member to the entity that owns the shared partition key (unless `foreign-keys: false`).
|
|
326
|
+
|
|
327
|
+
```yaml
|
|
328
|
+
options:
|
|
329
|
+
"@kattebak/typespec-drizzle-orm-generator":
|
|
330
|
+
frontend: "remit"
|
|
331
|
+
schema-only: true
|
|
332
|
+
foreign-keys: false
|
|
333
|
+
id-default: true
|
|
334
|
+
```
|
|
335
|
+
|
|
336
|
+
## Schema-only output
|
|
337
|
+
|
|
338
|
+
`relations.ts`, `describe.ts`, and the `DrizzleClient` type use the Drizzle v2 relational API (`defineRelations`, `PgAsyncDatabase`). Set `schema-only: true` to emit just the table schema (`schema.ts` + the `base36Uuid` / nullable custom types), which stays compatible with Drizzle v1 consumers that manage relations themselves. The generated `package.json` then declares a `drizzle-orm` peer range of `>=0.30.0`.
|
|
339
|
+
|
|
340
|
+
## Foreign keys and id defaults
|
|
341
|
+
|
|
342
|
+
`foreign-keys: false` drops the collection-derived foreign keys for a consumer that manages referential integrity and delete cascades in the application (a database `ON DELETE CASCADE` would otherwise fight an app-managed cascade). `id-default: true` attaches `.$defaultFn(() => generateBase36Id())` to single-column text primary keys so a caller may omit the id. Both are honoured by the `remit` front-end.
|
|
343
|
+
|
|
308
344
|
## Type mapping (PostgreSQL)
|
|
309
345
|
|
|
310
346
|
| TypeSpec | Drizzle | PostgreSQL |
|
package/dist/assembler.d.ts
CHANGED
package/dist/assembler.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assembler.d.ts","sourceRoot":"","sources":["../src/assembler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAOvD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEvD,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"assembler.d.ts","sourceRoot":"","sources":["../src/assembler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAOvD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEvD,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,QAAQ,EAAE,EAClB,KAAK,EAAE,OAAO,EAAE,EAChB,MAAM,EAAE,aAAa,GACpB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAmBrB"}
|
package/dist/assembler.js
CHANGED
|
@@ -14,15 +14,19 @@ import { buildRelationGraph } from "./ir/relation-graph.js";
|
|
|
14
14
|
export function assemblePackage(tables, enums, config) {
|
|
15
15
|
const graph = buildRelationGraph(tables, config.pluralize);
|
|
16
16
|
const dialect = resolveDialect(config.dialect);
|
|
17
|
-
|
|
17
|
+
const schemaOnly = config.schemaOnly ?? false;
|
|
18
|
+
const files = new Map([
|
|
18
19
|
["package.json", generatePackageJson(config)],
|
|
19
20
|
["tsconfig.json", generateTsConfig()],
|
|
20
|
-
["types.ts", generateTypes(dialect)],
|
|
21
|
+
["types.ts", generateTypes(dialect, schemaOnly)],
|
|
21
22
|
["schema.ts", generateSchema(tables, enums, dialect, config.pluralize)],
|
|
22
|
-
["
|
|
23
|
-
["describe.ts", generateDescribe(tables, graph, config.pluralize)],
|
|
24
|
-
["index.ts", generateIndex()],
|
|
23
|
+
["index.ts", generateIndex(schemaOnly)],
|
|
25
24
|
]);
|
|
25
|
+
if (!schemaOnly) {
|
|
26
|
+
files.set("relations.ts", generateRelations(tables, graph, config.pluralize));
|
|
27
|
+
files.set("describe.ts", generateDescribe(tables, graph, config.pluralize));
|
|
28
|
+
}
|
|
29
|
+
return files;
|
|
26
30
|
}
|
|
27
31
|
function generatePackageJson(config) {
|
|
28
32
|
const pkg = {
|
|
@@ -45,7 +49,7 @@ function generatePackageJson(config) {
|
|
|
45
49
|
"short-uuid": "^5.2.0",
|
|
46
50
|
},
|
|
47
51
|
peerDependencies: {
|
|
48
|
-
"drizzle-orm": ">=1.0.0-beta.1",
|
|
52
|
+
"drizzle-orm": config.schemaOnly ? ">=0.30.0" : ">=1.0.0-beta.1",
|
|
49
53
|
typescript: ">=5.0.0",
|
|
50
54
|
},
|
|
51
55
|
};
|
package/dist/assembler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assembler.js","sourceRoot":"","sources":["../src/assembler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"assembler.js","sourceRoot":"","sources":["../src/assembler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-helpers.js","sourceRoot":"","sources":["../../src/codegen/ast-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,SAAS,kBAAkB,CAAC,IAAa,EAA4B;IACnE,OAAO,CACL,OAAO,IAAI,KAAK,QAAQ;QACxB,IAAI,KAAK,IAAI;QACZ,IAA0B,CAAC,IAAI,KAAK,kBAAkB,CACxD,CAAC;AAAA,CACH;AAED,MAAM,UAAU,MAAM,CAAC,KAAa,EAAU;IAC5C,OAAO,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"ast-helpers.js","sourceRoot":"","sources":["../../src/codegen/ast-helpers.ts"],"names":[],"mappings":"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"}
|
package/dist/decorators.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { DecoratorContext, Model, ModelProperty } from "@typespec/compiler"
|
|
|
2
2
|
export declare function $table(context: DecoratorContext, target: Model, name: string, service: string): void;
|
|
3
3
|
export declare function $primaryKey(context: DecoratorContext, target: Model, tableName: string): void;
|
|
4
4
|
export declare function $pk(context: DecoratorContext, target: ModelProperty): void;
|
|
5
|
-
export declare function $references(context: DecoratorContext, target: ModelProperty, ref: ModelProperty): void;
|
|
5
|
+
export declare function $references(context: DecoratorContext, target: ModelProperty, ref: ModelProperty, onDelete?: "CASCADE" | "RESTRICT"): void;
|
|
6
6
|
export declare function $junction(context: DecoratorContext, target: Model): void;
|
|
7
7
|
export declare function $uuid(context: DecoratorContext, target: ModelProperty, encoding: string, autoGenerate?: boolean): void;
|
|
8
8
|
export declare function $createdAt(context: DecoratorContext, target: ModelProperty): void;
|
package/dist/decorators.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGjF,wBAAgB,MAAM,CACpB,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,EACb,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,IAAI,CAEN;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAE7F;AAED,wBAAgB,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI,CAE1E;AAED,wBAAgB,WAAW,CACzB,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGjF,wBAAgB,MAAM,CACpB,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,EACb,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,IAAI,CAEN;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAE7F;AAED,wBAAgB,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI,CAE1E;AAED,wBAAgB,WAAW,CACzB,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,aAAa,EAClB,QAAQ,CAAC,EAAE,SAAS,GAAG,UAAU,GAChC,IAAI,CAEN;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI,CAExE;AAED,wBAAgB,KAAK,CACnB,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,OAAO,GACrB,IAAI,CAKN;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI,CAEjF;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI,CAEjF;AAED,wBAAgB,OAAO,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI,CAE9E;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,EACb,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,EAAE,GACvB,IAAI,CAQN;AAED,wBAAgB,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAEjG;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,EACb,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,EAAE,EACxB,MAAM,CAAC,EAAE,OAAO,GACf,IAAI,CAQN;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,EACb,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,EAAE,EACxB,cAAc,EAAE,aAAa,EAAE,GAC9B,IAAI,CAQN;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAE/F;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAE/F;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,MAAM,GACZ,IAAI,CAEN"}
|
package/dist/decorators.js
CHANGED
|
@@ -8,8 +8,8 @@ export function $primaryKey(context, target, tableName) {
|
|
|
8
8
|
export function $pk(context, target) {
|
|
9
9
|
context.program.stateSet(StateKeys.pk).add(target);
|
|
10
10
|
}
|
|
11
|
-
export function $references(context, target, ref) {
|
|
12
|
-
context.program.stateMap(StateKeys.references).set(target, ref);
|
|
11
|
+
export function $references(context, target, ref, onDelete) {
|
|
12
|
+
context.program.stateMap(StateKeys.references).set(target, { ref, onDelete });
|
|
13
13
|
}
|
|
14
14
|
export function $junction(context, target) {
|
|
15
15
|
context.program.stateSet(StateKeys.junction).add(target);
|
package/dist/decorators.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,MAAM,UAAU,MAAM,CACpB,OAAyB,EACzB,MAAa,EACb,IAAY,EACZ,OAAe,EACT;IACN,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAAA,CAC1E;AAED,MAAM,UAAU,WAAW,CAAC,OAAyB,EAAE,MAAa,EAAE,SAAiB,EAAQ;IAC7F,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;AAAA,CAC3E;AAED,MAAM,UAAU,GAAG,CAAC,OAAyB,EAAE,MAAqB,EAAQ;IAC1E,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAAA,CACpD;AAED,MAAM,UAAU,WAAW,CACzB,OAAyB,EACzB,MAAqB,EACrB,GAAkB,
|
|
1
|
+
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"column-mapper.d.ts","sourceRoot":"","sources":["../../src/generators/column-mapper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,QAAQ,EACf,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,aAAa,EACtB,eAAe,UAAO,GACrB,MAAM,
|
|
1
|
+
{"version":3,"file":"column-mapper.d.ts","sourceRoot":"","sources":["../../src/generators/column-mapper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,QAAQ,EACf,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,aAAa,EACtB,eAAe,UAAO,GACrB,MAAM,CAyCR"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { chainCall, quoted } from "../codegen/index.js";
|
|
1
|
+
import { chainCall, objectLiteral, quoted } from "../codegen/index.js";
|
|
2
2
|
import { toTableVariableName } from "./naming.js";
|
|
3
3
|
export function mapFieldToColumn(field, table, dialect, shouldPluralize = true) {
|
|
4
4
|
const calls = [];
|
|
5
5
|
if (isPrimaryKey(field, table)) {
|
|
6
6
|
calls.push({ method: "primaryKey" });
|
|
7
7
|
}
|
|
8
|
-
if (field.uuid?.autoGenerate) {
|
|
8
|
+
if (field.uuid?.autoGenerate || field.autoGenerateId) {
|
|
9
9
|
calls.push({ method: "$defaultFn", args: ["() => generateBase36Id()"] });
|
|
10
10
|
}
|
|
11
11
|
if (!field.nullable && !isPrimaryKey(field, table)) {
|
|
@@ -14,7 +14,11 @@ export function mapFieldToColumn(field, table, dialect, shouldPluralize = true)
|
|
|
14
14
|
if (field.references) {
|
|
15
15
|
const targetVar = toTableVariableName(field.references.tableName, shouldPluralize);
|
|
16
16
|
const targetField = field.references.fieldName;
|
|
17
|
-
|
|
17
|
+
const refArgs = [`() => ${targetVar}.${targetField}`];
|
|
18
|
+
if (field.references.onDelete) {
|
|
19
|
+
refArgs.push(objectLiteral([["onDelete", quoted(field.references.onDelete)]], { concise: true }));
|
|
20
|
+
}
|
|
21
|
+
calls.push({ method: "references", args: refArgs });
|
|
18
22
|
}
|
|
19
23
|
if (field.createdAt || field.updatedAt) {
|
|
20
24
|
calls.push(dialect.mapTimestampDefault());
|
|
@@ -25,7 +29,8 @@ export function mapFieldToColumn(field, table, dialect, shouldPluralize = true)
|
|
|
25
29
|
if (field.defaultValue !== undefined && !field.createdAt && !field.updatedAt) {
|
|
26
30
|
calls.push({ method: "default", args: [mapDefault(field.defaultValue)] });
|
|
27
31
|
}
|
|
28
|
-
|
|
32
|
+
const base = field.nullable ? dialect.mapNullableFieldType(field) : dialect.mapFieldType(field);
|
|
33
|
+
return chainCall(base, calls);
|
|
29
34
|
}
|
|
30
35
|
function isPrimaryKey(field, table) {
|
|
31
36
|
return !table.primaryKey.isComposite && table.primaryKey.columns.includes(field.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"column-mapper.js","sourceRoot":"","sources":["../../src/generators/column-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"column-mapper.js","sourceRoot":"","sources":["../../src/generators/column-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,UAAU,gBAAgB,CAC9B,KAAe,EACf,KAAe,EACf,OAAsB,EACtB,eAAe,GAAG,IAAI,EACd;IACR,MAAM,KAAK,GAAkB,EAAE,CAAC;IAEhC,IAAI,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,EAAE,YAAY,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;QACrD,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;QACnD,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACrB,MAAM,SAAS,GAAG,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QACnF,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC;QAC/C,MAAM,OAAO,GAAG,CAAC,SAAS,SAAS,IAAI,WAAW,EAAE,CAAC,CAAC;QACtD,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CACV,aAAa,CAAC,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CACpF,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;QAC7E,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAChG,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAAA,CAC/B;AAED,SAAS,YAAY,CAAC,KAAe,EAAE,KAAe,EAAW;IAC/D,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,IAAI,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAAA,CACvF;AAED,SAAS,UAAU,CAAC,KAAc,EAAU;IAC1C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AAAA,CACtB"}
|
|
@@ -17,17 +17,24 @@ export function generateDescribe(tables, graph, shouldPluralize = true) {
|
|
|
17
17
|
function generateDescribeBlock(table, relations, shouldPluralize) {
|
|
18
18
|
const lines = [];
|
|
19
19
|
const tableVar = toTableVariableName(table.name, shouldPluralize);
|
|
20
|
-
const
|
|
20
|
+
const pkFields = table.primaryKey.isComposite
|
|
21
|
+
? table.primaryKey.columns
|
|
22
|
+
: [table.primaryKey.columns[0]];
|
|
21
23
|
const funcName = `describe${table.name}`;
|
|
22
24
|
const typeName = `${table.name}Description`;
|
|
25
|
+
const whereClause = `{ ${pkFields.join(", ")} }`;
|
|
23
26
|
lines.push(...generateDescriptionType(table, relations, typeName, tableVar, shouldPluralize));
|
|
24
|
-
lines.push(`export const ${funcName} = (`, ` db: DrizzleClient
|
|
27
|
+
lines.push(`export const ${funcName} = (`, ` db: DrizzleClient,`);
|
|
28
|
+
for (const pkField of pkFields) {
|
|
29
|
+
lines.push(` ${pkField}: string,`);
|
|
30
|
+
}
|
|
31
|
+
lines.push(`): Promise<${typeName} | undefined> =>`);
|
|
25
32
|
if (relations.length > 0) {
|
|
26
33
|
const withObj = objectLiteral(relations.map((rel) => [rel.name, "true"]), { concise: true });
|
|
27
|
-
lines.push(` db.query.${tableVar}.findFirst({`, ` where:
|
|
34
|
+
lines.push(` db.query.${tableVar}.findFirst({`, ` where: ${whereClause},`, ` with: ${withObj},`, " });");
|
|
28
35
|
}
|
|
29
36
|
else {
|
|
30
|
-
lines.push(` db.query.${tableVar}.findFirst({`, ` where:
|
|
37
|
+
lines.push(` db.query.${tableVar}.findFirst({`, ` where: ${whereClause},`, " });");
|
|
31
38
|
}
|
|
32
39
|
return lines;
|
|
33
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"describe-generator.js","sourceRoot":"","sources":["../../src/generators/describe-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,UAAU,gBAAgB,CAC9B,MAAkB,EAClB,KAAoB,EACpB,eAAe,GAAG,IAAI,EACd;IACR,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACxE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,aAAa,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAEnE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,CAAC,UAAU;YAAE,SAAS;QAE/B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACzC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,KAAK,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAAA,CACzB;AAED,SAAS,qBAAqB,CAC5B,KAAe,EACf,SAAqB,EACrB,eAAwB,EACd;IACV,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,QAAQ,GAAG,mBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAClE,MAAM,
|
|
1
|
+
{"version":3,"file":"describe-generator.js","sourceRoot":"","sources":["../../src/generators/describe-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,21 @@
|
|
|
1
1
|
import type { ChainMethod } from "../codegen/index.js";
|
|
2
|
-
import type { FieldDef } from "../ir/types.js";
|
|
2
|
+
import type { FieldDef, FieldType } from "../ir/types.js";
|
|
3
3
|
export type Dialect = "pg" | "sqlite";
|
|
4
|
+
export interface NullableWrapperDef {
|
|
5
|
+
name: string;
|
|
6
|
+
dataType: string;
|
|
7
|
+
jsType: string;
|
|
8
|
+
}
|
|
4
9
|
export interface DialectConfig {
|
|
5
10
|
dialect: Dialect;
|
|
6
11
|
coreModule: string;
|
|
7
12
|
tableFn: string;
|
|
8
13
|
enumFn: string | null;
|
|
9
14
|
uuidDataType: string;
|
|
15
|
+
nullableWrappers: readonly NullableWrapperDef[];
|
|
10
16
|
mapFieldType(field: FieldDef): string;
|
|
17
|
+
mapNullableFieldType(field: FieldDef): string;
|
|
18
|
+
nullableWrapperName(kind: FieldType["kind"]): string | null;
|
|
11
19
|
mapTimestampDefault(): ChainMethod;
|
|
12
20
|
}
|
|
13
21
|
export declare function resolveDialect(dialect: Dialect): DialectConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/generators/dialect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/generators/dialect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE1D,MAAM,MAAM,OAAO,GAAG,IAAI,GAAG,QAAQ,CAAC;AAEtC,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,SAAS,kBAAkB,EAAE,CAAC;IAChD,YAAY,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAC;IACtC,oBAAoB,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC9C,mBAAmB,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IAC5D,mBAAmB,IAAI,WAAW,CAAC;CACpC;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,CAO9D"}
|
|
@@ -7,6 +7,28 @@ export function resolveDialect(dialect) {
|
|
|
7
7
|
return sqliteDialect();
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
+
const pgNullableWrappers = [
|
|
11
|
+
{ name: "nullableText", dataType: "text", jsType: "string" },
|
|
12
|
+
{ name: "nullableInteger", dataType: "integer", jsType: "number" },
|
|
13
|
+
{ name: "nullableReal", dataType: "real", jsType: "number" },
|
|
14
|
+
{ name: "nullableBigint", dataType: "bigint", jsType: "number" },
|
|
15
|
+
{ name: "nullableDoublePrecision", dataType: "double precision", jsType: "number" },
|
|
16
|
+
{ name: "nullableBoolean", dataType: "boolean", jsType: "boolean" },
|
|
17
|
+
{ name: "nullableTimestamp", dataType: "timestamp with time zone", jsType: "Date" },
|
|
18
|
+
];
|
|
19
|
+
const pgNullableWrapperMap = new Map([
|
|
20
|
+
["text", "nullableText"],
|
|
21
|
+
["integer", "nullableInteger"],
|
|
22
|
+
["real", "nullableReal"],
|
|
23
|
+
["bigint", "nullableBigint"],
|
|
24
|
+
["doublePrecision", "nullableDoublePrecision"],
|
|
25
|
+
["boolean", "nullableBoolean"],
|
|
26
|
+
["timestamp", "nullableTimestamp"],
|
|
27
|
+
]);
|
|
28
|
+
function textEnumColumn(col, values) {
|
|
29
|
+
const union = values.map((v) => quoted(v)).join(" | ");
|
|
30
|
+
return `${fnCall("text", [col])}.$type<${union}>()`;
|
|
31
|
+
}
|
|
10
32
|
function pgDialect() {
|
|
11
33
|
return {
|
|
12
34
|
dialect: "pg",
|
|
@@ -14,7 +36,18 @@ function pgDialect() {
|
|
|
14
36
|
tableFn: "pgTable",
|
|
15
37
|
enumFn: "pgEnum",
|
|
16
38
|
uuidDataType: "uuid",
|
|
39
|
+
nullableWrappers: pgNullableWrappers,
|
|
17
40
|
mapTimestampDefault: () => ({ method: "defaultNow" }),
|
|
41
|
+
nullableWrapperName(kind) {
|
|
42
|
+
return pgNullableWrapperMap.get(kind) ?? null;
|
|
43
|
+
},
|
|
44
|
+
mapNullableFieldType(field) {
|
|
45
|
+
const wrapperName = this.nullableWrapperName(field.type.kind);
|
|
46
|
+
if (wrapperName) {
|
|
47
|
+
return fnCall(wrapperName, [quoted(field.columnName)]);
|
|
48
|
+
}
|
|
49
|
+
return this.mapFieldType(field);
|
|
50
|
+
},
|
|
18
51
|
mapFieldType(field) {
|
|
19
52
|
const col = quoted(field.columnName);
|
|
20
53
|
switch (field.type.kind) {
|
|
@@ -43,14 +76,30 @@ function pgDialect() {
|
|
|
43
76
|
col,
|
|
44
77
|
objectLiteral([["withTimezone", "true"]], { concise: true }),
|
|
45
78
|
]);
|
|
79
|
+
case "jsonb":
|
|
80
|
+
return fnCall("jsonb", [col]);
|
|
46
81
|
case "uuid":
|
|
47
82
|
return fnCall("base36Uuid", [col]);
|
|
48
83
|
case "enum":
|
|
49
84
|
return fnCall(field.type.enumName, [col]);
|
|
85
|
+
case "textEnum":
|
|
86
|
+
return textEnumColumn(col, field.type.values);
|
|
50
87
|
}
|
|
51
88
|
},
|
|
52
89
|
};
|
|
53
90
|
}
|
|
91
|
+
const sqliteNullableWrappers = [
|
|
92
|
+
{ name: "nullableText", dataType: "text", jsType: "string" },
|
|
93
|
+
{ name: "nullableInteger", dataType: "integer", jsType: "number" },
|
|
94
|
+
{ name: "nullableReal", dataType: "real", jsType: "number" },
|
|
95
|
+
];
|
|
96
|
+
const sqliteNullableWrapperMap = new Map([
|
|
97
|
+
["text", "nullableText"],
|
|
98
|
+
["varchar", "nullableText"],
|
|
99
|
+
["integer", "nullableInteger"],
|
|
100
|
+
["real", "nullableReal"],
|
|
101
|
+
["doublePrecision", "nullableReal"],
|
|
102
|
+
]);
|
|
54
103
|
function sqliteDialect() {
|
|
55
104
|
return {
|
|
56
105
|
dialect: "sqlite",
|
|
@@ -58,7 +107,18 @@ function sqliteDialect() {
|
|
|
58
107
|
tableFn: "sqliteTable",
|
|
59
108
|
enumFn: null,
|
|
60
109
|
uuidDataType: "text",
|
|
110
|
+
nullableWrappers: sqliteNullableWrappers,
|
|
61
111
|
mapTimestampDefault: () => ({ method: "$defaultFn", args: ["() => new Date()"] }),
|
|
112
|
+
nullableWrapperName(kind) {
|
|
113
|
+
return sqliteNullableWrapperMap.get(kind) ?? null;
|
|
114
|
+
},
|
|
115
|
+
mapNullableFieldType(field) {
|
|
116
|
+
const wrapperName = this.nullableWrapperName(field.type.kind);
|
|
117
|
+
if (wrapperName) {
|
|
118
|
+
return fnCall(wrapperName, [quoted(field.columnName)]);
|
|
119
|
+
}
|
|
120
|
+
return this.mapFieldType(field);
|
|
121
|
+
},
|
|
62
122
|
mapFieldType(field) {
|
|
63
123
|
const col = quoted(field.columnName);
|
|
64
124
|
switch (field.type.kind) {
|
|
@@ -90,6 +150,11 @@ function sqliteDialect() {
|
|
|
90
150
|
col,
|
|
91
151
|
objectLiteral([["mode", quoted("timestamp")]], { concise: true }),
|
|
92
152
|
]);
|
|
153
|
+
case "jsonb":
|
|
154
|
+
return fnCall("text", [
|
|
155
|
+
col,
|
|
156
|
+
objectLiteral([["mode", quoted("json")]], { concise: true }),
|
|
157
|
+
]);
|
|
93
158
|
case "uuid":
|
|
94
159
|
return fnCall("base36Uuid", [col]);
|
|
95
160
|
case "enum":
|
|
@@ -99,6 +164,8 @@ function sqliteDialect() {
|
|
|
99
164
|
concise: true,
|
|
100
165
|
}),
|
|
101
166
|
]);
|
|
167
|
+
case "textEnum":
|
|
168
|
+
return textEnumColumn(col, field.type.values);
|
|
102
169
|
}
|
|
103
170
|
},
|
|
104
171
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/generators/dialect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/generators/dialect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function generateIndex(): string;
|
|
1
|
+
export declare function generateIndex(schemaOnly?: boolean): string;
|
|
2
2
|
//# sourceMappingURL=index-generator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index-generator.d.ts","sourceRoot":"","sources":["../../src/generators/index-generator.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,
|
|
1
|
+
{"version":3,"file":"index-generator.d.ts","sourceRoot":"","sources":["../../src/generators/index-generator.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,CAAC,UAAU,UAAQ,GAAG,MAAM,CAcxD"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { quoted } from "../codegen/index.js";
|
|
2
|
-
export function generateIndex() {
|
|
2
|
+
export function generateIndex(schemaOnly = false) {
|
|
3
3
|
const lines = [
|
|
4
4
|
`export * from ${quoted("./types.js")};`,
|
|
5
5
|
`export * from ${quoted("./schema.js")};`,
|
|
6
|
-
`export { relations } from ${quoted("./relations.js")};`,
|
|
7
|
-
`export * from ${quoted("./describe.js")};`,
|
|
8
|
-
"",
|
|
9
6
|
];
|
|
7
|
+
if (!schemaOnly) {
|
|
8
|
+
lines.push(`export { relations } from ${quoted("./relations.js")};`);
|
|
9
|
+
lines.push(`export * from ${quoted("./describe.js")};`);
|
|
10
|
+
}
|
|
11
|
+
lines.push("");
|
|
10
12
|
return lines.join("\n");
|
|
11
13
|
}
|
|
12
14
|
//# sourceMappingURL=index-generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index-generator.js","sourceRoot":"","sources":["../../src/generators/index-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,MAAM,UAAU,aAAa,
|
|
1
|
+
{"version":3,"file":"index-generator.js","sourceRoot":"","sources":["../../src/generators/index-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,MAAM,UAAU,aAAa,CAAC,UAAU,GAAG,KAAK,EAAU;IACxD,MAAM,KAAK,GAAa;QACtB,iBAAiB,MAAM,CAAC,YAAY,CAAC,GAAG;QACxC,iBAAiB,MAAM,CAAC,aAAa,CAAC,GAAG;KAC1C,CAAC;IAEF,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,KAAK,CAAC,IAAI,CAAC,6BAA6B,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACrE,KAAK,CAAC,IAAI,CAAC,iBAAiB,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAAA,CACzB"}
|
|
@@ -21,11 +21,8 @@ function generateImports(tables, enums, dialect) {
|
|
|
21
21
|
if (needsSqlImport(tables)) {
|
|
22
22
|
lines.push(importDecl(["sql"], "drizzle-orm"));
|
|
23
23
|
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
if (hasAutoGenerateUuid(tables)) {
|
|
27
|
-
typesImports.push("generateBase36Id");
|
|
28
|
-
}
|
|
24
|
+
const typesImports = collectTypesImports(tables, dialect);
|
|
25
|
+
if (typesImports.length > 0) {
|
|
29
26
|
lines.push(importDecl(typesImports, "./types.js"));
|
|
30
27
|
}
|
|
31
28
|
return lines.join("\n");
|
|
@@ -62,6 +59,8 @@ function collectCoreImports(tables, enums, dialect) {
|
|
|
62
59
|
for (const field of table.fields) {
|
|
63
60
|
if (field.uuid)
|
|
64
61
|
continue;
|
|
62
|
+
if (field.nullable && dialect.nullableWrapperName(field.type.kind))
|
|
63
|
+
continue;
|
|
65
64
|
for (const imp of collectFieldImports(field, dialect)) {
|
|
66
65
|
imports.add(imp);
|
|
67
66
|
}
|
|
@@ -78,6 +77,8 @@ function collectFieldImports(field, dialect) {
|
|
|
78
77
|
case "text":
|
|
79
78
|
case "varchar":
|
|
80
79
|
case "enum":
|
|
80
|
+
case "textEnum":
|
|
81
|
+
case "jsonb":
|
|
81
82
|
return ["text"];
|
|
82
83
|
case "integer":
|
|
83
84
|
case "bigint":
|
|
@@ -108,6 +109,10 @@ function collectFieldImports(field, dialect) {
|
|
|
108
109
|
return ["boolean"];
|
|
109
110
|
case "timestamp":
|
|
110
111
|
return ["timestamp"];
|
|
112
|
+
case "jsonb":
|
|
113
|
+
return ["jsonb"];
|
|
114
|
+
case "textEnum":
|
|
115
|
+
return ["text"];
|
|
111
116
|
case "uuid":
|
|
112
117
|
case "enum":
|
|
113
118
|
return [];
|
|
@@ -118,11 +123,28 @@ function hasCheckConstraints(table) {
|
|
|
118
123
|
f.constraints?.maxValue !== undefined ||
|
|
119
124
|
f.constraints?.check !== undefined);
|
|
120
125
|
}
|
|
121
|
-
function
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
+
function collectTypesImports(tables, dialect) {
|
|
127
|
+
const imports = new Set();
|
|
128
|
+
for (const table of tables) {
|
|
129
|
+
for (const field of table.fields) {
|
|
130
|
+
if (field.uuid) {
|
|
131
|
+
imports.add("base36Uuid");
|
|
132
|
+
if (field.uuid.autoGenerate) {
|
|
133
|
+
imports.add("generateBase36Id");
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
if (field.autoGenerateId) {
|
|
137
|
+
imports.add("generateBase36Id");
|
|
138
|
+
}
|
|
139
|
+
if (field.nullable && !field.uuid) {
|
|
140
|
+
const wrapperName = dialect.nullableWrapperName(field.type.kind);
|
|
141
|
+
if (wrapperName) {
|
|
142
|
+
imports.add(wrapperName);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
return [...imports].sort();
|
|
126
148
|
}
|
|
127
149
|
function generateEnumDeclaration(enumDef, enumFn) {
|
|
128
150
|
const values = enumDef.values.map((v) => ` ${quoted(v)},`).join("\n");
|