@hkdigital/lib-core 0.5.75 → 0.5.76

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hkdigital/lib-core",
-	"version": "0.5.75",
+	"version": "0.5.76",
 	"author": {
 		"name": "HKdigital",
 		"url": "https://hkdigital.nl"

package/scripts/validate-imports.mjs

@@ -534,6 +534,7 @@ async function validateFile(filePath) {
       const importedNames = extractImportNames(line);
 
       // Check each imported name for barrel exports
+      let foundBarrel = false;
       for (const importedName of importedNames) {
         const barrelPath = await findAliasBarrelExport(
           importPath,
@@ -546,35 +547,38 @@ async function validateFile(filePath) {
             `  from '${importPath}'\n` +
             `  => from '${barrelPath}' (use barrel export)`
           );
+          foundBarrel = true;
           break; // Only report once per line
         }
       }
 
-      // Check if alias import is missing file extension
-      // Allow any extension (not just .js/.svelte) to support assets
-      const hasExtension = importPath.match(/\.[^/]+$/);
-
-      if (!hasExtension) {
-        // Extract path after alias to check if it's not just the alias
-        let pathAfterAlias = null;
-        for (const alias of Object.keys(PROJECT_ALIASES)) {
-          if (importPath === alias || importPath.startsWith(alias + '/')) {
-            pathAfterAlias = importPath.slice(alias.length);
-            if (pathAfterAlias.startsWith('/')) {
-              pathAfterAlias = pathAfterAlias.slice(1);
+      // Only check for missing extension if no barrel was found
+      if (!foundBarrel) {
+        const hasExtension = importPath.match(/\.[^/]+$/);
+
+        if (!hasExtension) {
+          // Extract path after alias
+          let pathAfterAlias = null;
+          for (const alias of Object.keys(PROJECT_ALIASES)) {
+            if (importPath === alias ||
+                importPath.startsWith(alias + '/')) {
+              pathAfterAlias = importPath.slice(alias.length);
+              if (pathAfterAlias.startsWith('/')) {
+                pathAfterAlias = pathAfterAlias.slice(1);
+              }
+              break;
             }
-            break;
           }
-        }
 
-        // Only error if there's a path after the alias
-        if (pathAfterAlias && pathAfterAlias.length > 0) {
-          errors.push(
-            `${relativePath}:${lineNum}\n` +
-            `  from '${importPath}'\n` +
-            `  => Missing file extension (add .js, .svelte, ` +
-            `or .svelte.js)`
-          );
+          // Only error if there's a path after the alias
+          if (pathAfterAlias && pathAfterAlias.length > 0) {
+            errors.push(
+              `${relativePath}:${lineNum}\n` +
+              `  from '${importPath}'\n` +
+              `  => Missing file extension ` +
+              `(add .js, .svelte, or .svelte.js)`
+            );
+          }
         }
       }
 
@@ -598,6 +602,7 @@ async function validateFile(filePath) {
         const importedNames = extractImportNames(line);
 
         // Check each imported name for barrel exports
+        let foundBarrel = false;
         for (const importedName of importedNames) {
           const barrelPath = await findExternalBarrelExport(
             importPath,
@@ -610,28 +615,30 @@ async function validateFile(filePath) {
               `  from '${importPath}'\n` +
               `  => from '${barrelPath}' (use barrel export)`
             );
+            foundBarrel = true;
             break; // Only report once per line
           }
         }
 
-        // Check if external import is missing file extension
-        // Allow any extension (not just .js/.svelte) to support assets
-        const hasExtension = importPath.match(/\.[^/]+$/);
+        // Only check for missing extension if no barrel was found
+        if (!foundBarrel) {
+          const hasExtension = importPath.match(/\.[^/]+$/);
 
-        if (!hasExtension) {
-          // Extract package name and check if there's a path
-          const pkgName = importPath.startsWith('@') ?
-            `${parts[0]}/${parts[1]}` : parts[0];
-          const pathInPackage = importPath.slice(pkgName.length);
+          if (!hasExtension) {
+            // Extract package name and check if there's a path
+            const pkgName = importPath.startsWith('@') ?
+              `${parts[0]}/${parts[1]}` : parts[0];
+            const pathInPackage = importPath.slice(pkgName.length);
 
-          // Only error if there's a path in the package (not just pkg name)
-          if (pathInPackage && pathInPackage.length > 1) {
-            errors.push(
-              `${relativePath}:${lineNum}\n` +
-              `  from '${importPath}'\n` +
-              `  => Missing file extension (add .js, .svelte, ` +
-              `or .svelte.js)`
-            );
+            // Only error if path exists in the package (not just pkg name)
+            if (pathInPackage && pathInPackage.length > 1) {
+              errors.push(
+                `${relativePath}:${lineNum}\n` +
+                `  from '${importPath}'\n` +
+                `  => Missing file extension ` +
+                `(add .js, .svelte, or .svelte.js)`
+              );
+            }
           }
         }
       }