jskelet 0.4.0 → 0.4.2

package/src/compile/resolve.js

@@ -7,6 +7,17 @@
 import fs from "node:fs";
 import path from "node:path";
 import { toPascalCase } from "./codegen.js";
+import { CompileError } from "./errors.js";
+import { scanNamedExports } from "./scan-exports.js";
+
+/**
+ * Runtime'ın camelCase → PascalCase alias'ı ile aynı kural.
+ * @param {string} name
+ * @returns {string}
+ */
+export function toComponentTag(name) {
+  return name.charAt(0).toUpperCase() + name.slice(1);
+}
 
 /**
  * @param {{ root: string, dirs: Record<string, string> }} config
@@ -106,6 +117,9 @@ export function componentNameFromViewId(viewId) {
  * Bilinen bileşen adları: JS named export'lar + derlenecek `.jsk` bileşenleri
  * + yerleşik etiketler.
  *
+ * JS tarafında dosya adı varsayılmaz; kaynak metinden `export` adları okunur.
+ * Aynı export (veya aynı PascalCase etiket) iki dosyada varsa derleme hatası.
+ *
  * @param {string[]} componentDirs
  * @param {Map<string, string>} jskFiles
  * @returns {Set<string>}
@@ -119,41 +133,76 @@ export function collectKnownComponents(componentDirs, jskFiles) {
     "PreloadImage",
   ]);
 
+  /** @type {Map<string, string>} export adı → göreli yol */
+  const byName = new Map();
+  /** @type {Map<string, string>} PascalCase etiket → göreli yol */
+  const byTag = new Map();
+
   for (const [viewId] of jskFiles) {
     const name = componentNameFromViewId(viewId);
-    if (name) known.add(name);
+    if (!name) continue;
+    known.add(name);
+    byTag.set(name, `${viewId}.jsk`);
   }
 
   for (const dir of componentDirs) {
-    collectJsComponentNames(dir, dir, known);
+    collectJsComponentNames(dir, known, byName, byTag);
   }
 
   return known;
 }
 
+/**
+ * @param {string} name
+ * @param {string} origin
+ * @param {Map<string, string>} byName
+ * @param {Map<string, string>} byTag
+ */
+function registerExportOrigin(name, origin, byName, byTag) {
+  const previousName = byName.get(name);
+  if (previousName && previousName !== origin) {
+    throw new CompileError(
+      `Component '${name}' is defined twice: ${previousName} and ${origin}`,
+    );
+  }
+  byName.set(name, origin);
+
+  const tag = toComponentTag(name);
+  const previousTag = byTag.get(tag);
+  if (previousTag && previousTag !== origin) {
+    throw new CompileError(
+      `Component '${tag}' is defined twice: ${previousTag} and ${origin}`,
+    );
+  }
+  byTag.set(tag, origin);
+}
+
 /**
  * @param {string} dir
- * @param {string} root
  * @param {Set<string>} out
+ * @param {Map<string, string>} byName
+ * @param {Map<string, string>} byTag
  */
-function collectJsComponentNames(dir, root, out) {
+function collectJsComponentNames(dir, out, byName, byTag) {
   if (!fs.existsSync(dir)) return;
   for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
     const full = path.join(dir, entry.name);
     if (entry.isDirectory()) {
-      collectJsComponentNames(full, root, out);
+      collectJsComponentNames(full, out, byName, byTag);
       continue;
     }
     if (!entry.name.endsWith(".js")) continue;
-    if (entry.name === "loader.js") continue;
-    // Dosya adından PascalCase tahmin — export adı dosya içinde olabilir;
-    // bilinmeyen bileşen uyarısını azaltmak için her iki biçimi ekle.
-    const base = entry.name.replace(/\.js$/, "");
-    if (base === "index") continue;
-    out.add(toPascalCase(base));
-    // camelCase export'lar da yaygın: `list` → List ve list
-    out.add(base);
-    const pascal = toPascalCase(base);
-    out.add(pascal.charAt(0).toLowerCase() + pascal.slice(1));
+    if (entry.name === "loader.js" || entry.name === "index.js") continue;
+
+    // Kimlik mutlak yol: çoklu kökte iki `list.js` aynı göreli ada sahip olabilir.
+    const origin = full.split(path.sep).join("/");
+    const source = fs.readFileSync(full, "utf8");
+    const exports = scanNamedExports(source);
+
+    for (const name of exports) {
+      registerExportOrigin(name, origin, byName, byTag);
+      out.add(name);
+      out.add(toComponentTag(name));
+    }
   }
 }

