sandcms 0.6.3 → 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 (175) hide show
  1. package/README.md +15 -11
  2. package/dist/admin/Account.svelte +2 -0
  3. package/dist/admin/Admin.svelte +21 -6
  4. package/dist/admin/AssetAttachment.svelte +9 -6
  5. package/dist/admin/AssetAttachment.svelte.d.ts +3 -1
  6. package/dist/admin/BlueprintFields.svelte +0 -3
  7. package/dist/admin/BlueprintFields.svelte.d.ts +0 -1
  8. package/dist/admin/Editor.svelte +5 -10
  9. package/dist/admin/Fields.svelte +2 -8
  10. package/dist/admin/Fields.svelte.d.ts +0 -1
  11. package/dist/admin/Gallery.svelte +221 -80
  12. package/dist/admin/Gallery.svelte.d.ts +0 -1
  13. package/dist/admin/Inbox.svelte +3 -2
  14. package/dist/admin/LinkField.svelte +0 -3
  15. package/dist/admin/LinkField.svelte.d.ts +0 -1
  16. package/dist/admin/MediaLibrary.svelte +10 -7
  17. package/dist/admin/MediaPicker.svelte +43 -35
  18. package/dist/admin/MediaPicker.svelte.d.ts +0 -1
  19. package/dist/admin/Navigation.svelte +13 -2
  20. package/dist/admin/Pages.svelte +195 -0
  21. package/dist/admin/Pages.svelte.d.ts +7 -0
  22. package/dist/admin/Shell.svelte +27 -5
  23. package/dist/admin/SortableList.svelte +82 -61
  24. package/dist/admin/SortableList.svelte.d.ts +3 -1
  25. package/dist/admin/ThemePicker.svelte +72 -0
  26. package/dist/admin/ThemePicker.svelte.d.ts +18 -0
  27. package/dist/admin/UploadButton.svelte +2 -1
  28. package/dist/admin/UploadProgress.svelte +24 -0
  29. package/dist/admin/UploadProgress.svelte.d.ts +7 -0
  30. package/dist/admin/Users.svelte +8 -3
  31. package/dist/admin/client.d.ts +3 -670
  32. package/dist/admin/client.js +2 -1
  33. package/dist/admin/components/ui/alert/alert.svelte.d.ts +3 -13
  34. package/dist/admin/components/ui/attachment/attachment-media.svelte.d.ts +3 -13
  35. package/dist/admin/components/ui/attachment/attachment.svelte.d.ts +6 -26
  36. package/dist/admin/components/ui/badge/badge.svelte.d.ts +7 -25
  37. package/dist/admin/components/ui/button/button.svelte.d.ts +15 -53
  38. package/dist/admin/components/ui/toggle/toggle.svelte.d.ts +6 -26
  39. package/dist/admin/generated/admin.css +823 -115
  40. package/dist/admin/navigation.d.ts +9 -0
  41. package/dist/admin/navigation.js +20 -1
  42. package/dist/admin/theme-context.d.ts +7 -0
  43. package/dist/admin/theme-context.js +3 -0
  44. package/dist/admin/theme.d.ts +7 -0
  45. package/dist/admin/theme.js +14 -0
  46. package/dist/admin/types.d.ts +3 -1
  47. package/dist/admin/uploads.d.ts +8 -1
  48. package/dist/admin/uploads.js +94 -16
  49. package/dist/blueprints/files.js +1 -0
  50. package/dist/blueprints/labels.d.ts +6 -0
  51. package/dist/blueprints/labels.js +14 -0
  52. package/dist/blueprints/load.js +16 -2
  53. package/dist/blueprints/types.d.ts +4 -1
  54. package/dist/cli/admin.d.ts +39 -0
  55. package/dist/cli/admin.js +95 -0
  56. package/dist/cli/backup.js +4 -4
  57. package/dist/cli/doctor.d.ts +10 -1
  58. package/dist/cli/doctor.js +98 -33
  59. package/dist/cli/email-test.d.ts +3 -0
  60. package/dist/cli/email-test.js +20 -0
  61. package/dist/cli/files.d.ts +2 -6
  62. package/dist/cli/files.js +12 -2
  63. package/dist/cli/index.js +401 -95
  64. package/dist/cli/rebaseline.d.ts +10 -0
  65. package/dist/cli/rebaseline.js +117 -0
  66. package/dist/cli/scaffold.js +8 -8
  67. package/dist/cli/setup.js +16 -26
  68. package/dist/cli/upgrade.js +34 -7
  69. package/dist/env.d.ts +26 -2
  70. package/dist/env.js +48 -6
  71. package/dist/notification-fields.js +2 -1
  72. package/dist/server/admin-load.d.ts +85 -5
  73. package/dist/server/admin-load.js +26 -1
  74. package/dist/server/api-access.d.ts +4 -0
  75. package/dist/server/api-access.js +15 -2
  76. package/dist/server/api-keys.d.ts +96 -0
  77. package/dist/server/api-keys.js +115 -0
  78. package/dist/server/api-pagination.d.ts +3 -0
  79. package/dist/server/api.js +21 -63
  80. package/dist/server/auth.d.ts +10 -9
  81. package/dist/server/cms.d.ts +63 -21
  82. package/dist/server/cms.js +64 -7
  83. package/dist/server/db/auto-migrate.d.ts +0 -4
  84. package/dist/server/db/auto-migrate.js +12 -3
  85. package/dist/server/db/legacy.d.ts +13 -0
  86. package/dist/server/db/legacy.js +60 -0
  87. package/dist/server/db/migration-data.js +2 -34
  88. package/dist/server/db/migrations/{0000_foundation.sql → 0000_baseline.sql} +120 -4
  89. package/dist/server/db/migrations/meta/0000_snapshot.json +578 -3
  90. package/dist/server/db/migrations/meta/_journal.json +2 -58
  91. package/dist/server/db/schema.d.ts +119 -2
  92. package/dist/server/db/schema.js +23 -9
  93. package/dist/server/db/store.d.ts +25 -2
  94. package/dist/server/db/store.js +90 -26
  95. package/dist/server/forms.js +2 -1
  96. package/dist/server/hooks.js +155 -81
  97. package/dist/server/media/contracts.d.ts +115 -0
  98. package/dist/server/media/contracts.js +12 -0
  99. package/dist/server/media/deletions.d.ts +2 -1
  100. package/dist/server/media/deletions.js +3 -3
  101. package/dist/server/media/delivery.js +7 -11
  102. package/dist/server/media/processor-child.d.ts +2 -0
  103. package/dist/server/media/processor-child.js +236 -0
  104. package/dist/server/media/processor.d.ts +51 -0
  105. package/dist/server/media/processor.js +135 -0
  106. package/dist/server/media/render-math.d.ts +24 -0
  107. package/dist/server/media/render-math.js +50 -0
  108. package/dist/server/media/runner.d.ts +30 -1
  109. package/dist/server/media/runner.js +418 -165
  110. package/dist/server/media/service.d.ts +53 -11
  111. package/dist/server/media/service.js +307 -98
  112. package/dist/server/media/storage.d.ts +5 -0
  113. package/dist/server/media/storage.js +279 -0
  114. package/dist/server/media/upload-ticket.d.ts +12 -0
  115. package/dist/server/media/upload-ticket.js +35 -0
  116. package/dist/server/media/verify.d.ts +64 -0
  117. package/dist/server/media/verify.js +201 -0
  118. package/dist/server/platform/http.d.ts +27 -0
  119. package/dist/server/platform/http.js +77 -0
  120. package/dist/server/platform/index.d.ts +52 -0
  121. package/dist/server/platform/index.js +98 -0
  122. package/dist/server/platform/snapshots.d.ts +18 -0
  123. package/dist/server/platform/snapshots.js +110 -0
  124. package/dist/server/platform/volume.d.ts +20 -0
  125. package/dist/server/platform/volume.js +60 -0
  126. package/docs/acceptance.md +7 -5
  127. package/docs/api.md +56 -4
  128. package/docs/cloudflare.md +26 -152
  129. package/docs/content.md +20 -5
  130. package/docs/deployment.md +222 -57
  131. package/docs/email.md +6 -0
  132. package/docs/forms.md +2 -2
  133. package/docs/media.md +94 -21
  134. package/docs/package.md +21 -18
  135. package/docs/plans/0.7-self-hosted.md +264 -0
  136. package/docs/releases.md +37 -1
  137. package/docs/upgrades.md +72 -9
  138. package/package.json +37 -44
  139. package/templates/Dockerfile +32 -0
  140. package/templates/integration.ts +26 -5
  141. package/templates/openship.json +9 -0
  142. package/templates/railpack.json +1 -1
  143. package/templates/sandcms/blueprints/files/image.yaml +1 -1
  144. package/templates/sandcms/config.yaml +1 -1
  145. package/dist/cli/cloudflare.d.ts +0 -8
  146. package/dist/cli/cloudflare.js +0 -135
  147. package/dist/server/db/migrations/0001_independent_password_resets.sql +0 -3
  148. package/dist/server/db/migrations/0002_email_failure_reason.sql +0 -1
  149. package/dist/server/db/migrations/0003_direct_r2_uploads.sql +0 -10
  150. package/dist/server/db/migrations/0004_agent_api_keys.sql +0 -38
  151. package/dist/server/db/migrations/0005_api_retention_and_pagination.sql +0 -3
  152. package/dist/server/db/migrations/0006_durable_media_deletion.sql +0 -7
  153. package/dist/server/db/migrations/0007_content_and_job_indexes.sql +0 -2
  154. package/dist/server/db/migrations/0008_search_text_cache.sql +0 -45
  155. package/dist/server/db/migrations/meta/0001_snapshot.json +0 -1197
  156. package/dist/server/db/migrations/meta/0002_snapshot.json +0 -1204
  157. package/dist/server/db/migrations/meta/0003_snapshot.json +0 -1281
  158. package/dist/server/db/migrations/meta/0004_snapshot.json +0 -1546
  159. package/dist/server/db/migrations/meta/0005_snapshot.json +0 -1572
  160. package/dist/server/db/migrations/meta/0006_snapshot.json +0 -1627
  161. package/dist/server/db/migrations/meta/0007_snapshot.json +0 -1643
  162. package/dist/server/db/migrations/meta/0008_snapshot.json +0 -1711
  163. package/dist/worker/index.d.ts +0 -10
  164. package/dist/worker/index.js +0 -460
  165. package/dist/worker/local.d.ts +0 -5
  166. package/dist/worker/local.js +0 -57
  167. package/dist/worker/source.d.ts +0 -2
  168. package/dist/worker/source.js +0 -31
  169. package/dist/worker/uploads.d.ts +0 -22
  170. package/dist/worker/uploads.js +0 -48
  171. package/templates/sandcms/worker/index.ts +0 -1
  172. package/templates/sandcms/worker/local.ts +0 -1
  173. package/templates/sandcms/worker/wrangler.jsonc +0 -6
  174. /package/dist/{worker → server/media}/svg.d.ts +0 -0
  175. /package/dist/{worker → server/media}/svg.js +0 -0
