@supatype/cli 0.1.0 → 0.1.1
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/.turbo/turbo-build.log +1 -1
- package/.turbo/turbo-test.log +96 -85
- package/.turbo/turbo-typecheck.log +1 -1
- package/dist/commands/admin.d.ts +28 -1
- package/dist/commands/admin.d.ts.map +1 -1
- package/dist/commands/admin.js +273 -111
- package/dist/commands/admin.js.map +1 -1
- package/dist/commands/dev.d.ts.map +1 -1
- package/dist/commands/dev.js +2 -0
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/init.d.ts +5 -0
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +70 -1
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/push.js +3 -3
- package/dist/commands/push.js.map +1 -1
- package/dist/compose-rename.d.ts +10 -0
- package/dist/compose-rename.d.ts.map +1 -0
- package/dist/compose-rename.js +67 -0
- package/dist/compose-rename.js.map +1 -0
- package/dist/dev-compose.d.ts.map +1 -1
- package/dist/dev-compose.js +34 -50
- package/dist/dev-compose.js.map +1 -1
- package/dist/dev-ports.d.ts +27 -0
- package/dist/dev-ports.d.ts.map +1 -0
- package/dist/dev-ports.js +171 -0
- package/dist/dev-ports.js.map +1 -0
- package/dist/dev-session-lock.d.ts +25 -0
- package/dist/dev-session-lock.d.ts.map +1 -0
- package/dist/dev-session-lock.js +81 -0
- package/dist/dev-session-lock.js.map +1 -0
- package/dist/dev-shutdown.d.ts +18 -2
- package/dist/dev-shutdown.d.ts.map +1 -1
- package/dist/dev-shutdown.js +69 -5
- package/dist/dev-shutdown.js.map +1 -1
- package/dist/env-file.d.ts +5 -0
- package/dist/env-file.d.ts.map +1 -0
- package/dist/env-file.js +33 -0
- package/dist/env-file.js.map +1 -0
- package/dist/self-host-compose.d.ts.map +1 -1
- package/dist/self-host-compose.js +2 -1
- package/dist/self-host-compose.js.map +1 -1
- package/package.json +3 -1
- package/src/commands/admin.ts +361 -136
- package/src/commands/dev.ts +3 -0
- package/src/commands/init.ts +93 -1
- package/src/commands/push.ts +3 -3
- package/src/compose-rename.ts +76 -0
- package/src/dev-compose.ts +44 -50
- package/src/dev-ports.ts +212 -0
- package/src/dev-session-lock.ts +101 -0
- package/src/dev-shutdown.ts +98 -5
- package/src/env-file.ts +37 -0
- package/src/self-host-compose.ts +2 -1
- package/tests/admin-ensure.test.ts +59 -0
- package/tests/dev-ports.test.ts +41 -0
- package/tests/dev-session-lock.test.ts +54 -0
- package/tests/dev-ui.test.ts +24 -1
- package/tsconfig.tsbuildinfo +1 -1
package/dist/commands/admin.js
CHANGED
|
@@ -1,15 +1,22 @@
|
|
|
1
1
|
// ─── Admin panel CLI commands (Gap Appendices task 48) ──────────────────────
|
|
2
2
|
//
|
|
3
3
|
// `npx supatype admin create-user` — create an admin user in the project's
|
|
4
|
-
//
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
4
|
+
// auth.users table. First admin is ensured on `supatype dev` or `supatype push`.
|
|
5
|
+
import { spawnSync } from "node:child_process";
|
|
6
|
+
import { existsSync } from "node:fs";
|
|
7
|
+
import { dirname, join, resolve } from "node:path";
|
|
8
|
+
import bcrypt from "bcryptjs";
|
|
7
9
|
import { loadConfig } from "../config.js";
|
|
8
|
-
import { connectionString } from "../project-config.js";
|
|
10
|
+
import { connectionString, resolveRuntimeProvider, } from "../project-config.js";
|
|
11
|
+
import { readEnvValue, upsertEnvFile } from "../env-file.js";
|
|
12
|
+
import { hasEngineOverride } from "../binary-cache.js";
|
|
9
13
|
import { confirm as uiConfirm } from "../ui/confirm.js";
|
|
10
14
|
import { error, info, plain } from "../ui/messages.js";
|
|
11
15
|
import { promptText } from "../ui/prompts.js";
|
|
12
|
-
|
|
16
|
+
import { isInteractive } from "../ui/interactive.js";
|
|
17
|
+
export const ADMIN_EMAIL_ENV = "SUPATYPE_ADMIN_EMAIL";
|
|
18
|
+
export const ADMIN_PASSWORD_ENV = "SUPATYPE_ADMIN_PASSWORD";
|
|
19
|
+
const BCRYPT_ROUNDS = 10;
|
|
13
20
|
export function registerAdmin(program) {
|
|
14
21
|
const adminCmd = program
|
|
15
22
|
.command("admin")
|
|
@@ -37,58 +44,11 @@ export function registerAdmin(program) {
|
|
|
37
44
|
}
|
|
38
45
|
const role = opts.role;
|
|
39
46
|
info(`Creating admin user: ${email} (role: ${role})...`);
|
|
40
|
-
// We use pg directly to insert into the auth.users table
|
|
41
47
|
const pg = await importPg();
|
|
42
48
|
const pool = new pg.Pool({ connectionString: connection, max: 2 });
|
|
43
49
|
try {
|
|
44
|
-
|
|
45
|
-
await pool
|
|
46
|
-
CREATE SCHEMA IF NOT EXISTS auth;
|
|
47
|
-
|
|
48
|
-
CREATE TABLE IF NOT EXISTS auth.users (
|
|
49
|
-
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
50
|
-
instance_id UUID,
|
|
51
|
-
aud TEXT DEFAULT 'authenticated',
|
|
52
|
-
role TEXT DEFAULT 'authenticated',
|
|
53
|
-
email TEXT UNIQUE,
|
|
54
|
-
encrypted_password TEXT,
|
|
55
|
-
email_confirmed_at TIMESTAMPTZ DEFAULT now(),
|
|
56
|
-
raw_app_meta_data JSONB DEFAULT '{}',
|
|
57
|
-
raw_user_meta_data JSONB DEFAULT '{}',
|
|
58
|
-
created_at TIMESTAMPTZ DEFAULT now(),
|
|
59
|
-
updated_at TIMESTAMPTZ DEFAULT now(),
|
|
60
|
-
confirmation_token TEXT DEFAULT '',
|
|
61
|
-
recovery_token TEXT DEFAULT '',
|
|
62
|
-
email_change_token_new TEXT DEFAULT '',
|
|
63
|
-
email_change TEXT DEFAULT ''
|
|
64
|
-
);
|
|
65
|
-
`);
|
|
66
|
-
// Check if user already exists
|
|
67
|
-
const existing = await pool.query(`SELECT id FROM auth.users WHERE email = $1`, [email.toLowerCase()]);
|
|
68
|
-
if (existing.rows.length > 0) {
|
|
69
|
-
error(`User with email "${email}" already exists.`);
|
|
70
|
-
info(`To update their role, use: supatype admin set-role --email ${email} --role ${role}`);
|
|
71
|
-
process.exit(1);
|
|
72
|
-
}
|
|
73
|
-
// Hash the password (bcrypt-style for GoTrue compatibility)
|
|
74
|
-
const passwordHash = await hashPassword(password);
|
|
75
|
-
// Insert the admin user with the admin role in app_metadata
|
|
76
|
-
const appMetadata = JSON.stringify({ role, provider: "email", providers: ["email"] });
|
|
77
|
-
const userMetadata = JSON.stringify({});
|
|
78
|
-
const result = await pool.query(`INSERT INTO auth.users (
|
|
79
|
-
email, encrypted_password, role, aud,
|
|
80
|
-
raw_app_meta_data, raw_user_meta_data,
|
|
81
|
-
email_confirmed_at, created_at, updated_at
|
|
82
|
-
) VALUES (
|
|
83
|
-
$1, $2, 'authenticated', 'authenticated',
|
|
84
|
-
$3::jsonb, $4::jsonb,
|
|
85
|
-
now(), now(), now()
|
|
86
|
-
) RETURNING id, email`, [email.toLowerCase(), passwordHash, appMetadata, userMetadata]);
|
|
87
|
-
const user = result.rows[0];
|
|
88
|
-
info("Admin user created successfully.");
|
|
89
|
-
plain(` ID: ${user.id}`);
|
|
90
|
-
plain(` Email: ${user.email}`);
|
|
91
|
-
plain(` Role: ${role}`);
|
|
50
|
+
await ensureAuthUsersTable(pool);
|
|
51
|
+
await createAdminUser(pool, email, password, role);
|
|
92
52
|
info("This user can now log in to the admin panel at /admin");
|
|
93
53
|
}
|
|
94
54
|
catch (err) {
|
|
@@ -177,69 +137,276 @@ export function registerAdmin(program) {
|
|
|
177
137
|
}
|
|
178
138
|
});
|
|
179
139
|
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
140
|
+
/** @deprecated Use ensureFirstAdminUser */
|
|
141
|
+
export const promptFirstAdminUser = ensureFirstAdminUser;
|
|
142
|
+
/**
|
|
143
|
+
* Ensure a first admin user exists (idempotent). Called from `dev` and `push`
|
|
144
|
+
* when auth.users is ready and no admin users exist yet.
|
|
145
|
+
*/
|
|
146
|
+
export async function ensureFirstAdminUser(connection, options = {}) {
|
|
183
147
|
const pg = await importPg();
|
|
184
148
|
const pool = new pg.Pool({ connectionString: connection, max: 2 });
|
|
185
149
|
try {
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
150
|
+
await ensureFirstAdminWithQuery((sql, params) => pool.query(sql, params), options);
|
|
151
|
+
}
|
|
152
|
+
catch {
|
|
153
|
+
// Non-fatal — skip when DB is unreachable or auth schema is not ready
|
|
154
|
+
}
|
|
155
|
+
finally {
|
|
156
|
+
await pool.end();
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
/**
|
|
160
|
+
* Resolve DB access for the current project (host URL or compose exec when DB
|
|
161
|
+
* is not published to the host).
|
|
162
|
+
*/
|
|
163
|
+
export async function ensureFirstAdminUserForProject(cwd, config, options = {}) {
|
|
164
|
+
const root = resolve(cwd);
|
|
165
|
+
const merged = { cwd: root, ...options };
|
|
166
|
+
if (resolveRuntimeProvider(config) === "docker" &&
|
|
167
|
+
merged.compose &&
|
|
168
|
+
!hasEngineOverride(config)) {
|
|
169
|
+
try {
|
|
170
|
+
await ensureFirstAdminWithQuery((sql, params) => composeExecQuery(root, merged.compose, sql, params), merged);
|
|
206
171
|
}
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
info("Invalid email. Skipping admin user creation.");
|
|
210
|
-
return;
|
|
172
|
+
catch {
|
|
173
|
+
// Non-fatal
|
|
211
174
|
}
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
175
|
+
return;
|
|
176
|
+
}
|
|
177
|
+
const connection = merged.compose && hasEngineOverride(config)
|
|
178
|
+
? hostComposeDbUrlFromEnv(root)
|
|
179
|
+
: options.connection ?? readEnvValue(root, "DATABASE_URL", connectionString(config));
|
|
180
|
+
await ensureFirstAdminUser(connection, merged);
|
|
181
|
+
}
|
|
182
|
+
async function ensureFirstAdminWithQuery(query, options) {
|
|
183
|
+
const cwd = options.cwd ? resolve(options.cwd) : process.cwd();
|
|
184
|
+
if (!(await authUsersTableExists(query)))
|
|
185
|
+
return;
|
|
186
|
+
if (await hasAdminUsers(query))
|
|
187
|
+
return;
|
|
188
|
+
const credentials = await resolveAdminCredentials(options, cwd);
|
|
189
|
+
if (!credentials) {
|
|
190
|
+
if (!isInteractive()) {
|
|
191
|
+
info("No admin users found. Set SUPATYPE_ADMIN_EMAIL / SUPATYPE_ADMIN_PASSWORD in .env, " +
|
|
192
|
+
"or run: supatype admin create-user");
|
|
216
193
|
}
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
const role = options.role ?? "admin";
|
|
197
|
+
await createAdminUser(query, credentials.email, credentials.password, role, { quiet: true });
|
|
198
|
+
clearAdminSeedPassword(cwd);
|
|
199
|
+
info(`Admin user "${credentials.email}" created (role: ${role}).`);
|
|
200
|
+
info("Log in at /admin after starting the dev server.");
|
|
201
|
+
}
|
|
202
|
+
async function resolveAdminCredentials(options, cwd) {
|
|
203
|
+
const envEmail = options.email ?? readEnvValue(cwd, ADMIN_EMAIL_ENV, "").trim();
|
|
204
|
+
const envPassword = options.password ?? readEnvValue(cwd, ADMIN_PASSWORD_ENV, "").trim();
|
|
205
|
+
if (envEmail && envPassword) {
|
|
206
|
+
if (!envEmail.includes("@")) {
|
|
207
|
+
info("Invalid admin email in .env. Skipping admin user creation.");
|
|
208
|
+
return null;
|
|
209
|
+
}
|
|
210
|
+
if (envPassword.length < 8) {
|
|
211
|
+
info("Admin password in .env is too short (min 8 chars). Skipping.");
|
|
212
|
+
return null;
|
|
213
|
+
}
|
|
214
|
+
return { email: envEmail, password: envPassword };
|
|
215
|
+
}
|
|
216
|
+
if (!isInteractive())
|
|
217
|
+
return null;
|
|
218
|
+
info("No admin users found for the admin panel.");
|
|
219
|
+
const createAdmin = await uiConfirm("Create an admin user now?");
|
|
220
|
+
if (!createAdmin) {
|
|
221
|
+
info("Skipped. You can create one later with: supatype admin create-user");
|
|
222
|
+
return null;
|
|
223
|
+
}
|
|
224
|
+
const email = await promptText("Admin email");
|
|
225
|
+
if (!email || !email.includes("@")) {
|
|
226
|
+
info("Invalid email. Skipping admin user creation.");
|
|
227
|
+
return null;
|
|
228
|
+
}
|
|
229
|
+
const password = await promptText("Admin password (min 8 chars)");
|
|
230
|
+
if (!password || password.length < 8) {
|
|
231
|
+
info("Password too short. Skipping admin user creation.");
|
|
232
|
+
return null;
|
|
233
|
+
}
|
|
234
|
+
return { email, password };
|
|
235
|
+
}
|
|
236
|
+
export function clearAdminSeedPassword(cwd) {
|
|
237
|
+
upsertEnvFile(cwd, {}, [ADMIN_PASSWORD_ENV]);
|
|
238
|
+
}
|
|
239
|
+
export async function hashPasswordForAuth(password) {
|
|
240
|
+
return bcrypt.hash(password, BCRYPT_ROUNDS);
|
|
241
|
+
}
|
|
242
|
+
async function createAdminUser(db, email, password, role, opts = {}) {
|
|
243
|
+
const query = typeof db.query === "function"
|
|
244
|
+
? (sql, params) => db.query(sql, params)
|
|
245
|
+
: db;
|
|
246
|
+
const normalized = email.toLowerCase();
|
|
247
|
+
const existing = await query(`SELECT id FROM auth.users WHERE email = $1`, [
|
|
248
|
+
normalized,
|
|
249
|
+
]);
|
|
250
|
+
if (existing.rows.length > 0) {
|
|
251
|
+
throw new Error(`User with email "${email}" already exists.`);
|
|
252
|
+
}
|
|
253
|
+
const passwordHash = await hashPasswordForAuth(password);
|
|
254
|
+
const appMetadata = JSON.stringify({
|
|
255
|
+
role,
|
|
256
|
+
provider: "email",
|
|
257
|
+
providers: ["email"],
|
|
258
|
+
});
|
|
259
|
+
const userMetadata = JSON.stringify({});
|
|
260
|
+
const result = await query(`INSERT INTO auth.users (
|
|
261
|
+
email, encrypted_password, role, aud,
|
|
262
|
+
raw_app_meta_data, raw_user_meta_data,
|
|
263
|
+
email_confirmed_at, created_at, updated_at
|
|
264
|
+
) VALUES (
|
|
265
|
+
$1, $2, 'authenticated', 'authenticated',
|
|
266
|
+
$3::jsonb, $4::jsonb,
|
|
267
|
+
now(), now(), now()
|
|
268
|
+
) RETURNING id, email`, [normalized, passwordHash, appMetadata, userMetadata]);
|
|
269
|
+
const user = result.rows[0];
|
|
270
|
+
if (!opts.quiet) {
|
|
271
|
+
info("Admin user created successfully.");
|
|
272
|
+
plain(` ID: ${user.id}`);
|
|
273
|
+
plain(` Email: ${user.email}`);
|
|
274
|
+
plain(` Role: ${role}`);
|
|
275
|
+
}
|
|
276
|
+
return user;
|
|
277
|
+
}
|
|
278
|
+
async function ensureAuthUsersTable(pool) {
|
|
279
|
+
await pool.query(`
|
|
280
|
+
CREATE SCHEMA IF NOT EXISTS auth;
|
|
281
|
+
|
|
282
|
+
CREATE TABLE IF NOT EXISTS auth.users (
|
|
283
|
+
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
284
|
+
instance_id UUID,
|
|
285
|
+
aud TEXT DEFAULT 'authenticated',
|
|
286
|
+
role TEXT DEFAULT 'authenticated',
|
|
287
|
+
email TEXT UNIQUE,
|
|
288
|
+
encrypted_password TEXT,
|
|
289
|
+
email_confirmed_at TIMESTAMPTZ DEFAULT now(),
|
|
290
|
+
raw_app_meta_data JSONB DEFAULT '{}',
|
|
291
|
+
raw_user_meta_data JSONB DEFAULT '{}',
|
|
292
|
+
created_at TIMESTAMPTZ DEFAULT now(),
|
|
293
|
+
updated_at TIMESTAMPTZ DEFAULT now(),
|
|
294
|
+
confirmation_token TEXT DEFAULT '',
|
|
295
|
+
recovery_token TEXT DEFAULT '',
|
|
296
|
+
email_change_token_new TEXT DEFAULT '',
|
|
297
|
+
email_change TEXT DEFAULT ''
|
|
298
|
+
);
|
|
299
|
+
`);
|
|
300
|
+
}
|
|
301
|
+
async function authUsersTableExists(query) {
|
|
302
|
+
const result = await query(`SELECT EXISTS (
|
|
303
|
+
SELECT FROM information_schema.tables
|
|
304
|
+
WHERE table_schema = 'auth' AND table_name = 'users'
|
|
305
|
+
) as exists`);
|
|
306
|
+
return Boolean(result.rows[0]?.exists);
|
|
307
|
+
}
|
|
308
|
+
async function hasAdminUsers(query) {
|
|
309
|
+
const adminCount = await query(`SELECT COUNT(*)::int as count FROM auth.users
|
|
310
|
+
WHERE raw_app_meta_data->>'role' IS NOT NULL
|
|
311
|
+
AND raw_app_meta_data->>'role' != 'authenticated'`);
|
|
312
|
+
const count = adminCount.rows[0]?.count ?? 0;
|
|
313
|
+
return count > 0;
|
|
314
|
+
}
|
|
315
|
+
function composeExecQuery(cwd, compose, sql, params = []) {
|
|
316
|
+
const db = readEnvValue(cwd, "POSTGRES_DB", "supatype");
|
|
317
|
+
const user = readEnvValue(cwd, "POSTGRES_USER", "supatype_admin");
|
|
318
|
+
const envFile = join(cwd, ".env");
|
|
319
|
+
const composeDir = dirname(compose.composePath);
|
|
320
|
+
const args = [
|
|
321
|
+
"compose",
|
|
322
|
+
"-p",
|
|
323
|
+
compose.project,
|
|
324
|
+
"--project-directory",
|
|
325
|
+
cwd,
|
|
326
|
+
"-f",
|
|
327
|
+
compose.composePath,
|
|
328
|
+
];
|
|
329
|
+
if (existsSync(envFile))
|
|
330
|
+
args.push("--env-file", envFile);
|
|
331
|
+
if (params.length === 0) {
|
|
332
|
+
args.push("exec", "-T", "db", "psql", "-U", user, "-d", db, "-tAc", sql);
|
|
333
|
+
const result = spawnSync("docker", args, { cwd: composeDir, encoding: "utf8" });
|
|
334
|
+
if (result.status !== 0) {
|
|
335
|
+
throw new Error((result.stderr ?? result.stdout ?? "compose psql failed").trim());
|
|
336
|
+
}
|
|
337
|
+
const text = (result.stdout ?? "").trim();
|
|
338
|
+
if (sql.trim().toUpperCase().startsWith("SELECT")) {
|
|
339
|
+
return Promise.resolve({
|
|
340
|
+
rows: parsePsqlScalarRows(sql, text),
|
|
341
|
+
rowCount: 1,
|
|
342
|
+
command: "SELECT",
|
|
343
|
+
oid: 0,
|
|
344
|
+
fields: [],
|
|
345
|
+
});
|
|
346
|
+
}
|
|
347
|
+
return Promise.resolve({
|
|
348
|
+
rows: [],
|
|
349
|
+
rowCount: 0,
|
|
350
|
+
command: "INSERT",
|
|
351
|
+
oid: 0,
|
|
352
|
+
fields: [],
|
|
222
353
|
});
|
|
223
|
-
await pool.query(`INSERT INTO auth.users (
|
|
224
|
-
email, encrypted_password, role, aud,
|
|
225
|
-
raw_app_meta_data, raw_user_meta_data,
|
|
226
|
-
email_confirmed_at, created_at, updated_at
|
|
227
|
-
) VALUES (
|
|
228
|
-
$1, $2, 'authenticated', 'authenticated',
|
|
229
|
-
$3::jsonb, '{}'::jsonb,
|
|
230
|
-
now(), now(), now()
|
|
231
|
-
)`, [email.toLowerCase(), passwordHash, appMetadata]);
|
|
232
|
-
info(`Admin user "${email}" created (role: admin).`);
|
|
233
|
-
info("Log in at /admin after starting the dev server.");
|
|
234
354
|
}
|
|
235
|
-
|
|
236
|
-
|
|
355
|
+
args.push("exec", "-T", "db", "psql", "-U", user, "-d", db, "-v", "ON_ERROR_STOP=1", "-c", interpolateSql(sql, params));
|
|
356
|
+
const result = spawnSync("docker", args, { cwd: composeDir, encoding: "utf8" });
|
|
357
|
+
if (result.status !== 0) {
|
|
358
|
+
throw new Error((result.stderr ?? result.stdout ?? "compose psql failed").trim());
|
|
237
359
|
}
|
|
238
|
-
|
|
239
|
-
|
|
360
|
+
const stdout = (result.stdout ?? "").trim();
|
|
361
|
+
const idMatch = stdout.match(/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\s+\|\s+(.+)/i);
|
|
362
|
+
if (idMatch) {
|
|
363
|
+
return Promise.resolve({
|
|
364
|
+
rows: [{ id: idMatch[1], email: idMatch[2]?.trim() }],
|
|
365
|
+
rowCount: 1,
|
|
366
|
+
command: "INSERT",
|
|
367
|
+
oid: 0,
|
|
368
|
+
fields: [],
|
|
369
|
+
});
|
|
370
|
+
}
|
|
371
|
+
return Promise.resolve({
|
|
372
|
+
rows: [],
|
|
373
|
+
rowCount: 0,
|
|
374
|
+
command: "INSERT",
|
|
375
|
+
oid: 0,
|
|
376
|
+
fields: [],
|
|
377
|
+
});
|
|
378
|
+
}
|
|
379
|
+
function parsePsqlScalarRows(sql, text) {
|
|
380
|
+
const upper = sql.toUpperCase();
|
|
381
|
+
if (upper.includes(" AS EXISTS")) {
|
|
382
|
+
return [{ exists: text === "t" }];
|
|
383
|
+
}
|
|
384
|
+
if (upper.includes(" AS COUNT")) {
|
|
385
|
+
return [{ count: Number.parseInt(text, 10) || 0 }];
|
|
240
386
|
}
|
|
387
|
+
if (text === "")
|
|
388
|
+
return [];
|
|
389
|
+
return [{ value: text }];
|
|
390
|
+
}
|
|
391
|
+
function interpolateSql(sql, params) {
|
|
392
|
+
return sql.replace(/\$(\d+)/g, (_match, index) => {
|
|
393
|
+
const value = params[Number(index) - 1];
|
|
394
|
+
if (value === null || value === undefined)
|
|
395
|
+
return "NULL";
|
|
396
|
+
if (typeof value === "number" || typeof value === "bigint")
|
|
397
|
+
return String(value);
|
|
398
|
+
if (typeof value === "boolean")
|
|
399
|
+
return value ? "TRUE" : "FALSE";
|
|
400
|
+
return `'${String(value).replace(/'/g, "''")}'`;
|
|
401
|
+
});
|
|
402
|
+
}
|
|
403
|
+
function hostComposeDbUrlFromEnv(cwd) {
|
|
404
|
+
const port = readEnvValue(cwd, "SUPATYPE_DEV_DB_PORT", "54329");
|
|
405
|
+
const user = readEnvValue(cwd, "POSTGRES_USER", "supatype_admin");
|
|
406
|
+
const pass = readEnvValue(cwd, "POSTGRES_PASSWORD", "postgres");
|
|
407
|
+
const db = readEnvValue(cwd, "POSTGRES_DB", "supatype");
|
|
408
|
+
return `postgresql://${user}:${pass}@127.0.0.1:${port}/${db}?sslmode=disable`;
|
|
241
409
|
}
|
|
242
|
-
// ─── Helpers ────────────────────────────────────────────────────────────────────
|
|
243
410
|
async function importPg() {
|
|
244
411
|
try {
|
|
245
412
|
return await import("pg");
|
|
@@ -249,9 +416,4 @@ async function importPg() {
|
|
|
249
416
|
process.exit(1);
|
|
250
417
|
}
|
|
251
418
|
}
|
|
252
|
-
async function hashPassword(password) {
|
|
253
|
-
const salt = randomBytes(16).toString("hex");
|
|
254
|
-
const derived = (await scryptAsync(password, salt, 64));
|
|
255
|
-
return `${salt}:${derived.toString("hex")}`;
|
|
256
|
-
}
|
|
257
419
|
//# sourceMappingURL=admin.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/commands/admin.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/commands/admin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AA4FxC,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AA4FxC,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA4blD"}
|
package/dist/commands/dev.js
CHANGED
|
@@ -209,6 +209,8 @@ ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON SEQUENCES TO authenticate
|
|
|
209
209
|
// Native Postgres builds don't include PostGIS — skip geo fields rather than failing.
|
|
210
210
|
const skipFieldKinds = new Set(["geo", "vector"]);
|
|
211
211
|
await runSchemaPush(cwd, engineBin, schemaPath, dbURL, manifestPath, adminConfigPath, localStoragePath, skipFieldKinds, config).catch((e) => console.error("[supatype] Initial schema push failed:", e.message));
|
|
212
|
+
const { ensureFirstAdminUser } = await import("./admin.js");
|
|
213
|
+
await ensureFirstAdminUser(dbURL, { cwd });
|
|
212
214
|
// ── 10. Spawn supatype-server ─────────────────────────────────────────
|
|
213
215
|
// Resolve edge functions config: only enable Deno if a functions dir exists.
|
|
214
216
|
const functionsDir = functionsPathCandidatesFromProject(config, cwd).find(dir => existsSync(dir));
|