@idealyst/cli 1.0.36 → 1.0.38

package/dist/templates/database/package.json

@@ -0,0 +1,61 @@
+{
+  "name": "{{packageName}}",
+  "version": "{{version}}",
+  "description": "{{description}}",
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "./client": {
+      "types": "./dist/client.d.ts",
+      "import": "./dist/client.js"
+    },
+    "./schemas": {
+      "types": "./dist/schemas.d.ts",
+      "import": "./dist/schemas.js"
+    }
+  },
+  "scripts": {
+    "build": "tsc",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage",
+    "db:generate": "prisma generate",
+    "db:push": "prisma db push",
+    "db:studio": "prisma studio",
+    "db:migrate": "prisma migrate dev",
+    "db:reset": "prisma migrate reset",
+    "db:seed": "tsx prisma/seed.ts",
+    "lint": "eslint src --ext .ts,.tsx",
+    "lint:fix": "eslint src --ext .ts,.tsx --fix",
+    "type-check": "tsc --noEmit",
+    "dev": "tsx watch src/index.ts"
+  },
+  "dependencies": {
+    "@prisma/client": "^5.7.1",
+    "zod": "^3.22.4"
+  },
+  "devDependencies": {
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.10.4",
+    "@typescript-eslint/eslint-plugin": "^6.13.1",
+    "@typescript-eslint/parser": "^6.13.1",
+    "dotenv": "^16.3.1",
+    "eslint": "^8.54.0",
+    "jest": "^29.7.0",
+    "prisma": "^5.7.1",
+    "ts-jest": "^29.1.2",
+    "tsx": "^4.6.2",
+    "typescript": "^5.3.3"
+  },
+  "keywords": [
+    "database",
+    "prisma",
+    "typescript",
+    "orm"
+  ]
+}

package/dist/templates/{api → database}/prisma/schema.prisma

@@ -18,4 +18,4 @@ datasource db {
 //   name      String?
 //   createdAt DateTime @default(now())
 //   updatedAt DateTime @updatedAt
-// } 
+// }

package/dist/templates/database/prisma/seed.ts

@@ -0,0 +1,28 @@
+import { PrismaClient } from '@prisma/client';
+
+const prisma = new PrismaClient();
+
+async function main() {
+  console.log('🌱 Seeding database...');
+
+  // Add your seed data here
+  // Example:
+  // const user = await prisma.user.create({
+  //   data: {
+  //     email: 'admin@example.com',
+  //     name: 'Admin User',
+  //   },
+  // });
+  // console.log('Created user:', user);
+
+  console.log('✅ Database seeded successfully!');
+}
+
+main()
+  .catch((e) => {
+    console.error('❌ Error seeding database:', e);
+    process.exit(1);
+  })
+  .finally(async () => {
+    await prisma.$disconnect();
+  });

package/dist/templates/database/src/client.ts

@@ -0,0 +1,18 @@
+import { PrismaClient } from '@prisma/client';
+
+declare global {
+  // Prevent multiple instances of Prisma Client in development
+  var __globalPrisma: PrismaClient | undefined;
+}
+
+const prisma =
+  globalThis.__globalPrisma ??
+  new PrismaClient({
+    log: ['query', 'error', 'warn'],
+  });
+
+if (process.env.NODE_ENV !== 'production') {
+  globalThis.__globalPrisma = prisma;
+}
+
+export default prisma;

package/dist/templates/database/src/index.ts

@@ -0,0 +1,11 @@
+// Export Prisma client
+export { PrismaClient } from '@prisma/client';
+
+// Export database client instance
+export { default as db } from './client';
+
+// Export Zod schemas
+export * from './schemas';
+
+// Export types from Prisma
+export type * from '@prisma/client';

package/dist/templates/database/src/schemas.ts

@@ -0,0 +1,26 @@
+import { z } from 'zod';
+
+// Add your Zod schemas here to match your Prisma models
+// Example:
+// export const UserSchema = z.object({
+//   id: z.string().cuid(),
+//   email: z.string().email(),
+//   name: z.string().optional(),
+//   createdAt: z.date(),
+//   updatedAt: z.date(),
+// });
+
+// export const CreateUserSchema = UserSchema.omit({
+//   id: true,
+//   createdAt: true,
+//   updatedAt: true,
+// });
+
+// export const UpdateUserSchema = CreateUserSchema.partial();
+
+// Export all your schemas
+export const schemas = {
+  // user: UserSchema,
+  // createUser: CreateUserSchema,
+  // updateUser: UpdateUserSchema,
+} as const;

package/dist/templates/database/tsconfig.json

@@ -0,0 +1,32 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "lib": ["ES2020"],
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "resolveJsonModule": true,
+    "allowJs": false,
+    "noUncheckedIndexedAccess": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true
+  },
+  "include": [
+    "src/**/*",
+    "prisma/**/*"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist",
+    "__tests__"
+  ]
+}

