: ,
-// ],
-// }
-// }
-var data = {
- 'Templates/EmptyPage': {
- text: 'Page [@include(./path)] is empty.' +'
'
- +'Links to this page:' +'
'
- +'@include(./links)' +'
'
- +'---' +'
'
- +'WikiHome',
- },
-
- 'Templates/_view': {
- text: '\n'
- +'/@include(../path) ([../_edit])
\n'
- +'
\n'
- +'@include(../title)
\n'
- +'
\n'
- +'@include(../text)
\n'
- +'\n',
- },
- 'Templates/_edit': {
- text: '\n'
- +'/@include(../path) ([../_view])
\n'
- +'
\n'
- +'@include(../title)
\n'
- +'
\n'
- +'@include(../text)
\n'
- +'\n'
- +'',
- },
-}
-data.__proto__ = BaseData
-
-
-
-/*********************************************************************/
-
-var path2lst = path =>
- (path instanceof Array ? path : path.split(/[\\\/]+/g))
- // handle '..' (lookahead) and trim path elements...
- // NOTE: this will not touch the leading '.' or '..'
- .map((p, i, l) =>
- (i > 0 && (p.trim() == '..' || p.trim() == '.')
- || (l[i+1] || '').trim() == '..') ?
- null
- : p.trim())
- // cleanup and clear '.'...
- .filter(p =>
- p != null && p != '')
-
-var normalizePath = path =>
- path2lst(path).join('/')
-
-
-
-/*********************************************************************/
-
-var Wiki = {
- __wiki_data: data,
-
- __home_page__: 'WikiHome',
- __default_page__: 'EmptyPage',
- // Special sub-paths to look in on each level...
- __acquesition_order__: [
- 'Templates',
- ],
- __post_acquesition_order__: [
- ],
- // XXX should this be read only???
- __system__: 'System',
- //__redirect_template__: 'RedirectTemplate',
-
- __wiki_link__: RegExp('('+[
- '(\\./|\\.\\./|[A-Z][a-z0-9]+[A-Z/])[a-zA-Z0-9/]*',
- '\\[[^\\]]+\\]',
- ].join('|') +')', 'g'),
-
-
- // Resolve '.' and '..' relative to current page...
- //
- // NOTE: '.' is relative to .path and not to .dir
- // NOTE: this is a method as it needs the context to resolve...
- resolveDotPath: function(path){
- path = normalizePath(path)
- // '.' or './*'
- return path == '.' || /^\.\//.test(path) ?
- //path.replace(/^\./, this.dir)
- path.replace(/^\./, this.path)
- // '..' or '../*'
- : path == '..' || /^\.\.\//.test(path) ?
- //path.replace(/^\.\./,
- // normalizePath(path2lst(this.dir).slice(0, -1)))
- path.replace(/^\.\./, this.dir)
- : path
- },
-
-
- // current location...
- get location(){
- return this.__location || this.__home_page__ },
- set location(value){
- this.__location = this.resolveDotPath(value) },
-
-
- get data(){
- return this.__wiki_data[this.acquire()] },
-
-
- // page path...
- //
- // Format:
- // /
- //
- // NOTE: changing this will move the page to the new path and change
- // .location acordingly...
- // NOTE: same applies to path parts below...
- // NOTE: changing path will update all the links to the moving page.
- // NOTE: if a link can't be updated without a conflit then it is left
- // unchanged, and a redirect page will be created.
- get path(){
- return this.location },
- // XXX should lik updating be part of this???
- // XXX use a template for the redirect page...
- set path(value){
- value = this.resolveDotPath(value)
-
- var l = this.location
-
- if(value == l){
- return
- }
-
- // old...
- var otitle = this.title
- var odir = this.dir
-
- if(this.exists(l)){
- this.__wiki_data[value] = this.__wiki_data[l]
- }
- this.location = value
-
- // new...
- var ntitle = this.title
- var ndir = this.dir
-
- var redirect = false
-
- // update links to this page...
- this.pages(function(page){
- // skip the old page...
- if(page.location == l){
- return
- }
- page.raw = page.raw.replace(page.__wiki_link__, function(lnk){
- var from = lnk[0] == '[' ? lnk.slice(1, -1) : lnk
-
- // get path/title...
- var p = path2lst(from)
- var t = p.pop()
- p = normalizePath(p)
-
- var target = page.get(p).acquire('./'+t)
- // page target changed...
- // NOTE: this can happen either when a link was an orphan
- // or if the new page path shadowed the original
- // target...
- // XXX should we report the exact condition here???
- if(target == value){
- console.log('Link target changed:', lnk, '->', value)
- return lnk
-
- // skip links that do not resolve to target...
- } else if(page.get(p).acquire('./'+t) != l){
- return lnk
- }
-
- // format the new link...
- var to = p == '' ? ntitle : p +'/'+ ntitle
- to = lnk[0] == '[' ? '['+to+'}' : to
-
- // explicit link change -- replace...
- if(from == l){
- //console.log(lnk, '->', to)
- return to
-
- // path did not change -- change the title...
- } else if(ndir == odir){
- // conflict: the new link will not resolve to the
- // target page...
- if(page.get(p).acquire('./'+ntitle) != value){
- console.log('ERR:', lnk, '->', to,
- 'is shadowed by:', page.get(p).acquire('./'+ntitle))
- // XXX should we add a note to the link???
- redirect = true
-
- // replace title...
- } else {
- //console.log(lnk, '->', to)
- return to
- }
-
- // path changed -- keep link + add redirect page...
- } else {
- redirect = true
- }
-
- // no change...
- return lnk
- })
- })
-
- // redirect...
- //
- // XXX should we use a template here???
- // ...might be a good idea to set a .redirect attr and either
- // do an internal/transparent redirect or show a redirect
- // template
- // ...might also be good to add an option to fix the link from
- // the redirect page...
- if(redirect){
- console.log('CREATING REDIRECT PAGE:', l, '->', value, '')
- this.__wiki_data[l].raw = 'REDIRECT TO: ' + value
- +'<br>'
- +'<br><i>NOTE: This page was created when renaming the target '
- +'page that resulted new link being broken (i.e. resolved '
- +'to a different page from the target)</i>'
- this.__wiki_data[l].redirect = value
-
- // cleaup...
- } else {
- delete this.__wiki_data[l]
- }
- },
-
- // path parts: directory...
- //
- // NOTE: see .path for details...
- get dir(){
- return path2lst(this.location).slice(0, -1).join('/') },
- set dir(value){
- this.path = value +'/'+ this.title },
-
- // path parts: title...
- //
- // NOTE: see .path for details...
- get title(){
- return path2lst(this.location).pop() },
- set title(value){
- this.path = this.dir +'/'+ value },
-
-
- // page content...
- get raw(){
- var data = this.data
- return data instanceof Function ? data.call(this, this)
- : typeof(data) == typeof('str') ? data
- : data != null ? data.text
- : ''
- },
- set raw(value){
- var l = this.location
-
- // prevent overwriting actions...
- if(this.data instanceof Function){
- return
- }
-
- this.__wiki_data[l] = this.__wiki_data[l] || {}
- this.__wiki_data[l].text = value
-
- // cache links...
- delete this.__wiki_data[l].links
- this.__wiki_data[l].links = this.links
- },
-
- // XXX take .raw, parse macros and apply filters...
- get text(){ return this.raw },
-
-
- // NOTE: this is set by setting .text
- get links(){
- var data = this.data || {}
- var links = data.links = data.links
- || (this.raw.match(this.__wiki_link__) || [])
- // unwrap explicit links...
- .map(e => e[0] == '[' ? e.slice(1, -1) : e)
- // unique...
- .filter((e, i, l) => l.slice(0, i).indexOf(e) == -1)
- return links
- },
-
- // XXX list children/sub-pages...
- get list(){
- },
-
-
- // navigation...
- get parent(){
- return this.get('..') },
- get: function(path){
- var o = Object.create(this)
- o.location = path || this.path
- return o
- },
-
-
- exists: function(path){
- return normalizePath(path || this.path) in this.__wiki_data },
- // get title from dir and then go up the tree...
- acquire: function(path, no_default){
- var that = this
-
- // handle paths and relative paths...
- var p = this.get(path)
- var title = p.title
- path = path2lst(p.dir)
-
- var acquire_from = this.__acquesition_order__ || []
- var post_acquire_from = this.__post_acquesition_order__ || []
- var data = this.__wiki_data
-
- var _get = function(path, title, lst){
- lst = (lst == null || lst.length == 0) ? [''] : lst
- for(var i=0; i < lst.length; i++){
- var p = path.concat([lst[i], title])
- if(that.exists(p)){
- p = normalizePath(p)
- return that.__wiki_data[p] && p
- }
- }
- }
-
- while(true){
- // get title from path...
- var p = _get(path, title)
- // get title from special paths in path...
- || _get(path, title, acquire_from)
-
- if(p != null){
- return p
- }
-
- if(path.length == 0){
- break
- }
-
- path.pop()
- }
-
- // default paths...
- var p = _get(path, title, post_acquire_from)
- // system path...
- || this.__system__
- && _get([this.__system__], title)
-
- // NOTE: this may be null...
- return p
- || ((!no_default && title != this.__default_page__) ?
- this.acquire('./'+this.__default_page__)
- : null)
- },
-
-
- // serialization...
- // XXX
- json: function(path){
- return path == null ? JSON.parse(JSON.stringify(this.__wiki_data))
- : path == '.' ? {
- path: this.location,
- text: this.raw,
- }
- : {
- path: path,
- text: (this.__wiki_data[path] || {}).raw,
- }
- },
- // XXX should we inherit from the default???
- load: function(json){
- this.__wiki_data = json
- },
-
-
- // iteration...
- // XXX this is not page specific, might need refactoring...
- pages: function(callback){
- var that = this
- Object.keys(this.__wiki_data).forEach(function(location){
- // XXX not sure if this is the right way to go...
- var o = Object.create(that)
- o.location = location
- callback.call(o, o)
- })
- return this
- },
-}
-
-
-/*********************************************************************/
-
-
+// XXX should inline macros support named args???
var macro = {
// Abstract macro syntax:
@@ -720,6 +251,487 @@ var macro = {
+/*********************************************************************/
+
+// XXX not sure about these...
+// XXX add docs...
+var BaseData = {
+ // Macro acces to standard page attributes...
+ 'System/title': function(){ return this.get('..').title },
+ 'System/path': function(){ return this.dir },
+ 'System/dir': function(){ return this.get('..').dir },
+ 'System/location': function(){ return this.dir },
+ 'System/resolved': function(){ return this.get('..').acquire() },
+
+ // page data...
+ 'System/raw': function(){ return this.get('..').raw },
+ 'System/text': function(){ return this.get('..').text },
+
+ // XXX
+ 'System/list': function(){
+ var p = this.dir
+
+ return Object.keys(this.__wiki_data)
+ .map(function(k){
+ if(k.indexOf(p) == 0){
+ return path2lst(k.slice(p.length)).shift()
+ }
+ return null
+ })
+ .filter(function(e){ return e != null })
+ .sort()
+ .map(function(e){ return '['+ e +']' })
+ .join('<br>')
+ },
+ 'System/tree': function(){
+ var p = this.dir
+
+ return Object.keys(this.__wiki_data)
+ .map(function(k){
+ if(k.indexOf(p) == 0){
+ return k
+ }
+ return null
+ })
+ .filter(function(e){ return e != null })
+ .sort()
+ .map(function(e){ return '['+ e +']' })
+ .join('<br>')
+ },
+ // list links to this page...
+ 'System/links': function(){
+ var that = this
+ var p = this.dir
+
+ var res = []
+
+ var wiki = this.__wiki_data
+ Object.keys(wiki).forEach(function(k){
+ (wiki[k].links || []).forEach(function(l){
+ (l == p || that.get(path2lst(l).slice(0, -1)).acquire('./'+path2lst(l).pop()) == p)
+ && res.push([l, k])
+ })
+ })
+
+ return res
+ //.map(function(e){ return '['+ e[0] +'] <i>from page: ['+ e[1] +']</i>' })
+ .map(function(e){ return '['+ e[1] +'] <i>-> ['+ e[0] +']</i>' })
+ .sort()
+ .join('<br>')
+ },
+
+ // XXX this needs a redirect...
+ 'System/delete': function(){
+ var p = this.dir
+ delete this.__wiki_data[p]
+ },
+}
+
+
+// data store...
+// Format:
+// {
+// <path>: {
+// text: <text>,
+//
+// links: [
+// <offset>: <link>,
+// ],
+// }
+// }
+//
+// XXX add .json support...
+var data = {
+ 'Templates/EmptyPage': {
+ text: 'Page [@include(./path)] is empty.' +'<br><br>'
+ +'Links to this page:' +'<br>'
+ +'@include(./links)' +'<br><br>'
+ +'---' +'<br>'
+ +'WikiHome',
+ },
+
+ 'Templates/_view': {
+ text: '\n'
+ +'<div>/@include(../path) ([../_edit])</div>\n'
+ +'<hr>\n'
+ +'<h1>@include(../title)</h1>\n'
+ +'<br>\n'
+ +'<div>@include(../text)</div>\n'
+ +'\n',
+ },
+ 'Templates/_edit': {
+ text: '\n'
+ +'<div>/@include(../path) ([../_view])</div>\n'
+ +'<hr>\n'
+ +'<h1 contenteditable>@include(../title)</h1>\n'
+ +'<br>\n'
+ +'<div class="raw" contenteditable>@include(../text)</div>\n'
+ +'<script>\n'
+ +'\t$(".raw").text($(".raw").html())\n'
+ +'</script>\n'
+ +'',
+ },
+}
+data.__proto__ = BaseData
+
+
+
+/*********************************************************************/
+
+// XXX add .json support...
+var Wiki = {
+ __wiki_data: data,
+
+ __home_page__: 'WikiHome',
+ __default_page__: 'EmptyPage',
+ // Special sub-paths to look in on each level...
+ __acquesition_order__: [
+ 'Templates',
+ ],
+ __post_acquesition_order__: [
+ ],
+ // XXX should this be read only???
+ __system__: 'System',
+ //__redirect_template__: 'RedirectTemplate',
+
+ __wiki_link__: RegExp('('+[
+ '(\\./|\\.\\./|[A-Z][a-z0-9]+[A-Z/])[a-zA-Z0-9/]*',
+ '\\[[^\\]]+\\]',
+ ].join('|') +')', 'g'),
+
+
+ // Resolve '.' and '..' relative to current page...
+ //
+ // NOTE: '.' is relative to .path and not to .dir
+ // NOTE: this is a method as it needs the context to resolve...
+ resolveDotPath: function(path){
+ path = normalizePath(path)
+ // '.' or './*'
+ return path == '.' || /^\.\//.test(path) ?
+ //path.replace(/^\./, this.dir)
+ path.replace(/^\./, this.path)
+ // '..' or '../*'
+ : path == '..' || /^\.\.\//.test(path) ?
+ //path.replace(/^\.\./,
+ // normalizePath(path2lst(this.dir).slice(0, -1)))
+ path.replace(/^\.\./, this.dir)
+ : path
+ },
+
+
+ // current location...
+ get location(){
+ return this.__location || this.__home_page__ },
+ set location(value){
+ this.__location = this.resolveDotPath(value) },
+
+
+ get data(){
+ return this.__wiki_data[this.acquire()] },
+
+
+ // XXX
+ clone: function(){
+ var o = Object.create(Wiki)
+ o.location = this.location
+ return o
+ },
+
+
+ // page path...
+ //
+ // Format:
+ // <dir>/<title>
+ //
+ // NOTE: changing this will move the page to the new path and change
+ // .location acordingly...
+ // NOTE: same applies to path parts below...
+ // NOTE: changing path will update all the links to the moving page.
+ // NOTE: if a link can't be updated without a conflit then it is left
+ // unchanged, and a redirect page will be created.
+ get path(){
+ return this.location },
+ // XXX should lik updating be part of this???
+ // XXX use a template for the redirect page...
+ set path(value){
+ value = this.resolveDotPath(value)
+
+ var l = this.location
+
+ if(value == l){
+ return
+ }
+
+ // old...
+ var otitle = this.title
+ var odir = this.dir
+
+ if(this.exists(l)){
+ this.__wiki_data[value] = this.__wiki_data[l]
+ }
+ this.location = value
+
+ // new...
+ var ntitle = this.title
+ var ndir = this.dir
+
+ var redirect = false
+
+ // update links to this page...
+ this.pages(function(page){
+ // skip the old page...
+ if(page.location == l){
+ return
+ }
+ page.raw = page.raw.replace(page.__wiki_link__, function(lnk){
+ var from = lnk[0] == '[' ? lnk.slice(1, -1) : lnk
+
+ // get path/title...
+ var p = path2lst(from)
+ var t = p.pop()
+ p = normalizePath(p)
+
+ var target = page.get(p).acquire('./'+t)
+ // page target changed...
+ // NOTE: this can happen either when a link was an orphan
+ // or if the new page path shadowed the original
+ // target...
+ // XXX should we report the exact condition here???
+ if(target == value){
+ console.log('Link target changed:', lnk, '->', value)
+ return lnk
+
+ // skip links that do not resolve to target...
+ } else if(page.get(p).acquire('./'+t) != l){
+ return lnk
+ }
+
+ // format the new link...
+ var to = p == '' ? ntitle : p +'/'+ ntitle
+ to = lnk[0] == '[' ? '['+to+'}' : to
+
+ // explicit link change -- replace...
+ if(from == l){
+ //console.log(lnk, '->', to)
+ return to
+
+ // path did not change -- change the title...
+ } else if(ndir == odir){
+ // conflict: the new link will not resolve to the
+ // target page...
+ if(page.get(p).acquire('./'+ntitle) != value){
+ console.log('ERR:', lnk, '->', to,
+ 'is shadowed by:', page.get(p).acquire('./'+ntitle))
+ // XXX should we add a note to the link???
+ redirect = true
+
+ // replace title...
+ } else {
+ //console.log(lnk, '->', to)
+ return to
+ }
+
+ // path changed -- keep link + add redirect page...
+ } else {
+ redirect = true
+ }
+
+ // no change...
+ return lnk
+ })
+ })
+
+ // redirect...
+ //
+ // XXX should we use a template here???
+ // ...might be a good idea to set a .redirect attr and either
+ // do an internal/transparent redirect or show a redirect
+ // template
+ // ...might also be good to add an option to fix the link from
+ // the redirect page...
+ if(redirect){
+ console.log('CREATING REDIRECT PAGE:', l, '->', value, '')
+ this.__wiki_data[l].raw = 'REDIRECT TO: ' + value
+ +'<br>'
+ +'<br><i>NOTE: This page was created when renaming the target '
+ +'page that resulted new link being broken (i.e. resolved '
+ +'to a different page from the target)</i>'
+ this.__wiki_data[l].redirect = value
+
+ // cleaup...
+ } else {
+ delete this.__wiki_data[l]
+ }
+ },
+
+ // path parts: directory...
+ //
+ // NOTE: see .path for details...
+ get dir(){
+ return path2lst(this.location).slice(0, -1).join('/') },
+ set dir(value){
+ this.path = value +'/'+ this.title },
+
+ // path parts: title...
+ //
+ // NOTE: see .path for details...
+ get title(){
+ return path2lst(this.location).pop() },
+ set title(value){
+ this.path = this.dir +'/'+ value },
+
+
+ // page content...
+ get raw(){
+ var data = this.data
+ return data instanceof Function ? data.call(this, this)
+ : typeof(data) == typeof('str') ? data
+ : data != null ? data.text
+ : ''
+ },
+ set raw(value){
+ var l = this.location
+
+ // prevent overwriting actions...
+ if(this.data instanceof Function){
+ return
+ }
+
+ this.__wiki_data[l] = this.__wiki_data[l] || {}
+ this.__wiki_data[l].text = value
+
+ // cache links...
+ delete this.__wiki_data[l].links
+ this.__wiki_data[l].links = this.links
+ },
+
+ // XXX take .raw, parse macros and apply filters...
+ get text(){ return this.raw },
+
+
+ // NOTE: this is set by setting .text
+ get links(){
+ var data = this.data || {}
+ var links = data.links = data.links
+ || (this.raw.match(this.__wiki_link__) || [])
+ // unwrap explicit links...
+ .map(function(e){ return e[0] == '[' ? e.slice(1, -1) : e })
+ // unique...
+ .filter(function(e, i, l){ return l.slice(0, i).indexOf(e) == -1 })
+ return links
+ },
+
+
+ // navigation...
+ get parent(){
+ return this.get('..') },
+ // XXX list children/sub-pages...
+ get children(){
+ },
+
+ // XXX add prpper insyantiation ( .clone() )...
+ get: function(path){
+ //var o = Object.create(this)
+ var o = this.clone()
+ o.location = path || this.path
+ return o
+ },
+
+
+ exists: function(path){
+ return normalizePath(path || this.path) in this.__wiki_data },
+ // get title from dir and then go up the tree...
+ //
+ // XXX should we also acquire each path part???
+ acquire: function(path, no_default){
+ var that = this
+
+ // handle paths and relative paths...
+ var p = this.get(path)
+ var title = p.title
+ path = path2lst(p.dir)
+
+ var acquire_from = this.__acquesition_order__ || []
+ var post_acquire_from = this.__post_acquesition_order__ || []
+ var data = this.__wiki_data
+
+ var _get = function(path, title, lst){
+ lst = (lst == null || lst.length == 0) ? [''] : lst
+ for(var i=0; i < lst.length; i++){
+ var p = path.concat([lst[i], title])
+ if(that.exists(p)){
+ p = normalizePath(p)
+ return that.__wiki_data[p] && p
+ }
+ }
+ }
+
+ while(true){
+ // get title from path...
+ var p = _get(path, title)
+ // get title from special paths in path...
+ || _get(path, title, acquire_from)
+
+ if(p != null){
+ return p
+ }
+
+ if(path.length == 0){
+ break
+ }
+
+ path.pop()
+ }
+
+ // default paths...
+ var p = _get(path, title, post_acquire_from)
+ // system path...
+ || this.__system__
+ && _get([this.__system__], title)
+
+ // NOTE: this may be null...
+ return p
+ || ((!no_default && title != this.__default_page__) ?
+ this.acquire('./'+this.__default_page__)
+ : null)
+ },
+
+
+ // serialization...
+ // XXX
+ json: function(path){
+ return path == null ? JSON.parse(JSON.stringify(this.__wiki_data))
+ : path == '.' ? {
+ path: this.location,
+ text: this.raw,
+ }
+ : {
+ path: path,
+ text: (this.__wiki_data[path] || {}).raw,
+ }
+ },
+ // XXX should we inherit from the default???
+ load: function(json){
+ this.__wiki_data = json
+ },
+
+
+ // iteration...
+ // XXX this is not page specific, might need refactoring...
+ pages: function(callback){
+ var that = this
+ Object.keys(this.__wiki_data).forEach(function(location){
+ // XXX not sure if this is the right way to go...
+ //var o = Object.create(that)
+ var o = that.clone()
+ o.location = location
+ callback.call(o, o)
+ })
+ return this
+ },
+}
+
+
/**********************************************************************
* vim:set ts=4 sw=4 : */