@lumeland/core 1.0.0-beta-8 → 1.0.0-beta-9

package/README.md

@@ -0,0 +1,7 @@
+# @lumeland/core
+
+The core of Lume SSG
+
+---
+
+Please see [CHANGELOG](CHANGELOG.md) for information about the recent changes.

package/build/deps/cli.d.ts

@@ -1 +1 @@
-export { parseArgs } from "deno-std/cli/parse_args.js";
+export { parseArgs } from "deno-std/cli/parse-args.js";

package/build/deps/cli.js

@@ -1 +1 @@
-export { parseArgs } from "deno-std/cli/parse_args.js";
+export { parseArgs } from "deno-std/cli/parse-args.js";

package/build/deps/front-matter.d.ts

@@ -0,0 +1,2 @@
+export * from "deno-std/front-matter/any.js";
+export { test } from "deno-std/front-matter/test.js";

package/build/deps/front-matter.js

@@ -0,0 +1,2 @@
+export * from "deno-std/front-matter/any.js";
+export { test } from "deno-std/front-matter/test.js";

package/build/deps/media-types.d.ts

@@ -0,0 +1,2 @@
+export { contentType } from "deno-std/media-types/content-type.js";
+export { typeByExtension } from "deno-std/media-types/type-by-extension.js";

package/build/deps/media-types.js

@@ -0,0 +1,2 @@
+export { contentType } from "deno-std/media-types/content-type.js";
+export { typeByExtension } from "deno-std/media-types/type-by-extension.js";

package/build/deps/path.d.ts

@@ -1,4 +1,4 @@
 export { posix, sep as SEPARATOR } from "node:path";
 export { basename, dirname, extname, join, relative } from "node:path";
-export { globToRegExp } from "deno-std/path/glob_to_regexp.js";
+export { globToRegExp } from "deno-std/path/glob-to-regexp.js";
 export { fileURLToPath as fromFileUrl, pathToFileURL as toFileUrl } from "node:url";

package/build/deps/path.js

@@ -1,6 +1,6 @@
 export { posix, sep as SEPARATOR } from "node:path";
 export { basename, dirname, extname, join, relative } from "node:path";
-export { globToRegExp } from "deno-std/path/glob_to_regexp.js";
+export { globToRegExp } from "deno-std/path/glob-to-regexp.js";
 export { fileURLToPath as fromFileUrl, pathToFileURL as toFileUrl } from "node:url";
 // posix.dirname
 // posix.join

package/build/src/archetypes.d.ts

@@ -9,13 +9,22 @@ export default class Archetypes {
     constructor(options: Options);
     register(name: string, archetype: string | Archetype): void;
     run(name: string, args?: string[]): Promise<void>;
-    save(file: ArchetypeFile): Promise<void>;
+    save(file: ArchetypeFile | ArchetypeRemote): Promise<void>;
     load(name: string): Promise<Archetype>;
 }
-export type Archetype = (...args: string[]) => void | ArchetypeFile | Generator<ArchetypeFile> | AsyncGenerator<ArchetypeFile>;
+export type Archetype = (...args: string[]) => void | ArchetypeFile | ArchetypeRemote | Generator<ArchetypeFile | ArchetypeRemote> | AsyncGenerator<ArchetypeFile | ArchetypeRemote>;
+/** To generate files dynamically */
 export interface ArchetypeFile<T = unknown> {
     base?: "src" | "root";
     path: string;
     overwrite?: boolean;
     content: T | URL | ((prev?: T) => T | Promise<T>);
+    url?: string;
+}
+/** Allow to download files */
+export interface ArchetypeRemote {
+    url: string | URL;
+    path?: string;
+    files: string[];
+    overwrite?: boolean;
 }

package/build/src/archetypes.js

@@ -7,7 +7,7 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     return path;
 };
 import { parse, stringify } from "../deps/yaml.js";
-import { extract, test } from "../deps/front_matter.js";
+import { extract, test } from "../deps/front-matter.js";
 import { ensureDir } from "./utils/fs.js";
 import { dirname, join, toFileUrl } from "../deps/path.js";
 import { isGenerator } from "./utils/generator.js";
@@ -16,6 +16,7 @@ import { isUrl } from "./utils/path.js";
 import { cwd } from "./services/process.js";
 import { readTextFile, writeFile, writeTextFile } from "./services/fs.js";
 import { read } from "./utils/read.js";
