@haxtheweb/create 10.0.7 → 11.0.0

package/dist/lib/programs/webcomponent.js

@@ -18,15 +18,12 @@ var _statements = require("../statements.js");
 var _logging = require("../logging.js");
 var _utils = require("../utils.js");
 var hax = _interopRequireWildcard(require("@haxtheweb/haxcms-nodejs"));
-var child_process = _interopRequireWildcard(require("child_process"));
-var util = _interopRequireWildcard(require("node:util"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 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; }
 const HAXCMS = hax.HAXCMS;
-const exec = util.promisify(child_process.exec);
 let sysGit = true;
-exec('git --version', error => {
+(0, _utils.exec)('which git', error => {
   if (error) {
     sysGit = false;
   }
@@ -228,7 +225,7 @@ async function webcomponentProcess(commandRun, project, port = "8000") {
   s.stop('Files are now awesome!');
   if (project.gitRepo && !commandRun.options.isMonorepo) {
     try {
-      await exec(`cd ${project.path}/${project.name} && git init && git add -A && git commit -m "first commit" && git branch -M main${project.gitRepo ? ` && git remote add origin ${project.gitRepo}` : ''}`);
+      await (0, _utils.exec)(`cd ${project.path}/${project.name} && git init && git add -A && git commit -m "first commit" && git branch -M main${project.gitRepo ? ` && git remote add origin ${project.gitRepo}` : ''}`);
     } catch (e) {}
   }
   // options for install, git and other extras
@@ -238,7 +235,7 @@ async function webcomponentProcess(commandRun, project, port = "8000") {
     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`);
+        await (0, _utils.exec)(`cd ${project.path}/${project.name} && ${commandRun.options.npmClient} install`);
       }
     } catch (e) {
       console.warn(e);
@@ -260,12 +257,12 @@ ${_picocolors.default.underline(_picocolors.default.cyan(`http://localhost:${por
 📘  VS Code Project: ${_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`code ${optionPath}`)))}
 🚧  Launch later: ${_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`${command}`)))}
 
-⌨️  To resume 🧙 Merlin press: ${_picocolors.default.bold(_picocolors.default.black(_picocolors.default.bgRed(` CTRL + C `)))}
+⌨️  To resume 🧙 Merlin press: ${_picocolors.default.bold(_picocolors.default.black(_picocolors.default.bgRed(` CTRL + C or CTRL + BREAK `)))}
 `);
     // at least a second to see the message print at all
     await (0, _promises.setTimeout)(1000);
     try {
-      await exec(`cd ${optionPath} && ${command} && ${commandRun.options.npmClient} run analyze`);
+      await (0, _utils.exec)(`cd ${optionPath} && ${command} && ${commandRun.options.npmClient} run analyze`);
     } catch (e) {
       // don't log bc output is weird
     }
@@ -284,7 +281,7 @@ function webcomponentActions() {
     label: "Check status of web component"
   }, {
     value: 'wc:element',
-    label: "Add a new Lit module to an existing project"
+    label: "Add new Lit component to existing project"
   }, {
     value: 'wc:haxproperties',
     label: "Write haxProperties schema"
@@ -358,7 +355,7 @@ async function webcomponentCommandDetected(commandRun, packageData = {}, port =
 📘  VS Code Project: ${_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`code ${process.cwd()}`)))}
 🚧  Launch later: ${_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`${commandRun.options.npmClient} start`)))}
 
-⌨️  To exit 🧙 Merlin press: ${_picocolors.default.bold(_picocolors.default.black(_picocolors.default.bgRed(` CTRL + C `)))}
+⌨️  To exit 🧙 Merlin press: ${_picocolors.default.bold(_picocolors.default.black(_picocolors.default.bgRed(` CTRL + C or CTRL + BREAK `)))}
           `);
         }
         try {
@@ -368,17 +365,63 @@ async function webcomponentCommandDetected(commandRun, packageData = {}, port =
             if (!commandRun.options.quiet) {
               let s = p.spinner();
               s.start((0, _statements.merlinSays)(`Installation magic (${commandRun.options.npmClient} install)`));
-              await exec(`${commandRun.options.npmClient} install`);
+              await (0, _utils.exec)(`${commandRun.options.npmClient} install`);
               s.stop((0, _statements.merlinSays)(`Everything is installed. It's go time`));
             } else {
-              await exec(`${commandRun.options.npmClient} install`);
+              await (0, _utils.exec)(`${commandRun.options.npmClient} install`);
             }
           }
-          await exec(`${commandRun.options.npmClient} start`);
+          await (0, _utils.exec)(`${commandRun.options.npmClient} start`);
         } catch (e) {
           // don't log bc output is odd
         }
         break;
