sn-typescript-util 1.3.13 → 1.3.14

package/.eslintignore

@@ -1 +1,2 @@
 node_modules
+tmp

package/.eslintrc.yml

@@ -1,4 +1,3 @@
-
 extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended']
 parser: '@typescript-eslint/parser'
 plugins: ['@typescript-eslint']

package/README.md

@@ -54,14 +54,10 @@ In the application directory created by the ServiceNow Extension for VS Code, th
 
 ## Basic Workflow
 
-After installation & setup, simply run the `watch` script to start looking for TypeScript code changes in the `ts` directory.
+After installation & setup, simply run the TypeScript compiler `--watch` command to start looking for TypeScript code changes in the `ts` directory.
 
 ```bash
-npm run watch
-
-# or
-
-yarn watch
+tsc --watch
 ```
 
 Any JavaScript ES2015 (ES6) code added will get converted down to ES5 and moved to the `src` directory. Then changes are ready to sync with the target instance using the ServiceNow Extension for VS Code.

package/bin/snts.js

@@ -24,10 +24,10 @@ async function doCompile() {
     }
   );
 }
-function doOptions(program, version) {
+function doOptions(program) {
   const options = parseOptions(program);
   const optionKey = options;
-  return handleOptions(program, getOptions(program), optionKey, version);
+  return handleOptions(program, getOptions(program), optionKey);
 }
 async function doSync() {
   const s = startPrompts('Processing', 'Sync started');
@@ -95,6 +95,10 @@ function getOptions(program) {
 async function getPackageInfo() {
   return JSON.parse(readFileSync(getFilePath('package.json', '.')).toString());
 }
+async function getVersion() {
+  const info = await getPackageInfo();
+  return info.version;
+}
 function getWorkspace() {
   return JSON.parse(readFileSync('./system/sn-workspace.json').toString());
 }
@@ -102,8 +106,9 @@ function handleError() {
   getErrorMsg();
   return process.exit(1);
 }
-function handleOptions(program, options, option, version) {
+async function handleOptions(program, options, option) {
   if (option === 'help' || !option) {
+    const version = await getVersion();
     console.log(getDescription(version));
     showHelp(program);
   }
@@ -126,16 +131,15 @@ async function hasApplication() {
 })();
 async function init() {
   const program = new Command();
-  const info = await getPackageInfo();
   const constants = getConstants();
-  const version = info.version;
+  const version = await getVersion();
   program.option('-b, --build', constants.buildOption);
   program.option('-c, --compile', constants.compileOption);
   program.option('-h, --help', constants.helpOption);
   program.option('-s, --sync', constants.syncOption);
   program.version(version, '-v, --version', constants.versionOption);
   program.usage(cyan('[options]'));
-  return doOptions(program, version);
+  return doOptions(program);
 }
 function introPrompt(msg) {
   return intro(msg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sn-typescript-util",
-  "version": "1.3.13",
+  "version": "1.3.14",
   "description": "A TypeScript utility for ServiceNow developers using VS Code",
   "bin": {
     "snts": "bin/snts.js"
@@ -19,7 +19,7 @@
   "scripts": {
     "format": "prettier --write ./bin/*.js ./scripts/*.ts",
     "lint": "eslint .",
-    "release": "./scripts/utils/release.sh",
+    "release": "bun ./scripts/utils/release.ts",
     "watch": "tsc --watch"
   },
   "type": "module",
@@ -28,7 +28,6 @@
     "@types/servicenow": "^10.0.4",
     "colorette": "^2.0.20",
     "commander": "^11.1.0",
-    "npm-add-script": "^1.1.0",
     "typescript": "^5.3.3"
   },
   "devDependencies": {

package/scripts/snts.ts

@@ -33,10 +33,10 @@ async function doCompile() {
   );
 }
 
-function doOptions(program: Command, version: string) {
+function doOptions(program: Command) {
   const options = parseOptions(program);
   const optionKey = options as keyof Options;
-  return handleOptions(program, getOptions(program), optionKey, version);
+  return handleOptions(program, getOptions(program), optionKey);
 }
 
 async function doSync() {
@@ -108,6 +108,11 @@ async function getPackageInfo() {
   return JSON.parse(readFileSync(getFilePath('package.json', '.')).toString());
 }
 
+async function getVersion() {
+  const info = await getPackageInfo();
+  return info.version;
+}
+
 function getWorkspace() {
   return JSON.parse(readFileSync('./system/sn-workspace.json').toString());
 }
@@ -117,13 +122,13 @@ function handleError() {
   return process.exit(1);
 }
 
-function handleOptions(
+async function handleOptions(
   program: Command,
   options: Options,
-  option: keyof Options,
-  version: string
+  option: keyof Options
 ) {
   if (option === 'help' || !option) {
+    const version = await getVersion();
     console.log(getDescription(version));
     showHelp(program);
   }
@@ -149,16 +154,15 @@ async function hasApplication() {
 
 async function init() {
   const program = new Command();
-  const info = await getPackageInfo();
   const constants = getConstants();
-  const version = info.version;
+  const version = await getVersion();
   program.option('-b, --build', constants.buildOption);
   program.option('-c, --compile', constants.compileOption);
   program.option('-h, --help', constants.helpOption);
   program.option('-s, --sync', constants.syncOption);
   program.version(version, '-v, --version', constants.versionOption);
   program.usage(cyan('[options]'));
-  return doOptions(program, version);
+  return doOptions(program);
 }
 
 function introPrompt(msg: string) {

package/scripts/types/version.ts

@@ -0,0 +1,6 @@
+type VersionType = 'patch' | 'minor' | 'major';
+
+export interface Version {
+  value: VersionType;
+  label: Capitalize<VersionType>;
+}

package/scripts/utils/release.ts

@@ -0,0 +1,80 @@
+import { $ } from 'execa';
+import path from 'path';
+import { readFileSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { cancel, confirm, intro, outro, select, spinner } from '@clack/prompts';
+import { Version } from './../types/version.js';
+
+async function bumpVersion(releaseType) {
+  return await $`npm version ${releaseType} --no-git-tag-version`;
+}
+
+async function confirmVersion(version: string) {
+  return await confirm({
+    message: `Bump to ${version}?`
+  });
+}
+
+async function doGitOperation(version: string) {
+  const msg = 'chore: bump the version';
+  await $`git commit -a -m ${msg}`;
+  await $`git tag ${version}`;
+  await $`git push`;
+  await $`git push origin ${version}`;
+}
+
+async function doOperation(shouldContinue, version: string) {
+  if (shouldContinue) {
+    const s = spinner();
+    s.start('Start release');
+    await doGitOperation(version);
+    await doPublish();
+    s.stop('Done.');
+    outro("You're all set!");
+  } else {
+    cancel('Operation cancelled.');
+    await $`git checkout package.json`;
+  }
+}
+
+async function doPublish() {
+  return await $`npm publish`;
+}
+
+function getFilePath(file: string, dir: string) {
+  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());
+}
+
+async function getReleaseTypes() {
+  return select({
+    message: 'Please pick a release type.',
+    options: getOptions()
+  });
+}
+
+function getOptions(): Version[] {
+  return [
+    { value: 'patch', label: 'Patch' },
+    { value: 'minor', label: 'Minor' },
+    { value: 'major', label: 'Major' }
+  ];
+}
+
+async function getVersion() {
+  const file = await getPackageInfo();
+  return file.version;
+}
+
+(async function init() {
+  intro('Release Utils');
+  const releaseType = await getReleaseTypes();
+  const version = (await bumpVersion(releaseType)) && (await getVersion());
+  const shouldContinue = await confirmVersion(version);
+  return await doOperation(shouldContinue, version);
+})();

package/scripts/utils/release.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-bump_version() {
-  version=$(npm version "$1" --no-git-tag-version)
-  echo "version bumped to $version"
-  do_git_operation
-}
-
-do_git_operation() {
-  git commit -a -m "chore: bump the version"
-  git tag $(get_package_version)
-  git push
-  git push origin $(get_package_version)
-}
-
-get_package_version() {
-  version=`node -p "require('./package.json').version"`
-  echo "v$version"
-}
-
-bump_version "$1"