+import { getFiles, isFromCdn } from "./utils/cdn.js";
 export default class Archetypes {
     archetypes = new Map();
     src;
@@ -53,6 +54,13 @@ export default class Archetypes {
         }
     }
     async save(file) {
+        if (isRemote(file)) {
+            const files = await remoteToFile(file);
+            for (const file of files) {
+                await this.save(file);
+            }
+            return;
+        }
         const { path, base = "src", content, overwrite } = file;
         if (!path) {
             throw new Error("Archetype path is required.");
@@ -154,3 +162,26 @@ async function readFile(path) {
         throw error;
     }
 }
+function isRemote(arch) {
+    return !!arch.url;
+}
+async function remoteToFile(remote) {
+    const overwrite = remote.overwrite;
+    const url = remote.url.toString();
+    if (isFromCdn(url) || url.startsWith("file:")) {
+        const files = await getFiles(url, remote.files);
+        return Array.from(files).map(([file, url]) => ({
+            path: join(remote.path ?? "/", file),
+            overwrite,
+            content: new URL(url),
+        }));
+    }
+    if (isUrl(url)) {
+        return remote.files.map((file) => ({
+            path: join(remote.path ?? "/", file),
+            overwrite,
+            content: new URL(url),
+        }));
+    }
+    throw new Error(`Invalid archifact's url "${url}"`);
+}

package/build/src/components.js

@@ -12,7 +12,7 @@ export class ComponentLoader {
         if (!components) {
             components = new Map();
         }
-        for await (const entry of dirEntry.children.values()) {
+        for (const entry of dirEntry.children.values()) {
             if (entry.name.startsWith(".") || entry.name.startsWith("_")) {
                 continue;
             }

package/build/src/{data_loader.js → data-loader.js}

@@ -26,7 +26,7 @@ export default class DataLoader {
     /** Load a _data directory */
     async #loadDirectory(entry) {
         const data = {};
-        for await (const child of entry.children.values()) {
+        for (const child of entry.children.values()) {
             await this.loadEntry(child, data);
         }
         return data;

package/build/src/loaders/text.js

@@ -1,4 +1,4 @@
-import { extract, test } from "../../deps/front_matter.js";
+import { extract, test } from "../../deps/front-matter.js";
 import { read } from "../utils/read.js";
 /** Load a text file. Detect and parse the front matter */
 export default async function text(path) {

package/build/src/path.d.ts

@@ -0,0 +1,20 @@
+export default class Path {
+    #private;
+    static create(path: string | Path): Path;
+    static createDecoded(path: string): Path;
+    private constructor();
+    clone(): Path;
+    get dirname(): string;
+    toString(): string;
+    valueOf(): string;
+    get full(): string;
+    get url(): URL;
+    get basename(): string;
+    get extension(): string;
+    set extension(ext: string);
+    join(...paths: string[]): this;
+    removeBase(base: string | Path): this;
+    addBase(base: string | Path): this;
+    belongsTo(base: string | Path): boolean;
+    contains(base: string | Path): boolean;
+}

package/build/src/path.js

@@ -0,0 +1,101 @@
+import { fromFileUrl, toFileUrl, posix, SEPARATOR } from "../deps/path.js";
+import { decodeURIComponentSafe } from "./utils/path.js";
+const WINDOWS_ABSOLUTE = /^\w:[\\/]/;
+const EXTENSION = /\.\w+$/;
+export default class Path {
+    #drive;
+    #path;
+    static create(path) {
+        if (typeof path === "string") {
+            const [d, p] = parse(path);
+            return new Path(d, p);
+        }
+        return path;
+    }
+    static createDecoded(path) {
+        return Path.create(decodeURIComponentSafe(path));
+    }
+    constructor(drive, path) {
+        this.#drive = drive;
+        this.#path = path;
+    }
+    clone() {
+        return new Path(this.#drive, this.#path);
+    }
+    get dirname() {
+        return posix.dirname(this.#path);
+    }
+    toString() {
+        return this.#path;
+    }
+    valueOf() {
+        return this.#path;
+    }
+    get full() {
+        return this.#drive ? `${this.#drive}:${this.#path}` : this.#path;
+    }
+    get url() {
+        return toFileUrl(this.full);
+    }
+    get basename() {
+        return posix.basename(this.#path, this.extension);
+    }
+    get extension() {
+        const match = this.#path.match(EXTENSION);
+        return match ? match[0].toLowerCase() : "";
+    }
+    set extension(ext) {
+        const length = this.extension.length;
+        this.#path = `${length ? this.#path.slice(0, -length) : this.#path}${ext}`;
+    }
+    join(...paths) {
+        this.#path = posix.join(this.#path, ...paths);
+        return this;
+    }
+    removeBase(base) {
+        this.#drive = undefined;
+        base = Path.create(base).toString();
+        if (base.length > 1 && base.endsWith("/")) {
+            base = base.slice(0, -1);
+        }
+        if (this.#path === base || this.#path.startsWith(base)) {
+            this.#path = posix.join("/", this.#path.slice(base.length));
+        }
+        return this;
+    }
+    addBase(base) {
+        if (base instanceof Path) {
+            this.#drive = base.#drive;
+        }
+        base = Path.create(base).toString();
+        if (!this.#path.startsWith(base)) {
+            this.#path = posix.join(base, this.#path);
+        }
+        return this;
+    }
+    belongsTo(base) {
+        base = Path.create(base).toString();
+        if (base.length > 1 && base.endsWith("/")) {
+            base = base.slice(0, -1);
+        }
+        return this.#path === base || this.#path.startsWith(base);
+    }
+    contains(base) {
+        return Path.create(base).belongsTo(this);
+    }
+}
+function parse(path) {
+    let drive;
+    if (path.startsWith("file://")) {
+        path = fromFileUrl(path);
+    }
+    if (path.match(WINDOWS_ABSOLUTE)) {
+        drive = path[0];
+        path = path.slice(2).replaceAll("\\", "/");
+    }
+    else if (SEPARATOR !== "/") {
+        path = path.replaceAll("\\", "/");
+    }
+    path = posix.join("/", path);
+    return [drive, path];
+}

package/build/src/processors.js

@@ -8,7 +8,6 @@ export default class Processors {
     /** Loaded extensions cache */
     loadedExtensions = new Set();
     /** Assign a processor to some extensions */
-    // deno-lint-ignore no-explicit-any
     set(extensions, processor) {
         if (Array.isArray(extensions)) {
             extensions.forEach((extension) => {

package/build/src/renderer.d.ts

@@ -5,7 +5,6 @@ import type Formats from "./formats.ts";
 import type FS from "./fs.ts";
 import type DebugBar from "./debugbar.ts";
 export interface Options {
-    includes: string;
     prettyUrls: boolean;
     preprocessors: Processors;
     formats: Formats;
@@ -17,8 +16,6 @@ export interface Options {
  */
 export default class Renderer {
     #private;
-    /** The default folder to include the layouts */
-    includes: string;
     /** The filesystem instance used to read the layouts */
     fs: FS;
     /** To convert the urls to pretty /example.html => /example/ */

package/build/src/renderer.js

@@ -1,18 +1,16 @@
-import { resolveInclude } from "./utils/path.js";
 import { isGenerator } from "./utils/generator.js";
 import { concurrent } from "./utils/concurrent.js";
-import { mergeData } from "./utils/merge_data.js";
-import { getBasename, getPageUrl } from "./utils/page_url.js";
-import { getPageDate } from "./utils/page_date.js";
+import { mergeData } from "./utils/merge-data.js";
+import { getBasename, getPageUrl } from "./utils/page-url.js";
+import { getPageDate } from "./utils/page-date.js";
 import { posix } from "../deps/path.js";
 import { log } from "./utils/log.js";
+import { getInclude } from "./utils/includes.js";
 /**
  * The renderer is responsible for rendering the site pages
  * in the right order and using the right template engine.
  */
 export default class Renderer {
-    /** The default folder to include the layouts */
-    includes;
     /** The filesystem instance used to read the layouts */
     fs;
     /** To convert the urls to pretty /example.html => /example/ */
@@ -24,7 +22,6 @@ export default class Renderer {
     /** The registered helpers */
     helpers = new Map();
     constructor(options) {
-        this.includes = options.includes;
         this.prettyUrls = options.prettyUrls;
         this.preprocessors = options.preprocessors;
         this.formats = options.formats;
@@ -164,7 +161,7 @@ export default class Renderer {
     /** Render the page layout */
     async #renderLayout(page, content) {
         let data = { ...page.data };
-        let path = page.src.path + page.src.ext;
+        let path = posix.dirname(page.src.path + page.src.ext);
         let layout = data.layout;
         // Render the layouts recursively
         while (layout) {
@@ -172,22 +169,17 @@ export default class Renderer {
             if (!format || !format.loader) {
                 throw new Error(`The layout format "${layout}" doesn't exist`);
             }
-            const includesPath = format.engines?.[0].includes;
-            if (!includesPath) {
-                throw new Error(`The layout format "${layout}" doesn't support includes`);
+            const layoutEntry = getInclude(path, layout, this.fs);
+            if (!layoutEntry) {
+                throw new Error(`The layout file "${layout}" for the file "${path}" doesn't exist`);
             }
-            const layoutPath = resolveInclude(layout, includesPath, posix.dirname(path));
-            const entry = this.fs.entries.get(layoutPath);
-            if (!entry) {
-                throw new Error(`The layout file "${layoutPath}" doesn't exist`);
-            }
-            const layoutData = await entry.getContent(format.loader);
+            const layoutData = await layoutEntry.getContent(format.loader);
             delete data.layout;
             delete data.templateEngine;
             data = mergeData(layoutData, data, { content });
-            content = await this.render(layoutData.content, data, layoutPath, true);
+            content = await this.render(layoutData.content, data, layoutEntry.path, true);
             layout = layoutData.layout;
-            path = layoutPath;
+            path = layoutEntry.path.split("/_includes/")[0];
         }
         return content;
     }

package/build/src/searcher.d.ts

@@ -20,7 +20,7 @@ export default class Searcher {
     /**
      * Return the data in the scope of a path (file or folder)
      */
-    data<T>(path?: string): Data<T> | DirectoryData<T> | undefined;
+    data<T>(rawPath?: string): Data<T> | DirectoryData<T> | undefined;
     /** Search pages */
     pages<T>(query?: string, sort?: string, limit?: number): Data<T>[];
     /** Search and return the first page */

package/build/src/searcher.js

@@ -1,5 +1,5 @@
 import { globToRegExp } from "../deps/path.js";
-import { normalizePath } from "./utils/path.js";
+import Path from "./path.js";
 /** Search helper */
 export default class Searcher {
     #pages;
@@ -22,13 +22,13 @@ export default class Searcher {
     /**
      * Return the data in the scope of a path (file or folder)
      */
-    data(path = "/") {
-        const normalized = normalizePath(path);
-        const dirData = this.#sourceData.get(normalized);
+    data(rawPath = "/") {
+        const path = Path.create(rawPath).toString();
+        const dirData = this.#sourceData.get(path);
         if (dirData) {
             return dirData;
         }
-        const result = this.#pages.find((page) => page.data.url === normalized || page.data.sourcePath === normalized);
+        const result = this.#pages.find((page) => page.data.url === path || page.data.sourcePath === path);
         if (result) {
             return result.data;
         }
@@ -159,6 +159,7 @@ function compileFilter(conditions) {
         values.push(value);
     });
     args.push(`return (data) => ${filters.join(" && ")};`);
+    // oxlint-disable-next-line typescript/no-implied-eval
     const factory = new Function(...args);
     return factory(...values);
 }
@@ -330,5 +331,6 @@ export function buildSort(sort) {
                 break;
         }
     });
+    // oxlint-disable-next-line typescript/no-implied-eval
     return new Function(`${init} return function (a, b) { return ${fn}; }`)();
 }

package/build/src/server.d.ts

@@ -1,5 +1,5 @@
 import Events from "./events.ts";
-import { serveFile } from "./utils/serve_file.ts";
+import { serveFile } from "./utils/serve-file.ts";
 import type { Event, EventListener, EventOptions } from "./events.ts";
 import type { HTTPHandlerInfo, NetAddress } from "./services/net.ts";
 import type { Merge } from "./utils/object.ts";

package/build/src/server.js

@@ -1,5 +1,5 @@
 import Events from "./events.js";
-import { serveFile } from "./utils/serve_file.js";
+import { serveFile } from "./utils/serve-file.js";
 import { cwd } from "./services/process.js";
 import { merge } from "./utils/object.js";
 import { serve } from "./services/net.js";
@@ -9,7 +9,6 @@ export const defaults = {
     serveFile,
 };
 export default class Server {
-    // deno-lint-ignore no-explicit-any
     events = new Events();
     options;
     middlewares = [];
@@ -74,17 +73,17 @@ export default class Server {
                 signal,
                 onListen: () => {
                     if (!this.#waiting) {
-                        this.dispatchEvent({ type: "start" });
+                        void this.dispatchEvent({ type: "start" });
                     }
                 },
                 onUpgradeWebSocket: (socket) => {
-                    this.dispatchEvent({ type: "upgrade", socket });
+                    void this.dispatchEvent({ type: "upgrade", socket });
                 },
             });
         }
         else if (this.#waiting) {
             this.#waiting = false;
-            this.dispatchEvent({ type: "start" });
+            void this.dispatchEvent({ type: "start" });
         }
     }
     /** Stops the server */
@@ -93,7 +92,7 @@ export default class Server {
             this.#server?.shutdown();
         }
         catch (err) {
-            this.dispatchEvent({
+            void this.dispatchEvent({
                 type: "error",
                 error: err,
             });

package/build/src/site.d.ts

@@ -1,6 +1,7 @@
+import Path from "./path.ts";
 import FS from "./fs.ts";
 import { ComponentLoader } from "./components.ts";
-import DataLoader from "./data_loader.ts";
+import DataLoader from "./data-loader.ts";
 import Source from "./source.ts";
 import Scopes from "./scopes.ts";
 import Processors from "./processors.ts";
@@ -28,7 +29,7 @@ import type { Middleware } from "./server.ts";
 import type { ScopeFilter } from "./scopes.ts";
 import type { ScriptOrFunction } from "./scripts.ts";
 import type { Merge } from "./utils/object.ts";
-import type { MergeStrategy } from "./utils/merge_data.ts";
+import type { MergeStrategy } from "./utils/merge-data.ts";
 import type { Data, DefaultType } from "./types.ts";
 import type { HTTPHandlerInfo } from "./services/net.ts";
 /** Default options of the site */
@@ -38,7 +39,6 @@ declare const defaults: {
     dest: string;
     emptyDest: true;
     caseSensitiveUrls: false;
-    includes: string;
     cssFile: string;
     jsFile: string;
     fontsFolder: string;
@@ -66,6 +66,7 @@ declare const defaults: {
 export default class Site {
     #private;
     options: Merge<SiteOptions, typeof defaults>;
+    rootPath: Path;
     /** Internal data. Used to save arbitrary data by plugins and processors */
     _data: Record<string, unknown>;
     /** To register and run archetypes */
@@ -237,13 +238,6 @@ export default class Site {
     /** Returns a Web server of the site */
     getServer(): Server;
 }
-/** The options for the resolve function */
-export interface ResolveOptions {
-    /** Whether search in the includes folder or not */
-    includes?: boolean;
-    /** Default loader */
-    loader?: Loader;
-}
 /** The options to configure the site build */
 export interface SiteOptions {
     /** The path of the current working directory */
@@ -254,8 +248,6 @@ export interface SiteOptions {
     dest?: string;
     /** Whether the empty folder should be emptied before the build */
     emptyDest?: boolean;
-    /** The default includes path */
-    includes?: string;
     /** The default css file */
     cssFile?: string;
     /** The default js file */

package/build/src/site.js

@@ -1,15 +1,16 @@
-import { fromFileUrl, join, posix } from "../deps/path.js";
+import { fromFileUrl, posix } from "../deps/path.js";
 import { merge } from "./utils/object.js";
-import { isUrl, normalizePath } from "./utils/path.js";
+import { isUrl } from "./utils/path.js";
 import { envBoolean, setEnv } from "./utils/env.js";
 import { log } from "./utils/log.js";
-import { filter404page } from "./utils/page_url.js";
-import { insertContent } from "./utils/page_content.js";
+import { filter404page } from "./utils/page-url.js";
+import { insertContent } from "./utils/page-content.js";
 import { getFile, getFiles, isFromCdn } from "./utils/cdn.js";
 import { setCache } from "./utils/read.js";
+import Path from "./path.js";
 import FS from "./fs.js";
 import { ComponentLoader } from "./components.js";
-import DataLoader from "./data_loader.js";
+import DataLoader from "./data-loader.js";
 import Source from "./source.js";
 import Scopes from "./scopes.js";
 import Processors from "./processors.js";
@@ -37,7 +38,6 @@ const defaults = {
     dest: "./_site",
     emptyDest: true,
     caseSensitiveUrls: false,
-    includes: "_includes",
     cssFile: "/style.css",
     jsFile: "/script.js",
     fontsFolder: "/fonts",
@@ -64,6 +64,7 @@ const defaults = {
  */
 export default class Site {
     options;
+    rootPath;
     /** Internal data. Used to save arbitrary data by plugins and processors */
     _data = {};
     /** To register and run archetypes */
@@ -87,7 +88,6 @@ export default class Site {
     /** To render the pages using any template engine */
     renderer;
     /** To listen and dispatch events */
-    // deno-lint-ignore no-explicit-any
     events;
     /** To run scripts */
     scripts;
@@ -104,7 +104,6 @@ export default class Site {
     /** Components created with site.component() */
     scopedComponents = new Map();
     /** Hooks installed by the plugins */
-    // deno-lint-ignore no-explicit-any
     hooks = {};
     /** The debug bar data */
     debugBar;
@@ -120,10 +119,11 @@ export default class Site {
         if (this.options.cwd.startsWith("file:")) {
             this.options.cwd = fromFileUrl(this.options.cwd);
         }
+        this.rootPath = Path.create(this.options.cwd);
         const root = this.root();
         const src = this.src();
         const dest = this.dest();
-        const { includes, cwd, prettyUrls, components, server, caseSensitiveUrls } = this.options;
+        const { cwd, prettyUrls, components, server, caseSensitiveUrls } = this.options;
         // To load source files
         const fs = new FS({ root: src });
         const formats = new Formats();
@@ -153,7 +153,6 @@ export default class Site {
             preprocessors,
             formats,
             fs,
-            includes,
         });
         // Other stuff
         const archetypes = new Archetypes({ src, root });
@@ -188,12 +187,10 @@ export default class Site {
         if (this.dest().startsWith(this.src())) {
             this.ignore(this.options.dest);
         }
-        // Ignore the includes folder
-        this.ignore(this.options.includes);
         // Normalize the ignored paths
-        this.options.watcher.ignore = this.options.watcher.ignore.map((path) => typeof path === "string" ? normalizePath(path) : path);
+        this.options.watcher.ignore = this.options.watcher.ignore.map((path) => typeof path === "string" ? Path.create(path).toString() : path);
         // Ignore the dest folder by the watcher
-        this.options.watcher.ignore.push(normalizePath(this.options.dest));
+        this.options.watcher.ignore.push(Path.create(this.options.dest).toString());
         this.fs.options.ignore = this.options.watcher.ignore;
         // Initialize the cache if LUME_NOCACHE is not enabled
         if (envBoolean("LUME_NOCACHE") !== true) {
@@ -225,7 +222,7 @@ export default class Site {
         debugBar.addEventListener("lume:drafts", (event) => {
             const showDrafts = event.data.value ?? "false";
             setEnv("LUME_DRAFTS", String(showDrafts));
-            this.update();
+            void this.update();
         });
         return this;
     }
@@ -234,7 +231,7 @@ export default class Site {
      * Use the arguments to return a subpath
      */
     root(...path) {
-        return normalizePath(join(this.options.cwd, ...path));
+        return this.rootPath.clone().join(...path).full;
     }
     /**
      * Returns the full path to the src directory.
@@ -469,7 +466,7 @@ export default class Site {
         if (from.startsWith("../")) {
             throw new Error(`It's not possible to copy files outsite the src directory ("${from}")`);
         }
-        this.source.addFile(normalizePath(from), to ?? ((str) => str), copy);
+        this.source.addFile(Path.create(from).toString(), to ?? ((str) => str), copy);
     }
     /** Ignore one or several files or directories */
     ignore(...paths) {
@@ -528,7 +525,7 @@ export default class Site {
         this.debugBar?.startMeasure("build");
         if ((await this.dispatchEvent({ type: "beforeBuild" })) === false) {
             this.debugBar?.endMeasure("build", "Build cancelled");
-            this.dispatchEvent({ type: "idle" });
+            await this.dispatchEvent({ type: "idle" });
             return;
         }
         if (this.options.emptyDest) {
@@ -540,7 +537,7 @@ export default class Site {
         this.debugBar?.endMeasure("scan", "[Loading] Scan source folder");
         if ((await this.dispatchEvent({ type: "afterLoad" })) === false) {
             this.debugBar?.endMeasure("build", "Build cancelled");
-            this.dispatchEvent({ type: "idle" });
+            await this.dispatchEvent({ type: "idle" });
             return;
         }
         // Get the site content
@@ -550,7 +547,7 @@ export default class Site {
         // Stop if the build is cancelled
         if ((await this.#buildPages(_pages)) === false) {
             this.debugBar?.endMeasure("build", "Build cancelled");
-            this.dispatchEvent({ type: "idle" });
+            await this.dispatchEvent({ type: "idle" });
             return;
         }
         // Save the pages and copy static files in the dest folder
@@ -560,7 +557,7 @@ export default class Site {
         this.debugBar?.endMeasure("save", `[Write] ${pages.length + staticFiles.length} files`);
         await this.dispatchEvent({ type: "afterBuild", pages, staticFiles });
         this.debugBar?.endMeasure("build", "Site generated");
-        this.dispatchEvent({ type: "idle" });
+        await this.dispatchEvent({ type: "idle" });
     }
     /** Reload some files that might be changed */
     async update(files) {
@@ -568,7 +565,7 @@ export default class Site {
         this.debugBar?.startMeasure("build");
         if ((await this.dispatchEvent({ type: "beforeUpdate", files })) === false) {
             this.debugBar?.endMeasure("build", "Update cancelled");
-            this.dispatchEvent({ type: "idle" });
+            await this.dispatchEvent({ type: "idle" });
             return;
         }
         this.search.deleteCache();
@@ -593,7 +590,7 @@ export default class Site {
         this.debugBar?.endMeasure("reload", `[Loading] Updated ${files?.size ?? 0} files`);
         if ((await this.dispatchEvent({ type: "afterLoad" })) === false) {
             this.debugBar?.endMeasure("build", "Update cancelled");
-            this.dispatchEvent({ type: "idle" });
+            await this.dispatchEvent({ type: "idle" });
             return;
         }
         // Get the site content
@@ -603,7 +600,7 @@ export default class Site {
         this.files.splice(0, this.files.length, ..._staticFiles);
         if ((await this.#buildPages(_pages)) === false) {
             this.debugBar?.endMeasure("build", "Update cancelled");
-            this.dispatchEvent({ type: "idle" });
+            await this.dispatchEvent({ type: "idle" });
             return;
         }
         // Save the pages and copy static files in the dest folder
@@ -618,7 +615,7 @@ export default class Site {
             pages,
             staticFiles,
         });
-        this.dispatchEvent({ type: "idle" });
+        await this.dispatchEvent({ type: "idle" });
     }
     /**
      * Internal function to load pages
@@ -786,7 +783,7 @@ export default class Site {
         }
     }
     async getOrCreatePage(url) {
-        url = normalizePath(url);
+        url = Path.create(url).toString();
         // It's a page
         const page = this.pages.find((page) => page.data.url === url);
         if (page) {
@@ -814,11 +811,7 @@ export default class Site {
         return newPage;
     }
     async getContent(file, binary) {
-        file = normalizePath(file);
-        const basePath = this.src();
-        if (file.startsWith(basePath)) {
-            file = normalizePath(file.slice(basePath.length));
-        }
+        file = Path.create(file).removeBase(this.src()).toString();
         file = decodeURI(file);
         const url = encodeURI(file);
         // It's a page

package/build/src/source.d.ts

@@ -2,7 +2,7 @@ import { Page, StaticFile } from "./file.ts";
 import type { DirectoryData, RawData } from "./types.ts";
 import type { default as FS, Entry } from "./fs.ts";
 import type { default as Formats } from "./formats.ts";
-import type DataLoader from "./data_loader.ts";
+import type DataLoader from "./data-loader.ts";
 import type { ScopeFilter } from "./scopes.ts";
 import type { ComponentLoader, Components } from "./components.ts";
 export interface Options {

package/build/src/source.js

@@ -1,10 +1,11 @@
 import { posix } from "../deps/path.js";
-import { getExtension, normalizePath } from "./utils/path.js";
-import { mergeData } from "./utils/merge_data.js";
-import { getBasename, getPageUrl } from "./utils/page_url.js";
-import { getPageDate } from "./utils/page_date.js";
+import { getExtension } from "./utils/path.js";
+import { mergeData } from "./utils/merge-data.js";
+import { getBasename, getPageUrl } from "./utils/page-url.js";
+import { getPageDate } from "./utils/page-date.js";
 import { Page, StaticFile } from "./file.js";
 import { toProxy } from "./components.js";
+import Path from "./path.js";
 import { log } from "./utils/log.js";
 /**
  * Scan and load files from the source folder
@@ -53,7 +54,7 @@ export default class Source {
         this.basenameParsers = options.basenameParsers;
     }
     addIgnoredPath(path) {
-        this.ignored.add(normalizePath(path));
+        this.ignored.add(Path.create(path).toString());
     }
     addIgnoreFilter(filter) {
         this.filters.push(filter);
@@ -65,13 +66,13 @@ export default class Source {
             }
         }
         else {
-            from = normalizePath(from);
+            from = Path.create(from).toString();
         }
         if (typeof to === "string") {
             if (to.endsWith("/")) {
                 to = to.slice(0, -1);
             }
-            to = normalizePath(to);
+            to = Path.create(to).toString();
         }
         this.addedFiles.set(from, [to, isCopy]);
     }

package/build/src/types.d.ts

@@ -4,7 +4,7 @@ import type { Loader } from "./fs.ts";
 import type { default as Site, Plugin } from "./site.ts";
 import type { Archetype, ArchetypeFile } from "./archetypes.ts";
 import type { Middleware, RequestHandler } from "./server.ts";
-import type { MergeStrategy } from "./utils/merge_data.ts";
+import type { MergeStrategy } from "./utils/merge-data.ts";
 import type { ProxyComponents } from "./components.ts";
 /** Raw data defined for pages or _data files */
 export type RawData<D = unknown> = D & {

package/build/src/utils/cdn.js

@@ -1,6 +1,7 @@
 import { canParse, format, maxSatisfying, parse, parseRange } from "../../deps/semver.js";
-import { fromFileUrl, globToRegExp, join, posix, toFileUrl } from "../../deps/path.js";
+import { fromFileUrl, globToRegExp, join, posix } from "../../deps/path.js";
 import { readDirSync } from "../services/fs.js";
+import Path from "../path.js";
 export async function getFiles(specifier, patterns = ["/**"]) {
     if (specifier.startsWith("file:")) {
         return getFsFiles(specifier, patterns);
@@ -40,11 +41,11 @@ function getFsFiles(specifier, patterns) {
     const fileMap = new Map();
     const regexps = patterns.map((pattern) => globToRegExp(posix.join("/", pattern), { globstar: true, extended: true }));
     for (const path of walk(basePath)) {
-        const filename = join("/", path.slice(basePath.length));
-        if (!regexps.some((regexp) => regexp.test(filename))) {
+        const filename = Path.create(path).removeBase(basePath);
+        if (!regexps.some((regexp) => regexp.test(filename.toString()))) {
             continue;
         }
-        fileMap.set(filename, toFileUrl(path).href);
+        fileMap.set(filename.toString(), filename.url.href);
     }
     return fileMap;
 }

package/build/src/utils/{data_values.js → data-values.js}

@@ -32,7 +32,6 @@ function searchValue(data, value) {
             return data[key] ?? searchValue(data, value);
         }
         const keys = key.split(".");
-        // deno-lint-ignore no-explicit-any
         let val = data;
         for (const key of keys) {
             val = val?.[key];

package/build/src/utils/includes.d.ts

@@ -0,0 +1,2 @@
+import type { default as FS, Entry } from "../fs.ts";
+export declare function getInclude(fromDir: string, to: string, fs: FS): Entry | undefined;

package/build/src/utils/includes.js

@@ -0,0 +1,13 @@
+import { posix } from "../../deps/path.js";
+export function getInclude(fromDir, to, fs) {
+    // Absolute path
+    if (to.startsWith("/_includes/")) {
+        return fs.entries.get(to);
+    }
+    // Relative path
+    if (to.startsWith(".")) {
+        return fs.entries.get(posix.join("/", fromDir, to));
+    }
+    // Get from _includes folder
+    return fs.entries.get(posix.join("/_includes", to));
+}

package/build/src/utils/{page_url.js → page-url.js}

@@ -1,8 +1,8 @@
 import { posix } from "../../deps/path.js";
-import { decodeURIComponentSafe, getExtension, normalizePath } from "./path.js";
+import Path from "../path.js";
 /** Returns a function to filter the 404 page */
 export function filter404page(page404) {
-    const url404 = page404 ? normalizePath(page404) : undefined;
+    const url404 = page404 ? Path.create(page404).toString() : undefined;
     return url404 ? (data) => data.url !== url404 : () => true;
 }
 /** Returns the final part of a url */
@@ -10,10 +10,7 @@ export function getBasename(url) {
     if (url === "/") {
         return "";
     }
-    if (url.endsWith("/")) {
-        return decodeURIComponentSafe(posix.basename(url));
-    }
-    return decodeURIComponentSafe(posix.basename(url, getExtension(url)));
+    return Path.createDecoded(url).basename;
 }
 /** Returns the final URL assigned to a page */
 export function getPageUrl(page, prettyUrls, parentPath, destination) {

package/build/src/utils/path.d.ts

@@ -1,26 +1,13 @@
-/**
- * Convert the Windows paths (that use the separator "\")
- * to Posix paths (with the separator "/")
- * and ensure it starts with "/".
- */
-export declare function normalizePath(path: string, rootToRemove?: string): string;
 /** Check if the path is an URL */
 export declare function isUrl(path: string): boolean;
 /** Check if the path is absolute */
 export declare function isAbsolutePath(path: string): boolean;
-/** Replace the extension of a path */
-export declare function replaceExtension(path: string, ext: string): string;
 /** Split a path to path + extension */
 export declare function getPathAndExtension(path: string): [string, string];
 /** Get the extension of a path (this works better than std/path) */
 export declare function getExtension(path: string): string;
 export type Extensions = string[] | "*";
 export declare function matchExtension(exts: Extensions, path: string): boolean;
-/**
- * Resolve the path of an included file
- * Used in the template engines and processors
- */
-export declare function resolveInclude(path: string, includesDir: string, fromDir?: string, rootToRemove?: string): string;
 /**
  * decodeURI() can't decode the `%` character, as it is used in any encoded character
  * @author [Why does decodeURIComponent('%') lock up my browser?](https://stackoverflow.com/a/54310080/3416774)

package/build/src/utils/path.js

@@ -1,28 +1,4 @@
-import { posix, SEPARATOR } from "../../deps/path.js";
-/**
- * Convert the Windows paths (that use the separator "\")
- * to Posix paths (with the separator "/")
- * and ensure it starts with "/".
- */
-export function normalizePath(path, rootToRemove) {
-    if (rootToRemove) {
-        path = path.replace(rootToRemove, "");
-    }
-    if (SEPARATOR !== "/") {
-        path = path.replaceAll(SEPARATOR, "/");
-        // Is absolute Windows path (C:/...)
-        if (path.includes(":/")) {
-            if (rootToRemove && path.startsWith(rootToRemove)) {
-                return posix.join("/", path.replace(rootToRemove, ""));
-            }
-            return path;
-        }
-    }
-    const absolute = posix.join("/", path);
-    return rootToRemove && absolute.startsWith(rootToRemove)
-        ? posix.join("/", absolute.replace(rootToRemove, ""))
-        : absolute;
-}
+import { SEPARATOR } from "../../deps/path.js";
 /** Check if the path is an URL */
 export function isUrl(path) {
     return !!path.match(/^(https?|file):\/\//);
@@ -31,10 +7,6 @@ export function isUrl(path) {
 export function isAbsolutePath(path) {
     return SEPARATOR !== "/" ? /^\w:[/\\]/.test(path) : path.startsWith("/");
 }
-/** Replace the extension of a path */
-export function replaceExtension(path, ext) {
-    return path.replace(/\.\w+$/, ext);
-}
 /** Split a path to path + extension */
 export function getPathAndExtension(path) {
     const extension = getExtension(path);
@@ -55,25 +27,6 @@ export function matchExtension(exts, path) {
     }
     return exts.some((ext) => path.endsWith(ext));
 }
-/**
- * Resolve the path of an included file
- * Used in the template engines and processors
- */
-export function resolveInclude(path, includesDir, fromDir, rootToRemove) {
-    if (isUrl(path)) {
-        return path;
-    }
-    if (path.startsWith(".")) {
-        if (!fromDir) {
-            throw new Error(`Cannot load "${path}" without a base directory`);
-        }
-        return normalizePath(posix.join(fromDir, path), rootToRemove);
-    }
-    const normalized = normalizePath(path, rootToRemove);
-    return normalized.startsWith(normalizePath(posix.join(includesDir, "/")))
-        ? normalized
-        : normalizePath(posix.join(includesDir, normalized));
-}
 /**
  * decodeURI() can't decode the `%` character, as it is used in any encoded character
  * @author [Why does decodeURIComponent('%') lock up my browser?](https://stackoverflow.com/a/54310080/3416774)

package/build/src/utils/{serve_file.js → serve-file.js}

@@ -1,4 +1,4 @@
-import { contentType } from "../../deps/media_types.js";
+import { contentType } from "../../deps/media-types.js";
 import { decodeURIComponentSafe } from "./path.js";
 import { extname, posix } from "../../deps/path.js";
 import { readStream, statSync } from "../services/fs.js";

package/build/src/watcher.js

@@ -1,6 +1,6 @@
-import { fromFileUrl, join, relative, toFileUrl } from "../deps/path.js";
-import { normalizePath } from "./utils/path.js";
+import { relative } from "../deps/path.js";
 import Events from "./events.js";
+import Path from "./path.js";
 import { updateDependencies, updateVersion } from "./services/hmr.js";
 import { watchFiles } from "./services/fs.js";
 export default class FSWatcher {
@@ -22,7 +22,8 @@ export default class FSWatcher {
     /** Start the file watcher */
     async start() {
         const { root, ignore, debounce, dependencies } = this.options;
-        const watcher = watchFiles(root);
+        const rootPath = Path.create(root);
+        const watcher = watchFiles(rootPath.toString());
         const changes = new Set();
         let timer = undefined;
         let runningCallback = false;
@@ -59,36 +60,35 @@ export default class FSWatcher {
             }
             // New changes detected while running the callback
             if (changes.size) {
-                callback();
+                void callback();
             }
         };
         for await (const changedPaths of watcher) {
             const paths = new Set();
             updateVersion();
-            for (const path of changedPaths.map((p) => normalizePath(p))) {
+            for (const path of changedPaths.map((p) => Path.create(p))) {
                 // Filter ignored paths
                 const isIgnored = ignore?.some((condition) => typeof condition === "string"
-                    ? path.startsWith(normalizePath(join(root, condition, "/"))) ||
-                        path === normalizePath(join(root, condition))
-                    : condition(path));
+                    ? path.belongsTo(rootPath.clone().join(condition))
+                    : condition(path.toString()));
                 if (isIgnored)
                     continue;
-                paths.add(path);
-                for (const dep of updateDependencies(toFileUrl(path).href)) {
-                    paths.add(normalizePath(fromFileUrl(dep)));
+                paths.add(path.toString());
+                for (const dep of updateDependencies(path.url.href)) {
+                    paths.add(Path.create(dep).toString());
                 }
             }
             if (!paths.size) {
                 continue;
             }
             paths.forEach((path) => {
-                const normalized = normalizePath(relative(root, path));
+                const normalized = Path.create(relative(root, path)).toString();
                 changes.add(normalized);
                 // The file has dependencies
                 for (const [file, deps] of Object.entries(dependencies ?? {})) {
-                    const isDependent = deps.some((dep) => normalizePath(dep) === normalized);
+                    const isDependent = deps.some((dep) => Path.create(dep).toString() === normalized);
                     if (isDependent) {
-                        changes.add(normalizePath(file));
+                        changes.add(Path.create(file).toString());
                     }
                 }
             });
@@ -124,7 +124,7 @@ export class SiteWatcher {
                 ...event.pages.map((page) => page.outputPath),
                 ...event.staticFiles.map((file) => file.outputPath),
             ]);
-            this.dispatchEvent({ type: "change", files });
+            void this.dispatchEvent({ type: "change", files });
         });
     }
 }

package/build/src/writer.js

@@ -104,9 +104,7 @@ export class FSWriter {
             return true;
         }
         catch (error) {
-            log.error(
-            // deno-lint-ignore no-explicit-any
-            `Failed to copy file: ${file.outputPath}: ${error.message}`);
+            log.error(`Failed to copy file: ${file.outputPath}: ${error.message}`);
         }
         return false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumeland/core",
-  "version": "1.0.0-beta-8",
+  "version": "1.0.0-beta-9",
   "description": "The core of Lume SSG",
   "license": "MIT",
   "author": "Óscar Otero",
@@ -21,9 +21,9 @@
   },
   "dependencies": {
     "@lumeland/dom": "^0.1.56",
-    "@lumeland/plugin-esbuild": "^1.0.0-beta-8",
-    "@lumeland/plugin-lightningcss": "^1.0.0-beta-8",
-    "deno-std": "1.5.1",
+    "@lumeland/plugin-esbuild": "^1.0.0-beta-9",
+    "@lumeland/plugin-lightningcss": "^1.0.0-beta-9",
+    "deno-std": "^1.6.0",
     "remove-markdown": "0.8.0",
     "temporal-polyfill": "^1.0.6",
     "ws": "^8.22.0"

package/build/deps/front_matter.d.ts

@@ -1,2 +0,0 @@
-export * from "deno-std/front_matter/any.js";
-export { test } from "deno-std/front_matter/test.js";

package/build/deps/front_matter.js

@@ -1,2 +0,0 @@
-export * from "deno-std/front_matter/any.js";
-export { test } from "deno-std/front_matter/test.js";

package/build/deps/media_types.d.ts

@@ -1,2 +0,0 @@
-export { contentType } from "deno-std/media_types/content_type.js";
-export { typeByExtension } from "deno-std/media_types/type_by_extension.js";

package/build/deps/media_types.js

@@ -1,2 +0,0 @@
-export { contentType } from "deno-std/media_types/content_type.js";
-export { typeByExtension } from "deno-std/media_types/type_by_extension.js";