okmodel 0.7.0 → 0.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.
Files changed (195) hide show
  1. package/dist/adapters/capabilities.d.ts +32 -0
  2. package/dist/adapters/failure.d.ts +1 -1
  3. package/dist/adapters/pg/bun-sql.d.ts +53 -0
  4. package/dist/adapters/pg/bunsql-extra.d.ts +1 -1
  5. package/dist/adapters/pg/bunsql.d.ts +1 -1
  6. package/dist/adapters/pg/neon-extra.d.ts +18 -0
  7. package/dist/adapters/pg/neon.d.ts +104 -0
  8. package/dist/adapters/pg/no-inflight-timeout.d.ts +1 -1
  9. package/dist/contracts/error.d.ts +1 -1
  10. package/dist/dialects/pg/fn/index.d.ts +39 -1
  11. package/dist/dialects/pg/fn/index.js +118 -26
  12. package/dist/dialects/pg/index.d.ts +2 -0
  13. package/dist/dialects/pg/index.js +393 -18
  14. package/dist/dialects/pg/introspect.d.ts +11 -0
  15. package/dist/dialects/pg/operators.d.ts +1 -1
  16. package/dist/dialects/pg/ops/fragment.d.ts +119 -0
  17. package/dist/dialects/pg/ops/lane.d.ts +49 -0
  18. package/dist/dialects/pg/view/client.d.ts +14 -6
  19. package/dist/dialects/pg/view/index.d.ts +73 -1
  20. package/dist/dialects/pg/view/index.js +156 -5
  21. package/dist/dialects/pg/view/scratch.d.ts +8 -5
  22. package/dist/runtime/otel.d.ts +105 -0
  23. package/dist/runtime/otel.js +97 -0
  24. package/dist/runtime/pg/bun.js +4 -4
  25. package/dist/runtime/pg/neon.d.ts +38 -0
  26. package/dist/runtime/pg/neon.js +64 -0
  27. package/dist/runtime/pg/pg.js +4 -4
  28. package/dist/runtime/pg/pglite.js +4 -4
  29. package/dist/runtime/pg/postgresjs.js +4 -4
  30. package/dist/runtime/plan.d.ts +1 -1
  31. package/dist/runtime/sql-fragment.d.ts +43 -0
  32. package/dist/runtime/tenancy/index.js +10 -10
  33. package/dist/runtime/topology.d.ts +1 -1
  34. package/dist/runtime/traits/index.js +15 -16
  35. package/dist/runtime/types.d.ts +15 -1
  36. package/dist/runtime/validate/index.js +4 -4
  37. package/dist/shared/{mtaszv5a.js → 0wrea3jq.js} +102 -4
  38. package/dist/shared/{qq3899ht.js → 12z7aznj.js} +243 -14
  39. package/dist/shared/{w79hsckn.js → 14x60fbf.js} +5 -5
  40. package/dist/shared/{ek2wt2dz.js → 16kvjebh.js} +4 -4
  41. package/dist/shared/{svncdeh5.js → 195pzzzz.js} +8 -8
  42. package/dist/shared/{gzaveazc.js → 1d9q9cv2.js} +29 -2
  43. package/dist/shared/{jvd0mqag.js → 3449rcae.js} +5 -5
  44. package/dist/shared/{14vx95q4.js → 35q0n9tz.js} +7 -7
  45. package/dist/shared/3bb7wsqt.js +99 -0
  46. package/dist/shared/{y6njgyda.js → 3t6kw83m.js} +2 -2
  47. package/dist/shared/{81ebdx9p.js → 4m6hskg8.js} +4 -4
  48. package/dist/shared/{xhfsfkgk.js → 4vbf83xx.js} +9 -2
  49. package/dist/shared/{bg3rym3g.js → 63f4ksbz.js} +2 -2
  50. package/dist/shared/{pt94kz7f.js → 6m78c8ss.js} +1 -1
  51. package/dist/shared/{5e3tf63j.js → 760ppr76.js} +14 -6
  52. package/dist/shared/{zm0ptry0.js → 7ghwamrf.js} +1 -1
  53. package/dist/shared/{xnxsed62.js → 9dr2qnx7.js} +14 -14
  54. package/dist/shared/{h15jx9bc.js → 9dvh1dr6.js} +1 -1
  55. package/dist/shared/{q5c6ngn3.js → a62rb2da.js} +1 -1
  56. package/dist/shared/{kb2sdhfb.js → ae4j5f42.js} +17 -1
  57. package/dist/shared/agsfb86s.js +233 -0
  58. package/dist/shared/{7k9grvf6.js → b6d6p0zc.js} +5 -5
  59. package/dist/shared/{tbrvgw6z.js → bah9nbg3.js} +17 -16
  60. package/dist/shared/{5fe3kbsh.js → bnby0esn.js} +1 -1
  61. package/dist/shared/bsek72fg.js +225 -0
  62. package/dist/shared/{1w508jbr.js → bxas03mq.js} +21 -17
  63. package/dist/shared/{dk8v79p3.js → d5nmj7vv.js} +1 -1
  64. package/dist/shared/{tsvww22q.js → dpc2r7rb.js} +7 -7
  65. package/dist/shared/{vb6qfyve.js → e8zyaqvj.js} +2 -2
  66. package/dist/shared/{hyh73qk6.js → ecn8mfdq.js} +5 -5
  67. package/dist/shared/{gs74dbj5.js → f4jy1j7x.js} +27 -14
  68. package/dist/shared/{ttsqgp4p.js → fjpnhqan.js} +2 -2
  69. package/dist/shared/{xjk7hnn5.js → g5yc06ka.js} +2 -2
  70. package/dist/shared/{w72kgg4q.js → hfqmpasr.js} +6 -6
  71. package/dist/shared/{kr0jzbw2.js → hm5f8jby.js} +7 -7
  72. package/dist/shared/{dkxgzaqd.js → hqpxf4a4.js} +1 -1
  73. package/dist/shared/{cn957f8d.js → jebgrkeq.js} +3 -3
  74. package/dist/shared/{wa07eas9.js → jp36k7dp.js} +11 -11
  75. package/dist/shared/jx2m62cs.js +96 -0
  76. package/dist/shared/{sfz1ksn6.js → k86n8vq3.js} +2 -2
  77. package/dist/shared/{67txcrcw.js → kgwp4jdd.js} +4 -4
  78. package/dist/shared/{8skf0cam.js → kj9d8maq.js} +1 -1
  79. package/dist/shared/{aytqh5y2.js → m4xff2a6.js} +2 -2
  80. package/dist/shared/{zp9fmend.js → mfedzr74.js} +4 -4
  81. package/dist/shared/{ax7qv55k.js → mkrn359n.js} +60 -11
  82. package/dist/shared/{m6p12kbr.js → mnvjvqyp.js} +10 -10
  83. package/dist/shared/{1qa0qajz.js → mtw6jz76.js} +1 -1
  84. package/dist/shared/{1est4ezg.js → n05z9nwz.js} +3 -3
  85. package/dist/shared/{pbp1ss85.js → n0jmpgj1.js} +2 -2
  86. package/dist/shared/{ktz42yez.js → n41w4fbz.js} +5 -5
  87. package/dist/shared/{n816peh1.js → n454kcnw.js} +1 -1
  88. package/dist/shared/n7kg8mmx.js +61 -0
  89. package/dist/shared/{g6evj1j3.js → needfe47.js} +1 -1
  90. package/dist/shared/{2shdbn8q.js → njga14v4.js} +9 -9
  91. package/dist/shared/{vqrjpcqn.js → nmnsgj7x.js} +1 -1
  92. package/dist/shared/{b5pftnn2.js → p3xbdcvt.js} +14 -18
  93. package/dist/shared/{te5as7z7.js → p5nh3r8q.js} +3 -3
  94. package/dist/shared/{p6qc5gcp.js → pan0370z.js} +6 -6
  95. package/dist/shared/{79dt02vc.js → q0cqt2sp.js} +1 -1
  96. package/dist/shared/{5v3xf80k.js → qd9hhd8f.js} +1 -1
  97. package/dist/shared/{bm22fvzr.js → qfw14tna.js} +2 -2
  98. package/dist/shared/{9s0ypp87.js → sjk86yrx.js} +1 -1
  99. package/dist/shared/{3v7t1yrv.js → th3be82n.js} +2 -2
  100. package/dist/shared/{ed0b8k4s.js → typ3vy7t.js} +1 -1
  101. package/dist/shared/{vczs8gd4.js → v1wad97q.js} +2 -2
  102. package/dist/shared/{9628a9xt.js → vk7rag46.js} +1 -1
  103. package/dist/shared/{ze4hxsmy.js → w9ejzaqf.js} +1 -1
  104. package/dist/shared/{bz84tkzm.js → wcrheftc.js} +2 -2
  105. package/dist/shared/{ab9gmbwy.js → wvdjznah.js} +5 -5
  106. package/dist/shared/{7mnme5tn.js → wz2a78mp.js} +1 -1
  107. package/dist/shared/{9y3mmmh1.js → xfhe73sb.js} +1 -1
  108. package/dist/shared/{je4axnm8.js → z581d7ny.js} +2 -2
  109. package/dist/shared/{x933k9a3.js → zbqbmmrp.js} +10 -10
  110. package/dist/shared/{rs73fca9.js → zgex00fd.js} +6 -6
  111. package/dist/shared/{jznfax0y.js → zq1he88x.js} +4 -4
  112. package/dist/tooling/cli.js +26 -13
  113. package/dist/tooling/driver-run.js +4971 -0
  114. package/dist/tooling/driver-test.d.ts +36 -0
  115. package/dist/tooling/migrate/commands.d.ts +2 -2
  116. package/dist/tooling/migrate/index.js +9 -9
  117. package/dist/tooling/migrate/project.d.ts +3 -0
  118. package/dist/tooling/shared/03k6res6.js +210 -0
  119. package/dist/tooling/shared/08kemxjd.js +10 -0
  120. package/dist/tooling/shared/2revefqt.js +209 -0
  121. package/dist/tooling/shared/2wtvc7rw.js +1425 -0
  122. package/dist/tooling/shared/345tbc2k.js +16 -0
  123. package/dist/tooling/shared/3m1hkg7z.js +344 -0
  124. package/dist/tooling/shared/3rrw5w8f.js +81 -0
  125. package/dist/tooling/shared/3tq8pnb8.js +131 -0
  126. package/dist/tooling/shared/417zdsk7.js +194 -0
  127. package/dist/tooling/shared/4d2w25vw.js +40 -0
  128. package/dist/tooling/shared/54tqkxja.js +51 -0
  129. package/dist/tooling/shared/5bvw2nev.js +12 -0
  130. package/dist/tooling/shared/6nyfyw70.js +231 -0
  131. package/dist/tooling/shared/72fyg4zv.js +160 -0
  132. package/dist/tooling/shared/733a1tq3.js +38 -0
  133. package/dist/tooling/shared/7ae7rjmn.js +20 -0
  134. package/dist/tooling/shared/7kms6fvj.js +20 -0
  135. package/dist/tooling/shared/8sqrsw3s.js +49 -0
  136. package/dist/tooling/shared/96ps4g1z.js +32 -0
  137. package/dist/tooling/shared/9kazs5p6.js +195 -0
  138. package/dist/tooling/shared/9xzm7hjg.js +38 -0
  139. package/dist/tooling/shared/a6pp9d12.js +49 -0
  140. package/dist/tooling/shared/a7q7t4n3.js +22 -0
  141. package/dist/tooling/shared/aftb2mwr.js +18 -0
  142. package/dist/tooling/shared/bz2dqhab.js +311 -0
  143. package/dist/tooling/shared/cmptmb4f.js +12 -0
  144. package/dist/tooling/shared/ddjtfgnx.js +177 -0
  145. package/dist/tooling/shared/djydjpqt.js +261 -0
  146. package/dist/tooling/shared/dw08f3m8.js +9 -0
  147. package/dist/tooling/shared/dy672fz6.js +16 -0
  148. package/dist/tooling/shared/dzx85q70.js +66 -0
  149. package/dist/tooling/shared/ec71zqgt.js +270 -0
  150. package/dist/tooling/shared/ep8zh3bk.js +6 -0
  151. package/dist/tooling/shared/f9mphxej.js +3789 -0
  152. package/dist/tooling/shared/fb9k2qwd.js +89 -0
  153. package/dist/tooling/shared/g9ad4n80.js +211 -0
  154. package/dist/tooling/shared/gfvtj6d0.js +94 -0
  155. package/dist/tooling/shared/gmcf9cxf.js +294 -0
  156. package/dist/tooling/shared/htnaj77v.js +17 -0
  157. package/dist/tooling/shared/j9t5s12a.js +7 -0
  158. package/dist/tooling/shared/jne7b93p.js +42 -0
  159. package/dist/tooling/shared/ma2340rx.js +118 -0
  160. package/dist/tooling/shared/mtrqn2hn.js +505 -0
  161. package/dist/tooling/shared/n4jqhpqz.js +27 -0
  162. package/dist/tooling/shared/nf7jmhfa.js +20 -0
  163. package/dist/tooling/shared/p7f08ktn.js +332 -0
  164. package/dist/tooling/shared/ppnnnvj8.js +13 -0
  165. package/dist/tooling/shared/pqy21k24.js +312 -0
  166. package/dist/tooling/shared/pw8fgahx.js +69 -0
  167. package/dist/tooling/shared/pwsytxm5.js +17 -0
  168. package/dist/tooling/shared/rf83gr2d.js +94 -0
  169. package/dist/tooling/shared/rq5kk8j6.js +401 -0
  170. package/dist/tooling/shared/rs1jb051.js +12 -0
  171. package/dist/tooling/shared/smn6kz1p.js +157 -0
  172. package/dist/tooling/shared/spk1jg3r.js +1696 -0
  173. package/dist/tooling/shared/tn8gay14.js +143 -0
  174. package/dist/tooling/shared/vraj6d74.js +42 -0
  175. package/dist/tooling/shared/vs0t6qt8.js +64 -0
  176. package/dist/tooling/shared/vx86qjv8.js +150 -0
  177. package/dist/tooling/shared/w7qe8sj1.js +140 -0
  178. package/dist/tooling/shared/wt7j7nf6.js +15 -0
  179. package/dist/tooling/shared/wwnekq5n.js +6 -0
  180. package/dist/tooling/shared/xhrnjch9.js +185 -0
  181. package/dist/tooling/shared/xjs6zqtc.js +190 -0
  182. package/dist/tooling/shared/y031jct9.js +16 -0
  183. package/dist/tooling/shared/y5656f0e.js +233 -0
  184. package/dist/tooling/shared/yfr8hzhm.js +604 -0
  185. package/dist/tooling/shared/yk9mp7vb.js +250 -0
  186. package/dist/tooling/shared/yw30vnq2.js +139 -0
  187. package/dist/tooling/shared/z8d7ptht.js +618 -0
  188. package/dist/tooling/shared/zhwnfyb2.js +9 -0
  189. package/dist/tooling/shared/zvnhh1n0.js +198 -0
  190. package/dist/tooling/testing/index.js +3 -3
  191. package/package.json +14 -2
  192. package/dist/shared/y34a8714.js +0 -150
  193. package/dist/shared/zy8r7qvz.js +0 -116
  194. package/dist/shared/{ywr8hmey.js → 606g0nbf.js} +3 -3
  195. package/dist/shared/{rpycarcr.js → gcefca6p.js} +4 -4
