pinstripe 0.12.0 → 0.15.0

package/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --unhandled-rejections=strict
+#!/usr/bin/env node
 
 import { spawn } from 'child_process';
 

package/lib/command.js

@@ -19,6 +19,18 @@ export const Command = Base.extend().include({
 
             run(name = 'list-commands', ...args){
                 return this.create(name, ...args).run();
+            },
+
+            get schedules(){
+                if(!this.hasOwnProperty('_schedules')){
+                    this._schedules = [];
+                }
+                return this._schedules;
+            },
+
+            schedule(...args){
+                this.schedules.push(args);
+                return this;
             }
         });
     },

package/lib/commands/generate_project.js

@@ -36,11 +36,29 @@ export default async ({
       await generateFile(`lib/index.js`, () => {
          line();
          line(`import { importAll } from 'pinstripe';`);
+         dependencies.forEach((dependency) => {
+            if(dependency != 'pinstripe') line(`import '${dependency}';`);
+         });
          line();
          line(`importAll(import.meta.url);`);
          line();
       });
 
+      await generateFile(`README.md`, () => {
+         line();
+         line(`# ${name}`);
+         line();
+         line('## Getting started');
+         line();
+         line('```bash');
+         indent(() => {
+            line('pinstripe init-database');
+            line('pinstripe start-server');
+         });
+         line('```');
+         line();
+      });
+
       spawnSync('yarn', [ 'add', ...dependencies ], {
          stdio: 'inherit'
       });

package/lib/commands/generate_static_site.js

@@ -8,12 +8,12 @@ export default {
 
     async run(){
         this.pages = {};
-        const paths = Object.keys(View.classes).filter(path => !path.match(/(^|\/)_/)).map(path => {
-            return `/${path.replace(/(^|\/)index$/, '')}`.replace(/^\/+/, '/');
+        const urls = Object.keys(View.classes).filter(path => !path.match(/(^|\/)_/)).map(path => {
+            return Url.fromString(`/${path.replace(/(^|\/)index$/, '')}`.replace(/^\/+/, '/'));
         });
 
-        while(paths.length){
-            await this.crawlPage({ _path: paths.shift() });
+        while(urls.length){
+            await this.crawlPage({ _url: urls.shift() });
         }
 
         const pages = Object.values(this.pages).filter(page => page.status == 200 && Object.keys(page.params).length == 1);
@@ -25,7 +25,7 @@ export default {
                     const { params, headers } = pages.shift();
                     const contentType = headers['content-type'];
 
-                    const path = params._path;
+                    const path = params._url.path;
                     let filePath = path.replace(/^\//, '');
                     if(filePath.match(/(^|\/)$/)){
                         filePath = `${filePath}index`;
@@ -34,7 +34,7 @@ export default {
                         filePath = `${filePath}.${mimeTypes.extension(contentType)}`
                     }
                     
-                    const data = (await this.fetch({ _path: path }))[2];
+                    const data = (await this.fetch({ _url: Url.fromString(path) }))[2];
 
                     await generateFile(filePath, () => {
                         echo(data.join(''));
@@ -58,7 +58,7 @@ export default {
         const urls = this.extractUrls(virtualDom);
         while(urls.length){
             const url = urls.shift();
-            await this.crawlPage({ ...url.params, _path: url.path });
+            await this.crawlPage({ ...url.params, _url: url });
         }
     },
 
@@ -68,7 +68,7 @@ export default {
             ['src', 'href'].forEach(name => {
                 const value = attributes[name];
                 if(!value) return;
-                const url = Url.fromString(value, 'http://localhost/');
+                const url = Url.fromString(value);
                 if(url.host != 'localhost') return;
                 out.push(url);
             });

package/lib/commands/generate_view.js

@@ -1,7 +1,8 @@
 
 export default async ({
     cliUtils: { extractArg },
-    fsBuilder: { inProjectRootDir, generateFile, line, indent }
+    fsBuilder: { inProjectRootDir, generateFile, line, indent },
+    app
 }) => {
     let name = extractArg('').replace(/^\//, '');
     if(name == ''){
@@ -10,7 +11,7 @@ export default async ({
     }
 
     if(!name.match(/\.[^\/]+$/)){
-        name = `${name}.tpl.js`;
+        name = `${name}.js`;
     }
 
     await inProjectRootDir(async () => {
@@ -21,7 +22,7 @@ export default async ({
             line();
         });
 
-        await generateFile(`lib/views/${name}`, () => {
+        await generateFile(`lib/views/${await app}/${name}`, () => {
             line();
             line('export default ({ renderHtml, params }) => renderHtml(`');
             indent(() => {

package/lib/commands/list_commands.js

@@ -1,13 +1,11 @@
 
 import chalk from 'chalk';
 
-import { Command } from '../command.js';
-
-export default () => {
+export default ({ commandNames }) => {
     console.log('');
     console.log('The following commands are available:');
     console.log('');
-    Object.keys(Command.classes).sort().forEach(commandName => {
+    commandNames.forEach(commandName => {
         console.log(`  * ${chalk.green(commandName)}`);
     });
     console.log('');

package/lib/commands/list_migrations.js

@@ -1,13 +1,11 @@
 
 import chalk from 'chalk';
 
-import { Migration } from '../database/migration.js'
-
-export default () => {
+export default ({ migrationNames }) => {
     console.log('');
     console.log('The following migrations are available:');
     console.log('');
-    Object.keys(Migration.classes).sort().forEach(migrationName => {
+    migrationNames.forEach(migrationName => {
         console.log(`  * ${chalk.green(migrationName)}`);
     });
     console.log('');

package/lib/commands/list_models.js

@@ -1,13 +1,11 @@
 
 import chalk from 'chalk';
 
-import { Row } from '../database/row.js';
-
-export default () => {
+export default ({ modelNames }) => {
     console.log('');
     console.log('The following models are available:');
     console.log('');
-    Object.keys(Row.classes).sort().forEach(modelName => {
+    modelNames.forEach(modelName => {
         console.log(`  * ${chalk.green(modelName)}`);
     });
     console.log('');

package/lib/commands/list_node_wrappers.js

@@ -1,13 +1,11 @@
 
 import chalk from 'chalk';
 
-import { NodeWrapper } from '../node_wrapper.js';
-
-export default () => {
+export default ({ nodeWrapperNames }) => {
     console.log('');
     console.log('The following node wrappers are available:');
     console.log('');
-    Object.keys(NodeWrapper.classes).sort().forEach(nodeWrapperName => {
+    nodeWrapperNames.forEach(nodeWrapperName => {
         console.log(`  * ${chalk.green(nodeWrapperName)}`);
     });
     console.log('');

package/lib/commands/list_services.js

@@ -1,13 +1,11 @@
 
 import chalk from 'chalk';
 
-import { ServiceFactory } from '../service_factory.js';
-
-export default () => {
+export default ({ serviceNames }) => {
     console.log('');
     console.log('The following services are available:');
     console.log('');
-    Object.keys(ServiceFactory.classes).sort().forEach(serviceName => {
+    serviceNames.forEach(serviceName => {
         console.log(`  * ${chalk.green(serviceName)}`);
     });
     console.log('');

package/lib/commands/list_views.js

@@ -1,13 +1,11 @@
 
 import chalk from 'chalk';
 
-import { View } from '../view.js';
-
-export default () => {
+export default ({ viewNames }) => {
     console.log('');
     console.log('The following views are available:');
     console.log('');
-    Object.keys(View.classes).sort().forEach(viewName => {
+    viewNames.forEach(viewName => {
         console.log(`  * ${chalk.green(viewName)}`);
     });
     console.log('');

package/lib/commands/purge_old_sessions.js

@@ -0,0 +1,12 @@
+
+export default {
+    meta(){
+        this.schedule('*/5 * * * *');
+    },
+
+    minutesUntilExpiry: 30,
+
+    async run(){
+        await this.database.withoutMultiTenancy.sessions.lastAccessedAtLt(Date.now() - (1000 * 60 * this.minutesUntilExpiry)).delete();
+    }
+};

package/lib/commands/start_server.js

@@ -1,10 +1,9 @@
 
 import http from 'http';
 import Busboy from 'busboy';
-import { default as qs} from 'qs';
-const { parse: parseQueryString } = qs;
+import { Url } from '../url.js';
 
-export default async ({ fetch }) => {
+export default async ({ fetch, bot }) => {
     const host = process.env.HOST || '127.0.0.1';
     const port = process.env.PORT || 3000;
 
@@ -27,20 +26,23 @@ export default async ({ fetch }) => {
     }).listen(port, host, () => {
         console.log(`Pinstripe running at http://${host}:${port}/`)
     });
+
+    bot.start();
+
+    return new Promise(() => {});
 };
 
 const extractParams = async (request) => {
     const { method, url, headers } = request;
-    const matches = url.match(/^([^\?]+)\?(.*)$/);
-    const path = matches ? matches[1] : url;
-    const queryString = parseQueryString(matches ? matches[2] : "");
+    const _url = Url.fromString(url);
+    if(headers['x-host']) _url.host = headers['x-host'];
     const body = method.match(/^POST|PUT|PATCH$/) ? await parseBody(request) : {};
     
     return {
-        ...queryString,
+        ..._url.params,
         ...body,
         _method: method,
-        _path: path,
+        _url,
         _headers: headers
     };
 };

package/lib/database/adapters/mysql.js

@@ -207,7 +207,7 @@ Adapter.register('mysql').include({
                 const table = this._table;
                 const database = table._database;
         
-                await table.create();
+                if(!await table.exists()) await table.create();
         
                 if(!await this.exists()){
                     await database.run`
@@ -281,9 +281,20 @@ Adapter.register('mysql').include({
                 return this;
             },
 
-            _generateInsertSql(){
+            async _generateInsertSql(){
                 this._fields['id'] = crypto.randomUUID();
                 this._alteredFields['id'] = this._fields['id'];
+
+                const database = await this._database;
+                const { isMultiTenant } = database;
+                const isScopedToTenant = isMultiTenant && !this.constructor.name.match(/^(pinstripe[A-Z]|tenant$)/);
+                const tenant = isScopedToTenant && database._environment ? await database._environment.tenant : undefined;
+                if(tenant){
+                    this._fields['tenantId'] = tenant.id;
+                    this._alteredFields['tenantId'] = tenant.id;
+                } else if(isScopedToTenant) {
+                    return this._database.renderSql`select NULL`;
+                }
         
                 return this._database.renderSql`
                     insert into ${this._adapter.escapeIdentifier(Inflector.pluralize(this.constructor.name))}(
@@ -352,7 +363,7 @@ Adapter.register('mysql').include({
             },
 
             async first(options = {}){
-                return (await this.all({ ...options, limit: Sql.fromString('0, 1') })).pop();
+                return (await this.all({ ...options, limit: Sql.fromString('1'), offset: Sql.fromString('0') })).pop();
             },
         
             async count(options = {}){
@@ -486,12 +497,32 @@ Adapter.register('mysql').include({
                     out.push(this.renderSql` from ${joinRoot._fromSql}`);
                 }
         
+                const { isMultiTenant } = this._database;
+                const isScopedToTenant = isMultiTenant && !this.constructor.name.match(/^(pinstripe[A-Z]|tenants$)/);
+                const tenant = isScopedToTenant ? await this._database._environment.tenant : undefined;
+        
                 if (options.hasOwnProperty('where')){
                     if(options.where){
                         out.push(this.renderSql` where ${options.where}`);
+                        if(tenant){
+                            out.push(this.renderSql` and ${this.tenantId} = uuid_to_bin(${tenant.id})`);
+                        } else if(isScopedToTenant){
+                            out.push(this.renderSql` and 1 = 2`);
+                        }
+                    } else if(isScopedToTenant){
+                        out.push(this.renderSql` where 1 = 2`);
                     }
                 } else if(joinRoot._whereSql.length) {
                     out.push(this.renderSql` where ${joinRoot._whereSql}`);
+                    if(tenant){
+                        out.push(this.renderSql` and ${this.tenantId} = uuid_to_bin(${tenant.id})`);
+                    } else if(isScopedToTenant){
+                        out.push(this.renderSql` and 1 = 2`);
+                    }
+                } else if(tenant){
+                    out.push(this.renderSql` where ${this.tenantId} = uuid_to_bin(${tenant.id})`);
+                } else if(isScopedToTenant){
+                    out.push(this.renderSql` where 1 = 2`);
                 }
         
                 if(options.hasOwnProperty('orderBy')){
@@ -506,9 +537,18 @@ Adapter.register('mysql').include({
                     if(options.limit){
                         out.push(this.renderSql` limit ${options.limit}`);
                     }
-                } else if(joinRoot._limit) {
-                    const { page, pageSize } = joinRoot._limit;
-                    out.push(this.renderSql` limit ${(page - 1) * pageSize}, ${pageSize}`);
+                } else if(joinRoot._pagination) {
+                    const { pageSize } = joinRoot._pagination;
+                    out.push(this.renderSql` limit ${pageSize}`);
+                }
+
+                if(options.hasOwnProperty('offset')){
+                    if(options.offset){
+                        out.push(this.renderSql` offset ${options.offset}`);
+                    }
+                } else if(joinRoot._pagination || joinRoot._skipCount) {
+                    const { page = 1, pageSize = 10 } = joinRoot._pagination || {};
+                    out.push(this.renderSql` offset ${((page - 1) * pageSize) + joinRoot._skipCount}`);
                 }
         
                 return this.renderSql`${out}`;
@@ -559,10 +599,16 @@ Adapter.register('mysql').include({
                     out.push(this.renderSql` order by ${this._orderBySql}`);
                 }
         
-                if(this._limit) {
-                    const { page, pageSize } = this._limit;
-                    out.push(this.renderSql` limit ${(page - 1) * pageSize}, ${pageSize}`);
+                if(this._pagination) {
+                    const { pageSize } = this._pagination;
+                    out.push(this.renderSql` limit ${pageSize}`);
                 }
+
+                if(this._pagination || this._skipCount) {
+                    const { page = 1, pageSize = 10 } = this._pagination || {};
+                    out.push(this.renderSql` offset ${((page - 1) * pageSize) + this._skipCount}`);
+                }
+
                 return this._database.renderSql`${out}`;
             }
         }
@@ -582,8 +628,6 @@ const TYPE_TO_COLUMN_TYPE_MAP = {
     integer: "int(11)",
     string: "varchar(255)",
     text: "longtext",
-    time: "time",
-    timestamp: "datetime"
 };
 
 const COLUMN_TYPE_TO_TYPE_MAP = (() => {

package/lib/database/adapters/sqlite.js

@@ -1,7 +1,7 @@
 
 import sqlite from 'sqlite3';
 import * as crypto from 'crypto';
-import { unlink } from 'fs';
+import { existsSync, unlink } from 'fs';
 import { promisify } from 'util';
 
 import { Adapter } from '../adapter.js';
@@ -14,14 +14,15 @@ import { Table } from '../table.js';
 import { Row } from '../row.js';
 
 let schemaCache = {};
+let connection;
 
 Adapter.register('sqlite').include({
     get connection(){
-        if(!this._connection){
+        if(!connection){
             const { filename } = this.config;
-            this._connection = new sqlite.Database(filename);
+            connection = new sqlite.Database(filename);
         }
-        return this._connection;
+        return connection;
     },
 
     escapeValue(value){
@@ -51,13 +52,15 @@ Adapter.register('sqlite').include({
             },
         
             async drop() {
-                await new Promise((resolve, reject) => {
-                    this._adapter.connection.close(error => error ? reject(error) : resolve());
-                });
-                delete this._adapter._connection;
+                if(connection){
+                    await new Promise((resolve, reject) => {
+                        connection.close(error => error ? reject(error) : resolve());
+                    });
+                    connection = undefined;
+                }
                 schemaCache = {};
                 this._sessionCache = {};
-                await promisify(unlink)(this._adapter.config.filename);
+                if(existsSync(this._adapter.config.filename)) await promisify(unlink)(this._adapter.config.filename);
             },
         
             async tables(){
@@ -80,9 +83,7 @@ Adapter.register('sqlite').include({
             },
         
             async destroy() {
-                await new Promise((resolve, reject) => {
-                    this._adapter.connection.close(error => error ? reject(error) : resolve());
-                });
+                // do nothing
             },
 
             async _fetchRows(sql){
@@ -138,7 +139,19 @@ Adapter.register('sqlite').include({
                 while(rows.length){
                     const { _type, ...fields } = rows.shift();
                     if(_type !== undefined){
-                        out.push(await Row.create(_type, this, fields));
+                        const table = await this[Inflector.pluralize(_type)];
+                        const mappedFields = {};
+                        const names = Object.keys(fields);
+                        while(names.length){
+                            const name = names.shift();
+                            const column = await table[name];
+                            if(column && ['date', 'datetime'].includes(await column.type())){
+                                mappedFields[name] = new Date(fields[name]);
+                            } else {
+                                mappedFields[name] = fields[name];
+                            }
+                        }
+                        out.push(await Row.create(_type, this, mappedFields));
                     } else {
                         out.push(fields);
                     }
@@ -169,7 +182,7 @@ Adapter.register('sqlite').include({
                 const table = this._table;
                 const database = table._database;
         
-                await table.create();
+                if(!await table.exists()) await table.create();
         
                 if(!await this.exists()){
                     let defaultSql = options.default;
@@ -252,10 +265,21 @@ Adapter.register('sqlite').include({
                 return this;
             },
 
-            _generateInsertSql(){
+            async _generateInsertSql(){
                 this._fields['id'] = crypto.randomUUID();
                 this._alteredFields['id'] = this._fields['id'];
-        
+
+                const database = await this._database;
+                const { isMultiTenant } = database;
+                const isScopedToTenant = isMultiTenant && !this.constructor.name.match(/^(pinstripe[A-Z]|tenant$)/);
+                const tenant = isScopedToTenant && database._environment ? await database._environment.tenant : undefined;
+                if(tenant){
+                    this._fields['tenantId'] = tenant.id;
+                    this._alteredFields['tenantId'] = tenant.id;
+                } else if(isScopedToTenant) {
+                    return this._database.renderSql`select NULL`;
+                }
+
                 return this._database.renderSql`
                     insert into ${this._adapter.escapeIdentifier(Inflector.pluralize(this.constructor.name))}(
                         ${Object.keys(this._alteredFields).map((key, i) =>
@@ -323,7 +347,7 @@ Adapter.register('sqlite').include({
             },
 
             async first(options = {}){
-                return (await this.all({ ...options, limit: Sql.fromString('0, 1') })).pop();
+                return (await this.all({ ...options, limit: Sql.fromString('1'), offset: Sql.fromString('0')  })).pop();
             },
         
             async count(options = {}){
@@ -345,6 +369,8 @@ Adapter.register('sqlite').include({
                             type = 'primary_key';
                         } else if(name == 'id'){
                             type = 'alternate_key';
+                        } else if(name.match(/.+Id$/)){
+                            type = 'foreign_key';
                         } else {
                             type = COLUMN_TYPE_TO_TYPE_MAP[row.type] || 'string';
                         }
@@ -444,23 +470,43 @@ Adapter.register('sqlite').include({
                     }
                     out.push(this.renderSql`${Inflector.singularize(this.constructor.name)} as \`_type\``);
                 }
-        
-                const joinRoot = this._joinRoot;
                 
+                const joinRoot = this._joinRoot;
                 if(options.hasOwnProperty('from')){
                     if(options.from){
                         out.push(this.renderSql` from ${options.from}`);
                     }
                 } else {
                     out.push(this.renderSql` from ${joinRoot._fromSql}`);
+                    
                 }
+
+                const { isMultiTenant } = this._database;
+                const isScopedToTenant = isMultiTenant && !this.constructor.name.match(/^(pinstripe[A-Z]|tenants$)/);
+                const tenant = isScopedToTenant ? await this._database._environment.tenant : undefined;
         
                 if (options.hasOwnProperty('where')){
                     if(options.where){
                         out.push(this.renderSql` where ${options.where}`);
+                        if(tenant){
+                            out.push(this.renderSql` and ${this.tenantId} = ${tenant.id}`);
+                        } else if(isScopedToTenant){
+                            out.push(this.renderSql` where 1 = 2`);
+                        }
+                    } else if(isScopedToTenant){
+                        out.push(this.renderSql` where 1 = 2`);
                     }
                 } else if(joinRoot._whereSql.length) {
                     out.push(this.renderSql` where ${joinRoot._whereSql}`);
+                    if(tenant){
+                        out.push(this.renderSql` and ${this.tenantId} = ${tenant.id}`);
+                    } else if(isScopedToTenant){
+                        out.push(this.renderSql` and 1 = 2`);
+                    }
+                } else if(tenant){
+                    out.push(this.renderSql` where ${this.tenantId} = ${tenant.id}`);
+                } else if(isScopedToTenant){
+                    out.push(this.renderSql` where 1 = 2`);
                 }
         
                 if(options.hasOwnProperty('orderBy')){
@@ -475,9 +521,18 @@ Adapter.register('sqlite').include({
                     if(options.limit){
                         out.push(this.renderSql` limit ${options.limit}`);
                     }
-                } else if(joinRoot._limit) {
-                    const { page, pageSize } = joinRoot._limit;
-                    out.push(this.renderSql` limit ${(page - 1) * pageSize}, ${pageSize}`);
+                } else if(joinRoot._pagination) {
+                    const { pageSize } = joinRoot._pagination;
+                    out.push(this.renderSql` limit ${pageSize}`);
+                }
+
+                if(options.hasOwnProperty('offset')){
+                    if(options.offset){
+                        out.push(this.renderSql` offset ${options.offset}`);
+                    }
+                } else if(joinRoot._pagination || joinRoot._skipCount) {
+                    const { page = 1, pageSize = 10 } = joinRoot._pagination || {};
+                    out.push(this.renderSql` offset ${((page - 1) * pageSize) + joinRoot._skipCount}`);
                 }
         
                 return this.renderSql`${out}`;
@@ -527,11 +582,17 @@ Adapter.register('sqlite').include({
                 if(this._orderBySql.length){
                     out.push(this.renderSql` order by ${this._orderBySql}`);
                 }
-        
-                if(this._limit) {
-                    const { page, pageSize } = this._limit;
-                    out.push(this.renderSql` limit ${(page - 1) * pageSize}, ${pageSize}`);
+
+                if(this._pagination) {
+                    const { pageSize } = this._pagination;
+                    out.push(this.renderSql` limit ${pageSize}`);
                 }
+
+                if(this._pagination || this._skipCount) {
+                    const { page = 1, pageSize = 10 } = this._pagination || {};
+                    out.push(this.renderSql` offset ${((page - 1) * pageSize) + this._skipCount}`);
+                }
+
                 return this._database.renderSql`${out}`;
             }
         }
@@ -551,8 +612,6 @@ const TYPE_TO_COLUMN_TYPE_MAP = {
     integer: "integer",
     string: "varchar",
     text: "text",
-    time: "time",
-    timestamp: "datetime"
 };
 
 const COLUMN_TYPE_TO_TYPE_MAP = (() => {

package/lib/database/constants.js

@@ -7,8 +7,6 @@ export const ALLOWED_TABLE_ADAPTER_COLUMN_TYPES = [
     'float',
     'integer',
     'string',
-    'time',
-    'timestamp'
 ];
 
 export const TYPE_TO_DEFAULT_VALUE_MAP = {
@@ -32,8 +30,6 @@ export const COLUMN_TYPE_TO_FORM_FIELD_TYPE_MAP = {
     integer: "number",
     string: "text",
     text: "textarea",
-    time: "datetime-local",
-    timestamp: "datetime-local"
 };
 
 export const RESERVED_WORDS = [