package/src/compile/scan-exports.js

@@ -0,0 +1,51 @@
+/**
+ * Kaynak metinden named export adlarını çıkarır — modülü çalıştırmadan.
+ * Compile-time bilinen bileşen listesi için; `default` yok sayılır.
+ */
+
+/**
+ * Yorumları kaba şekilde siler; string içindeki sahte eşleşmeler nadirdir.
+ * @param {string} source
+ * @returns {string}
+ */
+function stripComments(source) {
+  return source.replace(/\/\*[\s\S]*?\*\//g, "").replace(/\/\/.*$/gm, "");
+}
+
+/**
+ * `export { a, b as C, default as X }` listesinden dışa verilen adları toplar.
+ * @param {string} clause
+ * @param {Set<string>} out
+ */
+function addExportList(clause, out) {
+  for (const part of clause.split(",")) {
+    const trimmed = part.trim();
+    if (!trimmed) continue;
+    const bits = trimmed.split(/\s+as\s+/i);
+    const exported = (bits[1] ?? bits[0]).trim();
+    if (!exported || exported === "default") continue;
+    out.add(exported);
+  }
+}
+
+/**
+ * @param {string} source
+ * @returns {string[]}
+ */
+export function scanNamedExports(source) {
+  const text = stripComments(source);
+  /** @type {Set<string>} */
+  const names = new Set();
+
+  for (const match of text.matchAll(
+    /\bexport\s+(?:async\s+)?(?:function\*?|class|const|let|var)\s+([A-Za-z_$][\w$]*)/g,
+  )) {
+    names.add(match[1]);
+  }
+
+  for (const match of text.matchAll(/\bexport\s*\{([^}]+)\}/g)) {
+    addExportList(match[1], names);
+  }
+
+  return [...names];
+}

package/src/init.mjs

@@ -1,9 +1,12 @@
 /**
  * `jskelet init` — bulunduğun dizine çalışan bir minimum iskelet kurar.
  *
- * Var olan dosyaların üzerine yazmaz: komutu ikinci kez çalıştırmak yalnızca
- * eksikleri tamamlar. Amaç, "kurulum yaptım ama hiçbir şey çalışmıyor"
- * aşamasını tamamen atlamak — `jskelet dev` hemen ardından çalışır.
+ * Varsayılan düzen feature-first'tir: sayfa, bileşen ve island
+ * `features/<name>/` altında toplanır; URL kaydı yine açıkça yazılır.
+ * Şablonlar `.jsk`. Var olan dosyaların üzerine yazmaz: komutu ikinci kez
+ * çalıştırmak yalnızca eksikleri tamamlar. Amaç, "kurulum yaptım ama hiçbir
+ * şey çalışmıyor" aşamasını tamamen atlamak — `jskelet dev` hemen ardından
+ * çalışır.
  */
 import fs from "node:fs";
 import path from "node:path";
