pinstripe 0.32.0 → 0.33.0

package/cli.js

@@ -1,46 +1,36 @@
 #!/usr/bin/env node
 
-import { spawn } from 'child_process';
-
 import { Project } from './lib/project.js';
 import { Command } from './lib/command.js';
 import { importAll } from './lib/import_all.js';
 import { Workspace } from './lib/workspace.js';
 
 (async () => {
-    const { entryPath, localPinstripePath, exists } = await Project.instance;
-    const { argv, env, execPath } = process;
-    const args = argv.slice(2);
+    const { entryPath, exists } = await Project.instance;
+    const { argv } = process;
+    const [name, ...args ] = argv.slice(2);
 
-    if (env.IS_LOCAL_PINSTRIPE != 'true' && localPinstripePath) {
-        spawn(execPath, [localPinstripePath, ...args], {
-            env: { ...env, IS_LOCAL_PINSTRIPE: 'true' },
-            stdio: 'inherit'
-        });
-    } else {
-        if(entryPath){
-            import(entryPath);
-        }
+    if(entryPath){
+        import(entryPath);
+    }
 
-        await importAll();
+    await importAll();
 
-        if(exists){
-            Command.unregister('generate-project');
-        } else {
-            const allowedCommands = ['generate-project', 'list-commands'];
-            Command.names.forEach(commandName => {
-                if(!allowedCommands.includes(commandName)){
-                    Command.unregister(commandName);
-                }
-            });
-        }
-        
-        try {
-            await Workspace.run(async function(){
-                await this.runCommand(...args);
-            });
-        } catch(e) {
-            console.error(e);
-        }
+    if(exists){
+        Command.names.forEach(commandName => {
+            if(!Command.for(commandName).internal) Command.unregister(commandName);
+        });
+    } else {
+        Command.names.forEach(commandName => {
+            if(!Command.for(commandName).external) Command.unregister(commandName);
+        });
+    }
+    
+    try {
+        await Workspace.run(async function(){
+            await this.runCommand(name, args);
+        });
+    } catch(e) {
+        console.error(e);
     }
 })();

package/lib/command.js

@@ -4,9 +4,15 @@ import { inflector } from './inflector.js';
 import { Registry } from './registry.js';
 import { ServiceConsumer } from './service_consumer.js';
 
+const optionPattern = /^-([a-z]|-[a-z\-]+)$/;
+
 export const Command = Class.extend().include({
     meta(){
-        this.assignProps({ name: 'Command' });
+        this.assignProps({ 
+            name: 'Command',
+            internal: true,
+            external: false
+        });
 
         this.include(Registry);
         this.include(ServiceConsumer);
@@ -16,12 +22,43 @@ export const Command = Class.extend().include({
                 return inflector.dasherize(name);
             },
 
-            async run(context, name = 'list-commands', ...args){
+            async run(context, name = 'list-commands', params = {}){
                 await context.fork().run(async context => {
-                    context.args = [ ...args ];
+                    context.params = Array.isArray(params) ? this.extractParams(params) : params;
                     await this.create(name, context).run();
                 });
             },
+
+            extractParams(_args = []){
+                const args = [ ..._args ];
+                const out = {};
+                let currentName;
+                while(args.length){
+                    const arg = args.shift();
+                    const matches = arg.match(optionPattern);
+                    if(matches){
+                        currentName = inflector.camelize(matches[1]);
+                        if(out[currentName] === undefined){
+                            out[currentName] = [];
+                        }
+                    } else {
+                        if(currentName === undefined){
+                            currentName = 'args';
+                            out[currentName] = [];
+                        }
+                        out[currentName].push(arg);
+                    }
+                }
+                Object.keys(out).forEach(name => {
+                    const value = out[name];
+                    if(!value.length){
+                        out[name] = true;
+                    } else {
+                        out[name] = value.join(' ');
+                    }
+                });
+                return out;
+            }
         });
     },
 

package/lib/command.test.js

@@ -0,0 +1,32 @@
+import { Command } from "./command.js";
+
+[
+    { args: [], expectedParams: {} },
+    { args: ["-a"], expectedParams: { a: true } },
+    { args: ["--apple"], expectedParams: { apple: true } },
+    { args: ["--apple", "--pear"], expectedParams: { apple: true, pear: true } },
+    { args: ["Hello world!"], expectedParams: { args: "Hello world!" } },
+    { args: ["Hello", "world!"], expectedParams: { args: "Hello world!" } },
+    {
+        args: [
+            "Hello", "world!",
+            "--apple",
+            "--pear",
+            "--plum-color", "purple",
+            "--other-fruit", "peach", "orange",
+        ],
+        expectedParams: {
+            args: "Hello world!",
+            apple: true,
+            pear: true,
+            plumColor: "purple",
+            otherFruit: "peach orange",
+        },
+    },
+].forEach(({ args, expectedParams }, i) => {
+    test(`Command.extractParams (${i}})`, () => {
+        expect(Command.extractParams(args)).toStrictEqual(expectedParams);
+    });
+});
+
+

package/lib/commands/generate_app.js

@@ -2,10 +2,10 @@
 
 export default {
     async run(){
-        const [ name = '' ] = this.args;
+        const { name = '' } = this.params;
         const normalizedName = this.inflector.snakeify(name);
         if(normalizedName == ''){
-            console.error('An app name must be given.');
+            console.error('An app --name must be given.');
             process.exit();
         }
 
@@ -35,7 +35,9 @@ export default {
     
         });
 
-        await this.runCommand('generate-view', `${normalizedName}/index`);
+        await this.runCommand('generate-view', {
+            name: `${normalizedName}/index`
+        });
     }
 }
 

package/lib/commands/generate_background_job.js

@@ -2,10 +2,10 @@
 
 export default {
     async run(){
-        const [ name = '' ] = this.args;
+        const { name = '' } = this.params;
         const normalizedName = this.inflector.snakeify(name);
         if(normalizedName == ''){
-            console.error('A background_job name must be given.');
+            console.error('A background job --name must be given.');
             process.exit();
         }
 

package/lib/commands/generate_command.js

@@ -2,10 +2,10 @@
 
 export default {
     async run(){
-        const [ name = '' ] = this.args;
+        const { name = '' } = this.params;
         const normalizedName = this.inflector.snakeify(name);
         if(normalizedName == ''){
-            console.error('A command name must be given.');
+            console.error('A command --name must be given.');
             process.exit();
         }
 

package/lib/commands/generate_component.js

@@ -1,10 +1,9 @@
 
 export default {
     async run(){
-        const { extractArg } = this.cliUtils;
-        const name = this.inflector.snakeify(extractArg(''));
+        const name = this.inflector.snakeify(this.params.name || '');
         if(name == ''){
-            console.error('A component name must be given.');
+            console.error('A component --name must be given.');
             process.exit();
         }
     

package/lib/commands/generate_migration.js

@@ -1,18 +1,18 @@
 
 export default {
     async run(){
-        const { extractArg, extractFields, extractOptions } = this.cliUtils;
 
-        const suffix = this.inflector.snakeify(extractArg('migration'));
-        const fields = extractFields();
-        const { table } = extractOptions({
-            table: (() => {
-                const matches = suffix.match(/_to_(.+)$/);
-                if(matches){
-                    return matches[1];
-                }
-            })()
-        });
+        const suffix = this.inflector.snakeify(this.params.suffix || 'migration');
+
+        const { fields = '' } = this.params;
+        const normalizedFields = this.cliUtils.normalizeFields(fields);
+        
+        const table = this.params.table || (() => {
+            const matches = suffix.match(/_to_(.+)$/);
+            if(matches){
+                return matches[1];
+            }
+        })();
 
         const unixTime = Math.floor(new Date().getTime() / 1000);
         const name = `${unixTime}_${suffix}`;
@@ -33,10 +33,10 @@ export default {
                 indent(() => {
                     line(`async migrate(){`);
                     indent(() => {
-                        if(table && fields.length){
+                        if(table && normalizedFields.length){
                             line(`await this.database.table('${table}', async ${table} => {`);
                             indent(() => {
-                                fields.forEach(({ name, type }) => {
+                                normalizedFields.forEach(({ name, type }) => {
                                     line(`await ${table}.addColumn('${name}', '${type}');`);
                                 });
                             })

package/lib/commands/generate_model.js

@@ -2,20 +2,17 @@
 export default {
     async run(){
 
-        const { extractArg, extractFields } = this.cliUtils;
-        const name = this.inflector.snakeify(extractArg(''));
+        const name = this.inflector.snakeify(this.params.name || '');
         if(name == ''){
-            console.error('A model name must be given.');
+            console.error('A model --name must be given.');
             process.exit();
         }
-        const fields = extractFields();
-    
+
+        let { fields = '' } = this.params;
+
         const collectionName = this.inflector.camelize(this.inflector.pluralize(name));
         if(!await this.database[collectionName]){
-            const denormalizedFields = fields.map(({ mandatory, name, type }) => {
-                return `${ mandatory ? '^' : '' }${name}:${type}`
-            });
-            await this.runCommand('generate-migration', `create_${name}`, ...denormalizedFields, '--table', collectionName)
+            await this.runCommand('generate-migration', { name: `create_${name}`, fields, table: collectionName});
         }
     
         const { inProjectRootDir, generateFile, line, indent } = this.fsBuilder;

package/lib/commands/generate_project.js

@@ -7,18 +7,23 @@ const defaultDependencies = [
 ];
 
 export default {
-   async run(){
+   meta(){
+      this.assignProps({
+          external: true,
+          internal: false
+      });
+  },
 
-      const { extractArg, extractOptions } = this.cliUtils;
-      const name = extractArg('');
+   async run(){
+      const name = this.params.name || '';
       if(name == ''){
-         console.error('A project name must be given.');
+         console.error('A project --name must be given.');
          process.exit();
       }
-      const { with: dependencies, core } = extractOptions({
-         with: [],
-         core: false
-      });
+
+      let { with: dependencies = '', core = false } = this.params;
+
+      dependencies = dependencies.split(/\s+/).map(dependency => dependency.trim());
 
       if(!core) defaultDependencies.forEach(dependency => {
          if(!dependencies.includes(dependency)) dependencies.unshift(dependency);

package/lib/commands/generate_service.js

@@ -1,9 +1,9 @@
 
 export default {
     async run(){
-        const [ name = '' ] = this.args;
+        const { name = '' } = this.params;
         if(name == ''){
-            console.error('A service name must be given.');
+            console.error('A service --name must be given.');
             process.exit();
         }
     

package/lib/commands/generate_static_site.js

@@ -6,9 +6,7 @@ import { App, View } from 'pinstripe';
 export default {
     async run(){
 
-        const { extractOptions } = this.cliUtils;
-
-        const { app = 'main' } = extractOptions();
+        const { app = 'main' } = this.params;
 
         const { viewNames } = View.mapperFor(App.create(app, this.context).compose());
 

package/lib/commands/generate_view.js

@@ -4,10 +4,10 @@ import { readFile } from 'fs/promises';
 
 export default {
     async run(){
-        const [ name = '' ] = this.args;
+        const { name = '' } = this.params;
         let normalizedName = name.replace(/^\//, '');
         if(name == ''){
-            console.error('A view name must be given.');
+            console.error('A view --name must be given.');
             process.exit();
         }
 

package/lib/commands/list_commands.js

@@ -3,6 +3,12 @@ import chalk from 'chalk';
 import { Command } from 'pinstripe';
 
 export default {
+    meta(){
+        this.assignProps({
+            external: true,
+        });
+    },
+
     run(){
         console.log('');
         console.log('The following commands are available:');

package/lib/commands/list_views.js

@@ -4,9 +4,7 @@ import { App, View } from 'pinstripe';
 
 export default {
     run(){
-        const { extractOptions } = this.cliUtils;
-
-        const { app = 'main' } = extractOptions();
+        const { app = 'main' } = this.params;
 
         const { viewNames } = View.mapperFor(App.create(app, this.context).compose());
         console.log('');

package/lib/commands/run_background_job.js

@@ -1,9 +1,9 @@
 
 export default {
     async run(){
-        const [ name = '' ] = this.args;
+        const { name = '' } = this.params;
         if(name == ''){
-            console.error('A background job name must be given.');
+            console.error('A background job --name must be given.');
             process.exit();
         }
         this.runBackgroundJob(name);

package/lib/commands/start_server.js

@@ -1,13 +1,10 @@
 
 export default {
     run(){
-        const { extractOptions } = this.cliUtils;
-
-        const { app, withoutBot } = extractOptions({
-            app: `main:${process.env.HOST || '127.0.0.1'}:${parseInt(process.env.PORT || '3000')}`,
-            withoutBot: false
-        });
-
+        const {
+            app = `main:${process.env.HOST || '127.0.0.1'}:${parseInt(process.env.PORT || '3000')}`, 
+            withoutBot = false
+        } = this.params;
         
         const apps = [];
         let currentPort = 3000;

package/lib/project.js

@@ -40,8 +40,6 @@ export const Project = Class.extend().include({
         }
 
         this.entryPath = this.exports['.'] || this.main;
-
-        this.localPinstripePath = (await findInPath('node_modules/.bin/pinstripe', process.cwd())).shift();
         
         this.nodePaths = await findInPath('node_modules/', process.cwd());
     },

package/lib/registry.js

@@ -52,6 +52,7 @@ export const Registry = {
             unregister(name){
                 const normalizedName = this.normalizeName(name);
                 delete this.mixins[normalizedName];
+                this.clearCache();
             },
 
             clearCache(){

package/lib/services/cli_utils.js

@@ -1,77 +1,25 @@
-
-const optionPattern = /^-([a-z]|-[a-z\-]+)$/;
-
 export default {
     create(){
-        if(this.context.cliUtils) return this.context.cliUtils;
-
-        let args = [...this.args];
-    
-        const extractArg = (_default) => {
-            if(args[0] && !args[0].match(optionPattern)){
-                return args.shift();
+        return {
+            normalizeFields: fields => {
+                let out = fields;
+                if(typeof out == 'string') out = out.split(/\s+/).map(field => field.trim()).filter(field => field).map(arg => {
+                    const matches = arg.match(/^(\^|)([^:]*)(:|)(.*)$/);
+                    const mandatory = matches[1] == '^';
+                    const name = this.inflector.camelize(matches[2]);
+                    const type =  matches[4];
+                    return {
+                        mandatory,
+                        name,
+                        type
+                    };
+                });
+                out.forEach(field => {
+                    field.mandatory ??= false;
+                    field.type ||= 'string';
+                });
+                return out;
             }
-            return _default;
         };
-    
-        const extractArgs = () => {
-            const out = [];
-            while(args[0] && !args[0].match(optionPattern)){
-                out.push(args.shift())
-            }
-            return out;
-        };
-    
-        const extractFields = () => extractArgs().map(arg => {
-            const matches = arg.match(/^(\^|)([^:]*)(:|)(.*)$/);
-            const mandatory = matches[1] == '^';
-            const name = this.inflector.camelize(matches[2]);
-            const type =  matches[4] || 'string';
-            return {
-                mandatory,
-                name,
-                type
-            };
-        });
-    
-        const extractOptions = (_default = {}) => {
-            const out = {};
-            let currentName;
-            while(args.length){
-                const arg = args.shift();
-                const matches = arg.match(optionPattern);
-                if(matches){
-                    currentName = this.inflector.camelize(matches[1]);
-                    if(out[currentName] === undefined){
-                        out[currentName] = [];
-                    }
-                } else if(currentName){
-                    out[currentName].push(arg);
-                }
-            }
-            Object.keys({ ...out, ..._default }).forEach(name => {
-                const value = out[name];
-                if(value === undefined){
-                    out[name] = _default[name];
-                } else if(!value.length){
-                    out[name] = true;
-                } else if(!Array.isArray(_default[name])){
-                    out[name] = value.join(' ');
-                }
-            });
-            return out;
-        };
-    
-        const resetArgs = () => args = [..._args];
-    
-        this.context.cliUtils = {
-            extractArg,
-            extractArgs,
-            extractFields,
-            extractOptions,
-            resetArgs
-        };
-
-        return this.context.cliUtils;
     }
 };

package/lib/services/server.js

@@ -70,7 +70,7 @@ export default {
     parseBody(request){
         return new Promise((resolve) => {
             const out = {};
-            const busboy = new Busboy({ headers: request.headers });
+            const busboy = Busboy({ headers: request.headers });
         
             busboy.on('file', function(fieldname, file, filename, encoding, mimeType) {
                 const chunks = [];

package/lib/views/shared/_button.js

@@ -10,6 +10,7 @@ export const styles = `
         border-radius: 0.4rem;
         box-shadow: none;
         font-size: 1.6rem;
+        font-weight: 600;
         height: 2.5em;
         line-height: 1.5;
         position: relative;

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "pinstripe",
   "description": "A slick web framework for Node.js.",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "author": "Jody Salt",
   "license": "MIT",
   "exports": {
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf ./node_modules",
-    "start": "IS_LOCAL_PINSTRIPE=true pinstripe start-server",
+    "start": "pinstripe start-server",
     "test": "npm run test:unit",
     "test:unit": "jest lib"
   },
@@ -24,13 +24,13 @@
     "@babel/core": "^7.9.0",
     "@babel/plugin-transform-modules-commonjs": "^7.18.6",
     "@babel/preset-env": "^7.9.0",
-    "babel-jest": "^25.1.0",
+    "babel-jest": "^29.7.0",
     "jest": "^28.0.1",
     "jest-environment-jsdom": "^29.1.2"
   },
   "dependencies": {
     "bcrypt": "^5.0.1",
-    "busboy": "^0.3.1",
+    "busboy": "^1.6.0",
     "chalk": "^4.1.0",
     "cron-parser": "^4.3.0",
     "css": "^3.0.0",
@@ -41,10 +41,11 @@
     "markdown-it": "^12.2.0",
     "memfs": "^3.2.2",
     "mime-types": "^2.1.28",
-    "mysql2": "^2.3.3",
-    "nodemailer": "^6.7.2",
+    "mysql2": "^3.10.1",
+    "nodemailer": "^6.9.14",
     "punycode": "^2.3.0",
-    "sqlite3": "^5.0.2",
+    "sqlite3": "^5.1.7",
+    "start-server-and-test": "2.0.4",
     "tmp": "^0.2.1",
     "unionfs": "^4.4.0"
   },

package/lib/services/args.js

@@ -1,9 +0,0 @@
-
-export default {
-    create(){
-        if(!this.context.hasOwnProperty('args')){
-            this.context.args = [];
-        }
-        return this.context.args;
-    }
-};