@postxl/cli 1.0.9 → 1.0.11

package/dist/create-project/create-project.generator.d.ts

@@ -1,12 +1,10 @@
-import { ProjectSchemaName, ProjectSlug } from '@postxl/schema';
+import { ProjectSchemaName, ProjectSlug, ProjectType } from '@postxl/schema';
 import { ProjectPath } from '../create-project.command';
 export type CreateProjectOptions = {
     name: ProjectSchemaName;
     slug: ProjectSlug;
     schema: object & {
-        projectType?: {
-            kind: string;
-        };
+        projectType?: ProjectType;
     };
     projectPath: ProjectPath;
 };

package/dist/create-project/create-project.generator.js

@@ -136,10 +136,7 @@ async function createProject(options) {
         ...schema,
         name,
         slug,
-        projectType: {
-            kind: projectPath.kind,
-            projectDirectory: projectPath.projectGenerationPath,
-        },
+        projectType: projectPath.kind,
     };
     // Write source files directly to disk (not tracked as generated files)
     // These are the files that define the project, not generated output

package/dist/generate.command.js

@@ -38,9 +38,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = register;
 const child_process_1 = require("child_process");
-const fs = __importStar(require("fs/promises"));
 const util_1 = require("util");
 const dotenv_1 = __importDefault(require("dotenv"));
+const fs = __importStar(require("node:fs/promises"));
 const path = __importStar(require("node:path"));
 const zod_validation_error_1 = require("zod-validation-error");
 const generator_1 = require("@postxl/generator");
@@ -78,7 +78,7 @@ This reads the schema from ${(0, utils_1.yellow)('schema.json')} and runs the ge
         const envConfig = dotenv_1.default.config({ path: path.join(projectPath, '.env') });
         const localGenerators = await getLocalGenerators({ program, projectPath });
         const schema = await getSchema({ program, projectPath });
-        targetPath = resolveTargetPath({
+        targetPath = await resolveTargetPath({
             projectPath,
             targetPath,
             envTargetPath: process.env.PXL_PROJECT_PATH ?? envConfig.parsed?.PXL_PROJECT_PATH,
@@ -238,15 +238,32 @@ async function getSchema(params) {
     }
     return schema.data;
 }
-function resolveTargetPath({ projectPath, targetPath, envTargetPath, schemaSlug, projectType, }) {
+/**
+ * Checks if the current projectPath is within the PostXL monorepo workspace
+ * by verifying if '../../packages/cli' exists relative to the project path.
+ */
+async function isInPostxlWorkspace(projectPath) {
+    const cliPath = path.resolve(projectPath, '..', '..', 'packages', 'cli');
+    try {
+        await fs.access(cliPath);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function resolveTargetPath({ projectPath, targetPath, envTargetPath, schemaSlug, projectType, }) {
     let resolved = targetPath ?? envTargetPath;
     if (!resolved) {
-        if (projectType.kind === 'workspace') {
+        if (projectType === 'workspace') {
             resolved = projectPath;
         }
-        else {
+        else if (await isInPostxlWorkspace(projectPath)) {
             const repositoryRoot = path.join(projectPath, '..', '..');
-            resolved = path.resolve(repositoryRoot, '..', schemaSlug);
+            resolved = path.resolve(repositoryRoot, 'projects', schemaSlug);
+        }
+        else {
+            resolved = projectPath;
         }
     }
     if (resolved.startsWith('.') || !path.isAbsolute(resolved)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/cli",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Command-line interface for PostXL code generation framework",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -44,9 +44,9 @@
     "commander": "12.1.0",
     "dotenv": "16.4.7",
     "zod-validation-error": "3.4.0",
-    "@postxl/generator": "^1.0.5",
-    "@postxl/generators": "^1.0.6",
-    "@postxl/schema": "^1.0.1",
+    "@postxl/generator": "^1.0.6",
+    "@postxl/generators": "^1.0.8",
+    "@postxl/schema": "^1.0.2",
     "@postxl/utils": "^1.0.0"
   },
   "devDependencies": {},