@ketvietlab/ketjs 0.1.2 → 0.1.5

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 (307) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +8 -2
  3. package/dist/agent/capabilities.d.ts +1 -3
  4. package/dist/agent/capabilities.d.ts.map +1 -1
  5. package/dist/agent/capabilities.js +10 -1
  6. package/dist/agent/capabilities.js.map +1 -1
  7. package/dist/agent/permissions.d.ts +43 -1
  8. package/dist/agent/permissions.d.ts.map +1 -1
  9. package/dist/agent/permissions.js +50 -2
  10. package/dist/agent/permissions.js.map +1 -1
  11. package/dist/cli.js +246 -97
  12. package/dist/cli.js.map +1 -1
  13. package/dist/codegen/dts.d.ts.map +1 -1
  14. package/dist/codegen/dts.js +1 -0
  15. package/dist/codegen/dts.js.map +1 -1
  16. package/dist/data/changeset.d.ts +12 -0
  17. package/dist/data/changeset.d.ts.map +1 -1
  18. package/dist/data/changeset.js +73 -17
  19. package/dist/data/changeset.js.map +1 -1
  20. package/dist/data/expr.d.ts +25 -1
  21. package/dist/data/expr.d.ts.map +1 -1
  22. package/dist/data/expr.js +47 -6
  23. package/dist/data/expr.js.map +1 -1
  24. package/dist/data/fleet.d.ts +41 -1
  25. package/dist/data/fleet.d.ts.map +1 -1
  26. package/dist/data/fleet.js +100 -11
  27. package/dist/data/fleet.js.map +1 -1
  28. package/dist/data/migrate.d.ts +20 -0
  29. package/dist/data/migrate.d.ts.map +1 -1
  30. package/dist/data/migrate.js +86 -3
  31. package/dist/data/migrate.js.map +1 -1
  32. package/dist/data/physical.d.ts +5 -0
  33. package/dist/data/physical.d.ts.map +1 -0
  34. package/dist/data/physical.js +196 -0
  35. package/dist/data/physical.js.map +1 -0
  36. package/dist/data/pool.d.ts +2 -1
  37. package/dist/data/pool.d.ts.map +1 -1
  38. package/dist/data/pool.js +159 -31
  39. package/dist/data/pool.js.map +1 -1
  40. package/dist/data/query.d.ts +10 -1
  41. package/dist/data/query.d.ts.map +1 -1
  42. package/dist/data/query.js +136 -27
  43. package/dist/data/query.js.map +1 -1
  44. package/dist/data/sqlite.d.ts.map +1 -1
  45. package/dist/data/sqlite.js +350 -52
  46. package/dist/data/sqlite.js.map +1 -1
  47. package/dist/data/time.d.ts +13 -0
  48. package/dist/data/time.d.ts.map +1 -1
  49. package/dist/data/time.js +61 -17
  50. package/dist/data/time.js.map +1 -1
  51. package/dist/index.d.ts +45 -24
  52. package/dist/index.d.ts.map +1 -1
  53. package/dist/index.js +34 -18
  54. package/dist/index.js.map +1 -1
  55. package/dist/kernel/audit.d.ts +27 -0
  56. package/dist/kernel/audit.d.ts.map +1 -0
  57. package/dist/kernel/audit.js +67 -0
  58. package/dist/kernel/audit.js.map +1 -0
  59. package/dist/kernel/classification.d.ts +26 -0
  60. package/dist/kernel/classification.d.ts.map +1 -0
  61. package/dist/kernel/classification.js +73 -0
  62. package/dist/kernel/classification.js.map +1 -0
  63. package/dist/kernel/compose.d.ts +6 -2
  64. package/dist/kernel/compose.d.ts.map +1 -1
  65. package/dist/kernel/compose.js +269 -15
  66. package/dist/kernel/compose.js.map +1 -1
  67. package/dist/kernel/define.d.ts +2 -3
  68. package/dist/kernel/define.d.ts.map +1 -1
  69. package/dist/kernel/define.js +22 -12
  70. package/dist/kernel/define.js.map +1 -1
  71. package/dist/kernel/diff.d.ts.map +1 -1
  72. package/dist/kernel/diff.js +28 -4
  73. package/dist/kernel/diff.js.map +1 -1
  74. package/dist/kernel/graph.js +1 -1
  75. package/dist/kernel/graph.js.map +1 -1
  76. package/dist/kernel/i18n.d.ts +10 -1
  77. package/dist/kernel/i18n.d.ts.map +1 -1
  78. package/dist/kernel/i18n.js +34 -1
  79. package/dist/kernel/i18n.js.map +1 -1
  80. package/dist/kernel/layout.d.ts +97 -0
  81. package/dist/kernel/layout.d.ts.map +1 -1
  82. package/dist/kernel/layout.js +294 -12
  83. package/dist/kernel/layout.js.map +1 -1
  84. package/dist/kernel/menu.d.ts +33 -2
  85. package/dist/kernel/menu.d.ts.map +1 -1
  86. package/dist/kernel/menu.js +99 -7
  87. package/dist/kernel/menu.js.map +1 -1
  88. package/dist/kernel/modules.d.ts +3 -3
  89. package/dist/kernel/modules.d.ts.map +1 -1
  90. package/dist/kernel/modules.js +21 -21
  91. package/dist/kernel/modules.js.map +1 -1
  92. package/dist/kernel/permissions.d.ts +10 -0
  93. package/dist/kernel/permissions.d.ts.map +1 -0
  94. package/dist/kernel/permissions.js +365 -0
  95. package/dist/kernel/permissions.js.map +1 -0
  96. package/dist/kernel/schedule.d.ts +23 -0
  97. package/dist/kernel/schedule.d.ts.map +1 -0
  98. package/dist/kernel/schedule.js +83 -0
  99. package/dist/kernel/schedule.js.map +1 -0
  100. package/dist/kernel/types.d.ts.map +1 -1
  101. package/dist/kernel/types.js +5 -4
  102. package/dist/kernel/types.js.map +1 -1
  103. package/dist/kernel/workspace.d.ts +92 -14
  104. package/dist/kernel/workspace.d.ts.map +1 -1
  105. package/dist/kernel/workspace.js +128 -49
  106. package/dist/kernel/workspace.js.map +1 -1
  107. package/dist/pdf/assets/Inter-Bold.ttf +0 -0
  108. package/dist/pdf/assets/Inter-Regular.ttf +0 -0
  109. package/dist/pdf/assets/Inter-SemiBold.ttf +0 -0
  110. package/dist/pdf/assets/LICENSE.txt +92 -0
  111. package/dist/pdf/font.d.ts +10 -0
  112. package/dist/pdf/font.d.ts.map +1 -0
  113. package/dist/pdf/font.js +83 -0
  114. package/dist/pdf/font.js.map +1 -0
  115. package/dist/pdf/image.d.ts +8 -0
  116. package/dist/pdf/image.d.ts.map +1 -0
  117. package/dist/pdf/image.js +94 -0
  118. package/dist/pdf/image.js.map +1 -0
  119. package/dist/pdf/index.d.ts +15 -0
  120. package/dist/pdf/index.d.ts.map +1 -0
  121. package/dist/pdf/index.js +17 -0
  122. package/dist/pdf/index.js.map +1 -0
  123. package/dist/pdf/markup.d.ts +19 -0
  124. package/dist/pdf/markup.d.ts.map +1 -0
  125. package/dist/pdf/markup.js +146 -0
  126. package/dist/pdf/markup.js.map +1 -0
  127. package/dist/pdf/render.d.ts +14 -0
  128. package/dist/pdf/render.d.ts.map +1 -0
  129. package/dist/pdf/render.js +387 -0
  130. package/dist/pdf/render.js.map +1 -0
  131. package/dist/scaffold/index.js +6 -6
  132. package/dist/scaffold/index.js.map +1 -1
  133. package/dist/scaffold/templates/{app.test.ts.tmpl → deployment.test.ts.tmpl} +3 -3
  134. package/dist/scaffold/templates/ket.workspace.ts.tmpl +4 -6
  135. package/dist/scaffold/templates/module.ts.tmpl +1 -4
  136. package/dist/server/assets.d.ts +23 -0
  137. package/dist/server/assets.d.ts.map +1 -0
  138. package/dist/server/assets.js +97 -0
  139. package/dist/server/assets.js.map +1 -0
  140. package/dist/server/boot.d.ts +174 -38
  141. package/dist/server/boot.d.ts.map +1 -1
  142. package/dist/server/boot.js +399 -140
  143. package/dist/server/boot.js.map +1 -1
  144. package/dist/server/config.d.ts +30 -10
  145. package/dist/server/config.d.ts.map +1 -1
  146. package/dist/server/config.js +73 -17
  147. package/dist/server/config.js.map +1 -1
  148. package/dist/server/ctx.d.ts +10 -0
  149. package/dist/server/ctx.d.ts.map +1 -1
  150. package/dist/server/ctx.js +284 -48
  151. package/dist/server/ctx.js.map +1 -1
  152. package/dist/server/development.d.ts +10 -0
  153. package/dist/server/development.d.ts.map +1 -0
  154. package/dist/server/development.js +15 -0
  155. package/dist/server/development.js.map +1 -0
  156. package/dist/server/fn.d.ts +22 -3
  157. package/dist/server/fn.d.ts.map +1 -1
  158. package/dist/server/fn.js +116 -32
  159. package/dist/server/fn.js.map +1 -1
  160. package/dist/server/form.d.ts +33 -0
  161. package/dist/server/form.d.ts.map +1 -0
  162. package/dist/server/form.js +47 -0
  163. package/dist/server/form.js.map +1 -0
  164. package/dist/server/http.d.ts +82 -3
  165. package/dist/server/http.d.ts.map +1 -1
  166. package/dist/server/http.js +373 -37
  167. package/dist/server/http.js.map +1 -1
  168. package/dist/server/idem.d.ts +3 -2
  169. package/dist/server/idem.d.ts.map +1 -1
  170. package/dist/server/idem.js +12 -4
  171. package/dist/server/idem.js.map +1 -1
  172. package/dist/server/jobs.js +1 -1
  173. package/dist/server/jobs.js.map +1 -1
  174. package/dist/server/log/combinators.d.ts +42 -0
  175. package/dist/server/log/combinators.d.ts.map +1 -0
  176. package/dist/server/log/combinators.js +270 -0
  177. package/dist/server/log/combinators.js.map +1 -0
  178. package/dist/server/log/console.d.ts +12 -0
  179. package/dist/server/log/console.d.ts.map +1 -0
  180. package/dist/server/log/console.js +96 -0
  181. package/dist/server/log/console.js.map +1 -0
  182. package/dist/server/log/file.d.ts +11 -0
  183. package/dist/server/log/file.d.ts.map +1 -0
  184. package/dist/server/log/file.js +61 -0
  185. package/dist/server/log/file.js.map +1 -0
  186. package/dist/server/log/index.d.ts +23 -0
  187. package/dist/server/log/index.d.ts.map +1 -0
  188. package/dist/server/log/index.js +45 -0
  189. package/dist/server/log/index.js.map +1 -0
  190. package/dist/server/log/logger.d.ts +53 -0
  191. package/dist/server/log/logger.d.ts.map +1 -0
  192. package/dist/server/log/logger.js +94 -0
  193. package/dist/server/log/logger.js.map +1 -0
  194. package/dist/server/log/memory.d.ts +11 -0
  195. package/dist/server/log/memory.d.ts.map +1 -0
  196. package/dist/server/log/memory.js +25 -0
  197. package/dist/server/log/memory.js.map +1 -0
  198. package/dist/server/log/types.d.ts +112 -0
  199. package/dist/server/log/types.d.ts.map +1 -0
  200. package/dist/server/log/types.js +58 -0
  201. package/dist/server/log/types.js.map +1 -0
  202. package/dist/server/policy.d.ts +29 -0
  203. package/dist/server/policy.d.ts.map +1 -0
  204. package/dist/server/policy.js +29 -0
  205. package/dist/server/policy.js.map +1 -0
  206. package/dist/server/queue.d.ts +1 -1
  207. package/dist/server/queue.d.ts.map +1 -1
  208. package/dist/server/queue.js.map +1 -1
  209. package/dist/server/ratelimit.d.ts +48 -0
  210. package/dist/server/ratelimit.d.ts.map +1 -0
  211. package/dist/server/ratelimit.js +102 -0
  212. package/dist/server/ratelimit.js.map +1 -0
  213. package/dist/server/respond.d.ts.map +1 -1
  214. package/dist/server/respond.js +16 -1
  215. package/dist/server/respond.js.map +1 -1
  216. package/dist/server/runtime.d.ts +18 -3
  217. package/dist/server/runtime.d.ts.map +1 -1
  218. package/dist/server/runtime.js +32 -2
  219. package/dist/server/runtime.js.map +1 -1
  220. package/dist/server/schedule.d.ts +18 -0
  221. package/dist/server/schedule.d.ts.map +1 -0
  222. package/dist/server/schedule.js +70 -0
  223. package/dist/server/schedule.js.map +1 -0
  224. package/dist/server/sequence.d.ts +42 -0
  225. package/dist/server/sequence.d.ts.map +1 -0
  226. package/dist/server/sequence.js +97 -0
  227. package/dist/server/sequence.js.map +1 -0
  228. package/dist/server/session.d.ts +21 -0
  229. package/dist/server/session.d.ts.map +1 -1
  230. package/dist/server/session.js +84 -10
  231. package/dist/server/session.js.map +1 -1
  232. package/dist/server/sessionstore.d.ts +3 -1
  233. package/dist/server/sessionstore.d.ts.map +1 -1
  234. package/dist/server/sessionstore.js +7 -3
  235. package/dist/server/sessionstore.js.map +1 -1
  236. package/dist/server/storage/index.d.ts +1 -1
  237. package/dist/server/storage/index.d.ts.map +1 -1
  238. package/dist/server/storage/index.js +61 -1
  239. package/dist/server/storage/index.js.map +1 -1
  240. package/dist/server/storage/types.d.ts +8 -0
  241. package/dist/server/storage/types.d.ts.map +1 -1
  242. package/dist/server/storage/types.js +58 -0
  243. package/dist/server/storage/types.js.map +1 -1
  244. package/dist/server/stream.d.ts +8 -2
  245. package/dist/server/stream.d.ts.map +1 -1
  246. package/dist/server/stream.js +44 -4
  247. package/dist/server/stream.js.map +1 -1
  248. package/dist/server/streamstore.d.ts +10 -0
  249. package/dist/server/streamstore.d.ts.map +1 -1
  250. package/dist/server/streamstore.js +72 -6
  251. package/dist/server/streamstore.js.map +1 -1
  252. package/dist/server/tenants.d.ts +20 -18
  253. package/dist/server/tenants.d.ts.map +1 -1
  254. package/dist/server/tenants.js +133 -84
  255. package/dist/server/tenants.js.map +1 -1
  256. package/dist/server/transport/types.js +2 -2
  257. package/dist/server/transport/types.js.map +1 -1
  258. package/dist/server/worker.d.ts +19 -3
  259. package/dist/server/worker.d.ts.map +1 -1
  260. package/dist/server/worker.js +168 -21
  261. package/dist/server/worker.js.map +1 -1
  262. package/dist/testing.d.ts +26 -10
  263. package/dist/testing.d.ts.map +1 -1
  264. package/dist/testing.js +41 -14
  265. package/dist/testing.js.map +1 -1
  266. package/dist/theme/contracts.d.ts +14 -1
  267. package/dist/theme/contracts.d.ts.map +1 -1
  268. package/dist/theme/contracts.js +35 -6
  269. package/dist/theme/contracts.js.map +1 -1
  270. package/dist/theme/index.d.ts +1 -1
  271. package/dist/theme/index.d.ts.map +1 -1
  272. package/dist/theme/index.js +1 -1
  273. package/dist/theme/index.js.map +1 -1
  274. package/dist/theme/joint-runtime.d.ts +33 -0
  275. package/dist/theme/joint-runtime.d.ts.map +1 -0
  276. package/dist/theme/joint-runtime.js +121 -0
  277. package/dist/theme/joint-runtime.js.map +1 -0
  278. package/dist/theme/joints.d.ts.map +1 -1
  279. package/dist/theme/joints.js +15 -97
  280. package/dist/theme/joints.js.map +1 -1
  281. package/dist/theme/ktl/compile.d.ts +4 -0
  282. package/dist/theme/ktl/compile.d.ts.map +1 -1
  283. package/dist/theme/ktl/compile.js +54 -1
  284. package/dist/theme/ktl/compile.js.map +1 -1
  285. package/dist/theme/ktl/parser.d.ts +4 -0
  286. package/dist/theme/ktl/parser.d.ts.map +1 -1
  287. package/dist/theme/ktl/parser.js +8 -0
  288. package/dist/theme/ktl/parser.js.map +1 -1
  289. package/dist/theme/render.d.ts +8 -0
  290. package/dist/theme/render.d.ts.map +1 -1
  291. package/dist/theme/render.js +88 -118
  292. package/dist/theme/render.js.map +1 -1
  293. package/dist/theme/tokens.d.ts +18 -0
  294. package/dist/theme/tokens.d.ts.map +1 -1
  295. package/dist/theme/tokens.js +33 -0
  296. package/dist/theme/tokens.js.map +1 -1
  297. package/dist/theme/viewmodel.d.ts +24 -0
  298. package/dist/theme/viewmodel.d.ts.map +1 -1
  299. package/dist/theme/viewmodel.js +75 -6
  300. package/dist/theme/viewmodel.js.map +1 -1
  301. package/dist/types.d.ts +320 -56
  302. package/dist/types.d.ts.map +1 -1
  303. package/package.json +6 -2
  304. package/dist/kernel/apps.d.ts +0 -43
  305. package/dist/kernel/apps.d.ts.map +0 -1
  306. package/dist/kernel/apps.js +0 -234
  307. package/dist/kernel/apps.js.map +0 -1
