@haxtheweb/create 9.0.13 → 9.0.14

package/dist/lib/programs/site.js

@@ -68,37 +68,43 @@ class Res {
 function siteActions() {
   return [{
     value: 'start',
-    label: "Launch site (http://localhost)"
+    label: "Launch site in browser (http://localhost)"
   }, {
     value: 'node:stats',
-    label: "Node: Stats"
+    label: "Node Stats / data"
   }, {
     value: 'node:add',
-    label: "Node: Add page"
+    label: "Add a new page"
   }, {
     value: 'node:edit',
-    label: "Node: Edit page"
+    label: "Edit a page"
   }, {
     value: 'node:delete',
-    label: "Node: Delete page"
+    label: "Delete a page"
   }, {
-    value: 'status',
-    label: "Site: Status"
+    value: 'site:stats',
+    label: "Site Status / stats"
   }, {
-    value: 'theme',
-    label: "Site: Change theme"
+    value: 'site:items',
+    label: "Site items"
+  }, {
+    value: 'site:list-files',
+    label: "List site files"
   }, {
-    value: 'file:list',
-    label: "Site: List files"
+    value: 'site:theme',
+    label: "Change theme"
   }, {
     value: 'site:html',
-    label: "Site: Full site as HTML"
+    label: "Full site as HTML"
   }, {
     value: 'site:md',
-    label: "Site: Full site as Markdown"
+    label: "Full site as Markdown"
   }, {
-    value: 'sync',
-    label: "Site: Sync git"
+    value: 'site:schema',
+    label: "Full site as HAXElementSchema"
+  }, {
+    value: 'site:sync',
+    label: "Sync git repo"
   }];
 }
 async function siteCommandDetected(commandRun) {
@@ -107,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,
@@ -126,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({
@@ -158,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 {
@@ -412,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`);
@@ -420,7 +473,7 @@ async function siteCommandDetected(commandRun) {
           console.log(e.stderr);
         }
         break;
-      case "theme":
+      case "site:theme":
         try {
           //theme
           let list = await siteThemeList();
@@ -443,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({
@@ -463,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,
@@ -477,6 +530,7 @@ async function siteCommandDetected(commandRun) {
         break;
       case "site:html":
       case "site:md":
+      case "site:schema":
         let siteContent = '';
         activeHaxsite = await hax.systemStructureContext();
         let items = [];
@@ -485,18 +539,41 @@ async function siteCommandDetected(commandRun) {
         } else {
           items = activeHaxsite.manifest.orderTree(activeHaxsite.manifest.items);
         }
-        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);
+        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 {
-          console.log(siteContent);
+          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":
@@ -668,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`;
@@ -705,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);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haxtheweb/create",
-  "version": "9.0.13",
+  "version": "9.0.14",
   "publishConfig": {
     "access": "public"
   },