jskelet 0.6.3 → 0.6.4

package/src/compile/compile-all.js

@@ -1,149 +1,149 @@
-/**
- * Tüm `.jsk` dosyalarını derleyip `.jskelet/templates/` altına yazar.
- */
-import fs from "node:fs";
-import path from "node:path";
-import { parseTemplate } from "./parse.js";
-import { codegen, normalizeIncludeId } from "./codegen.js";
-import { CompileError } from "./errors.js";
-import {
-  collectKnownComponents,
-  componentNameFromViewId,
-  discoverJskFiles,
-  getComponentDirs,
-  getViewRoots,
-} from "./resolve.js";
-
-/**
- * @param {{ root: string, dirs: Record<string, string> }} config
- * @param {{ quiet?: boolean }} [options]
- * @returns {Promise<{ count: number, manifest: Record<string, string>, outDir: string }>}
- */
-export async function compileAll(config, _options = {}) {
-  const outDir = path.join(config.dirs.generated, "templates");
-  const viewRoots = getViewRoots(config);
-  const jskFiles = discoverJskFiles(viewRoots);
-  const componentDirs = getComponentDirs(config);
-  const knownComponents = collectKnownComponents(componentDirs, jskFiles);
-
-  // Önceki çıktıyı temizle — silinmiş şablonlar kalmasın.
-  fs.rmSync(outDir, { recursive: true, force: true });
-  fs.mkdirSync(outDir, { recursive: true });
-
-  /** @type {Record<string, string>} */
-  const manifest = {};
-  /** @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) {
-    const source = fs.readFileSync(file, "utf8");
-    const relative = path.relative(config.root, file).split(path.sep).join("/");
-
-    let ast;
-    try {
-      ast = parseTemplate(source, { file: relative });
-    } catch (error) {
-      if (error instanceof CompileError) throw error;
-      throw error;
-    }
-
-    const { code, includes, includeEntries } = codegen(ast, {
-      viewId,
-      file: relative,
-      knownComponents,
-    });
-
-    compiled.set(viewId, { code, includes, includeEntries, source, relative });
-  }
-
-  // Include hedefleri mevcut mu?
-  for (const [, { includeEntries, source, relative }] of compiled) {
-    for (const { id, index } of includeEntries) {
-      const normalized = normalizeIncludeId(id);
-      if (!compiled.has(normalized) && !jskFiles.has(normalized)) {
-        throw new CompileError(`Unknown include "${id}"`, {
-          file: relative,
-          source,
-          index,
-        });
-      }
-    }
-  }
-
-  for (const [viewId, { code }] of compiled) {
-    const outFile = path.join(outDir, `${viewId}.mjs`);
-    fs.mkdirSync(path.dirname(outFile), { recursive: true });
-    fs.writeFileSync(outFile, code, "utf8");
-    manifest[viewId] = `${viewId}.mjs`.split(path.sep).join("/");
-  }
-
-  const manifestPath = path.join(outDir, "manifest.json");
-  fs.writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`, "utf8");
-
-  // Bileşen adı → view id haritası (runtime kayıt için)
-  /** @type {Record<string, string>} */
-  const components = {};
-  for (const viewId of Object.keys(manifest)) {
-    const name = componentNameFromViewId(viewId);
-    if (name) components[name] = viewId;
-  }
-  fs.writeFileSync(
-    path.join(outDir, "components.json"),
-    `${JSON.stringify(components, null, 2)}\n`,
-    "utf8",
-  );
-
-  return { count: compiled.size, manifest, outDir };
-}
-
-/**
- * Manifest yoksa veya herhangi bir `.jsk` daha yeniyse yeniden derler.
- * Dev sunucu restart'ında build watch kaçırmış olsa bile şablonlar güncel kalır.
- *
- * @param {{ root: string, dirs: Record<string, string> }} config
- * @returns {Promise<{ count: number, rebuilt: boolean }>}
- */
-export async function ensureTemplatesCompiled(config) {
-  const viewRoots = getViewRoots(config);
-  const jskFiles = discoverJskFiles(viewRoots);
-  if (jskFiles.size === 0) {
-    return { count: 0, rebuilt: false };
-  }
-
-  const outDir = path.join(config.dirs.generated, "templates");
-  const manifestPath = path.join(outDir, "manifest.json");
-  let needs = !fs.existsSync(manifestPath);
-
-  if (!needs) {
-    const manifestMtime = fs.statSync(manifestPath).mtimeMs;
-    for (const file of jskFiles.values()) {
-      if (fs.statSync(file).mtimeMs > manifestMtime) {
-        needs = true;
-        break;
-      }
-    }
-  }
-
-  if (!needs) {
-    return { count: jskFiles.size, rebuilt: false };
-  }
-
-  const result = await compileAll(config, { quiet: true });
-  return { count: result.count, rebuilt: true };
-}
-
-/**
- * Tek kaynak dizgisini derler (birim testleri).
- * @param {string} source
- * @param {{ viewId?: string, file?: string, knownComponents?: Set<string> }} [options]
- * @returns {{ code: string, includes: string[], components: string[] }}
- */
-export function compileSource(source, options = {}) {
-  const viewId = options.viewId ?? "test";
-  const ast = parseTemplate(source, { file: options.file ?? "test.jsk" });
-  return codegen(ast, {
-    viewId,
-    file: options.file ?? "test.jsk",
-    knownComponents: options.knownComponents ?? null,
-  });
-}
+/**
+ * Tüm `.jsk` dosyalarını derleyip `.jskelet/templates/` altına yazar.
+ */
+import fs from "node:fs";
+import path from "node:path";
+import { parseTemplate } from "./parse.js";
+import { codegen, normalizeIncludeId } from "./codegen.js";
+import { CompileError } from "./errors.js";
+import {
+  collectKnownComponents,
+  componentNameFromViewId,
+  discoverJskFiles,
+  getComponentDirs,
+  getViewRoots,
+} from "./resolve.js";
+
+/**
+ * @param {{ root: string, dirs: Record<string, string> }} config
+ * @param {{ quiet?: boolean }} [options]
+ * @returns {Promise<{ count: number, manifest: Record<string, string>, outDir: string }>}
+ */
+export async function compileAll(config, _options = {}) {
+  const outDir = path.join(config.dirs.generated, "templates");
+  const viewRoots = getViewRoots(config);
+  const jskFiles = discoverJskFiles(viewRoots);
+  const componentDirs = getComponentDirs(config);
+  const knownComponents = collectKnownComponents(componentDirs, jskFiles);
+
+  // Önceki çıktıyı temizle — silinmiş şablonlar kalmasın.
+  fs.rmSync(outDir, { recursive: true, force: true });
+  fs.mkdirSync(outDir, { recursive: true });
+
+  /** @type {Record<string, string>} */
+  const manifest = {};
+  /** @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) {
+    const source = fs.readFileSync(file, "utf8");
+    const relative = path.relative(config.root, file).split(path.sep).join("/");
+
+    let ast;
+    try {
+      ast = parseTemplate(source, { file: relative });
+    } catch (error) {
+      if (error instanceof CompileError) throw error;
+      throw error;
+    }
+
+    const { code, includes, includeEntries } = codegen(ast, {
+      viewId,
+      file: relative,
+      knownComponents,
+    });
+
+    compiled.set(viewId, { code, includes, includeEntries, source, relative });
+  }
+
+  // Include hedefleri mevcut mu?
+  for (const [, { includeEntries, source, relative }] of compiled) {
+    for (const { id, index } of includeEntries) {
+      const normalized = normalizeIncludeId(id);
+      if (!compiled.has(normalized) && !jskFiles.has(normalized)) {
+        throw new CompileError(`Unknown include "${id}"`, {
+          file: relative,
+          source,
+          index,
+        });
+      }
+    }
+  }
+
+  for (const [viewId, { code }] of compiled) {
+    const outFile = path.join(outDir, `${viewId}.mjs`);
+    fs.mkdirSync(path.dirname(outFile), { recursive: true });
+    fs.writeFileSync(outFile, code, "utf8");
+    manifest[viewId] = `${viewId}.mjs`.split(path.sep).join("/");
+  }
+
+  const manifestPath = path.join(outDir, "manifest.json");
+  fs.writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`, "utf8");
+
+  // Bileşen adı → view id haritası (runtime kayıt için)
+  /** @type {Record<string, string>} */
+  const components = {};
+  for (const viewId of Object.keys(manifest)) {
+    const name = componentNameFromViewId(viewId);
+    if (name) components[name] = viewId;
+  }
+  fs.writeFileSync(
+    path.join(outDir, "components.json"),
+    `${JSON.stringify(components, null, 2)}\n`,
+    "utf8",
+  );
+
+  return { count: compiled.size, manifest, outDir };
+}
+
+/**
+ * Manifest yoksa veya herhangi bir `.jsk` daha yeniyse yeniden derler.
+ * Dev sunucu restart'ında build watch kaçırmış olsa bile şablonlar güncel kalır.
+ *
+ * @param {{ root: string, dirs: Record<string, string> }} config
+ * @returns {Promise<{ count: number, rebuilt: boolean }>}
+ */
+export async function ensureTemplatesCompiled(config) {
+  const viewRoots = getViewRoots(config);
+  const jskFiles = discoverJskFiles(viewRoots);
+  if (jskFiles.size === 0) {
+    return { count: 0, rebuilt: false };
+  }
+
+  const outDir = path.join(config.dirs.generated, "templates");
+  const manifestPath = path.join(outDir, "manifest.json");
+  let needs = !fs.existsSync(manifestPath);
+
+  if (!needs) {
+    const manifestMtime = fs.statSync(manifestPath).mtimeMs;
+    for (const file of jskFiles.values()) {
+      if (fs.statSync(file).mtimeMs > manifestMtime) {
+        needs = true;
+        break;
+      }
+    }
+  }
+
+  if (!needs) {
+    return { count: jskFiles.size, rebuilt: false };
+  }
+
+  const result = await compileAll(config, { quiet: true });
+  return { count: result.count, rebuilt: true };
+}
+
+/**
+ * Tek kaynak dizgisini derler (birim testleri).
+ * @param {string} source
+ * @param {{ viewId?: string, file?: string, knownComponents?: Set<string> }} [options]
+ * @returns {{ code: string, includes: string[], components: string[] }}
+ */
+export function compileSource(source, options = {}) {
+  const viewId = options.viewId ?? "test";
+  const ast = parseTemplate(source, { file: options.file ?? "test.jsk" });
+  return codegen(ast, {
+    viewId,
+    file: options.file ?? "test.jsk",
+    knownComponents: options.knownComponents ?? null,
+  });
+}

