pinstripe 0.24.0 → 0.26.0

package/lib/inflector.js

@@ -1,173 +1,2 @@
 
-import { Class } from "./class.js";
-import { Singleton } from "./singleton.js";
-
-export const Inflector = Class.extend().include({
-
-    meta(){
-        this.include(Singleton);
-    },
-
-    initialize(){
-        this.pluralizeRules = [];
-        this.singularizeRules = [];
-
-        this.definePlural(/$/, 's');
-        this.definePlural(/s$/i, 's');
-        this.definePlural(/^(ax|test)is$/i, '$1es');
-        this.definePlural(/(octop|vir)us$/i, '$1i');
-        this.definePlural(/(octop|vir)i$/i, '$1i');
-        this.definePlural(/(alias|status)$/i, '$1es');
-        this.definePlural(/(bu)s$/i, '$1ses');
-        this.definePlural(/(buffal|tomat)o$/i, '$1oes');
-        this.definePlural(/([ti])um$/i, '$1a');
-        this.definePlural(/([ti])a$/i, '$1a');
-        this.definePlural(/sis$/i, 'ses');
-        this.definePlural(/(?:([^f])fe|([lr])f)$/i, '$1$2ves');
-        this.definePlural(/(hive)$/i, '$1s');
-        this.definePlural(/([^aeiouy]|qu)y$/i, '$1ies');
-        this.definePlural(/(x|ch|ss|sh)$/i, '$1es');
-        this.definePlural(/(matr|vert|ind)(?:ix|ex)$/i, '$1ices');
-        this.definePlural(/^(m|l)ouse$/i, '$1ice');
-        this.definePlural(/^(m|l)ice$/i, '$1ice');
-        this.definePlural(/^(ox)$/i, '$1en');
-        this.definePlural(/^(oxen)$/i, '$1');
-        this.definePlural(/(quiz)$/i, '$1zes');
-
-        this.defineSingular(/s$/i, '');
-        this.defineSingular(/(ss)$/i, '$1');
-        this.defineSingular(/(n)ews$/i, '$1ews');
-        this.defineSingular(/([ti])a$/i, '$1um');
-        this.defineSingular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)(sis|ses)$/i, '$1sis');
-        this.defineSingular(/(^analy)(sis|ses)$/i, '$1sis');
-        this.defineSingular(/([^f])ves$/i, '$1fe');
-        this.defineSingular(/(hive)s$/i, '$1');
-        this.defineSingular(/(tive)s$/i, '$1');
-        this.defineSingular(/([lr])ves$/i, '$1f');
-        this.defineSingular(/([^aeiouy]|qu)ies$/i, '$1y');
-        this.defineSingular(/(s)eries$/i, '$1eries');
-        this.defineSingular(/(m)ovies$/i, '$1ovie');
-        this.defineSingular(/(x|ch|ss|sh)es$/i, '$1');
-        this.defineSingular(/^(m|l)ice$/i, '$1ouse');
-        this.defineSingular(/(bus)(es)?$/i, '$1');
-        this.defineSingular(/(o)es$/i, '$1');
-        this.defineSingular(/(shoe)s$/i, '$1');
-        this.defineSingular(/(cris|test)(is|es)$/i, '$1is');
-        this.defineSingular(/^(a)x[ie]s$/i, '$1xis');
-        this.defineSingular(/(octop|vir)(us|i)$/i, '$1us');
-        this.defineSingular(/(alias|status)(es)?$/i, '$1');
-        this.defineSingular(/^(ox)en/i, '$1');
-        this.defineSingular(/(vert|ind)ices$/i, '$1ex');
-        this.defineSingular(/(matr)ices$/i, '$1ix');
-        this.defineSingular(/(quiz)zes$/i, '$1');
-        this.defineSingular(/(database)s$/i, '$1');
-
-        this.defineIrregular('person', 'people');
-        this.defineIrregular('man', 'men');
-        this.defineIrregular('child', 'children');
-        this.defineIrregular('sex', 'sexes');
-        this.defineIrregular('move', 'moves');
-        this.defineIrregular('zombie', 'zombies');
-
-        this.defineUncountable('equipment');
-        this.defineUncountable('information');
-        this.defineUncountable('rice');
-        this.defineUncountable('money');
-        this.defineUncountable('species');
-        this.defineUncountable('series');
-        this.defineUncountable('fish');
-        this.defineUncountable('sheep');
-        this.defineUncountable('jeans');
-        this.defineUncountable('police');
-    },
-    
-    definePlural(...args){
-        this.pluralizeRules.unshift(args);
-    },
-    
-    defineSingular(...args){
-        this.singularizeRules.unshift(args);
-    },
-    
-    defineIrregular(singular, plural){
-        const s0 = singular[0];
-        const srest = singular.substr(1);
-    
-        const p0 = plural[0]
-        const prest = plural.substr(1);
-    
-        if (s0.toUpperCase() == p0.toUpperCase()){
-            this.definePlural(new RegExp(`(${s0})${srest}$`, 'i'), `$1${prest}`);
-            this.definePlural(new RegExp(`(${p0})${prest}$`, 'i'), `$1${prest}`);
-    
-            this.defineSingular(new RegExp(`(${s0})${srest}$`, 'i'), `$1${srest}`);
-            this.defineSingular(new RegExp(`(${p0})${prest}$`, 'i'), `$1${srest}`);
-        } else {
-            this.definePlural(new RegExp(`${s0.toUpperCase()}${caseInsensitive(srest)}$`), `${p0.toUpperCase()}${prest}`);
-            this.definePlural(new RegExp(`${s0.toLowerCase()}${caseInsensitive(srest)}$`), `${p0.toLowerCase()}${prest}`);
-            this.definePlural(new RegExp(`${p0.toUpperCase()}${caseInsensitive(prest)}$`), `${p0.toUpperCase()}${prest}`);
-            this.definePlural(new RegExp(`${p0.toLowerCase()}${caseInsensitive(prest)}$`), `${p0.toLowerCase()}${prest}`);
-    
-            this.defineSingular(new RegExp(`${s0.toUpperCase()}${caseInsensitive(srest)}$`), `${s0.toUpperCase()}${srest}`);
-            this.defineSingular(new RegExp(`${s0.toLowerCase()}${caseInsensitive(srest)}$`), `${s0.toLowerCase()}${srest}`);
-            this.defineSingular(new RegExp(`${p0.toUpperCase()}${caseInsensitive(prest)}$`), `${s0.toUpperCase()}${srest}`);
-            this.defineSingular(new RegExp(`${p0.toLowerCase()}${caseInsensitive(prest)}$`), `${s0.toLowerCase()}${srest}`);
-        }
-    },
-    
-    defineUncountable(singularAndPlural){
-        this.defineIrregular(singularAndPlural, singularAndPlural);
-    },
-    
-    pluralize(word){
-        word = `${word}`;
-        for(let i in this.pluralizeRules){
-            const [pattern, replacement] = this.pluralizeRules[i];
-            if(word.match(pattern)){
-                return word.replace(pattern, replacement);
-            }
-        }      
-    },
-    
-    singularize(word){
-        word = `${word}`;
-        for(let i in this.singularizeRules){
-            const [pattern, replacement] = this.singularizeRules[i];
-            if(word.match(pattern)){
-                return word.replace(pattern, replacement);
-            }
-        }      
-    },
-    
-    snakeify(stringable){
-        return `${stringable}`.split(/\//).map(segment =>
-            segment.replace(/([A-Z])/g, '_$1').toLocaleLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/(^_|_$)/g, '')
-        ).join('/');
-    },
-    
-    dasherize(stringable){
-        return this.snakeify(stringable).replace(/_/g, '-');
-    },
-    
-    capitalize(stringable){
-        const [first, ...rest] = `${stringable}`;
-        return `${first.toLocaleUpperCase()}${rest.join('')}`;
-    },
-    
-    uncapitalize(stringable){
-        const [first, ...rest] = `${stringable}`;
-        return `${first.toLocaleLowerCase()}${rest.join('')}`;
-    },
-    
-    pascalize(stringable){
-        return this.snakeify(stringable).replace(/^[0-9]+/, '').split(/[^a-z0-9]+/).map(word => this.capitalize(word)).join('');
-    },
-    
-    camelize(stringable){
-        return this.uncapitalize(this.pascalize(stringable));
-    }
-});
-
-const caseInsensitive = (string) => string.replace(/[a-z]/gi, (c) => `[${c.toUpperCase()}${c.toLowerCase()}]`);
-
-export const inflector = Inflector.instance;
+export { Inflector, inflector } from '@blognami/util';