@@ -0,0 +1,83 @@
1
+ // When a job runs on its own, computed rather than stored.
2
+ //
3
+ // Pure: a schedule is manifest data, so deciding what it means has to be possible
4
+ // with nothing but the manifest — `ket check` validates one without a database and
5
+ // a test computes a tick without a clock.
6
+ import { KetError } from './errors.js';
7
+ import { dateBucket, localDateTimeToUtc } from '../data/time.js';
8
+ const UNITS = { s: 1_000, m: 60_000, h: 3_600_000, d: 86_400_000 };
9
+ const EVERY = /^(\d+)(s|m|h|d)$/;
10
+ const AT = /^([01]\d|2[0-3]):([0-5]\d)$/;
11
+ /** The shortest interval worth having. Below this the sweep costs more than the work. */
12
+ export const MIN_EVERY_MS = 10_000;
13
+ export function parseEvery(value) {
14
+ const match = EVERY.exec(value);
15
+ if (!match) {
16
+ throw new KetError({
17
+ code: 'E_BAD_SCHEDULE',
18
+ message: `"${value}" is not an interval`,
19
+ hint: 'write a count and a unit, one of s m h d — "30s", "15m", "6h", "1d"',
20
+ });
21
+ }
22
+ const ms = Number(match[1]) * UNITS[match[2]];
23
+ if (ms < MIN_EVERY_MS) {
24
+ throw new KetError({
25
+ code: 'E_BAD_SCHEDULE',
26
+ message: `interval "${value}" is shorter than the ${MIN_EVERY_MS / 1000}s minimum`,
27
+ hint: 'a job that has to run more often than this wants a queue, not a schedule',
28
+ });
29
+ }
30
+ return ms;
31
+ }
32
+ /** Validate a schedule at composition time, so a typo is a build error. */
33
+ export function validateSchedule(schedule) {
34
+ if ('every' in schedule) {
35
+ parseEvery(schedule.every);
36
+ return;
37
+ }
38
+ if (!AT.exec(schedule.dailyAt)) {
39
+ throw new KetError({
40
+ code: 'E_BAD_SCHEDULE',
41
+ message: `"${schedule.dailyAt}" is not a time of day`,
42
+ hint: 'write 24-hour HH:MM, for example "03:00"',
43
+ });
44
+ }
45
+ }
46
+ /**
47
+ * The most recent tick at or before `now`, as an ISO instant.
48
+ *
49
+ * An instant rather than a counter, in both forms, so that the stored value orders
50
+ * lexicographically — which is the same reason every datetime in this framework is
51
+ * ISO-8601 UTC text.
52
+ */
53
+ export function tickAt(schedule, now, defaultTimezone) {
54
+ if ('every' in schedule) {
55
+ const ms = parseEvery(schedule.every);
56
+ return new Date(Math.floor(now.getTime() / ms) * ms).toISOString();
57
+ }
58
+ const timezone = schedule.timezone ?? defaultTimezone;
59
+ const today = dateBucket(now.toISOString(), 'day', timezone);
60
+ if (!today)
61
+ throw new KetError({ code: 'E_BAD_SCHEDULE', message: `cannot read a date in "${timezone}"` });
62
+ const todays = localDateTimeToUtc(`${today}T${schedule.dailyAt}`, timezone);
63
+ if (Date.parse(todays) <= now.getTime())
64
+ return todays;
65
+ // Before today's time: the occurrence that has actually passed is yesterday's.
66
+ const yesterday = new Date(Date.parse(`${today}T00:00:00Z`) - 86_400_000).toISOString().slice(0, 10);
67
+ return localDateTimeToUtc(`${yesterday}T${schedule.dailyAt}`, timezone);
68
+ }
69
+ /**
70
+ * How many ticks were passed over between two instants. Reported, never replayed.
71
+ *
72
+ * A daily count treats every day as 24 hours, so a span crossing a DST boundary can
73
+ * be off by one. This is a number in a record, not a control value: nothing decides
74
+ * anything by it, and rounding it correctly would cost a calendar walk.
75
+ */
76
+ export function ticksBetween(schedule, from, to) {
77
+ const span = Date.parse(to) - Date.parse(from);
78
+ if (!(span > 0))
79
+ return 0;
80
+ const ms = 'every' in schedule ? parseEvery(schedule.every) : 86_400_000;
81
+ return Math.max(0, Math.round(span / ms) - 1);
82
+ }
83
+ //# sourceMappingURL=schedule.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"schedule.js","sourceRoot":"","sources":["../../../../../../packages/ketjs/src/kernel/schedule.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../packages/ketjs/src/kernel/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEnE,eAAO,MAAM,OAAO,aAAyF,CAAA;AAE7G,mFAAmF;AACnF,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAW1D;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAgBjD;AAgBD,eAAO,MAAM,QAAQ,MAAO,UAAU,KAAG,MAAoD,CAAA;AAgB7F,eAAO,MAAM,SAAS,MAAO,UAAU,KAAG,MAAqB,CAAA"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../packages/ketjs/src/kernel/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEnE,eAAO,MAAM,OAAO,aAAyF,CAAA;AAE7G,mFAAmF;AACnF,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAW1D;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAgBjD;AAiBD,eAAO,MAAM,QAAQ,MAAO,UAAU,KAAG,MAAoD,CAAA;AAgB7F,eAAO,MAAM,SAAS,MAAO,UAAU,KAAG,MAAqB,CAAA"}
@@ -34,18 +34,19 @@ export function parseType(spec) {
34
34
  return { ok: false, reason: `unknown type "${spec}"` };
35
35
  return { ok: true, base: s, optional };
36
36
  }
