jskelet 0.5.4 → 0.6.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jskelet",
-  "version": "0.5.4",
-  "description": "A framework that feels like no framework: Express 5 + build-time .jsk (or EJS) SSR, vanilla JS islands, Tailwind v4 and an in-process HTML TTL cache.",
+  "version": "0.6.0",
+  "description": "A framework that feels like no framework: Express 5 + build-time .jsk SSR (optional EJS peer), vanilla JS islands, Tailwind v4 and an in-process HTML TTL cache.",
   "type": "module",
   "license": "MIT",
   "author": "Ayberk Enis",
@@ -17,7 +17,7 @@
     "ssr",
     "islands",
     "express",
-    "ejs",
+    "jsk",
     "esbuild",
     "tailwind",
     "seo",
@@ -28,19 +28,42 @@
   },
   "main": "./src/index.js",
   "exports": {
-    ".": "./src/index.js",
-    "./server": "./src/index.js",
-    "./client": "./src/client/index.js",
-    "./html": "./src/views/helpers/html.js",
-    "./tags": "./src/views/helpers/tags.js",
-    "./cookies": "./src/http/cookies-entry.js",
-    "./log": "./src/log.mjs",
+    ".": {
+      "types": "./types/index.d.ts",
+      "default": "./src/index.js"
+    },
+    "./server": {
+      "types": "./types/index.d.ts",
+      "default": "./src/index.js"
+    },
+    "./client": {
+      "types": "./types/client/index.d.ts",
+      "default": "./src/client/index.js"
+    },
+    "./html": {
+      "types": "./types/views/helpers/html.d.ts",
+      "default": "./src/views/helpers/html.js"
+    },
+    "./tags": {
+      "types": "./types/views/helpers/tags.d.ts",
+      "default": "./src/views/helpers/tags.js"
+    },
+    "./cookies": {
+      "types": "./types/http/cookies-entry.d.ts",
+      "default": "./src/http/cookies-entry.js"
+    },
+    "./log": {
+      "types": "./types/log.d.mts",
+      "default": "./src/log.mjs"
+    },
     "./register": "./src/runtime/register.mjs",
-    "./layout": "./src/templates/layout.ejs"
+    "./layout": "./src/templates/layout.jsk",
+    "./layout/ejs": "./src/templates/layout.ejs"
   },
   "files": [
     "bin",
     "src",
+    "types",
     "docs",
     "README.md",
     "AGENTS.md",
@@ -53,12 +76,16 @@
   "scripts": {
     "lint": "eslint",
     "test": "node --test \"test/**/*.test.mjs\"",
+    "types": "tsc -p tsconfig.types.json",
+    "prepublishOnly": "npm run types",
+    "test:framework-layout": "node scripts/compile-framework-layout.mjs --check",
     "example:minimal": "npm --prefix examples/minimal run dev",
     "example:blog": "npm --prefix examples/blog run dev",
     "example:dashboard": "npm --prefix examples/dashboard run dev"
   },
   "dependencies": {
-    "ejs": "^6.0.1",
+    "@babel/parser": "^8.0.6",
+    "@babel/types": "^8.0.6",
     "esbuild": "^0.28.2",
     "express": "^5.2.1",
     "tailwind-merge": "^3.5.0"
@@ -66,6 +93,7 @@
   "peerDependencies": {
     "@phosphor-icons/core": "^2.1.1",
     "@tailwindcss/postcss": "^4.3.3",
+    "ejs": "^6.0.1",
     "ioredis": "^5.4.0 || ^6.0.0",
     "lightningcss": "^1.32.0",
     "postcss": "^8.5.26",
@@ -79,6 +107,9 @@
     "@tailwindcss/postcss": {
       "optional": true
     },
+    "ejs": {
+      "optional": true
+    },
     "ioredis": {
       "optional": true
     },
@@ -97,7 +128,11 @@
   },
   "devDependencies": {
     "@eslint/js": "^9",
+    "@types/express": "^5.0.6",
+    "@types/node": "^26.6.1",
+    "ejs": "^6.0.1",
     "eslint": "^9",
-    "globals": "^16"
+    "globals": "^16",
+    "typescript": "^7.0.2"
   }
-}
+}

package/src/build/tasks/client.mjs

