@docyrus/cli 0.1.0 → 0.3.0

package/README.md

@@ -2,78 +2,86 @@
 
 Official command-line interface for Docyrus - authentication, project scaffolding, and code generation tools.
 
-## Installation
+## Usage
 
 ```bash
-npm install -g docyrus
-# or
-pnpm add -g docyrus
+npx @docyrus/cli <command>
 ```
 
 ## Commands
 
 ### Authentication
 
-#### `docyrus login`
+#### `login`
 
 Log in to Docyrus using browser-based SSO (default).
 
 ```bash
-docyrus login              # Opens browser for SSO authentication
-docyrus login --email      # Use email/password instead (prompts for credentials)
-docyrus login -e user@example.com  # Pre-fill email address
+npx @docyrus/cli login              # Opens browser for SSO authentication
+npx @docyrus/cli login --email      # Use email/password instead (prompts for credentials)
+npx @docyrus/cli login -e user@example.com  # Pre-fill email address
 ```
 
-#### `docyrus logout`
+#### `logout`
 
 Log out from Docyrus and clear stored credentials.
 
 ```bash
-docyrus logout
+npx @docyrus/cli logout
 ```
 
-#### `docyrus whoami`
+#### `whoami`
 
 Display the currently logged-in user.
 
 ```bash
-docyrus whoami
+npx @docyrus/cli whoami
 # Output: Email: user@example.com
 #         Name: John Doe
 ```
 
 ### Project Creation
 
-#### `docyrus create [name]`
+#### `create [name]`
 
 Create a new Docyrus project from a template.
 
 ```bash
-docyrus create                           # Interactive mode - prompts for all options
-docyrus create my-app                    # Create project with specified name
-docyrus create my-app --nextjs           # Next.js + plain Tailwind
-docyrus create my-app --nextjs --shadcn  # Next.js + shadcn/ui
-docyrus create my-app --react --heroui   # React + HeroUI
-docyrus create my-app --vue --shadcn     # Vue + shadcn-vue
-docyrus create my-app --astro            # Astro + plain Tailwind
-docyrus create my-app --nextjs --shadcn --eslint --pnpm  # Full flags
+npx @docyrus/cli create                           # Interactive mode - prompts for all options
+npx @docyrus/cli create my-app                    # Create project with specified name
+npx @docyrus/cli create my-app --nextjs           # Next.js + plain Tailwind
+npx @docyrus/cli create my-app --nextjs --shadcn  # Next.js + shadcn/ui
+npx @docyrus/cli create my-app --react --heroui   # React + HeroUI
+npx @docyrus/cli create my-app --react --diceui   # React + DiceUI
+npx @docyrus/cli create my-app --vue --shadcn     # Vue + shadcn-vue
+npx @docyrus/cli create my-app --electron --shadcn # Electron + shadcn/ui
+npx @docyrus/cli create my-app --nextjs --shadcn --zustand --eslint --pnpm  # Full flags
 ```
 
 **Framework Options:**
 
 | Flag | Description |
 |------|-------------|
-| `--nextjs` | Use Next.js 15+ (App Router) |
+| `--nextjs` | Use Next.js 16+ (App Router) |
 | `--react` | Use React 19+ with Vite |
-| `--astro` | Use Astro 5+ |
 | `--vue` | Use Vue 3.5+ with Vite |
+| `--electron` | Use Electron + React + Vite |
 
 **UI Library Options (optional - defaults to plain Tailwind if not specified):**
 
-| Flag | Description |
-|------|-------------|
-| `--shadcn` | Use shadcn/ui (React/Next.js) or shadcn-vue (Vue) |
-| `--heroui` | Use HeroUI (React/Next.js only) |
+| Flag | Compatible Frameworks |
+|------|----------------------|
+| `--shadcn` | Next.js, React, Electron (shadcn/ui) / Vue (shadcn-vue) |
+| `--diceui` | Next.js, React, Electron |
+| `--heroui` | Next.js, React |
+
+**State Management Options (optional):**
+
+| Flag | Compatible Frameworks |
+|------|----------------------|
+| `--zustand` | Next.js, React, Electron |
+| `--tanstack-query` | Next.js, React, Electron |
+| `--tanstack-vue-query` | Vue |
 
 **Linter Options:**
 
@@ -98,37 +106,24 @@ docyrus create my-app --nextjs --shadcn --eslint --pnpm  # Full flags
 |--------|-------------|
 | `-p, --path <path>` | Target directory path |
 | `--alias <prefix>` | Custom import alias prefix (must start with @) |
