ferst-core 0.5.0 → 0.5.2

package/bin/check-thin.mjs

@@ -6,10 +6,25 @@
 // only content DATA, pages, the content config re-export, and a `custom/`
 // override sandbox. Shipped from core (its own single source) and run in each
 // client's CI/build: `ferst-check-thin [srcDir]` (defaults to ./src).
-import { readdirSync, statSync, existsSync } from 'node:fs';
+import { readdirSync, statSync, existsSync, realpathSync } from 'node:fs';
 import { join, relative } from 'node:path';
 import { pathToFileURL } from 'node:url';
 
+/**
+ * True when run as a CLI (not imported). Handles npm's `node_modules/.bin` symlink,
+ * where `process.argv[1]` is the symlink path but `import.meta.url` is the realpath —
+ * a plain `===` check silently skips `main()`, making this guard a false pass.
+ */
+export function isDirectInvocation(argv1) {
+  if (!argv1) return false;
+  if (import.meta.url === pathToFileURL(argv1).href) return true;
+  try {
+    return import.meta.url === pathToFileURL(realpathSync(argv1)).href;
+  } catch {
+    return false;
+  }
+}
+
 // Directories directly under src/ that belong to the core, not the client.
 const CORE_OWNED_DIRS = ['components', 'layouts', 'lib', 'utils', 'styles'];
 // Files under src/content/ that are the core's contract, not client data.
@@ -69,6 +84,6 @@ function main() {
 }
 
 // Run only when invoked directly as a bin (not when imported by a test).
-if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+if (isDirectInvocation(process.argv[1])) {
   main();
 }

package/bin/cms-config.mjs

@@ -14,11 +14,27 @@
 //
 // Output path: dist/admin/config.yml under the CWD (the client repo root at build
 // time). Override with a first CLI arg.
-import { readFileSync, writeFileSync, mkdirSync } from 'node:fs';
+import { readFileSync, writeFileSync, mkdirSync, realpathSync } from 'node:fs';
 import { execSync } from 'node:child_process';
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 
+/**
+ * True when this file is being run as a CLI (not imported). Handles npm's
+ * `node_modules/.bin` **symlink**: there `process.argv[1]` is the symlink path but
+ * `import.meta.url` is the realpath, so a plain `===` check silently skips `main()`
+ * and the config is never generated — the bug this guards against.
+ */
+export function isDirectInvocation(argv1) {
+  if (!argv1) return false;
+  if (import.meta.url === pathToFileURL(argv1).href) return true;
+  try {
+    return import.meta.url === pathToFileURL(realpathSync(argv1)).href;
+  } catch {
+    return false;
+  }
+}
+
 const HERE = dirname(fileURLToPath(import.meta.url));
 export const TEMPLATE_PATH = resolve(HERE, '../cms/config.template.yml');
 
@@ -44,6 +60,27 @@ export function repoSlug() {
   return '';
 }
 
+/**
+ * The platform git-proxy origin (CMS `base_url` / `api_root`) for THIS site:
+ *   FERST_GIT_BASE env → committed `ferst-site.json` `gitBase` → prod default.
+ * The seeder writes `ferst-site.json` with the origin of the worker that provisioned
+ * the site, so a dev-provisioned site points its CMS backend at the dev worker and a
+ * prod one at prod — the "site respects the portal it was generated from" binding,
+ * restored at build time.
+ */
+export function resolveGitBase(cwd = process.cwd()) {
+  const fromEnv = env('FERST_GIT_BASE');
+  if (fromEnv) return fromEnv;
+  try {
+    const raw = readFileSync(resolve(cwd, 'ferst-site.json'), 'utf8');
+    const site = JSON.parse(raw);
+    if (site && typeof site.gitBase === 'string' && site.gitBase.trim()) return site.gitBase.trim();
+  } catch {
+    /* no ferst-site.json (e.g. the template repo itself) — fall through to the default */
+  }
+  return 'https://signin.ferst.co.uk';
+}
+
 /** The deployment branch: CF Pages env → current git branch → main. */
 export function deploymentBranch() {
   const cf = env('CF_PAGES_BRANCH');
@@ -86,9 +123,8 @@ function main() {
     console.error('ferst-cms-config: could not determine the repo — set GITHUB_REPOSITORY=owner/name.');
     process.exit(1);
   }
-  // The platform git-proxy origin. Identical for every managed client; overridable for
-  // dev/self-hosted via FERST_GIT_BASE.
-  const base = env('FERST_GIT_BASE') || 'https://signin.ferst.co.uk';
+  // The platform git-proxy origin for this site (env → ferst-site.json → prod default).
+  const base = resolveGitBase();
   const branch = deploymentBranch();
 
   let tpl;
@@ -112,7 +148,7 @@ function main() {
   console.log(`ferst-cms-config: wrote ${outPath} (repo=${repo}, branch="${branch}", base=${base})`);
 }
 
-// Run only when invoked directly as a bin (not when imported by a test).
-if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+// Run when invoked directly as a bin — including via npm's node_modules/.bin symlink.
+if (isDirectInvocation(process.argv[1])) {
   main();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ferst-core",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "type": "module",
   "description": "Ferst Core — the shared, brand-agnostic client-site system: Astro components, layouts, content schemas, the layered config resolver, and a neutral styling architecture that every client overrides.",
   "license": "BUSL-1.1",