@haxtheweb/create 9.0.12 → 9.0.14

package/dist/create.js

@@ -28,7 +28,7 @@ exec('git --version', error => {
 });
 async function main() {
   var commandRun = {};
-  _commander.program.option('--').option('--v', 'Verbose output').option('--debug', 'Output for developers').option('--format <char>', 'Output format; json (default), yaml').option('--path <char>', 'where to perform operation').option('--npm-client <char>', 'npm client to use (must be installed) npm, yarn, pnpm', 'npm').option('--y', 'yes to all questions').option('--skip', 'skip frills like animations').option('--auto', 'yes to all questions, alias of y')
+  _commander.program.option('--').option('--v', 'Verbose output').option('--debug', 'Output for developers').option('--format <char>', 'Output format; json (default), yaml').option('--path <char>', 'where to perform operation').option('--npm-client <char>', 'npm client to use (must be installed) npm, yarn, pnpm', 'npm').option('--y', 'yes to all questions').option('--skip', 'skip frills like animations').option('--auto', 'yes to all questions, alias of y').option('--no-i', 'prevent interactions / sub-process, good for scripting')
 
   // options for webcomponent
   .option('--org <char>', 'organization for package.json').option('--author <char>', 'author for site / package.json').option('--writeHaxProperties', 'Write haxProperties for the element')
@@ -61,7 +61,7 @@ async function main() {
       commandRun.arguments.action = action;
       commandRun.options.skip = true;
     }
-  }).option('--path <char>', 'path the project should be created in').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('--name <char>', 'name of the site (when creating a new one)').option('--domain <char>', 'published domain name').option('--node-op <char>', 'node operation to perform').version(await HAXCMS.getHAXCMSVersion());
+  }).option('--path <char>', 'path the project should be created in').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('--name <char>', 'name of the site (when creating a new one)').option('--domain <char>', 'published domain name').option('--node-op <char>', 'node operation to perform').option('--no-i', 'prevent interactions / sub-process, good for scripting').version(await HAXCMS.getHAXCMSVersion());
   let siteNodeOps = (0, _site.siteNodeOperations)();
   for (var i in siteNodeOps) {
     _commander.program.option(`--${(0, _utils.camelToDash)(siteNodeOps[i].value)} <char>`, `${siteNodeOps[i].label}`);
@@ -80,7 +80,7 @@ async function main() {
       commandRun.arguments.name = name;
       commandRun.options.skip = true;
     }
-  }).option('--path <char>', 'path the project should be created in').option('--org <char>', 'organization for package.json').option('--author <char>', 'author for site / package.json').option('--writeHaxProperties', 'Write haxProperties for the element');
+  }).option('--path <char>', 'path the project should be created in').option('--org <char>', 'organization for package.json').option('--author <char>', 'author for site / package.json').option('--writeHaxProperties', 'Write haxProperties for the element').option('--no-i', 'prevent interactions / sub-process, good for scripting');
   // process program arguments
   _commander.program.parse();
   commandRun.options = {
@@ -198,7 +198,7 @@ async function main() {
         project = {
           type: commandRun.command
         };
-      } else {
+      } else if (commandRun.options.i) {
         project = await p.group({
           type: ({
             results
@@ -224,6 +224,8 @@ async function main() {
             process.exit(0);
           }
         });
+      } else if (!commandRun.options.i) {
+        process.exit(0);
       }
       // detect being in a haxcms scaffold. easiest way is _sites being in this directory
       // set the path automatically so we skip the question
@@ -334,7 +336,7 @@ async function main() {
           extras: ({
             results
           }) => {
-            if (!commandRun.options.auto) {
+            if (!commandRun.options.auto && commandRun.options.i) {
               let options = [];
               let initialValues = [];
               if (commandRun.command === "webcomponent" || results.type === "webcomponent") {

package/dist/lib/programs/site.js

@@ -17,6 +17,7 @@ var _picocolors = _interopRequireDefault(require("picocolors"));
 var _jsYaml = require("js-yaml");
 var _nodeHtmlParser = require("node-html-parser");
 var _statements = require("../statements.js");
+var _utils = require("../utils.js");
 var _microFrontendRegistry = require("../micro-frontend-registry.js");
 var haxcmsNodejsCli = _interopRequireWildcard(require("@haxtheweb/haxcms-nodejs/dist/cli.js"));
 var hax = _interopRequireWildcard(require("@haxtheweb/haxcms-nodejs"));
@@ -30,7 +31,7 @@ globalThis.MicroFrontendRegistryConfig = {
   base: `@haxtheweb/open-apis/`
 };
 // emable HAXcms routes so we have name => path just like on frontend!
-_microFrontendRegistry.MicroFrontendRegistry.enableServices(['haxcms']);
+_microFrontendRegistry.MicroFrontendRegistry.enableServices(['core', 'haxcms', 'experimental']);
 const HAXCMS = hax.HAXCMS;
 const exec = util.promisify(child_process.exec);
 var sysSurge = true;
@@ -56,6 +57,10 @@ class Res {
     this.statusCode = status;
     return this;
   }
+  json(data) {
+    this.data = JSON.parse(JSON.stringify(data));
+    return this;
+  }
   setHeader() {
     return this;
   }
@@ -63,31 +68,43 @@ class Res {
 function siteActions() {
   return [{
     value: 'start',
-    label: "Start site (http://localhost)"
-  }, {
-    value: 'status',
-    label: "Status"
-  }, {
-    value: 'sync',
-    label: "Sync git"
-  }, {
-    value: 'theme',
-    label: "Change theme"
+    label: "Launch site in browser (http://localhost)"
   }, {
     value: 'node:stats',
-    label: "Page stats"
+    label: "Node Stats / data"
   }, {
     value: 'node:add',
-    label: "Add page"
+    label: "Add a new page"
   }, {
     value: 'node:edit',
-    label: "Edit page"
+    label: "Edit a page"
   }, {
     value: 'node:delete',
-    label: "Delete page"
+    label: "Delete a page"
+  }, {
+    value: 'site:stats',
+    label: "Site Status / stats"
+  }, {
+    value: 'site:items',
+    label: "Site items"
   }, {
-    value: 'file:list',
-    label: "List files"
+    value: 'site:list-files',
+    label: "List site files"
+  }, {
+    value: 'site:theme',
+    label: "Change theme"
+  }, {
+    value: 'site:html',
+    label: "Full site as HTML"
+  }, {
+    value: 'site:md',
+    label: "Full site as Markdown"
+  }, {
+    value: 'site:schema',
+    label: "Full site as HAXElementSchema"
+  }, {
+    value: 'site:sync',
+    label: "Sync git repo"
   }];
 }
 async function siteCommandDetected(commandRun) {
@@ -96,9 +113,11 @@ async function siteCommandDetected(commandRun) {
   if (!commandRun.arguments.action) {
     commandRun.arguments.action = 'status';
   }
-  p.intro(`${_picocolors.default.bgBlack(_picocolors.default.white(` HAXTheWeb : Site detected `))}`);
   commandRun.command = "site";
-  p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Name: ${activeHaxsite.name} `))}`);
+  if (!commandRun.options.y && commandRun.options.i) {
+    p.intro(`${_picocolors.default.bgBlack(_picocolors.default.white(` HAXTheWeb : Site detected `))}`);
+    p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Name: ${activeHaxsite.name} `))}`);
+  }
   // defaults if nothing set via CLI
   let operation = {
     ...commandRun.arguments,
@@ -115,8 +134,8 @@ async function siteCommandDetected(commandRun) {
     let actions = siteActions();
     if (sysSurge) {
       actions.push({
-        value: 'surge',
-        label: "Publish site using Surge.sh"
+        value: 'site:surge',
+        label: "Publish site to Surge.sh"
       });
     }
     actions.push({
@@ -147,13 +166,58 @@ async function siteCommandDetected(commandRun) {
       });
     }
     switch (operation.action) {
-      case "status":
-        p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Title: ${activeHaxsite.manifest.title} `))}`);
-        p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Description: ${activeHaxsite.manifest.description} `))}`);
-        p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Theme: ${activeHaxsite.manifest.metadata.theme.name} (${activeHaxsite.manifest.metadata.theme.element})`))}`);
-        p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Pages: ${activeHaxsite.manifest.items.length} `))}`);
+      case "site:stats":
         const date = new Date(activeHaxsite.manifest.metadata.site.updated * 1000);
-        p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Last updated: ${date.toLocaleDateString("en-US")} `))}`);
+        let siteItems = [];
+        if (commandRun.options.itemId != null) {
+          siteItems = activeHaxsite.manifest.findBranch(commandRun.options.itemId);
+        } else {
+          siteItems = activeHaxsite.manifest.orderTree(activeHaxsite.manifest.items);
+        }
+        let els = {};
+        for (var i in siteItems) {
+          let page = activeHaxsite.loadNode(siteItems[i].id);
+          let html = await activeHaxsite.getPageContent(page);
+          let dom = (0, _nodeHtmlParser.parse)(`<div id="fullpage">${html}</div>`);
+          for (var j in dom.querySelector('#fullpage').childNodes) {
+            let node = dom.querySelector('#fullpage').childNodes[j];
+            if (node && node.getAttribute) {
+              let haxel = await nodeToHaxElement(node, null);
+              if (!els[haxel.tag]) {
+                els[haxel.tag] = 0;
+              }
+              els[haxel.tag]++;
+            }
+          }
+        }
+        let siteStats = {
+          title: activeHaxsite.manifest.title,
+          description: activeHaxsite.manifest.description,
+          themeName: activeHaxsite.manifest.metadata.theme.name,
+          themeElement: activeHaxsite.manifest.metadata.theme.element,
+          pageCount: activeHaxsite.manifest.items.length,
+          lastUpdated: date.toLocaleDateString("en-US"),
+          tagUsage: els
+        };
+        if (!commandRun.options.format) {
+          p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Title: ${siteStats.title} `))}`);
+          p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Description: ${siteStats.description} `))}`);
+          p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Theme: ${siteStats.themeName} (${siteStats.themeElement})`))}`);
+          p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Pages: ${siteStats.pageCount} `))}`);
+          p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Last updated: ${siteStats.lastUpdated} `))}`);
+          p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Tags used: ${JSON.stringify(siteStats.tagUsage, null, 2)} `))}`);
+        } else if (commandRun.options.format === 'yaml') {
+          console.log((0, _jsYaml.dump)(siteStats));
+        } else {
+          console.log(siteStats);
+        }
+        break;
+      case "site:items":
+        if (commandRun.options.format === 'yaml') {
+          console.log((0, _jsYaml.dump)(activeHaxsite.manifest.items));
+        } else {
+          console.log(activeHaxsite.manifest.items);
+        }
         break;
       case "start":
         try {
@@ -201,17 +265,28 @@ async function siteCommandDetected(commandRun) {
                 case 'schema':
                   // next up
                   let html = await activeHaxsite.getPageContent(page);
-                  let dom = (0, _nodeHtmlParser.parse)(html);
-                  console.log(dom);
+                  let dom = (0, _nodeHtmlParser.parse)(`<div id="fullpage">${html}</div>`);
+                  let els = [];
+                  for (var i in dom.querySelector('#fullpage').childNodes) {
+                    let node = dom.querySelector('#fullpage').childNodes[i];
+                    if (node && node.getAttribute) {
+                      els.push(await nodeToHaxElement(node, null));
+                    }
+                  }
+                  console.log(els);
                   break;
                 case 'md':
-                  // @todo use the built in endpoints broker
+                  let resp = await openApiBroker('@core', 'htmlToMd', {
+                    html: await activeHaxsite.getPageContent(page)
+                  });
+                  console.log(resp.res.data.data);
                   break;
               }
             }
           }
         } catch (e) {
           console.log(e.stderr);
+          console.log(e);
         }
         break;
       case "node:add":
