pinstripe 0.18.0 → 0.19.0

package/lib/database.js

@@ -11,14 +11,17 @@ export const Database = Class.extend().include({
         this.assignProps({ name: 'database' });
     },
 
-    async initialize(client, options = {}){
+    async initialize(client){
         this.client = client;
-        this.options = options;
         if(!loadSchemaPromise) loadSchemaPromise = Row.loadSchema(client);
         await loadSchemaPromise;
         return trapify(this);
     },
 
+    get withoutTenantScope(){
+        return Database.new(this.client);
+    },
+
     table(name, fn){
         const out = Table.create(name, this);
         if(fn) return fn.call(out, out);

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

@@ -16,7 +16,7 @@ Table.include({
             
             initialize(...args){
                 const out = initialize.call(this, ...args);
-                if(this.constructor.columns.tenantId && this.database.options.tenant){
+                if(this.constructor.columns.tenantId && this.database.scopedByTenant){
                     if(this.database.tenant){
                         this.where({ tenantId: this.database.tenant.id });
                     } else {

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

@@ -2,26 +2,7 @@
 import { Database } from '../../database.js';
 
 Database.include({
-    meta(){
-        const { initialize } =  this.prototype;
-
-        this.include({
-            async initialize(...args){
-                const out = await initialize.call(this, ...args);
-                const { tenant } = this.options;
-                if(tenant && out.info.tenants){
-                    const { name, host } = tenant;
-                    this.tenant = await (await out.tenants.tap(function(){
-                        this.where('(? = ? or ? = ?)', this.tableReference.createColumnReference('name'), name, this.tableReference.createColumnReference('host'), host);
-                    })).first();
-                }
-                return out;
-            },
-
-            get withoutTenantScope(){
-                const { tenant, ...options } = this.options;
-                return Database.new(this.client, options);
-            }
-        });
+    get scopedByTenant(){
+        return this.hasOwnProperty('tenant');
     }
 });

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

@@ -8,12 +8,25 @@ export default {
             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
+
+            const out = await Database.new(this.context.root.databaseClient);
+
+            if(out.info.tenants){
+                const headers = this.initialParams._headers;
+                const hostname = this.initialParams._url.hostname;
+                const host = (headers['host'] || hostname).toLowerCase();
+                const { primaryDomain = '' } = await this.config;
+                const domainSuffix = `\.${primaryDomain}`.toLowerCase();
+
+                if(host.endsWith(domainSuffix)){
+                    const name = host.substr(0, host.length - domainSuffix.length);
+                    out.tenant = await out.tenants.where({ name }).first();
+                } else {
+                    out.tenant = await out.tenants.where({ host }).first();
                 }
-            })
+            }
+
+            return out;
         });
     }
 };

package/lib/services/config.js

@@ -39,17 +39,25 @@ export default {
 
         const environment = process.env.NODE_ENV || 'development';
 
-        if(adapter == 'sqlite'){
+        if(adapter == 'mysql'){
             return Object.assign({
-                filename: `${await this.project.rootPath}/${environment}.db`
+                host: 'localhost',
+                user: 'root',
+                password: '',
+                database: `${await this.project.name}_${environment}`
             }, out);
         }
 
         return Object.assign({
-            host: 'localhost',
-            user: 'root',
-            password: '',
-            database: `${await this.project.name}_${environment}`
+            adapter: 'sqlite',
+            filename: `${await this.project.rootPath}/${environment}.db`
         }, out);
+    },
+
+    normalizeMailConfig(config){
+        return {
+            defaults: {},
+            ...config
+        };
     }
 };

package/lib/services/send_mail.js

@@ -13,9 +13,9 @@ export default {
         });
     },
 
-    createDummy(){
+    createDummy({ defaults }){
         return (mailOptions = {}) => {
-            const { text, html, ...otherMailOptions } = mailOptions;
+            const { text, html, ...otherMailOptions } = { ...defaults, ...mailOptions };
             console.log('');
             console.log('----------------------------------------');
             console.log(chalk.green('sendMail'));
@@ -39,8 +39,8 @@ export default {
         }
     },
 
-    createSmtp(config){
-        const transport = createTransport(config);
+    createSmtp({ defaults, ...config }){
+        const transport = createTransport(config, defaults);
         return (mailOptions = {}) => transport.sendMail(mailOptions);
     }
 };

package/lib/services/server.js

@@ -40,8 +40,6 @@ export default {
         const { method, url, headers } = request;
         const _url = new URL(url, 'http://localhost');
 
-        if(headers['x-host']) _url.host = headers['x-host'];
-
         const urlParams = {};
         _url.searchParams.forEach((value, key) => {
             urlParams[key] = value;

package/package.json

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