Merge branch 'next' of https://github.com/devforth/adminforth into create-cli

Author: NoOne7135

README.md

@@ -54,7 +54,6 @@ npx adminforth create-app
 
 
 
-
 # For developers
 
 The most convenient way to add new features or fixes is using `dev-demo`. It imports the source code of the repository and plugins so you can edit them and see changes on the fly.
@@ -66,20 +65,21 @@ Fork repo, pull it and do next:
 cd adminforth
 npm ci
 npm run build
+```
+
+To run dev demo:
+```sh
+cd dev-demo
+cp .env.sample .env
 
 # this will install all official plugins and link adminforth package, if plugin installed it will git pull and npm ci
 npm run install-plugins
 
 # same for official adapters
 npm run install-adapters
-```
 
-To run dev demo:
-```sh
-cd dev-demo
-cp .env.sample .env
 npm ci
-npm run migrate
+npm run migrate:local
 npm start
 ```
 

adapters/install-adapters.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-ADAPTERS="adminforth-completion-adapter-open-ai-chat-gpt adminforth-email-adapter-aws-ses adminforth-google-oauth-adapter adminforth-github-oauth-adapter adminforth-facebook-oauth-adapter adminforth-keycloak-oauth-adapter adminforth-microsoft-oauth-adapter"
+ADAPTERS="adminforth-completion-adapter-open-ai-chat-gpt adminforth-email-adapter-aws-ses adminforth-google-oauth-adapter adminforth-github-oauth-adapter adminforth-facebook-oauth-adapter adminforth-keycloak-oauth-adapter adminforth-microsoft-oauth-adapter adminforth-image-generation-adapter-openai adminforth-storage-adapter-amazon-s3 adminforth-storage-adapter-local"
 
 # for each
 install_adapter() {

adminforth/commands/callTsProxy.js

@@ -7,7 +7,7 @@ import chalk from "chalk";
 const currentFilePath = import.meta.url;
 const currentFileFolder = path.dirname(currentFilePath).replace("file:", "");
 
-export function callTsProxy(tsCode) {
+export function callTsProxy(tsCode, silent=false) {
 
   process.env.HEAVY_DEBUG && console.log("🌐 Calling tsproxy with code:", path.join(currentFileFolder, "proxy.ts"));
   return new Promise((resolve, reject) => {
@@ -30,9 +30,11 @@ export function callTsProxy(tsCode) {
       if (code === 0) {
         try {
           const parsed = JSON.parse(stdout);
-          parsed.capturedLogs.forEach((log) => {
-            console.log(...log);
-          });
+          if (!silent) {
+            parsed.capturedLogs.forEach((log) => {
+              console.log(...log);
+            });
+          }
 
           if (parsed.error) {
             reject(new Error(`${parsed.error}\n${parsed.stack}`));
@@ -73,13 +75,13 @@ export async function findAdminInstance() {
       const fileNoTs = file.replace(/\.ts$/, "");
       process.env.HEAVY_DEBUG && console.log(`🪲 Trying bundleing ${file}...`);
       try {
-        res = await callTsProxy(`
+        const res = await callTsProxy(`
           import { admin } from './${fileNoTs}.js';
 
           export async function exec() {
             return admin.formatAdminForth();
           }
-        `);
+        `, true);
         instanceFound.file = fileNoTs;
         instanceFound.version = res;
         break;

adminforth/commands/createApp/main.js

@@ -22,6 +22,7 @@ export default async function createApp(args) {
     await tasks.run();
   } catch (err) {
     console.error(chalk.red(`\n❌  ${err.message}\n`));
+    console.error(err.stack);
     process.exit(1);
   }
 }

adminforth/commands/createApp/templates/.env.prod.hbs

@@ -1,6 +1,5 @@
 NODE_ENV=production
-DATABASE_URL=sqlite://.db.sqlite
-DATABASE_URL={{dbUrl}}
-{{#if prismaDbUrl}}
-PRISMA_DATABASE_URL={{prismaDbUrl}}
+DATABASE_URL={{dbUrlProd}}
+{{#if prismaDbUrlProd}}
+PRISMA_DATABASE_URL={{prismaDbUrlProd}}
 {{/if}}

adminforth/commands/createApp/templates/adminuser.ts.hbs

@@ -1,6 +1,6 @@
-import AdminForth, { AdminForthDataTypes, AdminForthResourceInput, AdminForthResource, AdminUser } from 'adminforth';
-
-import type { AdminUser } from  'adminforth';
+import AdminForth, { AdminForthDataTypes } from 'adminforth';
+import type { AdminForthResourceInput, AdminForthResource, AdminUser } from 'adminforth';
+import { randomUUID } from 'crypto';
 
 async function canModifyUsers({ adminUser }: { adminUser: AdminUser }): Promise<boolean> {
   return adminUser.dbUser.role === 'superadmin';
@@ -23,7 +23,7 @@ export default {
       name: 'id',
       primaryKey: true,
       type: AdminForthDataTypes.STRING,
-      fillOnCreate: ({ initialRecord, adminUser }) => Math.random().toString(36).substring(7),
+      fillOnCreate: ({ initialRecord, adminUser }) => randomUUID(),
       showIn: {
         edit: false,
         create: false,

adminforth/commands/createApp/templates/index.ts.hbs

@@ -1,5 +1,5 @@
 import express from 'express';
-import AdminForth, { Filters } from 'adminforth';
+import AdminForth from 'adminforth';
 import usersResource from "./resources/adminuser.js";
 
 const ADMIN_BASE_URL = '';
@@ -61,13 +61,14 @@ if (import.meta.url === `file://${process.argv[1]}`) {
 
   const port = 3500;
 
