@deessejs/cli 0.6.23 → 0.6.25
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/dist/commands/admin/create.d.ts.map +1 -1
- package/dist/commands/admin/create.js +14 -23
- package/dist/commands/admin/create.js.map +1 -1
- package/package.json +2 -1
- package/dist/commands/admin/create.d.ts +0 -14
- package/dist/commands/admin-create.d.ts +0 -16
- package/dist/commands/admin-create.d.ts.map +0 -1
- package/dist/commands/admin-create.js +0 -264
- package/dist/commands/admin-create.js.map +0 -1
- package/dist/commands/admin.d.ts +0 -29
- package/dist/commands/admin.d.ts.map +0 -1
- package/dist/commands/admin.js +0 -22
- package/dist/commands/admin.js.map +0 -1
- package/dist/commands/db/generate.d.ts +0 -11
- package/dist/commands/db/generate.d.ts.map +0 -1
- package/dist/commands/db/generate.js +0 -31
- package/dist/commands/db/generate.js.map +0 -1
- package/dist/commands/db/index.d.ts +0 -15
- package/dist/commands/db/index.d.ts.map +0 -1
- package/dist/commands/db/index.js +0 -100
- package/dist/commands/db/index.js.map +0 -1
- package/dist/commands/db/migrate.d.ts +0 -16
- package/dist/commands/db/migrate.d.ts.map +0 -1
- package/dist/commands/db/migrate.js +0 -75
- package/dist/commands/db/migrate.js.map +0 -1
- package/dist/commands/db/push.d.ts +0 -12
- package/dist/commands/db/push.d.ts.map +0 -1
- package/dist/commands/db/push.js +0 -39
- package/dist/commands/db/push.js.map +0 -1
- package/dist/commands/db-generate.d.ts +0 -14
- package/dist/commands/db-generate.d.ts.map +0 -1
- package/dist/commands/db-generate.js +0 -56
- package/dist/commands/db-generate.js.map +0 -1
- package/dist/commands/db-introspect.d.ts +0 -14
- package/dist/commands/db-introspect.d.ts.map +0 -1
- package/dist/commands/db-introspect.js +0 -34
- package/dist/commands/db-introspect.js.map +0 -1
- package/dist/commands/db-migrate.d.ts +0 -16
- package/dist/commands/db-migrate.d.ts.map +0 -1
- package/dist/commands/db-migrate.js +0 -75
- package/dist/commands/db-migrate.js.map +0 -1
- package/dist/commands/db-push.d.ts +0 -16
- package/dist/commands/db-push.d.ts.map +0 -1
- package/dist/commands/db-push.js +0 -67
- package/dist/commands/db-push.js.map +0 -1
- package/dist/commands/db-studio.d.ts +0 -15
- package/dist/commands/db-studio.d.ts.map +0 -1
- package/dist/commands/db-studio.js +0 -49
- package/dist/commands/db-studio.js.map +0 -1
- package/dist/commands/db.d.ts +0 -15
- package/dist/commands/db.d.ts.map +0 -1
- package/dist/commands/db.js +0 -100
- package/dist/commands/db.js.map +0 -1
- package/dist/index.d.ts +0 -3
- package/dist/index.js +0 -167
- package/dist/index.js.map +0 -1
- package/dist/lib/admin/create.d.ts +0 -33
- package/dist/lib/admin/create.d.ts.map +0 -1
- package/dist/lib/admin/create.js +0 -46
- package/dist/lib/admin/create.js.map +0 -1
- package/dist/lib/config/loader.d.ts +0 -77
- package/dist/lib/config/loader.d.ts.map +0 -1
- package/dist/lib/config/loader.js +0 -199
- package/dist/lib/config/loader.js.map +0 -1
- package/dist/lib/db/auth-schema.d.ts +0 -25
- package/dist/lib/db/auth-schema.d.ts.map +0 -1
- package/dist/lib/db/auth-schema.js +0 -111
- package/dist/lib/db/auth-schema.js.map +0 -1
- package/dist/lib/db/schema.d.ts +0 -43
- package/dist/lib/db/schema.d.ts.map +0 -1
- package/dist/lib/db/schema.js +0 -144
- package/dist/lib/db/schema.js.map +0 -1
- package/dist/lib/index.d.ts +0 -5
- package/dist/lib/index.d.ts.map +0 -1
- package/dist/lib/index.js +0 -6
- package/dist/lib/index.js.map +0 -1
- package/dist/utils/config.d.ts +0 -15
- package/dist/utils/config.d.ts.map +0 -1
- package/dist/utils/config.js +0 -47
- package/dist/utils/config.js.map +0 -1
- package/dist/utils/dialect.d.ts +0 -23
- package/dist/utils/dialect.d.ts.map +0 -1
- package/dist/utils/dialect.js +0 -82
- package/dist/utils/dialect.js.map +0 -1
- package/dist/utils/schema-generator.d.ts +0 -25
- package/dist/utils/schema-generator.d.ts.map +0 -1
- package/dist/utils/schema-generator.js +0 -157
- package/dist/utils/schema-generator.js.map +0 -1
- package/dist/utils/schema-loader.d.ts +0 -16
- package/dist/utils/schema-loader.d.ts.map +0 -1
- package/dist/utils/schema-loader.js +0 -46
- package/dist/utils/schema-loader.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/commands/admin/create.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/commands/admin/create.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAaH,OAAO,eAAe,CAAC;AAUvB,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AA2ID,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8E5E"}
|
|
@@ -11,6 +11,7 @@ import { loadMinimalConfig, ConfigLoaderError } from '../../lib/config/loader.js
|
|
|
11
11
|
import { createAdminUser, AdminCreationError } from '../../lib/admin/create.js';
|
|
12
12
|
import { drizzle } from 'drizzle-orm/node-postgres';
|
|
13
13
|
import { authSchemaExists } from '../../lib/db/auth-schema.js';
|
|
14
|
+
import { validateAdminEmailDomain } from 'deesse';
|
|
14
15
|
// Load environment variables
|
|
15
16
|
import 'dotenv/config';
|
|
16
17
|
const AdminSchema = z.object({
|
|
@@ -18,20 +19,6 @@ const AdminSchema = z.object({
|
|
|
18
19
|
password: z.string().min(8, 'Password must be at least 8 characters'),
|
|
19
20
|
name: z.string().min(1, 'Name is required').default('Admin'),
|
|
20
21
|
});
|
|
21
|
-
// Public email domains that should warn users
|
|
22
|
-
const PUBLIC_EMAIL_DOMAINS = [
|
|
23
|
-
'gmail.com',
|
|
24
|
-
'yahoo.com',
|
|
25
|
-
'hotmail.com',
|
|
26
|
-
'outlook.com',
|
|
27
|
-
'icloud.com',
|
|
28
|
-
'mail.com',
|
|
29
|
-
'aol.com',
|
|
30
|
-
];
|
|
31
|
-
function isPublicEmailDomain(email) {
|
|
32
|
-
const domain = email.split('@')[1]?.toLowerCase();
|
|
33
|
-
return PUBLIC_EMAIL_DOMAINS.includes(domain);
|
|
34
|
-
}
|
|
35
22
|
function validateEmail(value) {
|
|
36
23
|
if (!value)
|
|
37
24
|
return 'Email is required';
|
|
@@ -55,10 +42,7 @@ async function promptForAdminDetails() {
|
|
|
55
42
|
p.cancel('Operation cancelled.');
|
|
56
43
|
process.exit(0);
|
|
57
44
|
}
|
|
58
|
-
|
|
59
|
-
p.log.warn(`Warning: ${emailResult} is a public email domain.\n` +
|
|
60
|
-
' Admin accounts should use organizational email addresses.');
|
|
61
|
-
}
|
|
45
|
+
const email = emailResult;
|
|
62
46
|
const passwordResult = await p.password({
|
|
63
47
|
message: 'Admin password:',
|
|
64
48
|
mask: true,
|
|
@@ -77,7 +61,7 @@ async function promptForAdminDetails() {
|
|
|
77
61
|
process.exit(0);
|
|
78
62
|
}
|
|
79
63
|
return {
|
|
80
|
-
email:
|
|
64
|
+
email: email,
|
|
81
65
|
password: passwordResult,
|
|
82
66
|
name: nameResult || 'Admin',
|
|
83
67
|
};
|
|
@@ -190,10 +174,17 @@ export async function adminCreate(options) {
|
|
|
190
174
|
else {
|
|
191
175
|
adminInput = await promptForAdminDetails();
|
|
192
176
|
}
|
|
193
|
-
// Warn about public email
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
177
|
+
// Warn about public email and enforce allowed domains
|
|
178
|
+
const emailValidation = validateAdminEmailDomain(adminInput.email);
|
|
179
|
+
if (!emailValidation.valid) {
|
|
180
|
+
if (emailValidation.code === 'INVALID_EMAIL_DOMAIN') {
|
|
181
|
+
throw new AdminCreationError(emailValidation.message, emailValidation.code, emailValidation.suggestion);
|
|
182
|
+
}
|
|
183
|
+
// PUBLIC_EMAIL_DOMAIN - just a warning
|
|
184
|
+
p.log.warn(emailValidation.message);
|
|
185
|
+
if (emailValidation.suggestion) {
|
|
186
|
+
p.log.info(emailValidation.suggestion);
|
|
187
|
+
}
|
|
197
188
|
}
|
|
198
189
|
// Create admin user via backend logic
|
|
199
190
|
const result = await createAdminUser({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/admin/create.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/admin/create.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,QAAQ,CAAC;AAElD,6BAA6B;AAC7B,OAAO,eAAe,CAAC;AAEvB,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,sBAAsB,CAAC;IAC/C,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,wCAAwC,CAAC;IACrE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;CAC7D,CAAC,CAAC;AAWH,SAAS,aAAa,CAAC,KAAa;IAClC,IAAI,CAAC,KAAK;QAAE,OAAO,mBAAmB,CAAC;IACvC,MAAM,UAAU,GAAG,4BAA4B,CAAC;IAChD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,sBAAsB,CAAC;IAC3D,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAa;IACrC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,wCAAwC,CAAC;IACtE,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,qBAAqB;IAClC,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAE/B,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC;QAC/B,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,aAAa;KACxB,CAAC,CAAC;IAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAC5B,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,KAAK,GAAG,WAAqB,CAAC;IAEpC,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,QAAQ,CAAC;QACtC,OAAO,EAAE,iBAAiB;QAC1B,IAAI,EAAE,IAAyB;QAC/B,QAAQ,EAAE,gBAAgB;KAC3B,CAAC,CAAC;IAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC/B,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC;QAC9B,OAAO,EAAE,qBAAqB;QAC9B,YAAY,EAAE,OAAO;KACtB,CAAC,CAAC;IAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3B,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO;QACL,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,cAAwB;QAClC,IAAI,EAAG,UAAqB,IAAI,OAAO;KACxC,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,OAAgC;IACrD,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAE9C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;QACxC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,KAAK,YAAY,iBAAiB,EAAE,CAAC;QACvC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,8BAA8B;IAC9B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,GAAG,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,SAAS,YAAY,CAAC,MAA6D;IACjF,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;IAClD,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC1C,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;AACrD,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,cAAc,CAAC,GAAW;IAKvC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAAC;IAE9D,8BAA8B;IAC9B,IAAI,CAAC,CAAC,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,0EAA0E;QAC1E,MAAM,SAAS,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QAChE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC;QAEjD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;YACvD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,wCAAwC;QACxC,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;QACtE,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;YACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,KAAK,EAAE,CAAC,CAAC;gBACtD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,GAAG,GAAG,KAA8C,CAAC;QAC3D,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAA2B;IAC3D,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAEzC,uFAAuF;QACvF,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAChC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAEhD,wBAAwB;QACxB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;YACjC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,8DAA8D,CAAC,CAAC;YAC5E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,gCAAgC;QAChC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACrC,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,YAAY,EAAE,CAAC;YACjB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,0BAA0B,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACN,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;QACvE,CAAC;QAED,oCAAoC;QACpC,qEAAqE;QACrE,8DAA8D;QAC9D,MAAM,EAAE,GAAQ,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,OAAO,CAAC;YACvB,MAAM,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC;gBAClB,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC9C,CAAC;SACH,CAAC,CAAC;QAEH,kBAAkB;QAClB,IAAI,UAAsB,CAAC;QAE3B,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACtC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;YAC/D,UAAU,GAAG,aAAa,CAAC;gBACzB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,OAAO;aAC9B,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,MAAM,qBAAqB,EAAE,CAAC;QAC7C,CAAC;QAED,sDAAsD;QACtD,MAAM,eAAe,GAAG,wBAAwB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACnE,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;YAC3B,IAAI,eAAe,CAAC,IAAI,KAAK,sBAAsB,EAAE,CAAC;gBACpD,MAAM,IAAI,kBAAkB,CAC1B,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,IAAI,EACpB,eAAe,CAAC,UAAU,CAC3B,CAAC;YACJ,CAAC;YACD,uCAAuC;YACvC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YACpC,IAAI,eAAe,CAAC,UAAU,EAAE,CAAC;gBAC/B,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QAED,sCAAsC;QACtC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;YACnC,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,QAAQ;YACR,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO;YAC7B,MAAM,EAAE,YAAY,EAAE,MAAM;SAC7B,CAAC,CAAC;QACH,YAAY,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,WAAW,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@deessejs/cli",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.25",
|
|
4
4
|
"description": "DeesseJS CLI for managing DeesseJS projects",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -36,6 +36,7 @@
|
|
|
36
36
|
"@clack/prompts": "^0.8.2",
|
|
37
37
|
"auth": "^1.6.0",
|
|
38
38
|
"better-auth": "^1.0.0",
|
|
39
|
+
"deesse": "^0.2.8",
|
|
39
40
|
"dotenv": "^17.3.1",
|
|
40
41
|
"drizzle-orm": "^0.38.0",
|
|
41
42
|
"pg": "^8.13.0",
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Admin create command - CLI interface
|
|
3
|
-
*
|
|
4
|
-
* Handles user interaction and delegates to backend logic.
|
|
5
|
-
*/
|
|
6
|
-
import 'dotenv/config';
|
|
7
|
-
export interface AdminCreateOptions {
|
|
8
|
-
email?: string;
|
|
9
|
-
password?: string;
|
|
10
|
-
name?: string;
|
|
11
|
-
cwd?: string;
|
|
12
|
-
}
|
|
13
|
-
export declare function adminCreate(options: AdminCreateOptions): Promise<void>;
|
|
14
|
-
//# sourceMappingURL=create.d.ts.map
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Admin user creation command
|
|
3
|
-
*
|
|
4
|
-
* Implements the `deesse admin create` command for creating admin users
|
|
5
|
-
* via better-auth's admin plugin.
|
|
6
|
-
*/
|
|
7
|
-
import 'dotenv/config';
|
|
8
|
-
interface AdminOptions {
|
|
9
|
-
email?: string;
|
|
10
|
-
password?: string;
|
|
11
|
-
name?: string;
|
|
12
|
-
cwd?: string;
|
|
13
|
-
}
|
|
14
|
-
export declare function adminCreate(options: AdminOptions): Promise<void>;
|
|
15
|
-
export {};
|
|
16
|
-
//# sourceMappingURL=admin-create.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"admin-create.d.ts","sourceRoot":"","sources":["../../src/commands/admin-create.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,OAAO,eAAe,CAAC;AAUvB,UAAU,YAAY;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAsQD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAiCtE"}
|
|
@@ -1,264 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Admin user creation command
|
|
3
|
-
*
|
|
4
|
-
* Implements the `deesse admin create` command for creating admin users
|
|
5
|
-
* via better-auth's admin plugin.
|
|
6
|
-
*/
|
|
7
|
-
import * as p from '@clack/prompts';
|
|
8
|
-
import { z } from 'zod';
|
|
9
|
-
import * as path from 'node:path';
|
|
10
|
-
import { pathToFileURL } from 'node:url';
|
|
11
|
-
import { createRequire } from 'module';
|
|
12
|
-
// Load environment variables
|
|
13
|
-
import 'dotenv/config';
|
|
14
|
-
const AdminSchema = z.object({
|
|
15
|
-
email: z.string().email('Invalid email format'),
|
|
16
|
-
password: z.string().min(8, 'Password must be at least 8 characters'),
|
|
17
|
-
name: z.string().min(1, 'Name is required').default('Admin'),
|
|
18
|
-
});
|
|
19
|
-
// Public email domains that should warn users
|
|
20
|
-
const PUBLIC_EMAIL_DOMAINS = [
|
|
21
|
-
'gmail.com',
|
|
22
|
-
'yahoo.com',
|
|
23
|
-
'hotmail.com',
|
|
24
|
-
'outlook.com',
|
|
25
|
-
'icloud.com',
|
|
26
|
-
'mail.com',
|
|
27
|
-
'aol.com',
|
|
28
|
-
];
|
|
29
|
-
function isPublicEmailDomain(email) {
|
|
30
|
-
const domain = email.split('@')[1]?.toLowerCase();
|
|
31
|
-
return PUBLIC_EMAIL_DOMAINS.includes(domain);
|
|
32
|
-
}
|
|
33
|
-
function warnPublicEmail(email) {
|
|
34
|
-
p.log.warn(`Warning: ${email} is a public email domain.\n` +
|
|
35
|
-
' Admin accounts should use organizational email addresses.');
|
|
36
|
-
}
|
|
37
|
-
const ERROR_MAP = {
|
|
38
|
-
USER_ALREADY_EXISTS: {
|
|
39
|
-
message: 'A user with this email already exists',
|
|
40
|
-
suggestion: 'Use a different email or check if an admin already exists',
|
|
41
|
-
},
|
|
42
|
-
DATABASE_ERROR: {
|
|
43
|
-
message: 'Cannot connect to database',
|
|
44
|
-
suggestion: 'Check DATABASE_URL in your .env file and ensure PostgreSQL is running',
|
|
45
|
-
},
|
|
46
|
-
INVALID_PASSWORD: {
|
|
47
|
-
message: 'Password must be at least 8 characters',
|
|
48
|
-
suggestion: 'Choose a longer password',
|
|
49
|
-
},
|
|
50
|
-
CONNECTION_REFUSED: {
|
|
51
|
-
message: 'Database connection refused',
|
|
52
|
-
suggestion: 'Ensure PostgreSQL is running and DATABASE_URL is correct',
|
|
53
|
-
},
|
|
54
|
-
};
|
|
55
|
-
function handleError(error) {
|
|
56
|
-
const err = error;
|
|
57
|
-
const code = err.code || '';
|
|
58
|
-
const mapped = ERROR_MAP[code];
|
|
59
|
-
if (mapped) {
|
|
60
|
-
p.log.error(mapped.message);
|
|
61
|
-
p.log.info(mapped.suggestion);
|
|
62
|
-
process.exit(1);
|
|
63
|
-
}
|
|
64
|
-
// Fallback for unknown errors
|
|
65
|
-
p.log.error('Unexpected error: ' + (error instanceof Error ? error.message : String(error)));
|
|
66
|
-
process.exit(1);
|
|
67
|
-
}
|
|
68
|
-
function validateEmail(value) {
|
|
69
|
-
if (!value)
|
|
70
|
-
return 'Email is required';
|
|
71
|
-
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
|
72
|
-
if (!emailRegex.test(value))
|
|
73
|
-
return 'Invalid email format';
|
|
74
|
-
return undefined;
|
|
75
|
-
}
|
|
76
|
-
function validatePassword(value) {
|
|
77
|
-
if (value.length < 8)
|
|
78
|
-
return 'Password must be at least 8 characters';
|
|
79
|
-
return undefined;
|
|
80
|
-
}
|
|
81
|
-
async function promptForAdminDetails() {
|
|
82
|
-
p.intro('Creating admin user');
|
|
83
|
-
const emailResult = await p.text({
|
|
84
|
-
message: 'Admin email:',
|
|
85
|
-
validate: validateEmail,
|
|
86
|
-
});
|
|
87
|
-
if (p.isCancel(emailResult)) {
|
|
88
|
-
p.cancel('Operation cancelled.');
|
|
89
|
-
process.exit(0);
|
|
90
|
-
}
|
|
91
|
-
if (isPublicEmailDomain(emailResult)) {
|
|
92
|
-
p.log.warn(`Warning: ${emailResult} is a public email domain.\n` +
|
|
93
|
-
' Admin accounts should use organizational email addresses.');
|
|
94
|
-
}
|
|
95
|
-
const passwordResult = await p.password({
|
|
96
|
-
message: 'Admin password:',
|
|
97
|
-
mask: true,
|
|
98
|
-
validate: validatePassword,
|
|
99
|
-
});
|
|
100
|
-
if (p.isCancel(passwordResult)) {
|
|
101
|
-
p.cancel('Operation cancelled.');
|
|
102
|
-
process.exit(0);
|
|
103
|
-
}
|
|
104
|
-
const nameResult = await p.text({
|
|
105
|
-
message: 'Admin display name:',
|
|
106
|
-
defaultValue: 'Admin',
|
|
107
|
-
});
|
|
108
|
-
if (p.isCancel(nameResult)) {
|
|
109
|
-
p.cancel('Operation cancelled.');
|
|
110
|
-
process.exit(0);
|
|
111
|
-
}
|
|
112
|
-
return {
|
|
113
|
-
email: emailResult,
|
|
114
|
-
password: passwordResult,
|
|
115
|
-
name: nameResult || 'Admin',
|
|
116
|
-
};
|
|
117
|
-
}
|
|
118
|
-
function validateInput(options) {
|
|
119
|
-
const result = AdminSchema.safeParse(options);
|
|
120
|
-
if (!result.success) {
|
|
121
|
-
const error = result.error.errors[0];
|
|
122
|
-
throw new Error(`${error.path.join('.')}: ${error.message}`);
|
|
123
|
-
}
|
|
124
|
-
return result.data;
|
|
125
|
-
}
|
|
126
|
-
async function loadConfig(cwd) {
|
|
127
|
-
const CONFIG_PATHS = ['src/deesse.config.ts', 'deesse.config.ts', 'config/deesse.ts'];
|
|
128
|
-
let configModule = null;
|
|
129
|
-
let configPath = '';
|
|
130
|
-
for (const configFile of CONFIG_PATHS) {
|
|
131
|
-
configPath = path.resolve(cwd, configFile);
|
|
132
|
-
try {
|
|
133
|
-
// Windows ESM compatibility: use file:// URL
|
|
134
|
-
const url = pathToFileURL(configPath).toString();
|
|
135
|
-
configModule = await import(url);
|
|
136
|
-
break;
|
|
137
|
-
}
|
|
138
|
-
catch (error) {
|
|
139
|
-
const err = error;
|
|
140
|
-
if (err.code !== 'ENOENT') {
|
|
141
|
-
throw error;
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
if (!configModule) {
|
|
146
|
-
throw new Error(`Config file not found. Searched paths:\n` +
|
|
147
|
-
CONFIG_PATHS.map((p) => ` - ${p}`).join('\n') +
|
|
148
|
-
`\nRun 'deesse init' to create a new project.`);
|
|
149
|
-
}
|
|
150
|
-
const rawConfig = configModule.default ||
|
|
151
|
-
configModule.config;
|
|
152
|
-
if (!rawConfig) {
|
|
153
|
-
throw new Error(`No config found in ${configPath}`);
|
|
154
|
-
}
|
|
155
|
-
return rawConfig;
|
|
156
|
-
}
|
|
157
|
-
async function createAdminUser(options) {
|
|
158
|
-
const { email, password, name, cwd = process.cwd() } = options;
|
|
159
|
-
// Load the deesse config
|
|
160
|
-
const rawConfig = await loadConfig(cwd);
|
|
161
|
-
// Dynamically import defineConfig to process the config
|
|
162
|
-
const require = createRequire(import.meta.url);
|
|
163
|
-
let defineConfig = null;
|
|
164
|
-
try {
|
|
165
|
-
// Use require for CJS module
|
|
166
|
-
const deesse = require('deesse');
|
|
167
|
-
defineConfig = deesse.defineConfig;
|
|
168
|
-
}
|
|
169
|
-
catch {
|
|
170
|
-
// defineConfig not available, we'll do basic checks
|
|
171
|
-
}
|
|
172
|
-
let config = null;
|
|
173
|
-
if (defineConfig) {
|
|
174
|
-
config = defineConfig(rawConfig);
|
|
175
|
-
}
|
|
176
|
-
else {
|
|
177
|
-
// If we can't load defineConfig, assume rawConfig is already processed or use it directly
|
|
178
|
-
config = rawConfig;
|
|
179
|
-
}
|
|
180
|
-
// Check if admin plugin is configured
|
|
181
|
-
const hasAdminPlugin = config?.auth?.plugins?.some((p) => {
|
|
182
|
-
const pluginStr = String(p);
|
|
183
|
-
return pluginStr.includes('admin') || pluginStr.includes('Admin');
|
|
184
|
-
}) ?? false;
|
|
185
|
-
if (!hasAdminPlugin) {
|
|
186
|
-
throw new Error('Admin plugin not configured. Add admin() to your auth.plugins in deesse.config.ts:\n\n' +
|
|
187
|
-
' import { admin } from "better-auth/plugins";\n\n' +
|
|
188
|
-
' export const config = defineConfig({\n' +
|
|
189
|
-
' auth: {\n' +
|
|
190
|
-
' plugins: [admin()],\n' +
|
|
191
|
-
' },\n' +
|
|
192
|
-
' });');
|
|
193
|
-
}
|
|
194
|
-
// Get better-auth instance - using require for better module resolution
|
|
195
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
196
|
-
const betterAuth = require('better-auth');
|
|
197
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
198
|
-
const betterAuthDrizzleAdapter = require('@better-auth/drizzle-adapter');
|
|
199
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
200
|
-
const drizzleOrm = require('drizzle-orm');
|
|
201
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
202
|
-
const pg = require('pg');
|
|
203
|
-
const Pool = pg.Pool;
|
|
204
|
-
// Create database client
|
|
205
|
-
const databaseUrl = process.env['DATABASE_URL'];
|
|
206
|
-
if (!databaseUrl) {
|
|
207
|
-
throw new Error('DATABASE_URL not found in environment. Check your .env file.');
|
|
208
|
-
}
|
|
209
|
-
// Create better-auth instance with admin plugin
|
|
210
|
-
const pool = new Pool({ connectionString: databaseUrl });
|
|
211
|
-
const auth = betterAuth.betterAuth({
|
|
212
|
-
database: betterAuthDrizzleAdapter.drizzleAdapter(drizzleOrm.drizzle(pool)),
|
|
213
|
-
plugins: [betterAuth.admin()],
|
|
214
|
-
});
|
|
215
|
-
// Create admin user via better-auth API
|
|
216
|
-
const result = await auth.api.createUser({
|
|
217
|
-
body: {
|
|
218
|
-
email,
|
|
219
|
-
password,
|
|
220
|
-
name,
|
|
221
|
-
role: 'admin',
|
|
222
|
-
},
|
|
223
|
-
});
|
|
224
|
-
await pool.end();
|
|
225
|
-
return result;
|
|
226
|
-
}
|
|
227
|
-
function printSuccess(result) {
|
|
228
|
-
p.log.success('Admin user created successfully!');
|
|
229
|
-
p.log.info(`Email: ${result.user.email}`);
|
|
230
|
-
p.log.info(`Name: ${result.user.name}`);
|
|
231
|
-
p.log.info(`ID: ${result.user.id.slice(0, 8)}...`);
|
|
232
|
-
}
|
|
233
|
-
export async function adminCreate(options) {
|
|
234
|
-
try {
|
|
235
|
-
// Normalize options
|
|
236
|
-
const opts = {
|
|
237
|
-
name: options.name || 'Admin',
|
|
238
|
-
cwd: options.cwd || process.cwd(),
|
|
239
|
-
};
|
|
240
|
-
// If email and password provided via CLI args, use them directly
|
|
241
|
-
// Otherwise prompt interactively
|
|
242
|
-
let adminInput;
|
|
243
|
-
if (options.email && options.password) {
|
|
244
|
-
opts['email'] = options.email;
|
|
245
|
-
opts['password'] = options.password;
|
|
246
|
-
p.log.info('Creating admin user with provided credentials...');
|
|
247
|
-
adminInput = validateInput(opts);
|
|
248
|
-
}
|
|
249
|
-
else {
|
|
250
|
-
adminInput = await promptForAdminDetails();
|
|
251
|
-
}
|
|
252
|
-
// Validate email domain
|
|
253
|
-
if (isPublicEmailDomain(adminInput.email)) {
|
|
254
|
-
warnPublicEmail(adminInput.email);
|
|
255
|
-
}
|
|
256
|
-
// Create the admin user
|
|
257
|
-
const result = await createAdminUser({ ...adminInput, cwd: opts['cwd'] });
|
|
258
|
-
printSuccess(result);
|
|
259
|
-
}
|
|
260
|
-
catch (error) {
|
|
261
|
-
handleError(error);
|
|
262
|
-
}
|
|
263
|
-
}
|
|
264
|
-
//# sourceMappingURL=admin-create.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"admin-create.js","sourceRoot":"","sources":["../../src/commands/admin-create.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/admin.d.ts
DELETED
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Admin command for managing admin users
|
|
3
|
-
*
|
|
4
|
-
* Usage: deesse admin create [options]
|
|
5
|
-
*/
|
|
6
|
-
export interface AdminCreateOptions {
|
|
7
|
-
email?: string;
|
|
8
|
-
password?: string;
|
|
9
|
-
name?: string;
|
|
10
|
-
cwd?: string;
|
|
11
|
-
}
|
|
12
|
-
export declare const adminCommand: {
|
|
13
|
-
name: "admin";
|
|
14
|
-
description: string;
|
|
15
|
-
subcommands: {
|
|
16
|
-
name: "create";
|
|
17
|
-
description: string;
|
|
18
|
-
options: ({
|
|
19
|
-
name: string;
|
|
20
|
-
description: string;
|
|
21
|
-
default?: undefined;
|
|
22
|
-
} | {
|
|
23
|
-
name: string;
|
|
24
|
-
description: string;
|
|
25
|
-
default: string;
|
|
26
|
-
})[];
|
|
27
|
-
}[];
|
|
28
|
-
};
|
|
29
|
-
//# sourceMappingURL=admin.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../src/commands/admin.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;CAexB,CAAC"}
|
package/dist/commands/admin.js
DELETED
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Admin command for managing admin users
|
|
3
|
-
*
|
|
4
|
-
* Usage: deesse admin create [options]
|
|
5
|
-
*/
|
|
6
|
-
export const adminCommand = {
|
|
7
|
-
name: 'admin',
|
|
8
|
-
description: 'Manage admin users',
|
|
9
|
-
subcommands: [
|
|
10
|
-
{
|
|
11
|
-
name: 'create',
|
|
12
|
-
description: 'Create an admin user',
|
|
13
|
-
options: [
|
|
14
|
-
{ name: '--email <email>', description: 'Admin email address' },
|
|
15
|
-
{ name: '--password <password>', description: 'Admin password (min 8 characters)' },
|
|
16
|
-
{ name: '--name <name>', description: 'Admin display name', default: 'Admin' },
|
|
17
|
-
{ name: '--cwd <path>', description: 'Working directory', default: process.cwd() },
|
|
18
|
-
],
|
|
19
|
-
},
|
|
20
|
-
],
|
|
21
|
-
};
|
|
22
|
-
//# sourceMappingURL=admin.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/commands/admin.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,OAAgB;IACtB,WAAW,EAAE,oBAAoB;IACjC,WAAW,EAAE;QACX;YACE,IAAI,EAAE,QAAiB;YACvB,WAAW,EAAE,sBAAsB;YACnC,OAAO,EAAE;gBACP,EAAE,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,qBAAqB,EAAE;gBAC/D,EAAE,IAAI,EAAE,uBAAuB,EAAE,WAAW,EAAE,mCAAmC,EAAE;gBACnF,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,oBAAoB,EAAE,OAAO,EAAE,OAAO,EAAE;gBAC9E,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,mBAAmB,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE;aACnF;SACF;KACF;CACF,CAAC"}
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* db:generate command
|
|
3
|
-
*
|
|
4
|
-
* Generates auth schema and user migrations with drizzle-kit.
|
|
5
|
-
* Always recreates drizzle config to ensure correct schema path.
|
|
6
|
-
*/
|
|
7
|
-
export interface DbGenerateOptions {
|
|
8
|
-
cwd?: string;
|
|
9
|
-
}
|
|
10
|
-
export declare function dbGenerate(options?: DbGenerateOptions): Promise<void>;
|
|
11
|
-
//# sourceMappingURL=generate.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/commands/db/generate.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,wBAAsB,UAAU,CAAC,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuB/E"}
|
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* db:generate command
|
|
3
|
-
*
|
|
4
|
-
* Generates auth schema and user migrations with drizzle-kit.
|
|
5
|
-
* Always recreates drizzle config to ensure correct schema path.
|
|
6
|
-
*/
|
|
7
|
-
import { execSync } from 'node:child_process';
|
|
8
|
-
import { createDrizzleConfig } from '../../lib/db/schema.js';
|
|
9
|
-
import { generateAuthSchema } from '../../lib/db/auth-schema.js';
|
|
10
|
-
export async function dbGenerate(options = {}) {
|
|
11
|
-
const cwd = options.cwd ?? process.cwd();
|
|
12
|
-
// Generate auth schema (mandatory in DeesseJS)
|
|
13
|
-
await generateAuthSchema(cwd);
|
|
14
|
-
// Always recreate drizzle config to ensure correct schema path
|
|
15
|
-
console.warn('Setting up drizzle.config.ts...');
|
|
16
|
-
await createDrizzleConfig(cwd);
|
|
17
|
-
console.warn('Generating migrations with drizzle-kit...');
|
|
18
|
-
try {
|
|
19
|
-
execSync('npx drizzle-kit generate', {
|
|
20
|
-
cwd,
|
|
21
|
-
stdio: 'inherit',
|
|
22
|
-
});
|
|
23
|
-
}
|
|
24
|
-
catch (error) {
|
|
25
|
-
if (error.code === 'ENOENT') {
|
|
26
|
-
throw new Error('drizzle-kit not found. Please install it: npm install drizzle-kit');
|
|
27
|
-
}
|
|
28
|
-
throw error;
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
//# sourceMappingURL=generate.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/commands/db/generate.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAMjE,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,UAA6B,EAAE;IAC9D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAEzC,+CAA+C;IAC/C,MAAM,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAE9B,+DAA+D;IAC/D,OAAO,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;IAChD,MAAM,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAE/B,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;IAE1D,IAAI,CAAC;QACH,QAAQ,CAAC,0BAA0B,EAAE;YACnC,GAAG;YACH,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACvD,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;QACvF,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* db command dispatcher
|
|
3
|
-
*
|
|
4
|
-
* Handles all db:* subcommands:
|
|
5
|
-
* - db:generate Generate migrations from schema changes
|
|
6
|
-
* - db:push Push schema changes directly (dev only)
|
|
7
|
-
* - db:migrate Apply pending migrations to database
|
|
8
|
-
*/
|
|
9
|
-
export interface DbCommandOptions {
|
|
10
|
-
subcommand: string;
|
|
11
|
-
args: string[];
|
|
12
|
-
}
|
|
13
|
-
export declare function runDbCommand(options: DbCommandOptions): Promise<void>;
|
|
14
|
-
export declare function showDbHelp(): void;
|
|
15
|
-
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/db/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4B3E;AA0CD,wBAAgB,UAAU,IAAI,IAAI,CA+BjC"}
|