@@ -55,13 +58,12 @@ export default {
 };
 `,
 
-  "routes/10-pages.mjs": `/**
- * Route module. The default export receives \`(app, api)\`; \`api.route()\` wraps
- * the controller with the HTML cache, the notFound/redirect flow and
- * compression.
+  "features/home/index.js": `/**
+ * Feature route registration. Explicit paths only — no filesystem URL routing.
+ * Loaded after \`routes/\` (alphabetically among features).
  *
- * The numeric prefix in the file name sets load order: catch-all routes
- * (like "/:slug") belong to a higher number.
+ * @param {import('express').Express} app
+ * @param {{ route: Function }} api
  */
 export default function register(app, { route }) {
   app.get(
@@ -78,25 +80,19 @@ export default function register(app, { route }) {
 }
 `,
 
-  "views/pages/home.jsk": `<section class="wrapper">
+  "features/home/views/pages/home.jsk": `<section class="wrapper">
   <h1>{{ metadata.title }}</h1>
   <p>{{ message }}</p>
+  <Button text="Example component" />
   <div data-island="counter" data-island-props='{"start":0}'></div>
 </section>
 `,
 
-  "views/pages/not-found.jsk": `<section class="wrapper">
-  <h1>404</h1>
-  <p>The page you are looking for was not found.</p>
-  <p><Link href="/" text="Back to home" /></p>
-</section>
-`,
-
-  "views/components/button.js": `import { attrs, esc } from "jskelet/html";
+  "features/home/views/components/button.js": `import { attrs, esc } from "jskelet/html";
 
 /**
- * Every named export under \`views/components/**\` is usable directly in
- * templates: \`<Button text="Save" />\` in \`.jsk\` or \`<%- button({ text }) %>\` in EJS.
+ * Named exports under \`views/components/**\` (including feature views) become
+ * PascalCase tags in \`.jsk\`: \`<Button text="Save" />\`.
  *
  * @param {{ text: string, href?: string, class?: string }} props
  * @returns {string}
@@ -107,22 +103,10 @@ export function button({ text, href, class: className }) {
 }
 `,
 
-  "client/entries/main.js": `import { registerAll, start } from "jskelet/client";
-
-/**
- * Island registry. Values are dynamic imports: a module is downloaded only if
- * that island is actually on the page and becomes visible.
- */
-registerAll({
-  counter: () => import("../islands/counter.js"),
-});
-
-start();
-`,
-
-  "client/islands/counter.js": `/**
+  "features/home/client/counter.js": `/**
  * Island contract: a named export called \`mount(element, props)\`.
- * The returned function, if any, is reserved for cleanup.
+ * Register it from \`client/entries/main.js\`. The returned function, if any,
+ * is reserved for cleanup.
  *
  * @param {HTMLElement} element
  * @param {{ start?: number }} props
@@ -145,6 +129,28 @@ export function mount(element, props) {
   paint();
   element.append(button);
 }
+`,
+
+  "features/home/server/.gitkeep": "",
+
+  "views/pages/not-found.jsk": `<section class="wrapper">
+  <h1>404</h1>
+  <p>The page you are looking for was not found.</p>
+  <p><Link href="/" text="Back to home" /></p>
+</section>
+`,
+
+  "client/entries/main.js": `import { registerAll, start } from "jskelet/client";
+
+/**
+ * Island registry. Values are dynamic imports: a module is downloaded only if
+ * that island is actually on the page and becomes visible.
+ */
+registerAll({
+  counter: () => import("../../features/home/client/counter.js"),
+});
+
+start();
 `,
 
   "styles/globals.css": `@import "tailwindcss" source(none);
@@ -220,4 +226,5 @@ export async function init(root) {
 
   log.line("");
   log.line("next step:  npx jskelet dev");
+  log.line("grow with:  npx jskelet generate feature <name>");
 }

package/src/views/components/loader.js

@@ -60,21 +60,24 @@ async function loadDir(dir, components, origin) {
   ];
 
   for (const file of files) {
-    const relative = path.relative(dir, file).split(path.sep).join("/");
+    const isBarrel = path.basename(file) === BARREL;
+    // Kimlik mutlak yol — çoklu components kökünde göreli ad çakışmasın.
+    const fileId = isBarrel ? BARREL : file.split(path.sep).join("/");
     const module = await import(pathToFileURL(file).href);
 
     for (const [name, value] of Object.entries(module)) {
       if (name === "default") continue;
 
       const previous = origin.get(name);
-      if (previous && previous !== BARREL && previous !== relative) {
-        console.warn(
-          `[components] '${name}' is defined twice: ${previous} and ${relative} — the second one wins.`,
+      // Barrel üzerine yazmak bilinçli; iki gerçek bileşen dosyası çakışması hata.
+      if (previous && previous !== BARREL && previous !== fileId) {
+        throw new Error(
+          `[components] '${name}' is defined twice: ${previous} and ${fileId}`,
         );
       }
 
       components[name] = value;
-      origin.set(name, relative);
+      origin.set(name, fileId);
     }
   }
 }