-  await admin.bundleNow({ hotReload: process.env.NODE_ENV === 'development' });
-  console.log('Bundling AdminForth SPA done.');
+  admin.bundleNow({ hotReload: process.env.NODE_ENV === 'development' }).then(() => {
+    console.log('Bundling AdminForth SPA done.');
+  });
 
-  admin.express.serve(app)
+  admin.express.serve(app);
 
   admin.discoverDatabases().then(async () => {
-    if (!await admin.resource('adminuser').get([Filters.EQ('email', 'adminforth')])) {
+    if (await admin.resource('adminuser').count() === 0) {
       await admin.resource('adminuser').create({
         email: 'adminforth',
         password_hash: await AdminForth.Utils.generatePasswordHash('adminforth'),

adminforth/commands/createApp/templates/readme.md.hbs

@@ -38,7 +38,7 @@ You have Dockerfile ready for production deployment. You can test the build with
 
 ```bash
 docker build -t {{appName}}-image .
-docker run -p 3500:3500 {{appName}}-image
+docker run -p 3500:3500 -e ADMINFORTH_SECRET=123 {{#if sqliteFile}}-v $(pwd)/db:/code/db {{/if}}{{appName}}-image
 ```
 
 To set non-sensitive environment variables in production, use `.env.prod` file.

adminforth/commands/createApp/utils.js

@@ -100,6 +100,20 @@ function generateDbUrlForPrisma(connectionString) {
   return connectionString.toString();
 }
 
+function generateDbUrlForPrismaProd(connectionString) {
+  if (connectionString.protocol.startsWith('sqlite'))
+    return `file:/code/db/${connectionString.host}`;
+  if (connectionString.protocol.startsWith('mongodb'))
+    return null;
+  return connectionString.toString();
+}
+
+function generateDbUrlForAfProd(connectionString) {
+  if (connectionString.protocol.startsWith('sqlite'))
+    return `sqlite:////code/db/${connectionString.host}`;
+  return connectionString.toString();
+}
+
 function initialChecks(options) {
   return [
     {
@@ -128,8 +142,12 @@ async function scaffoldProject(ctx, options, cwd) {
   await fse.ensureDir(projectDir);
 
   const connectionString = parseConnectionString(options.db);
+  const connectionStringProd = generateDbUrlForAfProd(connectionString);
+
   const provider = detectDbProvider(connectionString.protocol);
   const prismaDbUrl = generateDbUrlForPrisma(connectionString);
+  const prismaDbUrlProd = generateDbUrlForPrismaProd(connectionString);
+
 
   ctx.skipPrismaSetup = !prismaDbUrl;
   const appName = options.appName;
@@ -151,17 +169,23 @@ async function scaffoldProject(ctx, options, cwd) {
   // Write templated files
   await writeTemplateFiles(dirname, projectDir, {
     dbUrl: connectionString.toString(),
+    dbUrlProd: connectionStringProd,
     prismaDbUrl,
+    prismaDbUrlProd,
     appName,
     provider,
     nodeMajor: parseInt(process.versions.node.split('.')[0], 10),
+    sqliteFile: connectionString.protocol.startsWith('sqlite') ? connectionString.host : null,
   });
 
   return projectDir;  // Return the new directory path
 }
 
 async function writeTemplateFiles(dirname, cwd, options) {
-  const { dbUrl, prismaDbUrl, appName, provider, nodeMajor } = options;
+  const { 
+    dbUrl, prismaDbUrl, appName, provider, nodeMajor,
+    dbUrlProd, prismaDbUrlProd, sqliteFile
+   } = options;
 
   // Build a list of files to generate
   const templateTasks = [
@@ -199,12 +223,12 @@ async function writeTemplateFiles(dirname, cwd, options) {
     {
       src: '.env.prod.hbs',
       dest: '.env.prod',
-      data: { dbUrl, prismaDbUrl },
+      data: { prismaDbUrlProd, dbUrlProd },
     },
     {
       src: 'readme.md.hbs',
       dest: 'README.md',
-      data: { dbUrl, prismaDbUrl, appName },
+      data: { dbUrl, prismaDbUrl, appName, sqliteFile },
     },
     {
       // We'll write .env using the same content as .env.sample
@@ -237,7 +261,7 @@ async function writeTemplateFiles(dirname, cwd, options) {
       src: '.dockerignore.hbs',
       dest: '.dockerignore',
       data: {
-        sqliteFile: detectDbProvider(options.db).startsWith('sqlite') ? options.db.split('://')[1] : null,
+        sqliteFile,
       },
     }
   ];

adminforth/commands/utils.js

@@ -13,7 +13,6 @@ export const mapToTypeScriptType = (adminType) => {
   switch (adminType) {
     case "string":
     case "text":
-    case "richtext":
     case "datetime":
     case "date":
     case "time":