Fixed issue with prelude path in builds

desktop/sources/scripts/commander.js

@@ -33,8 +33,7 @@ function Commander (ronin) {
 
   this.run = (txt = this._input.value) => {
     if (txt.indexOf('$') > -1) { ronin.log('Present: $'); return }
-    const inter = new Lisp(txt, ronin.library)
-    inter.toPixels()
+    const inter = new Lisp(txt, ronin.library, ronin.includes).run()
     ronin.always === true && requestAnimationFrame(() => this.run(txt))
   }
 

desktop/sources/scripts/lisp.js

@@ -1,6 +1,6 @@
 'use strict'
 
-function Lisp (input, lib) {
+function Lisp (input, lib, includes) {
   const path = require('path')
   const fs = require('fs')
 
@@ -20,7 +20,7 @@ function Lisp (input, lib) {
 
   const special = {
     include: (input, context) => {
-      if (!input[1].value || !fs.existsSync(input[1].value)) { console.warn('Source', input[1].value); return [] }
+      if (!input[1].value || !fs.existsSync(input[1].value)) { console.warn('Lisp', 'No file: ' + input[1].value); return [] }
       const file = fs.readFileSync(input[1].value, { encoding: 'utf-8' })
       return interpret(this.parse(`(${file})`), context)
     },
@@ -69,7 +69,7 @@ function Lisp (input, lib) {
     __fn: function (input, context) {
       return async function () {
         const lambdaArguments = arguments
-        const keys = [...new Set(input.slice(2).flat(100).filter(i => 
+        const keys = [...new Set(input.slice(2).flat(100).filter(i =>
           i.type === TYPES.identifier &&
           i.value[0] === '%'
         ).map(x => x.value).sort())]
@@ -82,8 +82,8 @@ function Lisp (input, lib) {
     },
     __obj: async function (input, context) {
       const obj = {}
-      for (let i = 1 ; i<input.length ; i+=2) {
-        obj[await interpret(input[i] ,context)] = await interpret(input[i+1], context)
+      for (let i = 1; i < input.length; i += 2) {
+        obj[await interpret(input[i], context)] = await interpret(input[i + 1], context)
       }
       return obj
     }
@@ -101,7 +101,7 @@ function Lisp (input, lib) {
   }
 
   const interpret = async function (input, context) {
-    if (!input) { console.warn('error', context.scope); return null }
+    if (!input) { console.warn('Lisp', 'error', context.scope); return null }
 
     if (context === undefined) {
       return interpret(input, new Context(lib))
@@ -153,26 +153,34 @@ function Lisp (input, lib) {
 
   const tokenize = function (input) {
     const i = input.replace(/^\;.*\n?/gm, '').split('"')
-    return i.map(function (x, i) { 
-      return i % 2 === 0 ? 
-        x.replace(/\(/g, ' ( ')
-        .replace(/\)/g, ' ) ')
-        .replace(/' \( /g, ' \'( ') // '()
-        .replace(/\{/g, ' { ') // {}
-        .replace(/\}/g, ' } ') // {}
-        : x.replace(/ /g, '!whitespace!') 
+    return i.map(function (x, i) {
+      return i % 2 === 0
+        ? x.replace(/\(/g, ' ( ')
+          .replace(/\)/g, ' ) ')
+          .replace(/' \( /g, ' \'( ') // '()
+          .replace(/\{/g, ' { ') // {}
+          .replace(/\}/g, ' } ') // {}
+        : x.replace(/ /g, '!whitespace!')
     })
-    .join('"').trim().split(/\s+/)
-    .map(function (x) { return x.replace(/!whitespace!/g, ' ') })
+      .join('"').trim().split(/\s+/)
+      .map(function (x) { return x.replace(/!whitespace!/g, ' ') })
+  }
+
+  this.inc = function () {
+    return includes.reduce((acc, item) => {
+      const p = path.join(__dirname, `lisp/${item}.lisp`)
+      if (!fs.existsSync(p)) { console.warn('Lisp', `Missing include: ${p}`); return acc }
+      return `${acc}(include "${p}") `
+    }, '')
   }
 
   this.parse = function (input) {
     return parenthesize(tokenize(input))
   }
 
-  this.toPixels = async function () {
+  this.run = async function () {
     return interpret(this.parse(`(
-    (include "./sources/lisp/prelude.lisp") 
-    ${input})`))
+      ${this.inc()}
+      ${input})`))
   }
 }

desktop/sources/scripts/ronin.js

@@ -23,6 +23,7 @@ function Ronin () {
   // Parameters
 
   this.always = false
+  this.includes = ['prelude']
 
   this.install = function (host = document.body) {
     this._wrapper = document.createElement('div')

desktop/sources/scripts/source.js

@@ -126,12 +126,6 @@ function Source (ronin) {
     return `${str}`
   }
 
-  this.locate = function (name) {
-    if (!this.path) { return }
-    const loc = path.join(this.folder(), name)
-    return fs.existsSync(loc) ? loc : null
-  }
-
   // Etc
 
   this.name = function () {