pinstripe 0.19.0 → 0.21.0

package/lib/commands/{generate_node_wrapper.js → generate_component.js}

@@ -12,13 +12,13 @@ export default {
     
         await inProjectRootDir(async () => {
     
-            await generateFile(`lib/node_wrappers/_importer.js`, { skipIfExists: true }, () => {
+            await generateFile(`lib/components/_file_importer.js`, { skipIfExists: true }, () => {
                 line();
-                line(`export { componentImporter as default } from 'pinstripe';`);
+                line(`export { Component as default } from 'pinstripe';`);
                 line();
             });
     
-            await generateFile(`lib/node_wrappers/${normalizedName}.client.js`, () => {
+            await generateFile(`lib/components/${normalizedName}.js`, () => {
                 line();
                 line(`export default {`);
                 indent(() => {

package/lib/commands/generate_migration.js

@@ -21,9 +21,9 @@ export default {
     
         await inProjectRootDir(async () => {
     
-            await generateFile(`lib/migrations/_importer.js`, { skipIfExists: true }, () => {
+            await generateFile(`lib/migrations/_file_importer.js`, { skipIfExists: true }, () => {
                 line();
-                line(`export { migrationImporter as default } from 'pinstripe';`);
+                line(`export { Migration as default } from 'pinstripe/database';`);
                 line();
             });
     

package/lib/commands/generate_model.js

@@ -22,9 +22,9 @@ export default {
     
         await inProjectRootDir(async () => {
     
-            await generateFile(`lib/models/_importer.js`, { skipIfExists: true }, () => {
+            await generateFile(`lib/models/_file_importer.js`, { skipIfExists: true }, () => {
                 line();
-                line(`export { modelImporter as default } from 'pinstripe';`);
+                line(`export { Row as default } from 'pinstripe/database';`);
                 line();
             });
     

package/lib/commands/generate_service.js

@@ -11,9 +11,9 @@ export default {
     
         await inProjectRootDir(async () => {
     
-            await generateFile(`lib/services/_importer.js`, { skipIfExists: true }, () => {
+            await generateFile(`lib/services/_file_importer.js`, { skipIfExists: true }, () => {
                 line();
-                line(`export { serviceImporter as default } from 'pinstripe';`);
+                line(`export { ServiceFactory as default } from 'pinstripe';`);
                 line();
             });
     

package/lib/commands/generate_static_site.js

@@ -1,12 +1,11 @@
 
-import { View } from '../view.js';
 import { default as mimeTypes } from 'mime-types';
 
 export default {
     async run(){
         this.pages = {};
         const urls = this.viewNames.filter(path => !path.match(/(^|\/)_/)).map(path => {
-            return new URL(`/${path.replace(/(^|\/)index$/, '')}`.replace(/^\/+/, '/'), 'http://localhost/');
+            return new URL(path, 'http://127.0.0.1/');
         });
 
         while(urls.length){
@@ -31,7 +30,7 @@ export default {
                         filePath = `${filePath}.${mimeTypes.extension(contentType)}`
                     }
                     
-                    const data = (await this.fetch({ _url: new URL(path, 'http://localhost/') }))[2];
+                    const data = (await this.fetch({ _url: new URL(path, 'http://127.0.0.1/') }))[2];
 
                     await generateFile(filePath, () => {
                         echo(data.join(''));
@@ -65,8 +64,8 @@ export default {
             ['src', 'href'].forEach(name => {
                 const value = attributes[name];
                 if(!value) return;
-                const url = new URL(value, 'http://localhost/');
-                if(url.host != 'localhost') return;
+                const url = new URL(value, 'http://127.0.0.1/');
+                if(url.host != '127.0.0.1') return;
                 out.push(url);
             });
         });

package/lib/components/pinstripe_anchor.js

@@ -8,9 +8,10 @@ export default {
         const { ignoreEventsFromChildren = false } = this.data;
         this.on('click', (event) => {
             if(ignoreEventsFromChildren && event.target != this) return;
+            const { action = 'load', confirm, target = '_self', method = 'GET', href } = { ...this.attributes, ...this.data };
+            if(new URL(href, window.location.href).host != window.location.host) return;
             event.preventDefault();
             event.stopPropagation();
-            const { action = 'load', confirm, target = '_self', method = 'GET', href } = { ...this.attributes, ...this.data };
             if(action == 'load') loadFrame.call(this, confirm, target, method, href);
             if(action == 'remove') removeFrame.call(this, confirm, target);
         });

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

@@ -14,7 +14,7 @@ export default {
             if(out.info.tenants){
                 const headers = this.initialParams._headers;
                 const hostname = this.initialParams._url.hostname;
-                const host = (headers['host'] || hostname).toLowerCase();
+                const host = (headers['host'] || hostname).replace(/\:\d+$/, '').toLowerCase();
                 const { primaryDomain = '' } = await this.config;
                 const domainSuffix = `\.${primaryDomain}`.toLowerCase();
 

package/lib/services/client_builder.js

@@ -58,8 +58,8 @@ export default {
                 build.onLoad({ filter: /\.js$/ }, async args => {
                     const { path } = args;
                     const contents = await promisify(readFile)(path, 'utf8');
+                    if(!contents.match(/pinstripe-if-client/)) return;
                     const alteredContents = contents.replace(/(.*)\/\/\s*pinstripe-if-client:\s*(.*)/g, '$2 // pinstripe-if-server: $1');
-        
                     return { contents: alteredContents, loader: 'js' };
                 });
             }

package/lib/services/config.js

@@ -41,7 +41,7 @@ export default {
 
         if(adapter == 'mysql'){
             return Object.assign({
-                host: 'localhost',
+                host: '127.0.0.1',
                 user: 'root',
                 password: '',
                 database: `${await this.project.name}_${environment}`

package/lib/services/initial_params.js

@@ -4,7 +4,7 @@ export default {
         if(!this.context.root.hasOwnProperty('params')){
             this.context.root.params = {
                 _method: 'GET',
-                _url: new URL('http://localhost/'),
+                _url: new URL('http://127.0.0.1/'),
                 _headers: {}
             };
         }

package/lib/services/params.js

@@ -4,7 +4,7 @@ export default {
         if(!this.context.hasOwnProperty('params')){
             this.context.params = {
                 _method: 'GET',
-                _url: new URL('http://localhost/'),
+                _url: new URL('http://127.0.0.1/'),
                 _headers: {}
             };
         }

package/lib/services/run_in_new_workspace.js

@@ -0,0 +1,11 @@
+
+import { Workspace } from '../workspace.js';
+
+
+const runInNewWorkspace = fn => Workspace.run(fn);
+
+export default {
+    create(){
+        return runInNewWorkspace;
+    }
+};

package/lib/services/send_mail.js

@@ -7,7 +7,7 @@ export default {
         return this.defer(async () => {
             const { mail: mailConfig = {} } = await this.config;
             const { adapter = 'dummy', ...adapterConfig } = mailConfig;
-            if(adapter == 'dummy') return this.createDummy();
+            if(adapter == 'dummy') return this.createDummy(adapterConfig);
             if(adapter == 'smtp') return this.createSmtp(adapterConfig);
             throw new Error(`No such mail adapter '${adapter}' exists.`);
         });

package/lib/services/server.js

@@ -38,7 +38,7 @@ export default {
 
     async extractParams(request){
         const { method, url, headers } = request;
-        const _url = new URL(url, 'http://localhost');
+        const _url = new URL(url, 'http://127.0.0.1');
 
         const urlParams = {};
         _url.searchParams.forEach((value, key) => {

package/lib/views/sign_in/index.js

@@ -17,10 +17,12 @@ export default {
                     const user = await this.database.users.where({ email }).first();
                     if(user){
                         const password = await user.generatePassword();
-                        await this.sendMail({ 
+                        
+                        this.runInNewWorkspace(({ sendMail }) => sendMail({ 
                             to: email,
                             subject: 'Your one-time-password',
-                            text: `Your one-time-password: "${password}" - this will be valid for approximately 3 mins.`});
+                            text: `Your one-time-password: "${password}" - this will be valid for approximately 3 mins.`
+                        }));
                     }
                     return this.renderHtml`
                         <span data-component="pinstripe-anchor" data-trigger="click" data-href="/sign_in/verify_password?email=${email}"></span>

package/package.json

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