@haxtheweb/create 9.0.15 → 9.0.16

package/dist/create.js

@@ -34,7 +34,7 @@ async function main() {
   .option('--org <char>', 'organization for package.json').option('--author <char>', 'author for site / package.json').option('--writeHaxProperties', 'Write haxProperties for the element')
 
   // options for site
-  .option('--import-site <char>', 'URL of site to import').option('--import-structure <char>', `import method to use:\n\rpressbooksToSite\n\relmslnToSite\n\rhaxcmsToSite\n\rnotionToSite\n\rgitbookToSite\n\revolutionToSite\n\rhtmlToSite\n\rdocxToSite`).option('--node-op <char>', 'node operation to perform').option('--item-id <char>', 'node ID to operate on').option('--name <char>', 'name of the project').option('--domain <char>', 'published domain name').option('--items-import <char>', 'import items from a file / site').helpCommand(true);
+  .option('--import-site <char>', 'URL of site to import').option('--import-structure <char>', `import method to use:\n\rpressbooksToSite\n\relmslnToSite\n\rhaxcmsToSite\n\rnotionToSite\n\rgitbookToSite\n\revolutionToSite\n\rhtmlToSite\n\rdocxToSite`).option('--node-op <char>', 'node operation to perform').option('--item-id <char>', 'node ID to operate on').option('--name <char>', 'name of the project').option('--domain <char>', 'published domain name').option('--title-scrape <char>', 'CSS Selector for `title` in resource').option('--content-scrape <char>', 'CSS Selector for `body` in resource').option('--items-import <char>', 'import items from a file / site').helpCommand(true);
 
   // default command which runs interactively
   _commander.program.command('start').description('Interactive program to pick options').action(() => {
@@ -347,6 +347,24 @@ async function main() {
               });
             }
           },