-
-**Available Templates:**
-
-| Template | Description |
-|----------|-------------|
-| `nextjs` | Next.js 15+ + Tailwind CSS v4 |
-| `nextjs-shadcn` | Next.js 15+ + Tailwind CSS v4 + shadcn/ui |
-| `nextjs-heroui` | Next.js 15+ + Tailwind CSS v4 + HeroUI |
-| `react` | React 19+ + Vite + Tailwind CSS v4 |
-| `react-shadcn` | React 19+ + Vite + Tailwind CSS v4 + shadcn/ui |
-| `react-heroui` | React 19+ + Vite + Tailwind CSS v4 + HeroUI |
-| `astro` | Astro 5+ + Tailwind CSS v4 |
-| `vue` | Vue 3.5+ + Vite + Tailwind CSS v4 |
-| `vue-shadcn` | Vue 3.5+ + Vite + Tailwind CSS v4 + shadcn-vue |
+| `--local` | Use local templates (development only) |
 
 Each template includes:
-- Pre-configured OAuth2 authentication pages
+- Pre-configured OAuth2 authentication via `@docyrus/app-auth-ui`
 - Docyrus API client integration
 - Modern TypeScript setup
 - Linter configuration (ESLint or Biome)
 
 ### Code Generation
 
-#### `docyrus generate db [spec]`
+#### `generate db [spec]`
 
 Generate TanStack Query collections from an OpenAPI 3.1.0 specification.
 
 ```bash
-docyrus generate db                           # Auto-detect openapi.json in current directory
-docyrus generate db ./api/openapi.json        # Specify spec file path
-docyrus generate db ./spec.json -o ./src/api  # Custom output directory
+npx @docyrus/cli generate db                           # Auto-detect openapi.json in current directory
+npx @docyrus/cli generate db ./api/openapi.json        # Specify spec file path
+npx @docyrus/cli generate db ./spec.json -o ./src/api  # Custom output directory
 ```
 
 **Options:**
@@ -136,53 +131,23 @@ docyrus generate db ./spec.json -o ./src/api  # Custom output directory
 | Option | Description |
 |--------|-------------|
 | `-o, --output <dir>` | Output directory (defaults to `src` in spec file folder) |
-| `-w, --watch` | Watch for changes in the spec file (coming soon) |
 
 ### CLI Management
 
-#### `docyrus upgrade`
+#### `upgrade`
 
 Upgrade the CLI to the latest version. Automatically detects your package manager (npm, pnpm, yarn, bun).
 
 ```bash
-docyrus upgrade
+npx @docyrus/cli upgrade
 ```
 
-#### `docyrus completion <shell>`
+#### `info`
 
-Generate shell completion script for tab completion support.
+Display CLI version, system information, and authentication status.
 
 ```bash
-# Bash - add to ~/.bashrc
-eval "$(docyrus completion bash)"
-
-# Zsh - add to ~/.zshrc
-eval "$(docyrus completion zsh)"
-
-# Fish - save to completions directory
-docyrus completion fish > ~/.config/fish/completions/docyrus.fish
-```
-
-#### `docyrus info`
-
-Display CLI version, system information, and authentication status. Useful for debugging.
-
-```bash
-docyrus info
-# Output:
-# docyrus v0.0.1
-#
-# System:
-#   Node.js:  v20.10.0
-#   OS:       darwin 23.0.0 (arm64)
-#
-# Environment:
-#   API URL:  https://api.docyrus.com
-#   Config:   /Users/you/.docyrus
-#
-# Authentication:
-#   Status:   Logged in
-#   Email:    user@example.com
+npx @docyrus/cli info
 ```
 
 ## Global Options
@@ -192,42 +157,21 @@ docyrus info
 Output results in JSON format. Useful for scripting and CI/CD pipelines.
 
 ```bash
-docyrus whoami --json
-# Output: {"user": {"email": "user@example.com", "firstname": "John", "lastname": "Doe"}}
-
-docyrus generate db ./spec.json --json
-# Output: {"spec": "./spec.json", "output": "./src", "success": true, "message": "..."}
+npx @docyrus/cli whoami --json
+npx @docyrus/cli generate db ./spec.json --json
 ```
 
 ### `-v, --version`
 
 Display the CLI version.
 
