@paralect/hive 0.1.50-alpha.3 → 0.1.50

package/.claude/settings.local.json

@@ -0,0 +1,13 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npx npm-check-updates:*)",
+      "Bash(npm install:*)",
+      "Bash(git mv:*)",
+      "Bash(npm run test:init:*)",
+      "Bash(ls:*)",
+      "Bash(node:*)",
+      "Bash(HIVE_SRC=$PWD/hive node -e \"\nconst tsx = require\\(''tsx/cjs/api''\\);\nprocess.env.HIVE_SRC = ''$PWD/hive'';\ntsx.require\\(''./.hive/src/app.ts'', __filename\\);\n\")"
+    ]
+  }
+}

package/cli/helpers/execCommand.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
+const { spawn } = require('child_process');
 
-const execa = require('execa');
 const mkdirp = require('mkdirp');
 
 const execCommand = async (command, options = {}, outputFileSrc = null) => {
@@ -20,29 +20,29 @@ const execCommand = async (command, options = {}, outputFileSrc = null) => {
 
         return commandPart;
       });
-
-    // commandParts = command.split(' ').filter((part) => !!part.trim());
   }
 
   const commandName = commandParts.shift();
   const commandArguments = commandParts;
 
-  const process = execa(commandName, commandArguments, {
+  const child = spawn(commandName, commandArguments, {
     stdio: outputFileSrc ? 'pipe' : 'inherit',
     ...options,
   });
 
   if (outputFileSrc) {
-    console.log('writing to outputFileSrc', outputFileSrc);
     const dir = path.dirname(outputFileSrc);
-
     await mkdirp(dir);
-    console.log(dir, fs.existsSync(dir));
-
-    process.stdout.pipe(fs.createWriteStream(outputFileSrc, { flags: 'a+' }));
+    child.stdout.pipe(fs.createWriteStream(outputFileSrc, { flags: 'a+' }));
   }
 
-  return process;
+  return new Promise((resolve, reject) => {
+    child.on('close', (code) => {
+      if (code === 0) resolve();
+      else reject(new Error(`Command "${command}" failed with exit code ${code}`));
+    });
+    child.on('error', reject);
+  });
 };
 
 module.exports = execCommand;

package/cli/helpers/isProjectInit.js

@@ -5,9 +5,9 @@ const inquirer = require('inquirer');
 
 module.exports = async () => {
   if (!process.env.PROJECT_ID) {
-    let projectConfigPath = path.resolve(process.env.HIVE_SRC, './hive.config.js');
-    
-    if (fs.existsSync(projectConfigPath)) {
+    let projectConfigPath = [path.resolve(process.env.HIVE_SRC, './hive.config.ts'), path.resolve(process.env.HIVE_SRC, './hive.config.js')].find(p => fs.existsSync(p));
+
+    if (projectConfigPath) {
       const config = require(projectConfigPath);
       if (config.projectId) {
         process.env.PROJECT_ID = config.projectId;

package/cli/helpers/mergeDirs.js

@@ -71,7 +71,7 @@ async function mergeDirectories(sourceDir1, sourceDir2, targetDir) {
 }
 
 module.exports = async ({ hiveSrc, outDir }) => {
-  await mergeDirectories(path.resolve(__dirname, './../../starter'), hiveSrc, outDir);
+  await mergeDirectories(path.resolve(__dirname, './../../framework'), hiveSrc, outDir);
 
   console.log('Merged resources');
 }

package/cli/hive.js

@@ -7,41 +7,76 @@ const inquirer = require('inquirer');
 const mergeDirs = require('./helpers/mergeDirs');
 const execCommand = require('./helpers/execCommand');
 const downloadDirectory = require('./helpers/downloadDirectory');
-const { isDockerInstalled, startMongo, startRedis } = require('./helpers/docker');
-const { ensureEnvConfig, hashCode } = require('./helpers/envCheck');
-const { findAvailablePort } = require('./helpers/findPort');
 const axios = require('axios');
+const tsx = require('tsx/cjs/api');
 const fs = require('fs');
-const { spawn } = require('child_process');
-
-const hivePackage = require('../package.json');
-
-let appPackage = {
-  "name": "my-hive-app",
-  "version": "1.0.0",
-  "description": "Hive App",
-  "main": "src/app.js",
-  "scripts": {
-    "prepare": "hive prepare ./src",
-    "dev": "hive prepare ./src && HIVE_SRC=$PWD/src npm -C .hive run dev",
-    "start": "hive prepare ./src && HIVE_SRC=$PWD/src npm -C .hive run start",
-    "deploy-local": "hive build-local && hive deploy"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@paralect/hive": hivePackage.version,
-  },
-  "devDependencies": {
-    "nodemon": "^3.1.4"
+
+program
+  .version(require('../package.json').version, '-v, --version');
+
+function generateDbTypesFile(hiveSrc, frameworkDir, hiveProjectDir) {
+  // Write to .hive/src/_generated/ (NOT $HIVE_SRC) to avoid triggering tsx watcher
+  const generatedDir = path.resolve(hiveProjectDir, 'src', '_generated');
+
+  if (!fs.existsSync(generatedDir)) {
+    fs.mkdirSync(generatedDir, { recursive: true });
+  }
+
+  // Scan for schema files in user resources and framework resources
+  const schemas = [];
+  const scanDirs = [
+    { dir: path.resolve(hiveSrc, 'resources'), isUser: true },
+    { dir: path.resolve(frameworkDir, 'src', 'resources'), isUser: false },
+  ];
+
+  for (const { dir: resourcesDir, isUser } of scanDirs) {
+    if (!fs.existsSync(resourcesDir)) continue;
+
+    for (const resourceName of fs.readdirSync(resourcesDir)) {
+      const resourcePath = path.resolve(resourcesDir, resourceName);
+      if (!fs.statSync(resourcePath).isDirectory()) continue;
+
+      for (const file of fs.readdirSync(resourcePath)) {
+        if ((file.endsWith('.schema.ts') || file.endsWith('.schema.js')) && !file.includes('extends.schema')) {
+          const name = file.replace('.schema.ts', '').replace('.schema.js', '');
+          // Skip if already found (user schemas override framework)
+          if (!schemas.find(s => s.name === name)) {
+            schemas.push({ name, resourceName, isUser });
+          }
+        }
+      }
+    }
   }
+
+  // User schemas use @/ (hive/*), framework schemas use @hive/ (.hive/src/*)
+  const imports = schemas.map(
+    (s) => `import type ${s.name}Schema from '${s.isUser ? '@' : '@hive'}/resources/${s.resourceName}/${s.name}.schema';`
+  );
+
+  const entries = schemas.map(
+    (s) => `  ${s.name}: MongoService<z.infer<typeof ${s.name}Schema>>;`
+  );
+
+  const content = `// Auto-generated by Hive — do not edit manually
+import type { z } from 'zod';
+import type MongoService from '@hive/lib/node-mongo/src/mongo-service';
+${imports.join('\n')}
+
+export interface DbServices {
+${entries.join('\n')}
+}
+`;
+
+  fs.writeFileSync(path.resolve(generatedDir, 'db.types.ts'), content);
+  console.log('[hive] Generated db.types.ts');
 }
 
 program
   .command('init [projectName]')
   .description('Initialize a new Hive project')
-  .action(async (projectName) => {
+  .option('--skip-install', 'Skip npm install')
+  .option('--link', 'Use local file:.. dependency for @paralect/hive (for development)')
+  .action(async (projectName, options) => {
     try {
       let name = projectName;
 
@@ -58,41 +93,47 @@ program
       }
 
       const projectDir = path.resolve(process.cwd(), name);
+      const hiveVersion = require('../package.json').version;
 
       console.log(`\n🐝 Creating Hive project: ${name}\n`);
 
-      await execCommand(`mkdir -p ${projectDir}/src/resources`);
-      await execCommand(`mkdir -p ${projectDir}/src/middlewares`);
-      await execCommand(`mkdir -p ${projectDir}/src/services`);
-      await execCommand(`mkdir -p ${projectDir}/src/scheduler/handlers`);
+      const filesDir = path.resolve(__dirname, '../starter');
+      await execCommand(`cp -r ${filesDir}/. ${projectDir}/`);
 
-      fs.writeFileSync(
-        path.join(projectDir, 'package.json'),
-        JSON.stringify({
-          name,
-          ...appPackage
+      // Rename .env.example to .env (stored as .example to avoid gitignore)
+      const envExample = path.join(projectDir, 'hive', 'config', '.env.example');
+      const envFile = path.join(projectDir, 'hive', 'config', '.env');
+      if (fs.existsSync(envExample)) {
+        fs.renameSync(envExample, envFile);
+      }
 
-        }, null, 2)
-      );
+      const templateFiles = ['package.json'];
+      const replacements = {
+        '{{PROJECT_NAME}}': name,
+        '{{HIVE_DEP}}': options.link ? `file:${path.relative(projectDir, path.resolve(__dirname, '..'))}` : `^${hiveVersion}`,
+      };
+
+      for (const file of templateFiles) {
+        const filePath = path.join(projectDir, file);
+        let content = fs.readFileSync(filePath, 'utf-8');
+        for (const [key, value] of Object.entries(replacements)) {
+          content = content.replaceAll(key, value);
+        }
+        fs.writeFileSync(filePath, content);
+      }
 
-      const redisDb = hashCode(name) % 16;
-      const appConfigDir = path.join(projectDir, 'src', 'app-config');
-      await execCommand(`mkdir -p ${appConfigDir}`);
-      fs.writeFileSync(
-        path.join(appConfigDir, '.env'),
-        `MONGODB_URI=mongodb://localhost:27027/${name}\nREDIS_URI=redis://localhost:6389/${redisDb}\nPORT=3001\nNODE_ENV=development\n`
-      );
+      const projectPkgPath = path.join(projectDir, 'package.json');
+      const projectPkg = JSON.parse(fs.readFileSync(projectPkgPath, 'utf-8'));
+      fs.writeFileSync(projectPkgPath, JSON.stringify(projectPkg, null, 2));
 
-      fs.writeFileSync(
-        path.join(projectDir, '.gitignore'),
-        `node_modules\n.hive\n.env\nsrc/app-config/.env\n`
-      );
+      await execCommand(`cp -r ${path.resolve(__dirname, '..')}/framework/.cursor ${projectDir}/`);
 
-      await execCommand(`cp -r ${path.resolve(__dirname, '..')}/starter/.cursor ${projectDir}/`);
+      if (!options.skipInstall) {
+        await execCommand(`npm install`, { cwd: projectDir });
+      }
 
       console.log(`✅ Project created!\n`);
       console.log(`Next steps:\n`);
-      console.log(`  cd ${name}`);
       console.log(`  hive run ./src\n`);
       console.log(`Start building with AI commands:`);
       console.log(`  add-resource tasks`);
@@ -102,62 +143,21 @@ program
     }
   });
 
-program
-  .command('infra-docker')
-  .description('Start shared MongoDB and Redis containers for local development')
-  .action(async () => {
-    try {
-      if (!isDockerInstalled()) {
-        console.error('Docker is not installed or not running. Please install Docker first.');
-        process.exit(1);
-      }
-
-      console.log('\nStarting Hive infrastructure...\n');
-
-      await startMongo();
-      await startRedis();
-
-      console.log('\n✅ Infrastructure ready!\n');
-      console.log('Connection URIs:');
-      console.log('  MongoDB: mongodb://localhost:27027/<your-db-name>');
-      console.log('  Redis:   redis://localhost:6389/<db-number>\n');
-      console.log('These containers are shared across all Hive projects.');
-      console.log('Each project uses a unique database name for isolation.\n');
-    } catch (error) {
-      console.error('An error occurred:', error.message);
-    }
-  });
-
 program
   .command('run [dirPath]')
   .description('Run Hive server')
   .action(async (dirPath = '.') => {
     try {
-      const hiveSrc = path.resolve(process.cwd(), dirPath);
-      const projectDir = path.resolve(hiveSrc, '..');
-      const hiveProjectDir = path.resolve(projectDir, '.hive');
-
-      // Ensure env config exists in hive_src/app-config/.env
-      await ensureEnvConfig(hiveSrc);
-
-      // Find available port
-      const defaultPort = parseInt(process.env.PORT) || 3001;
-      const port = await findAvailablePort(defaultPort);
-      if (port !== defaultPort) {
-        console.log(`  Port ${defaultPort} in use, using ${port} instead\n`);
-      }
+      process.env.HIVE_SRC = path.resolve(process.cwd(), dirPath);
 
+      const hiveProjectDir = path.resolve(process.env.HIVE_SRC, `../.hive`);
       await execCommand(`mkdir -p ${hiveProjectDir}`);
-      await execCommand(`rsync -a --exclude node_modules ${path.resolve(__dirname, '..')}/starter/ ${hiveProjectDir}/`);
+      await execCommand(`cp -r ${path.resolve(__dirname, '..')}/framework/ ${hiveProjectDir}`);
 
-      const child = spawn('npx', ['tsx', '--watch', '--import', './register.mjs', 'src/app.js'], {
-        cwd: hiveProjectDir,
-        stdio: 'inherit',
-        env: { ...process.env, HIVE_SRC: hiveSrc, PORT: String(port) }
-      });
+      // Generate types before starting the server
+      generateDbTypesFile(process.env.HIVE_SRC, path.resolve(__dirname, '..', 'framework'), hiveProjectDir);
 
-      child.on('error', (err) => console.error('Failed to start:', err.message));
-      child.on('close', (code) => process.exit(code));
+      tsx.require(`${hiveProjectDir}/src/app.ts`, __filename); // TSX doesn't work inside node_moduels
     } catch (error) {
       console.error('An error occurred:', error.message);
     }
@@ -168,15 +168,15 @@ program
   .description('Prepare Hive server')
   .action(async (dirPath = '.') => {
     try {
-      const hiveSrc = path.resolve(process.cwd(), dirPath);
-      const projectDir = path.resolve(hiveSrc, '..');
-      const hiveProjectDir = path.resolve(projectDir, '.hive');
-
-      // Ensure env config exists in hive_src/app-config/.env
-      await ensureEnvConfig(hiveSrc);
+      process.env.HIVE_SRC = path.resolve(process.cwd(), dirPath);
+      const hiveProjectDir = path.resolve(process.env.HIVE_SRC, `../.hive`);
 
       await execCommand(`mkdir -p ${hiveProjectDir}`);
-      await execCommand(`rsync -a --exclude node_modules ${path.resolve(__dirname, '..')}/starter/ ${hiveProjectDir}/`);
+      await execCommand(`cp -r ${path.resolve(__dirname, '..')}/framework/. ${hiveProjectDir}`);
+      await execCommand(`npm install --prefix ${hiveProjectDir}`);
+
+      // Generate db.types.ts from discovered schemas
+      generateDbTypesFile(process.env.HIVE_SRC, path.resolve(__dirname, '..', 'framework'), hiveProjectDir);
     } catch (error) {
       console.error('An error occurred:', error.message);
     }

package/{test-app → framework}/.cursor/commands/add-service.md

@@ -36,7 +36,7 @@ When creating a service, use these go-to libraries:
 ## Template
 
 ```javascript
-import config from 'app-config';
+import config from 'config';
 
 // Initialize client here
 
@@ -52,7 +52,7 @@ export default {
 ### `add-service slack sendChannelMessage, replyToThread`
 
 ```javascript
-import config from 'app-config';
+import config from 'config';
 import { WebClient } from '@slack/web-api';
 
 const client = new WebClient(config.slack.botToken);
@@ -73,7 +73,7 @@ export default {
 ### `add-service stripe createCustomer, createPaymentIntent, listInvoices`
 
 ```javascript
-import config from 'app-config';
+import config from 'config';
 import Stripe from 'stripe';
 
 const client = new Stripe(config.stripe.secretKey);
@@ -102,7 +102,7 @@ export default {
 ### `add-service openai chat, generateImage`
 
 ```javascript
-import config from 'app-config';
+import config from 'config';
 import OpenAI from 'openai';
 
 const client = new OpenAI({ apiKey: config.openai.apiKey });
@@ -125,7 +125,7 @@ export default {
 ### `add-service sendgrid sendEmail, sendTemplateEmail`
 
 ```javascript
-import config from 'app-config';
+import config from 'config';
 import sgMail from '@sendgrid/mail';
 
 sgMail.setApiKey(config.sendgrid.apiKey);
@@ -144,7 +144,7 @@ export default {
 ### `add-service s3 upload, getSignedUrl, delete`
 
 ```javascript
-import config from 'app-config';
+import config from 'config';
 import { S3Client, PutObjectCommand, GetObjectCommand, DeleteObjectCommand } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 

package/{test-app → framework}/.cursor/skills/hive-overview/SKILL.md

@@ -39,7 +39,7 @@ src/resources/{name}/
 
 ```javascript
 import db from 'db';                    // Database
-import config from 'app-config';        // Config
+import config from 'config';        // Config
 import { z } from 'zod';                // Validation
 ```
 

package/{test-app → framework}/.cursor/skills/hive-service/SKILL.md

@@ -15,7 +15,7 @@ Location: `/src/services/{name}.js`
 ## API Client Template
 
 ```javascript
-import config from 'app-config';
+import config from 'config';
 import axios from 'axios';
 
 const client = axios.create({
@@ -41,7 +41,7 @@ export default {
 ## SDK Wrapper Template
 
 ```javascript
-import config from 'app-config';
+import config from 'config';
 import { WebClient } from '@slack/web-api';
 
 const client = new WebClient(config.slack.botToken);

package/framework/bin/start.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+docker compose up --build

package/{.hive/bootstrap-hive.js → framework/bootstrap-hive.ts}

@@ -58,7 +58,7 @@ function generateProjectStructure(resources) {
       resource.schemas.forEach((schema) => {
         const schemaCode = convertJsonToJs(schema);
         fs.writeFileSync(
-          path.join(schemaDir, `${schema.name.toLowerCase()}.schema.js`),
+          path.join(schemaDir, `${schema.name.toLowerCase()}.schema.ts`),
           schemaCode
         );
       });
@@ -71,7 +71,7 @@ function generateProjectStructure(resources) {
       resource.endpoints.forEach((endpoint) => {
         const endpointCode = createEndpointCode(endpoint);
         fs.writeFileSync(
-          path.join(endpointDir, `${endpoint.name}.js`),
+          path.join(endpointDir, `${endpoint.name}.ts`),
           endpointCode
         );
       });
@@ -84,7 +84,7 @@ function generateProjectStructure(resources) {
       resource.handlers.forEach((handler) => {
         const handlerCode = handler.handler;
         fs.writeFileSync(
-          path.join(handlerDir, `${handler.name}.js`),
+          path.join(handlerDir, `${handler.name}.ts`),
           handlerCode
         );
       });
@@ -96,7 +96,7 @@ function generateProjectStructure(resources) {
       mkdirRecursive(methodDir);
       resource.methods.forEach((method) => {
         const methodCode = method.handler;
-        fs.writeFileSync(path.join(methodDir, `${method.name}.js`), methodCode);
+        fs.writeFileSync(path.join(methodDir, `${method.name}.ts`), methodCode);
       });
     }
   });