package/lib/initialize.js

@@ -2,10 +2,12 @@
 import { Component } from './component.js';
 
 if(typeof window != 'undefined'){
+    const [ styleEl ] = Component.new(document.head, true).prepend(`<style>body { display: none; }</style>`);
     window.addEventListener('DOMContentLoaded', () => {
         const documentComponent = Component.instanceFor(document);
         documentComponent.observe({ add: true }, component => component.descendants);
         documentComponent.patch(document.documentElement.outerHTML);
+        styleEl.remove();
     });
 }
 

package/lib/internal.js

@@ -0,0 +1,7 @@
+
+
+import './initialize.js';
+
+export const path = import.meta.url;
+
+export { Component } from './component.js';

package/lib/lru_cache.js

@@ -1,53 +1,2 @@
 
-import { Class } from './class.js';
-
-export const LruCache = Class.extend().include({
-    meta(){
-        this.assignProps({
-            maxEntries: 1000
-        });
-    },
-
-    initialize(){
-        this.entries = {};
-        this.index = [];
-    },
-
-    put(key, value){
-        if(!this.entries[key]){
-            this.entries[key] = { key, position: this.index.length };
-            this.index.push(this.entries[key]);
-            this.promote(key);
-            this.evict();
-        }
-        this.entries[key].value = value;
-    },
-
-    get(key){
-        const entry = this.entries[key];
-        if(!entry) return;
-        this.promote(key);
-        return entry.value;
-    },
-
-    hasEntry(key){
-        return !!this.entries[key];
-    },
-
-    promote(key){
-        const entry = this.entries[key];
-        if(!entry || entry.position == 0) return;
-        const previousEntry = this.index[entry.position - 1];
-        this.index[entry.position] = previousEntry;
-        this.index[previousEntry.position] = entry;
-        previousEntry.position++;
-        entry.position--;
-    },
-
-    evict(){
-        while(this.index.length > this.constructor.maxEntries){
-            const entry = this.index.pop();
-            delete this.entries[entry.key];
-        }
-    }
-});
+export { LruCache } from '@blognami/util';