@@ -28,21 +28,29 @@ export declare function viewMentions(query: string, name: string): boolean;
28
28
  export type ViewInstall = (model: {
29
29
  [name: string]: TableModel;
30
30
  }, tenancy: ColumnTenancy | undefined, tables: readonly AnyTable[], casing: "snake" | undefined, scoped: Set<string>) => void;
31
+ /** A value, or a function `install` calls once casing is known. */
32
+ type ColumnSource = readonly {
33
+ readonly name: string;
34
+ readonly type: string;
35
+ }[] | (() => readonly {
36
+ readonly name: string;
37
+ readonly type: string;
38
+ }[]);
39
+ /** A query string, or a function `install` calls once casing is known. */
40
+ type QuerySource = string | (() => string);
31
41
  /**
32
42
  * Client name, read model, and the hook that moves the handle under `views`.
33
43
  *
34
44
  * @param name - SQL name of the view
35
- * @param columns - Declared output columns
36
- * @param query - Author SQL
45
+ * @param columns - Declared output columns, or a getter `install` calls
46
+ * @param query - Author SQL, or a getter `install` calls
37
47
  * @param tenancy - `global("reason")`, when the view opts out
38
48
  * @param refresh - `plain` stores no `refresh`. A materialized view is `blocking` or `concurrently`
39
49
  * @returns Methods stored on the declaration
40
50
  */
