vivth 1.5.9 → 1.5.11

package/README.md

@@ -770,7 +770,11 @@ body {
 - files extention:
   > - `js`/`ts` files will be compiled with `vivth/node.EsWathcer`, using `option.esbuild` as argument;
   > - `sass`/`scss` it will be compiled to `css` first;
+  > - `html` will be checked for `script`;
+  >   > - has `[type="module]"`: will be processed as `esm`;
+  >   > - has `[minify="true"]`: will be minified;
   > - other than those files, they will be just copied to `targetPaths`;
+- avoid forbidden filename characters and problematic one such as curly/square/normal-braces, that might be used for file pointing cli;
 - for runtime example see file `/dev/auto/` on source code;
 
 ```js

package/generated/types/src/bundler/FileSelfMapper.d.mts

@@ -31,7 +31,11 @@
  * - files extention:
  * >- `js`/`ts` files will be compiled with `vivth/node.EsWathcer`, using `option.esbuild` as argument;
  * >- `sass`/`scss` it will be compiled to `css` first;
+ * >- `html` will be checked for `script`;
+ * >>- has `[type="module]"`: will be processed as `esm`;
+ * >>- has `[minify="true"]`: will be minified;
  * >- other than those files, they will be just copied to `targetPaths`;
+ * - avoid forbidden filename characters and problematic one such as curly/square/normal-braces, that might be used for file pointing cli;
  * - for runtime example see file `/dev/auto/` on source code;
  * @implements {VivthCleanup}
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vivth",
-  "version": "1.5.9",
+  "version": "1.5.11",
   "description": "library primitives",
   "devDependencies": {
     "@types/bun": "^1.3.3",

package/src/bundler/FileSelfMapper.mjs

@@ -59,7 +59,11 @@ import { LazyFactory } from '../function/LazyFactory.mjs';
  * - files extention:
  * >- `js`/`ts` files will be compiled with `vivth/node.EsWathcer`, using `option.esbuild` as argument;
  * >- `sass`/`scss` it will be compiled to `css` first;
+ * >- `html` will be checked for `script`;
+ * >>- has `[type="module]"`: will be processed as `esm`;
+ * >>- has `[minify="true"]`: will be minified;
  * >- other than those files, they will be just copied to `targetPaths`;
+ * - avoid forbidden filename characters and problematic one such as curly/square/normal-braces, that might be used for file pointing cli;
  * - for runtime example see file `/dev/auto/` on source code;
  * @implements {VivthCleanup}
  */
@@ -206,15 +210,14 @@ export class FileSelfMapper {
 		const { content: originalContent, targetPaths } = await FileSelfMapper.#getTargetPath(path);
 		let newContent = originalContent;
 		const resDocument = createDocument(originalContent);
-		const fileSelfMapperAttribute = 'vivth-file-self-mapper';
-		const handledScripts = resDocument.querySelectorAll(`script[${fileSelfMapperAttribute}]`);
+		const handledScripts = Array.from(resDocument.querySelectorAll(`script`));
 		await Promise.all(
 			ForOfSync(handledScripts, async (scriptElement) => {
-				const directionsString = scriptElement.getAttribute(fileSelfMapperAttribute);
-				scriptElement.removeAttribute(fileSelfMapperAttribute);
-				if (!directionsString) return;
-				const directions = new Set(directionsString.split(';'));
-				const hasMin = directions.has('min');
+				const hasMinifyTrue = (scriptElement.getAttribute('minify') ?? '') === 'true';
+				const hasTypeModule = (scriptElement.getAttribute('type') ?? '') === 'module';
+				if (!hasMinifyTrue && !hasTypeModule) {
+					return;
+				}
 				const inner = scriptElement.innerHTML;
 				const res = await build({
 					write: false,
@@ -225,12 +228,8 @@ export class FileSelfMapper {
 					},
 					bundle: false,
 					logLevel: 'silent',
-					minify: hasMin,
-					format: directions.has('iife')
-						? 'iife'
-						: scriptElement.getAttribute('type') === 'module'
-							? 'esm'
-							: undefined,
+					minify: hasMinifyTrue,
+					format: hasTypeModule ? 'esm' : undefined,
 				});
 				if (res.errors.length) {
 					Console.error({
@@ -241,8 +240,7 @@ export class FileSelfMapper {
 					});
 					return;
 				}
-
-				const minified = res.outputFiles[0]?.text;
+				const minified = res.outputFiles[0]?.text.trim();
 				newContent = newContent.replace(
 					inner,
 					// @ts-expect-error
@@ -259,7 +257,7 @@ export class FileSelfMapper {
 				const [, errorWriteHTML] = await FileSafe.write(
 					target,
 					(!!processedContent ? processedContent : newContent).replace(
-						/\s*vivth-file-self-mapper\="[\s\S]*?"\s*/g,
+						/\s*minify\="[\s\S]*?"\s*/g,
 						'',
 					),
 					{
@@ -270,7 +268,7 @@ export class FileSelfMapper {
 					Console.error({ errorWriteHTML }, { now: true });
 					return;
 				}
-				Console.info(`✅ Successfully map:'${path}' to:'${target}'`, { now: true });
+				Console.info(`✅ Successfully map:'${path}' 👉:'${target}'`, { now: true });
 			})[0],
 		);
 	};
@@ -546,15 +544,20 @@ export class FileSelfMapper {
 			if (!group) {
 				break;
 			}
-			const candidate = group.trim();
-			if (!/^(?:[A-Za-z]:[\\/]|[\\/]|\.{1,2}[\\/])?[A-Za-z0-9._\\/-]+$/g.test(candidate)) {
-				break;
-			}
-			if (!candidate) {
+			const pathCandidate = group.trim();
+			if (
+				!pathCandidate ||
+				!/^(?:[A-Za-z]:[\\/]|[\\/]|\.{1,2}[\\/])?[A-Za-z0-9._\\/-]+$/g.test(pathCandidate)
+			) {
+				Console.error({
+					pathCandidate,
+					message: 'pathCandidate invalid for testRegex',
+					testRegex: /^(?:[A-Za-z]:[\\/]|[\\/]|\.{1,2}[\\/])?[A-Za-z0-9._\\/-]+$/g,
+				});
 				break;
 			}
 			perLinesCode[i] = '';
-			targetPaths.add(Paths.normalize(candidate));
+			targetPaths.add(Paths.normalize(pathCandidate));
 		}
 
 		return {