whereto-bike 0.0.1 → 0.0.2

package/eslint-rules/no-hardcoded-city-locale.js

@@ -6,6 +6,7 @@ export default {
     messages: {
       hardcodedCity: "Don't hardcode city name '{{value}}'. Import CITY from src/lib/config.ts.",
       hardcodedLocale: "Don't hardcode locale '{{value}}'. Derive from city config locales.",
+      cityFallbackDefault: "Don't use '{{value}}' as a fallback default for CITY. A silent default can cause content to be committed to the wrong directory. Make the value required instead.",
     },
   },
   create(context) {
@@ -28,7 +29,16 @@ export default {
         // Skip type annotations and enums
         if (node.parent.type === 'TSLiteralType') return;
 
+        // Detect `X || 'ottawa'` or `X ?? 'ottawa'` — a city name used as fallback.
+        // This is dangerous because the fallback silently applies when the env var
+        // is unset (e.g. in Cloudflare Workers at runtime), causing content to be
+        // committed to the wrong directory.
         if (CITY_NAMES.includes(val)) {
+          const p = node.parent;
+          if (p.type === 'LogicalExpression' && (p.operator === '||' || p.operator === '??') && p.right === node) {
+            context.report({ node, messageId: 'cityFallbackDefault', data: { value: node.value } });
+            return;
+          }
           context.report({ node, messageId: 'hardcodedCity', data: { value: node.value } });
         }
         // Only flag exact matches for locale codes (not substrings)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whereto-bike",
   "type": "module",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Open-source cycling platform — the CMS for cycling",
   "license": "AGPL-3.0",
   "repository": {

package/src/content-collections.ts

@@ -11,7 +11,10 @@ import {
   eventSchema, organizerSchema, pageSchema,
 } from './schemas/index';
 
-const CITY_DIR = `${process.env.CONTENT_DIR || '.'}/${process.env.CITY || 'blog'}`;
+// This file is exclusively for blog/club consumer repos. Default to 'blog'
+// since that's the primary consumer — clubs override via CITY env var.
+const city = process.env.CITY || 'blog';
+const CITY_DIR = `${process.env.CONTENT_DIR || '.'}/${city}`;
 const mdPattern = ['**/*.md', '!**/*.??.md'];
 
 export const collections = {

package/src/content.config.ts

@@ -4,12 +4,13 @@ import { routeLoader } from './loaders/routes';
 import { rideLoader } from './loaders/rides';
 import { pageLoader } from './loaders/pages';
 import { isBlogInstance } from './lib/city-config';
+import { cityDir } from './lib/config';
 import {
   routeSchema, placeSchema, guideSchema,
   eventSchema, organizerSchema, pageSchema,
 } from './schemas/index';
 
-const CITY_DIR = `${process.env.CONTENT_DIR || '../bike-routes'}/${process.env.CITY || 'ottawa'}`;
+const CITY_DIR = cityDir;
 
 // Exclude translation files (e.g. bike-crash.fr.md) — only load base language
 const mdPattern = ['**/*.md', '!**/*.??.md'];

package/src/env.d.ts

@@ -20,6 +20,9 @@ declare global {
   /** App repo git branch, baked in at build time via vite.define */
   const __APP_BRANCH__: string;
 
+  /** City slug, baked in at build time via vite.define */
+  const __CITY__: string;
+
   // -- D1 (SQL database) types used by drizzle-orm/d1 --
 
   interface D1Result<T = unknown> {

package/src/integration.ts

@@ -77,6 +77,19 @@ function patchStaticCspStyles(rootDir: string) {
   }
 }
 
+/**
+ * Auto-detect the city slug by scanning a content directory for subdirectories
+ * containing config.yml. If exactly one is found, return it. This lets consumer
+ * repos (blog, club) skip setting CITY= when the content layout is unambiguous.
+ */
+function detectCity(contentDir: string): string | null {
+  if (!fs.existsSync(contentDir)) return null;
+  const candidates = fs.readdirSync(contentDir, { withFileTypes: true })
+    .filter(e => e.isDirectory() && fs.existsSync(path.join(contentDir, e.name, 'config.yml')))
+    .map(e => e.name);
+  return candidates.length === 1 ? candidates[0] : null;
+}
+
 function detectBranch(): string {
   try {
     return execSync('git rev-parse --abbrev-ref HEAD', { encoding: 'utf-8' }).trim();
@@ -98,6 +111,17 @@ export function wheretoBike(options?: WheretoBikeOptions): AstroIntegration[] {
     process.env.CITY = options.city;
   }
 
+  // Auto-detect CITY for consumer repos: scan the content directory for a single
+  // city folder containing config.yml. Blog repos always have blog/config.yml,
+  // club repos have their club folder — no need to set CITY explicitly.
+  if (!process.env.CITY && options?.consumerRoot) {
+    const contentDir = process.env.CONTENT_DIR || options.consumerRoot;
+    const detected = detectCity(contentDir);
+    if (detected) {
+      process.env.CITY = detected;
+    }
+  }
+
   const consumerRoot = options?.consumerRoot;
 
   // Derive i18n config from city config.yml (same logic as previous astro.config.mjs).
@@ -129,6 +153,7 @@ export function wheretoBike(options?: WheretoBikeOptions): AstroIntegration[] {
             },
             define: {
               __APP_BRANCH__: JSON.stringify(detectBranch()),
+              __CITY__: JSON.stringify(CITY),
             },
             plugins: [buildDataPlugin({ consumerRoot })],
             build: {

package/src/lib/config.ts

@@ -1,5 +1,26 @@
 import path from 'node:path';
 
 export const CONTENT_DIR = process.env.CONTENT_DIR || path.resolve('..', 'bike-routes');
-export const CITY = process.env.CITY || 'ottawa';
+
+/**
+ * City slug for this instance.
+ *
+ * At build time: read from process.env.CITY (set by shell or wheretoBike() options).
+ * In bundled Worker: inlined as a string literal via Vite define (__CITY__).
+ *
+ * Never defaults silently — an unset CITY would commit content to the wrong
+ * directory in the data repo (the bug that prompted this safeguard).
+ */
+function resolveCity(): string {
+  // In the Vite-bundled server, __CITY__ is replaced with a string literal at build time.
+  // In Node.js (loaders, tests, scripts), it's undefined and we fall back to process.env.
+  if (typeof __CITY__ !== 'undefined') return __CITY__;
+  const fromEnv = process.env.CITY;
+  if (fromEnv) return fromEnv;
+  throw new Error(
+    'CITY environment variable is required. Set CITY=ottawa (or blog, demo, etc.) before building or running.',
+  );
+}
+
+export const CITY: string = resolveCity();
 export const cityDir = path.join(CONTENT_DIR, CITY);