Merge pull request #801 from sasjs/issue-680

ErrorBody interface made public

sasjs-tests/.gitignore

@@ -21,3 +21,6 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+sasjsbuild
+sasjsresults

sasjs-tests/.sasjslint

@@ -0,0 +1,19 @@
+{
+  "lineEndings": "off",
+  "noTrailingSpaces": true,
+  "noEncodedPasswords": true,
+  "hasDoxygenHeader": true,
+  "noSpacesInFileNames": true,
+  "lowerCaseFileNames": true,
+  "maxLineLength": 80,
+  "maxHeaderLineLength": 80,
+  "maxDataLineLength": 80,
+  "noTabIndentation": true,
+  "indentationMultiple": 2,
+  "hasMacroNameInMend": true,
+  "noNestedMacros": true,
+  "hasMacroParentheses": true,
+  "strictMacroDefinition": true,
+  "noGremlins": true,
+  "defaultHeader": "/**{lineEnding}  @file{lineEnding}  @brief <Your brief here>{lineEnding}  <h4> SAS Macros </h4>{lineEnding}**/"
+}

sasjs-tests/README.md

@@ -65,6 +65,7 @@ The code below will work on ALL SAS platforms (Viya, SAS 9 EBI, SASjs Server).
 ```sas
 filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
 %inc mc;
+%let apploc=/Public/app/adapter-tests;
 filename ft15f001 temp lrecl=1000;
 parmcards4;
   %webout(FETCH)
@@ -80,7 +81,7 @@ parmcards4;
   %mend; %x()
   %webout(CLOSE)
 ;;;;
-%mx_createwebservice(path=/Public/app/common,name=sendObj)
+%mx_createwebservice(path=&apploc/services/common,name=sendObj)
 parmcards4;
   %webout(FETCH)
   %webout(OPEN)
@@ -95,7 +96,7 @@ parmcards4;
   %mend; %x()
   %webout(CLOSE)
 ;;;;
-%mx_createwebservice(path=/Public/app/common,name=sendArr)
+%mx_createwebservice(path=&apploc/services/common,name=sendArr)
 parmcards4;
   data work.macvars;
     set sashelp.vmacro;
@@ -104,14 +105,14 @@ parmcards4;
   %webout(OBJ,macvars) 
   %webout(CLOSE)
 ;;;;
-%mx_createwebservice(path=/Public/app/common,name=sendMacVars)
+%mx_createwebservice(path=&apploc/services/common,name=sendMacVars)
 parmcards4;
 If you can keep your head when all about you
     Are losing theirs and blaming it on you,
 If you can trust yourself when all men doubt you,
     But make allowance for their doubting too;
 ;;;;
-%mx_createwebservice(path=/Public/app/common,name=makeErr)
+%mx_createwebservice(path=&apploc/services/common,name=makeErr)
 parmcards4;
 %webout(OPEN)
 data _null_;
@@ -120,7 +121,7 @@ data _null_;
  run;
 %webout(CLOSE)
 ;;;;
-%mx_createwebservice(path=/Public/app/common,name=invalidJSON)
+%mx_createwebservice(path=&apploc/services/common,name=invalidJSON)
 ```
 
 You should now be able to access the tests in your browser at the deployed path on your server.

sasjs-tests/package.json

@@ -45,4 +45,4 @@
   "devDependencies": {
     "node-sass": "7.0.3"
   }
-}
+}

sasjs-tests/public/config.json

@@ -3,10 +3,10 @@
   "password": "",
   "sasJsConfig": {
     "serverUrl": "",
-    "appLoc": "/Public/app",
-    "serverType": "SASVIYA",
+    "appLoc": "/Public/app/adapter-tests",
+    "serverType": "SASJS",
     "debug": false,
     "contextName": "sasjs adapter compute context",
     "useComputeApi": true
   }
-}
+}

sasjs-tests/sasjs/common/invalidJSON.sas