package/dist/templates/workspace/.devcontainer/Dockerfile

@@ -0,0 +1,23 @@
+FROM node:20-bullseye
+
+# Install additional tools
+RUN apt-get update && apt-get install -y \
+    git \
+    postgresql-client \
+    && rm -rf /var/lib/apt/lists/*
+
+# Enable corepack for yarn
+RUN corepack enable
+
+# Install global tools that might be useful
+RUN npm install -g @expo/cli
+
+# Set up git (will be configured in setup script)
+RUN git config --global init.defaultBranch main
+
+# Create workspace directory
+RUN mkdir -p /workspace
+WORKDIR /workspace
+
+# Keep container running
+CMD ["sleep", "infinity"]

package/dist/templates/workspace/.devcontainer/devcontainer.json

@@ -1,88 +1,10 @@
 {
-  "name": "Idealyst Development Environment",
-  "dockerComposeFile": ["./docker-compose.yml"],
-  "service": "dev",
-  "workspaceFolder": "/app",
-  "shutdownAction": "stopCompose",
+  "name": "Idealyst Development",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/workspace",
 
-  // VS Code configuration
-  "customizations": {
-    "vscode": {
-      "settings": {
-        "terminal.integrated.shell.linux": "/bin/bash",
-        "typescript.preferences.includePackageJsonAutoImports": "auto",
-        "editor.formatOnSave": true,
-        "editor.codeActionsOnSave": {
-          "source.fixAll.eslint": "explicit",
-          "source.organizeImports": "explicit"
-        },
-        "files.watcherExclude": {
-          "**/node_modules/**": true,
-          "**/.git/**": true,
-          "**/dist/**": true,
-          "**/coverage/**": true
-        },
-        "search.exclude": {
-          "**/node_modules": true,
-          "**/dist": true,
-          "**/coverage": true,
-          "**/.yarn": true
-        },
-        "typescript.preferences.importModuleSpecifier": "relative",
-        "jest.jestCommandLine": "yarn test",
-        "jest.autoRun": "off"
-      },
-
-      // Extensions to install
-      "extensions": [
-        "ms-vscode.vscode-typescript-next",
-        "bradlc.vscode-tailwindcss",
-        "esbenp.prettier-vscode",
-        "dbaeumer.vscode-eslint",
-        "ms-vscode.vscode-json",
-        "ms-vscode.test-adapter-converter",
-        "orta.vscode-jest",
-        "ms-vscode.vscode-npm-script",
-        "christian-kohler.path-intellisense",
-        "formulahendry.auto-rename-tag",
-        "bradlc.vscode-tailwindcss",
-        "ms-vscode.vscode-docker",
-        "ms-azuretools.vscode-docker",
-        "redhat.vscode-yaml",
-        "ms-vscode.vscode-markdown",
-        "yzhang.markdown-all-in-one",
-        "davidanson.vscode-markdownlint",
-        "ms-vscode.vscode-git-graph",
-        "eamodio.gitlens",
-        "github.vscode-pull-request-github",
-        "github.copilot",
-        "github.copilot-chat",
-        "ms-vscode.vscode-react-native",
-        "msjsdiag.vscode-react-native"
-      ]
-    }
-  },
-
-  // Development container features
-  "features": {
-    "ghcr.io/devcontainers/features/git:1": {
-      "ppa": true,
-      "version": "latest"
-    },
-    "ghcr.io/devcontainers/features/github-cli:1": {
-      "version": "latest"
-    },
-    "ghcr.io/devcontainers/features/common-utils:2": {
-      "installZsh": true,
-      "configureZshAsDefaultShell": true,
-      "installOhMyZsh": true,
-      "username": "devuser",
-      "userUid": 1001,
-      "userGid": 1001
-    }
-  },
-
-  // Port forwarding for development servers
+  // Forward ports
   "forwardPorts": [
     3000,  // Web dev server
     3001,  // API server
@@ -93,6 +15,7 @@
     6379   // Redis
   ],
 
+  // Port attributes
   "portsAttributes": {
     "3000": {
       "label": "Web App",
@@ -100,41 +23,90 @@
     },
     "3001": {
       "label": "API Server",
-      "onAutoForward": "silent"
+      "onAutoForward": "notify"
     },
     "5173": {
       "label": "Vite Dev Server",
       "onAutoForward": "openBrowser"
     },
+    "8080": {
+      "label": "Additional Dev Server",
+      "onAutoForward": "notify"
+    },
     "19006": {
       "label": "Expo Dev Tools",
       "onAutoForward": "openBrowser"
     },
     "5432": {
-      "label": "PostgreSQL",
+      "label": "PostgreSQL Database",
       "onAutoForward": "silent"
     },
     "6379": {
-      "label": "Redis",
+      "label": "Redis Cache",
       "onAutoForward": "silent"
     }
   },
 
