sandcms 0.6.0 → 0.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/cli/cloudflare.js +6 -6
- package/dist/cli/doctor.js +2 -2
- package/dist/cli/files.js +11 -6
- package/dist/cli/index.js +1 -1
- package/dist/cli/upgrade.js +2 -1
- package/dist/env.d.ts +80 -0
- package/dist/env.js +103 -0
- package/dist/server/admin-load.d.ts +46 -76
- package/dist/server/admin-load.js +98 -24
- package/dist/server/api-pagination.d.ts +2 -0
- package/dist/server/api-pagination.js +51 -7
- package/dist/server/cms.d.ts +19 -2
- package/dist/server/cms.js +13 -1
- package/dist/server/content.d.ts +15 -2
- package/dist/server/content.js +72 -30
- package/dist/server/db/auto-migrate.d.ts +12 -0
- package/dist/server/db/auto-migrate.js +23 -0
- package/dist/server/db/migration-data.js +8 -0
- package/dist/server/db/migrations/0007_content_and_job_indexes.sql +2 -0
- package/dist/server/db/migrations/0008_search_text_cache.sql +45 -0
- package/dist/server/db/migrations/meta/0007_snapshot.json +1643 -0
- package/dist/server/db/migrations/meta/0008_snapshot.json +1711 -0
- package/dist/server/db/migrations/meta/_journal.json +14 -0
- package/dist/server/db/schema.d.ts +83 -0
- package/dist/server/db/schema.js +23 -5
- package/dist/server/db/store.js +24 -9
- package/dist/server/email/index.d.ts +5 -1
- package/dist/server/email/index.js +12 -11
- package/dist/server/index.d.ts +1 -0
- package/dist/server/index.js +1 -0
- package/dist/server/media/runner.js +217 -191
- package/dist/server/media/service.d.ts +6 -0
- package/dist/server/media/service.js +36 -3
- package/dist/server/search.d.ts +2 -0
- package/dist/server/search.js +7 -0
- package/dist/worker/index.d.ts +1 -1
- package/dist/worker/index.js +134 -81
- package/dist/worker/local.js +5 -5
- package/dist/worker/uploads.d.ts +5 -5
- package/dist/worker/uploads.js +11 -9
- package/docs/cloudflare.md +7 -7
- package/docs/deployment.md +18 -0
- package/docs/email.md +5 -5
- package/docs/media.md +2 -2
- package/docs/package.md +4 -4
- package/docs/releases.md +18 -0
- package/docs/upgrades.md +66 -0
- package/package.json +5 -1
- package/templates/env.ts +8 -0
- package/templates/integration.ts +6 -5
|
@@ -50,6 +50,20 @@
|
|
|
50
50
|
"when": 1791075641694,
|
|
51
51
|
"tag": "0006_durable_media_deletion",
|
|
52
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",
|
|
66
|
+
"breakpoints": true
|
|
53
67
|
}
|
|
54
68
|
]
|
|
55
69
|
}
|
|
@@ -1539,6 +1539,25 @@ export declare const documents: import("drizzle-orm/sqlite-core").SQLiteTableWit
|
|
|
1539
1539
|
identity: undefined;
|
|
1540
1540
|
generated: undefined;
|
|
1541
1541
|
}, {}, {}>;
|
|
1542
|
+
searchText: import("drizzle-orm/sqlite-core").SQLiteColumn<{
|
|
1543
|
+
name: "searchText";
|
|
1544
|
+
tableName: "documents";
|
|
1545
|
+
dataType: "string";
|
|
1546
|
+
columnType: "SQLiteText";
|
|
1547
|
+
data: string;
|
|
1548
|
+
driverParam: string;
|
|
1549
|
+
notNull: false;
|
|
1550
|
+
hasDefault: false;
|
|
1551
|
+
isPrimaryKey: false;
|
|
1552
|
+
isAutoincrement: false;
|
|
1553
|
+
hasRuntimeDefault: false;
|
|
1554
|
+
enumValues: [string, ...string[]];
|
|
1555
|
+
baseColumn: never;
|
|
1556
|
+
identity: undefined;
|
|
1557
|
+
generated: undefined;
|
|
1558
|
+
}, {}, {
|
|
1559
|
+
length: undefined;
|
|
1560
|
+
}>;
|
|
1542
1561
|
};
|
|
1543
1562
|
dialect: "sqlite";
|
|
1544
1563
|
}>;
|
|
@@ -1880,6 +1899,25 @@ export declare const media: import("drizzle-orm/sqlite-core").SQLiteTableWithCol
|
|
|
1880
1899
|
identity: undefined;
|
|
1881
1900
|
generated: undefined;
|
|
1882
1901
|
}, {}, {}>;
|
|
1902
|
+
searchText: import("drizzle-orm/sqlite-core").SQLiteColumn<{
|
|
1903
|
+
name: "searchText";
|
|
1904
|
+
tableName: "media";
|
|
1905
|
+
dataType: "string";
|
|
1906
|
+
columnType: "SQLiteText";
|
|
1907
|
+
data: string;
|
|
1908
|
+
driverParam: string;
|
|
1909
|
+
notNull: false;
|
|
1910
|
+
hasDefault: false;
|
|
1911
|
+
isPrimaryKey: false;
|
|
1912
|
+
isAutoincrement: false;
|
|
1913
|
+
hasRuntimeDefault: false;
|
|
1914
|
+
enumValues: [string, ...string[]];
|
|
1915
|
+
baseColumn: never;
|
|
1916
|
+
identity: undefined;
|
|
1917
|
+
generated: undefined;
|
|
1918
|
+
}, {}, {
|
|
1919
|
+
length: undefined;
|
|
1920
|
+
}>;
|
|
1883
1921
|
};
|
|
1884
1922
|
dialect: "sqlite";
|
|
1885
1923
|
}>;
|
|
@@ -2950,3 +2988,48 @@ export declare const mediaDeletions: import("drizzle-orm/sqlite-core").SQLiteTab
|
|
|
2950
2988
|
};
|
|
2951
2989
|
dialect: "sqlite";
|
|
2952
2990
|
}>;
|
|
2991
|
+
export declare const mediaDocumentLinks: import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
|
|
2992
|
+
name: "media_document_links";
|
|
2993
|
+
schema: undefined;
|
|
2994
|
+
columns: {
|
|
2995
|
+
mediaId: import("drizzle-orm/sqlite-core").SQLiteColumn<{
|
|
2996
|
+
name: "mediaId";
|
|
2997
|
+
tableName: "media_document_links";
|
|
2998
|
+
dataType: "string";
|
|
2999
|
+
columnType: "SQLiteText";
|
|
3000
|
+
data: string;
|
|
3001
|
+
driverParam: string;
|
|
3002
|
+
notNull: true;
|
|
3003
|
+
hasDefault: false;
|
|
3004
|
+
isPrimaryKey: false;
|
|
3005
|
+
isAutoincrement: false;
|
|
3006
|
+
hasRuntimeDefault: false;
|
|
3007
|
+
enumValues: [string, ...string[]];
|
|
3008
|
+
baseColumn: never;
|
|
3009
|
+
identity: undefined;
|
|
3010
|
+
generated: undefined;
|
|
3011
|
+
}, {}, {
|
|
3012
|
+
length: undefined;
|
|
3013
|
+
}>;
|
|
3014
|
+
documentId: import("drizzle-orm/sqlite-core").SQLiteColumn<{
|
|
3015
|
+
name: "documentId";
|
|
3016
|
+
tableName: "media_document_links";
|
|
3017
|
+
dataType: "string";
|
|
3018
|
+
columnType: "SQLiteText";
|
|
3019
|
+
data: string;
|
|
3020
|
+
driverParam: string;
|
|
3021
|
+
notNull: true;
|
|
3022
|
+
hasDefault: false;
|
|
3023
|
+
isPrimaryKey: false;
|
|
3024
|
+
isAutoincrement: false;
|
|
3025
|
+
hasRuntimeDefault: false;
|
|
3026
|
+
enumValues: [string, ...string[]];
|
|
3027
|
+
baseColumn: never;
|
|
3028
|
+
identity: undefined;
|
|
3029
|
+
generated: undefined;
|
|
3030
|
+
}, {}, {
|
|
3031
|
+
length: undefined;
|
|
3032
|
+
}>;
|
|
3033
|
+
};
|
|
3034
|
+
dialect: "sqlite";
|
|
3035
|
+
}>;
|
package/dist/server/db/schema.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { sql } from 'drizzle-orm';
|
|
2
|
-
import { sqliteTable, text, integer, index, uniqueIndex, blob } from 'drizzle-orm/sqlite-core';
|
|
2
|
+
import { sqliteTable, text, integer, index, uniqueIndex, blob, primaryKey } from 'drizzle-orm/sqlite-core';
|
|
3
3
|
const timestamp = (name) => integer(name, { mode: 'timestamp_ms' });
|
|
4
4
|
export const user = sqliteTable('user', {
|
|
5
5
|
id: text().primaryKey(),
|
|
@@ -115,7 +115,9 @@ export const documents = sqliteTable('documents', {
|
|
|
115
115
|
version: integer().notNull().default(1),
|
|
116
116
|
publishedAt: integer(),
|
|
117
117
|
updatedAt: integer().notNull(),
|
|
118
|
-
createdAt: integer().notNull()
|
|
118
|
+
createdAt: integer().notNull(),
|
|
119
|
+
// Normalized search text cache; NULL means stale or not yet computed. Maintained by triggers.
|
|
120
|
+
searchText: text()
|
|
119
121
|
}, (t) => [
|
|
120
122
|
uniqueIndex('draft_slug').on(t.blueprint, t.draftSlug),
|
|
121
123
|
uniqueIndex('published_slug').on(t.blueprint, t.publishedSlug),
|
|
@@ -130,7 +132,10 @@ export const references = sqliteTable('content_references', {
|
|
|
130
132
|
targetId: text().notNull(),
|
|
131
133
|
kind: text({ enum: ['entry', 'media'] }).notNull(),
|
|
132
134
|
snapshot: text({ enum: ['draft', 'published'] }).notNull()
|
|
133
|
-
}, (t) => [
|
|
135
|
+
}, (t) => [
|
|
136
|
+
index('reference_target').on(t.targetId),
|
|
137
|
+
index('reference_document').on(t.documentId, t.snapshot)
|
|
138
|
+
]);
|
|
134
139
|
export const media = sqliteTable('media', {
|
|
135
140
|
blueprint: text().notNull(),
|
|
136
141
|
metadata: text({ mode: 'json' }).$type().notNull().default({}),
|
|
@@ -143,7 +148,9 @@ export const media = sqliteTable('media', {
|
|
|
143
148
|
targetVersion: text().notNull(),
|
|
144
149
|
variants: text({ mode: 'json' }).$type().notNull().default([]),
|
|
145
150
|
error: text(),
|
|
146
|
-
createdAt: integer().notNull()
|
|
151
|
+
createdAt: integer().notNull(),
|
|
152
|
+
// Normalized search text cache; NULL means stale or not yet computed. Maintained by triggers.
|
|
153
|
+
searchText: text()
|
|
147
154
|
}, (t) => [index('media_api_page').on(t.createdAt, t.id)]);
|
|
148
155
|
export const jobs = sqliteTable('jobs', {
|
|
149
156
|
id: text().primaryKey(),
|
|
@@ -162,7 +169,7 @@ export const jobs = sqliteTable('jobs', {
|
|
|
162
169
|
nextAttempt: integer().notNull().default(0),
|
|
163
170
|
error: text(),
|
|
164
171
|
result: text({ mode: 'json' }).$type()
|
|
165
|
-
}, (t) => [index('job_due').on(t.status, t.nextAttempt)]);
|
|
172
|
+
}, (t) => [index('job_due').on(t.status, t.nextAttempt), index('job_media').on(t.mediaId, t.version)]);
|
|
166
173
|
export const submissions = sqliteTable('submissions', {
|
|
167
174
|
id: text().primaryKey(),
|
|
168
175
|
formId: text().notNull(),
|
|
@@ -241,3 +248,14 @@ export const mediaDeletions = sqliteTable('media_deletions', {
|
|
|
241
248
|
nextAttempt: integer().notNull().default(0),
|
|
242
249
|
leaseUntil: integer().notNull().default(0)
|
|
243
250
|
});
|
|
251
|
+
// Document IDs found in media metadata, maintained by triggers so document changes can
|
|
252
|
+
// invalidate only the related media search text.
|
|
253
|
+
export const mediaDocumentLinks = sqliteTable('media_document_links', {
|
|
254
|
+
mediaId: text()
|
|
255
|
+
.notNull()
|
|
256
|
+
.references(() => media.id, { onDelete: 'cascade' }),
|
|
257
|
+
documentId: text().notNull()
|
|
258
|
+
}, (t) => [
|
|
259
|
+
primaryKey({ columns: [t.mediaId, t.documentId] }),
|
|
260
|
+
index('media_document_link_document').on(t.documentId)
|
|
261
|
+
]);
|
package/dist/server/db/store.js
CHANGED
|
@@ -71,15 +71,19 @@ export function openStore(path, { migrate = false, guard = true } = {}) {
|
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
export function pendingMigrations(store) {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
const exists = store.sqlite
|
|
78
|
-
.query("SELECT name FROM sqlite_master WHERE name='schema_migrations'")
|
|
74
|
+
// 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")
|
|
79
77
|
.get();
|
|
80
|
-
const
|
|
81
|
-
? store.sqlite
|
|
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')
|
|
81
|
+
.all()
|
|
82
82
|
: [];
|
|
83
|
+
const version = { user_version: rows[0]?.user_version ?? state.user_version };
|
|
84
|
+
const applied = rows.slice(1);
|
|
85
|
+
if (version.user_version > SCHEMA_VERSION)
|
|
86
|
+
throw new Error(`Database schema is incompatible with this package. ${resetGuidance}`);
|
|
83
87
|
const available = migrations();
|
|
84
88
|
for (const old of applied) {
|
|
85
89
|
const m = available.find((m) => m.name === old.name);
|
|
@@ -101,16 +105,27 @@ export function applyMigrations(store) {
|
|
|
101
105
|
const completed = [];
|
|
102
106
|
for (const m of pending) {
|
|
103
107
|
try {
|
|
104
|
-
store.sqlite
|
|
108
|
+
const applied = store.sqlite
|
|
105
109
|
.transaction(() => {
|
|
110
|
+
// Another process starting concurrently may have applied it after the pending check.
|
|
111
|
+
const recorded = store.sqlite
|
|
112
|
+
.query('SELECT hash FROM schema_migrations WHERE name = ?')
|
|
113
|
+
.get(m.name);
|
|
114
|
+
if (recorded) {
|
|
115
|
+
if (recorded.hash !== m.hash)
|
|
116
|
+
throw new Error(`Incompatible or modified migration ${m.name}. ${resetGuidance}`);
|
|
117
|
+
return false;
|
|
118
|
+
}
|
|
106
119
|
store.sqlite.exec(m.sql);
|
|
107
120
|
store.sqlite
|
|
108
121
|
.query('INSERT INTO schema_migrations VALUES (?, ?, ?)')
|
|
109
122
|
.run(m.name, m.hash, Date.now());
|
|
110
123
|
store.sqlite.exec(`PRAGMA user_version=${migrations().findIndex((item) => item.name === m.name) + 1}`);
|
|
124
|
+
return true;
|
|
111
125
|
})
|
|
112
126
|
.immediate();
|
|
113
|
-
|
|
127
|
+
if (applied)
|
|
128
|
+
completed.push(m.name);
|
|
114
129
|
}
|
|
115
130
|
catch (cause) {
|
|
116
131
|
throw new Error(`Migration ${m.name} failed. Applied in this run: ${completed.join(', ') || 'none'}. ${String(cause)}`, { cause });
|
|
@@ -57,4 +57,8 @@ export declare function createEmail(options?: EmailOptions): {
|
|
|
57
57
|
send(message: EmailMessage): Promise<EmailResult>;
|
|
58
58
|
};
|
|
59
59
|
/** Parse private environment settings; no settings means email is disabled. */
|
|
60
|
-
|
|
60
|
+
declare const emailEnvKeys: readonly ["SANDCMS_EMAIL_FROM", "SANDCMS_EMAIL_REPLY_TO", "SANDCMS_SMTP_HOST", "SANDCMS_SMTP_PORT", "SANDCMS_SMTP_SECURE", "SANDCMS_SMTP_USER", "SANDCMS_SMTP_PASSWORD", "SANDCMS_SMTP_ALLOW_INSECURE_LOCAL"];
|
|
61
|
+
/** Accepts `process.env` or `import * as env from '$app/env/private'`. */
|
|
62
|
+
export declare function emailOptionsFromEnv(env: {
|
|
63
|
+
readonly [K in (typeof emailEnvKeys)[number]]?: string | undefined;
|
|
64
|
+
}): EmailOptions | undefined;
|
|
@@ -199,18 +199,19 @@ export function createEmail(options) {
|
|
|
199
199
|
};
|
|
200
200
|
}
|
|
201
201
|
/** Parse private environment settings; no settings means email is disabled. */
|
|
202
|
+
const emailEnvKeys = [
|
|
203
|
+
'SANDCMS_EMAIL_FROM',
|
|
204
|
+
'SANDCMS_EMAIL_REPLY_TO',
|
|
205
|
+
'SANDCMS_SMTP_HOST',
|
|
206
|
+
'SANDCMS_SMTP_PORT',
|
|
207
|
+
'SANDCMS_SMTP_SECURE',
|
|
208
|
+
'SANDCMS_SMTP_USER',
|
|
209
|
+
'SANDCMS_SMTP_PASSWORD',
|
|
210
|
+
'SANDCMS_SMTP_ALLOW_INSECURE_LOCAL'
|
|
211
|
+
];
|
|
212
|
+
/** Accepts `process.env` or `import * as env from '$app/env/private'`. */
|
|
202
213
|
export function emailOptionsFromEnv(env) {
|
|
203
|
-
|
|
204
|
-
'SANDCMS_EMAIL_FROM',
|
|
205
|
-
'SANDCMS_EMAIL_REPLY_TO',
|
|
206
|
-
'SANDCMS_SMTP_HOST',
|
|
207
|
-
'SANDCMS_SMTP_PORT',
|
|
208
|
-
'SANDCMS_SMTP_SECURE',
|
|
209
|
-
'SANDCMS_SMTP_USER',
|
|
210
|
-
'SANDCMS_SMTP_PASSWORD',
|
|
211
|
-
'SANDCMS_SMTP_ALLOW_INSECURE_LOCAL'
|
|
212
|
-
];
|
|
213
|
-
if (!keys.some((key) => env[key] !== undefined && env[key] !== ''))
|
|
214
|
+
if (!emailEnvKeys.some((key) => env[key] !== undefined && env[key] !== ''))
|
|
214
215
|
return undefined;
|
|
215
216
|
const boolean = (key) => {
|
|
216
217
|
const value = env[key];
|
package/dist/server/index.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ export { createCMS, type CMS, type CmsOptions } from './cms.js';
|
|
|
2
2
|
export { cmsHandle, adminLoad, apiHandler } from './http.js';
|
|
3
3
|
export { createUser, recoverUser } from './auth.js';
|
|
4
4
|
export { openStore, applyMigrations, pendingMigrations } from './db/store.js';
|
|
5
|
+
export { autoMigrate } from './db/auto-migrate.js';
|
|
5
6
|
export { loadDefinition } from '../blueprints/load.js';
|
|
6
7
|
export { honeypotName } from './forms.js';
|
|
7
8
|
export { createEmail, createSmtpAdapter, emailOptionsFromEnv, EmailError, type EmailMessage, type EmailResult, type EmailAdapter, type EmailOptions, type SmtpOptions, emailFailureMessage, type EmailFailureReason, type EmailErrorCode } from './email/index.js';
|
package/dist/server/index.js
CHANGED
|
@@ -2,6 +2,7 @@ export { createCMS } from './cms.js';
|
|
|
2
2
|
export { cmsHandle, adminLoad, apiHandler } from './http.js';
|
|
3
3
|
export { createUser, recoverUser } from './auth.js';
|
|
4
4
|
export { openStore, applyMigrations, pendingMigrations } from './db/store.js';
|
|
5
|
+
export { autoMigrate } from './db/auto-migrate.js';
|
|
5
6
|
export { loadDefinition } from '../blueprints/load.js';
|
|
6
7
|
export { honeypotName } from './forms.js';
|
|
7
8
|
export { createEmail, createSmtpAdapter, emailOptionsFromEnv, EmailError, emailFailureMessage } from './email/index.js';
|