@@ -5,64 +5,8 @@
5
5
  {
6
6
  "idx": 0,
7
7
  "version": "6",
8
- "when": 1790528895144,
9
- "tag": "0000_foundation",
10
- "breakpoints": true
11
- },
12
- {
13
- "idx": 1,
14
- "version": "6",
15
- "when": 1790941625583,
16
- "tag": "0001_independent_password_resets",
17
- "breakpoints": true
18
- },
19
- {
20
- "idx": 2,
21
- "version": "6",
22
- "when": 1790943374287,
23
- "tag": "0002_email_failure_reason",
24
- "breakpoints": true
25
- },
26
- {
27
- "idx": 3,
28
- "version": "6",
29
- "when": 1790943435700,
30
- "tag": "0003_direct_r2_uploads",
31
- "breakpoints": true
32
- },
33
- {
34
- "idx": 4,
35
- "version": "6",
36
- "when": 1790948837850,
37
- "tag": "0004_agent_api_keys",
38
- "breakpoints": true
39
- },
40
- {
41
- "idx": 5,
42
- "version": "6",
43
- "when": 1790950792615,
44
- "tag": "0005_api_retention_and_pagination",
45
- "breakpoints": true
46
- },
47
- {
48
- "idx": 6,
49
- "version": "6",
50
- "when": 1791075641694,
51
- "tag": "0006_durable_media_deletion",
52
- "breakpoints": true
53
- },
54
- {
55
- "idx": 7,
56
- "version": "6",
57
- "when": 1791405303147,
58
- "tag": "0007_content_and_job_indexes",
59
- "breakpoints": true
60
- },
61
- {
62
- "idx": 8,
63
- "version": "6",
64
- "when": 1791407294932,
65
- "tag": "0008_search_text_cache",
8
+ "when": 1795294799888,
9
+ "tag": "0000_baseline",
66
10
  "breakpoints": true
67
11
  }