@@ -390,7 +465,7 @@ async function siteCommandDetected(commandRun) {
           console.log(e.stderr);
         }
         break;
-      case "sync":
+      case "site:sync":
         // @todo git sync might need other arguments / be combined with publishing
         try {
           await exec(`cd ${activeHaxsite.directory} && git pull && git push`);
@@ -398,7 +473,7 @@ async function siteCommandDetected(commandRun) {
           console.log(e.stderr);
         }
         break;
-      case "theme":
+      case "site:theme":
         try {
           //theme
           let list = await siteThemeList();
@@ -421,7 +496,7 @@ async function siteCommandDetected(commandRun) {
           console.log(e.stderr);
         }
         break;
-      case "surge":
+      case "site:surge":
         try {
           if (!commandRun.options.domain) {
             commandRun.options.domain = await p.text({
@@ -441,7 +516,7 @@ async function siteCommandDetected(commandRun) {
           console.log(e.stderr);
         }
         break;
-      case "file:list":
+      case "site:file-list":
         let res = new Res();
         await hax.RoutesMap.get.listFiles({
           query: activeHaxsite.name,
@@ -453,6 +528,54 @@ async function siteCommandDetected(commandRun) {
           console.log(res.data);
         }
         break;
+      case "site:html":
+      case "site:md":
+      case "site:schema":
+        let siteContent = '';
+        activeHaxsite = await hax.systemStructureContext();
+        let items = [];
+        if (commandRun.options.itemId != null) {
+          items = activeHaxsite.manifest.findBranch(commandRun.options.itemId);
+        } else {
+          items = activeHaxsite.manifest.orderTree(activeHaxsite.manifest.items);
+        }
+        if (operation.action === 'site:schema') {
+          let els = [];
+          for (var i in items) {
+            let page = activeHaxsite.loadNode(items[i].id);
+            let html = await activeHaxsite.getPageContent(page);
+            let dom = (0, _nodeHtmlParser.parse)(`<div id="fullpage">${html}</div>`);
+            els.push({
+              tag: "h1",
+              properties: {
+                "data-jos-item-id": items[i].id
+              },
+              content: `${items[i].title}`
+            });
+            for (var j in dom.querySelector('#fullpage').childNodes) {
+              let node = dom.querySelector('#fullpage').childNodes[j];
+              if (node && node.getAttribute) {
+                els.push(await nodeToHaxElement(node, null));
+              }
+            }
+          }
+          console.log(els);
+        } else {
+          for (var i in items) {
+            let page = activeHaxsite.loadNode(items[i].id);
+            siteContent += `<h1>${items[i].title}</h1>\n\r`;
+            siteContent += `<div data-jos-item-id="${items[i].id}">\n\r${await activeHaxsite.getPageContent(page)}\n\r</div>\n\r`;
+          }
+          if (operation.action === 'site:md') {
+            let resp = await openApiBroker('@core', 'htmlToMd', {
+              html: siteContent
+            });
+            console.log(resp.res.data.data);
+          } else {
+            console.log(siteContent);
+          }
+        }
+        break;
       case "quit":
         // quit
         process.exit(0);
@@ -531,8 +654,8 @@ function siteNodeOperations(search = null) {
 
 // broker a call to the open-api repo which is an express based wrapper for vercel (originally)
 // this ensures the calls are identical and yet are converted to something the CLI can leverage
-async function openApiBroker(call, body) {
-  let mfItem = _microFrontendRegistry.MicroFrontendRegistry.get(`@haxcms/${call}`);
+async function openApiBroker(scope, call, body) {
+  let mfItem = _microFrontendRegistry.MicroFrontendRegistry.get(`${scope}/${call}`);
   // ensure we have a MFR record to do the connection
   // fun thing is this is local file access directly via import()
   if (mfItem) {
@@ -557,8 +680,10 @@ async function openApiBroker(call, body) {
 async function siteProcess(commandRun, project, port = '3000') {
   // auto select operations to perform if requested
   if (!project.extras) {
-    let extras = ['launch'];
-    project.extras = extras;
+    project.extras = [];
+    if (commandRun.options.i) {
+      project.extras = ['launch'];
+    }
   }
   let s = p.spinner();
   s.start((0, _statements.merlinSays)(`Creating new site: ${project.name}`));
@@ -587,7 +712,7 @@ async function siteProcess(commandRun, project, port = '3000') {
     }
     // verify this is a valid way to do an import
     if (commandRun.options.importStructure && _microFrontendRegistry.MicroFrontendRegistry.get(`@haxcms/${commandRun.options.importStructure}`)) {
-      let resp = await openApiBroker(commandRun.options.importStructure, {
+      let resp = await openApiBroker('@haxcms', commandRun.options.importStructure, {
         repoUrl: commandRun.options.importSite
       });
       if (resp.res.data && resp.res.data.data && resp.res.data.data.items) {
@@ -620,19 +745,6 @@ async function siteProcess(commandRun, project, port = '3000') {
   }
   // options for install, git and other extras
   // can't launch if we didn't install first so launch implies installation
-  if (project.extras.includes('launch') || project.extras.includes('install')) {
-    s.start((0, _statements.merlinSays)(`Installation magic (${commandRun.options.npmClient} install)`));
-    try {
-      // monorepos install from top but then still need to launch from local location
-      if (!commandRun.options.isMonorepo) {
-        await exec(`cd ${project.path}/${project.name} && ${commandRun.options.npmClient} install`);
-      }
-    } catch (e) {
-      console.log(e);
-    }
-    s.stop((0, _statements.merlinSays)(`Everything is installed. It's go time`));
-  }
-  // autolaunch if default was selected
   if (project.extras.includes('launch')) {
     let optionPath = `${project.path}/${project.name}`;
     let command = `npx @haxtheweb/haxcms-nodejs`;
@@ -657,8 +769,8 @@ async function siteProcess(commandRun, project, port = '3000') {
       // don't log bc output is weird
     }
   } else {
-    let nextSteps = `cd ${project.path}/${project.name} && ${project.extras.includes('install') ? '' : `${commandRun.options.npmClient} install && `}${commandRun.options.npmClient} start`;
-    p.note(`${project.name} is ready to go. Run the following to start development:`);
+    let nextSteps = `cd ${project.path}/${project.name} && hax start`;
+    p.note(`${project.name} is ready to go. Run the following to start working with it:`);
     p.outro(nextSteps);
   }
 }
@@ -685,4 +797,101 @@ async function siteThemeList() {
     });
   }
   return items;
+}
+
+// @fork of the hax core util for this so that we avoid api difference between real dom and parse nodejs dom
+async function nodeToHaxElement(node, eventName = "insert-element") {
+  if (!node) {
+    return null;
+  }
+  // build out the properties to send along
+  var props = {};
+  // support basic styles
+  if (typeof node.getAttribute("style") !== typeof undefined) {
+    props.style = node.getAttribute("style");
+  }
+  // don't set a null style
+  if (props.style === null || props.style === "null") {
+    delete props.style;
+  }
+  // test if a class exists, not everything scopes
+  if (typeof node.getAttribute('class') !== typeof undefined) {
+    props.class = node.getAttribute('class').replace("hax-active", "");
+  }
+  // test if a id exists as its a special case in attributes... of course
+  if (typeof node.getAttribute('id') !== typeof undefined) {
+    props.id = node.getAttribute("id");
+  }
+  let tmpProps;
+  // weak fallback
+  if (typeof tmpProps === typeof undefined) {
+    tmpProps = node.__data;
+  }
+  // complex elements need complex support
+  if (typeof tmpProps !== typeof undefined) {
+    // run through attributes, though non-reflected props won't be here
+    // run through props, we always defer to property values
+    for (var property in tmpProps) {
+      // make sure we only set things that have a value
+      if (property != "class" && property != "style" && tmpProps.hasOwnProperty(property) && typeof node[property] !== undefined && node[property] != null && node[property] != "") {
+        props[property] = node[property];
+      }
+      // special support for false boolean
+      else if (node[property] === false) {
+        props[property] = false;
+      } else if (node[property] === true) {
+        props[property] = true;
+      } else if (node[property] === 0) {
+        props[property] = 0;
+      } else {
+        // unknown prop setting / ignored
+        //console.warn(node[property], property);
+      }
+    }
+    for (var attribute in node._attrs) {
+      // make sure we only set things that have a value
+      if (typeof node._attrs[attribute] !== typeof undefined && attribute != "class" && attribute != "style" && attribute != "id" && typeof node._attrs[attribute] !== undefined && node._attrs[attribute] != null && node._attrs[attribute] != "") {
+        props[attribute] = node._attrs[attribute];
+      } else if (node._attrs[attribute] == "0") {
+        props[attribute] = node._attrs[attribute];
+      } else {
+        // note: debug here if experiencing attributes that won't bind
+      }
+    }
+  } else {
+    // much easier case, usually just in primatives
+    for (var attribute in node._attrs) {
+      // make sure we only set things that have a value
+      if (typeof node._attrs[attribute] !== typeof undefined && attribute != "class" && attribute != "style" && attribute != "id" && typeof node._attrs[attribute] !== undefined && node._attrs[attribute] != null && node._attrs[attribute] != "") {
+        props[attribute] = node._attrs[attribute];
+      }
+    }
+  }
+  // support sandboxed environments which
+  // will hate iframe tags but love webview
+  let tag = node.tagName.toLowerCase();
+  if (globalThis.HaxStore && globalThis.HaxStore.instance && globalThis.HaxStore.instance._isSandboxed && tag === "iframe") {
+    tag = "webview";
+  }
+  let slotContent = '';
+  // if hax store around, allow it to get slot content of the node
+  if (globalThis.HaxStore && globalThis.HaxStore.instance) {
+    slotContent = await globalThis.HaxStore.instance.getHAXSlot(node);
+  } else {
+    // if HAX isn't around, just return the innerHTML as a string for asignment to content
+    slotContent = node.innerHTML;
+  }
+  // support fallback on inner text if there were no nodes
+  if (slotContent == "") {
+    slotContent = node.innerText;
+  }
+  let element = {
+    tag: tag,
+    properties: props,
+    content: slotContent
+  };
+  if (eventName !== null) {
+    element.eventName = eventName;
+  }
+  return element;
 }

package/package.json

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