@sasjs/cli 3.17.1 → 3.18.2

package/build/commands/add/internal/input.d.ts

@@ -28,7 +28,7 @@ export declare const getCredentialsInputSas9: (target: Target, scope: TargetScop
     userName: string;
     password: string;
 }>;
-export declare const getDefaultValues: (targetName: string) => {
+export declare const getDefaultValues: (targetName: string, serverType?: string | undefined) => {
     client: string;
     secret: string;
 };

package/build/commands/add/internal/input.js

@@ -363,7 +363,7 @@ var getCredentialsInputSasjs = function (target) { return __awaiter(void 0, void
     var client;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, input_1.getString)('Please enter your Client ID: ', function (v) { return !!v || 'Client ID is required.'; }, (0, exports.getDefaultValues)(target.name).client)];
+            case 0: return [4 /*yield*/, (0, input_1.getString)('Please enter your Client ID: ', function (v) { return !!v || 'Client ID is required.'; }, (0, exports.getDefaultValues)(target.name, types_1.ServerType.Sasjs).client)];
             case 1:
                 client = _a.sent();
                 return [2 /*return*/, { client: client }];
@@ -411,7 +411,7 @@ var getCredentialsInputSas9 = function (target, scope) { return __awaiter(void 0
     });
 }); };
 exports.getCredentialsInputSas9 = getCredentialsInputSas9;
-var getDefaultValues = function (targetName) {
+var getDefaultValues = function (targetName, serverType) {
     dotenv_1.default.config({ path: path_1.default.join(process.projectDir, ".env.".concat(targetName)) });
     var defaultClient = process.env.CLIENT === 'undefined' ||
         process.env.CLIENT === 'null' ||
@@ -423,6 +423,8 @@ var getDefaultValues = function (targetName) {
         !process.env.SECRET
         ? ''
         : process.env.SECRET;
+    if (serverType === types_1.ServerType.Sasjs && defaultClient === '')
+        defaultClient = 'clientID1';
     return { client: defaultClient, secret: defaultSecret };
 };
 exports.getDefaultValues = getDefaultValues;

package/build/commands/compile/internal/compileFile.js

@@ -122,10 +122,11 @@ function getPreCodeForServicePack(serverType) {
                             '/* so we provide instead as __program */\n' +
                             '%global __program _program;\n' +
                             '%let _program=%sysfunc(coalescec(&__program,&_program));\n' +
-                            '%macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO);\n' +
+                            '%macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO,maxobs=MAX);\n' +
                             '  %mv_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n' +
                             '    ,missing=&missing\n' +
                             '    ,showmeta=&showmeta\n' +
+                            '    ,maxobs=&maxobs\n' +
                             '  )' +
                             '%mend;\n';
                     return [3 /*break*/, 14];
@@ -143,10 +144,11 @@ function getPreCodeForServicePack(serverType) {
                 case 8:
                     content = _g + _l.sent();
                     content +=
-                        '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO);\n' +
+                        '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO,maxobs=MAX);\n' +
                             '    %mm_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n' +
                             '      ,missing=&missing\n' +
                             '      ,showmeta=&showmeta\n' +
+                            '      ,maxobs=&maxobs\n' +
                             '    )' +
                             '  %mend;\n';
                     return [3 /*break*/, 14];
@@ -164,10 +166,11 @@ function getPreCodeForServicePack(serverType) {
                 case 12:
                     content = _k + _l.sent();
                     content +=
-                        '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO);\n' +
+                        '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO,maxobs=MAX);\n' +
                             '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n' +
                             '      ,missing=&missing\n' +
                             '      ,showmeta=&showmeta\n' +
+                            '      ,maxobs=&maxobs\n' +
                             '    )' +
                             '  %mend;\n';
                     return [3 /*break*/, 14];

package/build/commands/compile/internal/spec/compileTestFile.spec.js

@@ -131,7 +131,7 @@ describe('compileTestFile', function () {
                                         testVar = replaceLineBreaks("* Test Variables start;\n\n%let ".concat(Object.keys(target.testConfig.macroVars)[0], "=").concat(Object.values(target.testConfig.macroVars)[0], ";\n\n* Test Variables end;"));
                                         testInit = replaceLineBreaks("* TestInit start;\n\n\n%put testing, init;\n* TestInit end;");
                                         testTerm = replaceLineBreaks("* TestTerm start;\n\n\n%put testing, termed;\n* TestTerm end;");
-                                        mvWebout = "%macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y,stream=Y,missing=NULL<br>  ,showmeta=N";
+                                        mvWebout = "%macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=N,stream=Y,missing=NULL";
                                         expect(testFileContent.indexOf(testVar)).toBeGreaterThan(-1);
                                         expect(testFileContent.indexOf(testInit)).toBeGreaterThan(-1);
                                         expect(testFileContent.indexOf(testTerm)).toBeGreaterThan(-1);

package/build/commands/deploy/spec/cbd.spec.js

@@ -128,10 +128,11 @@ describe('sasjs cbd with server type SASJS', function () {
                     return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/server/ms_webout.sas"))];
                 case 8:
                     ms_webout = _b.sent();
-                    webout = '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO);\n' +
+                    webout = '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO,maxobs=MAX);\n' +
                         '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n' +
                         '      ,missing=&missing\n' +
                         '      ,showmeta=&showmeta\n' +
+                        '      ,maxobs=&maxobs\n' +
                         '    )' +
                         '  %mend;\n';
                     mocksPath = path_1.default.join(__dirname, appName, 'sasjs', 'mocks');

package/package.json

@@ -48,9 +48,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.10.10",
-    "@sasjs/core": "4.32.2",
-    "@sasjs/lint": "1.11.2",
+    "@sasjs/adapter": "3.10.11",
+    "@sasjs/core": "4.35.3",
+    "@sasjs/lint": "1.12.0",
     "@sasjs/utils": "2.47.0",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
@@ -89,7 +89,7 @@
     "jest": "27.4.7",
     "jest-cli": "27.4.7",
     "jest-extended": "1.1.0",
-    "nodemon": "2.0.15",
+    "nodemon": "2.0.19",
     "prettier": "2.6.2",
     "ts-jest": "27.1.2",
     "ts-node": "10.4.0",
@@ -97,5 +97,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.17.1"
+  "version": "3.18.2"
 }