package/lib/registry.js

@@ -1,130 +1,2 @@
 
-import { Class } from './class.js';
-
-export const Registry = {
-    meta(){
-
-        const { include } = this;
-
-        this.assignProps({
-            registry: this,
-
-            mixins: {},
-
-            cache: {},
-
-            get names(){
-                return Object.keys(this.mixins).sort();
-            },
-        
-            get includedIn(){
-                const out = [];
-                this.names.forEach(name => {
-                    if(this.for(name).includes.includes(this.name) && !out.includes(name)){
-                        out.push(name);
-                    }
-                });
-                return out;
-            },
-
-            normalizeName(name){
-                return name;
-            },
-
-            normalizeMixin(name, mixin, previousMixin){
-                return {
-                    meta(){
-                        if(previousMixin) this.include(previousMixin);
-                        this.include(mixin);
-                    }
-                }
-            },
-
-            register(name, mixin = {}){
-                const normalizedName = this.normalizeName(name);
-                this.mixins[normalizedName] = this.normalizeMixin(normalizedName, mixin, this.mixins[normalizedName]);
-                this.clearCache();
-            },
-
-            unregister(name){
-                const normalizedName = this.normalizeName(name);
-                delete this.mixins[normalizedName];
-            },
-
-            clearCache(){
-                this.registry.cache = {};
-            },
-
-            createInitialMixin(name){
-                return {};
-            },
-
-            for(name){
-                const normalizedName = this.normalizeName(name);
-                if(!this.cache.classes) this.cache.classes = {};
-                const { classes } = this.cache;
-                if(!classes[normalizedName]){
-                    classes[normalizedName] = this.registry.extend().include({
-                        meta(){
-                            this.assignProps({ name: normalizedName, includes: [] });
-                            this.include(this.createInitialMixin(normalizedName));
-                            this.include(this.mixins[normalizedName] || {});
-                        }
-                    });
-                }
-                return classes[normalizedName];
-            },
-
-            include(...includes){
-                includes.forEach(current => {
-                    if(typeof current == 'string'){
-                        if(!this.mixins[current]) throw new Error(`Named include '${current}' does not exist.`);
-                        if(!this.includes.includes(current)) this.includes.push(current);
-                        return include.call(this, this.mixins[current]);
-                    }
-                    return include.call(this, current);
-                });
-                return this;
-            },
-            
-            create(name, ...args){
-                return this.for(name).new(...args);
-            },
-
-            get FileImporter(){
-                if(!this.registry.hasOwnProperty('_FileImporter')){
-                    this.registry._FileImporter = Class.extend().include({
-                        meta(){
-                            this.include(Registry);
-                            
-                            this.assignProps({
-                                async importFile({ extension, ...rest }){
-                                    await this.create(extension).importFile({ extension, ...rest });
-                                }
-                            });
-                        },
-
-                        importFile(){
-                            // by default do nothing
-                        }
-                    });
-
-                    const that = this;
-                    this.registry._FileImporter.register('js', {
-                        async importFile({ filePath, relativeFilePathWithoutExtension }){
-                            if(relativeFilePathWithoutExtension == '_file_importer') return;
-                            const include = (await import(filePath)).default;
-                            if(!include) return;
-                            that.register(relativeFilePathWithoutExtension, include);
-                        }
-                    });
-                }
-                return this.registry._FileImporter;
-            },
-
-            async importFile(...args){
-                await this.FileImporter.importFile(...args);
-            }
-        })
-    }
-};
+export { Registry, registries } from '@blognami/util';