@@ -0,0 +1,13 @@
+/**
+  @file
+  @brief Makes an invalid JSON file
+
+  <h4> SAS Macros </h4>
+**/
+
+%webout(OPEN)
+data _null_;
+  file _webout;
+  put ' the discovery channel ';
+run;
+%webout(CLOSE)

sasjs-tests/sasjs/common/makeErr.sas

@@ -0,0 +1,11 @@
+/**
+  @file
+  @brief Makes an error
+
+  <h4> SAS Macros </h4>
+**/
+
+If you can keep your head when all about you
+    Are losing theirs and blaming it on you,
+If you can trust yourself when all men doubt you,
+    But make allowance for their doubting too;

sasjs-tests/sasjs/common/sendArr.sas

@@ -0,0 +1,21 @@
+/**
+  @file
+  @brief Returns JSON in Array format
+
+  <h4> SAS Macros </h4>
+**/
+
+%webout(FETCH)
+%webout(OPEN)
+%macro x();
+  %if %symexist(sasjs_tables) %then
+  %do i=1 %to %sysfunc(countw(&sasjs_tables));
+    %let table=%scan(&sasjs_tables,&i);
+    %webout(ARR,&table,missing=STRING,showmeta=YES)
+  %end;
+  %else %do i=1 %to &_webin_file_count;
+    %webout(ARR,&&_webin_name&i,missing=STRING,showmeta=YES)
+  %end;
+%mend x;
+%x()
+%webout(CLOSE)

sasjs-tests/sasjs/common/sendMacVars.sas

@@ -0,0 +1,13 @@
+/**
+  @file
+  @brief Returns Macro Variables
+
+  <h4> SAS Macros </h4>
+**/
+
+data work.macvars;
+  set sashelp.vmacro;
+run;
+%webout(OPEN)
+%webout(OBJ,macvars)
+%webout(CLOSE)

sasjs-tests/sasjs/common/sendObj.sas

@@ -0,0 +1,21 @@
+/**
+  @file
+  @brief Returns JSON in Object format
+
+  <h4> SAS Macros </h4>
+**/
+
+%webout(FETCH)
+%webout(OPEN)
+%macro x();
+  %if %symexist(sasjs_tables) %then
+  %do i=1 %to %sysfunc(countw(&sasjs_tables));
+    %let table=%scan(&sasjs_tables,&i);
+    %webout(OBJ,&table,missing=STRING,showmeta=YES)
+  %end;
+  %else %do i=1 %to &_webin_file_count;
+    %webout(OBJ,&&_webin_name&i,missing=STRING,showmeta=YES)
+  %end;
+%mend x;
+%x()
+%webout(CLOSE)

sasjs-tests/sasjs/doxy/Doxyfile

@@ -0,0 +1,40 @@
+ALPHABETICAL_INDEX     = NO
+
+ENABLE_PREPROCESSING   = NO
+EXTENSION_MAPPING      = sas=Java ddl=Java
+EXTRACT_LOCAL_CLASSES  = NO
+FILE_PATTERNS          = *.sas \
+                         *.ddl \
+                         *.dox
+GENERATE_LATEX         = NO
+GENERATE_TREEVIEW      = YES
+HIDE_FRIEND_COMPOUNDS  = YES
+HIDE_IN_BODY_DOCS      = YES
+HIDE_SCOPE_NAMES       = YES
+HIDE_UNDOC_CLASSES     = YES
+HIDE_UNDOC_MEMBERS     = YES
+HTML_OUTPUT            = $(DOXY_HTML_OUTPUT)
+HTML_HEADER            = $(HTML_HEADER)
+HTML_EXTRA_FILES       = $(HTML_EXTRA_FILES)
+HTML_FOOTER            = $(HTML_FOOTER)
+HTML_EXTRA_STYLESHEET  = $(HTML_EXTRA_STYLESHEET)
+INHERIT_DOCS           = NO
+INLINE_INFO            = NO
+INPUT                  = $(DOXY_INPUT)
+LAYOUT_FILE            = $(LAYOUT_FILE)
+USE_MDFILE_AS_MAINPAGE = README.md
+MAX_INITIALIZER_LINES  = 0
+PROJECT_NAME           = $(PROJECT_NAME)
+PROJECT_LOGO           = $(PROJECT_LOGO)
+PROJECT_BRIEF          = $(PROJECT_BRIEF)
+RECURSIVE              = YES
+REPEAT_BRIEF           = NO
+SHOW_NAMESPACES        = NO
+SHOW_USED_FILES        = NO
+SOURCE_BROWSER         = YES
+SOURCE_TOOLTIPS        = NO
+STRICT_PROTO_MATCHING  = YES
+STRIP_CODE_COMMENTS    = NO
+SUBGROUPING            = NO
+TAB_SIZE               = 2
+VERBATIM_HEADERS       = NO

