fix: export unregistered formats

Closes #158

sas/package-lock.json

@@ -7,7 +7,7 @@
       "name": "dc-sas",
       "dependencies": {
         "@sasjs/cli": "^4.12.7",
-        "@sasjs/core": "^4.59.0"
+        "@sasjs/core": "^4.59.1"
       }
     },
     "node_modules/@coolaj86/urequest": {
@@ -83,9 +83,9 @@
       "license": "MIT"
     },
     "node_modules/@sasjs/core": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.59.0.tgz",
-      "integrity": "sha512-mv7UU3Nc9J4Q0h+QerN2DkZDIKNwOG6dg+w55hjpl9qyncKqn0YKk3fc9P/P+F8FB9D6VMUFDy3AgAUHXMjZ8A==",
+      "version": "4.59.1",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.59.1.tgz",
+      "integrity": "sha512-52GNI4nIll5YivI8uobWrucE6TkHcTjcbKTr/YPC9eTauC4sh0V0MptebfAJ5E6vE5P2WevNZGr42KdDpckLpg==",
       "license": "MIT"
     },
     "node_modules/@sasjs/lint": {

sas/package.json

@@ -29,6 +29,6 @@
   "private": true,
   "dependencies": {
     "@sasjs/cli": "^4.12.7",
-    "@sasjs/core": "^4.59.0"
+    "@sasjs/core": "^4.59.1"
   }
 }

sas/sasjs/sasjsconfig.json

@@ -94,38 +94,41 @@
     },
     {
       "name": "viya",
-      "serverUrl": "https://sas.4gl.io",
+      "serverUrl": "https://viya-f0g8ht62vq.engage.sas.com",
       "serverType": "SASVIYA",
       "httpsAgentOptions": {
         "allowInsecureRequests": false
       },
       "appLoc": "/Public/app/dcplaceholder",
+      "deployConfig": {
+        "deployServicePack": true,
+        "deployScripts": [
+          "sasjs/utils/viyadeploy.sh"
+        ]
+      },
       "macroFolders": [
         "sasjs/targets/viya/macros_viya"
       ],
       "programFolders": [
         "sasjs/db/datactrl"
       ],
-      "binaryFolders": [],
       "buildConfig": {
         "initProgram": "sasjs/utils/buildinitviya.sas",
         "buildResultsFolder": "sasjsresults",
         "buildOutputFolder": "sasjsbuild",
-        "buildOutputFileName": "viya.sas"
+        "buildOutputFileName": "viya.sas",
+        "termProgram": "",
+        "macroVars": {}
       },
       "serviceConfig": {
-        "initProgram": "sasjs/utils/serviceinitviya.sas",
         "serviceFolders": [
           "sasjs/targets/viya/services_viya/viya_users",
           "sasjs/targets/viya/services_viya/admin",
           "sasjs/targets/viya/services_viya/public"
-        ]
-      },
-      "deployConfig": {
-        "deployServicePack": true,
-        "deployScripts": [
-          "sasjs/utils/viyadeploy.sh"
-        ]
+        ],
+        "initProgram": "sasjs/utils/serviceinitviya.sas",
+        "termProgram": "",
+        "macroVars": {}
       },
       "streamConfig": {
         "streamWeb": true,
@@ -137,54 +140,6 @@
       },
       "contextName": "SAS Job Execution compute context"
     },
-    {
-      "name": "viyacloud",
-      "serverUrl": "https://4gl.viyacloud.sas.com",
-      "serverType": "SASVIYA",
-      "httpsAgentOptions": {
-        "rejectUnauthorized": false,
-        "allowInsecureRequests": true
-      },
-      "appLoc": "/30.SASApps/app/dc",
-      "macroFolders": [
-        "sasjs/targets/viya/macros_viya"
-      ],
-      "programFolders": [
-        "sasjs/db/datactrl"
-      ],
-      "buildConfig": {
-        "initProgram": "sasjs/utils/buildinitviya.sas",
-        "termProgram": "sasjs/utils/buildtermviya.sas",
-        "macroVars": {
-          "dcpath": "/opt/sas/viya/config/var/tmp/dc",
-          "adminGroup": "DataBuilders"
-        },
-        "buildResultsFolder": "sasjsresults",
-        "buildOutputFolder": "sasjsbuild",
-        "buildOutputFileName": "viya.sas"
-      },
-      "serviceConfig": {
-        "initProgram": "sasjs/utils/serviceinitviya.sas",
-        "serviceFolders": [
-          "sasjs/targets/viya/services_viya/viya_users",
-          "sasjs/targets/viya/services_viya/admin",
-          "sasjs/targets/viya/services_viya/public"
-        ],
-        "termProgram": "",
-        "macroVars": {}
-      },
-      "streamConfig": {
-        "streamWeb": true,
-        "streamWebFolder": "webv",
-        "webSourcePath": "../client/dist",
-        "streamServiceName": "clickme",
-        "assetPaths": []
-      },
-      "deployConfig": {
-        "deployServicePack": true
-      },
-      "contextName": "Datacontroller compute context"
-    },
     {
       "name": "vtest",
       "appLoc": "/30.SASApps/app/vtest",

sas/sasjs/services/public/getrawdata.sas

@@ -54,7 +54,10 @@ data _null_;
   /* if a TXTEMPORAL table then filter as such */
   call symputx('txfrom',var_txfrom);
   call symputx('txto',var_txto);
+run;
 
+/* if a format, extract relevant info */
+data _null_;
   ds=symget('ds');
   is_fmt=0;
   if subpad(cats(reverse(ds)),1,3)=:'CF-' then do;

sas/sasjs/services/public/getrawdata.test.sas

@@ -76,3 +76,37 @@ run;
   test=EQUALS 3,
   outds=work.test_results
 )