@@ -1,9 +1,11 @@
 /**
  * Island bundle'ı: esbuild, ESM, code splitting.
  *
- * `client/entries/*.js` içindeki her dosya bir entry'dir. `main.js` her sayfada
- * yüklenen ortak island bootstrap'ıdır; ek entry'ler yalnızca onları isteyen
- * sayfalarda (`controller` → `entries: ["chart.js"]`) yüklenir.
+ * `client/entries/*.{js,ts,mts}` içindeki her dosya bir entry'dir. `main.js`
+ * (veya `main.ts`) her sayfada yüklenen ortak island bootstrap'ıdır; ek
+ * entry'ler yalnızca onları isteyen sayfalarda
+ * (`controller` → `entries: ["chart.js"]`) yüklenir. Manifest anahtarı her
+ * zaman `*.js` kalır.
  *
  * Hedef tarayıcılar `package.json` → `browserslist` yerine burada sabit: ESM +
  * dinamik import + `IntersectionObserver` island modelinin zaten alt sınırı,
@@ -16,11 +18,17 @@ import * as esbuild from "esbuild";
 import { paths, patchManifest, pruneAssets } from "../paths.mjs";
 import * as log from "../../log.mjs";
 
+/** Client entry ve `@/` alias için kabul edilen kaynak uzantıları. `.tsx` yok. */
+const CLIENT_SOURCE_EXTS = [".js", ".ts", ".mts"];
+
 /**
  * `@/` alias'ını proje köküne çözer — Node tarafındaki `alias-hooks.mjs` ile
  * aynı davranış, böylece `lib/` altındaki modüller hem sunucuda hem
  * tarayıcıda aynı import stilini kullanabilir.
  *
+ * Not: sunucu runtime `.ts` çözmez; paylaşılan `@/lib` dosyaları `.js`
+ * kalmalıdır. `.ts` yalnızca esbuild client hattında anlamlıdır.
+ *
  * @param {string} root
  * @returns {esbuild.Plugin}
  */
@@ -35,6 +43,23 @@ function aliasPlugin(root) {
   };
 }
 
