pinstripe 0.16.2 → 0.18.0

package/lib/commands/generate_project.js

@@ -32,6 +32,70 @@ export default {
                },
             }, null, 2));
          });
+
+         await generateFile(`pinstripe.config.js`, () => {
+            line();
+            line(`const environment = process.env.NODE_ENV || 'development';`);
+            line();
+            line(`let database;`);
+            line(`if(environment == 'production'){`)
+            indent(() => {
+               line(`database = {`);
+               indent(() => {
+                  line(`adapter: 'mysql',`)
+                  line(`host: 'localhost',`);
+                  line(`user: 'root',`);
+                  line(`password: '',`);
+                  line(`database: \`${this.inflector.snakeify(name)}_\${environment}\``);
+               });
+               line(`};`);
+            });
+            line(`} else {`);
+            indent(() => {
+               line(`database = {`);
+               indent(() => {
+                  line(`adapter: 'sqlite',`);
+                  line(`filename: \`\${environment}.db\``)
+               });
+               line(`};`);
+            });
+            line(`}`);
+            line();
+            line(`let mail;`);
+            line(`if(environment == 'production'){`)
+            indent(() => {
+               line(`mail = {`);
+               indent(() => {
+                  line(`adapter: 'smtp',`)
+                  line(`host: "smtp.example.com",`)
+                  line(`port: 465,`);
+                  line(`secure: true, // use TLS`);
+                  line(`auth: {`);
+                  indent(() => {
+                     line(`user: "username",`);
+                     line(`pass: "password",`);
+                  });
+                  line(`}`);
+               });
+               line(`};`);
+            });
+            line(`} else {`);
+            indent(() => {
+               line(`mail = {`);
+               indent(() => {
+                  line(`adapter: 'dummy'`);
+               });
+               line(`};`);
+            });
+            line(`}`);
+            line();
+            line(`export default {`);
+            indent(() => {
+               line(`database,`);
+               line(`mail`);
+            })
+            line(`};`);
+         });
    
          await generateFile(`lib/index.js`, () => {
             line();

package/lib/commands/show_config.js

@@ -0,0 +1,6 @@
+
+export default {
+    async run(){
+        console.log(JSON.stringify(await this.config, null, 2));
+    }
+};

package/lib/database/migrator.js

@@ -17,7 +17,7 @@ export const Migrator = Class.extend().include({
         const migrations = Migration.names.map(name => Migration.for(name)).sort((a, b) => a.schemaVersion - b.schemaVersion);
         for(let i in migrations){
             const migration = migrations[i];
-            const isMigrationApplied = this.database.table('pinstripeAppliedMigrations').where({ schemaVersion: migration.schemaVersion }).count() > 0;
+            const isMigrationApplied = await this.database.table('pinstripeAppliedMigrations').where({ schemaVersion: migration.schemaVersion }).count() > 0;
             if(!isMigrationApplied){
                 if(isDevelopmentEnvironment) console.log(`Applying migration: ${migration.name}`);
                 await migration.new(this.database).migrate();

package/lib/database/table.js

@@ -168,11 +168,12 @@ export const Table = Class.extend().include({
     },
 
     where(...args){
-        if(typeof args[0] == 'string'){
+        if(typeof args[0] == 'string' || Array.isArray(args[0])){
             this.expressions.push(args);
             return this;
         }
-        const [ scopedBy = {} ] = args;
+        const [ scopedBy ] = args;
+        if(typeof scopedBy != 'object') throw new Error(`Invalid argument (0) - expected object, array or string.`);
         const names = Object.keys(scopedBy);
         while(names.length){
             const name = names.shift();
@@ -183,6 +184,11 @@ export const Table = Class.extend().include({
         return this;
     },
 
+    async tap(fn){
+        await fn.call(this);
+        return this;
+    },
+
     orderBy(...args){
         this.orderedBy.push(args);
         return this;

package/lib/extensions/multi-tenant/database.js

@@ -11,11 +11,9 @@ Database.include({
                 const { tenant } = this.options;
                 if(tenant && out.info.tenants){
                     const { name, host } = tenant;
-                    if(name) {
-                        this.tenant = await out.tenants.where({ name }).first();
-                    } else {
-                        this.tenant = await out.tenants.where({ host }).first();
-                    }
+                    this.tenant = await (await out.tenants.tap(function(){
+                        this.where('(? = ? or ? = ?)', this.tableReference.createColumnReference('name'), name, this.tableReference.createColumnReference('host'), host);
+                    })).first();
                 }
                 return out;
             },

package/lib/extensions/multi-tenant/services/database.js

@@ -10,7 +10,7 @@ export default {
             }
             return Database.new(this.context.root.databaseClient, {
                 tenant: {
-                    name: this.initialParams._headers['x-tenant'],
+                    name: this.initialParams._headers['x-tenant'] || this.initialParams._url.hostname.replace(/\..*$/, ''),
                     host: this.initialParams._url.hostname
                 }
             })

package/lib/services/config.js

@@ -1,33 +1,47 @@
 
+import { existsSync } from 'fs';
+
 let createConfigPromise;
 
 export default {
     create(){
         return this.defer(() => {
             if(!createConfigPromise){
-                createConfigPromise = (async () => ({ 
-                    database: await this.createDatabaseConfig()  
-                }))();
+                createConfigPromise = this.createConfig();
             }
             return createConfigPromise;
         });
     },
 
-    async createDatabaseConfig(){
-        const out = { adapter: 'sqlite' };
+    async createConfig(){
+        let out = {};
+        const candidateConfigFilePath = `${await this.project.rootPath}/pinstripe.config.js`;
+        if(existsSync(candidateConfigFilePath)){
+            out = await (await import(candidateConfigFilePath)).default;
+        }
 
-        Object.keys(process.env).forEach(name => {
-            const matches = name.match(/^DATABASE_(.+)$/);
-            if(!matches) return;
-            const normalizedName = matches[1].toLowerCase().split(/_+/).map((s, i) => i > 0 ? s[0].toUpperCase() + s.slice(1) : s).join('');
-            out[normalizedName] = process.env[name];
-        });
+        const { 
+            database = { adapter: 'sqlite' },
+            mail = { adapter: 'dummy' }
+        } = out;
+        
+        return {
+            ...out,
+            database: await this.normalizeDatabaseConfig(database),
+            mail
+        };
+    },
+
+    async normalizeDatabaseConfig(config){
+        const out = { ...config };
 
         const { adapter } = out;
 
+        const environment = process.env.NODE_ENV || 'development';
+
         if(adapter == 'sqlite'){
             return Object.assign({
-                filename: `${await this.project.rootPath}/${process.env.NODE_ENV || 'development'}.db`
+                filename: `${await this.project.rootPath}/${environment}.db`
             }, out);
         }
 
@@ -35,6 +49,7 @@ export default {
             host: 'localhost',
             user: 'root',
             password: '',
+            database: `${await this.project.name}_${environment}`
         }, out);
     }
 };

package/lib/services/send_mail.js

@@ -6,31 +6,41 @@ export default {
     create(){
         return this.defer(async () => {
             const { mail: mailConfig = {} } = await this.config;
-            const transport = createTransport(mailConfig);
-            return (mailOptions = {}) => {
-                if(process.env.NODE_ENV == 'production') return transport.sendMail(mailOptions);
-                const { text, html, ...otherMailOptions } = mailOptions;
-                console.log('');
-                console.log('----------------------------------------');
-                console.log(chalk.green('sendMail'));
-                console.log('----------------------------------------');
-                Object.keys(otherMailOptions).forEach(name => {
-                    console.log(`${name}: ${JSON.stringify(otherMailOptions[name])}`)
-                });
-                if(text){
-                    console.log('text:')
-                    console.log(text.replace(/(^|\n)/g, '$1  '));
-                }
-                if(html){
-                    console.log('html:')
-                    console.log(html.replace(/(^|\n)/g, '$1  '));
-                }
-                if(!Object.keys(mailOptions).length){
-                    console.log('No mail options have been provided.')
-                }
-                console.log('----------------------------------------');
-                console.log('');
-            }
+            const { adapter = 'dummy', ...adapterConfig } = mailConfig;
+            if(adapter == 'dummy') return this.createDummy();
+            if(adapter == 'smtp') return this.createSmtp(adapterConfig);
+            throw new Error(`No such mail adapter '${adapter}' exists.`);
         });
+    },
+
+    createDummy(){
+        return (mailOptions = {}) => {
+            const { text, html, ...otherMailOptions } = mailOptions;
+            console.log('');
+            console.log('----------------------------------------');
+            console.log(chalk.green('sendMail'));
+            console.log('----------------------------------------');
+            Object.keys(otherMailOptions).forEach(name => {
+                console.log(`${name}: ${JSON.stringify(otherMailOptions[name])}`)
+            });
+            if(text){
+                console.log('text:')
+                console.log(text.replace(/(^|\n)/g, '$1  '));
+            }
+            if(html){
+                console.log('html:')
+                console.log(html.replace(/(^|\n)/g, '$1  '));
+            }
+            if(!Object.keys(mailOptions).length){
+                console.log('No mail options have been provided.')
+            }
+            console.log('----------------------------------------');
+            console.log('');
+        }
+    },
+
+    createSmtp(config){
+        const transport = createTransport(config);
+        return (mailOptions = {}) => transport.sendMail(mailOptions);
     }
 };

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "pinstripe",
   "description": "A slick web framework for Node.js.",
-  "version": "0.16.2",
+  "version": "0.18.0",
   "author": "Jody Salt",
   "license": "MIT",
   "exports": {
@@ -48,5 +48,5 @@
     "tmp": "^0.2.1",
     "unionfs": "^4.4.0"
   },
-  "gitHead": "bf3b7e1cb4f5c534a3d8b2136b0123b71c0d0286"
+  "gitHead": "b638218b06f4cdea77f3ba0a4f9c082989528ccf"
 }