Fix adjectives bug

merrymake · Oct 19, 2023 · 83d67eb · 83d67eb
1 parent 3d47eeb
commit 83d67eb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@merrymake/cli",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/questions.js b/questions.js
@@ -23,6 +23,7 @@ const detect_project_type_1 = require("@merrymake/detect-project-type");
 const templates_1 = require("./templates");
 const simulator_1 = require("./simulator");
 const args_1 = require("./args");
+const words_1 = require("./words");
 function service_template_language(path, template, projectType) {
     (0, utils_1.addToExecuteQueue)(() => (0, executors_1.fetch_template)(path, template, projectType));
     return (0, utils_1.finish)();
@@ -540,11 +541,11 @@ function generateOrgName() {
         !Number.isNaN(+process.env["MERRYMAKE_NAME_LENGTH"]))
         return "org" + generateString(+process.env["MERRYMAKE_NAME_LENGTH"] - 3);
     else
-        return (ADJECTIVE[~~(ADJECTIVE.length * Math.random())] +
+        return (words_1.ADJECTIVE[~~(words_1.ADJECTIVE.length * Math.random())] +
             "-" +
-            NOUN[~~(NOUN.length * Math.random())] +
+            words_1.NOUN[~~(words_1.NOUN.length * Math.random())] +
             "-" +
-            NOUN[~~(NOUN.length * Math.random())]);
+            words_1.NOUN[~~(words_1.NOUN.length * Math.random())]);
 }
 function quickstart() {
     let cache = (0, utils_1.getCache)();

diff --git a/questions.ts b/questions.ts
@@ -49,6 +49,7 @@ import { execSync } from "child_process";
 import { languages, templates } from "./templates";
 import { Run } from "./simulator";
 import { getArgs, initializeArgs } from "./args";
+import { ADJECTIVE, NOUN } from "./words";
 
 function service_template_language(
   path: Path,

diff --git a/words.js b/words.js
@@ -1,5 +1,7 @@
 "use strict";
-const NOUN = [
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ADJECTIVE = exports.NOUN = void 0;
+exports.NOUN = [
     "advantage",
     "advertisement",
     "advice",
@@ -101,7 +103,7 @@ const NOUN = [
     "transport",
     "turnover",
 ];
-const ADJECTIVE = [
+exports.ADJECTIVE = [
     "absent-minded",
     "abstruse",
     "absurd",

diff --git a/words.ts b/words.ts
@@ -1,4 +1,4 @@
-const NOUN = [
+export const NOUN = [
   "advantage",
   "advertisement",
   "advice",
@@ -100,7 +100,7 @@ const NOUN = [
   "transport",
   "turnover",
 ];
-const ADJECTIVE = [
+export const ADJECTIVE = [
   "absent-minded",
   "abstruse",
   "absurd",