chokibasic 1.1.10 → 1.1.12

package/index.d.ts

@@ -87,6 +87,13 @@ declare namespace chokibasic {
     skipped: number;
   }
 
+  export interface ExportDistOptions {
+    ignore?: string[];
+    include?: string[];
+    debug?: boolean;
+    filter?: (relPath: string) => boolean;
+  }
+
   /** Options forwardées à esbuild.build() */
   export type BuildJSOptions = Parameters<typeof import("esbuild").build>[0];
 
@@ -107,9 +114,12 @@ declare namespace chokibasic {
   export function exportDist(
     src: string,
     dist: string,
-    banner?: string | null
+    banner?: string | null,
+    options?: ExportDistOptions
   ): Promise<ExportDistStats>;
 
+
+
   /**
    * Compile SCSS -> CSS minifié (csso), écrit dans outCssMin.
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chokibasic",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "description": "Basic chokidar watcher + pxpros + esbuild + sass + csso helpers",
   "main": "index.js",
   "types": "index.d.ts",

package/src/buildjs.js

@@ -14,6 +14,7 @@ const buildJS = async (entry, outfile, options = {}) => {
 			supported: { "template-literal": false },
 			target: ["es2020"],
 			legalComments: "none",
+			loader: { '.json': 'json' },
 			...options
 		});
 		console.log(`✅ JS generated: ${outfile}`);

package/src/export.js

@@ -5,14 +5,14 @@ const path = require("path");
 
 const ROOT = process.cwd();
 
-
 async function emptyDir(dir) {
 	await fsprom.mkdir(dir, { recursive: true });
 	const entries = await fsprom.readdir(dir, { withFileTypes: true });
-	await Promise.all(entries.map((e) => fsprom.rm(path.join(dir, e.name), { recursive: true, force: true })));
+	await Promise.all(entries.map((e) =>
+		fsprom.rm(path.join(dir, e.name), { recursive: true, force: true })
+	));
 }
 
-
 function formatFrDate(dateInput = new Date(), timeZone = 'America/Toronto') {
 	const d = (dateInput instanceof Date) ? dateInput : new Date(dateInput);
 	const fmt = new Intl.DateTimeFormat('fr-CA', {
@@ -26,109 +26,164 @@ function formatFrDate(dateInput = new Date(), timeZone = 'America/Toronto') {
 		timeZone
 	});
 	const parts = Object.fromEntries(fmt.formatToParts(d).map(p => [p.type, p.value]));
-	const weekday = parts.weekday.charAt(0).toUpperCase() + parts.weekday.slice(1); // "Samedi"
+	const weekday = parts.weekday.charAt(0).toUpperCase() + parts.weekday.slice(1);
 	return `${weekday} le ${parts.day} ${parts.month} ${parts.year} à ${parts.hour} h ${parts.minute}`;
 }
 
-
 function norm(p) {
-	// normalise en chemin POSIX pour compat .gitignore
 	return p.split(path.sep).join('/');
 }
 
-async function loadGitignore() {
+async function loadGitignore(src, extraPatterns = []) {
 	const ig = ignore();
 	const giPath = path.join(ROOT, '.gitignore');
+
 	if (fs.existsSync(giPath)) {
 		const txt = await fsprom.readFile(giPath, 'utf8');
-		ig.add(txt);
+
+		// ⚠️ IMPORTANT: on convert les patterns ROOT → relatifs à src
+		const lines = txt.split('\n')
+			.map(l => l.trim())
+			.filter(l => l && !l.startsWith('#'))
+			.map(l => {
+				// enlever "/" initial si présent
+				return l.replace(/^\//, '');
+			});
+
+		ig.add(lines);
 	}
-	// on ignore aussi le dossier dist par sécurité (pas nécessaire mais sain)
+
+	// Toujours ignorer dist (relatif ROOT → on garde tel quel)
 	ig.add('dist/');
-	return ig;
-}
 
-async function rmDir(dir) {
-	await fsprom.rm(dir, { recursive: true, force: true });
-	await fsprom.mkdir(dir, { recursive: true });
+	// 👇 Patterns custom (déjà relatifs à src)
+	if (Array.isArray(extraPatterns)) {
+		ig.add(extraPatterns);
+	}
+
+	return ig;
 }
 
-function shouldExcludeFile(relFromRoot, absPath) {
-	// Exclusions de type/extension
+function shouldExcludeFile(relFromSrc, absPath) {
 	const lower = absPath.toLowerCase();
+
 	if (path.basename(lower).startsWith('_')) return true;
 	if (lower.endsWith('.scss')) return true;
 	if (lower.endsWith('.js') && !lower.endsWith('.min.js')) return true;
+
 	return false;
 }
 
 async function copyFilePreserveTree(absSrc, src, dist, ig) {
 	const relFromSrc = path.relative(src, absSrc);
-	const relFromRoot = path.relative(ROOT, absSrc);
-	const relPosix = norm(relFromRoot);
+	const relPosix = norm(relFromSrc);
 
-	// 1) Exclusions via .gitignore
+	// 1) ignore basé sur src
 	if (ig.ignores(relPosix)) return false;
 
-	// 2) Exclusions spécifiques (scss, js non minifiés)
+	// 2) exclusions internes
 	if (shouldExcludeFile(relPosix, absSrc)) return false;
 
 	const absDst = path.join(dist, relFromSrc);
-	// console.log(absDst);
+
 	await fsprom.mkdir(path.dirname(absDst), { recursive: true });
 	await fsprom.copyFile(absSrc, absDst);
+
 	return absDst;
 }
 
 async function walkAndCopy(dir, src, dest, ig, stats, banner = null) {
 	const entries = await fsprom.readdir(dir, { withFileTypes: true });
-	const bannerContent = (await fsprom.readFile(banner || path.join(__dirname, 'banner.txt'), 'utf8')).replace(/###DATE###/, formatFrDate());
-	const today = (d => `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,'0')}-${String(d.getDate()).padStart(2,'0')}`)(new Date());
+
+	const bannerContent = (await fsprom.readFile(
+		banner || path.join(__dirname, 'banner.txt'),
+		'utf8'
+	)).replace(/###DATE###/, formatFrDate());
+
+	const today = (d =>
+		`${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,'0')}-${String(d.getDate()).padStart(2,'0')}`
+	)(new Date());
 
 	for (const de of entries) {
 		const abs = path.join(dir, de.name);
-		const relFromRoot = path.relative(ROOT, abs);
-		const relPosix = norm(relFromRoot);
+		const relFromSrc = path.relative(src, abs);
+		const relPosix = norm(relFromSrc);
 
 		if (de.isDirectory()) {
-			// Si le dossier est ignoré par .gitignore, on ne descend pas
 			if (ig.ignores(relPosix + '/')) continue;
-			if(de.name.startsWith('_')) continue;
+			if (de.name.startsWith('_')) continue;
+
 			await walkAndCopy(abs, src, dest, ig, stats, banner);
-		} else if (de.isFile()) {
+		}
+		else if (de.isFile()) {
 			const copied = await copyFilePreserveTree(abs, src, dest, ig);
+
 			if (copied) {
 				const lower = abs.toLowerCase();
-				if (lower.endsWith('.js')) await fsprom.writeFile(copied, "/*!\n\n" + bannerContent + "\n\n*/\n" + (await fsprom.readFile(copied, 'utf8')), "utf8");
-				else if (lower.endsWith('.css')) await fsprom.writeFile(copied, "/*!\n\n" + bannerContent + "\n\n*/\n" + (await fsprom.readFile(copied, 'utf8')), "utf8");
-				else if (lower.endsWith('.html')) await fsprom.writeFile(copied, "<!--\n\n" + bannerContent + "\n\n\-->\n" + (await fsprom.readFile(copied, 'utf8'))
-					.replaceAll(/###YEAR###/g, (new Date).getFullYear())
-					.replaceAll(/###TIMESTAMP###/g, Math.floor(Date.now() / 1000)), "utf8");
-				else if (lower.endsWith('sitemap.xml')) await fsprom.writeFile(copied, (await fsprom.readFile(copied, 'utf8')).replaceAll(/###TODAY###/g, today), "utf8");
+
+				if (lower.endsWith('.js')) {
+					await fsprom.writeFile(
+						copied,
+						"/*!\n\n" + bannerContent + "\n\n*/\n" +
+						(await fsprom.readFile(copied, 'utf8')),
+						"utf8"
+					);
+				}
+				else if (lower.endsWith('.css')) {
+					await fsprom.writeFile(
+						copied,
+						"/*!\n\n" + bannerContent + "\n\n*/\n" +
+						(await fsprom.readFile(copied, 'utf8')),
+						"utf8"
+					);
+				}
+				else if (lower.endsWith('.html')) {
+					await fsprom.writeFile(
+						copied,
+						"<!--\n\n" + bannerContent + "\n\n-->\n" +
+						(await fsprom.readFile(copied, 'utf8'))
+							.replaceAll(/###YEAR###/g, (new Date).getFullYear())
+							.replaceAll(/###TIMESTAMP###/g, Math.floor(Date.now() / 1000)),
+						"utf8"
+					);
+				}
+				else if (lower.endsWith('sitemap.xml')) {
+					await fsprom.writeFile(
+						copied,
+						(await fsprom.readFile(copied, 'utf8'))
+							.replaceAll(/###TODAY###/g, today),
+						"utf8"
+					);
+				}
+
 				stats.copied++;
 			}
-			else stats.skipped++;
+			else {
+				stats.skipped++;
+			}
 		}
-		// (symlinks & autres: ignorés)
 	}
 }
 
-
-const exportDist = async (src, dist, banner = null) => {
+const exportDist = async (src, dist, banner = null, options = {}) => {
 	try {
-		const ig = await loadGitignore();
+		const ig = await loadGitignore(src, options.ignore || []);
 
 		await emptyDir(dist);
-		if (!fs.existsSync(src)) throw new error('Folder src is invalid.');
+
+		if (!fs.existsSync(src)) {
+			throw new Error('Folder src is invalid.');
+		}
 
 		const stats = { copied: 0, skipped: 0 };
+
 		await walkAndCopy(src, src, dist, ig, stats, banner);
 
 		return stats;
+
 	} catch (err) {
-		throw new error(err);
+		throw new Error(err);
 	}
-}
-
+};
 
-module.exports = { exportDist };
+module.exports = { exportDist };