package/lib/trapify.js

@@ -1,32 +1,2 @@
 
-
-const TRAP_NAMES = ['get' ,'deleteProperty' ,'ownKeys' ,'has' ,'apply' ,'defineProperty' ,'getPrototypeOf' ,'setPrototypeOf' ,'isExtensible' ,'preventExtensions' ,'getOwnPropertyDescriptor' ,'enumerate' ,'construct'];
-
-export const trapify = o => new Proxy(new Proxy(o, {
-    get(target, name, ...args){
-        const descriptor = getPropertyDescriptor(target, name);
-        if(descriptor){
-            const { get, value } = descriptor;
-            if(get) return get.call(trapify(target));
-            return value;
-        }
-        if(getPropertyDescriptor(target, '__getMissing')) return target.__getMissing.call(trapify(target), target, name, ...args);
-    },
-    
-    set(target, name, value, ...args){
-        const descriptor = getPropertyDescriptor(target, name);
-        if(descriptor){
-            const { set } = descriptor;
-            if(set) return set.call(trapify(target), value);
-        }
-        if(getPropertyDescriptor(target, '__setMissing')) return target.__setMissing.call(trapify(target), target, name, value, ...args);
-        target[name] = value;
-        return true;
-    }
-}), TRAP_NAMES.reduce((traps, name) => {
-    const methodName = `__${name}`;
-    if(getPropertyDescriptor(o, methodName)) traps[name] = (target, ...args) => target[methodName].call(trapify(target), target, ...args);
-    return traps;
-}, {}));
-
-const getPropertyDescriptor = (o, name) => o ? Object.getOwnPropertyDescriptor(o, name) || getPropertyDescriptor(Object.getPrototypeOf(o), name) : undefined;
+export { trapify } from '@blognami/util';

package/lib/virtual_node.js

@@ -1,171 +1,2 @@
 