-  // Post-create commands
-  "postCreateCommand": "bash .devcontainer/post-create.sh",
+  // VS Code customizations
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        // React Native/React development
+        "ms-vscode.vscode-react-native",
+        "msjsdiag.vscode-react-native",
+
+        // TypeScript/JavaScript
+        "ms-vscode.vscode-typescript-next",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "bradlc.vscode-tailwindcss",
+
+        // General development
+        "ms-vscode.vscode-json",
+        "redhat.vscode-yaml",
+        "ms-vscode.vscode-docker",
+        "ms-vscode.vscode-markdown",
+        "christian-kohler.path-intellisense",
+        "formulahendry.auto-rename-tag",
 
-  // Development user
-  "remoteUser": "devuser",
+        // Testing
+        "orta.vscode-jest",
+        "ms-vscode.test-adapter-converter",
 
-  // Environment variables
-  "remoteEnv": {
-    "NODE_ENV": "development",
-    "DATABASE_URL": "postgresql://postgres:postgres@postgres:5432/idealyst_db",
-    "REDIS_URL": "redis://redis:6379"
+        // Git
+        "mhutchie.git-graph",
+        "eamodio.gitlens",
+        "github.vscode-pull-request-github",
+        "github.copilot",
+        "github.copilot-chat"
+      ],
+      "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash",
+        "typescript.preferences.includePackageJsonAutoImports": "auto",
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "editor.codeActionsOnSave": {
+          "source.fixAll.eslint": "explicit",
+          "source.organizeImports": "explicit"
+        },
+        "files.watcherExclude": {
+          "**/node_modules/**": true,
+          "**/.git/**": true,
+          "**/dist/**": true,
+          "**/coverage/**": true
+        },
+        "search.exclude": {
+          "**/node_modules": true,
+          "**/dist": true,
+          "**/coverage": true,
+          "**/.yarn": true
+        },
+        "jest.jestCommandLine": "yarn test",
+        "jest.autoRun": "off"
+      }
+    }
   },
 
-  // Mount the workspace with proper permissions
-  "mounts": [
-    "source=${localWorkspaceFolder},target=/app,type=bind,consistency=cached"
-  ]
+  // Post-create command to set up the development environment
+  "postCreateCommand": "bash .devcontainer/setup.sh"
 }

package/dist/templates/workspace/.devcontainer/docker-compose.yml

@@ -2,73 +2,46 @@ services:
   # PostgreSQL Database
   postgres:
     image: postgres:15-alpine
-    container_name: ${PROJECT_NAME:-truday}-postgres
     environment:
-      POSTGRES_DB: ${POSTGRES_DB:-idealyst_db}
-      POSTGRES_USER: ${POSTGRES_USER:-postgres}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
+      POSTGRES_DB: idealyst_db
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
     ports:
-      - "${POSTGRES_PORT:-5432}:5432"
+      - "5432:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
-      - ../docker/postgres/init.sql:/docker-entrypoint-initdb.d/init.sql
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-postgres}"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    networks:
-      - idealyst-network
 
   # Redis Cache
   redis:
     image: redis:7-alpine
-    container_name: ${PROJECT_NAME:-truday}-redis
     ports:
-      - "${REDIS_PORT:-6379}:6379"
+      - "6379:6379"
     volumes:
       - redis_data:/data
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    networks:
-      - idealyst-network
 
   # Development Service (for devcontainer)
-  dev:
+  app:
     build:
-      context: ..
+      context: .
       dockerfile: Dockerfile
-      target: dev
-    container_name: ${PROJECT_NAME:-truday}-dev
     environment:
       NODE_ENV: development
+      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/idealyst_db
+      REDIS_URL: redis://redis:6379
     ports:
-      - "3000:3000"   # Web dev server
-      - "3001:3001"   # API dev server
-      - "5173:5173"   # Vite dev server
-      - "8080:8080"   # Additional dev server
-      - "19006:19006" # Expo dev tools
+      - "3000:3000"
+      - "3001:3001"
+      - "5173:5173"
+      - "8080:8080"
+      - "19006:19006"
     volumes:
-      - ..:/app
-      - /app/node_modules
-      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ..:/workspace
+      - /workspace/node_modules
     depends_on:
-      postgres:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-    networks:
-      - idealyst-network
-    tty: true
-    stdin_open: true
+      - postgres
+      - redis
+    command: sleep infinity
 
 volumes:
   postgres_data:
   redis_data:
