go-duck-cli 1.1.29 → 1.1.31

package/generators/devops.js

@@ -96,6 +96,7 @@ services:
       - "${dbPort}:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
+      - ./postgres-init:/docker-entrypoint-initdb.d
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${config.datasource?.username || 'postgres'} -d ${config.datasource?.database || 'go_duck_master'}"]
       interval: 5s
@@ -167,7 +168,7 @@ services:
       KEYCLOAK_ADMIN: admin
       KEYCLOAK_ADMIN_PASSWORD: admin
       KC_DB: postgres
-      KC_DB_URL: jdbc:postgresql://postgres:5432/${config.datasource?.database || 'go_duck_master'}
+      KC_DB_URL: jdbc:postgresql://postgres:5432/keycloak
       KC_DB_USERNAME: ${config.datasource?.username || 'postgres'}
       KC_DB_PASSWORD: ${config.datasource?.password || 'password'}
     depends_on:
@@ -392,6 +393,10 @@ jobs:
     await fs.ensureDir(realmConfigDir);
     await fs.writeFile(path.join(realmConfigDir, `${realmName}-realm.json`), realmJson);
 
+    const postgresInitDir = path.join(devopsDir, 'postgres-init');
+    await fs.ensureDir(postgresInitDir);
+    await fs.writeFile(path.join(postgresInitDir, 'init.sql'), 'CREATE DATABASE keycloak;\n');
+
     await fs.writeFile(path.join(devopsDir, 'Dockerfile'), dockerfile);
     await fs.writeFile(path.join(devopsDir, 'services.yml'), servicesYaml);
     await fs.writeFile(path.join(devopsDir, 'app.yml'), appYaml);

package/generators/graphql.js

@@ -2,12 +2,15 @@ import fs from 'fs-extra';
 import path from 'path';
 import chalk from 'chalk';
 import Handlebars from 'handlebars';
