@shoper/cli 0.9.4-5 → 0.9.4-7

package/build/theme/features/theme/utils/files/theme_files_utils.js

@@ -18,7 +18,18 @@ export class ThemeFilesUtils {
     }
     static async writeThemeFilesStructure(themeDirectory, filesStructure) {
         const filePath = join(themeDirectory, SHOPER_THEME_METADATA_DIR, THEME_FILES_STRUCTURE_FILE_NAME);
-        await writeJSONFile(filePath, filesStructure);
+        const normalizedStructure = {};
+        for (const [key, value] of Object.entries(filesStructure)) {
+            let unixKey = toUnixPath(key);
+            if (!unixKey.endsWith('/')) {
+                const fullPath = join(themeDirectory, unixKey);
+                if ((await fileExists(fullPath)) && (await isDirectory(fullPath))) {
+                    unixKey = `${unixKey}/`;
+                }
+            }
+            normalizedStructure[unixKey] = value;
+        }
+        await writeJSONFile(filePath, normalizedStructure);
     }
     static async getFilesPermissions(themeDirectory) {
         const fileStructure = await ThemeFilesUtils.getThemeFilesStructure(themeDirectory);

package/build/utils/path_utils.js

@@ -21,22 +21,31 @@ export const hasParentDirectory = (path) => {
 };
 export const looksLikeDirectory = (path) => {
     const normalized = normalize(path);
-    if (normalized.endsWith(sep))
+    if (normalized.endsWith(sep) || path.endsWith('/') || path.endsWith('\\'))
         return true;
     const base = basename(normalized);
     const isHidden = base.startsWith('.') && !base.slice(1).includes('.');
     const hasExtension = base.slice(1).includes('.');
     if (isHidden) {
-        const stat = fs.lstatSync(path);
-        return stat.isDirectory();
+        try {
+            const stat = fs.lstatSync(normalized);
+            return stat.isDirectory();
+        }
+        catch {
+            return false;
+        }
     }
     return isHidden || !hasExtension;
 };
 export const toUnixPath = (filePath) => {
-    return normalize(filePath).split(sep).join(path.posix.sep);
+    const endsWithSep = filePath.endsWith('/') || filePath.endsWith('\\');
+    const result = normalize(filePath).split(sep).join(path.posix.sep);
+    return endsWithSep && !result.endsWith('/') ? `${result}/` : result;
 };
 export const toWinowsPath = (filePath) => {
-    return normalize(filePath).split(sep).join(path.win32.sep);
+    const endsWithSep = filePath.endsWith('/') || filePath.endsWith('\\');
+    const result = normalize(filePath).split(sep).join(path.win32.sep);
+    return endsWithSep && !result.endsWith('\\') ? `${result}\\` : result;
 };
 export const isUnixPath = (path) => {
     return !path.includes('\\') && (path.startsWith('/') || path.includes('/'));

package/package.json

@@ -2,7 +2,7 @@
     "name": "@shoper/cli",
     "packageManager": "yarn@3.2.0",
     "sideEffects": false,
-    "version": "0.9.4-5",
+    "version": "0.9.4-7",
     "description": "CLI tool for Shoper",
     "author": "Joanna Firek",
     "license": "MIT",