Merge pull request #1534 from LLazyEmail/conflict-fix-1534

[draft]syncing branch with main

Author: atherdon

package.json

@@ -44,6 +44,7 @@
     "husky": "7.0.0",
     "jest": "27.5.1",
     "lint-staged": "12.4.1",
+    "markup-generator": "^2.5.0",
     "prettier": "2.7.0",
     "rollup": "2.75.6",
     "rollup-plugin-node-polyfills": "0.2.1",

package/__ToUseLater/converter/___template.js

@@ -1,8 +1,8 @@
-import { writeHTML, generateTemplateName } from '../write';
+import { writeHTML, generateTemplateName } from 'markup-generator';
 import { printMessage } from '../helper-methods/cli';
 
 export const deliver = (template, name, message) => {
-  const fileName = generateTemplateName(name);
-  writeHTML(fileName, template);
+  const fileName = generateTemplateName(name, 'html');
+  writeHTML(fileName, template, 'generated', ''); // writeHTML(fileName, template);
   printMessage({ message, type: 'green2' });
 };

package/__ToUseLater/converter/full-we-need-to-move-missing-parts.js

@@ -1,91 +1,25 @@
-import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
-
-import write from 'write';
+import {
+  writeHTML,
+  readSourceFile,
+  isFolderExists,
+  generateTemplateName,
+} from 'markup-generator';
 
 import {
-  CONST_FILE_NOT_WRITTEN,
+  // CONST_FILE_NOT_WRITTEN,
   ERROR_NO_TITLE,
   ERROR_NO_BODY_CONTENT,
   ERROR_NO_PREVIEW_TEXT,
 } from './constant-messages';
-
-// eslint-disable-next-line default-param-last
-function writeHTML(fileName, content, dir = 'generated', message) {
-  // @todo it's not an ideal thing
-  // eslint-disable-next-line no-underscore-dangle
-  const _path = `${dir}/${fileName}`;
-
-  // promise
-  write(_path, content)
-    .then(() => {
-      // i dont like this line @TODO change it
-      // eslint-disable-next-line no-unused-expressions
-      message && console.log(`file has been written successfully${fileName}`);
-    })
-    .catch(() => {
-      // console.log(err)
-      throw new Error(CONST_FILE_NOT_WRITTEN);
-    });
-}
-
-// TODO I think we can delete this method
-// __write - an old version of a method that we have
-// eslint-disable-next-line no-underscore-dangle
-function __write(
-  fileName,
-  content,
-  // eslint-disable-next-line default-param-last
-  dir = 'generated',
-  message,
-) {
-  // eslint-disable-next-line no-underscore-dangle
-  const _path = `${dir}/${fileName}`; // @todo it's not an ideal thing
-
-  writeFileSync(_path, content, (err) => {
-    if (err) {
-      throw new Error(CONST_FILE_NOT_WRITTEN);
-    }
-  });
-
-  // i dont like this line @TODO change it
-  // eslint-disable-next-line no-unused-expressions
-  message && console.log(`file has been written successfully${fileName}`);
-}
-
-function readSourceFile(fileName) {
-  return readFileSync(fileName, { encoding: 'utf-8' });
-}
-
-// https://www.npmjs.com/package/directory-exists
-// https://www.npmjs.com/package/path-exists this is better
-
-function isFolderExists(dir) {
-  if (!existsSync(dir)) {
-    mkdirSync(dir);
-  }
-}
-
-// can be renamed into a generateFileName
-// https://befused.com/javascript/get-filename-url/
-const generateTemplateName = (suffix, ext = 'html') =>
-  `${suffix}-${Date.now()}.${ext}`;
-
-//--------
 // const countingBytes = (html) => {
 //   const bytes = Buffer.byteLength(html, 'utf8');
-
 //   if (bytes > 1024 * 100) {
 //     console.warn( WARNING_EMAIL_LENGTH );
 //   }
-
 //   return bytes;
 // };
-
-//-----------
-
 export {
   writeHTML,
-  __write,
   readSourceFile,
   isFolderExists,
   generateTemplateName,

src/domain/deliver/deliver.js

@@ -1,6 +1,9 @@
+// TODO replace it with latest write method, in order to avoid confusion
+import { readSourceFile } from 'markup-generator';
+import { resolve } from 'path';
+
 //--------------
 // --- Typography
-
 import {
   REGEXP_HEADER,
   REGEXP_IMAGE,
@@ -22,13 +25,8 @@ import {
   REGEXP_SEPARATOR,
 } from '../../../constants/index';
 
-// TODO replace it with latest write method, in order to avoid confusion
-import { __write, readSourceFile } from '..';
-
 import PlainCallbacks from '../../../callbacks/html';
 
-const { resolve } = require('path');
-
 // import replace stuff
 // TODO probably move out this method into helpers
 const tests_getMarkdownFile = () => {
@@ -76,7 +74,6 @@ export {
   REGEXP_PARAGRAPH,
   REGEXP_SEPARATOR,
   //-------------------------
-  __write,
   readSourceFile,
   //-------------------------
   PlainCallbacks,

src/domain/write/index.js

@@ -2,21 +2,9 @@
 // moving things into 'domain' folder.
 import {
   writeHTML,
-  __write,
   readSourceFile,
   isFolderExists,
   generateTemplateName,
-  // countingBytes,
-} from '../domain/write';
+} from 'markup-generator';
 
-export {
-  writeHTML,
-  __write,
-  readSourceFile,
-  isFolderExists,
-  generateTemplateName,
-  // countingBytes,
-  // ERROR_NO_TITLE,
-  // ERROR_NO_BODY_CONTENT,
-  // ERROR_NO_PREVIEW_TEXT,
-};
+export { writeHTML, readSourceFile, isFolderExists, generateTemplateName };

src/domain/write/testing/index.js

@@ -1,14 +1,16 @@
+import {
+  writeHTML,
+  isFolderExists,
+  readSourceFile,
+  generateTemplateName,
+} from 'markup-generator';
 import {
   generateHtmlFullTemplateHackernoon,
   generateReactFullTemplateHackernoon,
   generateHtmlFullTemplateRecipes,
 } from './src';
-import {
-  readSourceFile,
-  generateTemplateName,
-  printMessage,
-} from './src/helper';
-import { writeHTML, isFolderExists } from './src/domain/write';
+import { printMessage } from './src/helper';
+
 import { deliver } from './src/domain/deliver/deliver';
 import { MESSAGE_HTML_FULL_TEMPLATE2 } from './src/domain/deliver/deliver.constants';
 
@@ -42,7 +44,7 @@ export const modes = {
 
     // TODO replace this three rows on deliver function
     const fileName = generateTemplateName('FullTemplate', 'js');
-    writeHTML(fileName, fullContent);
+    writeHTML(fileName, fullContent, 'generated', '');
     printMessage(MESSAGE_REACT_FULL_TEMPLATE, 'green2');
   },
   recipesFull: () => {