sasjs-tests/sasjs/doxy/DoxygenLayout.xml

@@ -0,0 +1,112 @@
+<doxygenlayout version="1.0">
+  <!-- Generated by doxygen 1.8.14 -->
+  <!-- Navigation index tabs for HTML output -->
+  <navindex>
+    <tab type="mainpage" visible="yes" title="Home"/>
+    <tab type="pages" visible="no" title="" intro=""/>
+    <tab type="modules" visible="no" title="" intro=""/>
+    <tab type="namespaces" visible="no" title="">
+      <tab type="namespacelist" visible="no" title="" intro=""/>
+      <tab type="namespacemembers" visible="no" title="" intro=""/>
+    </tab>
+    <tab type="classes" visible="no" title="">
+      <tab type="classlist" visible="no" title="" intro=""/>
+      <tab type="classindex" visible="no" title=""/>
+      <tab type="hierarchy" visible="no" title="" intro=""/>
+      <tab type="classmembers" visible="no" title="" intro=""/>
+    </tab>
+
+    <tab type="filelist" visible="yes" title="" intro="List of Files"/>
+
+    <tab type="examples" visible="no" title="" intro=""/>
+    <tab type="user" url="data_lineage.svg" title="Lineage"/>
+  </navindex>
+
+
+  <!-- Layout definition for a file page -->
+  <file>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includegraph visible="$INCLUDE_GRAPH"/>
+    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
+    <sourcelink visible="yes"/>
+    <memberdecl>
+      <classes visible="no" title=""/>
+      <namespaces visible="no" title=""/>
+      <constantgroups visible="no" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="no"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection/>
+  </file>
+
+  <!-- Layout definition for a group page -->
+  <group>
+    <briefdescription visible="no"/>
+    <groupgraph visible="$GROUP_GRAPHS"/>
+    <memberdecl>
+      <nestedgroups visible="no" title=""/>
+      <dirs visible="yes" title=""/>
+      <files visible="yes" title=""/>
+      <namespaces visible="no" title=""/>
+      <classes visible="no" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <pagedocs/>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </group>
+
+  <!-- Layout definition for a directory page -->
+  <directory>
+    <briefdescription visible="yes"/>
+    <detaileddescription visible="yes" title=""/>
+    <directorygraph visible="yes"/>
+    <memberdecl>
+      <dirs visible="yes"/>
+      <files visible="yes"/>
+    </memberdecl>
+  </directory>
+</doxygenlayout>

sasjs-tests/sasjs/doxy/new_footer.html

@@ -0,0 +1,33 @@
+<!-- HTML footer for doxygen 1.8.17-->
+<!-- start footer part -->
+<!--BEGIN GENERATE_TREEVIEW-->
+<div id="nav-path" class="navpath">
+  <!-- id is needed for treeview function! -->
+  <ul>
+    $navpath
+    <li class="footer">
+      $generatedby
+      <a href="https://www.doxygen.org/index.html">
+        <img class="footer" src="$relpath^doxygen.svg" alt="doxygen"
+      /></a>
+      $doxygenversion
+    </li>
+    <li>
+      <i> For more information visit the </i>
+      <a href="https://cli.sasjs.io">SASjs cli</a> documentation.
+    </li>
+  </ul>
+</div>
+<!--END GENERATE_TREEVIEW-->
+<!--BEGIN !GENERATE_TREEVIEW-->
+<hr class="footer" />
+<address class="footer">
+  <small>
+    $generatedby &#160;<a href="http://www.doxygen.org/index.html">
+      <img class="footer" src="$relpath^doxygen.svg" alt="doxygen" />
+    </a>
+    $doxygenversion
+  </small>
+</address>
+
+<!--END !GENERATE_TREEVIEW-->

