Update to 1.1.3

Author: digikid

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 Все основные изменения задокументированы в этом файле.
 
+[1.1.3]: https://github.com/digikid/create-project/releases/tag/1.1.3
+
+## [1.1.3] - 2022-02-09
+
+### Исправлено
+- Исправлена ошибка форматирования файлов в ОС Windows
+- Из файла README.md удален значок с последней версией сборки
+- Рефакторинг кода, исправление мелких ошибок
+
 [1.1.2]: https://github.com/digikid/create-project/releases/tag/1.1.2
 
 ## [1.1.2] - 2022-02-08

lib/tasks/addConfig.js

@@ -1,3 +1,4 @@
+import { parseRepoUrl } from '#lib/utils/path';
 import { replaceAsync } from '#lib/utils/fs';
 import { spinner } from '#lib/utils/log';
 
@@ -20,7 +21,8 @@ export default async (config, options) => {
 
     const data = {};
     const repoUrl = `https://${repo.host.toLowerCase()}.com/${repo.owner}/${repo.name}`;
-    const originalRepoName = `${originalRepoUrl}.git`.replace(/^(https|git)(:\/\/|@)([^\/:]+)[\/:]([^\/:]+)\/(.+).git$/, '$5');
+
+    const originalRepo = parseRepoUrl(originalRepoUrl);
 
     let description = '';
 
@@ -95,8 +97,14 @@ export default async (config, options) => {
 
         await replaceAsync({
             files: './README.md',
-            from: originalRepoTitle,
-            to: info.title
+            from: [
+                originalRepoTitle,
+                /(\n+)(\!\[GitHub release])(.*)(\.svg\))(\n+)/gis
+            ],
+            to: [
+                info.title,
+                '\n\n'
+            ]
         });
 
         await replaceAsync({

lib/tasks/copyBoilerplate.js

@@ -1,8 +1,16 @@
 import path from 'path';
 import del from 'del';
+import beautify from 'js-beautify';
 
-import { mergeDirsAsync, replaceAsync } from '#lib/utils/fs';
+import {
+    mergeDirsAsync,
+    replaceAsync,
+    scanDirectory,
+    readFileAsync,
+    writeFileAsync
+} from '#lib/utils/fs';
 
+import { findDeep } from '#lib/utils/object';
 import { spinner } from '#lib/utils/log';
 
 export default async (config, options) => {
@@ -13,9 +21,7 @@ export default async (config, options) => {
         vendor
     } = options;
 
-    if (!files.boilerplate) {
-        return;
-    };
+    if (!files.boilerplate) return;
 
     const loader = spinner();
     const cwd = process.cwd();
@@ -24,8 +30,8 @@ export default async (config, options) => {
     const dest = path.join(cwd, 'src');
 
     const paths = {
-        styles: path.join(cwd, 'src/styles/**'),
-        js: path.join(cwd, 'src/js/**')
+        styles: path.join(cwd, 'src/styles'),
+        js: path.join(cwd, 'src/js')
     };
 
     const replaces = {
@@ -84,30 +90,57 @@ export default async (config, options) => {
         };
     });
 
-    addReplace(/(\r\n|\r|\n){1,}/g, '$1\n');
-    addReplace(/^\s+\n/gm, '');
-    addReplace(/(\{|,|\/\/.*)(\n+)/g, '$1\n');
-    addReplace(/(\n+)(}|@?import)/g, '\n$2');
-    addReplace(/;(\n+)(\s+)\$/g, ';\n\n$2\$');
-    addReplace(/(\n+)(\s+)}/g, '\n$2}');
+    const n = (process.platform === 'win32') ? '\r\n' : '\n';
 
     try {
         loader.start('COPY_BOILERPLATE_START');
 
+        const formattedFiles = [];
+
         await mergeDirsAsync(source, dest);
 
+        for (const path of Object.values(paths)) {
+            const tree = scanDirectory(path);
+            const files = findDeep(tree, ({ type }) => (type === 'file'));
+
+            for (const file of files) {
+                const data = await readFileAsync(file.path);
+
+                if (data && data.includes('/* if')) {
+                    formattedFiles.push(file.path);
+                };
+            };
+        };
+
         await replaceAsync({
             files: [
-                paths.styles,
-                paths.js
+                `${paths.styles}/**`,
+                `${paths.js}/**`
             ],
             ...replaces
         });
 
-        if (removedFiles.length) {
-            for (const file of removedFiles) {
-                await del(path.join(cwd, file));
+        for (const file of removedFiles) {
+            await del(path.join(cwd, file));
+        };
+
+        for (const file of formattedFiles) {
+            const type = file.includes('.js') ? 'js' : 'css';
+
+            const data = await readFileAsync(file);
+
+            let formatted = beautify[type](data, {
+                indent_size: 4,
+                max_preserve_newlines: 2,
+                preserve_newlines: true,
+                brace_style: 'collapse,preserve-inline'
+            });
+
+            if (type === 'js') {
+                formatted = formatted.replace(/(,)(\n+)/gim, `$1${n}`).replace(/(\n+)(@?import)/gim, `${n}$2`);
             };
+
+            await writeFileAsync(file, formatted);
         };
 
         loader.success('COPY_BOILERPLATE_SUCCESS');

lib/utils/fs.js

@@ -79,7 +79,10 @@ export const mergeDirsAsync = (source, dest) => {
 
 export const scanDirectory = (path, options = {}) => {
     try {
-        const result = dree.scan(path, options);
+        const result = dree.scan(path, {
+            showHidden: false,
+            ...options
+        });
 
         const tree = (result && ('children' in result)) ? result.children : [];
 

lib/utils/object.js

@@ -24,4 +24,28 @@ export const mergeDeep = (target, ...sources) => {
     };
 
     return mergeDeep(target, ...sources);
+};
+
+export const findDeep = (obj, cb) => {
+    const keys = Object.keys(obj) || [];
+
+    let result = [];
+
+    if (cb(obj)) {
+        result = [...result, obj];
+    };
+
+    for (let i = 0; i < keys.length; i++) {
+        let value = obj[keys[i]];
+
+        if (typeof value === 'object' && value != null) {
+            let o = findDeep(value, cb);
+
+            if (o != null && o instanceof Array) {
+                result = [...result, ...o];
+            };
+        };
+    };
+
+    return result;
 };

lib/utils/path.js

@@ -6,4 +6,21 @@ export const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 export const dir = (child = '') => child ? path.join(__dirname, `../../${child}`) : __dirname;
 
-export const cwd = (child = '') => child ? path.join(process.cwd(), child) : process.cwd();
+export const cwd = (child = '') => child ? path.join(process.cwd(), child) : process.cwd();
+
+export const parseRepoUrl = url => {
+    const keys = ['protocol', 'separator', 'host', 'owner', 'name'];
+    const reg = /^(https|git)(:\/\/|@)([^\/:]+)[\/:]([^\/:]+)\/(.+).git$/;
+
+    const fullUrl = url.includes('.git') ? url : `${url}.git`;
+
+    const result = keys.reduce((acc, key) => {
+        const index = keys.indexOf(key) + 1;
+
+        acc[key] = url ? fullUrl.replace(reg, `\$${index}`) : '';
+
+        return acc;
+    }, {});
+
+    return result;
+};