package/src/compile/errors.js

@@ -1,66 +1,66 @@
-/**
- * Şablon derleme hataları. Satır/sütun korunur ki DX overlay ve CLI
- * çıktısı kaynağa işaret edebilsin.
- */
-
-/**
- * @param {string} source
- * @param {number} index
- * @returns {{ line: number, column: number }}
- */
-export function indexToLocation(source, index) {
-  let line = 1;
-  let column = 1;
-  const end = Math.min(index, source.length);
-  for (let i = 0; i < end; i++) {
-    if (source[i] === "\n") {
-      line += 1;
-      column = 1;
-    } else {
-      column += 1;
-    }
-  }
-  return { line, column };
-}
-
-/**
- * @param {string} source
- * @param {number} line
- * @returns {string}
- */
-function lineSnippet(source, line) {
-  const lines = source.split(/\r?\n/);
-  return lines[line - 1] ?? "";
-}
-
-export class CompileError extends Error {
-  /**
-   * @param {string} message
-   * @param {{ file?: string, source?: string, index?: number,
-   *   line?: number, column?: number }} [opts]
-   */
-  constructor(message, opts = {}) {
-    let line = opts.line;
-    let column = opts.column;
-    if ((line == null || column == null) && opts.source != null && opts.index != null) {
-      const loc = indexToLocation(opts.source, opts.index);
-      line = loc.line;
-      column = loc.column;
-    }
-
-    const where =
-      opts.file && line != null
-        ? `${opts.file}:${line}:${column ?? 1}`
-        : opts.file ?? "";
-    const snippet =
-      opts.source && line != null ? lineSnippet(opts.source, line).trimEnd() : "";
-    const head = where ? `${where}\n` : "";
-    const body = snippet ? `${message}\n\n  ${snippet}\n  ${" ".repeat((column ?? 1) - 1)}^` : message;
-
-    super(`${head}${body}`);
-    this.name = "CompileError";
-    this.file = opts.file;
-    this.line = line;
-    this.column = column;
-  }
-}
+/**
+ * Şablon derleme hataları. Satır/sütun korunur ki DX overlay ve CLI
+ * çıktısı kaynağa işaret edebilsin.
+ */
+
+/**
+ * @param {string} source
+ * @param {number} index
+ * @returns {{ line: number, column: number }}
+ */
+export function indexToLocation(source, index) {
+  let line = 1;
+  let column = 1;
+  const end = Math.min(index, source.length);
+  for (let i = 0; i < end; i++) {
+    if (source[i] === "\n") {
+      line += 1;
+      column = 1;
+    } else {
+      column += 1;
+    }
+  }
+  return { line, column };
+}
+
+/**
+ * @param {string} source
+ * @param {number} line
+ * @returns {string}
+ */
+function lineSnippet(source, line) {
+  const lines = source.split(/\r?\n/);
+  return lines[line - 1] ?? "";
+}
+
+export class CompileError extends Error {
+  /**
+   * @param {string} message
+   * @param {{ file?: string, source?: string, index?: number,
+   *   line?: number, column?: number }} [opts]
+   */
+  constructor(message, opts = {}) {
+    let line = opts.line;
+    let column = opts.column;
+    if ((line == null || column == null) && opts.source != null && opts.index != null) {
+      const loc = indexToLocation(opts.source, opts.index);
+      line = loc.line;
+      column = loc.column;
+    }
+
+    const where =
+      opts.file && line != null
+        ? `${opts.file}:${line}:${column ?? 1}`
+        : opts.file ?? "";
+    const snippet =
+      opts.source && line != null ? lineSnippet(opts.source, line).trimEnd() : "";
+    const head = where ? `${where}\n` : "";
+    const body = snippet ? `${message}\n\n  ${snippet}\n  ${" ".repeat((column ?? 1) - 1)}^` : message;
+
+    super(`${head}${body}`);
+    this.name = "CompileError";
+    this.file = opts.file;
+    this.line = line;
+    this.column = column;
+  }
+}