Merge branch 'next' of github.com:devforth/adminforth into next

Author: SerVitasik

adminforth/commands/callTsProxy.js

@@ -3,18 +3,28 @@ import { spawn } from "child_process";
 import path from "path";
 import fs from "fs";
 import chalk from "chalk";
+import dotenv from "dotenv";
 
 const currentFilePath = import.meta.url;
 const currentFileFolder = path.dirname(currentFilePath).replace("file:", "");
 
 export function callTsProxy(tsCode, silent=false) {
 
+  const currentDirectory = process.cwd();
+  const envPath = path.resolve(currentDirectory, ".env");
+  const envLocalPath = path.resolve(currentDirectory, ".env.local");
+  if (fs.existsSync(envLocalPath)) {
+    dotenv.config({ path: envLocalPath, override: true });
+  }
+  if (fs.existsSync(envPath)) {
+    dotenv.config({ path: envPath, override: true });
+  }
+
   process.env.HEAVY_DEBUG && console.log("🌐 Calling tsproxy with code:", path.join(currentFileFolder, "proxy.ts"));
   return new Promise((resolve, reject) => {
-    const child = spawn("tsx", [
-      path.join(currentFileFolder, "proxy.ts")
-    ]);
-
+    const child = spawn("tsx", [path.join(currentFileFolder, "proxy.ts")], {
+      env: process.env,
+    });
     let stdout = "";
     let stderr = "";
 

adminforth/commands/cli.js

@@ -12,6 +12,7 @@ import createResource from "./createResource/main.js";
 import chalk from "chalk";
 import path from "path";
 import fs from "fs";
+import { fileURLToPath } from 'url';
 
 function showHelp() {
   console.log(
@@ -25,19 +26,25 @@ function showHelp() {
   );
 }
 
-function currentFileDir(importMetaUrl) {
-  const filePath = importMetaUrl.replace("file://", "");
+export function currentFileDir(importMetaUrl) {
+  const filePath = fileURLToPath(importMetaUrl);
   const fileDir = path.dirname(filePath);
   return fileDir;
 }
 
-function showVersion() {
+export function getVersion() {
   const ADMIN_FORTH_ABSOLUTE_PATH = path.join(currentFileDir(import.meta.url), '..');
 
   const package_json = JSON.parse(fs.readFileSync(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'package.json'), 'utf8'));
 
   const ADMINFORTH_VERSION  = package_json.version;
 
+  return ADMINFORTH_VERSION;
+}
+
+function showVersion() {
+  const ADMINFORTH_VERSION = getVersion();
+
   console.log(
     chalk.white('AdminForth CLI version: ') +
     chalk.cyan.bold(ADMINFORTH_VERSION)

adminforth/commands/createApp/templates/custom/tsconfig.json.hbs

@@ -2,9 +2,8 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/": "../node_modules/adminforth/dist/spa/src/",
-      "": "../node_modules/adminforth/dist/spa/node_modules/",
-      "@@/*": "."
+      "@/*": ["../node_modules/adminforth/dist/spa/src/*"],
+      "@@/*": ["./*"]
     }
   }
 }

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

@@ -3,7 +3,7 @@ import AdminForth from 'adminforth';
 import usersResource from "./resources/adminuser.js";
 import { fileURLToPath } from 'url';
 import path from 'path';
-
+ 
 const ADMIN_BASE_URL = '';
 
 export const admin = new AdminForth({

adminforth/commands/createApp/templates/package.json.hbs

@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@dotenvx/dotenvx": "^1.34.0",
-    "adminforth": "latest",
+    "adminforth": "{{adminforthVersion}}",
     "express": "latest-4"
   },
   "devDependencies": {

adminforth/commands/createApp/utils.js

@@ -11,9 +11,31 @@ import { exec } from 'child_process';
 
 import Handlebars from 'handlebars';
 import { promisify } from 'util';
+import { getVersion } from '../cli.js';
 
 const execAsync = promisify(exec);
 
+function detectAdminforthVersion() {
+  try {
+    const version =  getVersion();
+
+    if (typeof version !== 'string') {
+      throw new Error('Invalid version format');
+    }
+
+    if (version.includes('next')) {
+      return 'next';
+    }
+    return 'latest';
+  } catch (err) {
+    console.warn('⚠️ Could not detect AdminForth version, defaulting to "latest".');
+    return 'latest';
+  }
+}
+
+const adminforthVersion = detectAdminforthVersion();
+
+
 export function parseArgumentsIntoOptions(rawArgs) {
   const args = arg(
     {
@@ -203,7 +225,10 @@ async function writeTemplateFiles(dirname, cwd, options) {
     {
       src: 'package.json.hbs',
       dest: 'package.json',
-      data: { appName },
+      data: { 
+        appName,
+        adminforthVersion: adminforthVersion,
+       },
     },
     {
       src: 'index.ts.hbs',
@@ -287,7 +312,7 @@ async function installDependencies(ctx, cwd) {
   const isWindows = process.platform === 'win32';
 
   const nodeBinary = process.execPath; 
-  const npmPath = path.join(path.dirname(nodeBinary), 'npm');
+  const npmPath = path.join(path.dirname(nodeBinary), isWindows ? 'npm.cmd' : 'npm');
   const customDir = ctx.customDir;
   if (isWindows) {
     const res = await Promise.all([

adminforth/dataConnectors/mongo.ts

@@ -194,13 +194,8 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
           if (!value) {
             return null;
           }
-          if (field._underlineType == 'timestamp' || field._underlineType == 'int') {
-            // value is iso string now, convert to unix timestamp
-            return dayjs(value).unix();
-          } else if (field._underlineType == 'varchar') {
-            // value is iso string now, convert to unix timestamp
-            return dayjs(value).toISOString();
-          }
+          return dayjs(value).toDate();
+          
         } else if (field.type == AdminForthDataTypes.BOOLEAN) {
             return value === null ? null : (value ? true : false);
         } else if (field.type == AdminForthDataTypes.DECIMAL) {

adminforth/documentation/blog/2024-08-05-chatgpt/index.md

@@ -11,7 +11,7 @@ Today LLM is already a must tool to speed-up writing, brainstorming, or generati
 
 Here is how it looks in action:
 
-![alt text](../../docs/tutorial/05-Plugins/demoChatGpt.gif)
+![alt text](../../docs/tutorial/07-Plugins/demoChatGpt.gif)
 
 <!-- truncate -->
 

adminforth/documentation/blog/2024-10-01-ai-blog/index.md

@@ -199,7 +199,7 @@ model ContentImage {
 Create a migration:
 
 ```bash
-npm run makemigration -- --name add-posts && npm run migrate:local
+npm run makemigration -- --name add-posts ; npm run migrate:local
 ```
 
 

adminforth/documentation/docs/tutorial/001-gettingStarted.md

@@ -89,7 +89,7 @@ This will create a migration file in `migrations` and apply it to the database.
 In future, when you need to add new resources, you need to modify `schema.prisma` (add models, change fields, etc.). After doing any modification you need to create a new migration using next command:
 
 ```bash
-npm run makemigration -- --name init && npm run migrate:local
+npm run makemigration -- --name init ; npm run migrate:local
 ```
 
 Other developers need to pull migration and run `npm run migrateLocal` to apply any unapplied migrations.
@@ -173,7 +173,7 @@ model apartments {
 Run the following command to create a new migration:
 
 ```bash
-npm run makemigration -- --name add-apartments && npm run migrate:local
+npm run makemigration -- --name add-apartments ; npm run migrate:local
 ```
 
 ### Step3. Create the `apartments` resource
@@ -314,7 +314,7 @@ Open `index.ts` in your project root and import the new resource:
 ```ts title="./index.ts"
 ...
 //diff-add
-import apartmentsResource from "./resources/apartments";
+import apartmentsResource from "./resources/apartments.js";
 
 ...
 export const admin = new AdminForth({
@@ -409,7 +409,7 @@ async function seedDatabase() {
 //diff-add
 };
 
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (fileURLToPath(import.meta.url) === path.resolve(process.argv[1])) {
 
   ...