Merge branch 'main' into issue-555

src/error/index.ts

@@ -1 +1,2 @@
-export { prefixMessage } from './errorModifier'
+export * from './errorModifier'
+export * from './serverTypeError'

src/error/serverTypeError.spec.ts

@@ -0,0 +1,67 @@
+import { ServerTypeError } from './serverTypeError'
+import { ServerType } from '../types'
+
+describe('ServerTypeError', () => {
+  it('should include valid server type', () => {
+    const validServerType = ServerType.Sas9
+    const error = new ServerTypeError([validServerType])
+
+    expect(error).toBeInstanceOf(ServerTypeError)
+    expect(error.name).toEqual('ServerTypeError')
+    expect(error.message).toEqual(
+      `Invalid server type: valid option is ${validServerType}`
+    )
+  })
+
+  it('should include 2 valid server types', () => {
+    const validServerType1 = ServerType.Sas9
+    const validServerType2 = ServerType.SasViya
+    const error = new ServerTypeError([validServerType1, validServerType2])
+
+    expect(error.message).toEqual(
+      `Invalid server type: valid options are ${validServerType1} and ${validServerType2}`
+    )
+  })
+
+  it('should include 3 valid server types', () => {
+    const validServerType1 = ServerType.Sas9
+    const validServerType2 = ServerType.SasViya
+    const validServerType3 = ServerType.Sasjs
+    const error = new ServerTypeError([
+      validServerType1,
+      validServerType2,
+      validServerType3
+    ])
+
+    expect(error.message).toEqual(
+      `Invalid server type: valid options are ${validServerType1}, ${validServerType2} and ${validServerType3}`
+    )
+  })
+
+  it('should include unique server types only', () => {
+    const validServerType1 = ServerType.Sas9
+    const validServerType2 = ServerType.SasViya
+    const validServerType3 = ServerType.Sasjs
+    const validServerType4 = ServerType.Sasjs
+    const error = new ServerTypeError([
+      validServerType1,
+      validServerType2,
+      validServerType3,
+      validServerType4
+    ])
+
+    expect(error.message).toEqual(
+      `Invalid server type: valid options are ${validServerType1}, ${validServerType2} and ${validServerType3}`
+    )
+  })
+
+  it('should include all supported server types if server type was not provided', () => {
+    const error = new ServerTypeError()
+
+    expect(error.message).toEqual(
+      `Invalid server type: valid options are ${ServerType.SasViya}, ${ServerType.Sas9} and ${ServerType.Sasjs}`
+    )
+  })
+
+  // TODO: test if super was called
+})

src/error/serverTypeError.ts

@@ -0,0 +1,25 @@
+import { ServerType } from '../types'
+
+export class ServerTypeError extends Error {
+  constructor(validOptions: ServerType[] = []) {
+    validOptions = [...new Set(validOptions)]
+
+    let options = validOptions.length
+      ? validOptions.join(', ').trim()
+      : [ServerType.SasViya, ServerType.Sas9, ServerType.Sasjs]
+          .join(', ')
+          .trim()
+
+    options = options.replace(/,\s([^,]*)$/, ' and $1')
+
+    super(
+      `Invalid server type: valid option${
+        validOptions.length !== 1 ? 's' : ''
+      } ${validOptions.length !== 1 ? 'are' : 'is'} ${options}`
+    )
+
+    this.name = 'ServerTypeError'
+
+    Object.setPrototypeOf(this, ServerTypeError.prototype)
+  }
+}

src/types/serverType.ts

@@ -1,4 +1,5 @@
 export enum ServerType {
   SasViya = 'SASVIYA',
-  Sas9 = 'SAS9'
+  Sas9 = 'SAS9',
+  Sasjs = 'SASJS'
 }

src/types/target.ts

@@ -305,7 +305,7 @@ export class Target implements TargetJson {
 
     if (this.serverType === ServerType.SasViya) {
       json.contextName = this.contextName
-    } else {
+    } else if (this.serverType === ServerType.Sas9) {
       json.serverName = this.serverName
       json.repositoryName = this.repositoryName
     }

src/types/targetValidators.spec.ts

@@ -88,7 +88,7 @@ describe('validateServerType', () => {
     expect(() =>
       validateServerType('garbage' as unknown as ServerType)
     ).toThrowError(
-      `Invalid server type: Supported values for  \`serverType\` are ${ServerType.SasViya} and ${ServerType.Sas9}.`
+      `Invalid server type: Supported values for  \`serverType\` are ${ServerType.SasViya}, ${ServerType.Sas9} and ${ServerType.Sasjs}.`
     )
   })
 

src/types/targetValidators.ts

@@ -23,9 +23,15 @@ export const validateServerType = (serverType: any): ServerType => {
     )
   }
 
-  if (!(serverType === ServerType.Sas9 || serverType === ServerType.SasViya)) {
+  if (
+    !(
+      serverType === ServerType.Sas9 ||
+      serverType === ServerType.SasViya ||
+      serverType === ServerType.Sasjs
+    )
+  ) {
     throw new Error(
-      `Invalid server type: Supported values for  \`serverType\` are ${ServerType.SasViya} and ${ServerType.Sas9}.`
+      `Invalid server type: Supported values for  \`serverType\` are ${ServerType.SasViya}, ${ServerType.Sas9} and ${ServerType.Sasjs}.`
     )
   }
 

tsconfig.json

@@ -12,7 +12,8 @@
         "declaration": true,
         "outDir": "./build",
         "strict": true,
-        "sourceMap": true
+        "sourceMap": true,
+        "downlevelIteration": true
     },
     "include": [
         "src"