37
- // decimal is a number in TypeScript because it is a number in arithmetic; only
38
- // its storage is exact.
37
+ // decimal is a string in TypeScript because that is the only shape that survives
38
+ // the round trip unchanged. Arithmetic still happens on numbers — coerce where you
39
+ // compute, and a write accepts either — but reading one back never rounds it.
39
40
  const TS = {
40
41
  id: 'string',
41
42
  text: 'string',
42
43
  int: 'number',
43
44
  float: 'number',
44
- decimal: 'number',
45
+ decimal: 'string',
45
46
  bool: 'boolean',
46
47
  json: 'unknown',
47
48
  date: 'string',
48
- datetime: 'Date',
49
+ datetime: 'string',
49
50
  ref: 'string',
50
51
  };
51
52
  export const tsTypeOf = (t) => TS[t.base] + (t.optional ? ' | null' : '');
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../packages/ketjs/src/kernel/types.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;AAE7G,mFAAmF;AACnF,MAAM,UAAU,UAAU,CAAC,KAAc;IACvC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3C,MAAM,KAAK,GAAG,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACrD,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAA;IACxB,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAC7B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5B,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE,IAAI,GAAG,GAAG,CAAC;QAAE,OAAO,KAAK,CAAA;IAClE,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,KAAK,CAAC,IAAI,IAAI,GAAG,GAAG,KAAK,CAAC,CAAC,CAAA;IACrE,MAAM,IAAI,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;IACzE,OAAO,GAAG,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,CAAE,CAAA;AAChC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAA;IACnF,IAAI,CAAC,GAAG,IAAI,CAAA;IACZ,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACpB,QAAQ,GAAG,IAAI,CAAA;QACf,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IACpB,CAAC;IACD,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACzB,IAAI,CAAC,sCAAsC,CAAC,IAAI,CAAC,MAAM,CAAC;YACtD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,2CAA2C,MAAM,GAAG,EAAE,CAAA;QACpF,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAA;IACpD,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,IAAI,GAAG,EAAE,CAAA;IAC3E,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAc,EAAE,QAAQ,EAAE,CAAA;AACrD,CAAC;AAED,+EAA+E;AAC/E,wBAAwB;AACxB,MAAM,EAAE,GAA8B;IACpC,EAAE,EAAE,QAAQ;IACZ,IAAI,EAAE,QAAQ;IACd,GAAG,EAAE,QAAQ;IACb,KAAK,EAAE,QAAQ;IACf,OAAO,EAAE,QAAQ;IACjB,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,MAAM;IAChB,GAAG,EAAE,QAAQ;CACd,CAAA;AACD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAa,EAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAE7F,8EAA8E;AAC9E,yDAAyD;AACzD,MAAM,GAAG,GAA8B;IACrC,EAAE,EAAE,kBAAkB;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,SAAS;IACd,KAAK,EAAE,MAAM;IACb,OAAO,EAAE,MAAM;IACf,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,MAAM;IAChB,GAAG,EAAE,MAAM;CACZ,CAAA;AACD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAa,EAAU,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../packages/ketjs/src/kernel/types.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import type { Schema } from '../data/migrate.ts';
2
- import type { KetModule, Manifest } from '../types.ts';
2
+ import type { KetModule, Manifest, ModulePermissionsDef, RoleTemplateDef } from '../types.ts';
3
3
  import type { ServeSpec } from '../server/boot.ts';
