feat(baseliner-md): using code block for html data type

Igmat · Mar 1, 2018 · a12595f · a12595f
1 parent 36369eb
commit a12595f
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 21 deletions.
diff --git a/packages/baset-baseliner-md/package.json b/packages/baset-baseliner-md/package.json
@@ -39,6 +39,7 @@
     },
     "dependencies": {
         "baset-core": "^0.8.0",
-        "baset-baseliner-json": "^0.8.0"
+        "baset-baseliner-json": "^0.8.0",
+        "html-beautify": "^1.0.4"
     }
 }
diff --git a/packages/baset-baseliner-md/src/index.ts b/packages/baset-baseliner-md/src/index.ts
@@ -1,58 +1,76 @@
 import JSONBaseliner from 'baset-baseliner-json';
 import { AbstractBaseliner, circularReference, dataTypes } from 'baset-core';
+import htmlBeautify from 'html-beautify';
 import { isPrimitive } from 'util';
-interface IImageProperty {
+interface IKnownType {
+    type: typeof dataTypes.image | typeof dataTypes.html;
     name: string;
     src: string;
 }
 function isEmptyJsonSting(json: string) {
     return !json || json === '[]' || json === '{}';
 }
 
-const imageTemplate = (image: IImageProperty) => `
-\`${image.name}:\`
-
+const knownTypeTemplates = {
+    [dataTypes.image]: (image: IKnownType) => `
 ![${image.name}](${image.src})
+`,
+    [dataTypes.html]: (html: IKnownType) => `
+\`\`\`HTML
+${htmlBeautify(html.src)}
+\`\`\`
+`,
+};
+const renderKnown = (property: IKnownType) => `
+\`${property.name}:\`
+${knownTypeTemplates[property.type](property)}
 `;
-const jsonTemplate = (json: string) => `
+const renderJson = (json: string) => `
 JSON values:
 \`\`\`JSON
 ${json}
 \`\`\`
 `;
-const mdTemplate = (json: string, images: IImageProperty[]) => `
-${!isEmptyJsonSting(json) ? jsonTemplate(json) : ''}
-${images.map(imageTemplate)}
+
+const mdTemplate = (json: string, known: IKnownType[]) => `
+${!isEmptyJsonSting(json) ? renderJson(json) : ''}
+${known.map(renderKnown)}
 `;
 
 export default class MDBaseliner extends AbstractBaseliner {
-    readonly ext = '.base.md';
+    readonly ext = '.md';
     private jsonBaseliner: JSONBaseliner;
     constructor(options: any) {
         super(options);
         this.jsonBaseliner = new JSONBaseliner({});
     }
     create = async (result: Promise<any>[]) => {
         const results = await Promise.all(result);
-        const images = results.length === 1
-            ? this.cutImages(results[0], 'exports')
-            : this.cutImages(results, 'exports');
+        const known = results.length === 1
+            ? this.cutKnownTypes(results[0], 'exports')
+            : this.cutKnownTypes(results, 'exports');
 
-        return mdTemplate(await this.jsonBaseliner.create(results), images);
+        return mdTemplate(await this.jsonBaseliner.create(results), known);
     }
 
-    private cutImages = (parent: any, path: string, key?: string | number): IImageProperty[] => {
+    private cutKnownTypes = (parent: any, path: string, key?: string | number): IKnownType[] => {
         const obj = (key !== undefined)
             ? parent[key]
             : parent;
         if (isPrimitive(obj)) return [];
         if (Array.isArray(obj)) {
-            return ([] as IImageProperty[]).concat(
+            return ([] as IKnownType[]).concat(
                 ...obj.map((value, index) =>
-                    this.cutImages(obj, `${path}[${index}]`, index)));
+                    this.cutKnownTypes(obj, `${path}[${index}]`, index)));
         }
-        if (obj[dataTypes.image]) {
-            const result = {
+        const type = obj[dataTypes.image]
+            ? dataTypes.image
+            : obj[dataTypes.html]
+                ? dataTypes.html
+                : false;
+        if (type) {
+            const result: IKnownType = {
+                type,
                 name: path,
                 src: obj.value,
             };
@@ -61,7 +79,7 @@ export default class MDBaseliner extends AbstractBaseliner {
             return [result];
         }
 
-        return ([] as IImageProperty[]).concat(...Object.keys(obj)
-            .map(index => this.cutImages(obj, `${path}.${index}`, index)));
+        return ([] as IKnownType[]).concat(...Object.keys(obj)
+            .map(index => this.cutKnownTypes(obj, `${path}.${index}`, index)));
     }
 }
diff --git a/packages/baset-baseliner-md/src/types/html-beautify.d.ts b/packages/baset-baseliner-md/src/types/html-beautify.d.ts
@@ -0,0 +1,2 @@
+declare const beautify: any;
+export = beautify;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		declare const beautify: any;
		export = beautify;