+      case "serve":
+        try {
+          if (!commandRun.options.quiet) {
+            p.intro(`Launching development server.. `);
+          }
+          if (packageData.scripts.serve) {
+            if (!commandRun.options.quiet) {
+              p.note(`${(0, _statements.merlinSays)(`Project launched in development mode`)}
+
+🚀  Running your ${_picocolors.default.bold('webcomponent')} ${_picocolors.default.bold(packageData.name)}:
+      ${_picocolors.default.underline(_picocolors.default.cyan(`http://localhost:${port}`))}
+
+🏠  Launched: ${_picocolors.default.underline(_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`${process.cwd()}`))))}
+💻  Folder: ${_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`cd ${process.cwd()}`)))}
+📂  Open folder: ${_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`open ${process.cwd()}`)))}
+📘  VS Code Project: ${_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`code ${process.cwd()}`)))}
+🚧  Launch later: ${_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`${commandRun.options.npmClient} serve`)))}
+
+⌨️  To exit 🧙 Merlin press: ${_picocolors.default.bold(_picocolors.default.black(_picocolors.default.bgRed(` CTRL + C or CTRL + BREAK `)))}
+          `);
+            }
+            await (0, _utils.exec)(`${commandRun.options.npmClient} run serve`);
+          } else {
+            // if no serve script, run start instead
+            if (!commandRun.options.quiet) {
+              p.note(`${(0, _statements.merlinSays)(`No ${_picocolors.default.bold('serve')} script found, running ${_picocolors.default.bold(`${commandRun.options.npmClient} start`)} instead`)}
+
+🚀  Running your ${_picocolors.default.bold('webcomponent')} ${_picocolors.default.bold(packageData.name)}:
+      ${_picocolors.default.underline(_picocolors.default.cyan(`http://localhost:${port}`))}
+
+🏠  Launched: ${_picocolors.default.underline(_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`${process.cwd()}`))))}
+💻  Folder: ${_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`cd ${process.cwd()}`)))}
+📂  Open folder: ${_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`open ${process.cwd()}`)))}
+📘  VS Code Project: ${_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`code ${process.cwd()}`)))}
+🚧  Launch later: ${_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`${commandRun.options.npmClient} start`)))}
+
+⌨️  To exit 🧙 Merlin press: ${_picocolors.default.bold(_picocolors.default.black(_picocolors.default.bgRed(` CTRL + C or CTRL + BREAK `)))}
+          `);
+            }
+            await (0, _utils.exec)(`${commandRun.options.npmClient} start`);
+          }
+        } catch (e) {
+          // don't log bc output is odd
+          console.log("error", e);
+        }
+        break;
       case "wc:status":
       case "wc:stats":
       case "webcomponent:status":
@@ -422,6 +465,7 @@ async function webcomponentCommandDetected(commandRun, packageData = {}, port =
       case "wc:element":
       case "webcomponent:element":
         try {
+          const reservedNames = ["annotation-xml", "color-profile", "font-face", "font-face-src", "font-face-uri", "font-face-format", "font-face-name", "missing-glyph"];
           if (!commandRun.options.name) {
             commandRun.options.name = await p.text({
               message: 'Component name:',
@@ -431,18 +475,28 @@ async function webcomponentCommandDetected(commandRun, packageData = {}, port =
                 if (!value) {
                   return "Name is required (tab writes default)";
                 }
+                if (reservedNames.includes(value)) {
+                  return `Reserved name ${_picocolors.default.bold(value)} cannot be used`;
+                }
                 if (value.toLocaleLowerCase() !== value) {
                   return "Name must be lowercase";
                 }
                 if (/^\d/.test(value)) {
                   return "Name cannot start with a number";
                 }
+                if (/[`~!@#$%^&*()_=+\[\]{}|;:\'",<.>\/?\\]/.test(value)) {
+                  return "No special characters allowed in name";
+                }
                 if (value.indexOf(' ') !== -1) {
                   return "No spaces allowed in name";
                 }
                 if (value.indexOf('-') === -1 || value.replace('--', '') !== value || value[0] === '-' || value[value.length - 1] === '-') {
                   return "Name must include at least one `-` and must not start or end name.";
                 }