4
4
  export type WorkerSpec = {
5
5
  /** Local concurrency per queue. Several worker processes multiply it. */
@@ -9,8 +9,78 @@ export type WorkerSpec = {
9
9
  tenantRefreshMs?: number;
10
10
  leaseMs?: number;
11
11
  shutdownGraceMs?: number;
12
+ /**
13
+ * How often to look for a due schedule, in every tenant database.
14
+ *
15
+ * The sweep is one small statement per scheduled job per tenant, so the cost is
16
+ * tenants times schedules divided by this. A deployment with many tenants and a
17
+ * minute of tolerance should raise it.
18
+ */
19
+ scheduleSweepMs?: number;
12
20
  };
13
- export type AppSpec = {
21
+ /**
22
+ * Where a deployment says what its navigation means, as opposed to what its
23
+ * modules happen to contain.
24
+ *
25
+ * `home` answers "what should this person see first". Entries are tried in
26
+ * order and the first the viewer may call wins, so the specific sits above the
27
+ * general. The condition is a function key rather than a role name because a
28
+ * role is a bundle of capabilities that the framework never sees at request
29
+ * time — the server knows what you may call, not what you are called.
30
+ *
31
+ * Without it `/admin` falls back to the first path in menu order, which is the
32
+ * entry with the smallest `sequence` the viewer is permitted to see. That is an
33
+ * accident of declaration order, not a decision about anyone's work.
34
+ */
35
+ export type NavigationSpec = {
36
+ home?: ReadonlyArray<{
37
+ needs: string;
38
+ path: string;
39
+ }>;
40
+ /**
41
+ * Function keys that mark a viewer as inspecting rather than operating.
42
+ *
43
+ * `MenuDef.for` narrows a sidebar to the work a person does, which is exactly
44
+ * wrong for an auditor: their work is looking, and looking is what `for` does
45
+ * not describe. Anyone who may call one of these keeps the whole permitted
46
+ * tree. A function key again, for the same reason `home` uses one.
47
+ */
48
+ audit?: readonly string[];
49
+ /**
50
+ * Regroup the menu the way this product's shifts actually run.
51
+ *
52
+ * A module groups its screens the way the module is built — hospitality puts
53
+ * folios and billing under "Operations" because both are hospitality code.
54
+ * A hotel does not run that way: the person holding the folio is a cashier and
55
+ * their shift is "Payments". Only the deployment knows this, and until now only
56
+ * the module could say it.
57
+ *
58
+ * Entries named here move under the declared heading; entries left out keep the
59
+ * heading their module gave them. Order is the order declared.
60
+ */
61
+ groups?: ReadonlyArray<{
62
+ id: string;
63
+ label: string;
64
+ icon?: string;
65
+ items: readonly string[];
66
+ }>;
67
+ /**
68
+ * Menu ids to keep out of the main list regardless of `for`.
69
+ *
70
+ * `for` answers "is this your work". This answers "is this worth a permanent
71
+ * row", which is the question a manager who can do everything still has.
72
+ */
73
+ demote?: readonly string[];
74
+ /**
75
+ * Whether the shell offers the list of root sections.
76
+ *
77
+ * `auto` shows it when this viewer has more than one root worth visiting, which
78
+ * is the honest default. A single-domain product like a hotel sets `never`: a
79
+ * chooser with one choice is furniture.
80
+ */
81
+ rootList?: 'auto' | 'always' | 'never';
82
+ };
83
+ export type DeploymentSpec = {
14
84
  name: string;
15
85
  modules: KetModule[];
16
86
  theme?: KetModule;
@@ -18,45 +88,53 @@ export type AppSpec = {
18
88
  themes?: KetModule[];
19
89
  datastore?: string;
20
90
  requires?: string[];
21
- /** An app that exposes functions but renders no pages: no theme, no region contract. */
91
+ /** A deployment that exposes functions but renders no pages: no theme, no region contract. */
22
92
  headless?: boolean;
23
- /** How the app runs: pages, routes, assets, datastore. Absent means it is never served. */
93
+ /** Require exact function coverage and compile product-owned managed role templates. */
94
+ permissions?: {
95
+ requireCoverage?: boolean;
96
+ modules?: Record<string, ModulePermissionsDef>;
97
+ roleTemplates?: Record<string, RoleTemplateDef>;
98
+ };
99
+ /** How the deployment runs: pages, routes, assets, datastore. Absent means it is never served. */
24
100
  serve?: ServeSpec;
25
- /** Same app and manifest, a separate production process role. */
101
+ /** Same deployment and manifest, a separate production process role. */
26
102
  worker?: WorkerSpec;
103
+ /** What this deployment's navigation means, over and above what its modules contain. */
104
+ navigation?: NavigationSpec;
27
105
  };
28
106
  /**
29
107
  * What an authored workspace may name before module paths have been resolved.
30
108
  *
31
- * Keeping this separate from AppSpec is deliberate: composition, HTTP and workers
109
+ * Keeping this separate from DeploymentSpec is deliberate: composition, HTTP and workers
32
110
  * continue to receive executable KetModule objects only. A string is allowed at
33
111
  * the workspace boundary and nowhere deeper in the framework.
34
112
  */
35
113
  export type ModuleRef = KetModule | string;
36
- export type AppDeclaration = Omit<AppSpec, 'modules' | 'theme' | 'themes'> & {
114
+ export type DeploymentDeclaration = Omit<DeploymentSpec, 'modules' | 'theme' | 'themes'> & {
37
115
  modules: ModuleRef[];
38
116
  theme?: ModuleRef;
39
117
  themes?: ModuleRef[];
40
118
  };
41
119
  export type ModulePath = string | URL;
42
120
  export type WorkspaceDeclaration = {
43
- apps: AppDeclaration[];
44
- /** Odoo-like roots whose direct children may contain ket.module.json. */
121
+ deployments: DeploymentDeclaration[];
122
+ /** the domain contract-like roots whose direct children may contain ket.module.json. */
45
123
  modulePaths?: ModulePath[];
46
124
  };
47
125
  export type Workspace = {
48
- apps: Record<string, Manifest>;
126
+ deployments: Record<string, Manifest>;
49
127
  datastores: Record<string, {
50
128
  schema: Schema;
51
- apps: string[];
129
+ deployments: string[];
52
130
  modules: string[];
53
131
  }>;
54
132
  shared: string[];
55
133
  soloed: Record<string, string[]>;
56
134
  };
57
- export declare function defineApp(spec: AppSpec): AppSpec;
58
- export declare function defineApp(spec: AppDeclaration): AppDeclaration;
135
+ export declare function defineDeployment(spec: DeploymentSpec): DeploymentSpec;
136
+ export declare function defineDeployment(spec: DeploymentDeclaration): DeploymentDeclaration;
59
137
  export declare function defineWorkspace<T extends WorkspaceDeclaration>(spec: T): T;
60
- export declare function composeWorkspace(apps: AppSpec[]): Workspace;
138
+ export declare function composeWorkspace(deployments: DeploymentSpec[]): Workspace;
61
139
  export declare function explainWorkspace(ws: Workspace): string;
62
140
  //# sourceMappingURL=workspace.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../../../../packages/ketjs/src/kernel/workspace.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAElD,MAAM,MAAM,UAAU,GAAG;IACvB,yEAAyE;IACzE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,SAAS,EAAE,CAAA;IACpB,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,mFAAmF;IACnF,MAAM,CAAC,EAAE,SAAS,EAAE,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,wFAAwF;IACxF,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,2FAA2F;IAC3F,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,iEAAiE;IACjE,MAAM,CAAC,EAAE,UAAU,CAAA;CACpB,CAAA;AAED;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,MAAM,CAAA;AAC1C,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO,GAAG,QAAQ,CAAC,GAAG;IAC3E,OAAO,EAAE,SAAS,EAAE,CAAA;IACpB,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,MAAM,CAAC,EAAE,SAAS,EAAE,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,GAAG,CAAA;AACrC,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,cAAc,EAAE,CAAA;IACtB,yEAAyE;IACzE,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC9B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAA;IACjF,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;CACjC,CAAA;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAA;AACjD,wBAAgB,SAAS,CAAC,IAAI,EAAE,cAAc,GAAG,cAAc,CAAA;AAwB/D,wBAAgB,eAAe,CAAC,CAAC,SAAS,oBAAoB,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAM1E;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,SAAS,CA0F3D;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,SAAS,GAAG,MAAM,CAiBtD"}
1
+ {"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../../../../packages/ketjs/src/kernel/workspace.ts"],"names":[],"mappings":"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"}
@@ -1,97 +1,156 @@
1
- // Umbrella layout: one repository, many deployable apps, shared modules.
1
+ // Umbrella layout: one repository, many deployments, shared modules.
2
2
  //
3
- // Elixir's umbrella works because apps declare their dependencies explicitly and
3
+ // Elixir's umbrella works because applications declare their dependencies explicitly and
4
4
  // share one build. Ket already has the first half — `depends` between modules is
5
- // `in_umbrella` by another name. This adds the second: several apps composed from
5
+ // `in_umbrella` by another name. This adds the second: several deployments composed from
6
6
  // overlapping module sets, each with its own routes, theme and agent surface.
7
7
  //
8
8
  // The classic umbrella failure is the shared database becoming an invisible
9
- // coupling. Here it is made visible: apps bound to the same datastore get a single
9
+ // coupling. Here it is made visible: deployments bound to the same datastore get a single
10
10
  // union schema, computed and checked at build time, and any disagreement between
11
- // two apps about the same model is an error rather than a 3am surprise.
11
+ // two deployments about the same model is an error rather than a 3am surprise.
12
12
  import { compose } from './compose.js';
13
13
  import { Diagnostics } from './errors.js';
14
14
  import { schemaFromManifest } from '../data/migrate.js';
15
- export function defineApp(spec) {
15
+ const columnContract = (column) => `${column.base === 'ref' ? `ref:${column.target ?? '(missing target)'}` : column.base}${column.optional ? '?' : ''}`;
16
+ const indexContract = (index) => `${index.unique ? 'unique ' : ''}(${index.fields.join(', ')}) from ${index.by}`;
17
+ export function defineDeployment(spec) {
16
18
  if (!/^[a-z][a-z0-9_]*$/.test(spec.name))
17
- throw new Error(`invalid app name "${spec.name}"`);
19
+ throw new Error(`invalid deployment name "${spec.name}"`);
18
20
  if (spec.headless && (spec.theme || spec.themes?.length))
19
- throw new Error(`app "${spec.name}" is headless but installs a theme`);
21
+ throw new Error(`deployment "${spec.name}" is headless but selects a theme`);
20
22
  const themeNames = [spec.theme, ...(spec.themes ?? [])]
21
23
  .filter((theme) => theme !== undefined)
22
24
  .map((theme) => (typeof theme === 'string' ? theme : theme.name));
23
25
  if (new Set(themeNames).size !== themeNames.length)
24
- throw new Error(`app "${spec.name}" selects the same theme more than once`);
26
+ throw new Error(`deployment "${spec.name}" selects the same theme more than once`);
25
27
  if (spec.headless && spec.serve?.pages)
26
- throw new Error(`app "${spec.name}" is headless but resolves pages`);
28
+ throw new Error(`deployment "${spec.name}" is headless but resolves pages`);
27
29
  const pageRegion = spec.serve?.pages?.region;
28
30
  if (pageRegion && !/^[a-z][a-z0-9]*(?:[.-][a-z0-9]+)*$/.test(pageRegion))
29
- throw new Error(`app "${spec.name}" declares invalid page region "${pageRegion}"`);
31
+ throw new Error(`deployment "${spec.name}" declares invalid page region "${pageRegion}"`);
32
+ for (const group of spec.navigation?.groups ?? []) {
33
+ if (!/^[a-z][a-z0-9]*(?:[._-][a-z0-9]+)*$/.test(group.id))
34
+ throw new Error(`deployment "${spec.name}" has invalid navigation.groups id "${group.id}"`);
35
+ if (!group.items.length)
36
+ throw new Error(`deployment "${spec.name}" declares navigation group "${group.id}" with no entries`);
37
+ }
38
+ for (const key of spec.navigation?.audit ?? []) {
39
+ if (!/^[a-z][a-z0-9_]*\.[A-Za-z][A-Za-z0-9_.]*$/.test(key))
40
+ throw new Error(`deployment "${spec.name}" has invalid navigation.audit condition "${key}"`);
41
+ }
42
+ for (const entry of spec.navigation?.home ?? []) {
43
+ if (!/^[a-z][a-z0-9_]*\.[A-Za-z][A-Za-z0-9_.]*$/.test(entry.needs))
44
+ throw new Error(`deployment "${spec.name}" has invalid navigation.home condition "${entry.needs}"`);
45
+ if (!entry.path.startsWith('/'))
46
+ throw new Error(`deployment "${spec.name}" has invalid navigation.home path "${entry.path}"`);
47
+ }
30
48
  if (spec.worker && !Object.keys(spec.worker.queues).length)
31
- throw new Error(`app "${spec.name}" declares a worker with no queues`);
49
+ throw new Error(`deployment "${spec.name}" declares a worker with no queues`);
32
50
  for (const [queue, concurrency] of Object.entries(spec.worker?.queues ?? {})) {
33
51
  if (!/^[a-z][a-z0-9_-]*$/.test(queue))
34
- throw new Error(`app "${spec.name}" has invalid queue "${queue}"`);
52
+ throw new Error(`deployment "${spec.name}" has invalid queue "${queue}"`);
35
53
  if (!Number.isInteger(concurrency) || concurrency < 1)
36
- throw new Error(`app "${spec.name}" queue "${queue}" needs concurrency >= 1`);
54
+ throw new Error(`deployment "${spec.name}" queue "${queue}" needs concurrency >= 1`);
37
55
  }
38
56
  return spec;
39
57
  }
40
58
  export function defineWorkspace(spec) {
41
59
  if (!spec || typeof spec !== 'object')
42
60
  throw new Error('defineWorkspace() expects an object');
43
- if (!Array.isArray(spec.apps))
44
- throw new Error('workspace apps must be an array');
61
+ if (!Array.isArray(spec.deployments))
62
+ throw new Error('workspace deployments must be an array');
45
63
  if (spec.modulePaths !== undefined && !Array.isArray(spec.modulePaths))
46
64
  throw new Error('workspace modulePaths must be an array');
47
65
  return spec;
48
66
  }
49
- export function composeWorkspace(apps) {
67
+ export function composeWorkspace(deployments) {
50
68
  const diag = new Diagnostics();
51
69
  const manifests = {};
52
70
  const usedBy = new Map();
53
- for (const app of apps) {
54
- const mods = [...app.modules, ...(app.theme ? [app.theme] : []), ...(app.themes ?? [])];
71
+ for (const deployment of deployments) {
72
+ const mods = [
73
+ ...deployment.modules,
74
+ ...(deployment.theme ? [deployment.theme] : []),
75
+ ...(deployment.themes ?? []),
76
+ ];
55
77
  try {
56
- manifests[app.name] = compose(mods, {
57
- appRequires: app.requires ?? [],
58
- headless: app.headless ?? false,
78
+ manifests[deployment.name] = compose(mods, {
79
+ requiredRegions: deployment.requires ?? [],
80
+ headless: deployment.headless ?? false,
81
+ requirePermissionCoverage: deployment.permissions?.requireCoverage,
82
+ modulePermissionDeclarations: deployment.permissions?.modules,
83
+ roleTemplates: deployment.permissions?.roleTemplates,
59
84
  });
60
85
  }
61
86
  catch (e) {
62
87
  diag.add({
63
- code: 'E_APP_COMPOSE_FAILED',
64
- module: app.name,
65
- message: `app "${app.name}" failed to compose: ${e.message}`,
88
+ code: 'E_DEPLOYMENT_COMPOSE_FAILED',
89
+ module: deployment.name,
90
+ message: `deployment "${deployment.name}" failed to compose: ${e.message}`,
66
91
  });
67
92
  continue;
68
93
  }
69
- const configured = app.worker?.queues ?? {};
70
- for (const [job, meta] of Object.entries(manifests[app.name].jobs)) {
94
+ const configured = deployment.worker?.queues ?? {};
95
+ for (const [job, meta] of Object.entries(manifests[deployment.name].jobs)) {
71
96
  if (configured[meta.queue])
72
97
  continue;
73
98
  diag.add({
74
- code: 'E_APP_JOB_QUEUE_UNCONFIGURED',
75
- module: app.name,
76
- message: `app "${app.name}" ships job "${job}" on queue "${meta.queue}" but does not configure that worker queue`,
99
+ code: 'E_DEPLOYMENT_JOB_QUEUE_UNCONFIGURED',
100
+ module: deployment.name,
101
+ message: `deployment "${deployment.name}" ships job "${job}" on queue "${meta.queue}" but does not configure that worker queue`,
77
102
  hint: `add worker.queues.${meta.queue}, or remove the module that contributes the job`,
78
103
  });
79
104
  }
105
+ // A landing page that names a function this build does not serve, or a path
106
+ // nothing routes, fails quietly at runtime: the viewer simply falls through to
107
+ // the old first-path behaviour and nobody is told why.
108
+ for (const key of deployment.navigation?.audit ?? []) {
109
+ const manifest = manifests[deployment.name];
110
+ if (!manifest.functions[key])
111
+ diag.add({
112
+ code: 'E_DEPLOYMENT_NAVIGATION_AUDIT_UNKNOWN_FUNCTION',
113
+ module: deployment.name,
114
+ message: `deployment "${deployment.name}" treats "${key}" as an inspection capability, but that function is not in this build`,
115
+ hint: 'name a function the composed modules serve, or drop the key',
116
+ });
117
+ }
118
+ for (const entry of deployment.navigation?.home ?? []) {
119
+ const manifest = manifests[deployment.name];
120
+ if (!manifest.functions[entry.needs])
121
+ diag.add({
122
+ code: 'E_DEPLOYMENT_NAVIGATION_HOME_UNKNOWN_FUNCTION',
123
+ module: deployment.name,
124
+ message: `deployment "${deployment.name}" lands on "${entry.path}" when "${entry.needs}" is permitted, but that function is not in this build`,
125
+ hint: 'name a function the composed modules serve, or drop the entry',
126
+ });
127
+ if (!Object.keys(manifest.routes).includes(entry.path))
128
+ diag.add({
129
+ code: 'E_DEPLOYMENT_NAVIGATION_HOME_UNROUTED',
130
+ module: deployment.name,
131
+ message: `deployment "${deployment.name}" lands on "${entry.path}", which no composed module routes`,
132
+ hint: 'point at a served path, or compose the module that serves it',
133
+ });
134
+ }
80
135
  for (const m of mods) {
81
136
  const list = usedBy.get(m.name) ?? [];
82
- list.push(app.name);
137
+ list.push(deployment.name);
83
138
  usedBy.set(m.name, list);
84
139
  }
85
140
  }
86
141
  diag.throwIfAny();
87
142
  // One union schema per datastore, so the coupling is explicit and checkable.
88
143
  const datastores = {};
89
- for (const app of apps) {
90
- const store = app.datastore ?? 'main';
91
- const manifest = manifests[app.name];
144
+ for (const deployment of deployments) {
145
+ const store = deployment.datastore ?? 'main';
146
+ const manifest = manifests[deployment.name];
92
147
  const schema = schemaFromManifest(manifest);
93
- const slot = (datastores[store] ??= { schema: { version: 1, tables: {} }, apps: [], modules: [] });
94
- slot.apps.push(app.name);
148
+ const slot = (datastores[store] ??= {
149
+ schema: { version: 1, tables: {} },
150
+ deployments: [],
151
+ modules: [],
152
+ });
153
+ slot.deployments.push(deployment.name);
95
154
  for (const m of manifest.order)
96
155
  if (!slot.modules.includes(m))
97
156
  slot.modules.push(m);
@@ -104,9 +163,9 @@ export function composeWorkspace(apps) {
104
163
  if (existing.model !== table.model) {
105
164
  diag.add({
106
165
  code: 'E_DATASTORE_MODEL_CLASH',
107
- module: app.name,
108
- message: `datastore "${store}": table "${tname}" is "${existing.model}" in another app but "${table.model}" in "${app.name}"`,
109
- hint: 'rename one of the models, or bind the apps to different datastores',
166
+ module: deployment.name,
167
+ message: `datastore "${store}": table "${tname}" is "${existing.model}" in another deployment but "${table.model}" in "${deployment.name}"`,
168
+ hint: 'rename one of the models, or bind the deployments to different datastores',
110
169
  });
111
170
  continue;
112
171
  }
@@ -116,12 +175,32 @@ export function composeWorkspace(apps) {
116
175
  existing.columns[cname] = { ...col };
117
176
  continue;
118
177
  }
119
- if (before.base !== col.base || before.by !== col.by) {
178
+ if (before.base !== col.base ||
179
+ before.optional !== col.optional ||
180
+ before.target !== col.target ||
181
+ before.by !== col.by) {
120
182
  diag.add({
121
183
  code: 'E_DATASTORE_COLUMN_CLASH',
122
- module: app.name,
123
- message: `datastore "${store}": column "${tname}.${cname}" is ${before.base} (from ${before.by}) elsewhere but ${col.base} (from ${col.by}) in "${app.name}"`,
124
- hint: 'both apps must install the same version of the contributing module',
184
+ module: deployment.name,
185
+ message: `datastore "${store}": column "${tname}.${cname}" is ${columnContract(before)} (from ${before.by}) elsewhere but ${columnContract(col)} (from ${col.by}) in "${deployment.name}"`,
186
+ hint: 'both deployments must install the same version of the contributing module',
187
+ });
188
+ }
189
+ }
190
+ for (const [name, index] of Object.entries(table.indexes)) {
191
+ const before = existing.indexes[name];
192
+ if (!before) {
193
+ existing.indexes[name] = { ...index, fields: [...index.fields] };
194
+ continue;
195
+ }
196
+ if (before.unique !== index.unique ||
197
+ before.by !== index.by ||
198
+ before.fields.join('\0') !== index.fields.join('\0')) {
199
+ diag.add({
200
+ code: 'E_DATASTORE_INDEX_CLASH',
201
+ module: deployment.name,
202
+ message: `datastore "${store}": index "${tname}.${name}" is ${indexContract(before)} elsewhere but ${indexContract(index)} in "${deployment.name}"`,
203
+ hint: 'rename one index, or make both deployments declare the same fields and uniqueness',
125
204
  });
126
205
  }
127
206
  }
@@ -136,21 +215,21 @@ export function composeWorkspace(apps) {
136
215
  else
137
216
  (soloed[list[0]] ??= []).push(mod);
138
217
  }
139
- return { apps: manifests, datastores, shared: shared.sort(), soloed };
218
+ return { deployments: manifests, datastores, shared: shared.sort(), soloed };
140
219
  }
141
220
  export function explainWorkspace(ws) {
142
221
  const lines = [];
143
- lines.push('apps:');
144
- for (const [name, m] of Object.entries(ws.apps)) {
222
+ lines.push('deployments:');
223
+ for (const [name, m] of Object.entries(ws.deployments)) {
145
224
  lines.push(` ${name.padEnd(14)} modules=${m.order.length} fns=${Object.keys(m.functions).length} jobs=${Object.keys(m.jobs).length} regions=${m.regions.required.length}`);
146
225
  }
147
226
  lines.push('datastores:');
148
227
  for (const [name, ds] of Object.entries(ws.datastores)) {
149
- lines.push(` ${name.padEnd(14)} tables=${Object.keys(ds.schema.tables).length} shared by: ${ds.apps.join(', ')}`);
228
+ lines.push(` ${name.padEnd(14)} tables=${Object.keys(ds.schema.tables).length} shared by: ${ds.deployments.join(', ')}`);
150
229
  }
151
230
  lines.push(`shared modules: ${ws.shared.join(', ') || '(none)'}`);
152
- for (const [app, mods] of Object.entries(ws.soloed))
153
- lines.push(` only in ${app}: ${mods.join(', ')}`);
231
+ for (const [deployment, mods] of Object.entries(ws.soloed))
232
+ lines.push(` only in ${deployment}: ${mods.join(', ')}`);
154
233
  return lines.join('\n');
155
234
  }
156
235
  //# sourceMappingURL=workspace.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../packages/ketjs/src/kernel/workspace.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../packages/ketjs/src/kernel/workspace.ts"],"names":[],"mappings":"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"}
Binary file