41
- export declare function viewClient(name: string, columns: readonly {
42
- readonly name: string;
43
- readonly type: string;
44
- }[], query: string, tenancy: unknown, refresh?: "plain" | "blocking" | "concurrently"): {
51
+ export declare function viewClient(name: string, columns: ColumnSource, query: QuerySource, tenancy: unknown, refresh?: "plain" | "blocking" | "concurrently"): {
45
52
  readonly field: string;
46
53
  readonly install: ViewInstall;
47
54
  readonly hook: SchemaHook;
48
55
  };
56
+ export {};
@@ -8,7 +8,7 @@
8
8
  */
9
9
  import type { CatalogObject } from "../../../contracts/catalog/types.js";
10
10
  import type { SchemaHook } from "../model.js";
11
- import type { SqlText } from "../table.js";
11
+ import { type AnyTable, type SqlText } from "../table.js";
12
12
  import { type ViewInstall } from "./client.js";
13
13
  /** One declared output column. `type` is the Postgres type name. */
14
14
  export type ViewColumnInput = {
@@ -29,6 +29,66 @@ export type ViewOptions = {
29
29
  */
30
30
  readonly tenancy?: unknown;
31
31
  };
32
+ /** Output columns of {@link ViewFrom.from}. A tuple keeps each name. */
33
+ type TupleColumns<K extends readonly string[]> = K extends readonly [] ? readonly [] : K extends readonly [infer H extends string, ...infer R extends readonly string[]] ? readonly [{
34
+ readonly name: H;
35
+ readonly type: string;
36
+ }, ...TupleColumns<R>] : readonly {
37
+ readonly name: K[number];
38
+ readonly type: string;
39
+ }[];
40
+ /** Every column of a table, when `from` is not given a list. */
41
+ type AllColumns<T extends AnyTable> = readonly {
42
+ readonly name: keyof T["columns"] & string;
43
+ readonly type: string;
44
+ }[];
45
+ /**
46
+ * The value `(q) => q.from(...)` returns.
47
+ *
48
+ * @typeParam C - Output columns, for `db.views`
49
+ */
50
+ export type ViewBuilt<C extends readonly ViewColumnInput[] = readonly ViewColumnInput[]> = {
51
+ /** Declared columns. Present for the type. The catalog uses the SQL names. */
52
+ readonly "~columns"?: C;
53
+ /**
54
+ * Adds a WHERE clause.
55
+ *
56
+ * The text is stored as written, the same way `query` is.
57
+ *
58
+ * @param predicate - SQL after `where`
59
+ * @returns The same view, with the clause
60
+ */
61
+ where(predicate: SqlText | string): ViewBuilt<C>;
62
+ /**
63
+ * Opts the view out of tenancy.
64
+ *
65
+ * Pass `global("reason")` from `okmodel/tenancy`.
66
+ *
67
+ * @param mark - `global("reason")`
68
+ * @returns The same view, opted out
69
+ */
70
+ tenancy(mark: unknown): ViewBuilt<C>;
71
+ };
72
+ /**
73
+ * The argument of `view(name, (q) => q.from(...))`.
74
+ */
75
+ export type ViewFrom = {
76
+ /**
77
+ * Selects every column of `table`.
78
+ *
79
+ * @param table - Source table
80
+ * @returns The view query
81
+ */
82
+ from<const T extends AnyTable>(table: T): ViewBuilt<AllColumns<T>>;
83
+ /**
84
+ * Selects `columns` from `table`, in that order.
85
+ *
86
+ * @param table - Source table
87
+ * @param columns - Output columns. Names are the table's fields
88
+ * @returns The view query
89
+ */
90
+ from<const T extends AnyTable, const K extends readonly (keyof T["columns"] & string)[]>(table: T, columns: K): ViewBuilt<TupleColumns<K>>;
91
+ };
32
92
  /**
33
93
  * One declared view.
34
94
  *
@@ -117,6 +177,17 @@ export type MaterializedViewDeclaration<N extends string = string, C extends rea
117
177
  export declare function view<const N extends string, const C extends readonly ViewColumnInput[]>(name: N, options: ViewOptions & {
118
178
  readonly columns: C;
119
179
  }): ViewDeclaration<N, C>;
180
+ /**
181
+ * Declares a view from a table.
182
+ *
183
+ * `view(name, (q) => q.from(table))` selects that table's columns. Pass a
184
+ * column list to project. `.where` adds a predicate. `.tenancy` opts out.
185
+ *
186
+ * @param name - View name
187
+ * @param build - `q.from(...)`
188
+ * @returns The definition object `schema({ views })` stores
189
+ */
190
+ export declare function view<const N extends string, const C extends readonly ViewColumnInput[]>(name: N, build: (q: ViewFrom) => ViewBuilt<C>): ViewDeclaration<N, C>;
120
191
  /**
121
192
  * Declares a materialized view.
122
193
  *
@@ -130,3 +201,4 @@ export declare function view<const N extends string, const C extends readonly Vi
130
201
  export declare function materializedView<const N extends string, const C extends readonly ViewColumnInput[]>(name: N, options: MaterializedViewOptions & {
131
202
  readonly columns: C;
132
203
  }): MaterializedViewDeclaration<N, C>;
204
+ export {};
@@ -1,11 +1,20 @@
1
- import {
2
- viewClient
3
- } from "../../../shared/5e3tf63j.js";
4
1
  import {
5
2
  viewObject,
6
3
  materializedViewObject,
7
4
  materializedViewIndex
8
- } from "../../../shared/zy8r7qvz.js";
5
+ } from "../../../shared/12z7aznj.js";
6
+ import {
7
+ viewClient
8
+ } from "../../../shared/760ppr76.js";
9
+ import {
10
+ snakeCase
11
+ } from "../../../shared/gcefca6p.js";
12
+ import {
13
+ formatType
14
+ } from "../../../shared/606g0nbf.js";
15
+ import {
16
+ quoteIdent
17
+ } from "../../../shared/sjk86yrx.js";
9
18
  import {
10
19
  staticNamespace2
11
20
  } from "../../../shared/358zsv4r.js";
@@ -14,7 +23,11 @@ import {
14
23
  } from "../../../shared/52szzakm.js";
15
24
 
16
25
  // src/dialects/pg/view/index.ts
17
- function view(name, options) {
26
+ var BUILT = Symbol("okmodel.view.from");
27
+ function view(name, source) {
28
+ if (typeof source === "function")
29
+ return viewFrom(name, source);
30
+ const options = source;
18
31
  const schema = options.schema ?? "public";
19
32
  const columns = options.columns.map((column) => ({ name: column.name, dataType: column.type }));
20
33
  const query = bodyText(options.query);
@@ -100,6 +113,144 @@ function materializedView(name, options) {
100
113
  }
101
114
  };
102
115
  }
116
+ var viewFromApi = {
117
+ from(table, columns) {
118
+ return finish({
119
+ [BUILT]: true,
120
+ table,
121
+ picked: columns,
122
+ predicate: undefined,
123
+ mark: undefined
124
+ });
125
+ }
126
+ };
127
+ function viewFrom(name, build) {
128
+ const built = build(viewFromApi);
129
+ if (!isRecipe(built)) {
130
+ throw new OkmError2("OKM1121", `View ${name} must return q.from(...).`, {
131
+ fix: { summary: "Return q.from(table), and chain where() or tenancy() on that value." }
132
+ });
133
+ }
134
+ const recipe = built;
135
+ let casingMode;
136
+ let rendered;
137
+ const render = () => {
138
+ rendered ??= renderQuery(name, recipe, casingMode);
139
+ return rendered;
140
+ };
141
+ const bound = viewClient(name, () => render().columns, () => render().query, recipe.mark, "plain");
142
+ let securityInvoker = false;
143
+ return {
144
+ name,
145
+ schema: "public",
146
+ "~kind": "view",
147
+ install(model, tenancy, tables, casing, scoped) {
148
+ casingMode = casing;
149
+ rendered = undefined;
150
+ bound.install(model, tenancy, tables, casing, scoped);
151
+ securityInvoker = tenancy?.strategy === "rls" && scoped.has(name);
152
+ },
153
+ hook: bound.hook,
154
+ contribute(peers, builtObjects) {
155
+ assertPeers(peers);
156
+ assertNoTable(builtObjects, name);
157
+ const query = render().query;
158
+ const columns = render().columns.map((column) => ({
159
+ name: column.name,
160
+ dataType: column.type
161
+ }));
162
+ const provenance = { origin: "file", name };
163
+ return [
164
+ viewObject({
165
+ namespace: staticNamespace2("public"),
166
+ name,
167
+ columns,
168
+ query,
169
+ provenance,
170
+ ...securityInvoker ? { securityInvoker: true } : {}
171
+ })
172
+ ];
173
+ }
174
+ };
175
+ }
176
+ function isRecipe(value) {
177
+ return typeof value === "object" && value !== null && BUILT in value;
178
+ }
179
+ function finish(recipe) {
180
+ const built = {
181
+ ...recipe,
182
+ where(predicate) {
183
+ return finish({ ...recipe, predicate: bodyText(predicate) });
184
+ },
185
+ tenancy(mark) {
186
+ return finish({ ...recipe, mark });
187
+ }
188
+ };
189
+ return built;
190
+ }
191
+ function renderQuery(name, recipe, casing) {
192
+ const fields = recipe.picked ?? Object.keys(recipe.table.columns);
193
+ if (fields.length === 0) {
194
+ throw new OkmError2("OKM1120", `View ${name} selects no columns.`, {
195
+ fix: { summary: "Pick at least one column of the table." }
196
+ });
197
+ }
198
+ const columns = [];
199
+ const selected = [];
200
+ for (const field of fields) {
201
+ const column = recipe.table.columns[field];
202
+ if (column === undefined || typeof column !== "object" || column === null) {
203
+ throw new OkmError2("OKM1020", `View ${name} names ${field}, which ${recipe.table.name} does not have.`, { fix: { summary: "Pass a column of that table." } });
204
+ }
205
+ const sqlName = columnSql(column, field, casing);
206
+ columns.push({ name: sqlName, type: columnType(column, field) });
207
+ selected.push(quoteIdent(sqlName));
208
+ }
209
+ const tableName = tableSql(recipe.table, casing);
210
+ let query = `select ${selected.join(", ")} from ${quoteIdent(tableName)}`;
211
+ if (recipe.predicate !== undefined && recipe.predicate.trim().length > 0) {
212
+ query += ` where ${recipe.predicate}`;
213
+ }
214
+ return { query, columns };
215
+ }
216
+ function tableSql(table, casing) {
217
+ const options = table.options;
218
+ if (typeof options?.sqlName === "string" && options.sqlName.length > 0)
219
+ return options.sqlName;
220
+ return casing === "snake" ? snakeCase(table.name) : table.name;
221
+ }
222
+ function columnSql(column, field, casing) {
223
+ const state = readState(column, field);
224
+ if (state.sqlName !== undefined && state.sqlName.length > 0)
225
+ return state.sqlName;
226
+ return casing === "snake" ? snakeCase(field) : field;
227
+ }
228
+ function columnType(column, field) {
229
+ const state = readState(column, field);
230
+ return formatType(state.baseType, state.dims);
231
+ }
232
+ function readState(column, field) {
233
+ if (!("state" in column)) {
234
+ throw new OkmError2("OKM1020", `Column ${field} has no type.`, {
235
+ fix: { summary: "Pass a column built with t." }
236
+ });
237
+ }
238
+ const state = column.state;
239
+ if (typeof state !== "object" || state === null || !("baseType" in state)) {
240
+ throw new OkmError2("OKM1020", `Column ${field} has no type.`, {
241
+ fix: { summary: "Pass a column built with t." }
242
+ });
243
+ }
244
+ const baseType = state.baseType;
245
+ const dims = "dims" in state && typeof state.dims === "number" ? state.dims : 0;
246
+ const sqlName = "sqlName" in state && typeof state.sqlName === "string" ? state.sqlName : undefined;
247
+ if (typeof baseType !== "string" || baseType.length === 0) {
248
+ throw new OkmError2("OKM1020", `Column ${field} has no type.`, {
249
+ fix: { summary: "Pass a column built with t." }
250
+ });
251
+ }
252
+ return { baseType, dims, sqlName };
253
+ }
103
254
  function bodyText(body) {
104
255
  return typeof body === "string" ? body : body.text;
105
256
  }
@@ -4,19 +4,22 @@
4
4
  * Domain and enum types from the catalog are created there, then the tables,
5
5
  * then the functions a view may call, then each view. `pg_get_viewdef`
6
6
  * replaces the author query and `pg_depend` supplies column edges (D117).
7
- * The scratch schema is dropped before this returns. Plans never use it.
7
+ * A `BEGIN ATOMIC` body is replaced with the `pg_get_functiondef` block, so a
8
+ * plan from the live catalog does not treat Postgres's reprint as a change
9
+ * (D273). The scratch schema is dropped before this returns. Plans never use it.
8
10
  */
9
11
  import type { Catalog } from "../../../contracts/catalog/types.js";
10
- import type { CatalogQuery } from "../introspect.js";
12
+ import { type CatalogQuery } from "../introspect.js";
11
13
  /**
12
14
  * Reads dependencies and reprints for every view in `source`.
13
15
  *
14
16
  * The returned catalog matches what introspection prints for those views
15
17
  * when the same query is applied. A declared column list that disagrees
16
- * with the database is OKM1020.
18
+ * with the database is OKM1020. A `BEGIN ATOMIC` function body is the
19
+ * server reprint, including an argument qualifier such as `by_id.n`.
17
20
  *
18
21
  * @param runner - Database connection. Statements share its session
19
- * @param source - Catalog whose views are still author SQL
20
- * @returns A catalog whose views carry the reprint and `pg_depend` edges
22
+ * @param source - Catalog whose views and atomic bodies are still author SQL
23
+ * @returns A catalog whose views and atomic bodies carry the reprint
21
24
  */
22
25
  export declare function sealViews(runner: CatalogQuery, source: Catalog): Promise<Catalog>;
@@ -0,0 +1,105 @@
1
+ /**
2
+ * OpenTelemetry observers (`okmodel/otel`).
3
+ *
4
+ * The package does not import `@opentelemetry/*`. Pass a tracer you already
5
+ * have. The observers are `hookm`, `onRoute`, and an `inspect()` result.
6
+ * Statement text is off unless `statement` is true. Parameters and tenant ids
7
+ * are never attributes (spec §5.5, D267).
8
+ */
9
+ import type { RouteEvent } from "./topology.js";
10
+ import type { Hookm, Inspection } from "./types.js";
11
+ /** A scalar OpenTelemetry attribute. Arrays are not used. */
12
+ export type OtelAttribute = string | number | boolean;
13
+ /**
14
+ * Status codes from the OpenTelemetry API.
15
+ *
16
+ * `0` is unset, `1` is OK, and `2` is ERROR.
17
+ */
18
+ export type OtelStatusCode = 0 | 1 | 2;
19
+ /**
20
+ * The span methods this entry calls.
21
+ *
22
+ * A tracer from `@opentelemetry/api` satisfies this shape.
23
+ */
24
+ export interface OtelSpan {
25
+ /** Sets one attribute. */
26
+ setAttribute(key: string, value: OtelAttribute): void;
27
+ /** Sets the span status. `message` is never sent. */
28
+ setStatus(status: {
29
+ readonly code: OtelStatusCode;
30
+ }): void;
31
+ /**
32
+ * Records an exception.
33
+ *
34
+ * `name` is the error name. `code` is an OKM code when the error has one.
35
+ * Message and stack are omitted.
36
+ */
37
+ recordException(exception: {
38
+ readonly name: string;
39
+ readonly code?: string;
40
+ }): void;
41
+ /** Adds a span event. */
42
+ addEvent(name: string, attributes?: Readonly<Record<string, OtelAttribute>>): void;
43
+ /** Ends the span. */
44
+ end(): void;
45
+ }
46
+ /** Options passed to `startSpan`. `kind` is `2` (client). */
47
+ export interface OtelSpanOptions {
48
+ /** OpenTelemetry span kind. This entry always passes `2`. */
49
+ readonly kind?: number;
50
+ /** Attributes set when the span starts. */
51
+ readonly attributes?: Readonly<Record<string, OtelAttribute>>;
52
+ }
53
+ /**
54
+ * The tracer methods this entry calls.
55
+ *
56
+ * A tracer from `@opentelemetry/api` satisfies this shape.
57
+ */
58
+ export interface OtelTracer {
59
+ /**
60
+ * Starts a span.
61
+ *
62
+ * @param name - Span name
63
+ * @param options - Kind and attributes
64
+ */
65
+ startSpan(name: string, options?: OtelSpanOptions): OtelSpan;
66
+ }
67
+ /** What {@link otel} accepts. */
68
+ export interface OtelOptions {
69
+ /** Tracer the caller owns. This module does not construct one. */
70
+ readonly tracer: OtelTracer;
71
+ /**
72
+ * Record `db.query.text` from `inspect()`.
73
+ *
74
+ * Omitted or false, the text is left off. Parameters stay off either way.
75
+ */
76
+ readonly statement?: boolean;
77
+ }
78
+ /**
79
+ * Observers to pass to `connect`, plus `query` for one `inspect()` result.
80
+ */
81
+ export interface OtelObservers {
82
+ /** Pass this in `connect({ hookm })`. */
83
+ readonly hookm: Hookm;
84
+ /** Pass this in `connect({ onRoute })`. A topology calls it. */
85
+ readonly onRoute: (event: RouteEvent) => void;
86
+ /**
87
+ * Records `db.query.summary` from `inspect()`.
88
+ *
89
+ * The fingerprint is that summary. `db.query.text` is included only when
90
+ * `statement` is true.
91
+ *
92
+ * @param inspection - The result of `inspect()`
93
+ */
94
+ readonly query: (inspection: Inspection) => void;
95
+ }
96
+ /**
97
+ * Connects the existing observers to a tracer.
98
+ *
99
+ * `onRoute` spans start and end in that call, because the hook fires once.
100
+ * A transaction span stays open from `start` until `commit` or `rollback`.
101
+ *
102
+ * @param options - Tracer, and whether statement text is recorded
103
+ * @returns `hookm`, `onRoute`, and `query`
104
+ */
105
+ export declare function otel(options: OtelOptions): OtelObservers;
@@ -0,0 +1,97 @@
1
+ // src/runtime/otel.ts
2
+ var SYSTEM = "postgresql";
3
+ var CLIENT = 2;
4
+ var STATUS_OK = 1;
5
+ var STATUS_ERROR = 2;
6
+ function otel(options) {
7
+ const tracer = options.tracer;
8
+ const statement = options.statement === true;
9
+ const open = [];
10
+ const hookm = {
11
+ onTransaction(event) {
12
+ if (event.phase === "start") {
13
+ const name = event.depth === 0 ? "transaction" : "savepoint";
14
+ open.push({
15
+ depth: event.depth,
16
+ span: begin(tracer, name, {
17
+ "db.system.name": SYSTEM,
18
+ "db.operation.name": name
19
+ })
20
+ });
21
+ return;
22
+ }
23
+ const index = latest(open, event.depth);
24
+ const found = index < 0 ? undefined : open[index];
25
+ if (found === undefined)
26
+ return;
27
+ open.splice(index, 1);
28
+ if (event.phase === "rollback") {
29
+ found.span.setAttribute("error.type", "rollback");
30
+ found.span.setStatus({ code: STATUS_ERROR });
31
+ } else {
32
+ found.span.setStatus({ code: STATUS_OK });
33
+ }
34
+ found.span.end();
35
+ },
36
+ onError(error) {
37
+ const span = begin(tracer, "error", {
38
+ "db.system.name": SYSTEM,
39
+ "error.type": errorType(error)
40
+ });
41
+ span.recordException(recordedException(error));
42
+ span.setStatus({ code: STATUS_ERROR });
43
+ span.end();
44
+ }
45
+ };
46
+ return {
47
+ hookm,
48
+ onRoute(event) {
49
+ const span = begin(tracer, event.op, {
50
+ "db.system.name": SYSTEM,
51
+ "db.operation.name": event.op
52
+ });
53
+ span.addEvent("route", { endpoint: event.endpoint, reason: event.reason });
54
+ span.end();
55
+ },
56
+ query(inspection) {
57
+ const op = inspection.intent.op;
58
+ const table = inspection.intent.table;
59
+ const attributes = {
60
+ "db.system.name": SYSTEM,
61
+ "db.operation.name": op,
62
+ "db.collection.name": table,
63
+ "db.query.summary": inspection.plan.fingerprint
64
+ };
65
+ if (statement)
66
+ attributes["db.query.text"] = inspection.sql.text;
67
+ begin(tracer, `${op} ${table}`, attributes).end();
68
+ }
69
+ };
70
+ }
71
+ function begin(tracer, name, attributes) {
72
+ return tracer.startSpan(name, { kind: CLIENT, attributes });
73
+ }
74
+ function latest(open, depth) {
75
+ for (let index = open.length - 1;index >= 0; index -= 1) {
76
+ if (open[index]?.depth === depth)
77
+ return index;
78
+ }
79
+ return -1;
80
+ }
81
+ function errorType(error) {
82
+ return error instanceof Error && error.name.length > 0 ? error.name : "error";
83
+ }
84
+ function recordedException(error) {
85
+ const name = errorType(error);
86
+ const code = okmCode(error);
87
+ return code === undefined ? { name } : { name, code };
88
+ }
89
+ function okmCode(error) {
90
+ if (typeof error !== "object" || error === null || !("code" in error))
91
+ return;
92
+ const code = error.code;
93
+ return typeof code === "string" && /^OKM\d+$/.test(code) ? code : undefined;
94
+ }
95
+ export {
96
+ otel
97
+ };
@@ -4,20 +4,20 @@ import {
4
4
  import {
5
5
  markClientPool,
6
6
  open5
7
- } from "../../shared/x933k9a3.js";
7
+ } from "../../shared/zbqbmmrp.js";
8
8
  import {
9
9
  BUNSQL_CAPABILITIES,
10
10
  readCapability2,
11
11
  hasCapability2
12
- } from "../../shared/kb2sdhfb.js";
12
+ } from "../../shared/ae4j5f42.js";
13
13
  import {
14
14
  createClient
15
- } from "../../shared/tbrvgw6z.js";
15
+ } from "../../shared/bah9nbg3.js";
16
16
 
