pinstripe 0.21.0 → 0.23.0

package/README.md

@@ -0,0 +1,10 @@
+
+# Welcome to Pinstripe
+
+## What is Pinstripe?
+
+A slick web framework for Node.js.
+
+## License
+
+Pinstripe is released under the [MIT License](https://opensource.org/licenses/MIT).

package/lib/client.js

@@ -1,8 +1,7 @@
 import { fileURLToPath } from 'url';
 
-import { Class } from "./class.js";
-import { Singleton } from "./singleton.js";
-
+import { Class } from './class.js';
+import { Singleton } from './singleton.js';
 
 export const Client = Class.extend().include({
     meta(){

package/lib/command.js

@@ -1,8 +1,8 @@
 
 import { Class } from './class.js';
+import { inflector } from './inflector.js';
 import { Registry } from './registry.js';
 import { ServiceConsumer } from './service_consumer.js';
-import { inflector } from "./inflector.js";
 
 export const Command = Class.extend().include({
     meta(){

package/lib/commands/generate_migration.js

@@ -29,15 +29,23 @@ export default {
     
             await generateFile(`lib/migrations/${name}.js`, () => {
                 line();
-                line(`export default async ({ database }) => {`);
+                line(`export default {`);
                 indent(() => {
-                    line();
-                    if(table && fields.length){
-                        fields.forEach(({ name, type }) => {
-                            line(`await database.${table}.addColumn('${name}', '${type}');`);
-                        });
-                        line();
-                    }
+                    line(`async migrate(){`);
+                    indent(() => {
+                        if(table && fields.length){
+                            line(`await this.database.table('${table}', async ${table} => {`);
+                            indent(() => {
+                                fields.forEach(({ name, type }) => {
+                                    line(`await ${table}.addColumn('${name}', '${type}');`);
+                                });
+                            })
+                            line(`});`);
+                        } else {
+                            line();
+                        }
+                    })
+                    line(`}`);
                 })
                 line('};');
                 line();

package/lib/commands/generate_model.js

@@ -11,7 +11,7 @@ export default {
         const fields = extractFields();
     
         const collectionName = this.inflector.camelize(this.inflector.pluralize(name));
-        if(!await this.database[collectionName].exists){
+        if(!await this.database[collectionName]){
             const denormalizedFields = fields.map(({ mandatory, name, type }) => {
                 return `${ mandatory ? '^' : '' }${name}:${type}`
             });

package/lib/commands/generate_project.js

@@ -1,5 +1,6 @@
 
 import { spawnSync } from 'child_process';
+import * as crypto from 'crypto';
 
 export default {
    async run(){
@@ -92,7 +93,8 @@ export default {
             line(`export default {`);
             indent(() => {
                line(`database,`);
-               line(`mail`);
+               line(`mail,`);
+               line(`salt: '${crypto.randomUUID()}'`)
             })
             line(`};`);
          });

package/lib/component.js

@@ -1,14 +1,13 @@
 
 import { fileURLToPath } from 'url'; // pinstripe-if-client: const fileURLToPath = undefined;
 
-import { VirtualNode } from './virtual_node.js';
-import { EventWrapper } from './event_wrapper.js';
-import { TEXT_ONLY_TAGS } from './constants.js';
-
 import { Class } from './class.js';
+import { TEXT_ONLY_TAGS } from './constants.js';
+import { Inflector } from './inflector.js';
+import { VirtualNode } from './virtual_node.js';
 import { Registry } from './registry.js';
+import { ComponentEvent } from './component_event.js';
 import { Client } from './client.js'; // pinstripe-if-client: const Client = undefined;
-import { Inflector } from './inflector.js';
 
 export const Component = Class.extend().include({
     meta(){
@@ -41,6 +40,10 @@ export const Component = Class.extend().include({
                         import include from ${JSON.stringify(filePath)};
                         Component.register(${JSON.stringify(relativeFilePathWithoutExtension)}, include);
                     `);
+                } else {
+                    Client.instance.addModule(`
+                        import ${JSON.stringify(filePath)};
+                    `);
                 }
                 return importFile.call(this, params);
             }
@@ -124,7 +127,9 @@ export const Component = Class.extend().include({
     },
 
     get realParent(){
-        return this.node.parentNode ? this.constructor.instanceFor(this.node.parentNode) : null;
+        if(this.node.parentNode) return this.constructor.instanceFor(this.node.parentNode);
+        if(this.node.host instanceof Element) return this.constructor.instanceFor(this.node.host);
+        return null;
     },
 
     get parent(){
@@ -298,7 +303,7 @@ export const Component = Class.extend().include({
         const selector = args.pop()
 
         const wrapperFn = (event, ...args) => {
-            const eventWrapper = EventWrapper.instanceFor(event)
+            const eventWrapper = ComponentEvent.instanceFor(event)
             if(selector){
                 if(eventWrapper.target.is(selector)){
                     return fn.call(eventWrapper.target, eventWrapper, ...args);
@@ -485,6 +490,9 @@ const matchesSelector = (() => {
 })();
 
 function cleanChildren(){
+    if(this.node.shadowRoot){
+        this.shadow.children.forEach(child => clean.call(child));
+    }
     this.children.forEach(child => clean.call(child));
 }
 
@@ -515,6 +523,9 @@ function clearTimers(){
 }
 
 function initChildren(){
+    if(this.node.shadowRoot){
+        this.shadow.children.forEach(child => initChildren.call(child));
+    }
     this.children.forEach(child => initChildren.call(child));
 }
 
@@ -537,13 +548,19 @@ function createVirtualNode(html){
 }
 
 function patch(attributes, virtualChildren){
-    const isEmptyFrame = this.is('.frame') && virtualChildren.length == 0;
+    const isFrame = this.type == 'pinstripe-frame' || this.attributes['data-component'] == 'pinstripe-frame';
+    const isEmptyFrame = isFrame && virtualChildren.length == 0;
     if(isEmptyFrame && attributes['data-load-on-init'] === undefined){
         attributes['data-load-on-init'] = 'true';
     }
     patchAttributes.call(this, attributes);
     if(isEmptyFrame) return;
-    patchChildren.call(this, virtualChildren);
+    if(this.is('pinstripe-silo, [data-component="pinstripe-silo"]')){
+        patchChildren.call(this.shadow, virtualChildren);
+        patchChildren.call(this, []);
+    } else {
+        patchChildren.call(this, virtualChildren);
+    }
 }
 
 function patchAttributes(attributes){
@@ -622,10 +639,17 @@ function insert(virtualNode, referenceChild, returnComponent = true){
         insert.call(new Component(node, true), child, null, false);
     })
     
-    this.node.insertBefore(
-        node,
-        referenceChild && referenceChild.node
-    );
+    if(this.is('pinstripe-silo, [data-component="pinstripe-silo"]')){
+        this.shadow.node.insertBefore(
+            node,
+            referenceChild && referenceChild.node
+        );
+    } else {
+        this.node.insertBefore(
+            node,
+            referenceChild && referenceChild.node
+        );
+    }
     
     if(returnComponent){
         return Component.instanceFor(node);
@@ -653,17 +677,4 @@ function normalizeVirtualNode(){
     }
 }
 
-EventWrapper.Component = Component;
-
-[
-    ['#document', 'pinstripe-document'],
-    ['a', 'pinstripe-anchor'],
-    ['body', 'pinstripe-body'],
-    ['form', 'pinstripe-form']
-].forEach(([name, include]) => {
-    Component.register(name, {
-        meta(){
-            this.include(include);
-        }
-    })
-});
+ComponentEvent.Component = Component;

package/lib/component_event.js

@@ -0,0 +1,28 @@
+
+import { Class } from './class.js';
+import { trapify } from './trapify.js';
+
+export const ComponentEvent = Class.extend().include({
+    meta(){
+        this.assignProps({
+            instanceFor(event){
+                if(!event._componentEvent){
+                    event._componentEvent = ComponentEvent.new(event);
+                }
+                return event._componentEvent;
+            }
+        });
+    },
+
+    initialize(event){
+        this.event = event;
+        return trapify(this);
+    },
+
+    __get(target, name){
+        const out = target.event[name];
+        if(out instanceof Node) return ComponentEvent.Component.instanceFor(out);
+        if(typeof out == 'function') return (...args) => out.call(target.event, ...args);
+        return out;
+    }
+});

package/lib/components/_file_importer.js

@@ -1 +1 @@
-export { Component as default } from 'pinstripe'
+export { Component as default } from 'pinstripe';

package/lib/components/pinstripe_markdown_editor.js

@@ -59,11 +59,11 @@ Component.register('pinstripe-markdown-editor/line-inserter', {
 
 Component.register('pinstripe-markdown-editor/anchor', {
     meta(){
-        this.include('pinstripe-anchor');
+        this.include('a');
     },
 
     initialize(...args){
-        this.constructor.for('pinstripe-anchor').prototype.initialize.call(this, ...args);
+        this.constructor.for('a').prototype.initialize.call(this, ...args);
 
         this.patch({ 
             ...this.attributes,

package/lib/components/pinstripe_overlay.js

@@ -1,5 +1,5 @@
 
-export default  {
+export default {
     meta(){
         this.include('pinstripe-frame');
     },

package/lib/components/pinstripe_silo.js

@@ -0,0 +1,2 @@
+
+export default {};

package/lib/constants.js

@@ -20,3 +20,7 @@ export const TEXT_ONLY_TAGS = [
     'script',
     'style'
 ];
+
+export const IS_SERVER = typeof window == 'undefined';
+
+export const IS_CLIENT = !IS_SERVER;

package/lib/database/client.js

@@ -2,7 +2,8 @@ import mysql from 'mysql2';
 import sqlite from 'sqlite3';
 import { existsSync, unlinkSync } from 'fs';
 
-import { Class } from "../class.js";
+import { Class } from '../class.js';
+
 
 export const Client = Class.extend().include({
     initialize(config){
@@ -31,7 +32,7 @@ export const Client = Class.extend().include({
                 }
             });   
         }
-        return run.call(this, ...prepare.call(this, query));
+        return run.call(this, ...prepare.call(this, await resolveQuery(query)));
     },
 
     async lock(fn){
@@ -130,6 +131,17 @@ export const Client = Class.extend().include({
 });
 
 
+async function resolveQuery(query){
+    let out = await query;
+    if(Array.isArray(out)){
+        out = [ ...out ];
+        for(let i = 0; i < out.length; i++){
+            out[i] = await resolveQuery(out[i]);
+        }
+    }
+    return out;
+}
+
 function flattenFirst(query){
     if(!Array.isArray(query[0])) return query;
     return flattenFirst([...query[0], ...query.slice(1)]);

package/lib/database/migration.js

@@ -1,6 +1,6 @@
 
-import { Class } from "../class.js";
-import { Registry } from "../registry.js";
+import { Class } from '../class.js';
+import { Registry } from '../registry.js';
 
 export const Migration = Class.extend().include({
     meta(){

package/lib/database/migrator.js

@@ -1,5 +1,5 @@
 
-import { Class } from "../class.js";
+import { Class } from '../class.js';
 import { Migration } from "./migration.js";
 
 export const Migrator = Class.extend().include({
@@ -8,7 +8,7 @@ export const Migrator = Class.extend().include({
     },
 
     async migrate(){
-        if(!this.database.table('pinstripeAppliedMigrations').exists){
+        if(!await this.database.table('pinstripeAppliedMigrations').exists){
             await this.database.table('pinstripeAppliedMigrations', async pinstripeAppliedMigrations => {
                 await pinstripeAppliedMigrations.addColumn('schemaVersion', 'integer');
             });

package/lib/database/row.js

@@ -1,11 +1,12 @@
+
 import crypto from 'crypto';
 
+import { Registry } from '../registry.js';
 import { Model, defineCallbacks } from "../model.js";
-import { Registry } from "../registry.js";
 import { Table } from "./table.js";
 import { TableReference } from './table_reference.js';
 import { defer } from '../defer.js';
-import { inflector } from '../inflector.js'
+import { inflector } from '../inflector.js';
 import { COLUMN_TYPE_TO_FORM_FIELD_TYPE_MAP } from './constants.js';
 
 export const Row = Model.extend().include({
@@ -150,79 +151,82 @@ export const Row = Model.extend().include({
                     modifiedFields[name] = this[name];
                 }
             });
-            if(Object.keys(modifiedFields).length == 0) return this;
-
-            const query = [];
+            
+            if(Object.keys(modifiedFields).length) {
+                const query = [];
 
-            const tableReference = TableReference.new(this.constructor.collectionName);
+                const tableReference = TableReference.new(this.constructor.collectionName);
 
-            if(this._exists){
-                query.push('update ? set ', tableReference);
-                Object.keys(modifiedFields).forEach((name, i) => {
-                    if(name == 'id') return;
-                    this.database.client.adapt({
-                        mysql(){
-                            if(name.match(/(^id|Id)$/)){
-                                query.push(i > 0 ? ', ? = uuid_to_bin(?)' : '? = uuid_to_bin(?)', tableReference.createColumnReference(name), modifiedFields[name]);
-                            } else {
-                                query.push(i > 0 ? ', ? = ?' : '? = ?', tableReference.createColumnReference(name), modifiedFields[name]);
-                            } 
-                        },
+                if(this._exists){
+                    query.push('update ? set ', tableReference);
+                    Object.keys(modifiedFields).forEach((name, i) => {
+                        if(name == 'id') return;
+                        this.database.client.adapt({
+                            mysql(){
+                                if(name.match(/(^id|Id)$/)){
+                                    query.push(i > 0 ? ', ? = uuid_to_bin(?)' : '? = uuid_to_bin(?)', tableReference.createColumnReference(name), modifiedFields[name]);
+                                } else {
+                                    query.push(i > 0 ? ', ? = ?' : '? = ?', tableReference.createColumnReference(name), modifiedFields[name]);
+                                } 
+                            },
 
-                        sqlite(){
-                            query.push(i > 0 ? `, \`${name}\` = ?` : `\`${name}\` = ?`, modifiedFields[name]);
-                        }
+                            sqlite(){
+                                query.push(i > 0 ? `, \`${name}\` = ?` : `\`${name}\` = ?`, modifiedFields[name]);
+                            }
+                        });
                     });
-                });
-                this.database.client.adapt(this, {
-                    mysql(){
-                        query.push(' where ? = uuid_to_bin(?)', tableReference.createColumnReference('id'), this._initialFields.id);
-                    },
-
-                    sqlite(){
-                        query.push(' where ? = ?', tableReference.createColumnReference('id'), this._initialFields.id);
-                    }
-                });
-                
-            } else {
-                query.push('insert into ?(', tableReference);
-                Object.keys(modifiedFields).forEach((name, i) => {
-                    this.database.client.adapt({
+                    this.database.client.adapt(this, {
                         mysql(){
-                            query.push(i > 0 ? ', ?' : '?', tableReference.createColumnReference(name));
+                            query.push(' where ? = uuid_to_bin(?)', tableReference.createColumnReference('id'), this._initialFields.id);
                         },
 
                         sqlite(){
-                            query.push(i > 0 ? `, \`${name}\`` : `\`${name}\``,);
+                            query.push(' where ? = ?', tableReference.createColumnReference('id'), this._initialFields.id);
                         }
                     });
-                });
-                query.push(') values(');
-                Object.keys(modifiedFields).forEach((name, i) => {
-                    if(name.match(/(^id|Id)$/)){
+                    
+                } else {
+                    query.push('insert into ?(', tableReference);
+                    Object.keys(modifiedFields).forEach((name, i) => {
                         this.database.client.adapt({
                             mysql(){
-                                query.push(i > 0 ? ', uuid_to_bin(?)' : 'uuid_to_bin(?)', modifiedFields[name]);
+                                query.push(i > 0 ? ', ?' : '?', tableReference.createColumnReference(name));
                             },
 
                             sqlite(){
-                                query.push(i > 0 ? ', ?' : '?', modifiedFields[name]);
+                                query.push(i > 0 ? `, \`${name}\`` : `\`${name}\``,);
                             }
                         });
-                    } else {
-                        query.push(i > 0 ? ', ?' : '?', modifiedFields[name]);
-                    }
-                });
-                query.push(')');
-            }
+                    });
+                    query.push(') values(');
+                    Object.keys(modifiedFields).forEach((name, i) => {
+                        if(name.match(/(^id|Id)$/)){
+                            this.database.client.adapt({
+                                mysql(){
+                                    query.push(i > 0 ? ', uuid_to_bin(?)' : 'uuid_to_bin(?)', modifiedFields[name]);
+                                },
+
+                                sqlite(){
+                                    query.push(i > 0 ? ', ?' : '?', modifiedFields[name]);
+                                }
+                            });
+                        } else {
+                            query.push(i > 0 ? ', ?' : '?', modifiedFields[name]);
+                        }
+                    });
+                    query.push(')');
+                }
 
-            await this.database.run(query);
+                await this.database.run(query);
 
-            Object.keys(modifiedFields).forEach(name => {
-                this[name] = modifiedFields[name];
-            });
+                Object.keys(modifiedFields).forEach(name => {
+                    this[name] = modifiedFields[name];
+                    this._initialFields[name] = modifiedFields[name];
+                });
 
-            this._exists = true;
+                this._exists = true;
+
+            }
 
             await (this._exists ? this._runAfterUpdateCallbacks() : this._runAfterInsertCallbacks());
 
@@ -326,6 +330,11 @@ function defineRelationship({ name, type, collectionName, fromKey, toKey, cascad
     this.prototype.assignProps({
         get [name](){
             return defer(() => {
+                if(fromKey != 'id'){
+                    const out = this.database[collectionName].where({ [toKey]: this[fromKey] });
+                    if(type == 'singular') return out.first();
+                    return out;
+                }
                 const out = this.database[this.constructor.collectionName].where({ id: this.id })[name];
                 if(type == 'singular') return out.first();
                 return out;

package/lib/database/table.js

@@ -1,6 +1,7 @@
 
-import { Class } from "../class.js";
-import { Registry } from "../registry.js";
+import { Class } from '../class.js';
+import { inflector } from '../inflector.js';
+import { Registry } from '../registry.js';
 import { TableReference } from "./table_reference.js";
 import {
     MYSQL_COLUMN_TYPE_TO_TYPE_MAP,
@@ -13,7 +14,6 @@ import {
     COLUMN_TYPE_TO_FORM_FIELD_TYPE_MAP
 } from './constants.js';
 import { Union } from "./union.js";
-import { inflector } from "../inflector.js";
 
 export const Table = Class.extend().include({
     meta(){
@@ -489,6 +489,8 @@ export const Table = Class.extend().include({
     }
 });
 
+Union.Table = Table;
+
 function joinToUnion(fromKey, collectionName, toKey){
     return Union.new(
         this.database,

package/lib/database/union.js

@@ -1,7 +1,7 @@
 
-import { Class } from "../class.js";
+import { Class } from '../class.js';
+import { inflector } from '../inflector.js';
 import { Row } from './row.js';
-import { inflector } from "../inflector.js";
 
 export const Union = Class.extend().include({
     meta(){
@@ -12,7 +12,7 @@ export const Union = Class.extend().include({
             },
 
             create(name, database){
-                return this.new(database, this.tableNamesFor(name).map(tableName => database.table(tableName)));
+                return this.new(database, this.tableNamesFor(name).map(tableName => this.Table.create(tableName, database)));
             }
         });
     },
@@ -125,4 +125,4 @@ export const Union = Class.extend().include({
         }
         return this;
     }
-});
+});

package/lib/database.js

@@ -1,7 +1,7 @@
-
 import { Class } from './class.js';
-import { Table, Union, Row, Migrator } from './database/index.js';
 import { trapify } from './trapify.js';
+import { defer } from './defer.js';
+import { Table, Union, Row, Migrator } from './database/index.js';
 
 let loadSchemaPromise;
 
@@ -23,26 +23,30 @@ export const Database = Class.extend().include({
     },
 
     table(name, fn){
-        const out = Table.create(name, this);
-        if(fn) return fn.call(out, out);
-        return out;
+        return defer(() => {
+            const out = Table.create(name, this);
+            if(fn) return fn.call(out, out);
+            return out;
+        });
     },
 
     union(name){
-        return Union.create(name, this);
+        return defer(() => Union.create(name, this));
     },
 
-    async singleton(name){
-        const { abstract, singleton, collectionName } = Row.for(name);
-        if(!singleton || abstract) return;
-        const table = this.table(collectionName);
-        const out = await table.first();
-        if(out) return out;
-        return this.lock(async () => {
+    singleton(name){
+        return defer(async () => {
+            const { abstract, singleton, collectionName } = Row.for(name);
+            if(!singleton || abstract) return;
+            const table = this.table(collectionName);
             const out = await table.first();
             if(out) return out;
-            await table.insert();
-            return table.first();
+            return this.lock(async () => {
+                const out = await table.first();
+                if(out) return out;
+                await table.insert();
+                return table.first();
+            });
         });
     },
 

package/lib/escape_html.js

@@ -0,0 +1,2 @@
+
+export { encode as escapeHtml } from "html-entities";

package/lib/html.js

@@ -1,6 +1,5 @@
 
 import { Class } from './class.js';
-import { defer } from './defer.js';
 
 export const Html = Class.extend().include({
     meta(){