-```bash
-docyrus -v
-# Output: 0.0.1
-```
-
 ### `-h, --help`
 
 Display help information.
 
 ```bash
-docyrus --help
-docyrus login --help
-docyrus generate --help
-docyrus generate db --help
-```
-
-## Auto-Update Notifications
-
-The CLI automatically checks for updates and displays a notification when a new version is available:
-
-```
-┌────────────────────────────────────────────┐
-│  Update available! 0.0.1 → 0.1.0           │
-│  Run npm i -g docyrus to update            │
-└────────────────────────────────────────────┘
+npx @docyrus/cli --help
+npx @docyrus/cli create --help
 ```
 
 ## Environment Variables
@@ -236,7 +180,7 @@ The CLI automatically checks for updates and displays a notification when a new
 |----------|-------------|
 | `DOCYRUS_API_URL` | Override the API base URL |
 | `DOCYRUS_OAUTH_CLIENT_ID` | Override the OAuth2 client ID |
-| `DEBUG` | Enable debug output |
+| `DOCYRUS_OAUTH_SCOPES` | Override the OAuth2 scopes |
 
 ## Token Storage
 

package/dist/cli.js

@@ -11,7 +11,7 @@ import { homedir, arch, release, platform, hostname, userInfo } from 'os';
 import Conf from 'conf';
 import chalk4 from 'chalk';
 import ora from 'ora';
-import { select, input, password } from '@inquirer/prompts';
+import { select, input, password, confirm } from '@inquirer/prompts';
 import { exec } from 'child_process';
 import { promisify } from 'util';
 import { access, constants, writeFile, readFile, mkdir, cp, rm, readdir } from 'fs/promises';
@@ -19,7 +19,7 @@ import { downloadTemplate } from 'giget';
 import { generateFromOpenAPI } from '@docyrus/tanstack-db-generator';
 
 // src/config/constants.ts
-var DOCYRUS_API_URL = "https://alpha-api.docyrus.com";
+var DOCYRUS_API_URL = "https://api.docyrus.com";
 var OAUTH_CLIENT_ID = "90565525-8283-4881-82a9-8613eb82ae27";
 var OAUTH_SCOPES = "offline_access Read.All Users.Read Users.Read.All DS.Read.All".split(" ");
 var OAUTH_CALLBACK_PORT_MIN = 9876;
@@ -991,6 +991,11 @@ var MESSAGES = {
   CREATE_DOWNLOAD_OPENAPI: "Download OpenAPI spec for code generation?",
   CREATE_DOWNLOADING_OPENAPI: "Downloading OpenAPI specification...",
   CREATE_OPENAPI_SUCCESS: (path) => `OpenAPI spec saved to ${path}`,
+  // TanStack DB Generator
+  TANSTACK_GENERATOR_PROMPT: "Generate TanStack Query collections from OpenAPI spec?",
+  TANSTACK_GENERATOR_RUNNING: "Generating TanStack Query collections...",
+  TANSTACK_GENERATOR_SUCCESS: "TanStack Query collections generated",
+  TANSTACK_GENERATOR_FAILED: "Failed to generate TanStack Query collections",
   // Linter Setup
   LINTER_SETUP_TITLE: "Setting up Linter...",
   // State Management
@@ -1454,15 +1459,7 @@ async function applyUIVariants(targetDir, uiLibrary) {
   await rm(variantsDir, { recursive: true, force: true });
 }
 var execAsync = promisify(exec);
-function parseEnvArray(value) {
-  if (!value) {
-    throw new Error("Missing environment variable");
-  }
-  return value.split(",").map((s) => s.trim());
-}
-var SHADCN_BASE_COLORS = parseEnvArray("zinc,slate,neutral,stone,gray");
-parseEnvArray("vega,nova,maia,lyra,mira");
-var DICEUI_COMPONENTS = parseEnvArray("action-bar,avatar-group,badge-overflow,checkbox-group,circular-progress,color-picker,color-swatch,combobox,compare-slider,cropper,editable,file-upload,gauge,kanban,key-value,listbox,mask-input,media-player,mention,phone-input,qr-code,rating,relative-time-card,responsive-dialog,scroll-spy,scroller,segmented-input,sortable,speed-dial,stack,stat,status,stepper,swap,tags-input,time-picker,timeline,tour");
+var DICEUI_COMPONENTS = "action-bar,avatar-group,badge-overflow,checkbox-group,circular-progress,color-picker,color-swatch,combobox,compare-slider,cropper,editable,file-upload,gauge,kanban,key-value,listbox,mask-input,media-player,mention,phone-input,qr-code,rating,relative-time-card,responsive-dialog,scroll-spy,scroller,segmented-input,sortable,speed-dial,stack,stat,status,stepper,swap,tags-input,time-picker,timeline,tour".split(",");
 var UI_LIBRARY_COMPATIBILITY = {
   nextjs: [
     "shadcn",
@@ -1904,6 +1901,7 @@ import { vueQueryOptions } from './lib/query-client';
 
 // src/commands/create.ts
 var execAsync2 = promisify(exec);
+var SHADCN_BASE_COLORS = "zinc,slate,neutral,stone,gray".split(",");
 function validateConflictingFlags(options) {
   const frameworkFlags = [
     options.nextjs,
@@ -2033,8 +2031,8 @@ function getUiLibrariesForFramework(framework) {
   }
 }
 var STATE_MGMT_REACT = [
-  { name: "zustand", label: "Zustand (Recommended)", description: "Lightweight client state" },
-  { name: "tanstack-query", label: "TanStack Query", description: "Server state & data fetching" },
+  { name: "tanstack-query", label: "TanStack Query (Recommended)", description: "Server state & data fetching" },
+  { name: "zustand", label: "Zustand", description: "Lightweight client state" },
   { name: "none", label: "None", description: "No state management" }
 ];
 var STATE_MGMT_VUE = [{ name: "tanstack-vue-query", label: "TanStack Vue Query (Recommended)", description: "Server state & data fetching" }, { name: "none", label: "None", description: "No state management" }];
@@ -2071,7 +2069,7 @@ var PACKAGE_MANAGERS = [
   { name: "yarn", label: "yarn", description: "Fast, reliable, and secure" },
   { name: "bun", label: "bun", description: "All-in-one JavaScript runtime" }
 ];
-var TEMPLATE_REPO_BASE = "Docyrus/docyrus-devkit/packages/cli-templates";
+var TEMPLATE_REPO_BASE = "Docyrus/docyrus-devkit/templates";
 function getTemplateRepo(framework) {
   return `${TEMPLATE_REPO_BASE}/${framework}`;
 }
@@ -2158,12 +2156,11 @@ Examples:
           }))
         });
       } else {
-        const validColors = SHADCN_BASE_COLORS;
         if (options?.baseColor) {
-          if (!validColors.includes(options.baseColor)) {
-            throw new ConflictingFlagsError("--base-color", `must be one of: ${validColors.join(", ")}`);
+          if (!SHADCN_BASE_COLORS.includes(options.baseColor)) {
+            throw new ConflictingFlagsError("--base-color", `must be one of: ${SHADCN_BASE_COLORS.join(", ")}`);
           }
-          baseColor = options.baseColor;
+          ({ baseColor } = options);
         }
       }
     }
