create-nextblock 0.2.20 → 0.2.22

package/bin/create-nextblock.js

@@ -188,8 +188,9 @@ async function runSetupWizard(projectDir, projectName) {
   clack.note('I will now open your browser to log into Supabase.');
   await runSupabaseCli(['login'], { cwd: projectPath });
 
+  const assetsState = await ensureSupabaseAssets(projectPath, { required: true, resetProjectRef: true });
   clack.note('Now, please select your NextBlock project when prompted.');
-  const linkResult = await runSupabaseCli(['link'], { cwd: projectPath });
+  await runSupabaseCli(['link'], { cwd: projectPath });
   if (process.stdin.isTTY) {
     try {
       process.stdin.setRawMode(false);
@@ -200,8 +201,7 @@ async function runSetupWizard(projectDir, projectName) {
     process.stdin.resume();
   }
 
-  const assetsState = await ensureSupabaseAssets(projectPath, { required: true });
-  let projectId = extractProjectRefFromOutput(linkResult.stdout || '');
+  let projectId = await readSupabaseProjectRef(projectPath);
 
   if (!projectId && assetsState.projectId) {
     projectId = assetsState.projectId;
@@ -719,14 +719,15 @@ SMTP_FROM_NAME=
 }
 
 async function ensureSupabaseAssets(projectDir, options = {}) {
-  const { required = false } = options;
+  const { required = false, resetProjectRef = false } = options;
   const destSupabaseDir = resolve(projectDir, 'supabase');
   await fs.ensureDir(destSupabaseDir);
 
-  const packageSupabaseDir = await resolvePackageSupabaseDir();
+  const { dir: packageSupabaseDir, triedPaths } = await resolvePackageSupabaseDir(projectDir);
   if (!packageSupabaseDir) {
     const message =
-      'Unable to locate supabase assets in @nextblock-cms/db. Please reinstall dependencies and try again.';
+      'Unable to locate supabase assets in @nextblock-cms/db. Please ensure dependencies are installed.' +
+      (triedPaths.length > 0 ? `\nChecked:\n - ${triedPaths.join('\n - ')}` : '');
     if (required) {
       throw new Error(message);
     } else {
@@ -759,31 +760,105 @@ async function ensureSupabaseAssets(projectDir, options = {}) {
     migrationsCopied = true;
   }
 
+  if (resetProjectRef) {
+    const tempDir = resolve(destSupabaseDir, '.temp');
+    const projectRefPath = resolve(tempDir, 'project-ref');
+    if (await fs.pathExists(projectRefPath)) {
+      await fs.writeFile(projectRefPath, '');
+    }
+  }
+
   if (required) {
     if (!configCopied) {
-      throw new Error('Missing supabase/config.toml in the installed @nextblock-cms/db package.');
+      throw new Error(
+        `Missing supabase/config.toml in the installed @nextblock-cms/db package (checked ${packageSupabaseDir}).`,
+      );
     }
     if (!migrationsCopied) {
-      throw new Error('Missing supabase/migrations in the installed @nextblock-cms/db package.');
+      throw new Error(
+        `Missing supabase/migrations in the installed @nextblock-cms/db package (checked ${packageSupabaseDir}).`,
+      );
     }
   }
 
   return { migrationsCopied, configCopied, projectId: detectedProjectId };
 }
 
-async function resolvePackageSupabaseDir() {
-  try {
-    const pkgPath = require.resolve('@nextblock-cms/db/package.json');
-    const pkgDir = dirname(pkgPath);
-    const candidates = [resolve(pkgDir, 'supabase'), resolve(pkgDir, 'lib', 'supabase')];
-    for (const candidate of candidates) {
+async function resolvePackageSupabaseDir(projectDir) {
+  const triedPaths = [];
+  const candidateBases = new Set();
+
+  const installDir = resolve(projectDir, 'node_modules', '@nextblock-cms', 'db');
+  candidateBases.add(installDir);
+
+  const tryResolveFrom = (fromPath) => {
+    try {
+      const resolver = createRequire(fromPath);
+      const pkgPath = resolver.resolve('@nextblock-cms/db/package.json');
+      return dirname(pkgPath);
+    } catch {
+      return null;
+    }
+  };
+
+  const projectPkg = resolve(projectDir, 'package.json');
+  const resolvedProject = tryResolveFrom(projectPkg);
+  if (resolvedProject) {
+    candidateBases.add(resolvedProject);
+    const parent = dirname(resolvedProject);
+    candidateBases.add(parent);
+  }
+
+  const localResolve = tryResolveFrom(__filename);
+  if (localResolve) {
+    candidateBases.add(localResolve);
+    candidateBases.add(dirname(localResolve));
+  }
+
+  candidateBases.add(REPO_ROOT);
+  candidateBases.add(resolve(REPO_ROOT, 'libs', 'db'));
+  candidateBases.add(resolve(REPO_ROOT, 'dist', 'libs', 'db'));
+
+  const candidateSegments = [
+    'supabase',
+    'src/supabase',
+    'dist/supabase',
+    'dist/libs/db/supabase',
+    'dist/lib/supabase',
+    'lib/supabase',
+  ];
+
+  for (const base of Array.from(candidateBases).filter(Boolean)) {
+    for (const segment of candidateSegments) {
+      const candidate = resolve(base, segment);
+      triedPaths.push(candidate);
       if (await fs.pathExists(candidate)) {
-        return candidate;
+        return { dir: candidate, triedPaths };
       }
     }
-  } catch {
-    return null;
   }
+
+  return { dir: null, triedPaths };
+}
+
+async function readSupabaseProjectRef(projectDir) {
+  const configTomlPath = resolve(projectDir, 'supabase', 'config.toml');
+  if (await fs.pathExists(configTomlPath)) {
+    const config = await fs.readFile(configTomlPath, 'utf8');
+    const configMatch = config.match(/project_id\s*=\s*"([^"]+)"/);
+    if (configMatch?.[1] && !configMatch[1].includes('env(')) {
+      return configMatch[1];
+    }
+  }
+
+  const projectRefPath = resolve(projectDir, 'supabase', '.temp', 'project-ref');
+  if (await fs.pathExists(projectRefPath)) {
+    const value = (await fs.readFile(projectRefPath, 'utf8')).trim();
+    if (/^[a-z0-9]{20,}$/i.test(value)) {
+      return value;
+    }
+  }
+
   return null;
 }
 
@@ -1282,22 +1357,7 @@ async function runSupabaseCli(args, options = {}) {
     const child = spawn('npx', ['supabase', ...args], {
       cwd,
       shell: IS_WINDOWS,
-      stdio: ['inherit', 'pipe', 'pipe'],
-    });
-
-    let stdout = '';
-    let stderr = '';
-
-    child.stdout?.on('data', (chunk) => {
-      const text = chunk.toString();
-      stdout += text;
-      process.stdout.write(text);
-    });
-
-    child.stderr?.on('data', (chunk) => {
-      const text = chunk.toString();
-      stderr += text;
-      process.stderr.write(text);
+      stdio: 'inherit',
     });
 
     child.on('error', (error) => {
@@ -1306,7 +1366,7 @@ async function runSupabaseCli(args, options = {}) {
 
     child.on('close', (code) => {
       if (code === 0) {
-        resolve({ stdout, stderr });
+        resolve();
       } else {
         reject(new Error(`supabase ${args.join(' ')} exited with code ${code}`));
       }
@@ -1314,33 +1374,6 @@ async function runSupabaseCli(args, options = {}) {
   });
 }
 
-function extractProjectRefFromOutput(output) {
-  const sanitized = stripAnsiCodes(output);
-  const regexes = [
-    /project(?:\s+ref(?:erence)?)?\s*[:=]\s*([a-z0-9]{20,})/i,
-    /project_ref\s*[:=]\s*([a-z0-9]{20,})/i,
-    /\(ref:\s*([a-z0-9]{20,})\s*\)/i,
-  ];
-
-  for (const regex of regexes) {
-    const match = sanitized.match(regex);
-    if (match?.[1]) {
-      return match[1];
-    }
-  }
-
-  const fallback = sanitized.match(/\b[a-z0-9]{20,}\b/gi);
-  if (fallback?.length === 1) {
-    return fallback[0];
-  }
-
-  return null;
-}
-
-function stripAnsiCodes(input = '') {
-  return input.replace(/\x1b\[[0-9;]*m/g, '').replace(/\u001b\[[0-9;]*[A-Za-z]/g, '');
-}
-
 function buildNextConfigContent(editorUtilNames) {
   const aliasLines = [];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nextblock",
-  "version": "0.2.20",
+  "version": "0.2.22",
   "description": "",
   "main": "index.js",
   "bin": {