sasjs-tests/sasjs/doxy/new_header.html

@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- HTML header for doxygen 1.8.17-->
+<html xmlns="https://www.w3.org/1999/xhtml" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=9" />
+    <meta name="generator" content="Doxygen $doxygenversion" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <!--BEGIN PROJECT_NAME-->
+    <title>$projectname: $title</title>
+    <meta name="description" content="$projectbrief" />
+    <!--END PROJECT_NAME-->
+    <!--BEGIN !PROJECT_NAME-->
+    <title>$title</title>
+    <!--END !PROJECT_NAME-->
+    <link href="$relpath^tabs.css" rel="stylesheet" type="text/css" />
+    <script type="text/javascript" src="$relpath^jquery.js"></script>
+    <script type="text/javascript" src="$relpath^dynsections.js"></script>
+    $treeview $search $mathjax
+    <link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" href="$relpath^favicon.ico" type="image/x-icon" />
+    $extrastylesheet
+  </head>
+  <body>
+    <div id="top">
+      <!-- do not remove this div, it is closed by doxygen! -->
+
+      <!--BEGIN TITLEAREA-->
+      <div id="titlearea">
+        <table cellspacing="0" cellpadding="0">
+          <tbody>
+            <tr style="height: 56px">
+              <!--BEGIN PROJECT_LOGO-->
+              <td id="projectlogo">
+                <a href="$relpath^"
+                  ><img alt="Logo" src="$relpath^$projectlogo"
+                /></a>
+              </td>
+              <!--END PROJECT_LOGO-->
+              <td id="projectalign" style="padding-left: 0.5em">
+                <div id="projectname">$projectname</div>
+                <div id="projectbrief">$projectbrief</div>
+              </td>
+              <!--BEGIN DISABLE_INDEX-->
+              <!--BEGIN SEARCHENGINE-->
+              <td>$searchbox</td>
+              <!--END SEARCHENGINE-->
+              <!--END DISABLE_INDEX-->
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <!--END TITLEAREA-->
+      <!-- end header part -->
+    </div>
+  </body>
+</html>

sasjs-tests/sasjs/doxy/new_stylesheet.css

@@ -0,0 +1,4 @@
+#projectlogo img {
+  border: 0px none;
+  max-height: 70px;
+}

sasjs-tests/sasjs/sasjsconfig.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://cli.sasjs.io/sasjsconfig-schema.json",
+  "serviceConfig": {
+    "serviceFolders": [
+      "sasjs/common"
+    ]
+  },
+  "defaultTarget": "4gl",
+  "targets": [
+    {
+      "name": "4gl",
+      "serverType": "SASJS",
+      "serverUrl": "https://sas9.4gl.io",
+      "appLoc": "/Public/app/adapter-tests"
+    }
+  ]
+}

sasjs-tests/src/testSuites/Compute.ts

@@ -48,7 +48,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
       test: () => {
         const data: any = { table1: [{ col1: 'first col value' }] }
         return adapter.startComputeJob(
-          '/Public/app/common/sendArr',
+          '/Public/app/adapter-tests/services/common/sendArr',
           data,
           {},
           undefined,

src/types/errors/ErrorResponse.ts

@@ -21,8 +21,8 @@ export class ErrorResponse {
   }
 }
 
-interface ErrorBody {
+export interface ErrorBody {
   message: string
-  details: string
+  details: any
   raw: any
 }