pinstripe 0.16.1 → 0.17.0

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

@@ -4,14 +4,16 @@ import { Client } from "../../../database/client.js";
 
 export default {
     create(){
-        if(!this.context.root.databaseClient){
-            this.context.root.databaseClient = Client.new();
-        }
-        return this.defer(async () => Database.new(this.context.root.databaseClient, {
-            tenant: {
-                name: this.initialParams._headers['x-tenant'],
-                host: this.initialParams._url.hostname
+        return this.defer(async () => {
+            if(!this.context.root.databaseClient){
+                this.context.root.databaseClient = Client.new(await this.config.database);
             }
-        }));
+            return Database.new(this.context.root.databaseClient, {
+                tenant: {
+                    name: this.initialParams._headers['x-tenant'] || this.initialParams._url.hostname.replace(/\..*$/, ''),
+                    host: this.initialParams._url.hostname
+                }
+            })
+        });
     }
 };

package/package.json

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