@webqit/webflo 0.10.3 → 0.11.0

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.10.3",
+  "version": "0.11.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -36,8 +36,8 @@
   },
   "dependencies": {
     "@octokit/webhooks": "^7.15.1",
-    "@webqit/backpack": "^0.0.37",
-    "@webqit/oohtml-ssr": "^1.0.3",
+    "@webqit/backpack": "^0.1.0",
+    "@webqit/oohtml-ssr": "^1.1.0",
     "@webqit/util": "^0.8.9",
     "client-sessions": "^0.8.0",
     "esbuild": "^0.14.38",

package/src/Context.js

@@ -17,10 +17,14 @@ export default class Context {
             this[prop] = this.dict[prop];
         }
         if (arguments.length > 1) {
-            this.dict.CWD = CD;
+            Object.defineProperty(this.dict, 'CWD', { get: () => CD });
         }
     }
 
+    get name() {
+        return 'webflo';
+    }
+
     // create
     static create(...args) {
         return new this(...args);
@@ -31,9 +35,9 @@ export default class Context {
         return this.dict.CWD || '';
     }
 
-    // webflo
-    get webflo() {
-        return this.dict.webflo || {};
+    // meta
+    get meta() {
+        return this.dict.meta || {};
     }
 
     // app

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

@@ -3,9 +3,9 @@
  * imports
  */
 import { _merge } from '@webqit/util/obj/index.js';
-import Configurator from '../../Configurator.js';
+import { Dotfile } from '@webqit/backpack';
 
-export default class Env extends Configurator {
+export default class Env extends Dotfile {
 
     // Base name
     get name() {

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

@@ -3,9 +3,9 @@
  * imports
  */
 import { _merge } from '@webqit/util/obj/index.js';
-import Configurator from '../../Configurator.js';
+import { Dotfile } from '@webqit/backpack';
 
-export default class Layout extends Configurator {
+export default class Layout extends Dotfile {
 
     // Base name
     get name() {

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

@@ -6,9 +6,9 @@ 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 Configurator from '../../Configurator.js';
+import { Dotfile } from '@webqit/backpack';
 
-export default class Origins extends Configurator {
+export default class Origins extends Dotfile {
 
     // Base name
     get name() {

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

@@ -4,9 +4,9 @@
  */
 import { _merge } from '@webqit/util/obj/index.js';
 import { _isObject } from '@webqit/util/js/index.js';
-import Configurator from '../../Configurator.js';
+import { Dotfile } from '@webqit/backpack';
 
-export default class Virtualization extends Configurator {
+export default class Virtualization extends Dotfile {
 
     // Base name
     get name() {

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

@@ -5,9 +5,9 @@
 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 Configurator from '../../Configurator.js';
+import { Dotfile } from '@webqit/backpack';
 
-export default class Client extends Configurator {
+export default class Client extends Dotfile {
 
     // Base name
     get name() {
@@ -23,8 +23,10 @@ export default class Client extends Configurator {
     withDefaults(config) {
         return _merge(true, {
             bundle_filename: 'bundle.js',
-            support_oohtml: true,
-            support_service_worker: true,
+            public_base_url: '/',
+            spa_routing: true,
+            oohtml_support: 'full',
+            service_worker_support: true,
             worker_scope: '/',
             worker_filename: 'worker.js',
         }, config);
@@ -32,6 +34,16 @@ export default class Client extends Configurator {
 
     // Questions generator
     questions(config, choices = {}) {
+        // Choices
+        const CHOICES = _merge({
+            oohtml_support: [
+                {value: 'full', title: 'Full'},
+                {value: 'namespacing', title: 'namespacing'},
+                {value: 'scripting', title: 'scripting'},
+                {value: 'templating', title: 'templating'},
+                {value: 'none', title: 'none'},
+            ],
+        }, choices);
         // Questions
         return [
             {
@@ -41,30 +53,46 @@ export default class Client extends Configurator {
                 initial: config.bundle_filename,
             },
             {
-                name: 'support_oohtml',
+                name: 'public_base_url',
+                type: 'text',
+                message: '[public_base_url]: Enter the base-URL for public resource URLs',
+                initial: DATA.public_base_url,
+                validation: ['important'],
+            },
+            {
+                name: 'spa_routing',
                 type: 'toggle',
-                message: 'Support rendering with OOHTML? (Adds OOHTML to your app\'s bundle.)',
+                message: '[spa_routing]: Enable Single Page Routing Mode',
                 active: 'YES',
                 inactive: 'NO',
-                initial: config.support_oohtml,
+                initial: config.spa_routing,
+                validation: ['important'],
+            },
+            {
+                name: 'oohtml_support',
+                type: 'select',
+                message: '[oohtml_support]: (Adds OOHTML to your app\'s bundle.) Specify OOHTML support level',
+                choices: CHOICES.oohtml_support,
+                initial: this.indexOfInitial(CHOICES.oohtml_support, config.oohtml_support),
+                validation: ['important'],
             },
             {
-                name: 'support_service_worker',
+                name: 'service_worker_support',
                 type: 'toggle',
                 message: 'Support Service Worker?',
                 active: 'YES',
                 inactive: 'NO',
-                initial: config.support_service_worker,
+                initial: config.service_worker_support,
             },
             {
                 name: 'worker_scope',
-                type: (prev, answers) => answers.support_service_worker ? 'text' : null,
+                type: (prev, answers) => answers.service_worker_support ? 'text' : null,
                 message: 'Specify the Service Worker scope',
                 initial: config.worker_scope,
             },
             {
                 name: 'worker_filename',
-                type: (prev, answers) => answers.support_service_worker ? 'text' : null,
+                type: (prev, answers) => answers.service_worker_support ? 'text' : null,
                 message: 'Specify the Service Worker filename',
                 initial: config.worker_filename,
             },

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

@@ -3,9 +3,9 @@
  * imports
  */
 import { _merge } from '@webqit/util/obj/index.js';
-import Configurator from '../../Configurator.js';
+import { Dotfile } from '@webqit/backpack';
 
-export default class Server extends Configurator {
+export default class Server extends Dotfile {
 
     // Base name
     get name() {
@@ -29,6 +29,7 @@ export default class Server extends Configurator {
                 force: false,
             },
             force_www: '',
+            oohtml_support: 'full',
             shared: false,
         }, config);
     }
@@ -42,13 +43,20 @@ export default class Server extends Configurator {
                 {value: 'add',},
                 {value: 'remove',},
             ],
+            oohtml_support: [
+                {value: 'full', title: 'full'},
+                {value: 'namespacing', title: 'namespacing'},
+                {value: 'scripting', title: 'scripting'},
+                {value: 'templating', title: 'templating'},
+                {value: 'none', title: 'none'},
+            ],
         }, choices);
         // Questions
         return [
             {
                 name: 'port',
                 type: 'number',
-                message: 'Enter port number',
+                message: '[port]: Enter port number',
                 initial: config.port,
                 validation: ['important'],
             },
@@ -62,31 +70,31 @@ export default class Server extends Configurator {
                     {
                         name: 'port',
                         type: 'number',
-                        message: 'Enter HTTPS port number',
+                        message: '[port]: Enter HTTPS port number',
                         validation: ['important'],
                     },
                     {
                         name: 'keyfile',
                         type: 'text',
-                        message: 'Enter SSL KEY file',
+                        message: '[keyfile]: Enter SSL KEY file',
                         validation: ['important'],
                     },
                     {
                         name: 'certfile',
                         type: 'text',
-                        message: 'Enter SSL CERT file',
+                        message: '[certfile]: Enter SSL CERT file',
                         validation: ['important'],
                     },
                     {
                         name: 'certdoms',
                         type: 'list',
-                        message: 'Enter the CERT domains (comma-separated)',
+                        message: '[certdoms]: Enter the CERT domains (comma-separated)',
                         validation: ['important'],
                     },
                     {
                         name: 'force',
                         type: 'toggle',
-                        message: 'Force HTTPS?',
+                        message: '[force]: Force HTTPS?',
                         active: 'YES',
                         inactive: 'NO',
                     },
@@ -95,14 +103,22 @@ export default class Server extends Configurator {
             {
                 name: 'force_www',
                 type: 'select',
-                message: 'Force add/remove "www" on hostname?',
+                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',
+                message: '[oohtml_support]: Specify OOHTML support level',
+                choices: CHOICES.oohtml_support,
+                initial: this.indexOfInitial(CHOICES.oohtml_support, config.oohtml_support),
+                validation: ['important'],
+            },
             {
                 name: 'shared',
                 type: 'toggle',
-                message: 'Shared server?',
+                message: '[shared]: Shared server?',
                 active: 'YES',
                 inactive: 'NO',
                 initial: config.shared,

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

@@ -5,9 +5,9 @@
 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 Configurator from '../../../Configurator.js';
+import { Dotfile } from '@webqit/backpack';
 
-export default class Worker extends Configurator {
+export default class Worker extends Dotfile {
 
     // Base name
     get name() {
@@ -23,10 +23,11 @@ export default class Worker extends Configurator {
     withDefaults(config) {
         return _merge(true, {
             cache_name: 'cache_v0',
-            cache_only_urls: [],
+            default_fetching_strategy: 'network-first',
+            network_first_urls: [],
             cache_first_urls: [],
             network_only_urls: [],
-            network_first_urls: [],
+            cache_only_urls: [ '/page-3/{*.json}' ],
             skip_waiting: false,
             // -----------------
             support_push: false,
@@ -42,6 +43,15 @@ export default class Worker extends Configurator {
         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({
+            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);
         // Questions
         return [
             {
@@ -51,28 +61,36 @@ export default class Worker extends Configurator {
                 initial: config.cache_name,
             },
             {
-                name: 'cache_only_urls',
-                type: 'list',
-                message: 'Specify URLs for a "cache-only" fetching strategy (comma-separated, globe supported)',
-                initial: (config.cache_only_urls || []).join(', '),
+                name: 'default_fetching_strategy',
+                type: 'select',
+                message: '[default_fetching_strategy]: Choose the default fetching strategy',
+                choices: CHOICES.default_fetching_strategy,
+                initial: this.indexOfInitial(CHOICES.default_fetching_strategy, config.default_fetching_strategy),
+                validation: ['important'],
+            },
+            {
+                name: 'network_first_urls',
+                type: (prev, answers) => answers.default_fetching_strategy === 'network-first' ? null : 'list',
+                message: 'Specify URLs for a "network-first-then-cache" fetching strategy (comma-separated, globe supported)',
+                initial: (config.network_first_urls || []).join(', '),
             },
             {
                 name: 'cache_first_urls',
-                type: 'list',
+                type: (prev, answers) => answers.default_fetching_strategy === 'cache-first' ? null : 'list',
                 message: 'Specify URLs for a "cache-first-then-network" fetching strategy (comma-separated, globe supported)',
                 initial: (config.cache_first_urls || []).join(', '),
             },
             {
                 name: 'network_only_urls',
-                type: 'list',
+                type: (prev, answers) => answers.default_fetching_strategy === 'network-only' ? null : 'list',
                 message: 'Specify URLs for a "network-only" fetching strategy (comma-separated, globe supported)',
                 initial: (config.network_only_urls || []).join(', '),
             },
             {
-                name: 'network_first_urls',
-                type: 'list',
-                message: 'Specify URLs for a "network-first-then-cache" fetching strategy (comma-separated, globe supported)',
-                initial: (config.network_first_urls || []).join(', '),
+                name: 'cache_only_urls',
+                type: (prev, answers) => answers.default_fetching_strategy === 'cache-only' ? null : 'list',
+                message: 'Specify URLs for a "cache-only" fetching strategy (comma-separated, globe supported)',
+                initial: (config.cache_only_urls || []).join(', '),
             },
             {
                 name: 'skip_waiting',

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

@@ -5,9 +5,9 @@
 import Url from 'url';
 import { _merge } from '@webqit/util/obj/index.js';
 import { _isObject } from '@webqit/util/js/index.js';
-import Configurator from '../../../Configurator.js';
+import { Dotfile } from '@webqit/backpack';
 
-export default class Headers extends Configurator {
+export default class Headers extends Dotfile {
 
     // Base name
     get name() {

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

@@ -6,9 +6,9 @@ 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 Configurator from '../../../Configurator.js';
+import { Dotfile } from '@webqit/backpack';
 
-export default class Redirects extends Configurator {
+export default class Redirects extends Dotfile {
 
     // Base name
     get name() {

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

@@ -8,9 +8,9 @@ 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 Configurator from '../../Configurator.js';
+import { Dotfile } from '@webqit/backpack';
 
-export default class Manifest extends Configurator {
+export default class Manifest extends Dotfile {
 
     // Base name
     get name() {

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

@@ -4,9 +4,9 @@
  */
 import { _merge } from '@webqit/util/obj/index.js';
 import { _isObject } from '@webqit/util/js/index.js';
-import Configurator from '../../Configurator.js';
+import { Dotfile } from '@webqit/backpack';
 
-export default class Ssg extends Configurator {
+export default class Ssg extends Dotfile {
 
     // Base name
     get name() {

package/src/runtime-pi/Router.js

@@ -46,7 +46,7 @@ export default class Router {
         // The loop
         // ----------------
         const next = async function(thisTick) {
-            const thisContext = {};
+            const thisContext = { };
             if (!thisTick.trail || thisTick.trail.length < thisTick.destination.length) {
                 thisTick = await $this.readTick(thisTick);
                 // -------------