+/**
+ * Secret benzeri isimler public bundle'a gömülmemeli. `PUBLIC` / `PUBLISHABLE`
+ * içerenler (örn. Stripe publishable key) muaf; diğer `SECRET`, `PASSWORD`,
+ * `TOKEN`, `API_KEY`, `PRIVATE` vb. reddedilir.
+ */
+const SECRETISH_CLIENT_ENV =
+  /(?:^|_)(SECRET|PASSWORD|PASSWD|TOKEN|PRIVATE|CREDENTIAL|API[_-]?KEY)(?:_|$)|(?:^|_)(SECRET|PASSWORD|TOKEN|PRIVATE|KEY)$/i;
+
+/**
+ * @param {string} key
+ * @returns {boolean}
+ */
+export function isSecretLikeClientEnvKey(key) {
+  if (/PUBLIC|PUBLISHABLE/i.test(key)) return false;
+  return SECRETISH_CLIENT_ENV.test(key);
+}
+
 /**
  * Tarayıcıda `process` yoktur; sunucuyla paylaşılan modüller yine de
  * `process.env` okur. `clientEnv` ile bildirilen anahtarlar build zamanında
@@ -48,6 +73,14 @@ function aliasPlugin(root) {
  * @returns {Record<string, string>}
  */
 function publicEnv(keys) {
+  const secretish = keys.filter((key) => isSecretLikeClientEnvKey(key));
+  if (secretish.length) {
+    throw new Error(
+      `[build] clientEnv must not include secret-like keys: ${secretish.join(", ")}. ` +
+        "Only values safe to publish in the browser bundle belong here.",
+    );
+  }
+
   /** @type {Record<string, string>} */
   const env = { NODE_ENV: process.env.NODE_ENV ?? "production" };
   for (const key of keys) {
@@ -61,13 +94,16 @@ function publicEnv(keys) {
  * @param {string} base
  * @returns {string}
  */
-function resolveWithExtension(base) {
+export function resolveWithExtension(base) {
   const candidates = [
     base,
     `${base}.js`,
     `${base}.mjs`,
+    `${base}.ts`,
+    `${base}.mts`,
     `${base}.json`,
     path.join(base, "index.js"),
+    path.join(base, "index.ts"),
   ];
   for (const candidate of candidates) {
     if (fs.existsSync(candidate) && fs.statSync(candidate).isFile()) return candidate;
@@ -75,6 +111,53 @@ function resolveWithExtension(base) {
   return base;
 }
 
+/**
+ * Entry dosya adını manifest anahtarına çevirir (`main.ts` → `main.js`).
+ * Layout / `entries: ["chart.js"]` sözleşmesi hash'siz `.js` anahtarları bekler.
+ *
+ * @param {string} entryPath
+ * @returns {string}
+ */
+export function entryManifestName(entryPath) {
+  const base = path.basename(entryPath);
+  const ext = path.extname(base);
+  const stem = CLIENT_SOURCE_EXTS.includes(ext)
+    ? base.slice(0, -ext.length)
+    : path.basename(base, ".js");
+  return `${stem}.js`;
+}
+
+/**
+ * `client/entries/` altındaki kaynakları listeler. Aynı stem için birden fazla
+ * uzantı (`main.js` + `main.ts`) sessiz tercih yerine hata verir.
+ *
+ * @param {string} entryDir
+ * @returns {string[]}
+ */
+export function listClientEntries(entryDir) {
+  /** @type {Map<string, string>} */
+  const byStem = new Map();
+
+  for (const file of fs.readdirSync(entryDir)) {
+    const ext = path.extname(file);
+    if (!CLIENT_SOURCE_EXTS.includes(ext)) continue;
+
+    const stem = file.slice(0, -ext.length);
+    const previous = byStem.get(stem);
+    if (previous) {
+      throw new Error(
+        `[build] conflicting client entries for "${stem}": ${previous} and ${file}. ` +
+          "Keep a single extension per entry name.",
+      );
+    }
+    byStem.set(stem, file);
+  }
+
+  return [...byStem.values()]
+    .sort()
+    .map((file) => path.join(entryDir, file));
+}
+
 /**
  * @param {import('../../config/index.js').ResolvedConfig} config
  * @param {{ watch?: boolean }} [options]
@@ -89,10 +172,7 @@ export async function buildClient(config, { watch = false } = {}) {
     return {};
   }
 
-  const entryPoints = fs
-    .readdirSync(entryDir)
-    .filter((file) => file.endsWith(".js"))
-    .map((file) => path.join(entryDir, file));
+  const entryPoints = listClientEntries(entryDir);
 
   if (!entryPoints.length) {
     log.detail("no entries, skipped");
@@ -117,7 +197,8 @@ export async function buildClient(config, { watch = false } = {}) {
     format: "esm",
     target: ["chrome111", "edge111", "firefox111", "safari16.4"],
     minify: true,
-    sourcemap: true,
+    // Prod'da map dosyaları `public/assets` altında herkese açık kalırdı.
+    sourcemap: process.env.NODE_ENV === "development",
     metafile: true,
     entryNames: "[name].[hash]",
     chunkNames: "chunks/[name].[hash]",
@@ -256,7 +337,7 @@ function toManifest(metafile, config, entryRoot) {
   for (const [outputPath, output] of Object.entries(metafile.outputs)) {
     if (!output.entryPoint?.startsWith(entryRoot)) continue;
 
-    const name = `${path.basename(output.entryPoint, ".js")}.js`;
+    const name = entryManifestName(output.entryPoint);
     const absolute = path.resolve(config.root, outputPath);
     manifest[name] = `/${path
       .relative(config.dirs.public, absolute)

package/src/build/tasks/icons.mjs

@@ -1,12 +1,17 @@
 /**
- * Phosphor SVG sprite üretimi.
+ * SVG ikon sprite üretimi.
  *
- * `@phosphor-icons/core` içindeki tek tek SVG'lerden, **yalnızca kaynakta
- * kullanılan** ikonlar için `<symbol>` seti üretir. Tüm seti göndermek 1500+
- * ikon, yani birkaç megabayt; kullanım taraması sprite'ı tipik olarak 10-30
- * sembolde tutuyor.
+ * Kaynak XOR seçilir: uygulama kökünde `icons/` (veya `icons.dir`) dizini
+ * varsa yalnızca oradaki düz SVG'ler; yoksa `@phosphor-icons/core`. İkisi
+ * birleştirilmez — boş bir `icons/` dizini Phosphor'a düşmez.
+ *
+ * Yalnızca kaynakta kullanılan ikonlar `<symbol>` olur. Tüm seti göndermek
+ * 1500+ ikon, yani birkaç megabayt; kullanım taraması sprite'ı tipik olarak
+ * 10-30 sembolde tutuyor. Çıktı `public/assets/` altında hash'li
+ * `sprite.svg` olduğu için mevcut precompress kapsamına girer.
  *
  * Sembol id'si: `<kebab-name>-<weight>` (örn. `arrow-right-bold`).
+ * Yerel dosya adı: `house.svg` → `house:regular`, `house-bold.svg` → `house:bold`.
  *
  * Tarama statik metin üzerinden yapıldığı için adı çalışma anında hesaplanan
  * bir `icon()` çağrısı sprite'a girmez. Bu yüzden ad taşıyan yapılandırma
@@ -19,12 +24,15 @@ import { createRequire } from "node:module";
 import { pruneAssets, writeAsset } from "../paths.mjs";
 import * as log from "../../log.mjs";
 
-const SCAN_EXTENSIONS = new Set([".ejs", ".jsk", ".js", ".mjs"]);
+const SCAN_EXTENSIONS = new Set([".ejs", ".jsk", ".js", ".mjs", ".ts", ".mts"]);
 
 /** `icon({ … })` çağrısının tamamı; `name:` ifadesi ayrıca çözümlenir. */
 const ICON_CALL = /icon\(\s*\{([^}]*)\}/g;
 const ICON_NAME_EXPR = /name:\s*([^,}]+)/;
 const ICON_WEIGHT = /weight:\s*["']([^"']+)["']/;
+/** `.jsk` / JSX tarzı `<Icon name="Moon" />` ve isteğe bağlı `weight="bold"`. */
+const ICON_TAG =
+  /<Icon\b[^>]*\bname=["']([A-Z][A-Za-z0-9]*)["'][^>]*(?:\bweight=["']([a-z]+)["'])?/gi;
 /** `data-icon="flag:fill"` ve JS nesnesindeki `"data-icon": "flag:fill"`. */
 const ICON_ATTR = /data-icon"?\s*[:=]\s*["']([a-z0-9-]+)(?::([a-z]+))?["']/g;
 
@@ -41,6 +49,8 @@ const QUOTED_NAME = /["']([A-Z][A-Za-z0-9]*)["']/g;
 
 const WEIGHTS = new Set(["thin", "light", "regular", "bold", "fill", "duotone"]);
 
+const DEFAULT_VIEWBOX = "0 0 256 256";
+
 /**
  * `ArrowRightIcon` → `arrow-right`
  * @param {string} name
@@ -54,6 +64,50 @@ function toKebab(name) {
     .toLowerCase();
 }
 
+/**
+ * Düz dizin dosya adı → `name` + `weight`.
+ * `house.svg` / `house-regular.svg` → regular; `arrow-right-bold.svg` → bold.
+ *
+ * @param {string} fileName uzantılı veya uzantısız
+ * @returns {{ name: string, weight: string } | null}
+ */
+export function parseIconFileName(fileName) {
+  const base = String(fileName).replace(/\.svg$/i, "");
+  if (!base) return null;
+
+  let name = base;
+  let weight = "regular";
+
+  const dash = base.lastIndexOf("-");
+  if (dash > 0) {
+    const maybeWeight = base.slice(dash + 1);
+    if (WEIGHTS.has(maybeWeight)) {
+      name = base.slice(0, dash);
+      weight = maybeWeight;
+    }
+  }
+
+  // kebab: harf/rakam segmentleri, başta/sonda tire yok
+  if (!/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(name)) return null;
+
+  return { name, weight };
+}
+
+/**
+ * @param {import('../../config/index.js').ResolvedConfig} config
+ * @returns {string | null} mutlak dizin; yoksa veya dizin değilse null
+ */
+function resolveLocalIconsDir(config) {
+  const relative = config.icons?.dir ?? "icons";
+  const dir = path.resolve(config.root, relative);
+  try {
+    if (fs.statSync(dir).isDirectory()) return dir;
+  } catch {
+    // yok
+  }
+  return null;
+}
+
 /**
  * Paket, framework'ün değil **uygulamanın** node_modules'ünden çözülür:
  * ikon seti uygulamanın devDependency'si.
@@ -140,6 +194,13 @@ function scanUsedIcons(scanDirs) {
         for (const name of names) used.add(`${toKebab(name)}:${weight}`);
       }
 
+      for (const match of source.matchAll(ICON_TAG)) {
+        const weight = match[2] ?? "regular";
+        used.add(
+          `${toKebab(match[1])}:${WEIGHTS.has(weight) ? weight : "regular"}`,
+        );
+      }
+
       for (const match of source.matchAll(ICON_NAME_PROP)) {
         indirectNames.add(toKebab(match[1]));
       }
@@ -160,21 +221,80 @@ function scanUsedIcons(scanDirs) {
   return used;
 }
 
+/**
+ * @param {string} svg
+ * @returns {{ body: string, viewBox: string }}
+ */
+function parseSvgParts(svg) {
+  const open = svg.match(/<svg\b[^>]*>/i)?.[0] ?? "";
+  const viewBox =
+    open.match(/\bviewBox\s*=\s*["']([^"']+)["']/i)?.[1]?.trim() ||
+    DEFAULT_VIEWBOX;
+  const body = svg
+    .replace(/^[\s\S]*?<svg[^>]*>/i, "")
+    .replace(/<\/svg>\s*$/i, "")
+    .trim();
+  return { body, viewBox };
+}
+
+/**
+ * Düz `icons/` altındaki `*.svg` dosyalarından `name:weight` → parça haritası.
+ *
+ * @param {string} dir
+ * @returns {Map<string, { body: string, viewBox: string }>}
+ */
+function indexLocalIcons(dir) {
+  /** @type {Map<string, { body: string, viewBox: string }>} */
+  const index = new Map();
+
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    if (!entry.isFile() || path.extname(entry.name).toLowerCase() !== ".svg") {
+      continue;
+    }
+
+    const parsed = parseIconFileName(entry.name);
+    if (!parsed) {
+      log.warn(`icon file ignored (bad name) → ${entry.name}`);
+      continue;
+    }
+
+    const key = `${parsed.name}:${parsed.weight}`;
+    const svg = fs.readFileSync(path.join(dir, entry.name), "utf8");
+    index.set(key, parseSvgParts(svg));
+  }
+
+  return index;
+}
+
 /**
  * @param {string} coreAssets
  * @param {string} name kebab
  * @param {string} weight
- * @returns {string | null}
+ * @returns {{ body: string, viewBox: string } | null}
  */
-function readIconBody(coreAssets, name, weight) {
+function readPhosphorIcon(coreAssets, name, weight) {
   const fileName = weight === "regular" ? `${name}.svg` : `${name}-${weight}.svg`;
   const filePath = path.join(coreAssets, weight, fileName);
 
   if (!fs.existsSync(filePath)) return null;
 
-  const svg = fs.readFileSync(filePath, "utf8");
-  const inner = svg.replace(/^[\s\S]*?<svg[^>]*>/, "").replace(/<\/svg>\s*$/, "");
-  return inner.trim();
+  return parseSvgParts(fs.readFileSync(filePath, "utf8"));
+}
+
+/**
+ * @param {Map<string, { body: string, viewBox: string }>} index
+ * @param {string} name
+ * @param {string} weight
+ * @returns {{ body: string, viewBox: string } | null}
+ */
+function readLocalIcon(index, name, weight) {
+  const exact = index.get(`${name}:${weight}`);
+  if (exact) return exact;
+
+  // `house.svg` regular sayılır; tarama `house:regular` ister.
+  if (weight === "regular") return index.get(`${name}:regular`) ?? null;
+
+  return null;
 }
 
 /**
@@ -182,10 +302,22 @@ function readIconBody(coreAssets, name, weight) {
  * @returns {Promise<Record<string, string>>}
  */
 export async function buildIconSprite(config) {
-  const coreAssets = resolveIconAssets(config.root);
-  if (!coreAssets) {
-    log.detail("@phosphor-icons/core not installed, skipped");
-    return {};
+  const localDir = resolveLocalIconsDir(config);
+  /** @type {Map<string, { body: string, viewBox: string }> | null} */
+  let localIndex = null;
+  /** @type {string | null} */
+  let coreAssets = null;
+
+  if (localDir) {
+    localIndex = indexLocalIcons(localDir);
+    const rel = path.relative(config.root, localDir) || ".";
+    log.detail(`icons from ${rel} (${localIndex.size} files)`);
+  } else {
+    coreAssets = resolveIconAssets(config.root);
+    if (!coreAssets) {
+      log.detail("@phosphor-icons/core not installed, skipped");
+      return {};
+    }
   }
 
   const scanDirs = (
@@ -198,15 +330,17 @@ export async function buildIconSprite(config) {
 
   for (const entry of used) {
     const [name, weight] = entry.split(":");
-    const body = readIconBody(coreAssets, name, weight);
+    const parts = localIndex
+      ? readLocalIcon(localIndex, name, weight)
+      : readPhosphorIcon(/** @type {string} */ (coreAssets), name, weight);
 
-    if (!body) {
+    if (!parts?.body) {
       missing.push(entry);
       continue;
     }
 
     symbols.push(
-      `<symbol id="${name}-${weight}" viewBox="0 0 256 256">${body}</symbol>`,
+      `<symbol id="${name}-${weight}" viewBox="${parts.viewBox}">${parts.body}</symbol>`,
     );
   }
 

package/src/client/index.js

@@ -1,12 +1,12 @@
 /**
  * JSkelet island runtime'ının tarayıcı tarafı API'si.
  *
- * `client/entries/main.js` içinde:
+ * `client/entries/main.js` (veya `main.ts`) içinde:
  *
  *   import { registerAll, start } from "jskelet/client";
  *
  *   registerAll({
- *     counter: () => import("../islands/counter.js"),
+ *     counter: () => import("../islands/counter.ts"),
  *   });
  *
  *   start();

package/src/compile/codegen.js

@@ -21,6 +21,7 @@ export function codegen(ast, options) {
   return {
     code: ctx.finish(),
     includes: [...ctx.includes],
+    includeEntries: ctx.includeEntries,
     components: [...ctx.components],
   };
 }
@@ -58,6 +59,8 @@ class CodegenContext {
     this.knownComponents = options.knownComponents ?? null;
     /** @type {Set<string>} */
     this.includes = new Set();
+    /** @type {{ id: string, index: number }[]} */
+    this.includeEntries = [];
     /** @type {Set<string>} */
     this.components = new Set();
     /** @type {string[]} */
@@ -249,6 +252,7 @@ class CodegenContext {
   emitInclude(node) {
     const id = normalizeIncludeId(node.path);
     this.includes.add(id);
+    this.includeEntries.push({ id, index: node.index });
     const alias = includeAlias(id);
     this.append(`(${alias}(data, helpers) ?? "")`);
   }

package/src/compile/compile-all.js

@@ -19,7 +19,7 @@ import {
  * @param {{ quiet?: boolean }} [options]
  * @returns {Promise<{ count: number, manifest: Record<string, string>, outDir: string }>}
  */
-export async function compileAll(config, options = {}) {
+export async function compileAll(config, _options = {}) {
   const outDir = path.join(config.dirs.generated, "templates");
   const viewRoots = getViewRoots(config);
   const jskFiles = discoverJskFiles(viewRoots);
@@ -32,7 +32,7 @@ export async function compileAll(config, options = {}) {
 
   /** @type {Record<string, string>} */
   const manifest = {};
-  /** @type {Map<string, { code: string, includes: string[] }>} */
+  /** @type {Map<string, { code: string, includes: string[], includeEntries: { id: string, index: number }[], source: string, relative: string }>} */
   const compiled = new Map();
 
   for (const [viewId, file] of jskFiles) {
@@ -47,34 +47,25 @@ export async function compileAll(config, options = {}) {
       throw error;
     }
 
-    const { code, includes, components: usedComponents } = codegen(ast, {
+    const { code, includes, includeEntries } = codegen(ast, {
       viewId,
       file: relative,
-      knownComponents: null,
+      knownComponents,
     });
 
-    for (const name of usedComponents) {
-      if (knownComponents.has(name)) continue;
-      const camel = name.charAt(0).toLowerCase() + name.slice(1);
-      if (knownComponents.has(camel)) continue;
-      if (!options.quiet) {
-        console.warn(`[jsk] ${relative}: component "${name}" was not found at compile time`);
-      }
-    }
-
-    compiled.set(viewId, { code, includes });
+    compiled.set(viewId, { code, includes, includeEntries, source, relative });
   }
 
   // Include hedefleri mevcut mu?
-  for (const [viewId, { includes }] of compiled) {
-    for (const id of includes) {
+  for (const [, { includeEntries, source, relative }] of compiled) {
+    for (const { id, index } of includeEntries) {
       const normalized = normalizeIncludeId(id);
       if (!compiled.has(normalized) && !jskFiles.has(normalized)) {
-        const file = jskFiles.get(viewId);
-        const relative = file
-          ? path.relative(config.root, file).split(path.sep).join("/")
-          : viewId;
-        throw new CompileError(`Unknown include "${id}"`, { file: relative });
+        throw new CompileError(`Unknown include "${id}"`, {
+          file: relative,
+          source,
+          index,
+        });
       }
     }
   }

package/src/compile/expr.js

@@ -278,6 +278,11 @@ class ExprParser {
     let node = this.parsePrimary();
     for (;;) {
       this.skipWs();
+      if (this.peek() === "(") {
+        throw this.error(
+          "Function calls are not allowed in .jsk; move logic to a JS component or controller",
+        );
+      }
       if (this.match("?.")) {
         this.skipWs();
         if (this.peek() === "[") {