-import { escapeHtml } from './escape_html.js';
-import { unescapeHtml } from './unescape_html.js';
-import { StringReader } from './string_reader.js';
-import { SELF_CLOSING_TAGS, TEXT_ONLY_TAGS } from './constants.js';
-
-class CloseTag {
-    constructor(type){
-        this.type = type;
-    }
-}
-
-export class VirtualNode {
-
-    static fromString(html){
-        const out = new this();
-        out.appendHtml(html);
-        return out;
-    }
-
-    static deserialize(o, parent = null){
-        const { type, attributes, children } = typeof o == 'string' ? JSON.parse(o) : o;
-        const out = new this(parent, type, attributes);
-        out.children = children.map(
-            child => this.deserialize(child, this)
-        );
-        return out;
-    }
-
-    constructor(parent = null, type = '#fragment', attributes = {}){
-        this.parent = parent;
-        this.type = type;
-        this.attributes = attributes;
-        this.children = [];
-    }
-
-    get text(){
-        const out = [];
-        this.traverse(node => {
-            if(node.type == '#text'){
-                out.push(node.attributes.value);
-            }
-        });
-        return out.join('');
-    }
-
-    appendNode(type, attributes = {}){
-        const out = new this.constructor(this, type, attributes);
-        this.children.push(out);
-        return out;
-    }
-
-    appendHtml(html){
-        if(!(html instanceof StringReader)){
-            html = new StringReader(html);
-
-            while(html.length > 0){
-                try {
-                    this.appendHtml(html);
-                } catch(e){
-                    if(e instanceof CloseTag){
-                        //do nothing
-                    } else {
-                        throw e;
-                    }
-                }
-            }
-
-            return this;
-        }
-        
-        while(html.length > 0){
-            let matches;
-
-            if(matches = html.match(/^[^<]+/)){
-                this.appendNode('#text', {value: unescapeHtml(matches[0])})
-            } else if(matches = html.match(/^<!DOCTYPE[^>]*>/i)){
-                if(!this.parent){
-                    this.appendNode('#doctype');
-                }
-            } else if(matches = html.match(/^<!--([\s\S]*?)-->/i)){
-                this.appendNode('#comment', {value: matches[1]});
-            } else if(matches = html.match(/^<([^>\s]+)/)){
-                const type = matches[1].toLowerCase();
-                const attributes = {};
-
-                while(html.length > 0){
-                    if(matches = html.match(/^\s*([\w-]+)\s*=\s*\"([^\"]*)\"/)){
-                        attributes[matches[1]] = unescapeHtml(matches[2]);
-                    } else if(matches = html.match(/^\s*([\w-]+)\s*=\s*\'([^\']*)\'/)){
-                        attributes[matches[1]] = unescapeHtml(matches[2]);
-                    } else if(matches = html.match(/^\s*([\w-]+)\s*=\s*([^\s>]+)/)){
-                        attributes[matches[1]] = unescapeHtml(matches[2]);
-                    } else if(matches = html.match(/^\s*([\w-]+)/)){
-                        attributes[matches[1]] = null;
-                    } else {
-                        html.match(/^[^>]*>/);
-                        break;
-                    }
-                }
-                
-                if(matches = type.match(/^\/(.*)/)){
-                    throw new CloseTag(matches[1]);
-                }
-
-                const child = this.appendNode(type, attributes);
-                
-                if(SELF_CLOSING_TAGS.includes(type)){
-                    // do nothing
-                } else if(TEXT_ONLY_TAGS.includes(type) && (matches = html.match(new RegExp(`^([\\s\\S]*?)<\\/${type}[^>]*>`)))){
-                    child.appendNode('#text', {value: matches[1]});
-                } else if(TEXT_ONLY_TAGS.includes(type) && (matches = html.match(/^([\s\S]+)/))){
-                    child.appendNode('#text', {value: matches[1]});
-                } else {
-                    try {
-                        child.appendHtml(html);
-                    } catch(e){
-                        if(e instanceof CloseTag && e.type == type){
-                            //do nothing
-                        } else {
-                            throw e;
-                        }
-                    }
-                }
-            } else if(matches = html.match(/^[\s\S]/)) {
-                this.appendNode('#text', {value: matches[0]});
-            } else {
-                break;
-            }
-        }
-
-    }
-
-    traverse(fn){
-        fn.call(this, this);
-        this.children.forEach(child => child.traverse(fn));
-    }
-
-    serialize(){
-        return JSON.stringify(this, ['type', 'attributes', 'children']);
-    }
-
-    toString(){
-        if(this.type == '#doctype') return '<!DOCTYPE html>';
-        if(this.type == '#text'){
-            if(this.parent && TEXT_ONLY_TAGS.includes(this.parent.type)) return this.attributes.value;
-            return escapeHtml(this.attributes.value);
-        }
-        if(this.type == '#comment') return `<!--${escapeHtml(this.attributes.value)}-->`;
-        const out = [];
-        if(this.type != '#fragment'){
-            out.push(`<${this.type}`);
-            Object.keys(this.attributes).forEach(name => {
-                const value = this.attributes[name];
-                if(value){
-                    out.push(` ${name}="${escapeHtml(value)}"`);
-                } else {
-                    out.push(` ${name}`);
-                }
-            })
-            out.push('>');
-        }
-        this.children.forEach(child => {
-            out.push(child.toString());
-        });
-        if(this.type != '#fragment' && !SELF_CLOSING_TAGS.includes(this.type)) out.push(`</${this.type}>`);
-        return out.join('');
-    }
-}
-
-export const parseHtml = html => VirtualNode.fromString(html);
+export { VirtualNode, parseHtml } from '@blognami/util';

package/package.json

@@ -1,50 +1,24 @@
 {
   "type": "module",
   "name": "pinstripe",
-  "description": "A slick web framework for Node.js.",
-  "version": "0.24.0",
+  "description": "Surgically updates your app's DOM when a page changes.",
+  "version": "0.26.0",
   "author": "Jody Salt",
   "license": "MIT",
   "exports": {
     ".": "./lib/index.js",
-    "./database": "./lib/database/index.js",
-    "./multi-tenant": "./lib/extensions/multi-tenant/index.js",
-    "./util": "./lib/util.js"
-  },
-  "bin": {
-    "pinstripe": "./cli.js"
+    "./internal": "./lib/internal.js"
   },
   "scripts": {
-    "clean": "rm -rf ./node_modules",
-    "start": "IS_LOCAL_PINSTRIPE=true pinstripe start-server",
-    "test": "yarn test:unit",
-    "test:unit": "jest lib"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.9.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.18.6",
-    "@babel/preset-env": "^7.9.0",
-    "babel-jest": "^25.1.0",
-    "jest": "^28.0.1",
-    "jest-environment-jsdom": "^29.1.2"
+    "clean": "rm -rf ./node_modules"
   },
   "dependencies": {
-    "bcrypt": "^5.0.1",
-    "busboy": "^0.3.1",
-    "chalk": "^4.1.0",
-    "cron-parser": "^4.3.0",
-    "esbuild": "^0.15.12",
-    "html-entities": "^2.3.2",
-    "js-yaml": "^4.1.0",
-    "luxon": "^2.3.1",
-    "markdown-it": "^12.2.0",
-    "memfs": "^3.2.2",
-    "mime-types": "^2.1.28",
-    "mysql2": "^2.3.3",
-    "nodemailer": "^6.7.2",
-    "sqlite3": "^5.0.2",
-    "tmp": "^0.2.1",
-    "unionfs": "^4.4.0"
+    "@blognami/util": "^0.26.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/blognami/blognami.git",
+    "directory": "packages/pinstripe"
   },
-  "gitHead": "c581c719c8574bb58ce4f96ceef308ca9f9bfea4"
+  "gitHead": "981a4f7fdb5c28e6255a80e6a3cf1d3e4c8fc971"
 }

package/babel.config.cjs

@@ -1,18 +0,0 @@
-module.exports = {
-  presets: [
-    [
-      '@babel/preset-env',
-      {
-        targets: {
-            node: 'current',
-        },
-      },
-    ],
-  ],
-  env: {
-    test: {
-      plugins: ["@babel/plugin-transform-modules-commonjs"]
-    }
-  }
-};
-