+
+/* test 3 - when there is a format catalog / nothing else in the library */
+data work.params3;
+  length name $32 value $1000;
+  name='type';value='SAS';output;
+  name='table';value="FMTONLY.DCFMTS-FC";output;
+  name='filter';value='0';output;
+run;
+
+%mx_testservice(&_program,
+  viyacontext=&defaultcontext,
+  inputparams=work.params3,
+  outref=web3,
+  viyaresult=WEBOUT_TXT
+)
+
+data work.results3;
+  infile web3;
+  input;
+  putlog _infile_;
+  if _infile_=:'datalines4;' then do;
+    output;
+    output;
+    output;
+    stop;
+  end;
+  if _n_>100 then stop;
+run;
+
+%mp_assertdsobs(work.results3,
+  desc=datalines file is successfully returned for LONE format catalog,
+  test=EQUALS 3,
+  outds=work.test_results
+)

sas/sasjs/tests/testinit.sas

@@ -21,7 +21,7 @@ REMOVE THAT LAST MACRO
 %let syscc=0;
 %global apploc _program dclib defaultcontext _debug sasjs_mdebug dc_dttmtfmt;
 
-%let defaultcontext=Datacontroller compute context;
+%let defaultcontext=SAS Job Execution compute context;
 %let sasjs_mdebug=0;
 
 options mprint mprintnest nobomfile lrecl=32767;

sas/sasjs/tests/testsetup.sas

@@ -28,7 +28,7 @@
 
 %global apploc _program;
 
-%let defaultcontext=Datacontroller compute context;
+%let defaultcontext=SAS Job Execution compute context;
 
 data _null_;
   length _pgm $1000;
@@ -60,6 +60,9 @@ run;
 %let testloc=%sysfunc(pathname(&DC_LIBREF))/fmt%mf_getuniquefileref();
 %mf_mkdir(&testloc)
 libname dctest "&testloc";
+/* test library with only one format catalog */
+%mf_mkdir(&testloc/fmtonly)
+libname fmtonly "&testloc/fmtonly";
 
 /* add formats */
 PROC FORMAT library=dctest.dcfmts;
@@ -99,6 +102,10 @@ run;
 proc append base=&dc_libref..mpe_tables data=work.append;
 run;
 
+/* lone format catalog */
+proc format cntlin=work.fmts library=fmtonly.dcfmts;
+run;
+
 /* add some other tables */
 %mp_coretable(LOCKTABLE,libds=dctest.locktable)
 %mp_coretable(DIFFTABLE,libds=dctest.difftable)
@@ -130,6 +137,7 @@ options mprint;
     put _infile_;
     if last then do;
       put "libname dctest '&testloc';";
+      put "libname fmtonly '&testloc/fmtonly';";
     end;
   run;
   data _null_;
@@ -151,6 +159,7 @@ options mprint;
     put _infile_;
     if last then do;
       put "libname dctest '&testloc';";
+      put "libname fmtonly '&testloc/fmtonly';";
     end;
   run;
   %ms_deletefile(&root/services/public/settings.sas)
@@ -182,6 +191,7 @@ options mprint;
     put _infile_;
     if last then do;
       put "libname dctest '&testloc';";
+      put "libname fmtonly '&testloc/fmtonly';";
     end;
   run;
   %mm_deletestp(target=&root/services/public/Data_Controller_Settings)