sn-typescript-util 1.2.1 → 1.2.3

package/bin/snts.js

@@ -21,6 +21,25 @@ async function doCompile() {
         return stdout;
     });
 }
+function doOptions(program) {
+    program.parse(process.argv).opts();
+    const option = Object.keys(program.opts()).toString();
+    const options = {
+        build: () => {
+            doBuild();
+        },
+        compile: () => {
+            doCompile();
+        },
+        sync: () => {
+            doSync();
+        },
+        default: () => {
+            program.help();
+        }
+    };
+    return ((hasApplication() && options[option]) || options['default'])();
+}
 async function doSync() {
     const s = startPrompts('Processing', 'Sync started');
     return await execFile(getFilePath('sync.sh'), (stdout) => {
@@ -31,7 +50,7 @@ async function doSync() {
 function getBuildName() {
     const defaultBuild = 'utah';
     try {
-        const workspace = getWorkspaceFile();
+        const workspace = getWorkspace();
         const app = workspace.ACTIVE_APPLICATION;
         const build = workspace.ALL_APPLICATIONS[app].BUILD_NAME;
         return Object.entries(build).length !== 0
@@ -48,40 +67,21 @@ function getErrorMsg() {
     return console.error(bold(red(msg)));
 }
 function getFilePath(file, dir = 'scripts') {
-    const __filename = fileURLToPath(import.meta.url);
-    const __dirname = path.dirname(__filename);
-    return `${path.join(__dirname, `../${dir}`)}/${file}`;
-}
-function getOption(program) {
-    program.parse(process.argv).opts();
-    const option = Object.keys(program.opts()).toString();
-    const options = {
-        build: () => {
-            doBuild();
-        },
-        compile: () => {
-            doCompile();
-        },
-        sync: () => {
-            doSync();
-        },
-        default: () => {
-            program.help();
-        }
-    };
-    return (options[option] || options['default'])();
+    const fileName = fileURLToPath(import.meta.url);
+    const dirName = path.dirname(fileName);
+    return `${path.join(dirName, `../${dir}`)}/${file}`;
 }
 async function getPackageInfo() {
     return JSON.parse(readFileSync(getFilePath('package.json', '.')).toString());
 }
-function getWorkspaceFile() {
-    return JSON.parse(readFileSync('./system/sn-workspace.json').toString())
-        .ACTIVE_APPLICATION;
+function getWorkspace() {
+    return JSON.parse(readFileSync('./system/sn-workspace.json').toString());
 }
 async function hasApplication() {
     try {
-        const workspace = await getWorkspaceFile();
-        return Object.entries(workspace).length === 0 ? getErrorMsg() : true;
+        const workspace = await getWorkspace();
+        var app = workspace.ACTIVE_APPLICATION;
+        return Object.entries(app).length === 0 ? getErrorMsg() : true;
     }
     catch (e) {
         getErrorMsg();
@@ -99,7 +99,7 @@ async function init() {
     program.option('-b, --build', 'build project utility files & package dependencies');
     program.option('-c, --compile', 'compile TypeScript files to JavaScript & move to src');
     program.option('-s, --sync', 'sync new instance-based src files to the ts directory');
-    return hasApplication() && getOption(program);
+    return doOptions(program);
 }
 function introPrompt(msg) {
     return intro(msg);
@@ -113,7 +113,9 @@ async function runInstall() {
     });
 }
 async function runSync() {
+    const s = startPrompts('Syncing', null);
     return await execFile(getFilePath('sync.sh'), (stdout) => {
+        stopPrompt(s, 'Sync completed');
         runInstall();
         return stdout;
     });

package/package.json

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

package/src/snts.ts

@@ -7,6 +7,7 @@ import { readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { bold, red } from 'colorette';
 import { intro, outro, spinner } from '@clack/prompts';
+import { Workspace } from './workspace.js';
 
 async function doBuild() {
   const s = startPrompts('Installing configs', 'Build started');
@@ -25,6 +26,26 @@ async function doCompile() {
   });
 }
 
+function doOptions(program: any) {
+  program.parse(process.argv).opts();
+  const option = Object.keys(program.opts()).toString();
+  const options = {
+    build: () => {
+      doBuild();
+    },
+    compile: () => {
+      doCompile();
+    },
+    sync: () => {
+      doSync();
+    },
+    default: () => {
+      program.help();
+    }
+  };
+  return ((hasApplication() && options[option]) || options['default'])();
+}
+
 async function doSync() {
   const s = startPrompts('Processing', 'Sync started');
   return await execFile(getFilePath('sync.sh'), (stdout: any) => {
@@ -36,7 +57,7 @@ async function doSync() {
 function getBuildName() {
   const defaultBuild: string = 'utah';
   try {
-    const workspace = getWorkspaceFile();
+    const workspace: Workspace = getWorkspace();
     const app: string = workspace.ACTIVE_APPLICATION;
     const build: string = workspace.ALL_APPLICATIONS[app].BUILD_NAME;
     return Object.entries(build).length !== 0
@@ -54,44 +75,24 @@ function getErrorMsg() {
 }
 
 function getFilePath(file: string, dir: string = 'scripts') {
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = path.dirname(__filename);
-  return `${path.join(__dirname, `../${dir}`)}/${file}`;
-}
-
-function getOption(program: any) {
-  program.parse(process.argv).opts();
-  const option = Object.keys(program.opts()).toString();
-  const options = {
-    build: () => {
-      doBuild();
-    },
-    compile: () => {
-      doCompile();
-    },
-    sync: () => {
-      doSync();
-    },
-    default: () => {
-      program.help();
-    }
-  };
-  return (options[option] || options['default'])();
+  const fileName = fileURLToPath(import.meta.url);
+  const dirName = path.dirname(fileName);
+  return `${path.join(dirName, `../${dir}`)}/${file}`;
 }
 
 async function getPackageInfo() {
   return JSON.parse(readFileSync(getFilePath('package.json', '.')).toString());
 }
 
-function getWorkspaceFile() {
-  return JSON.parse(readFileSync('./system/sn-workspace.json').toString())
-    .ACTIVE_APPLICATION;
+function getWorkspace() {
+  return JSON.parse(readFileSync('./system/sn-workspace.json').toString());
 }
 
 async function hasApplication() {
   try {
-    const workspace = await getWorkspaceFile();
-    return Object.entries(workspace).length === 0 ? getErrorMsg() : true;
+    const workspace: Workspace = await getWorkspace();
+    var app: string = workspace.ACTIVE_APPLICATION;
+    return Object.entries(app).length === 0 ? getErrorMsg() : true;
   } catch (e) {
     getErrorMsg();
     return process.exit(1);
@@ -119,7 +120,7 @@ async function init() {
     '-s, --sync',
     'sync new instance-based src files to the ts directory'
   );
-  return hasApplication() && getOption(program);
+  return doOptions(program);
 }
 
 function introPrompt(msg: string) {
@@ -136,7 +137,9 @@ async function runInstall() {
 }
 
 async function runSync() {
+  const s = startPrompts('Syncing', null);
   return await execFile(getFilePath('sync.sh'), (stdout) => {
+    stopPrompt(s, 'Sync completed');
     runInstall();
     return stdout;
   });

package/src/workspace.ts

@@ -0,0 +1,4 @@
+export interface Workspace {
+  readonly ACTIVE_APPLICATION: string;
+  readonly ALL_APPLICATIONS: string;
+}

package/tsconfig.json

@@ -5,7 +5,6 @@
     "esModuleInterop": true,
     "outDir": "bin",
     "resolveJsonModule": true,
-    "rootDir": "src",
     "skipLibCheck": true
   },
   "include": ["src"]