sn-typescript-util 1.3.8 → 1.3.10

package/bin/snts.js

@@ -21,7 +21,7 @@ async function doCompile() {
     return stdout;
   });
 }
-function doOptions(program) {
+function doOptions(program, version) {
   program.parse(process.argv).opts();
   const option = Object.keys(program.opts()).toString();
   const optionKey = option;
@@ -32,14 +32,17 @@ function doOptions(program) {
     compile: () => {
       doCompile();
     },
+    help: () => {
+      showHelp(program);
+    },
     sync: () => {
       doSync();
     },
     default: () => {
-      program.help();
+      showHelp(program);
     }
   };
-  return handleOptions(program, options, optionKey);
+  return handleOptions(program, options, optionKey, version);
 }
 async function doSync() {
   const s = startPrompts('Processing', 'Sync started');
@@ -52,7 +55,7 @@ function getDescription(version) {
   const title = 'SN TypeScript Util';
   const description =
     'is a TS utility for ServiceNow developers using VS Code.';
-  return `${bold(magenta(title))} ${description} ${gray(`(${version})`)}\n`;
+  return `${bold(magenta(title))} ${description} ${gray(`(v${version})`)}\n`;
 }
 function getErrorMsg() {
   const url = `https://docs.servicenow.com/bundle/vancouver-application-development/page/build/applications/task/create-project.html`;
@@ -74,7 +77,11 @@ function handleError() {
   getErrorMsg();
   return process.exit(1);
 }
-function handleOptions(program, options, option) {
+function handleOptions(program, options, option, version) {
+  if (option === 'help' || !option) {
+    console.log(getDescription(version));
+    showHelp(program);
+  }
   return (
     shouldShowHelp(program, option) ||
     ((hasApplication() && options[option]) || showHelp(program))()
@@ -96,7 +103,6 @@ async function init() {
   const program = new Command();
   const info = await getPackageInfo();
   const version = info.version;
-  program.version(version, '-v, --version', 'output the current version');
   program.option(
     '-b, --build',
     'build project utility files & package dependencies'
@@ -105,13 +111,14 @@ async function init() {
     '-c, --compile',
     'compile TypeScript files to JavaScript & move to src'
   );
+  program.option('-h, --help', 'display help for command');
   program.option(
     '-s, --sync',
     'sync new instance-based src files to the ts directory'
   );
+  program.version(version, '-v, --version', 'output the current version');
   program.usage(cyan('[options]'));
-  console.log(getDescription(version));
-  return doOptions(program);
+  return doOptions(program, version);
 }
 function introPrompt(msg) {
   return intro(msg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sn-typescript-util",
-  "version": "1.3.8",
+  "version": "1.3.10",
   "description": "A TypeScript utility for ServiceNow developers using VS Code",
   "bin": {
     "snts": "bin/snts.js"

package/scripts/options.ts

@@ -1,6 +1,7 @@
 export interface Options {
   build: () => void;
   compile: () => void;
+  help: () => void;
   sync: () => void;
   default: () => void;
 }

package/scripts/snts.ts

@@ -27,7 +27,7 @@ async function doCompile() {
   });
 }
 
-function doOptions(program: Command) {
+function doOptions(program: Command, version: string) {
   program.parse(process.argv).opts();
   const option: string = Object.keys(program.opts()).toString();
   const optionKey = option as keyof Options;
@@ -38,14 +38,17 @@ function doOptions(program: Command) {
     compile: () => {
       doCompile();
     },
+    help: () => {
+      showHelp(program);
+    },
     sync: () => {
       doSync();
     },
     default: () => {
-      program.help();
+      showHelp(program);
     }
   };
-  return handleOptions(program, options, optionKey);
+  return handleOptions(program, options, optionKey, version);
 }
 
 async function doSync() {
@@ -60,7 +63,7 @@ function getDescription(version: string) {
   const title = 'SN TypeScript Util';
   const description =
     'is a TS utility for ServiceNow developers using VS Code.';
-  return `${bold(magenta(title))} ${description} ${gray(`(${version})`)}\n`;
+  return `${bold(magenta(title))} ${description} ${gray(`(v${version})`)}\n`;
 }
 
 function getErrorMsg() {
@@ -91,8 +94,13 @@ function handleError() {
 function handleOptions(
   program: Command,
   options: Options,
-  option: keyof Options
+  option: keyof Options,
+  version: string
 ) {
+  if (option === 'help' || !option) {
+    console.log(getDescription(version));
+    showHelp(program);
+  }
   return (
     shouldShowHelp(program, option) ||
     ((hasApplication() && options[option]) || showHelp(program))()
@@ -117,7 +125,6 @@ async function init() {
   const program = new Command();
   const info = await getPackageInfo();
   const version = info.version;
-  program.version(version, '-v, --version', 'output the current version');
   program.option(
     '-b, --build',
     'build project utility files & package dependencies'
@@ -126,13 +133,14 @@ async function init() {
     '-c, --compile',
     'compile TypeScript files to JavaScript & move to src'
   );
+  program.option('-h, --help', 'display help for command');
   program.option(
     '-s, --sync',
     'sync new instance-based src files to the ts directory'
   );
+  program.version(version, '-v, --version', 'output the current version');
   program.usage(cyan('[options]'));
-  console.log(getDescription(version));
-  return doOptions(program);
+  return doOptions(program, version);
 }
 
 function introPrompt(msg: string) {

package/scripts/sync.sh

@@ -15,14 +15,14 @@ get_project_name() {
 }
 
 sync() {
-  interface_dir="Interfaces"
+  types_dir="Types"
   src_path="$(get_project_name system/sn-workspace.json ACTIVE_APPLICATION)/src"
   ts_path="$(get_project_name system/sn-workspace.json ACTIVE_APPLICATION)/ts"
   clean_build "$build_dir"
   if [ -d "$ts_path" ]; then
     find "$ts_path" -name "*.ts" -exec sh -c 'mv "$0" "${0%.ts}.js"' {} \;
   fi
-  rsync --ignore-existing --delete-after -raz --progress --prune-empty-dirs --include "*/" --include "*.js" --exclude="*" "$interface_dir" "$src_path/" "$ts_path"
+  rsync --ignore-existing --delete-after -raz --progress --prune-empty-dirs --include "*/" --include "*.js" --exclude="*" "$types_dir" "$src_path/" "$ts_path"
   find "$ts_path" -name "*.js" -exec sh -c 'mv "$0" "${0%.js}.ts"' {} \;
 }