@webqit/webflo 0.11.34 → 0.11.36

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.11.34",
+  "version": "0.11.36",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@octokit/webhooks": "^7.15.1",
-    "@webqit/backpack": "^0.1.2",
+    "@webqit/backpack": "^0.1.3",
     "@webqit/oohtml-ssr": "^1.1.0",
     "@webqit/util": "^0.8.9",
     "client-sessions": "^0.8.0",

package/src/config-pi/deployment/Env.js

@@ -2,7 +2,6 @@
 /**
  * imports
  */
-import { _merge } from '@webqit/util/obj/index.js';
 import { Dotfile } from '@webqit/backpack';
 
 export default class Env extends Dotfile {
@@ -24,13 +23,13 @@ export default class Env extends Dotfile {
 
     // Defaults merger
     withDefaults(config) {
-        return _merge({
+        return this.merge({
             autoload: true,
-        }, config);
+        }, config, 'patch');
     }
 
     // Questions generator
-    questions(config, choices = {}) {
+    getSchema(config, choices = {}) {
         // Questions
         return [
             {
@@ -41,7 +40,7 @@ export default class Env extends Dotfile {
                     combomode: true,
                 },
                 initial: config.entries,
-                questions: [
+                schema: [
                     {
                         name: 'name',
                         type: 'text',

package/src/config-pi/deployment/Layout.js

@@ -2,7 +2,6 @@
 /**
  * imports
  */
-import { _merge } from '@webqit/util/obj/index.js';
 import { Dotfile } from '@webqit/backpack';
 
 export default class Layout extends Dotfile {
@@ -19,17 +18,17 @@ export default class Layout extends Dotfile {
 
     // Defaults merger
     withDefaults(config) {
-        return _merge({
+        return this.merge({
             ROOT: process.cwd(),
             PUBLIC_DIR: './public',
             SERVER_DIR: './server',
             CLIENT_DIR: './client',
             WORKER_DIR: './worker',
-        }, config);
+        }, config, 'patch');
     }
 
     // Questions generator
-    questions(config, choices = {}) {
+    getSchema(config, choices = {}) {
         // Questions
         return [
             {

package/src/config-pi/deployment/Origins.js

@@ -3,9 +3,8 @@
  * imports
  */
 import Url from 'url';
-import { _merge } from '@webqit/util/obj/index.js';
 import { _before } from '@webqit/util/str/index.js';
-import { _isObject, _isTypeObject } from '@webqit/util/js/index.js';
+import { _isTypeObject } from '@webqit/util/js/index.js';
 import { Dotfile } from '@webqit/backpack';
 
 export default class Origins extends Dotfile {
@@ -29,7 +28,7 @@ export default class Origins extends Dotfile {
             origin = _before(inferredRepo.pathname, '.');
         }
         // Params
-        return _merge({
+        return this.merge({
             entries: [{
                 host: hostname,
                 repo: origin,
@@ -41,7 +40,7 @@ export default class Origins extends Dotfile {
                 ondeploy: 'npm install',
                 ondeploy_autoexit: true,
             }],
-        }, config);
+        }, config, 'patch');
     }
 
     // Match
@@ -50,14 +49,14 @@ export default class Origins extends Dotfile {
     }
 
     // Questions generator
-    questions(config, choices = {}) {
+    getSchema(config, choices = {}) {
         // Choices
-        const CHOICES = _merge({
+        const CHOICES = this.merge({
             host: [
                 {value: 'github',},
                 {value: 'bitbucket',},
             ],
-        }, choices);
+        }, choices, 'patch');
         // Questions
         return [
             {
@@ -67,7 +66,7 @@ export default class Origins extends Dotfile {
                     name: 'repository',
                 },
                 initial: config.entries,
-                questions: [
+                schema: [
                     {
                         name: 'host',
                         type: 'select',

package/src/config-pi/deployment/Virtualization.js

@@ -2,8 +2,6 @@
 /**
  * imports
  */
-import { _merge } from '@webqit/util/obj/index.js';
-import { _isObject } from '@webqit/util/js/index.js';
 import { Dotfile } from '@webqit/backpack';
 
 export default class Virtualization extends Dotfile {
@@ -20,21 +18,21 @@ export default class Virtualization extends Dotfile {
 
     // Defaults merger
     withDefaults(config) {
-        return _merge(true, {
+        return this.merge({
             entries: [],
-        }, config);
-    }
-
-    // Match
-    async match(hostname) {
-        if (_isObject(hostname)) {
-            hostname = hostname.hostname;
-        }
-        return ((await this.read()).entries || []).filter(vh => vh.host === hostname);
+        }, config, 'patch');
     }
 
     // Questions generator
-    questions(config, choices = {}) {
+    getSchema(config, choices = {}) {
+        // Choices
+        const CHOICES = this.merge({
+            proto: [
+                {value: '', title: '(Auto)'},
+                {value: 'http', title: 'HTTP'},
+                {value: 'https', title: 'HTTPS'},
+            ],
+        }, choices, 'patch');
         // Questions
         return [
             {
@@ -44,17 +42,28 @@ export default class Virtualization extends Dotfile {
                     name: 'vhost',
                 },
                 initial: config.entries,
-                questions: [
+                schema: [
                     {
-                        name: 'host',
+                        name: 'path',
                         type: 'text',
-                        message: 'Enter Host name',
-                        validation: ['important'],
+                        message: '[path]: Enter local pathname to target server if exists.' + "\r\n" + '(Leave empty to explicitly specify hostnames and port number.)' + "\r\n",
                     },
                     {
-                        name: 'path',
-                        type: 'text',
-                        message: 'Enter local path',
+                        name: 'hostnames',
+                        type: 'list',
+                        message: '[hostnames]: Enter host names.' + "\r\n" + '(Leave empty to automatically derive hostnames from the config of the target server specified above.)' + "\r\n",
+                    },
+                    {
+                        name: 'port',
+                        type: 'number',
+                        message: '[port]: Enter the target port number.' + "\r\n" + '(Leave empty to automatically derive target port number from the config of the target server specified above.)' + "\r\n",
+                    },
+                    {
+                        name: 'proto',
+                        type: 'select',
+                        message: '[protocol]: Enter the target protocol: https/http.' + "\r\n" + '(Leave empty to automatically derive target protocol from the config of the target server specified above.)' + "\r\n",
+                        choices: CHOICES.proto,
+                        initial: this.indexOfInitial(CHOICES.proto, config.proto),
                         validation: ['important'],
                     },
                 ],

package/src/config-pi/runtime/Client.js

@@ -2,9 +2,6 @@
 /**
  * imports
  */
-import { _merge } from '@webqit/util/obj/index.js';
-import { _isNumeric } from '@webqit/util/js/index.js';
-import { _before, _after } from '@webqit/util/str/index.js';
 import { Dotfile } from '@webqit/backpack';
 
 export default class Client extends Dotfile {
@@ -21,7 +18,7 @@ export default class Client extends Dotfile {
 
     // Defaults merger
     withDefaults(config) {
-        return _merge(true, {
+        return this.merge({
             bundle_filename: 'bundle.js',
             public_base_url: '/',
             spa_routing: true,
@@ -29,13 +26,13 @@ export default class Client extends Dotfile {
             service_worker_support: true,
             worker_scope: '/',
             worker_filename: 'worker.js',
-        }, config);
+        }, config, 'patch');
     }
 
     // Questions generator
-    questions(config, choices = {}) {
+    getSchema(config, choices = {}) {
         // Choices
-        const CHOICES = _merge({
+        const CHOICES = this.merge({
             oohtml_support: [
                 {value: 'full', title: 'Full'},
                 {value: 'namespacing', title: 'namespacing'},
@@ -43,7 +40,7 @@ export default class Client extends Dotfile {
                 {value: 'templating', title: 'templating'},
                 {value: 'none', title: 'none'},
             ],
-        }, choices);
+        }, choices, 'patch');
         // Questions
         return [
             {

package/src/config-pi/runtime/Server.js

@@ -2,7 +2,6 @@
 /**
  * imports
  */
-import { _merge } from '@webqit/util/obj/index.js';
 import { Dotfile } from '@webqit/backpack';
 
 export default class Server extends Dotfile {
@@ -19,25 +18,25 @@ export default class Server extends Dotfile {
 
     // Defaults merger
     withDefaults(config) {
-        return _merge(true, {
+        return this.merge({
             port: process.env.port || 3000,
+            domains: [],
+            force_www: '',
             https: {
                 port: 0,
                 keyfile: '',
                 certfile: '',
-                certdoms: ['*'],
+                domains: [],
                 force: false,
             },
-            force_www: '',
             oohtml_support: 'full',
-            shared: false,
-        }, config);
+        }, config, 'patch');
     }
 
     // Questions generator
-    questions(config, choices = {}) {
+    getSchema(config, choices = {}) {
         // Choices
-        const CHOICES = _merge({
+        const CHOICES = this.merge({
             force_www: [
                 {value: '', title: 'do nothing'},
                 {value: 'add',},
@@ -50,7 +49,7 @@ export default class Server extends Dotfile {
                 {value: 'templating', title: 'templating'},
                 {value: 'none', title: 'none'},
             ],
-        }, choices);
+        }, choices, 'patch');
         // Questions
         return [
             {
@@ -60,13 +59,26 @@ export default class Server extends Dotfile {
                 initial: config.port,
                 validation: ['important'],
             },
+            {
+                name: 'domains',
+                type: 'list',
+                message: '[domains]: Enter a list of allowed domains if necessary (comma-separated)',
+                validation: ['important'],
+            },
+            {
+                name: 'force_www',
+                type: 'select',
+                message: '[force_www]: Force add/remove "www" on hostname?',
+                choices: CHOICES.force_www,
+                initial: this.indexOfInitial(CHOICES.force_www, config.force_www),
+            },
             {
                 name: 'https',
                 controls: {
                     name: 'https',
                 },
                 initial: config.https,
-                questions: [
+                schema: [
                     {
                         name: 'port',
                         type: 'number',
@@ -86,9 +98,9 @@ export default class Server extends Dotfile {
                         validation: ['important'],
                     },
                     {
-                        name: 'certdoms',
+                        name: 'domains',
                         type: 'list',
-                        message: '[certdoms]: Enter the CERT domains (comma-separated)',
+                        message: '[domains]: Enter the CERT domains (comma-separated)',
                         validation: ['important'],
                     },
                     {
@@ -100,13 +112,6 @@ export default class Server extends Dotfile {
                     },
                 ],
             },
-            {
-                name: 'force_www',
-                type: 'select',
-                message: '[force_www]: Force add/remove "www" on hostname?',
-                choices: CHOICES.force_www,
-                initial: this.indexOfInitial(CHOICES.force_www, config.force_www),
-            },
             {
                 name: 'oohtml_support',
                 type: 'select',
@@ -115,14 +120,6 @@ export default class Server extends Dotfile {
                 initial: this.indexOfInitial(CHOICES.oohtml_support, config.oohtml_support),
                 validation: ['important'],
             },
-            {
-                name: 'shared',
-                type: 'toggle',
-                message: '[shared]: Shared server?',
-                active: 'YES',
-                inactive: 'NO',
-                initial: config.shared,
-            },
         ];
     }
 }

package/src/config-pi/runtime/client/Worker.js

@@ -2,7 +2,6 @@
 /**
  * imports
  */
-import { _merge } from '@webqit/util/obj/index.js';
 import { _isNumeric } from '@webqit/util/js/index.js';
 import { _before, _after } from '@webqit/util/str/index.js';
 import { Dotfile } from '@webqit/backpack';
@@ -21,7 +20,7 @@ export default class Worker extends Dotfile {
 
     // Defaults merger
     withDefaults(config) {
-        return _merge(true, {
+        return this.merge({
             cache_name: 'cache_v0',
             default_fetching_strategy: 'network-first',
             network_first_urls: [],
@@ -34,24 +33,24 @@ export default class Worker extends Dotfile {
             push_registration_url: '',
             push_deregistration_url: '',
             push_public_key: '',
-        }, config);
+        }, config, 'patch');
     }
 
     // Questions generator
-    questions(config, choices = {}) {
+    getSchema(config, choices = {}) {
         // Increment cache
         if (config.cache_name && config.cache_name.indexOf('_v') > -1 && _isNumeric(_after(config.cache_name, '_v'))) {
             config.cache_name = _before(config.cache_name, '_v') + '_v' + (parseInt(_after(config.cache_name, '_v')) + 1);
         }
         // Choices
-        const CHOICES = _merge({
+        const CHOICES = this.merge({
             default_fetching_strategy: [
                 {value: 'network-first', title: 'Network-first (Webflo default)'},
                 {value: 'cache-first', title: 'Cache-first'},
                 {value: 'network-only', title: 'Network-only'},
                 {value: 'cache-only', title: 'Cache-only'},
             ],
-        }, choices);
+        }, choices, 'patch');
         // Questions
         return [
             {

package/src/config-pi/runtime/server/Headers.js

@@ -2,9 +2,6 @@
 /**
  * imports
  */
-import Url from 'url';
-import { _merge } from '@webqit/util/obj/index.js';
-import { _isObject } from '@webqit/util/js/index.js';
 import { Dotfile } from '@webqit/backpack';
 
 export default class Headers extends Dotfile {
@@ -21,19 +18,19 @@ export default class Headers extends Dotfile {
 
     // Defaults merger
     withDefaults(config) {
-        return _merge(true, {
+        return this.merge({
             entries: [],
-        }, config);
+        }, config, 'patch');
     }
 
     // Questions generator
-    questions(config, choices = {}) {
-        const CHOICES = _merge({
+    getSchema(config, choices = {}) {
+        const CHOICES = this.merge({
             type: [
                 {value: 'request', title: 'Request Header'},
                 {value: 'response', title: 'Response Header'},
             ]
-        }, choices);
+        }, choices, 'patch');
         // Questions
         return [
             {
@@ -43,7 +40,7 @@ export default class Headers extends Dotfile {
                     name: 'header',
                 },
                 initial: config.entries,
-                questions: [
+                schema: [
                     {
                         name: 'type',
                         type: 'text',

package/src/config-pi/runtime/server/Redirects.js

@@ -2,10 +2,6 @@
 /**
  * imports
  */
-import Url from 'url';
-import { _merge } from '@webqit/util/obj/index.js';
-import { _after } from '@webqit/util/str/index.js';
-import { _isObject, _isNumeric } from '@webqit/util/js/index.js';
 import { Dotfile } from '@webqit/backpack';
 
 export default class Redirects extends Dotfile {
@@ -22,20 +18,20 @@ export default class Redirects extends Dotfile {
 
     // Defaults merger
     withDefaults(config) {
-        return _merge(true, {
+        return this.merge({
             entries: [],
-        }, config);
+        }, config, 'patch');
     }
 
     // Questions generator
-    questions(config, choices = {}) {
+    getSchema(config, choices = {}) {
         // Choices
-        const CHOICES = _merge({
+        const CHOICES = this.merge({
             code: [
                 {value: 302,},
                 {value: 301,},
             ],
-        }, choices);
+        }, choices, 'patch');
         // Questions
         return [
             {
@@ -45,7 +41,7 @@ export default class Redirects extends Dotfile {
                     name: 'redirect',
                 },
                 initial: config.entries,
-                questions: [
+                schema: [
                     {
                         name: 'from',
                         type: 'text',

package/src/config-pi/static/Manifest.js

@@ -4,9 +4,7 @@
  */
 import Path from 'path';
 import { _all } from '@webqit/util/arr/index.js';
-import { _merge } from '@webqit/util/obj/index.js';
 import { _isNumeric } from '@webqit/util/js/index.js';
-import { _before, _after } from '@webqit/util/str/index.js';
 import { initialGetIndex } from '@webqit/backpack/src/cli/Promptx.js';
 import { Dotfile } from '@webqit/backpack';
 
@@ -30,7 +28,7 @@ export default class Manifest extends Dotfile {
     // Defaults merger
     withDefaults(config) {
         const pkg = this.cx.PKG || {};
-        return _merge(true, {
+        return this.merge({
             // -----------------
             name: pkg.value,
             short_name: pkg.value,
@@ -50,13 +48,13 @@ export default class Manifest extends Dotfile {
             dir: 'ltr',
             related_applications: '',
             prefer_related_applications: false,
-        }, config);
+        }, config, 'patch');
     }
 
     // Questions generator
-    questions(config, choices = {}) {
+    getSchema(config, choices = {}) {
         // Choices hash...
-        const CHOICES = _merge({
+        const CHOICES = this.merge({
             display: [
                 {value: 'browser',},
                 {value: 'fullscreen',},
@@ -75,7 +73,7 @@ export default class Manifest extends Dotfile {
                 {value: 'portrait-primary',},
                 {value: 'portrait-secondary',},
             ],
-        }, choices);
+        }, choices, 'patch');
 
         // Gets index...
         const getSize = src => Path.basename(src).split(/[_\.\-]/g).reduce((size, chunk) => size || (_all(chunk.split('x'), c => _isNumeric(c)) ? chunk : ''), null);
@@ -136,7 +134,7 @@ export default class Manifest extends Dotfile {
                 controls: {
                     name: 'icon',
                 },
-                questions: [
+                schema: [
                     {
                         name: 'src',
                         type: 'text',
@@ -191,7 +189,7 @@ export default class Manifest extends Dotfile {
                 controls: {
                     name: 'screenshot',
                 },
-                questions: [
+                schema: [
                     {
                         name: 'src',
                         type: 'text',
@@ -221,7 +219,7 @@ export default class Manifest extends Dotfile {
                 controls: {
                     name: 'shortcut',
                 },
-                questions: [
+                schema: [
                     {
                         name: 'name',
                         type: 'text',
@@ -252,7 +250,7 @@ export default class Manifest extends Dotfile {
                         controls: {
                             name: 'shortcut icon',
                         },
-                        questions: [
+                        schema: [
                             {
                                 name: 'src',
                                 type: 'text',

package/src/config-pi/static/Ssg.js

@@ -2,8 +2,6 @@
 /**
  * imports
  */
-import { _merge } from '@webqit/util/obj/index.js';
-import { _isObject } from '@webqit/util/js/index.js';
 import { Dotfile } from '@webqit/backpack';
 
 export default class Ssg extends Dotfile {
@@ -20,13 +18,13 @@ export default class Ssg extends Dotfile {
 
     // Defaults merger
     withDefaults(config) {
-        return _merge(true, {
+        return this.merge({
             entries: [],
-        }, config);
+        }, config, 'patch');
     }
 
     // Questions generator
-    questions(config, choices = {}) {
+    getSchema(config, choices = {}) {
         // Questions
         return [
             {
@@ -36,7 +34,7 @@ export default class Ssg extends Dotfile {
                     name: 'page',
                 },
                 initial: config.entries,
-                questions: [
+                schema: [
                     {
                         name: 'url',
                         type: 'text',

package/src/runtime-pi/Router.js

@@ -22,13 +22,13 @@ export default class Router {
 	 *
 	 * @return void
 	 */
-	constructor(cx, path) {
+	constructor(cx, path = []) {
         this.cx = cx;
         this.path = _isArray(path) ? path : (path + '').split('/').filter(a => a);
     }
 
     /**
-     * Performs dynamic routing.
+     * Performs dynamic routing
      * 
      * @param array|string      method
      * @param Object            event
@@ -59,7 +59,7 @@ export default class Router {
                     // Broadcast any hints exported by handler
                     if (thisTick.exports.hints) { await event.port.post({ ...thisTick.exports.hints, $type: 'handler:hints' }); }
                     const methods = _arrFrom(thisTick.method);
-                    const handler = _isFunction(thisTick.exports) && methods.includes('default') ? thisTick.exports : methods.reduce((_handler, name) => _handler || thisTick.exports[name.toLowerCase()], null);
+                    const handler = _isFunction(thisTick.exports) && methods.includes('default') ? thisTick.exports : methods.reduce((_handler, name) => _handler || thisTick.exports[name], null);
                     if (handler) {
                         // -------------
                         // Dynamic response

package/src/runtime-pi/Runtime.js

@@ -0,0 +1,21 @@
+
+/**
+ * @imports
+ */
+
+import { _isFunction } from "@webqit/util/js/index.js";
+
+/**
+ * ---------------------------
+ * The base Runtime class
+ * ---------------------------
+ */
+            
+export default class Runtime {
+    constructor(cx, client) {
+        this.cx = cx;
+        this.cx.runtime = this;
+        this.client = _isFunction(client) ? client(this.cx) : client;
+        if (!this.client || !this.client.handle) throw new Error(`Application instance must define a ".handle()" method.`);
+    }
+}