-
-networks:
-  idealyst-network:
-    driver: bridge

package/dist/templates/workspace/.devcontainer/post-create.sh

@@ -1,89 +0,0 @@
-#!/bin/bash
-
-# Post-create script for Idealyst dev container
-echo "🚀 Setting up Idealyst development environment..."
-
-# Set proper permissions
-sudo chown -R devuser:devuser /app
-
-# Make scripts executable
-chmod +x /app/scripts/*.sh
-
-# Install dependencies if not already installed
-if [ ! -d "/app/node_modules" ]; then
-    echo "📦 Installing dependencies..."
-    yarn install
-fi
-
-# Set up git configuration (if not already set)
-if [ -z "$(git config --global user.name)" ]; then
-    echo "⚙️ Please configure git:"
-    echo "  git config --global user.name \"Your Name\""
-    echo "  git config --global user.email \"your.email@example.com\""
-fi
-
-# Create environment file if it doesn't exist
-if [ ! -f "/app/.env" ]; then
-    echo "📝 Creating .env file..."
-    cat > /app/.env << EOF
-# Database Configuration
-DATABASE_URL=postgresql://postgres:postgres@postgres:5432/idealyst_db
-POSTGRES_DB=idealyst_db
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=postgres
-
-# Redis Configuration
-REDIS_URL=redis://redis:6379
-
-# API Configuration
-API_PORT=3001
-JWT_SECRET=your-jwt-secret-here
-
-# Web Configuration
-WEB_PORT=3000
-
-# Development Configuration
-NODE_ENV=development
-LOG_LEVEL=debug
-
-# Project Configuration
-PROJECT_NAME={{packageName}}
-EOF
-fi
-
-# Wait for database to be ready
-echo "⏳ Waiting for database to be ready..."
-until pg_isready -h postgres -p 5432 -U postgres; do
-    echo "Database is unavailable - sleeping"
-    sleep 1
-done
-
-echo "✅ Database is ready!"
-
-# Run database migrations if they exist
-if [ -d "/app/packages" ]; then
-    echo "🗄️ Setting up database..."
-    
-    # Check if any package has prisma
-    for package_dir in /app/packages/*/; do
-        if [ -f "${package_dir}prisma/schema.prisma" ]; then
-            echo "Running Prisma setup for $(basename "$package_dir")..."
-            cd "$package_dir"
-            npx prisma generate
-            npx prisma db push
-            cd /app
-        fi
-    done
-fi
-
-# Set up git hooks if husky is present
-if [ -f "/app/package.json" ] && grep -q "husky" /app/package.json; then
-    echo "🐕 Setting up git hooks..."
-    yarn husky install
-fi
-
-# Create helpful aliases
-echo "⚡ Setting up helpful aliases..."
-cat >> ~/.bashrc << EOF
-
-source ~/.bashrc

package/dist/templates/workspace/.devcontainer/setup.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+echo "🚀 Setting up Idealyst development environment..."
+
+# Install dependencies
+echo "📦 Installing dependencies..."
+yarn install
+
+# Create environment file if it doesn't exist
+if [ ! -f ".env" ]; then
+    echo "📝 Creating .env file..."
+    cat > .env << EOF
+# Database Configuration
+DATABASE_URL=postgresql://postgres:postgres@postgres:5432/idealyst_db
+POSTGRES_DB=idealyst_db
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+
+# Redis Configuration
+REDIS_URL=redis://redis:6379
+
+# API Configuration
+API_PORT=3001
+JWT_SECRET=your-jwt-secret-here
+
+# Web Configuration
+WEB_PORT=3000
+
+# Development Configuration
+NODE_ENV=development
+LOG_LEVEL=debug
+
+# Project Configuration
+PROJECT_NAME={{packageName}}
+EOF
+fi
+
+# Wait for database to be ready
+echo "⏳ Waiting for database to be ready..."
+until pg_isready -h postgres -p 5432 -U postgres; do
+    echo "Database is unavailable - sleeping"
+    sleep 1
+done
+
+echo "✅ Database is ready!"
+
+# Run database migrations if they exist
+if [ -d "packages" ]; then
+    echo "🗄️ Setting up database..."
+    
+    # Check if any package has prisma
+    for package_dir in packages/*/; do
+        if [ -f "${package_dir}prisma/schema.prisma" ]; then
+            echo "Running Prisma setup for $(basename "$package_dir")..."
+            cd "$package_dir"
+            npx prisma generate
+            npx prisma db push
+            cd /workspace
+        fi
+    done
+fi
+
+echo "✅ Development environment is ready!"
+echo "🎉 You can now start developing your Idealyst application!"