@haxtheweb/create 9.0.23 → 9.0.25

package/dist/create.js

@@ -35,10 +35,10 @@ 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('--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').version(await HAXCMS.getHAXCMSVersion()).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').option('--recipe <char>', 'path to recipe file').version(await HAXCMS.getHAXCMSVersion()).helpCommand(true);
 
   // default command which runs interactively
-  _commander.program.command('start').description('Interactive program to pick options').action(() => {
+  _commander.program.command('start').description('Select which hax sub-program to run').action(() => {
     commandRun = {
       command: 'start',
       arguments: {},
@@ -51,8 +51,7 @@ async function main() {
   (0, _site.siteActions)().forEach(action => {
     strActions += `${action.value} - ${action.label}` + "\n\r";
   });
-  let siteProg = _commander.program.command('site');
-  siteProg.argument('[action]', 'Actions to perform on site include:' + "\n\r" + strActions).action(action => {
+  let siteProg = _commander.program.command('site').description('create or administer a HAXsite').argument('[action]', 'Actions to perform on site include:' + "\n\r" + strActions).action(action => {
     commandRun = {
       command: 'site',
       arguments: {},
@@ -62,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').option('--no-i', 'prevent interactions / sub-process, good for scripting').option('--title-scrape <char>', 'CSS Selector for `title` in resource').option('--content-scrape <char>', 'CSS Selector for `body` in resource').option('--to-file <char>', 'redirect command output to a file').option('--no-extras', 'skip all extra / automatic command processing').option('--item-import <char>', 'import items from a file / site').option('--root <char>', 'root location to execute the command from').version(await HAXCMS.getHAXCMSVersion());
+  }).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('--quiet', 'remove console logging').option('--auto', 'yes to all questions, alias of y').option('--no-i', 'prevent interactions / sub-process, good for scripting').option('--to-file <char>', 'redirect command output to a file').option('--no-extras', 'skip all extra / automatic command processing').option('--root <char>', 'root location to execute the command from').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('--title-scrape <char>', 'CSS Selector for `title` in resource').option('--content-scrape <char>', 'CSS Selector for `body` in resource').option('--item-import <char>', 'import items from a file / site').option('--recipe <char>', 'path to recipe file').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}`);
@@ -367,7 +366,7 @@ async function main() {
             if (results.type === "site" && !commandRun.options.theme) {
               // support having no theme but autoselecting
               if (commandRun.options.auto && commandRun.options.skip) {
-                commandRun.options.theme = themes[0];
+                commandRun.options.theme = themes[0].value;
               } else {
                 return p.select({
                   message: "Theme:",

package/dist/lib/logging.js

@@ -35,7 +35,7 @@ const logger = exports.logger = winston.createLogger({
   transports: [consoleTransport, logFile]
 });
 function haxCliEnvOptions() {
-  return ['skip', 'npmClient', 'i', 'extras', 'root', 'path', 'org', 'author'];
+  return ['skip', 'npmClient', 'i', 'extras', 'root', 'path', 'org', 'author', 'y', 'auto'];
 }
 
 // wrapper so we can silence all log messages at the same time
@@ -52,7 +52,7 @@ function commandString(commandRun) {
       } else if (key === false) {
         comStr += ` --no-${(0, _utils.camelToDash)(key)}`;
       } else {
-        comStr += ` --${(0, _utils.camelToDash)(key)}="${commandRun.options[key]}"`;
+        comStr += ` --${(0, _utils.camelToDash)(key)} "${commandRun.options[key]}"`;
       }
     }
   }

package/dist/lib/programs/site.js

@@ -46,6 +46,9 @@ exec('surge --version', error => {
   }
 });
 const siteRecipeFile = 'create-cli.recipe';
+const siteLoggingName = 'cli';
+const logLevels = {};
+logLevels[siteLoggingName] = 0;
 
 // fake response class so we can capture the response from the headless route as opposed to print to console
 // this way we can handle as data or if use is requesting output format to change we can respond
@@ -132,10 +135,8 @@ async function siteCommandDetected(commandRun) {
     filename: recipeFileName
   });
   const recipe = winston.createLogger({
-    levels: {
-      hax: 0
-    },
-    level: 'hax',
+    levels: logLevels,
+    level: siteLoggingName,
     transports: [recipeLogTransport],
     format: winston.format.simple()
   });
@@ -343,7 +344,7 @@ async function siteCommandDetected(commandRun) {
           if (!commandRun.options.quiet) {
             (0, _logging.log)(`${josImport.items.length} nodes imported`);
           }
-          recipe.log('hax', (0, _logging.commandString)(commandRun));
+          recipe.log(siteLoggingName, (0, _logging.commandString)(commandRun));
         } else if (!commandRun.options.quiet) {
           (0, _logging.log)('Must specify --item-import as path to valid item export file or URL', 'error');
         }
@@ -525,7 +526,7 @@ async function siteCommandDetected(commandRun) {
             createNodeBody.node.contents = locationContent;
           }
           let resp = await haxcmsNodejsCli.cliBridge('createNode', createNodeBody);
-          recipe.log('hax', (0, _logging.commandString)(commandRun));
+          recipe.log(siteLoggingName, (0, _logging.commandString)(commandRun));
           if (commandRun.options.v) {
             (0, _logging.log)(resp.res.data, 'silly');
           }
@@ -658,7 +659,7 @@ async function siteCommandDetected(commandRun) {
                 }
                 // if we have content (meaning it's not blank) then try to write the page location                    
                 if (locationContent && (await page.writeLocation(locationContent))) {
-                  recipe.log('hax', (0, _logging.commandString)(commandRun));
+                  recipe.log(siteLoggingName, (0, _logging.commandString)(commandRun));
                   if (!commandRun.options.quiet) {
                     (0, _logging.log)(`node:edit success updated page content: "${page.id}`);
                   }
@@ -675,7 +676,7 @@ async function siteCommandDetected(commandRun) {
                   page[commandRun.options.nodeOp] = commandRun.options[commandRun.options.nodeOp];
                 }
                 let resp = await activeHaxsite.updateNode(page);
-                recipe.log('hax', (0, _logging.commandString)(commandRun));
+                recipe.log(siteLoggingName, (0, _logging.commandString)(commandRun));
                 if (commandRun.options.v) {
                   (0, _logging.log)(resp, 'silly');
                 }
@@ -719,7 +720,7 @@ async function siteCommandDetected(commandRun) {
               if (resp.res.data === 500) {
                 console.warn(`node:delete failed "${commandRun.options.itemId} not found`);
               } else {
-                recipe.log('hax', (0, _logging.commandString)(commandRun));
+                recipe.log(siteLoggingName, (0, _logging.commandString)(commandRun));
                 (0, _logging.log)(`"${commandRun.options.itemId}" deleted`);
               }
             } else {
@@ -755,7 +756,7 @@ async function siteCommandDetected(commandRun) {
             if (themes && commandRun.options.theme && themes[commandRun.options.theme]) {
               activeHaxsite.manifest.metadata.theme = themes[commandRun.options.theme];
               activeHaxsite.manifest.save(false);
-              recipe.log('hax', (0, _logging.commandString)(commandRun));
+              recipe.log(siteLoggingName, (0, _logging.commandString)(commandRun));
             }
           }
         } catch (e) {
@@ -885,9 +886,8 @@ async function siteCommandDetected(commandRun) {
       case "recipe:read":
         // just print the recipe out
         if (fs.existsSync(path.join(process.cwd(), `${siteRecipeFile}`))) {
-          let recContents = await fs.readFileSync(path.join(process.cwd(), `${siteRecipeFile}`));
+          let recContents = await fs.readFileSync(path.join(process.cwd(), `${siteRecipeFile}`), 'utf8');
           console.log(recContents);
-          (0, _logging.log)(recContents);
         }
         break;
       case "recipe:play":
@@ -897,14 +897,37 @@ async function siteCommandDetected(commandRun) {
           commandRun.options.recipe = await p.text({
             message: `Select recipe:`,
             defaultValue: process.cwd(),
-            initialValue: process.cwd()
+            initialValue: process.cwd(),
+            validate: val => {
+              if (!val.endsWith('.recipe')) {
+                return 'HAX Recipe files must end in .recipe';
+              }
+            }
           });
         }
         if (fs.existsSync(commandRun.options.recipe)) {
-          let recContents = await fs.readFileSync(commandRun.options.recipe);
+          let recContents = await fs.readFileSync(commandRun.options.recipe, 'utf8');
           // split into commands
-          let commandList = recContents.split('hax: ');
-          console.log(commandList);
+          let commandList = recContents.replaceAll('cli: ', '').split("\n");
+          // confirm each command or allow --y so that it auto applies
+          for (var i in commandList) {
+            // verify every command starts this way for safety
+            if (commandList[i].startsWith('hax site')) {
+              let confirmation;
+              if (commandRun.options.y) {
+                confirmation = true;
+              } else {
+                confirmation = await p.confirm({
+                  message: `Do you want to run ${commandList[i]}? (This cannot be undone)`,
+                  initialValue: true
+                });
+              }
+              // confirmed; let's run!
+              if (confirmation) {
+                await exec(`${commandList[i]} --y --no-i --auto --quiet`);
+              }
+            }
+          }
         }
         break;
       case "quit":
@@ -1144,22 +1167,19 @@ async function siteProcess(commandRun, project, port = '3000') {
   }, res);
   // path different for this one as it's on the fly produced
   const recipeFileName = path.join(project.path, '/', project.name, `${siteRecipeFile}`);
-  console.log(recipeFileName);
   const recipeLogTransport = new winston.transports.File({
     filename: recipeFileName
   });
   const recipe = winston.createLogger({
-    levels: {
-      hax: 0
-    },
-    level: 'hax',
+    levels: logLevels,
+    level: siteLoggingName,
     transports: [recipeLogTransport],
     format: winston.format.simple()
   });
   // matching the common object elsewhere tho different reference in this command since it creates from nothing
   // capture this if use input on the fly
   commandRun.options.theme = project.theme;
-  recipe.log('hax', (0, _logging.commandString)(commandRun));
+  recipe.log(siteLoggingName, (0, _logging.commandString)(commandRun));
   if (commandRun.options.v) {
     if (commandRun.options.format === 'yaml') {
       (0, _logging.log)((0, _jsYaml.dump)(res.data), 'silly');

package/dist/lib/programs/webcomponent.js

@@ -138,7 +138,8 @@ class HAXWiring {
 async function webcomponentProcess(commandRun, project, port = "8000") {
   // auto select operations to perform if requested
   if (!project.extras) {
-    if (!commandRun.options.extras) {
+    console.log(commandRun.options.extras);
+    if (commandRun.options.extras === false) {
       project.extras = [];
     } else {
       let extras = ['launch', 'install', 'git'];

package/package.json

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