@multiplatform.one/cli 1.0.28 → 1.0.30

package/lib/bin/multiplatformOne.mjs

@@ -1,23 +1,80 @@
 // src/bin/multiplatformOne.ts
+import fs from "fs/promises";
+import inquirer from "inquirer";
+import os from "os";
 import path from "path";
+import pkg from "@multiplatform.one/cli/package.json";
 import { execa } from "execa";
 import { fileURLToPath } from "url";
 import { program } from "commander";
+process.env.COOKIECUTTER = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../scripts/cookiecutter.sh");
 program.name("multiplatform.one");
-program.command("init").argument("[remote]", "the remote to use", "https://gitlab.com/bitspur/multiplatform.one/cookiecutter").description("init multiplatform.one").action(async (remote) => {
+program.version(pkg.version);
+program.command("init").argument("[remote]", "the remote to use", "https://gitlab.com/bitspur/multiplatform.one/cookiecutter").option("--name <name>", "the name of the project").description("init multiplatform.one").action(async (remote) => {
+  if ((await execa("git", [
+    "rev-parse",
+    "--is-inside-work-tree"
+  ])).stdout.trim() === "true") {
+    throw new Error("multiplatform.one cannot be initialized inside a git repository");
+  }
+  const cookieCutterConfig = {
+    name: program.opts().name || (await inquirer.prompt([
+      {
+        message: "What is the project name?",
+        name: "name",
+        type: "input"
+      }
+    ]))?.name
+  };
+  const cookieCutterConfigFile = await fs.mkdtemp(path.join(os.tmpdir(), "multiplatform-"));
+  await fs.writeFile(cookieCutterConfigFile, JSON.stringify(cookieCutterConfig, null, 2));
   await execa("sh", [
     path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../scripts/init.sh"),
+    "-f",
+    "--config-file",
+    cookieCutterConfigFile,
     remote
   ], {
     stdio: "inherit"
   });
 });
 program.command("update").argument("[remote]", "the remote to use", "https://gitlab.com/bitspur/multiplatform.one/cookiecutter").description("update multiplatform.one").action(async (remote) => {
+  if ((await execa("git", [
+    "rev-parse",
+    "--is-inside-work-tree"
+  ])).stdout.trim() !== "true") {
+    throw new Error("multiplatform.one cannot be updated outside of a git repository");
+  }
+  if ((await execa("git", [
+    "diff",
+    "--cached",
+    "--quiet"
+  ])).stdout.trim() !== "true") {
+    throw new Error("multiplatform.one cannot be updated with uncommitted changes");
+  }
+  const projectRoot = (await execa("git", [
+    "rev-parse",
+    "--show-toplevel"
+  ])).stdout.trim();
+  let cookieCutterConfig;
+  if ((await fs.stat(path.resolve(projectRoot, "package.json"))).isFile() && (await fs.stat(path.resolve(projectRoot, "app/package.json"))).isFile() && JSON.parse(await fs.readFile(path.resolve(projectRoot, "app/package.json"), "utf8"))?.dependencies?.["multiplatform.one"]?.length) {
+    const name = JSON.parse(await fs.readFile(path.resolve(projectRoot, "package.json"), "utf8"))?.name;
+    if (name) cookieCutterConfig = {
+      name
+    };
+  }
+  if (!cookieCutterConfig) throw new Error("not a multiplatform.one project");
+  const cookieCutterConfigFile = await fs.mkdtemp(path.join(os.tmpdir(), "multiplatform-"));
+  await fs.writeFile(cookieCutterConfigFile, JSON.stringify(cookieCutterConfig, null, 2));
   await execa("sh", [
     path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../scripts/update.sh"),
+    "-f",
+    "--config-file",
+    cookieCutterConfigFile,
     remote
   ], {
-    stdio: "inherit"
+    stdio: "inherit",
+    cwd: projectRoot
   });
 });
 program.parse(process.argv);

package/lib/types.d.mts

@@ -0,0 +1,5 @@
+interface CookieCutterConfig {
+    name: string;
+}
+
+export type { CookieCutterConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/cli",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "author": "BitSpur <support@bitspur.com> (https://bitspur.com)",
   "contributors": [
     {
@@ -48,14 +48,16 @@
     "node": ">= 16.0"
   },
   "devDependencies": {
+    "@types/inquirer": "^9.0.7",
     "@types/node": "~20.12.13",
     "tsup": "^8.1.0",
     "typescript": "~5.3.3",
-    "@multiplatform.one/utils": "^0.0.13"
+    "@multiplatform.one/utils": "^0.0.15"
   },
   "dependencies": {
     "commander": "^9.5.0",
-    "execa": "^9.2.0"
+    "execa": "^9.2.0",
+    "inquirer": "^9.2.23"
   },
   "transpileModules": [
     "#ansi-styles",

package/scripts/cookiecutter.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if ! which cookiecutter >/dev/null 2>&1; then
+    if [ "$(uname 2>/dev/null | tr '[:upper:]' '[:lower:]' 2>/dev/null)" = "darwin" ] && which brew >/dev/null 2>&1; then
+        brew install cookiecutter
+    else
+        if which pipx >/dev/null 2>&1; then
+            pipx install cookiecutter
+        else
+            python3 -m pip install --user cookiecutter
+        fi
+    fi
+fi
+if ! which cookiecutter >/dev/null 2>&1; then
+    echo "Failed to install cookiecutter. Please install it manually." >&2
+    exit 1
+fi
+
+cookiecutter -f "$@"

package/scripts/init.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-cookiecutter "$@"
+$COOKIECUTTER "$@"

package/scripts/update.sh

@@ -2,37 +2,15 @@
 
 set -e
 
-MULTIPLATFORM_REMOTE="$1"
-if ! (cat app/package.json | grep -q multiplatform.one); then
-    echo "\033[0;31mError:\033[0m not a multiplatform.one project" >&2
-    exit 1
-fi
-if ! git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
-    echo "\033[0;31mError:\033[0m not inside a git repository" >&2
-    exit 1
-fi
-cd "$(git rev-parse --show-toplevel)"
-if ! git diff --cached --exit-code > /dev/null; then
-    echo "\033[0;31mError:\033[0m there are uncommitted changes" >&2
-    exit 1
-fi
 git clean -fxd
 PROJECT_DIR="$(pwd)"
 TEMP_DIR="$(mktemp -d)"
 trap 'rm -rf "$TEMP_DIR"' EXIT
 echo "TEMP_DIR $TEMP_DIR"
 cd "$TEMP_DIR"
-cookiecutter "$@"
+$COOKIECUTTER "$@"
 COOKIECUTTER_DIR="$TEMP_DIR/$(ls "$TEMP_DIR")"
-if [ -d "$TEMP_DIR/multiplatform.one" ]; then
-    MULTIPLATFORM_DIR="$TEMP_DIR/multiplatform_one"
-else
-    MULTIPLATFORM_DIR="$TEMP_DIR/multiplatform.one"
-fi
-git clone "$MULTIPLATFORM_REMOTE" "$MULTIPLATFORM_DIR"
 cd "$COOKIECUTTER_DIR"
-rm -rf .git
-mv "$MULTIPLATFORM_DIR/.git" .git
 git add .
 git commit -m "Updated multiplatform.one"
 cd "$PROJECT_DIR"

package/src/bin/multiplatformOne.ts

@@ -19,21 +19,57 @@
  * limitations under the License.
  */
 
+import fs from 'fs/promises';
+import inquirer from 'inquirer';
+import os from 'os';
 import path from 'path';
+import pkg from '@multiplatform.one/cli/package.json';
+import type { CookieCutterConfig } from '../types';
 import { execa } from 'execa';
 import { fileURLToPath } from 'url';
 import { program } from 'commander';
 
+process.env.COOKIECUTTER = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../scripts/cookiecutter.sh');
 program.name('multiplatform.one');
+program.version(pkg.version);
 
 program
   .command('init')
   .argument('[remote]', 'the remote to use', 'https://gitlab.com/bitspur/multiplatform.one/cookiecutter')
+  .option('--name <name>', 'the name of the project')
   .description('init multiplatform.one')
   .action(async (remote) => {
-    await execa('sh', [path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../scripts/init.sh'), remote], {
-      stdio: 'inherit',
-    });
+    if ((await execa('git', ['rev-parse', '--is-inside-work-tree'])).stdout.trim() === 'true') {
+      throw new Error('multiplatform.one cannot be initialized inside a git repository');
+    }
+    const cookieCutterConfig: CookieCutterConfig = {
+      name:
+        program.opts().name ||
+        (
+          await inquirer.prompt([
+            {
+              message: 'What is the project name?',
+              name: 'name',
+              type: 'input',
+            },
+          ])
+        )?.name,
+    };
+    const cookieCutterConfigFile = await fs.mkdtemp(path.join(os.tmpdir(), 'multiplatform-'));
+    await fs.writeFile(cookieCutterConfigFile, JSON.stringify(cookieCutterConfig, null, 2));
+    await execa(
+      'sh',
+      [
+        path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../scripts/init.sh'),
+        '-f',
+        '--config-file',
+        cookieCutterConfigFile,
+        remote,
+      ],
+      {
+        stdio: 'inherit',
+      },
+    );
   });
 
 program
@@ -41,9 +77,41 @@ program
   .argument('[remote]', 'the remote to use', 'https://gitlab.com/bitspur/multiplatform.one/cookiecutter')
   .description('update multiplatform.one')
   .action(async (remote) => {
-    await execa('sh', [path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../scripts/update.sh'), remote], {
-      stdio: 'inherit',
-    });
+    if ((await execa('git', ['rev-parse', '--is-inside-work-tree'])).stdout.trim() !== 'true') {
+      throw new Error('multiplatform.one cannot be updated outside of a git repository');
+    }
+    if ((await execa('git', ['diff', '--cached', '--quiet'])).stdout.trim() !== 'true') {
+      throw new Error('multiplatform.one cannot be updated with uncommitted changes');
+    }
+    const projectRoot = (await execa('git', ['rev-parse', '--show-toplevel'])).stdout.trim();
+    let cookieCutterConfig: CookieCutterConfig | undefined;
+    if (
+      (await fs.stat(path.resolve(projectRoot, 'package.json'))).isFile() &&
+      (await fs.stat(path.resolve(projectRoot, 'app/package.json'))).isFile() &&
+      JSON.parse(await fs.readFile(path.resolve(projectRoot, 'app/package.json'), 'utf8'))?.dependencies?.[
+        'multiplatform.one'
+      ]?.length
+    ) {
+      const name = JSON.parse(await fs.readFile(path.resolve(projectRoot, 'package.json'), 'utf8'))?.name;
+      if (name) cookieCutterConfig = { name };
+    }
+    if (!cookieCutterConfig) throw new Error('not a multiplatform.one project');
+    const cookieCutterConfigFile = await fs.mkdtemp(path.join(os.tmpdir(), 'multiplatform-'));
+    await fs.writeFile(cookieCutterConfigFile, JSON.stringify(cookieCutterConfig, null, 2));
+    await execa(
+      'sh',
+      [
+        path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../scripts/update.sh'),
+        '-f',
+        '--config-file',
+        cookieCutterConfigFile,
+        remote,
+      ],
+      {
+        stdio: 'inherit',
+        cwd: projectRoot,
+      },
+    );
   });
 
 program.parse(process.argv);

package/src/types.ts

@@ -0,0 +1,24 @@
+/*
+ * File: /src/types.ts
+ * Project: @multiplatform.one/cli
+ * File Created: 23-06-2024 10:13:38
+ * Author: Clay Risser
+ * -----
+ * BitSpur (c) Copyright 2021 - 2024
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export interface CookieCutterConfig {
+  name: string;
+}