@ywal123456/jskim 0.4.0 → 0.5.0

package/scripts/lib/select-project-name.js

@@ -0,0 +1,64 @@
+'use strict';
+
+/**
+ * config.projects のキーを定義順で返します。
+ * @param {object} config
+ * @returns {string[]}
+ */
+function listProjectNames(config) {
+  const projects = config && config.projects;
+  if (!projects || typeof projects !== 'object') {
+    return [];
+  }
+  return Object.keys(projects);
+}
+
+/**
+ * positional project が無い場合の自動選択、または明示名を返します。
+ *
+ * @param {object} options
+ * @param {object} options.config
+ * @param {string|undefined} options.projectName
+ * @param {string} [options.commandName]
+ * @param {string} [options.usageLine]
+ * @returns {string}
+ */
+function selectProjectName({
+  config,
+  projectName,
+  commandName = 'build',
+  usageLine,
+}) {
+  const names = listProjectNames(config);
+  const usage =
+    usageLine || `jskim ${commandName} [<project>]`;
+
+  if (projectName && String(projectName).trim() !== '') {
+    return String(projectName).trim();
+  }
+
+  if (names.length === 0) {
+    throw new Error(
+      `[JSKim] 設定にprojectがありません。\n` +
+        `jskim.config.js の projects に1件以上定義してください。\n` +
+        `使用方法: ${usage}`
+    );
+  }
+
+  if (names.length === 1) {
+    return names[0];
+  }
+
+  const list = names.map((name) => `- ${name}`).join('\n');
+  throw new Error(
+    `[JSKim] projectを指定してください。\n` +
+      `使用方法: ${usage}\n\n` +
+      `利用可能なproject:\n` +
+      list
+  );
+}
+
+module.exports = {
+  listProjectNames,
+  selectProjectName,
+};

package/scripts/serve.js

@@ -1,11 +1,30 @@
 'use strict';
 
+const { parseCommandArgv } = require('./lib/parse-cli-args');
 const { runServeCommand } = require('./commands/serve-command');
 
+let parsed;
+try {
+  parsed = parseCommandArgv('serve', process.argv.slice(2));
+} catch (err) {
+  const message = err && err.message ? err.message : String(err);
+  console.error(message);
+  process.exitCode = 1;
+  return;
+}
+
+const projectName = parsed.projectName;
+const buildHint = projectName
+  ? `jskim build ${projectName}`
+  : 'jskim build [<project>]';
+
 runServeCommand({
-  projectName: process.argv[2],
+  projectName,
   workspaceRoot: process.cwd(),
-  usageLine: 'npm run serve -- <project-name>',
+  usageLine: 'jskim serve [<project>] [--host <host>] [--port <port>]',
+  buildHint,
+  host: parsed.options.host,
+  port: parsed.options.port,
 }).catch((err) => {
   const message = err && err.message ? err.message : String(err);
   console.error(message);

package/scripts/watch.js

@@ -1,11 +1,22 @@
 'use strict';
 
+const { parseCommandArgv } = require('./lib/parse-cli-args');
 const { runWatchCommand } = require('./commands/watch-command');
 
+let parsed;
+try {
+  parsed = parseCommandArgv('watch', process.argv.slice(2));
+} catch (err) {
+  const message = err && err.message ? err.message : String(err);
+  console.error(message);
+  process.exitCode = 1;
+  return;
+}
+
 runWatchCommand({
-  projectName: process.argv[2],
+  projectName: parsed.projectName,
   workspaceRoot: process.cwd(),
-  usageLine: 'npm run watch -- <project-name>',
+  usageLine: 'jskim watch [<project>]',
 }).catch((err) => {
   const message = err && err.message ? err.message : String(err);
   console.error(message);