@ascua/mdfiles 0.2.0 → 0.3.1

package/addon/services/mdfiles.js

@@ -1,5 +1,5 @@
 import Service from '@ember/service';
-import { trees } from '@ascua/mdfiles/files';
+import folders from '@ascua/mdfiles/files';
 import config from '@ascua/config';
 
 export default class extends Service {
@@ -8,10 +8,15 @@ export default class extends Service {
 		return config.mdfiles || {};
 	}
 
-	async folder(name) {
-		let tree = { name, path: this.config.folders[name] };
-		return trees[tree.path].map(file => {
-			return { ...file, path: file.path.replace(`${tree.path}/`, '') };
+	async folder(folder) {
+		return fetch(config.rootURL + folders[folder] + '/index.json').then(data => {
+			return data.json();
+		})
+	}
+
+	async file(folder, name) {
+		return fetch(config.rootURL + folders[folder] + `/${name}.json`).then(data => {
+			return data.json();
 		});
 	}
 

package/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const MarkdownResolver = require('broccoli-markdown-resolver');
+const MarkdownFiles = require('./lib/files.js');
 const Merger = require('broccoli-merge-trees');
 const path = require('path');
 const fs = require('fs');
@@ -25,28 +25,57 @@ module.exports = {
 
 	},
 
-	treeForAddon(tree) {
+	folders() {
 
-		let folders = Object.keys(this.opts.folders).reduce((folders, key) => {
-			return [...folders, this.opts.folders[key]];
+		return Object.keys(this.opts.folders).reduce((folders, name) => {
+			let dir = path.join(this.app.project.root, this.opts.folders[name]);
+			return fs.existsSync(dir) ? [...folders, { name, dir }] : [...folders];
 		}, []);
 
-		let paths = folders.reduce((paths, folder) => {
-			let dirpath = path.join(this.app.project.root, folder);
-			return fs.existsSync(dirpath) ? [...paths, dirpath] : [...paths];
-		}, []);
+	},
+
+	treeForAddon(tree) {
+
+		let folders = this.folders();
 
-		if (paths.length > 0) {
-			let files = new MarkdownResolver(paths, {
+		if (folders.length > 0) {
+
+			let files = new MarkdownFiles(folders.map(v => v.dir), {
+				type: 'addon',
+				folders: folders,
 				basePath: this.app.project.root,
-				outputFile: 'files.js',
-				trimExtensions: true,
+				outputDir: 'assets',
 			});
+
 			tree = new Merger([tree, files]);
+
 		}
 
 		return this._super.treeForAddon.call(this, tree);
 
 	},
 
+	postprocessTree(type, tree) {
+
+		if (type !== 'all') return tree;
+
+		let folders = this.folders();
+
+		if (folders.length > 0) {
+
+			let files = new MarkdownFiles(folders.map(v => v.dir), {
+				type: 'files',
+				folders: folders,
+				basePath: this.app.project.root,
+				outputDir: 'assets',
+			});
+
+			tree = new Merger([tree, files]);
+
+		}
+
+		return tree;
+
+	},
+
 };

package/lib/files.js

@@ -0,0 +1,97 @@
+'use strict';
+
+const Plugin = require('broccoli-caching-writer');
+const frontmatter = require('front-matter');
+const mkdirp = require('mkdirp');
+const path = require('path');
+const fs = require('fs');
+
+module.exports = class Trees extends Plugin {
+
+	constructor(inputNodes, opts) {
+
+		super(inputNodes);
+
+		this.opts = opts;
+
+	}
+
+	build() {
+
+		let output = Array.prototype.reduce.call(this.inputPaths, (trees, dir) => {
+			let folder = this.opts.folders.find(v => v.dir === dir);
+			trees[folder.name] = this.readDirectory(folder.name, dir);
+			return trees;
+		}, {});
+
+		if (this.opts.type === 'addon') {
+
+			let output = this.opts.folders.reduce((list, folder) => {
+				list[folder.name] = path.join(this.opts.outputDir, folder.name);
+				return list;
+			}, {});
+			let buffer = `export default ${JSON.stringify(output)}`;
+			fs.writeFileSync(path.join(this.outputPath, 'files.js'), buffer);
+
+		}
+
+		if (this.opts.type === 'files') {
+
+			for (const [name, entries] of Object.entries(output)) {
+
+				// Write the index.json file contents
+
+				let buffer = JSON.stringify(entries.map(v => {
+					return { name: v.name, attributes: v.attributes };
+				}));
+				let folder = path.join(this.outputPath, this.opts.outputDir, name);
+				let file = path.join(folder, 'index.json');
+				mkdirp.sync(folder);
+				fs.writeFileSync(file, buffer);
+
+				// Write the individual file contents
+
+				for (const entry of entries) {
+
+					let buffer = JSON.stringify(entry);
+					let folder = path.join(this.outputPath, this.opts.outputDir, name);
+					let file = path.join(folder, `${entry.name}.json`);
+					fs.writeFileSync(file, buffer);
+
+				}
+
+			}
+
+		}
+
+	}
+
+	readDirectory(name, dir) {
+
+		let files = fs.readdirSync(dir);
+
+		return Array.prototype.reduce.call(files, (tree, file) => {
+
+			let fileExt = path.extname(file);
+			let fileName = file.replace(/\.[^/.]+$/, '');
+			let filePath = path.join(name, fileName);
+			let fullPath = path.join(dir, file);
+			let isDirectory = fs.lstatSync(path.join(dir, file)).isDirectory();
+
+			if (isDirectory || fileExt !== '.md') { return [...tree]; }
+
+			let content = fs.readFileSync(fullPath, { encoding: 'utf8' });
+			content = frontmatter(content);
+
+			let entry = {
+				name: fileName,
+				body: content.body,
+				attributes: content.attributes,
+			};
+
+			return [...tree, entry];
+
+		}, []);
+	}
+
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ascua/mdfiles",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Small description for @ascua/mdfiles goes here",
   "keywords": [
     "ember-addon"
@@ -15,10 +15,10 @@
     "url": "https://surrealdb.com"
   },
   "dependencies": {
-    "broccoli-markdown-resolver": "^0.0.1",
     "broccoli-merge-trees": "^4.2.0",
     "ember-cli-babel": "^7.26.6",
-    "ember-cli-htmlbars": "^5.7.1"
+    "ember-cli-htmlbars": "^5.7.1",
+    "front-matter": "^4.0.2"
   },
   "ember-addon": {
     "demoURL": "https://abcum.github.io/ascua"
@@ -27,5 +27,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "15ac1610df327477e4cde680162812196d462303"
+  "gitHead": "198ee00fc714c2a8aa25d1585a7b06e2f3feaef2"
 }