68
12
  ]
@@ -1670,6 +1670,8 @@ export interface Variant {
1670
1670
  width: number;
1671
1671
  height: number;
1672
1672
  format: string;
1673
+ /** Strong validator for local delivery (short sha256 of the bytes); absent on legacy rows. */
1674
+ etag?: string;
1673
1675
  }
1674
1676
  export declare const media: import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
1675
1677
  name: "media";
@@ -1918,6 +1920,59 @@ export declare const media: import("drizzle-orm/sqlite-core").SQLiteTableWithCol
1918
1920
  }, {}, {
1919
1921
  length: undefined;
1920
1922
  }>;
1923
+ width: import("drizzle-orm/sqlite-core").SQLiteColumn<{
1924
+ name: "width";
1925
+ tableName: "media";
1926
+ dataType: "number";
1927
+ columnType: "SQLiteInteger";
1928
+ data: number;
1929
+ driverParam: number;
1930
+ notNull: false;
1931
+ hasDefault: false;
1932
+ isPrimaryKey: false;
1933
+ isAutoincrement: false;
1934
+ hasRuntimeDefault: false;
1935
+ enumValues: undefined;
1936
+ baseColumn: never;
1937
+ identity: undefined;
1938
+ generated: undefined;
1939
+ }, {}, {}>;
1940
+ height: import("drizzle-orm/sqlite-core").SQLiteColumn<{
1941
+ name: "height";
1942
+ tableName: "media";
1943
+ dataType: "number";
1944
+ columnType: "SQLiteInteger";
1945
+ data: number;
1946
+ driverParam: number;
1947
+ notNull: false;
1948
+ hasDefault: false;
1949
+ isPrimaryKey: false;
1950
+ isAutoincrement: false;
1951
+ hasRuntimeDefault: false;
1952
+ enumValues: undefined;
1953
+ baseColumn: never;
1954
+ identity: undefined;
1955
+ generated: undefined;
1956
+ }, {}, {}>;
1957
+ uploadAttempt: import("drizzle-orm/sqlite-core").SQLiteColumn<{
1958
+ name: "uploadAttempt";
1959
+ tableName: "media";
1960
+ dataType: "string";
1961
+ columnType: "SQLiteText";
1962
+ data: string;
1963
+ driverParam: string;
1964
+ notNull: false;
1965
+ hasDefault: false;
1966
+ isPrimaryKey: false;
1967
+ isAutoincrement: false;
1968
+ hasRuntimeDefault: false;
1969
+ enumValues: [string, ...string[]];
1970
+ baseColumn: never;
1971
+ identity: undefined;
1972
+ generated: undefined;
1973
+ }, {}, {
1974
+ length: undefined;
1975
+ }>;
1921
1976
  };