+          theme: async ({
+            results
+          }) => {
+            let themes = await (0, _site.siteThemeList)();
+            if (!commandRun.options.theme) {
+              // support having no theme but autoselecting
+              if (!commandRun.options.auto && !commandRun.options.skip) {
+                commandRun.options.theme = themes[0];
+              } else {
+                return p.select({
+                  message: "Theme:",
+                  required: false,
+                  options: themes,
+                  initialValue: themes[0]
+                });
+              }
+            }
+          },
           extras: ({
             results
           }) => {

package/dist/lib/micro-frontend-registry.js

@@ -8,6 +8,7 @@ exports.enableCoreServices = enableCoreServices;
 exports.enableExperimentalServices = enableExperimentalServices;
 exports.enableHAXcmsServices = enableHAXcmsServices;
 exports.enableServices = enableServices;
+var _statements = require("./statements.js");
 // because node hates mixing modern web at times this is a fork of @haxtheweb/micro-frontend-registry
 // and can fall out of date
 /**
@@ -50,8 +51,8 @@ const MicroFrontendRegCapabilities = function (SuperClass) {
      */
     define(item) {
       if (!(item instanceof MicroFrontend)) {
-        console.warn("MicroFrontendRegistry: use class MicroFrontend instance but if keys match it will register still.");
-        console.warn(item);
+        (0, _statements.log)("MicroFrontendRegistry: use class MicroFrontend instance but if keys match it will register still.", 'warn');
+        (0, _statements.log)(item, 'warn');
       }
       // validate item has all keys we care about
       if (Object.keys(item).every(key => MicroFrontendKeys.includes(key))) {
@@ -102,7 +103,7 @@ const MicroFrontendRegCapabilities = function (SuperClass) {
         }
       }
       if (!testOnly) {
-        console.error(`call for ${name} but not found in micro-frontend-registry`);
+        (0, _statements.log)(`call for ${name} but not found in micro-frontend-registry`, 'error');
       }
       return null;
     }
@@ -170,7 +171,7 @@ const MicroFrontendRegCapabilities = function (SuperClass) {
                 data: null
               };
             }).catch((e, d) => {
-              console.warn("Request failed", e);
+              (0, _statements.log)("Request failed", 'warn');
               // this is endpoint completely failed to respond
               return {
                 status: 500,
@@ -190,7 +191,7 @@ const MicroFrontendRegCapabilities = function (SuperClass) {
                 data: null
               };
             }).catch((e, d) => {
-              console.warn("Request failed", e);
+              (0, _statements.log)("Request failed", 'warn');
               // this is endpoint completely failed to respond
               return {
                 status: 500,

package/dist/lib/programs/site.js

@@ -29,7 +29,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 // trick MFR into giving local paths
 globalThis.MicroFrontendRegistryConfig = {
-  base: `@haxtheweb/open-apis/`
+  base: `@haxtheweb/open-apis`
 };
 // emable HAXcms routes so we have name => path just like on frontend!
 _microFrontendRegistry.MicroFrontendRegistry.enableServices(['core', 'haxcms', 'experimental']);
@@ -110,6 +110,9 @@ function siteActions() {
   }, {
     value: 'site:sync',
     label: "Sync git repo"
+  }, {
+    value: 'site:surge',
+    label: "Publish site to Surge.sh"
   }];
 }
 async function siteCommandDetected(commandRun) {
@@ -137,12 +140,6 @@ async function siteCommandDetected(commandRun) {
   // infinite loop until quitting the cli
   while (operation.action !== 'quit') {
     let actions = siteActions();
-    if (sysSurge) {
-      actions.push({
-        value: 'site:surge',
-        label: "Publish site to Surge.sh"
-      });
-    }
     actions.push({
       value: 'quit',
       label: "🚪 Quit"
@@ -432,7 +429,6 @@ async function siteCommandDetected(commandRun) {
         break;
       case "node:add":
         try {
-          // @todo accept title if not supplied
           if (!commandRun.options.title) {
             commandRun.options.title = await p.text({
               message: `Title for this page`,
@@ -445,16 +441,66 @@ async function siteCommandDetected(commandRun) {
               }
             });
           }
-          let resp = await haxcmsNodejsCli.cliBridge('createNode', {
+          var createNodeBody = {
             site: activeHaxsite,
             node: {
               title: commandRun.options.title
             }
-          });
+          };
+          // this would be odd but could be direct with no format specified
+          if (commandRun.options.content && !commandRun.options.format) {
+            // only API where it's called contents and already out there {facepalm}
+            // but user already has commands where it's --content as arg
+            createNodeBody.node.contents = commandRun.options.content;
+          } else if (commandRun.options.content && commandRun.options.format) {
+            let locationContent = '';
+            // if we have format set, then  we need to interpret content as a url
+            let location = commandRun.options.content;
+            // support for address, as in import from some place else
+            if (location.startsWith('https://') || location.startsWith('http://')) {
+              locationContent = await fetch(location).then(d => d.ok ? d.text() : '');
+            }
+            // look on prem
+            else if (fs.existsSync(location)) {
+              locationContent = await fs.readFileSync(location);
+            }
+            // format dictates additional processing; html is default
+            switch (commandRun.options.format) {
+              case 'json':
+                locationContent = JSON.parse(locationContent);
+                break;
+              case 'yaml':
+                locationContent = await (0, _jsYaml.load)(locationContent);
+                break;
+              case 'md':
+                let resp = await openApiBroker('@core', 'mdToHtml', {
+                  md: locationContent,
+                  raw: true
+                });
+                if (resp.res.data) {
+                  locationContent = resp.res.data;
+                }
+                break;
+            }
+            // support for scraper mode to find title from the content responsee
+            if (commandRun.options.titleScrape) {
+              let dom = (0, _nodeHtmlParser.parse)(`${locationContent}`);
+              createNodeBody.node.title = dom.querySelector(`${commandRun.options.titleScrape}`).textContent;
+            }
+            // support scraper mode which targets a wrapper for the actual content
+            if (commandRun.options.contentScrape) {
+              let dom = (0, _nodeHtmlParser.parse)(`${locationContent}`);
+              locationContent = dom.querySelector(`${commandRun.options.contentScrape}`).innerHTML;
+            }
+            createNodeBody.node.contents = locationContent;
+          }
+          let resp = await haxcmsNodejsCli.cliBridge('createNode', createNodeBody);
           if (commandRun.options.v) {
             (0, _statements.log)(resp.res.data);
           }
-          (0, _statements.log)(`"${commandRun.options.title}" added to site`);
+          if (!commandRun.options.quiet) {
+            (0, _statements.log)(`"${createNodeBody.node.title}" added to site`);
+          }
         } catch (e) {
           (0, _statements.log)(e.stderr);
         }
@@ -538,8 +584,52 @@ async function siteCommandDetected(commandRun) {
             // ensure we set empty values, just not completely undefined values
             if (typeof commandRun.options[commandRun.options.nodeOp] !== "undefined") {
               if (commandRun.options.nodeOp === 'content') {
-                if (commandRun.options.content && (await page.writeLocation(commandRun.options.content))) {
-                  (0, _statements.log)(`node:edit success updated page content: "${page.id}`);
+                let locationContent = '';
+                // this would be odd but could be direct with no format specified
+                if (commandRun.options.content && !commandRun.options.format) {
+                  locationContent = commandRun.options.content;
+                }
+                // this implies what we were given needs processing as a file / url
+                else if (commandRun.options.content && commandRun.options.format) {
+                  // if we have format set, then  we need to interpret content as a url
+                  let location = commandRun.options.content;
+                  // support for address, as in import from some place else
+                  if (location.startsWith('https://') || location.startsWith('http://')) {
+                    locationContent = await fetch(location).then(d => d.ok ? d.text() : '');
+                  }
+                  // look on prem
+                  else if (fs.existsSync(location)) {
+                    locationContent = await fs.readFileSync(location);
+                  }
+                  // format dictates additional processing; html is default
+                  switch (commandRun.options.format) {
+                    case 'json':
+                      locationContent = JSON.parse(locationContent);
+                      break;
+                    case 'yaml':
+                      locationContent = await (0, _jsYaml.load)(locationContent);
+                      break;
+                    case 'md':
+                      let resp = await openApiBroker('@core', 'mdToHtml', {
+                        md: locationContent,
+                        raw: true
+                      });
+                      if (resp.res.data) {
+                        locationContent = resp.res.data;
+                      }
+                      break;
+                  }
+                  // support scraper mode which targets a wrapper for the actual content
+                  if (commandRun.options.contentScrape) {
+                    let dom = (0, _nodeHtmlParser.parse)(`${locationContent}`);
+                    locationContent = dom.querySelector(`${commandRun.options.contentScrape}`).innerHTML;
+                  }
+                }
+                // if we have content (meaning it's not blank) then try to write the page location                    
+                if (locationContent && (await page.writeLocation(locationContent))) {
+                  if (!commandRun.options.quiet) {
+                    (0, _statements.log)(`node:edit success updated page content: "${page.id}`);
+                  }
                 } else {
                   console.warn(`node:edit failure to write page content : ${page.id}`);
                 }
@@ -639,9 +729,20 @@ async function siteCommandDetected(commandRun) {
         break;
       case "site:surge":
         try {
+          // attempt to install; implies they asked to publish with surge but
+          // system test did not see it globally
+          if (!sysSurge) {
+            let s = p.spinner();
+            s.start((0, _statements.merlinSays)('Installing Surge.sh globally so we can publish'));
+            let execOutput = await exec(`npm install --global surge`);
+            s.stop((0, _statements.merlinSays)('surge.sh installed globally'));
+            (0, _statements.log)(execOutput.stdout.trim());
+            sysSurge = true;
+          }
           if (!commandRun.options.domain) {
             commandRun.options.domain = await p.text({
               message: `Domain for surge`,
+              initialValue: `haxcli-${activeHaxsite.name}.surge.sh`,
               defaultValue: `haxcli-${activeHaxsite.name}.surge.sh`,
               required: true,
               validate: value => {
@@ -653,6 +754,7 @@ async function siteCommandDetected(commandRun) {
           }
           let execOutput = await exec(`cd ${activeHaxsite.directory} && surge . ${commandRun.options.domain}`);
           (0, _statements.log)(execOutput.stdout.trim());
+          (0, _statements.log)(`Site published: https://${commandRun.options.domain}`);
         } catch (e) {
           (0, _statements.log)(e.stderr);
         }
@@ -726,11 +828,21 @@ async function siteCommandDetected(commandRun) {
             });
             if (commandRun.options.toFile) {
               fs.writeFileSync(commandRun.options.toFile, resp.res.data.data);
+              if (!commandRun.options.quiet) {
+                (0, _statements.log)(`${commandRun.options.toFile} written`);
+              }
             } else {
               (0, _statements.log)(resp.res.data.data);
             }
           } else {
-            (0, _statements.log)(siteContent);
+            if (commandRun.options.toFile) {
+              fs.writeFileSync(commandRun.options.toFile, siteContent);
+              if (!commandRun.options.quiet) {
+                (0, _statements.log)(`${commandRun.options.toFile} written`);
+              }
+            } else {
+              (0, _statements.log)(siteContent);
+            }
           }
         }
         break;
@@ -739,7 +851,8 @@ async function siteCommandDetected(commandRun) {
         process.exit(0);
         break;
     }
-    if (commandRun.options.y) {
+    // y or noi need to act like it ran and finish instead of looping options
+    if (commandRun.options.y || !commandRun.options.i) {
       process.exit(0);
     }
     operation.action = null;
@@ -853,7 +966,7 @@ async function siteProcess(commandRun, project, port = '3000') {
     "site": {
       "name": project.name,
       "description": "own course",
-      "theme": commandRun.options.theme ? commandRun.options.theme : "clean-one"
+      "theme": commandRun.options.theme ? commandRun.options.theme : project.theme ? project.theme : "clean-one"
     },
     "build": {
       "type": "own",
@@ -885,6 +998,82 @@ async function siteProcess(commandRun, project, port = '3000') {
         siteRequest.build.files = resp.res.data.data.files;
       }
     }
+    // hidden import methodologies
+    else if (commandRun.options.importStructure) {
+      if (commandRun.options.importStructure === 'drupal7-book-print-html') {
+        let siteContent = await fetch(commandRun.options.importSite).then(d => d.ok ? d.text() : '');
+        if (siteContent) {
+          // @todo refactor to support 9 levels of heirarchy as this is technically what Drupal supports
+          let dom = (0, _nodeHtmlParser.parse)(siteContent);
+          // pull all of level 1 of hierarchy
+          let depth;
+          let order = 0;
+          let parent = null;
+          let items = [];
+          for (let branch1 of dom.querySelectorAll('.section-2')) {
+            parent = null;
+            depth = 0;
+            let itemID = branch1.getAttribute('id');
+            let item = {
+              id: itemID,
+              order: order,
+              indent: depth,
+              title: branch1.querySelector('h1').innerText,
+              slug: itemID.replace('-', '/'),
+              contents: branch1.querySelector(`.field.field-name-body .field-item`).innerHTML,
+              parent: parent
+            };
+            items.push(item);
+            order++;
+            depth = 1;
+            let parent2 = itemID;
+            let order2 = 0;
+            for (let branch2 of branch1.querySelectorAll('.section-3')) {
+              itemID = branch2.getAttribute('id');
+              let item = {
+                id: itemID,
+                order: order2,
+                indent: depth,
+                title: branch2.querySelector('h1').innerText,
+                slug: itemID.replace('-', '/'),
+                contents: branch2.querySelector(`.field.field-name-body .field-item`).innerHTML,
+                parent: parent2
+              };
+              items.push(item);
+              order2++;
+              depth = 2;
+              let parent3 = itemID;
+              let order3 = 0;
+              for (let branch3 of branch2.querySelectorAll('.section-4')) {
+                itemID = branch3.getAttribute('id');
+                let item = {
+                  id: itemID,
+                  order: order3,
+                  indent: depth,
+                  title: branch3.querySelector('h1').innerText,
+                  slug: itemID.replace('-', '/'),
+                  contents: branch3.querySelector(`.field.field-name-body .field-item`).innerHTML,
+                  parent: parent3
+                };
+                items.push(item);
+                order3++;
+              }
+            }
+            // obtain all images on the system to bring along with additional spider request
+            let location = new URL(commandRun.options.importSite).origin;
+            var files = {};
+            for (let image of dom.querySelectorAll("img[src^='/']")) {
+              if (!image.getAttribute('src').startsWith('//')) {
+                files[image.getAttribute('src')] = `${location}${image.getAttribute('src')}`;
+              }
+            }
+            siteRequest.build.files = files;
+          }
+          siteRequest.build.structure = 'import';
+          siteRequest.build.items = items;
+        }
+      }
+    }
   }
   HAXCMS.cliWritePath = `${project.path}`;
   let res = new Res();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haxtheweb/create",
-  "version": "9.0.15",
+  "version": "9.0.16",
   "publishConfig": {
     "access": "public"
   },
@@ -42,8 +42,8 @@
   "dependencies": {
     "@clack/core": "0.3.4",
     "@clack/prompts": "0.7.0",
-    "@haxtheweb/haxcms-nodejs": "^9.0.18",
-    "@haxtheweb/open-apis": "^9.0.11",
+    "@haxtheweb/haxcms-nodejs": "^9.0.20",
+    "@haxtheweb/open-apis": "^9.0.12",
     "commander": "12.1.0",
     "node-html-parser": "6.1.13",
     "ejs": "3.1.10",