develop
HerrHase 2 years ago
parent 28625e42e8
commit 536c6a5aa8

@ -6,7 +6,7 @@ excerpt: "ddd"
meta: meta:
description: "DSA yes plz hot chicken green juice" description: "DSA yes plz hot chicken green juice"
tags: tags:
- f - xxx
--- ---
## Normcore cold-pressed ramps DSA ## Normcore cold-pressed ramps DSA

23
package-lock.json generated

@ -1,13 +1,14 @@
{ {
"name": "@helpers/siteomat-webpack-plugin", "name": "@helpers/siteomat-webpack-plugin",
"version": "0.3.0", "version": "0.4.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@helpers/siteomat-webpack-plugin", "name": "@helpers/siteomat-webpack-plugin",
"version": "0.3.0", "version": "0.4.0",
"dependencies": { "dependencies": {
"@helpers/siteomat-query": "^0.1.0",
"assign-deep": "^1.0.1", "assign-deep": "^1.0.1",
"crypto": "^1.0.1", "crypto": "^1.0.1",
"dayjs": "^1.11.6", "dayjs": "^1.11.6",
@ -28,6 +29,15 @@
"mocha": "^10.2.0" "mocha": "^10.2.0"
} }
}, },
"node_modules/@helpers/siteomat-query": {
"version": "0.1.0",
"resolved": "https://gitea.node001.net/api/packages/HerrHase/npm/%40helpers%2Fsiteomat-query/-/0.1.0/siteomat-query-0.1.0.tgz",
"integrity": "sha512-5I5XrfZKCJ+RQ4phO/oI+0Wjb54jwRX3npbmDtZZ7sVHkLfYyBwKR+Zs3//MAKBOOUC44jeFp6RO3Si+IroZvg==",
"dependencies": {
"assign-deep": "^1.0.1",
"lodash.orderby": "^4.6.0"
}
},
"node_modules/a-sync-waterfall": { "node_modules/a-sync-waterfall": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz", "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
@ -1673,6 +1683,15 @@
} }
}, },
"dependencies": { "dependencies": {
"@helpers/siteomat-query": {
"version": "0.1.0",
"resolved": "https://gitea.node001.net/api/packages/HerrHase/npm/%40helpers%2Fsiteomat-query/-/0.1.0/siteomat-query-0.1.0.tgz",
"integrity": "sha512-5I5XrfZKCJ+RQ4phO/oI+0Wjb54jwRX3npbmDtZZ7sVHkLfYyBwKR+Zs3//MAKBOOUC44jeFp6RO3Si+IroZvg==",
"requires": {
"assign-deep": "^1.0.1",
"lodash.orderby": "^4.6.0"
}
},
"a-sync-waterfall": { "a-sync-waterfall": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz", "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",

@ -13,6 +13,7 @@
}, },
"description": "A Webpack Plugin for generating a Website as Html-Files from a Markdown File Structure", "description": "A Webpack Plugin for generating a Website as Html-Files from a Markdown File Structure",
"dependencies": { "dependencies": {
"@helpers/siteomat-query": "^0.1.0",
"assign-deep": "^1.0.1", "assign-deep": "^1.0.1",
"crypto": "^1.0.1", "crypto": "^1.0.1",
"dayjs": "^1.11.6", "dayjs": "^1.11.6",

@ -1,6 +1,8 @@
const fs = require('fs') const fs = require('fs')
const path = require('path') const path = require('path')
const orderBy = require('lodash.orderby') const {
Filter, orderBy, reduce
} = require('@helpers/siteomat-query')
const PageFactory = require('./../factories/page.js') const PageFactory = require('./../factories/page.js')
const BlocksQuery = require('./../queries/blocks.js') const BlocksQuery = require('./../queries/blocks.js')
@ -51,116 +53,23 @@ class Pages {
this._count = 0 this._count = 0
options = Object.assign({}, this._options, options) options = Object.assign({}, this._options, options)
this._findFiles(this._dirPath, options)
//
if (options.orderBy && options.orderBy.length > 0) {
this._orderBy(options)
}
return this._results
}
/**
* filtering single results from query
* if filter is set check result
*
* @param {array} result
* @param {array} options
* @return {boolean}
*
*/
_filter(result, options) {
let isValid = true
for (const [key, value] of Object.entries(options.filter)) {
// equal
if (value['_eq'] && result[key] !== value['_eq']) {
isValid = false
}
// not equal
if (value['_neq'] && result[key] === value['_neq']) {
isValid = false
}
// in
if (value['_in'] && Array.isArray(value['_in'])) {
// if result no exists
if (!result[key]) {
isValid = false
}
if (Array.isArray(result[key])) {
let found = false
result[key].forEach((v, index) => {
if (value['_in'].indexOf(v) !== -1) {
found = true
}
})
if (!found) {
isValid = false
}
} else {
if (value['_in'].indexOf(result[key]) === -1) {
isValid = false
}
}
}
if (value['_lt'] && result[key] < value['_lt']) {
isValid = false
}
if (value['_lte'] && result[key] <= value['_lte']) {
isValid = false
}
if (value['_gt'] && result[key] > value['_gt']) { if (options.filter) {
isValid = false this._filter = new Filter(options.filter)
} }
if (value['_gte'] && result[key] >= value['_gte']) { this._findFiles(this._dirPath, options)
isValid = false
}
if (value['_null'] && result[key]) {
isValid = false
}
if (value['_nnull'] && !result[key]) {
isValid = false
}
}
return isValid //
if (options.orderBy && options.orderBy.length > 0) {
this.results = orderBy(options.orderBy, this._results)
} }
/** if (options.limit || options.offset) {
* this._results = reduce(options, this._results)
*
* @param {array} options
*
*/
_orderBy(options) {
options.orderBy.forEach((key, index) => {
let direction = 'asc'
if (key.charAt(0) === '-') {
key.slice(0, 1)
direction = 'desc'
} }
this._results = orderBy(this._results, key, direction) return this._results
})
} }
/** /**
@ -225,12 +134,7 @@ class Pages {
const page = new PageFactory(file, options.parent, content, blocks) const page = new PageFactory(file, options.parent, content, blocks)
// check for filters and skip // check for filters and skip
if (options.filter && !this._filter(page.get(), options)) { if (this._filter && !this._filter.validate(page.get())) {
return;
}
// check for filters and skip
if (options.limit && options.limit <= this._results.length) {
return; return;
} }

Loading…
Cancel
Save