+import { fileURLToPath } from 'url';
 
 export const generateGraphQLCode = async (config, entities, relationships, outputDir, enums = []) => {
     const graphDir = path.join(outputDir, 'graph');
     await fs.ensureDir(graphDir);
 
-    const templatesDir = path.resolve(path.dirname(import.meta.url.replace('file://', '')), '../templates/graphql');
+    const __filename = fileURLToPath(import.meta.url);
+    const __dirname = path.dirname(__filename);
+    const templatesDir = path.resolve(__dirname, '../templates/graphql');
 
     // 1. Generate schema.graphqls
     const schemaTemplatePath = path.join(templatesDir, 'schema.graphql.hbs');

package/generators/kratos.js

@@ -2,6 +2,7 @@ import fs from 'fs-extra';
 import path from 'path';
 import Handlebars from 'handlebars';
 import chalk from 'chalk';
+import { fileURLToPath } from 'url';
 
 export const generateKratosCode = async (entities, projectRootDir, projectName, enums = []) => {
     console.log(chalk.cyan('Generating Kratos gRPC Services...'));
@@ -14,7 +15,8 @@ export const generateKratosCode = async (entities, projectRootDir, projectName,
     await fs.ensureDir(serviceDir);
     await fs.ensureDir(serverDir);
 
-    const __dirname = path.dirname(import.meta.url.replace('file://', ''));
+    const __filename = fileURLToPath(import.meta.url);
+    const __dirname = path.dirname(__filename);
     const templateBase = path.resolve(__dirname, '..', 'templates');
 
     const protoTemplateSource = await fs.readFile(path.join(templateBase, 'proto', 'entity.proto.hbs'), 'utf8');

package/generators/router.js

@@ -2,12 +2,15 @@ import fs from 'fs-extra';
 import path from 'path';
 import Handlebars from 'handlebars';
 import chalk from 'chalk';
+import { fileURLToPath } from 'url';
 
 export const generateRouterCode = async (outputDir, config, entities, openEntities) => {
     const routerDir = path.join(outputDir, 'router');
     await fs.ensureDir(routerDir);
 
-    const templatePath = path.resolve(path.dirname(import.meta.url.replace('file://', '')), '../templates/go/router.go.hbs');
+    const __filename = fileURLToPath(import.meta.url);
+    const __dirname = path.dirname(__filename);
+    const templatePath = path.resolve(__dirname, '../templates/go/router.go.hbs');
     if (!await fs.pathExists(templatePath)) {
         console.error(chalk.red(`❌ Router template not found: ${templatePath}`));
         return;

package/index.js

@@ -14,10 +14,14 @@ import chalk from 'chalk';
 import { execSync } from 'child_process';
 import express from 'express';
 import open from 'open';
+import { fileURLToPath } from 'url';
 import { parseGDL } from './parser/gdl.js';
 import { generateMultitenancy } from './generators/multitenancy.js';
 import { generateLiquibaseChangelogs } from './generators/migrations.js';
 import { generateMeteringCode } from './generators/metering.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 import { generateGraphQLCode } from './generators/graphql.js';
 import { generatePostgRESTCode } from './generators/postgrest.js';
 import { generateSwaggerDocs } from './generators/swagger.js';
@@ -288,7 +292,7 @@ Handlebars.registerPartial('renderFields', `
 {{/each}}
 `);
 
-const pkgPath = path.resolve(path.dirname(import.meta.url.replace('file://', '')), 'package.json');
+const pkgPath = path.resolve(__dirname, 'package.json');
 const pkg = fs.readJsonSync(pkgPath);
 
 program
@@ -399,15 +403,15 @@ const generateEntities = async (gdlPath, outputDir, config) => {
         return fromEntityCreated || toEntityCreated;
     });
 
-    const entityTemplatePath = path.resolve(path.dirname(import.meta.url.replace('file://', '')), 'templates/go/entity.go.hbs');
+    const entityTemplatePath = path.resolve(__dirname, 'templates/go/entity.go.hbs');
     const entityTemplateSource = await fs.readFile(entityTemplatePath, 'utf8');
     const entityTemplate = Handlebars.compile(entityTemplateSource);
 
-    const controllerTemplatePath = path.resolve(path.dirname(import.meta.url.replace('file://', '')), 'templates/go/controller.go.hbs');
+    const controllerTemplatePath = path.resolve(__dirname, 'templates/go/controller.go.hbs');
     const controllerTemplateSource = await fs.readFile(controllerTemplatePath, 'utf8');
     const controllerTemplate = Handlebars.compile(controllerTemplateSource);
 
-    const enumTemplatePath = path.resolve(path.dirname(import.meta.url.replace('file://', '')), 'templates/go/enum.go.hbs');
+    const enumTemplatePath = path.resolve(__dirname, 'templates/go/enum.go.hbs');
     const enumTemplateSource = await fs.readFile(enumTemplatePath, 'utf8');
     const enumTemplate = Handlebars.compile(enumTemplateSource);
 
@@ -512,7 +516,7 @@ program
         await generateRepositoryCode(absoluteOutputDir);
         
         {
-            const migratorTemplatePath = path.resolve(path.dirname(import.meta.url.replace('file://', '')), 'templates/go/migrator.go.hbs');
+            const migratorTemplatePath = path.resolve(__dirname, 'templates/go/migrator.go.hbs');
             if (await fs.pathExists(migratorTemplatePath)) {
                 const migratorTemplate = Handlebars.compile(await fs.readFile(migratorTemplatePath, 'utf8'));
                 await fs.writeFile(path.join(absoluteOutputDir, 'migrations/migrations.go'), migratorTemplate({ app_name: config.name }));
@@ -550,7 +554,7 @@ program
         console.log(chalk.green('🤖 System-level AI Blueprint Documentation generated!'));
 
         // 9. Generate main.go
-        const mainTemplatePath = path.resolve(path.dirname(import.meta.url.replace('file://', '')), 'templates/go/main.go.hbs');
+        const mainTemplatePath = path.resolve(__dirname, 'templates/go/main.go.hbs');
         if (await fs.pathExists(mainTemplatePath)) {
             const mainTemplateSource = await fs.readFile(mainTemplatePath, 'utf8');
             const mainTemplate = Handlebars.compile(mainTemplateSource);
@@ -675,7 +679,7 @@ program
 
         // Regenerate main.go to include new routes if any (or just entities)
         const timestamp = new Date().toISOString().replace(/[-:T]/g, '').split('.')[0];
-        const mainTemplatePath = path.resolve(path.dirname(import.meta.url.replace('file://', '')), 'templates/go/main.go.hbs');
+        const mainTemplatePath = path.resolve(__dirname, 'templates/go/main.go.hbs');
         if (await fs.pathExists(mainTemplatePath)) {
             const mainTemplate = Handlebars.compile(await fs.readFile(mainTemplatePath, 'utf8'));
             await fs.writeFile(path.join(absoluteOutputDir, 'main.go'), mainTemplate({ app_name: config.name, entities, openEntities, timestamp }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-duck-cli",
-  "version": "1.1.29",
+  "version": "1.1.31",
   "description": "The Ultimate Evolutionary Go Microservice Scaffolder.",
   "main": "index.js",
   "type": "module",