@idealyst/cli 1.0.26 → 1.0.28

package/dist/index.js

@@ -52,7 +52,10 @@ async function copyTemplate(templatePath, destPath, data) {
         await fs.copy(templatePath, destPath, {
             filter: (src) => {
                 const relativePath = path.relative(templatePath, src);
-                return !relativePath.includes('node_modules') && !relativePath.includes('.git');
+                // Skip App-with-trpc.tsx as it's only copied when tRPC is enabled
+                return !relativePath.includes('node_modules') &&
+                    !relativePath.includes('.git') &&
+                    !relativePath.endsWith('App-with-trpc.tsx');
             }
         });
         // Process template files
@@ -134,10 +137,15 @@ function runCommand(command, args, options) {
         });
     });
 }
-function getTemplateData(projectName, description, appName) {
+function getTemplateData(projectName, description, appName, workspaceScope) {
+    let packageName = createPackageName(projectName);
+    // If we have a workspace scope, prefix the package name with it
+    if (workspaceScope) {
+        packageName = `@${workspaceScope}/${packageName}`;
+    }
     return {
         projectName,
-        packageName: createPackageName(projectName),
+        packageName,
         version: '1.0.0',
         description: description || `A new Idealyst project: ${projectName}`,
         appName
@@ -159,6 +167,22 @@ async function isWorkspaceRoot(directory) {
     }
     return false;
 }
+/**
+ * Gets the workspace name from the workspace root's package.json
+ */
+async function getWorkspaceName(directory) {
+    const packageJsonPath = path.join(directory, 'package.json');
+    if (await fs.pathExists(packageJsonPath)) {
+        try {
+            const packageJson = await fs.readJSON(packageJsonPath);
+            return packageJson.name || null;
+        }
+        catch (error) {
+            return null;
+        }
+    }
+    return null;
+}
 /**
  * Resolves the correct project path for individual projects (native, web, shared).
  * Individual projects can ONLY be created within an existing workspace.
@@ -172,12 +196,15 @@ async function resolveProjectPath(projectName, directory) {
             `Please first create a workspace with: idealyst init my-workspace\n` +
             `Then navigate to the workspace directory and create your project.`);
     }
+    // Get the workspace name to use as scope
+    const workspaceScope = await getWorkspaceName(directory);
     // Create project in workspace's packages/ folder
     const packagesDir = path.join(directory, 'packages');
     await fs.ensureDir(packagesDir);
     return {
         projectPath: path.join(packagesDir, projectName),
-        workspacePath: `packages/${projectName}`
+        workspacePath: `packages/${projectName}`,
+        workspaceScope
     };
 }
 async function initializeReactNativeProject(projectName, directory, displayName, skipInstall) {
@@ -219,9 +246,11 @@ async function overlayIdealystFiles(templatePath, projectPath, data) {
             filter: (src) => {
                 const relativePath = path.relative(templatePath, src);
                 // Skip package.json as we'll merge it separately
+                // Skip App-with-trpc.tsx as it's only copied when tRPC is enabled
                 return !relativePath.includes('node_modules') &&
                     !relativePath.includes('.git') &&
-                    !relativePath.endsWith('package.json');
+                    !relativePath.endsWith('package.json') &&
+                    !relativePath.endsWith('App-with-trpc.tsx');
             }
         });
         // Process template files
@@ -444,6 +473,7 @@ var utils = /*#__PURE__*/Object.freeze({
   copyTrpcFiles: copyTrpcFiles,
   createPackageName: createPackageName,
   getTemplateData: getTemplateData,
+  getWorkspaceName: getWorkspaceName,
   initializeReactNativeProject: initializeReactNativeProject,
   installDependencies: installDependencies,
   isWorkspaceRoot: isWorkspaceRoot,
@@ -472,9 +502,9 @@ async function generateNativeProject(options) {
     const displayName = appName || name.split('-').map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(' ');
     console.log(chalk.blue(`📱 Creating React Native project: ${name}`));
     console.log(chalk.gray(`   App display name: ${displayName}`));
-    const { projectPath, workspacePath } = await resolveProjectPath(name, directory);
+    const { projectPath, workspacePath, workspaceScope } = await resolveProjectPath(name, directory);
     const templatePath = path.join(__dirname$4, '..', 'templates', 'native');
-    const templateData = getTemplateData(name, `React Native app built with Idealyst Framework`, displayName);
+    const templateData = getTemplateData(name, `React Native app built with Idealyst Framework`, displayName, workspaceScope || undefined);
     try {
         // Step 1: Update workspace configuration FIRST (before React Native CLI)
         await updateWorkspacePackageJson(workspacePath, directory);
@@ -530,9 +560,9 @@ async function generateWebProject(options) {
         throw new Error(`Invalid project name: ${name}`);
     }
     console.log(chalk.blue(`🌐 Creating React Web project: ${name}`));
-    const { projectPath, workspacePath } = await resolveProjectPath(name, directory);
+    const { projectPath, workspacePath, workspaceScope } = await resolveProjectPath(name, directory);
     const templatePath = path.join(__dirname$3, '..', 'templates', 'web');
-    const templateData = getTemplateData(name, `React web app built with Idealyst Framework`);
+    const templateData = getTemplateData(name, `React web app built with Idealyst Framework`, undefined, workspaceScope || undefined);
     await copyTemplate(templatePath, projectPath, templateData);
     // Handle tRPC setup
     if (withTrpc) {
@@ -569,9 +599,9 @@ async function generateSharedLibrary(options) {
         throw new Error(`Invalid project name: ${name}`);
     }
     console.log(chalk.blue(`📦 Creating shared library: ${name}`));
-    const { projectPath, workspacePath } = await resolveProjectPath(name, directory);
+    const { projectPath, workspacePath, workspaceScope } = await resolveProjectPath(name, directory);
     const templatePath = path.join(__dirname$2, '..', 'templates', 'shared');
-    const templateData = getTemplateData(name, `Shared library built with Idealyst Framework`);
+    const templateData = getTemplateData(name, `Shared library built with Idealyst Framework`, undefined, workspaceScope || undefined);
     await copyTemplate(templatePath, projectPath, templateData);
     await installDependencies(projectPath, skipInstall);
     await updateWorkspacePackageJson(workspacePath, directory);
@@ -614,9 +644,9 @@ async function generateApiProject(options) {
         throw new Error(`Invalid project name: ${name}`);
     }
     console.log(chalk.blue(`🚀 Creating API project: ${name}`));
-    const { projectPath, workspacePath } = await resolveProjectPath(name, directory);
+    const { projectPath, workspacePath, workspaceScope } = await resolveProjectPath(name, directory);
     const templatePath = path.join(__dirname, '..', 'templates', 'api');
-    const templateData = getTemplateData(name, `Clean API server template with tRPC, Prisma, and Zod`);
+    const templateData = getTemplateData(name, `Clean API server template with tRPC, Prisma, and Zod`, undefined, workspaceScope || undefined);
     await copyTemplate(templatePath, projectPath, templateData);
     await installDependencies(projectPath, skipInstall);
     await updateWorkspacePackageJson(workspacePath, directory);

package/dist/types/generators/utils.d.ts

@@ -9,11 +9,15 @@ export declare function installDependencies(projectPath: string, skipInstall?: b
 export declare function runCommand(command: string, args: string[], options: {
     cwd: string;
 }): Promise<void>;
-export declare function getTemplateData(projectName: string, description?: string, appName?: string): TemplateData;
+export declare function getTemplateData(projectName: string, description?: string, appName?: string, workspaceScope?: string): TemplateData;
 /**
  * Detects if we're in a workspace root directory
  */
 export declare function isWorkspaceRoot(directory: string): Promise<boolean>;
+/**
+ * Gets the workspace name from the workspace root's package.json
+ */
+export declare function getWorkspaceName(directory: string): Promise<string | null>;
 /**
  * Resolves the correct project path for individual projects (native, web, shared).
  * Individual projects can ONLY be created within an existing workspace.
@@ -22,6 +26,7 @@ export declare function isWorkspaceRoot(directory: string): Promise<boolean>;
 export declare function resolveProjectPath(projectName: string, directory: string): Promise<{
     projectPath: string;
     workspacePath: string;
+    workspaceScope: string | null;
 }>;
 export declare function initializeReactNativeProject(projectName: string, directory: string, displayName?: string, skipInstall?: boolean): Promise<void>;
 export declare function overlayIdealystFiles(templatePath: string, projectPath: string, data: TemplateData): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idealyst/cli",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "CLI tool for generating Idealyst Framework projects",
   "type": "module",
   "main": "dist/index.js",

package/templates/api/package.json

@@ -4,6 +4,13 @@
   "description": "{{description}}",
   "type": "module",
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
   "scripts": {
     "build": "tsc",
     "dev": "tsx watch src/server.ts",

package/templates/native/src/App-with-trpc.tsx

@@ -1,22 +1,9 @@
 import React from 'react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { httpBatchLink } from '@trpc/client';
-import { UnistylesRegistry } from 'react-native-unistyles';
 import { Screen, Text, View } from '@idealyst/components';
-import { breakpoints, lightTheme, darkTheme } from '@idealyst/theme';
 import { trpc } from './utils/trpc';
 
-// Register the Unistyles themes and breakpoints
-UnistylesRegistry
-  .addBreakpoints(breakpoints)
-  .addThemes({
-    light: lightTheme,
-    dark: darkTheme,
-  })
-  .addConfig({
-    adaptiveThemes: true,
-  });
-
 // Create tRPC client
 const queryClient = new QueryClient();
 

package/templates/native/src/utils/trpc.ts

@@ -57,7 +57,7 @@ function App() {
   return (
     <trpc.Provider client={trpcClient} queryClient={queryClient}>
       <QueryClientProvider client={queryClient}>
-        {/* Your app components */}
+       // Your app components
       </QueryClientProvider>
     </trpc.Provider>
   );

package/templates/web/src/App-with-trpc.tsx

@@ -1,22 +1,9 @@
 import React from 'react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { httpBatchLink } from '@trpc/client';
-import { UnistylesRegistry } from 'react-native-unistyles';
 import { BrowserRouter, Routes, Route } from 'react-router-dom';
 import { trpc } from './utils/trpc';
 import { Screen, Text, View } from '@idealyst/components';
-import { breakpoints, lightTheme, darkTheme } from '@idealyst/theme';
-
-// Register the Unistyles themes and breakpoints
-UnistylesRegistry
-  .addBreakpoints(breakpoints)
-  .addThemes({
-    light: lightTheme,
-    dark: darkTheme,
-  })
-  .addConfig({
-    adaptiveThemes: true,
-  });
 
 // Create tRPC client
 const queryClient = new QueryClient();

package/templates/web/src/utils/trpc.ts

@@ -55,7 +55,7 @@ function App() {
   return (
     <trpc.Provider client={trpcClient} queryClient={queryClient}>
       <QueryClientProvider client={queryClient}>
-        {/* Your app components */}
+        // Your app components
       </QueryClientProvider>
     </trpc.Provider>
   );