1922
1977
  dialect: "sqlite";
1923
1978
  }>;
@@ -2843,14 +2898,14 @@ export declare const uploadSessions: import("drizzle-orm/sqlite-core").SQLiteTab
2843
2898
  tableName: "upload_sessions";
2844
2899
  dataType: "string";
2845
2900
  columnType: "SQLiteText";
2846
- data: "pending" | "uploading" | "expired";
2901
+ data: "pending" | "uploading" | "receiving" | "expired";
2847
2902
  driverParam: string;
2848
2903
  notNull: true;
2849
2904
  hasDefault: true;
2850
2905
  isPrimaryKey: false;
2851
2906
  isAutoincrement: false;
2852
2907
  hasRuntimeDefault: false;
2853
- enumValues: ["uploading", "pending", "expired"];
2908
+ enumValues: ["uploading", "receiving", "pending", "expired"];
2854
2909
  baseColumn: never;
2855
2910
  identity: undefined;
2856
2911
  generated: undefined;
@@ -3033,3 +3088,65 @@ export declare const mediaDocumentLinks: import("drizzle-orm/sqlite-core").SQLit
3033
3088
  };
3034
3089
  dialect: "sqlite";
3035
3090
  }>;
3091
+ export declare const leases: import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
3092
+ name: "leases";
3093
+ schema: undefined;
3094
+ columns: {
3095
+ name: import("drizzle-orm/sqlite-core").SQLiteColumn<{
3096
+ name: "name";
3097
+ tableName: "leases";
3098
+ dataType: "string";
3099
+ columnType: "SQLiteText";
3100
+ data: string;
3101
+ driverParam: string;
3102
+ notNull: true;
3103
+ hasDefault: false;
3104
+ isPrimaryKey: true;
3105
+ isAutoincrement: false;
3106
+ hasRuntimeDefault: false;
3107
+ enumValues: [string, ...string[]];
3108
+ baseColumn: never;
3109
+ identity: undefined;
3110
+ generated: undefined;
3111
+ }, {}, {
3112
+ length: undefined;
3113
+ }>;
3114
+ owner: import("drizzle-orm/sqlite-core").SQLiteColumn<{
3115
+ name: "owner";
3116
+ tableName: "leases";
3117
+ dataType: "string";
3118
+ columnType: "SQLiteText";
3119
+ data: string;
3120
+ driverParam: string;
3121
+ notNull: true;
3122
+ hasDefault: false;
3123
+ isPrimaryKey: false;
3124
+ isAutoincrement: false;
3125
+ hasRuntimeDefault: false;
3126
+ enumValues: [string, ...string[]];
3127
+ baseColumn: never;
3128
+ identity: undefined;
3129
+ generated: undefined;
3130
+ }, {}, {
3131
+ length: undefined;
3132
+ }>;
3133
+ leaseUntil: import("drizzle-orm/sqlite-core").SQLiteColumn<{
3134
+ name: "leaseUntil";
3135
+ tableName: "leases";
3136
+ dataType: "number";
3137
+ columnType: "SQLiteInteger";
3138
+ data: number;
3139
+ driverParam: number;
3140
+ notNull: true;
3141
+ hasDefault: false;
3142
+ isPrimaryKey: false;
3143
+ isAutoincrement: false;
3144
+ hasRuntimeDefault: false;
3145
+ enumValues: undefined;
3146
+ baseColumn: never;
3147
+ identity: undefined;
3148
+ generated: undefined;
3149
+ }, {}, {}>;
3150
+ };
3151
+ dialect: "sqlite";
3152
+ }>;
@@ -4,7 +4,7 @@ const timestamp = (name) => integer(name, { mode: 'timestamp_ms' });
4
4
  export const user = sqliteTable('user', {
5
5
  id: text().primaryKey(),
6
6
  name: text().notNull(),
7
- email: text().notNull().unique(),
7
+ email: text().notNull(),
8
8
  emailVerified: integer({ mode: 'boolean' }).notNull().default(false),
9
9
  image: text(),
10
10
  createdAt: timestamp('createdAt').notNull(),
@@ -14,11 +14,11 @@ export const user = sqliteTable('user', {
14
14
  .default('editor'),
15
15
  mustChangePassword: integer({ mode: 'boolean' }).notNull().default(true),
16
16
  twoFactorEnabled: integer({ mode: 'boolean' }).default(false)
17
- });
17
+ }, (t) => [uniqueIndex('user_email_unique').on(t.email)]);
18
18
  export const session = sqliteTable('session', {
19
19
  id: text().primaryKey(),
20
20
  expiresAt: timestamp('expiresAt').notNull(),
21
- token: text().notNull().unique(),
21
+ token: text().notNull(),
22
22
  createdAt: timestamp('createdAt').notNull(),
23
23
  updatedAt: timestamp('updatedAt').notNull(),
24
24
  ipAddress: text(),
@@ -26,7 +26,7 @@ export const session = sqliteTable('session', {
26
26
  userId: text()
27
27
  .notNull()
28
28
  .references(() => user.id, { onDelete: 'cascade' })
29
- }, (t) => [index('session_user').on(t.userId)]);
29
+ }, (t) => [uniqueIndex('session_token_unique').on(t.token), index('session_user').on(t.userId)]);
30
30
  export const account = sqliteTable('account', {
31
31
  id: text().primaryKey(),
32
32
  accountId: text().notNull(),
@@ -107,7 +107,7 @@ export const apiRequests = sqliteTable('api_requests', {
107
107
  export const documents = sqliteTable('documents', {
108
108
  id: text().primaryKey(),
109
109
  blueprint: text().notNull(),
110
- singleton: text().unique(),
110
+ singleton: text(),
111
111
  draft: text({ mode: 'json' }).$type().notNull(),
112
112
  published: text({ mode: 'json' }).$type(),
113
113
  draftSlug: text(),
@@ -119,6 +119,7 @@ export const documents = sqliteTable('documents', {
119
119
  // Normalized search text cache; NULL means stale or not yet computed. Maintained by triggers.
120
120
  searchText: text()
121
121
  }, (t) => [
122
+ uniqueIndex('documents_singleton_unique').on(t.singleton),
122
123
  uniqueIndex('draft_slug').on(t.blueprint, t.draftSlug),
123
124
  uniqueIndex('published_slug').on(t.blueprint, t.publishedSlug),
124
125
  index('documents_blueprint').on(t.blueprint),
@@ -150,7 +151,12 @@ export const media = sqliteTable('media', {
150
151
  error: text(),
151
152
  createdAt: integer().notNull(),
152
153
  // Normalized search text cache; NULL means stale or not yet computed. Maintained by triggers.
153
- searchText: text()
154
+ searchText: text(),
155
+ // Oriented original dimensions, recorded when the original is stored locally (0.7.0+).
156
+ width: integer(),
157
+ height: integer(),
158
+ // Upload attempt that produced the stored original; guards against a replaced original.
159
+ uploadAttempt: text()
154
160
  }, (t) => [index('media_api_page').on(t.createdAt, t.id)]);
155
161
  export const jobs = sqliteTable('jobs', {
156
162
  id: text().primaryKey(),
@@ -209,13 +215,14 @@ export const accessLinks = sqliteTable('access_links', {
209
215
  role: text({ enum: ['admin', 'editor'] })
210
216
  .notNull()
211
217
  .default('editor'),
212
- tokenHash: text().notNull().unique(),
218
+ tokenHash: text().notNull(),
213
219
  credentialHash: text(),
214
220
  expiresAt: integer().notNull(),
215
221
  status: text({ enum: ['sending', 'accepted', 'failed'] }).notNull(),
216
222
  failureReason: text().$type(),
217
223
  createdAt: integer().notNull()
218
224
  }, (t) => [
225
+ uniqueIndex('access_links_tokenHash_unique').on(t.tokenHash),
219
226
  index('access_link_recipient').on(t.kind, t.email),
220
227
  uniqueIndex('access_invite_recipient')
221
228
  .on(t.kind, t.email)
@@ -225,14 +232,15 @@ export const formNotifications = sqliteTable('form_notifications', {
225
232
  formId: text().primaryKey(),
226
233
  settings: text({ mode: 'json' }).$type().notNull()
227
234
  });
228
- // Metadata only: browser transfers go directly to private R2 staging.
235
+ // Metadata only: chunk bytes are staged on disk under media/tmp/{mediaId}/{attempt}.
236
+ // 'receiving' means at least one chunk arrived; its lease is extended by every chunk.
229
237
  export const uploadSessions = sqliteTable('upload_sessions', {
230
238
  mediaId: text()
231
239
  .primaryKey()
232
240
  .references(() => media.id, { onDelete: 'cascade' }),
233
241
  attempt: text().notNull(),
234
242
  expiresAt: integer().notNull(),
235
- status: text({ enum: ['uploading', 'pending', 'expired'] })
243
+ status: text({ enum: ['uploading', 'receiving', 'pending', 'expired'] })
236
244
  .notNull()
237
245
  .default('uploading'),
238
246
  attempts: integer().notNull().default(0),
@@ -259,3 +267,9 @@ export const mediaDocumentLinks = sqliteTable('media_document_links', {
259
267
  primaryKey({ columns: [t.mediaId, t.documentId] }),
260
268
  index('media_document_link_document').on(t.documentId)
261
269
  ]);
270
+ // Named exclusive leases shared by the server and CLI processes (e.g. the single media processor).
271
+ export const leases = sqliteTable('leases', {
272
+ name: text().primaryKey(),
273
+ owner: text().notNull(),
274
+ leaseUntil: integer().notNull()
275
+ });
@@ -2,11 +2,18 @@ import { Database } from 'bun:sqlite';
2
2
  import { type BunSQLiteDatabase } from 'drizzle-orm/bun-sqlite';
3
3
  import * as schema from './schema.js';
4
4
  export declare const SCHEMA_VERSION: number;
5
+ /**
6
+ * A migration whose SQL contains this line cannot be read by code built before it. Every other migration
7
+ * must keep the previous release working on the migrated database (overlapping deploys and rollbacks).
8
+ */
9
+ export declare const BREAKING_MARKER: RegExp;
5
10
  export declare function migrations(): {
6
11
  hash: string;
12
+ breaking: boolean;
7
13
  name: string;
8
14
  sql: string;
9
15
  }[];
16
+ export type Migration = ReturnType<typeof migrations>[number];
10
17
  export declare function databasePath(path: string): string;
11
18
  export declare function volumeGuard(path: string, exclusive?: boolean): Database | undefined;
12
19
  export interface Store {
@@ -19,15 +26,31 @@ export declare function openStore(path: string, { migrate, guard }?: {
19
26
  migrate?: boolean | undefined;
20
27
  guard?: boolean | undefined;
21
28
  }): Store;
22
- export declare function pendingMigrations(store: Store): {
29
+ export interface SchemaHistory {
30
+ /** Migrations this package has and the database lacks. */
31
+ pending: Migration[];
32
+ /** Non-breaking migrations a newer release applied that this package does not know. */
33
+ ahead: {
34
+ name: string;
35
+ hash: string;
36
+ }[];
37
+ }
38
+ /**
39
+ * Compare the database's migration history with this package. Throws for a foreign, modified or
40
+ * inconsistent history, a pre-0.8.0 database, or a newer release's breaking migration.
41
+ */
42
+ export declare function schemaHistory(sqlite: Database): SchemaHistory;
43
+ export declare function pendingMigrations(store: Pick<Store, 'sqlite'>): {
23
44
  hash: string;
45
+ breaking: boolean;
24
46
  name: string;
25
47
  sql: string;
26
48
  }[];
27
- export declare function assertSchema(store: Store): void;
49
+ export declare function assertSchema(store: Store): SchemaHistory;
28
50
  export declare function applyMigrations(store: Store): string[];
29
51
  export declare function inspectMigrations(path: string): {
30
52
  hash: string;
53
+ breaking: boolean;
31
54
  name: string;
32
55
  sql: string;
33
56
  }[];
@@ -5,12 +5,19 @@ import { dirname, resolve, basename, join } from 'node:path';
5
5
  import { createHash } from 'node:crypto';
6
6
  import * as schema from './schema.js';
7
7
  import { migrationData } from './migration-data.js';
8
+ import { assertNotLegacy } from './legacy.js';
8
9
  export const SCHEMA_VERSION = migrationData.length;
9
- const resetGuidance = 'Use the matching package version for this database. Changed pre-0.5.0 baselines require an explicitly initialized fresh database; do not reset a supported database. See docs/upgrades.md.';
10
+ const resetGuidance = 'Use the matching package version for this database. Databases from before the 0.8.0 baseline must be converted with sandcms rebaseline. See docs/upgrades.md.';
11
+ /**
12
+ * A migration whose SQL contains this line cannot be read by code built before it. Every other migration
13
+ * must keep the previous release working on the migrated database (overlapping deploys and rollbacks).
14
+ */
15
+ export const BREAKING_MARKER = /^--\s*sandcms:breaking\s*$/m;
10
16
  export function migrations() {
11
17
  return migrationData.map((m) => ({
12
18
  ...m,
13
- hash: createHash('sha256').update(m.sql).digest('hex')
19
+ hash: createHash('sha256').update(m.sql).digest('hex'),
20
+ breaking: BREAKING_MARKER.test(m.sql)
14
21
  }));
15
22
  }
16
23
  // A separate DELETE-mode database holds shared locks for the lifetime of every connection.
@@ -54,7 +61,7 @@ export function openStore(path, { migrate = false, guard = true } = {}) {
54
61
  const store = {
55
62
  path,
56
63
  sqlite,
57
- db: drizzle(sqlite, { schema }),
64
+ db: drizzle({ client: sqlite, schema }),
58
65
  close() {
59
66
  sqlite.close();
60
67
  lock?.close();
@@ -70,41 +77,91 @@ export function openStore(path, { migrate = false, guard = true } = {}) {
70
77
  throw e;
71
78
  }
72
79
  }
73
- export function pendingMigrations(store) {
80
+ const MIGRATIONS_TABLE = 'CREATE TABLE IF NOT EXISTS schema_migrations (name TEXT PRIMARY KEY, hash TEXT NOT NULL, applied_at INTEGER NOT NULL, breaking INTEGER NOT NULL DEFAULT 0)';
81
+ /**
82
+ * Compare the database's migration history with this package. Throws for a foreign, modified or
83
+ * inconsistent history, a pre-0.8.0 database, or a newer release's breaking migration.
84
+ */
85
+ export function schemaHistory(sqlite) {
86
+ const tracked = sqlite
87
+ .query("SELECT name FROM pragma_table_info('schema_migrations')")
88
+ .all()
89
+ .map((c) => c.name);
90
+ if (tracked.length && !tracked.includes('breaking'))
91
+ assertNotLegacy(sqlite);
74
92
  // Each statement reads one snapshot, so a concurrent migration cannot mix version and history.
75
- const state = store.sqlite
76
- .query("SELECT user_version, EXISTS (SELECT 1 FROM sqlite_master WHERE name='schema_migrations') AS tracked FROM pragma_user_version")
77
- .get();
78
- const rows = state.tracked
79
- ? store.sqlite
80
- .query('SELECT NULL AS name, NULL AS hash, user_version FROM pragma_user_version UNION ALL SELECT name, hash, NULL FROM schema_migrations ORDER BY name')
93
+ const rows = tracked.length
94
+ ? sqlite
95
+ .query('SELECT NULL AS name, NULL AS hash, NULL AS breaking, user_version FROM pragma_user_version UNION ALL SELECT name, hash, breaking, NULL FROM schema_migrations ORDER BY name')
81
96
  .all()
82
- : [];
83
- const version = { user_version: rows[0]?.user_version ?? state.user_version };
97
+ : sqlite.query('SELECT user_version FROM pragma_user_version').all();
98
+ const version = rows[0].user_version;
84
99
  const applied = rows.slice(1);
85
- if (version.user_version > SCHEMA_VERSION)
86
- throw new Error(`Database schema is incompatible with this package. ${resetGuidance}`);
87
100
  const available = migrations();
88
- for (const old of applied) {
89
- const m = available.find((m) => m.name === old.name);
90
- if (!m || m.hash !== old.hash)
91
- throw new Error(`Incompatible or modified migration ${old.name}. ${resetGuidance}`);
101
+ if (version !== applied.length)
102
+ throw new Error(`Database migration history is inconsistent. ${resetGuidance}`);
103
+ for (const [index, old] of applied.entries()) {
104
+ const m = available[index];
105
+ if (!m)
106
+ break;
107
+ if (m.name !== old.name || m.hash !== old.hash)
108
+ throw new Error(available.some((item) => item.name === old.name)
109
+ ? `Database migration history is inconsistent. ${resetGuidance}`
110
+ : `Incompatible or modified migration ${old.name}. ${resetGuidance}`);
92
111
  }
93
- if (version.user_version !== applied.length ||
94
- applied.some((old, index) => available[index]?.name !== old.name))
112
+ const ahead = applied.slice(available.length);
113
+ if (ahead.length && ahead[0].name <= available[available.length - 1].name)
95
114
  throw new Error(`Database migration history is inconsistent. ${resetGuidance}`);
96
- return available.slice(applied.length);
115
+ const breaking = ahead.find((m) => m.breaking);
116
+ if (breaking)
117
+ throw new Error(`Database was migrated by a newer SandCMS release with the breaking migration ${breaking.name}; this package cannot use it. Deploy that release or a newer one.`);
118
+ return {
119
+ pending: available.slice(applied.length),
120
+ ahead: ahead.map(({ name, hash }) => ({ name, hash }))
121
+ };
122
+ }
123
+ export function pendingMigrations(store) {
124
+ return schemaHistory(store.sqlite).pending;
97
125
  }
98
126
  export function assertSchema(store) {
99
- if (pendingMigrations(store).length)
127
+ const history = schemaHistory(store.sqlite);
128
+ if (history.pending.length)
100
129
  throw new Error('Database migrations are pending. Run sandcms migrate against this database.');
130
+ return history;
131
+ }
132
+ /**
133
+ * Table rebuilds (drizzle-kit's `PRAGMA foreign_keys=OFF` ... `__new_<table>`) need foreign keys off for
134
+ * the whole transaction, and SQLite ignores that pragma inside one. Triggers are dropped first and
135
+ * recreated afterwards: DROP TABLE removes a rebuilt table's triggers, and RENAME fails while a trigger
136
+ * on another table refers to the dropped name.
137
+ */
138
+ function rebuilds(sql) {
139
+ return /PRAGMA\s+foreign_keys\s*=\s*(OFF|0|false)/i.test(sql);
140
+ }
141
+ function runMigration(sqlite, m) {
142
+ const triggers = sqlite
143
+ .query("SELECT name, sql FROM sqlite_master WHERE type = 'trigger'")
144
+ .all();
145
+ for (const t of triggers)
146
+ sqlite.exec(`DROP TRIGGER \`${t.name}\``);
147
+ sqlite.exec(m.sql);
148
+ const dropped = (name) => new RegExp(`DROP\\s+TRIGGER\\s+(IF\\s+EXISTS\\s+)?[\`"]?${name}[\`"]?`, 'i').test(m.sql);
149
+ for (const t of triggers)
150
+ if (!dropped(t.name) && !sqlite.query('SELECT 1 FROM sqlite_master WHERE name = ?').get(t.name))
151
+ sqlite.exec(t.sql);
152
+ const violations = sqlite.query('PRAGMA foreign_key_check').all();
153
+ if (violations.length)
154
+ throw new Error(`Table rebuild left invalid references: ${JSON.stringify(violations.slice(0, 5))}`);
101
155
  }
102
156
  export function applyMigrations(store) {
103
157
  const pending = pendingMigrations(store);
104
- store.sqlite.exec('CREATE TABLE IF NOT EXISTS schema_migrations (name TEXT PRIMARY KEY, hash TEXT NOT NULL, applied_at INTEGER NOT NULL)');
158
+ store.sqlite.exec(MIGRATIONS_TABLE);
105
159
  const completed = [];
106
160
  for (const m of pending) {
161
+ const rebuild = rebuilds(m.sql);
107
162
  try {
163
+ if (rebuild)
164
+ store.sqlite.exec('PRAGMA foreign_keys=OFF');
108
165
  const applied = store.sqlite
109
166
  .transaction(() => {
110
167
  // Another process starting concurrently may have applied it after the pending check.
@@ -116,10 +173,13 @@ export function applyMigrations(store) {
116
173
  throw new Error(`Incompatible or modified migration ${m.name}. ${resetGuidance}`);
117
174
  return false;
118
175
  }
119
- store.sqlite.exec(m.sql);
176
+ if (rebuild)
177
+ runMigration(store.sqlite, m);
178
+ else
179
+ store.sqlite.exec(m.sql);
120
180
  store.sqlite
121
- .query('INSERT INTO schema_migrations VALUES (?, ?, ?)')
122
- .run(m.name, m.hash, Date.now());
181
+ .query('INSERT INTO schema_migrations (name, hash, applied_at, breaking) VALUES (?, ?, ?, ?)')
182
+ .run(m.name, m.hash, Date.now(), m.breaking ? 1 : 0);
123
183
  store.sqlite.exec(`PRAGMA user_version=${migrations().findIndex((item) => item.name === m.name) + 1}`);
124
184
  return true;
125
185
  })
@@ -130,6 +190,10 @@ export function applyMigrations(store) {
130
190
  catch (cause) {
131
191
  throw new Error(`Migration ${m.name} failed. Applied in this run: ${completed.join(', ') || 'none'}. ${String(cause)}`, { cause });
132
192
  }
193
+ finally {
194
+ if (rebuild)
195
+ store.sqlite.exec('PRAGMA foreign_keys=ON');
196
+ }
133
197
  }
134
198
  return completed;
135
199
  }
@@ -1,6 +1,7 @@
1
1
  import { createHash } from 'node:crypto';
2
2
  import { desc, eq, lt } from 'drizzle-orm';
3
3
  import { jsonPayload } from '../blueprints/validate.js';
4
+ import { fieldLabel } from '../blueprints/labels.js';
4
5
  import { submissions, rateLimits } from './db/schema.js';
5
6
  export const honeypotName = 'website_url';
6
7
  export function rateLimit(store, key, max = 5, window = 60_000) {
@@ -69,7 +70,7 @@ export function createForms(store, definition, notify) {
69
70
  const fields = new Map();
70
71
  for (const row of rows)
71
72
  for (const key of row.schema.export ?? Object.keys(row.schema.fields))
72
- fields.set(key, row.schema.fields[key]?.label ?? key);
73
+ fields.set(key, fieldLabel(key, row.schema.fields[key]));
73
74
  const lines = [
74
75
  ['Submitted', ...fields.values()],
75
76
  ...rows.map((r) => [