Use minimist for field-scripts & create-fm.

farmOS · Aug 29, 2023 · 6e1ac25 · 6e1ac25
1 parent e06e435
commit 6e1ac25
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/create-field-module/bin/run.js b/packages/create-field-module/bin/run.js
@@ -2,12 +2,13 @@
 
 /* eslint-disable no-console */
 
+import minimist from 'minimist';
 import create from './index.js';
 
 async function run() {
-  const args = process.argv.slice(2);
   try {
-    const targetDir = args[0];
+    const argv = minimist(process.argv.slice(2));
+    const { _: [targetDir] } = argv;
     await create(targetDir);
   } catch (error) {
     console.error(error);

diff --git a/packages/create-field-module/package.json b/packages/create-field-module/package.json
@@ -11,6 +11,7 @@
   "author": "Jamie Gaehring <gaehj457@gmail.com> (https://jgaehring.com)",
   "license": "GPL-3.0-or-later",
   "dependencies": {
+    "minimist": "^1.2.8",
     "prompts": "^2.4.2"
   },
   "repository": {

diff --git a/packages/field-scripts/bin/field-scripts.js b/packages/field-scripts/bin/field-scripts.js
@@ -1,16 +1,8 @@
 #!/usr/bin/env node
+
 /* eslint-disable no-console */
-import path from 'path';
 
-const parseOptions = (args = []) => {
-  const [head, ...tail] = args;
-  if (!head || tail.length === 0) return {};
-  if (head === '--config' && typeof tail[0] === 'string') {
-    const config = path.resolve(process.cwd(), tail[0]);
-    return { config };
-  }
-  return parseOptions(tail);
-};
+import minimist from 'minimist';
 
 const printResults = ({
   info, install, lib,
@@ -21,23 +13,21 @@ lib: ${lib.location}
 `.trim());
 
 async function run() {
-  const args = process.argv.slice(2);
-  const [script, ...rest] = args;
-  if (script === 'build-module') {
+  const args = minimist(process.argv.slice(2));
+  const { _: [command], ...options } = args;
+  if (command === 'build-module') {
     const { default: build } = await import('../build-module/index.js');
     try {
-      const options = parseOptions(rest);
       const results = await build(options);
       printResults(results);
     } catch (error) {
       console.error(error);
       process.exit(1);
     }
   }
-  if (script === 'develop-module') {
+  if (command === 'develop-module') {
     const { default: develop } = await import('../develop-module/index.js');
     try {
-      const options = parseOptions(rest);
       await develop(options);
     } catch (error) {
       console.error(error);

diff --git a/packages/field-scripts/package.json b/packages/field-scripts/package.json
@@ -20,6 +20,7 @@
     "@vitejs/plugin-vue": "^4.2.3",
     "field-kit-utils": "2.0.0-alpha.1",
     "js-yaml": "^4.1.0",
+    "minimist": "^1.2.8",
     "ramda": "^0.28.0",
     "vite": "^4.3.9"
   },