@vexblocks/cli 1.0.4 → 1.0.6

package/dist/index.js

@@ -29,6 +29,11 @@ var PACKAGE_NAMES = {
   types: "Type Generator"
 };
 var MANAGED_PACKAGES = ["cms", "shared", "types"];
+var PROTECTED_FILES = [
+  "packages/backend/vexblocks.config.ts",
+  "packages/backend/.env",
+  "packages/backend/.env.local"
+];
 var PACKAGE_DEPENDENCIES = {
   cms: ["backend", "shared"],
   backend: [],
@@ -110,7 +115,10 @@ async function fetchFile(filePath) {
   }
   return response.text();
 }
-async function downloadFile(remotePath, localPath) {
+async function downloadFile(remotePath, localPath, options) {
+  if (options?.skipIfExists && await fs2.pathExists(localPath)) {
+    return;
+  }
   const url = `${GITHUB_RAW_URL}/${remotePath}`;
   const response = await fetch(url);
   if (!response.ok) {
@@ -138,8 +146,13 @@ async function downloadAndExtractPackage(packagePath, targetDir, onProgress) {
   for (const file of files) {
     const relativePath = file.path.slice(packagePath.length + 1);
     const localPath = path2.join(targetDir, relativePath);
+    const isProtectedFile = PROTECTED_FILES.some(
+      (protectedPath) => file.path.endsWith(protectedPath)
+    );
     onProgress?.(relativePath);
-    await downloadFile(file.path, localPath);
+    await downloadFile(file.path, localPath, {
+      skipIfExists: isProtectedFile
+    });
   }
 }
 async function getPackageFiles(packagePath) {
@@ -496,23 +509,7 @@ async function installBackendPackage(targetPath, sourcePath, spinner) {
         }
       }
     }
-    const schemaInstructions = `
-// === VEXBLOCKS CMS ===
-// Add the following imports and tables to your schema:
-//
-// import { cmsSchemaExports } from "./schema.cms"
-//
-// Then add to your defineSchema:
-// export default defineSchema({
-//   ...yourExistingTables,
-//   ...cmsSchemaExports,
-// })
-// === END VEXBLOCKS CMS ===
-`;
-    const existingContent = await fs4.readFile(existingSchemaPath, "utf-8");
-    if (!existingContent.includes("VEXBLOCKS CMS")) {
-      await fs4.appendFile(existingSchemaPath, schemaInstructions);
-    }
+    await mergeSchemaFile(existingSchemaPath, spinner);
   } else {
     await fs4.ensureDir(targetPath);
     await downloadAndExtractPackage(sourcePath, targetPath, (file) => {
@@ -574,6 +571,47 @@ function getOptionalEnvVars(packages) {
   }
   return vars;
 }
+async function mergeSchemaFile(schemaPath, spinner) {
+  const content = await fs4.readFile(schemaPath, "utf-8");
+  if (content.includes('from "./schema.cms"')) {
+    spinner.text = "CMS schema already integrated";
+    return;
+  }
+  spinner.text = "Merging CMS schema into existing schema.ts...";
+  let newContent = content;
+  const importStatement = 'import { cmsSchemaExports } from "./schema.cms"';
+  const hasImport = content.includes(importStatement);
+  if (!hasImport) {
+    const importRegex = /^import\s+.*from\s+['"].*['"];?\s*$/gm;
+    const imports = [...content.matchAll(importRegex)];
+    if (imports.length > 0) {
+      const lastImport = imports[imports.length - 1];
+      const insertPosition = lastImport.index + lastImport[0].length;
+      newContent = newContent.slice(0, insertPosition) + `
+${importStatement}` + newContent.slice(insertPosition);
+    } else {
+      newContent = `${importStatement}
+
+${newContent}`;
+    }
+  }
+  const hasSpread = /defineSchema\s*\(\s*\{[^}]*\.\.\.cmsSchemaExports/s.test(
+    newContent
+  );
+  if (!hasSpread) {
+    const defineSchemaRegex = /defineSchema\s*\(\s*\{(\s*)/;
+    if (defineSchemaRegex.test(newContent)) {
+      newContent = newContent.replace(
+        defineSchemaRegex,
+        (_match, whitespace) => {
+          return `defineSchema({${whitespace}// VexBlocks CMS tables${whitespace}...cmsSchemaExports,${whitespace}`;
+        }
+      );
+    }
+  }
+  await fs4.writeFile(schemaPath, newContent, "utf-8");
+  spinner.text = "Successfully merged CMS schema";
+}
 
 // src/commands/diff.ts
 import path5 from "path";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vexblocks/cli",
-	"version": "1.0.4",
+	"version": "1.0.6",
 	"description": "CLI for adding VexBlocks Headless CMS to your Turborepo project",
 	"keywords": [
 		"cms",