@gluhar/cli 2.0.0 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gluhar/cli",
-    "version": "2.0.0",
+    "version": "2.2.0",
     "description": "Gluhar cli commands and scripts",
     "exports": {
         ".": "./src/index.ts",
@@ -43,5 +43,5 @@
         "tsconfig-paths": "^4.2.0",
         "typescript": "^5.5.4"
     },
-    "gitHead": "7d827f45588677797fbee4ab19c77ed5ef3d3d0c"
+    "gitHead": "812cd4e9c210817ad607720435fed962d18b8688"
 }

package/src/commands/generate/GenerateOptions.d.ts

@@ -1,6 +1,7 @@
 export declare const generateTypes: readonly ["project", "package", "command"];
 export type GenerateType = (typeof generateTypes)[number];
 export interface GenerateOptions {
+    starterBranch?: string;
     noRepo?: boolean;
     keepHistory?: boolean;
     yes: boolean;

package/src/commands/generate/GenerateOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GenerateOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/generate/GenerateOptions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,4CAA6C,CAAC;AACxE,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1D,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,GAAG,EAAE,OAAO,CAAC;CACd"}
+{"version":3,"file":"GenerateOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/generate/GenerateOptions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,4CAA6C,CAAC;AACxE,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1D,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,GAAG,EAAE,OAAO,CAAC;CACd"}

package/src/commands/generate/generateProject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateProject.d.ts","sourceRoot":"","sources":["../../../../src/commands/generate/generateProject.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,eAAO,MAAM,eAAe,SACpB,MAAM,OACP,MAAM,WACF,eAAe,kBAwGzB,CAAC"}
+{"version":3,"file":"generateProject.d.ts","sourceRoot":"","sources":["../../../../src/commands/generate/generateProject.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,eAAO,MAAM,eAAe,SACpB,MAAM,OACP,MAAM,WACF,eAAe,kBAsGzB,CAAC"}

package/src/commands/generate/generateProject.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateProject = void 0;
 const filesystem_1 = require("../../scripts/filesystem");
+const git_1 = require("../../scripts/git");
 const log_1 = require("./log");
 const cmd_1 = require("../../scripts/cmd");
 const utils_1 = require("../../utils");
 const generateProject = async (name, cwd, options) => {
-    const { noRepo, keepHistory, yes } = options;
+    const { starterBranch = "base", noRepo, keepHistory, yes } = options;
     log_1.log.verbose("Check if project name is valid");
     if (!name.match(/^[a-z0-9-]+$/)) {
         log_1.log.error("Project name must be lowercase, alphanumeric, and contain hyphens only.");
@@ -40,9 +41,9 @@ const generateProject = async (name, cwd, options) => {
         log_1.log.verbose("Skipping gh verification");
     }
     log_1.log.verbose("Cloning gluhar project template");
-    (0, cmd_1.executeCmd)(`git clone --branch hui https://github.com/gluharry/starters.git ${name}`); // TODO create a git.clone; TODO allow other branches; TODO change hui to gluhar
+    git_1.git.clone("gluharry/starters", name, { branch: starterBranch });
     cmd_1.cmd.cd(name);
-    log_1.log.verbose("Replacing hui-app with project's name");
+    log_1.log.verbose("Replacing gluhar-app with project's name");
     await filesystem_1.filesystem.copyFiles([
         "./package.json",
         "./README.md",
@@ -50,7 +51,7 @@ const generateProject = async (name, cwd, options) => {
         "./sanity/sanity.config.ts",
         "./sanity/structure.ts",
     ], (file) => {
-        const content = file.content.replaceAll("hui-app", name);
+        const content = file.content.replaceAll("gluhar-app", name);
         return {
             ...file,
             content,

package/src/index.js

@@ -10,7 +10,7 @@ const commands_1 = __importDefault(require("./commands"));
 const preAction_1 = require("./preAction");
 commander_1.program
     .name(constants_1.PROGRAM_NAME)
-    .description("A collection of commands and scripts for helping running, building, deploying and assisting in developing with Gluhar UI, Vue, Nuxt, Tailwind & Sanity.")
+    .description("A collection of commands and scripts for helping running, building, deploying and assisting in developing with Gluhar, Vue, Nuxt, Tailwind & Sanity.")
     .version(constants_1.VERSION, "-v, --version", "Output the version number.")
     .helpOption("-h, --help", "Display help for a command.")
     .option("-l, --log-level <level>", "Set log level.", "info")

package/src/preAction.d.ts

@@ -1,3 +1,3 @@
 import type { Command } from "commander";
-export declare const preAction: (rootCmd: Command, actionCmd: Command) => void;
+export declare const preAction: (rootCmd: Command, actionCmd: Command) => Promise<void>;
 //# sourceMappingURL=preAction.d.ts.map

package/src/preAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preAction.d.ts","sourceRoot":"","sources":["../../src/preAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8CzC,eAAO,MAAM,SAAS,YAAa,OAAO,aAAa,OAAO,SAiB7D,CAAC"}
+{"version":3,"file":"preAction.d.ts","sourceRoot":"","sources":["../../src/preAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6DzC,eAAO,MAAM,SAAS,YAAmB,OAAO,aAAa,OAAO,kBAoBnE,CAAC"}

package/src/preAction.js

@@ -36,13 +36,26 @@ const logCli = (actionCmd) => {
     log.verbose("options:", getOptions(actionCmd));
     log.verbose("cwd:", process.cwd());
 };
-const preAction = (rootCmd, actionCmd) => {
+const checkCliVersion = async () => {
+    const latestVersion = (0, cmd_1.getCmdOutput)("npm show @gluhar/cli version");
+    // Version is up to date
+    if (latestVersion === constants_1.VERSION)
+        return;
+    // Version is old, ask to install latest
+    const installLatest = await (0, utils_1.confirmQuestion)(`There is a newer version of the gluhar/cli available (v${latestVersion}). \nDo you want to install it now? (npm i -g @gluhar/cli)`);
+    if (installLatest) {
+        (0, cmd_1.executeCmd)("npm i -g @gluhar/cli@latest");
+    }
+};
+const preAction = async (rootCmd, actionCmd) => {
     // setup logging before loadConfig, so we can get logging from loadConfig
     setup(rootCmd, actionCmd);
     const { cwd: initCwd } = getOptions(rootCmd);
     if (initCwd)
         cmd_1.cmd.cd(initCwd);
     // loadConfig(rootCmd, actionCmd);
+    // Check for newer cli version
+    await checkCliVersion();
     const { cwd: newCwd } = getOptions(rootCmd);
     if (newCwd && newCwd !== initCwd)
         cmd_1.cmd.cd(newCwd);

package/src/scripts/cmd/types.d.ts

@@ -1,5 +1,5 @@
 export type ArgValue = string | number | boolean;
-export type Args = Record<string, ArgValue | undefined>;
+export type Args = Record<string, ArgValue | undefined> | {};
 export interface ParsedArg {
     name: string;
     parsedName: string;

package/src/scripts/cmd/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/scripts/cmd/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AACjD,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAC;AAExD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC5B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI;KAC/B,CAAC,IAAI,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/scripts/cmd/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AACjD,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;AAE7D,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC5B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI;KAC/B,CAAC,IAAI,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC"}

package/src/scripts/git/clone.d.ts

@@ -0,0 +1,10 @@
+export interface CloneOptions {
+    branch?: string;
+    singleBranch?: boolean;
+}
+/**
+ * Clone a repo.
+ * @param repo The repo name in the format: 'gluharry/starters'.
+ */
+export declare const clone: (repo: string, dir?: string, options?: CloneOptions) => void;
+//# sourceMappingURL=clone.d.ts.map

package/src/scripts/git/clone.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clone.d.ts","sourceRoot":"","sources":["../../../../src/scripts/git/clone.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,SACV,MAAM,QACP,MAAM,YACF,YAAY,SAItB,CAAC"}

package/src/scripts/git/clone.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clone = void 0;
+const cmd_1 = require("../../scripts/cmd");
+const log_1 = require("./log");
+/**
+ * Clone a repo.
+ * @param repo The repo name in the format: 'gluharry/starters'.
+ */
+const clone = (repo, dir = "", options = {}) => {
+    log_1.log.verbose("Cloning:", repo, dir, options);
+    (0, cmd_1.executeCmd)(`git clone https://github.com/${repo}.git ${dir}`, options);
+};
+exports.clone = clone;

package/src/scripts/git/index.d.ts

@@ -23,6 +23,7 @@ export declare const git: {
         rename: (oldTagName: string, newTagName: string) => void;
         pushAll: (remote?: string) => import("child_process").SpawnSyncReturns<Buffer>;
     };
+    clone: (repo: string, dir?: string, options?: import("./clone").CloneOptions) => void;
 };
 export type { BranchInfo } from "./branch/getCurrentBranch";
 //# sourceMappingURL=index.d.ts.map

package/src/scripts/git/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/scripts/git/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAOzC,eAAO,MAAM,GAAG;;;;mBAIC,IAAI;wBACC,MAAM;uBAEP,MAAM;wBAEL,MAAM,MAAM,OAAO;;;;;;;;;;;;;;;;;CAexC,CAAC;AAEF,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/scripts/git/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAQzC,eAAO,MAAM,GAAG;;;;mBAIC,IAAI;wBACC,MAAM;uBAEP,MAAM;wBAEL,MAAM,MAAM,OAAO;;;;;;;;;;;;;;;;;;CAgBxC,CAAC;AAEF,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC"}

package/src/scripts/git/index.js

@@ -14,6 +14,7 @@ const getTags_1 = require("./tag/getTags");
 const pushAllTags_1 = require("./tag/pushAllTags");
 const deleteTag_1 = require("./tag/deleteTag");
 const renameTag_1 = require("./tag/renameTag");
+const clone_1 = require("./clone");
 exports.git = {
     openPr: openPr_1.openPr,
     getRepo: getRepo_1.getRepo,
@@ -35,4 +36,5 @@ exports.git = {
         rename: renameTag_1.renameTag,
         pushAll: pushAllTags_1.pushAllTags,
     },
+    clone: clone_1.clone,
 };

package/src/utils/inquirer.d.ts

@@ -1,5 +1,5 @@
 export interface ConfirmAnswer {
     confirm: boolean;
 }
-export declare const confirmQuestion: (message: string, yes: boolean) => Promise<boolean>;
+export declare const confirmQuestion: (message: string, yes?: boolean) => Promise<boolean>;
 //# sourceMappingURL=inquirer.d.ts.map

package/src/utils/inquirer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inquirer.d.ts","sourceRoot":"","sources":["../../../src/utils/inquirer.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,eAAO,MAAM,eAAe,YAAmB,MAAM,OAAO,OAAO,qBAalE,CAAC"}
+{"version":3,"file":"inquirer.d.ts","sourceRoot":"","sources":["../../../src/utils/inquirer.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,eAAO,MAAM,eAAe,YAAmB,MAAM,QAAQ,OAAO,qBAanE,CAAC"}

package/src/utils/inquirer.js

@@ -11,8 +11,8 @@ const confirmQuestion = async (message, yes) => {
     }
     const answer = await inquirer_1.default.prompt([
         {
-            name: 'confirm',
-            type: 'confirm',
+            name: "confirm",
+            type: "confirm",
             message,
         },
     ]);