@haxtheweb/create 9.0.7 → 9.0.8

package/README.md

@@ -1,20 +1,53 @@
 # HAX The CLI
 Rapidly build web components for the Web that work with HAX. HAX The Web's CLI tools empower you to rapidly..
-- start making Lit based web components using the HAX design system and tools
 
-## Future state
-- Create new HAX sites and administer them from the CLI
-- Create new themes for HAXcms
-- Interface w/ docs / AI agent on website
+```bash
+# this allows you to then use hax command
+npm install @haxtheweb/create --global
+# then run
+hax
+```
+
+# Commands
+
+## Default / global / new context
+- `hax` - fun ascii art and interactive CLI (via [clack](https://www.clack.cc/) )
+- `hax --name my-element --y` - Make a new HAX capable, i18n wired, Design system (DDD) driven web component
+  -  if in a monorepo root, will place in correct location / inherit settings
+- `hax --type haxsite --name mysite --y` - create a new HAXsite (HAXcms, single site)
+
+## Site  context
+- listing stats
+- launch site
+- publish to surge.sh (if installed)
+
+## web component context
+- launch element
 
-# Usage
+# Alternative Usage
 
 ```bash
+# also this will invoke 1x
 npx @haxtheweb/create
-#or
+# this is same as above, better windows CLI support
 npm init @haxtheweb
 ```
 
+## Usage in other programs
+https://stackoverflow.com/questions/69208298/use-node-bins-without-installing-the-package-globally explains it but you should be able to use the CLI as part of another project as follows:
+```json
+{
+  "scripts": {
+    "hax": "hax"
+  }
+}
+```
+
+```bash
+# script creating a new element called my-element w/ all defaults
+npm run hax -- --name my-element --y
+```
+
 ## Windows problems?
 Try setting a different cache path to load from `npm config set cache C:\tmp\nodejs\npm-cache --global`
 

package/dist/create.js

@@ -11,6 +11,7 @@ var _picocolors = _interopRequireDefault(require("picocolors"));
 var _statements = require("./lib/statements.js");
 var _utils = require("./lib/utils.js");
 var hax = _interopRequireWildcard(require("@haxtheweb/haxcms-nodejs"));
+var haxcmsNodejsCli = _interopRequireWildcard(require("@haxtheweb/haxcms-nodejs/dist/cli.js"));
 var child_process = _interopRequireWildcard(require("child_process"));
 var util = _interopRequireWildcard(require("node:util"));
 var _commander = require("commander");
@@ -37,16 +38,19 @@ exec('surge --version', error => {
   }
 });
 async function main() {
-  _commander.program.option('--y') // skip steps
-  .option('--skip') // skip steps
-  .option('--auto') // select defaults whenever possible
-  .option('--type <char>') // haxsite, webcomponent
-  .option('--name <char>') // project name
-  .option('--org <char>') // organization name
-  .option('--author <char>') // organization name
-  .option('--path <char>') // path
-  .option('--npmClient <char>') // npm yarn pnpm etc
-  .option('--');
+  _commander.program.option('--y', 'yes to all questions') // skip steps
+  .option('--skip', 'skip frills like animations') // skip steps
+  .option('--auto', 'yes to all questions, alias of y') // select defaults whenever possible
+  .option('--type <char>', 'type of project, haxsite or webcomponent') // haxsite, webcomponent
+  .option('--name <char>', 'name of the project') // haxsite / webcomponent name
+  .option('--title <char>', 'site: node title') // page title
+  .option('--domain <char>', 'site: published domain name') // haxsite / webcomponent name
+  .option('--action <char>', 'site: action to take') // action to take
+  .option('--org <char>', 'organization for package.json') // organization name
+  .option('--author <char>', 'author for site / package.json') // organization name
+  .option('--path <char>', 'where to perform operation') // path
+  .option('--npm-client <char>', 'npm client to use (must be installed) npm, yarn, pnpm') // npm yarn pnpm etc
+  .option('--').helpCommand(true);
   _commander.program.parse();
   var cliOptions = _commander.program.opts();
   // auto and y assume same thing
@@ -122,9 +126,17 @@ async function main() {
   // CLI works within context of the site if one is detected, otherwise we can do other thingss
   if (siteData) {
     p.intro(`${_picocolors.default.bgBlack(_picocolors.default.white(` HAXTheWeb : Site detected `))}`);
+    cliOptions.type = "haxsite";
     p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Name: ${siteData.name} `))}`);
+    // defaults if nothing set via CLI
     let operation = {
-      action: null
+      action: null,
+      title: "New Page",
+      domain: `haxcli-${siteData.name}.surge.sh`
+    };
+    operation = {
+      ...operation,
+      ...cliOptions
     };
     // infinite loop until quitting the cli
     while (operation.action !== 'quit') {
@@ -137,9 +149,10 @@ async function main() {
       }, {
         value: 'sync-git',
         label: "Sync code in git"
-      }
-      //{ value: 'node-add', label: "New Page"},
-      ];
+      }, {
+        value: 'node-add',
+        label: "Add New Page"
+      }];
       if (hasSurge) {
         actions.push({
           value: 'publish-surge',
@@ -150,20 +163,22 @@ async function main() {
         value: 'quit',
         label: "🚪 Quit"
       });
-      operation = await p.group({
-        action: ({
-          results
-        }) => p.select({
-          message: `Actions you can take`,
-          options: actions
-        })
-      }, {
-        onCancel: () => {
-          p.cancel('🧙 Merlin: Canceling CLI.. HAX ya later 🪄');
-          (0, _statements.communityStatement)();
-          process.exit(0);
-        }
-      });
+      if (!operation.action) {
+        operation = await p.group({
+          action: ({
+            results
+          }) => p.select({
+            message: `Actions you can take`,
+            options: actions
+          })
+        }, {
+          onCancel: () => {
+            p.cancel('🧙 Merlin: Canceling CLI.. HAX ya later 🪄');
+            (0, _statements.communityStatement)();
+            process.exit(0);
+          }
+        });
+      }
       switch (operation.action) {
         case "status":
           p.intro(`${_picocolors.default.bgBlue(_picocolors.default.white(` Title: ${siteData.manifest.title} `))}`);
@@ -178,9 +193,15 @@ async function main() {
           }
           break;
         case "node-add":
-          // @todo add new page option
+          // @todo need to accept arguments
           try {
-            //await exec(`${cliOptions.npmClient} run haxcms-nodejs-cli --site=${siteData.name} --op=createNode --nodeTitle=New`);
+            haxcmsNodejsCli.cliBridge('createNode', {
+              site: siteData,
+              node: {
+                title: operation.title
+              }
+            });
+            console.log(`"${operation.title}" added to site`);
           } catch (e) {
             console.log(e.stderr);
           }
@@ -195,7 +216,9 @@ async function main() {
           break;
         case "publish-surge":
           try {
-            await exec(`cd ${siteData.directory} && surge .`);
+            // @todo should provide an option for setting the domain
+            let execOutput = await exec(`cd ${siteData.directory} && surge . ${operation.domain}`);
+            console.log(execOutput.stdout.trim());
           } catch (e) {
             console.log(e.stderr);
           }
@@ -204,6 +227,10 @@ async function main() {
           // quit
           break;
       }
+      if (cliOptions.y) {
+        process.exit(0);
+      }
+      operation.action = null;
     }
   } else if (packageData && packageData.hax && packageData.hax.cli && packageData.scripts.start) {
     p.intro(`${_picocolors.default.bgBlack(_picocolors.default.white(` HAXTheWeb : Webcomponent detected `))}`);
@@ -244,7 +271,7 @@ async function main() {
         p.note(` 🧙🪄 BE GONE ${_picocolors.default.bold(_picocolors.default.black(_picocolors.default.bgGreen(activeProject)))} sub-process daemon! 🪄 + ✨ 👹 = 💀 `);
         cliOptions = {};
       }
-      if (['haxsite', 'webcomponent'].includes(cliOptions.type)) {
+      if (['site', 'haxsite', 'webcomponent'].includes(cliOptions.type)) {
         project = {
           type: cliOptions.type
         };
@@ -449,6 +476,7 @@ async function main() {
         let s = p.spinner();
         // resolve site vs multi-site
         switch (project.type) {
+          case 'site':
           case 'haxsite':
             s.start((0, _statements.merlinSays)(`Creating new site: ${project.name}`));
             let siteRequest = {
@@ -589,6 +617,7 @@ async function main() {
         } else {
           let nextSteps = `cd ${project.path}/${project.name} && `;
           switch (project.type) {
+            case 'site':
             case 'haxsite':
               nextSteps += `npx @haxtheweb/haxcms-nodejs`;
               break;

package/dist/templates/webcomponent/hax/package.json

@@ -28,8 +28,8 @@
     },
     "dependencies": {
       "lit": "^3.2.0",
-      "@haxtheweb/d-d-d": "^<%= version %>",
-      "@haxtheweb/i18n-manager": "^<%= version %>"
+      "@haxtheweb/d-d-d": "^9.0.13",
+      "@haxtheweb/i18n-manager": "^9.0.13"
     },
     "devDependencies": {
       "@babel/preset-env": "^7.16.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haxtheweb/create",
-  "version": "9.0.7",
+  "version": "9.0.8",
   "publishConfig": {
     "access": "public"
   },
@@ -22,7 +22,7 @@
     "build": "rm -rf dist && babel src --out-dir dist --copy-files --include-dotfiles && chmod 774 dist/create.js",
     "start": "npm run build && node ./dist/create.js && chmod 774 dist/create.js",
     "release": "npm run build && commit-and-tag-version && git push --follow-tags origin main && npm publish",
-    "haxcms-nodejs-cli": "./node_modules/.bin/haxcms-nodejs-cli"
+    "haxcms-nodejs-cli": "haxcms-nodejs-cli"
   },
   "bin": {
     "create-haxtheweb": "./dist/create.js",