+                // Check for any other syntax errors
+                if (!/^[a-z][a-z0-9.\-]*\-[a-z0-9.\-]*$/.test(value)) {
+                  return `Name must follow the syntax ${_picocolors.default.bold("my-component")}`;
+                }
                 // assumes auto was selected in CLI
                 let joint = process.cwd();
                 if (commandRun.options.path) {
@@ -459,12 +513,21 @@ async function webcomponentCommandDetected(commandRun, packageData = {}, port =
               console.error(_picocolors.default.red("Name is required (tab writes default)"));
               process.exit(1);
             }
+            if (reservedNames.includes(value)) {
+              console.error(_picocolors.default.red(`Reserved name ${_picocolors.default.bold(value)} cannot be used`));
+              process.exit(1);
+            }
             if (value.toLocaleLowerCase() !== value) {
               console.error(_picocolors.default.red("Name must be lowercase"));
               process.exit(1);
             }
             if (/^\d/.test(value)) {
               console.error(_picocolors.default.red("Name cannot start with a number"));
+              process.exit(1);
+            }
+            if (/[`~!@#$%^&*()_=+\[\]{}|;:\'",<.>\/?\\]/.test(value)) {
+              console.error(_picocolors.default.red("No special characters allowed in name"));
+              process.exit(1);
             }
             if (value.indexOf(' ') !== -1) {
               console.error(_picocolors.default.red("No spaces allowed in name"));
@@ -474,6 +537,11 @@ async function webcomponentCommandDetected(commandRun, packageData = {}, port =
               console.error(_picocolors.default.red("Name must include at least one `-` and must not start or end name."));
               process.exit(1);
             }
+            // Check for any other syntax errors
+            if (!/^[a-z][a-z0-9.\-]*\-[a-z0-9.\-]*$/.test(value)) {
+              console.error(_picocolors.default.red(`Name must follow the syntax ${_picocolors.default.bold("my-component")}`));
+              process.exit(1);
+            }
             // assumes auto was selected in CLI
             let joint = process.cwd();
             if (commandRun.options.path) {
@@ -500,9 +568,6 @@ async function webcomponentCommandDetected(commandRun, packageData = {}, port =
           let content = ejs.render(ejsString, project);
           // file written successfully  
           fs.writeFileSync(filePath, content);
-          if (packageData.customElements) {
-            await webcomponentGenerateHAXSchema(commandRun, packageData);
-          }
           p.note(`🧙  Add to another web component (.js): ${_picocolors.default.underline(_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`import ./${project.name}.js`))))}
 💻  Add to an HTML file: ${_picocolors.default.bold(_picocolors.default.yellow(_picocolors.default.bgBlack(`<script type="module" src="${project.name}"></script>`)))}`);
           // at least a second to see the message print at all
@@ -510,7 +575,7 @@ async function webcomponentCommandDetected(commandRun, packageData = {}, port =
         } catch (e) {
           (0, _logging.log)(e.stderr);
           // Original ejs.render error checking
-          console.error(_picocolors.default.red(filePath));
+          console.error(_picocolors.default.red(process.cwd()));
           console.error(_picocolors.default.red(e));
         }
         break;
@@ -541,7 +606,7 @@ async function webcomponentCommandDetected(commandRun, packageData = {}, port =
 async function webcomponentGenerateHAXSchema(commandRun, packageData) {
   // run analyzer automatically if we have it so that it's up to date
   if (packageData.scripts.analyze) {
-    await exec(`${commandRun.options.npmClient} run analyze`);
+    await (0, _utils.exec)(`${commandRun.options.npmClient} run analyze`);
   }
   if (fs.existsSync(`${process.cwd()}/${packageData.customElements}`)) {
     const ceFileData = fs.readFileSync(`${process.cwd()}/${packageData.customElements}`, 'utf8', (error, data) => {

package/dist/lib/utils.js

@@ -7,15 +7,90 @@ exports.SITE_FILE_NAME = void 0;
 exports.camelToDash = camelToDash;
 exports.capitalizeFirstLetter = capitalizeFirstLetter;
 exports.dashToCamel = dashToCamel;
+exports.exec = void 0;
 exports.generateUUID = generateUUID;
+exports.getTimeDifference = getTimeDifference;
+exports.interactiveExec = interactiveExec;
 exports.readAllFiles = readAllFiles;
+exports.readConfigFile = readConfigFile;
+exports.spawn = void 0;
+exports.writeConfigFile = writeConfigFile;
 var fs = _interopRequireWildcard(require("node:fs"));
+var os = _interopRequireWildcard(require("node:os"));
 var path = _interopRequireWildcard(require("node:path"));
 var child_process = _interopRequireWildcard(require("child_process"));
 var util = _interopRequireWildcard(require("node:util"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 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; }
-const exec = util.promisify(child_process.exec);
+const exec = exports.exec = util.promisify(child_process.exec);
+const spawn = exports.spawn = child_process.spawn;
+function getTimeDifference(timestamp1, timestamp2) {
+  const time1 = new Date(timestamp1).getTime();
+  const time2 = new Date(timestamp2).getTime();
+  if (isNaN(time1) || isNaN(time2)) {
+    return "Invalid date format";
+  }
+  const difference = Math.abs(time2 - time1);
+  const seconds = Math.floor(difference / 1000);
+  const minutes = Math.floor(seconds / 60);
+  const hours = Math.floor(minutes / 60);
+  const days = Math.floor(hours / 24);
+  return {
+    days,
+    hours: hours % 24,
+    minutes: minutes % 60,
+    seconds: seconds % 60
+  };
+}
+
+// write user config file
+function writeConfigFile(filename, data) {
+  let tempDir = os.homedir();
+  if (process.env.VERCEL_ENV) {
+    tempDir = "/tmp/";
+  }
+  const filePath = path.join(tempDir, '.haxtheweb', filename);
+  try {
+    fs.writeFileSync(filePath, data);
+    return filePath;
+  } catch (error) {
+    return null;
+  }
+}
+
+// read user config file
+function readConfigFile(filename) {
+  let tempDir = os.homedir();
+  if (process.env.VERCEL_ENV) {
+    tempDir = "/tmp/";
+  }
+  const filePath = path.join(tempDir, '.haxtheweb', filename);
+  try {
+    let file = fs.readFileSync(filePath, 'utf8');
+    return file;
+  } catch (error) {
+    return null;
+  }
+}
+async function interactiveExec(command, args = [], options = {}) {
+  return new Promise((resolve, reject) => {
+    process.env.NODE_NO_WARNINGS = 1;
+    const child = spawn(command, args, {
+      stdio: 'inherit',
+      ...options
+    });
+    child.on('exit', code => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(new Error(`Command failed with code ${code}`));
+      }
+    });
+    child.on('error', err => {
+      reject(err);
+    });
+  });
+}
 const SITE_FILE_NAME = exports.SITE_FILE_NAME = "site.json";
 /**
  * Helper to convert dash to camel; important when reading attributes.