@@ -2258,7 +2255,7 @@ Examples:
         MESSAGES.CREATE_COPYING_LOCAL,
         async () => {
           const cliPackageDir = dirname(dirname(fileURLToPath(import.meta.url)));
-          const localTemplateDir = resolve(cliPackageDir, "..", "cli-templates", framework);
+          const localTemplateDir = resolve(cliPackageDir, "..", "..", "templates", framework);
           try {
             await access(localTemplateDir, constants.F_OK);
           } catch {
@@ -2419,6 +2416,7 @@ ${errorMessage}`
     );
     logger.newline();
     logger.log(MESSAGES.OPENAPI_SETUP_TITLE);
+    let openApiDownloaded = false;
     try {
       const savedPath = await withSpinner(
         "Downloading OpenAPI spec...",
@@ -2426,9 +2424,28 @@ ${errorMessage}`
         { successText: "OpenAPI spec downloaded" }
       );
       logger.dim(MESSAGES.CREATE_OPENAPI_SUCCESS(savedPath));
+      openApiDownloaded = true;
     } catch (error) {
       logger.warn(`Failed to download OpenAPI spec: ${error instanceof Error ? error.message : "Unknown error"}`);
     }
+    if (openApiDownloaded) {
+      try {
+        logger.newline();
+        const runGenerator = await confirm({
+          message: MESSAGES.TANSTACK_GENERATOR_PROMPT,
+          default: true
+        });
+        if (runGenerator) {
+          await withSpinner(
+            MESSAGES.TANSTACK_GENERATOR_RUNNING,
+            async () => execAsync2("npx @docyrus/tanstack-db-generator openapi-spec.json", { cwd: targetDir }),
+            { successText: MESSAGES.TANSTACK_GENERATOR_SUCCESS }
+          );
+        }
+      } catch (genError) {
+        logger.warn(`${MESSAGES.TANSTACK_GENERATOR_FAILED}: ${genError instanceof Error ? genError.message : "Unknown error"}`);
+      }
+    }
     logger.newline();
     logger.success(MESSAGES.CREATE_SUCCESS);
     logger.newline();