17
17
  // src/runtime/pg/bun.ts
18
18
  function connect(target, options) {
19
19
  if (typeof target === "object" && !isPool(target)) {
20
- return import("../../shared/mtaszv5a.js").then((mod) => mod.default(target, options, (config) => {
20
+ return import("../../shared/0wrea3jq.js").then((mod) => mod.default(target, options, (config) => {
21
21
  const pool = open5(config);
22
22
  markClientPool(pool);
23
23
  return pool;
@@ -0,0 +1,38 @@
1
+ /**
2
+ * `connect` for Neon (`okmodel/pg/neon`).
3
+ *
4
+ * A string or an existing pool is one endpoint. A `{ primary, replicas }` object
5
+ * loads the topology module. The client is typed by the schema passed in.
6
+ * `mode` is `websocket` (the default) or `http`.
7
+ */
8
+ import type { DriverPool } from "../../contracts/driver.js";
9
+ import type { QuerySchema } from "../../dialects/pg/model.js";
10
+ import { type NeonConfig } from "../../adapters/pg/neon.js";
11
+ import type { RoutedClient, TopologyInput, TopologyOptions } from "../topology.js";
12
+ import type { ConnectOptions, Connected } from "../types.js";
13
+ export { open, type NeonConfig, type NeonMode } from "../../adapters/pg/neon.js";
14
+ export { capabilities, hasCapability, httpCapabilities, readCapability, } from "../../adapters/pg/neon.js";
15
+ export { DriverError } from "../../adapters/error.js";
16
+ /** A connection string or a pool from {@link open}. */
17
+ export type NeonTarget = string | DriverPool;
18
+ /** Driver options `connect` forwards to {@link open}. */
19
+ export type NeonConnectOptions<S extends QuerySchema> = ConnectOptions<S> & Omit<NeonConfig, "url"> & TopologyOptions;
20
+ /**
21
+ * Connects one Neon endpoint, or a primary and its replicas.
22
+ *
23
+ * A string or a pool is one endpoint. A topology loads on demand and the promise
24
+ * resolves to the client. Reads use the first healthy replica.
25
+ *
26
+ * `mode: "websocket"` is the default. Interactive `tx()` needs it. `mode: "http"`
27
+ * is one-shot HTTP: `batch()` is atomic and `tx()` is refused.
28
+ *
29
+ * Named prepared statements are off unless `prepared` is `"named"`.
30
+ * `prepared: "named"` is not for transaction-mode poolers.
31
+ *
32
+ * @typeParam S - Schema
33
+ * @param target - URL, an existing pool, or `{ primary, replicas }`
34
+ * @param options - Schema, mode, errors, logger, and driver options
35
+ * @returns The client. A topology returns a promise. Await `connected` for the dialect check
36
+ */
37
+ export declare function connect<const S extends QuerySchema>(target: TopologyInput, options: NeonConnectOptions<S>): Promise<RoutedClient<S>>;
38
+ export declare function connect<const S extends QuerySchema>(target: NeonTarget, options: NeonConnectOptions<S>): Promise<Connected<S>>;
@@ -0,0 +1,64 @@
1
+ import {
2
+ DriverError2
3
+ } from "../../shared/cm3w0ywp.js";
4
+ import {
5
+ open6
6
+ } from "../../shared/agsfb86s.js";
7
+ import {
8
+ NEON_WEBSOCKET_CAPABILITIES,
9
+ NEON_HTTP_CAPABILITIES,
10
+ readCapability2,
11
+ hasCapability2
12
+ } from "../../shared/ae4j5f42.js";
13
+ import {
14
+ createClient
15
+ } from "../../shared/bah9nbg3.js";
16
+
17
+ // src/runtime/pg/neon.ts
18
+ function connect(target, options) {
19
+ if (typeof target === "object" && !isPool(target)) {
20
+ return import("../../shared/0wrea3jq.js").then((mod) => mod.default(target, options, (config) => open6({
21
+ url: config.url,
22
+ ...options.mode !== undefined ? { mode: options.mode } : {},
23
+ ...config.max !== undefined ? { max: config.max } : {},
24
+ ...config.timeouts !== undefined ? { timeouts: config.timeouts } : {},
25
+ ...config.prepared !== undefined ? { prepared: config.prepared } : {},
26
+ ...config.searchPath !== undefined ? { searchPath: config.searchPath } : {}
27
+ })));
28
+ }
29
+ const owned = !isPool(target);
30
+ const opened = isPool(target) ? Promise.resolve(target) : open6({
31
+ url: target,
32
+ ...options.mode !== undefined ? { mode: options.mode } : {},
33
+ ...options.max !== undefined ? { max: options.max } : {},
34
+ ...options.timeouts !== undefined ? { timeouts: options.timeouts } : {},
35
+ ...options.prepared !== undefined ? { prepared: options.prepared } : {},
36
+ ...options.searchPath !== undefined ? { searchPath: options.searchPath } : {}
37
+ });
38
+ return opened.then((pool) => createClient(options.schema, pool, {
39
+ ownsPool: owned,
40
+ http: options.errors?.http,
41
+ includeValues: options.errors?.includeValues,
42
+ logger: options.logger,
43
+ signal: options.signal,
44
+ timeout: options.timeout,
45
+ timeouts: options.timeouts,
46
+ hookm: options.hookm,
47
+ catalog: options.catalog,
48
+ catalogDir: options.catalogDir,
49
+ requireMeta: options.requireMeta,
50
+ generators: options.generators
51
+ }));
52
+ }
53
+ function isPool(target) {
54
+ return typeof target === "object" && "execute" in target && "capabilities" in target;
55
+ }
56
+ export {
57
+ DriverError2 as DriverError,
58
+ NEON_WEBSOCKET_CAPABILITIES as capabilities,
59
+ connect,
60
+ hasCapability2 as hasCapability,
61
+ NEON_HTTP_CAPABILITIES as httpCapabilities,
62
+ open6 as open,
63
+ readCapability2 as readCapability
64
+ };