@sasjs/utils 4.0.1 → 4.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -19,4 +19,4 @@ export declare class CompileTree {
19
19
  private validateDependency;
20
20
  private getFileName;
21
21
  }
22
- export declare const removeHeader: (content: string) => string;
22
+ export declare const removeHeader: (content: string, filePath?: string | undefined) => string;
@@ -16,6 +16,7 @@ exports.removeHeader = exports.CompileTree = void 0;
16
16
  const path_1 = __importDefault(require("path"));
17
17
  const __1 = require("../");
18
18
  const sasjsCli_1 = require("../sasjsCli");
19
+ const doxygenHeader_1 = require("./doxygenHeader");
19
20
  class CompileTree {
20
21
  constructor(treePath, tree = {}) {
21
22
  this._treePath = treePath;
@@ -32,7 +33,7 @@ class CompileTree {
32
33
  // Adds leaf
33
34
  addLeaf(leaf) {
34
35
  leaf.dependencies = (0, sasjsCli_1.getList)((0, sasjsCli_1.getDeprecatedHeader)(leaf.content, sasjsCli_1.DependencyHeader.Macro), leaf.content);
35
- leaf.content = (0, exports.removeHeader)(leaf.content);
36
+ leaf.content = (0, exports.removeHeader)(leaf.content, leaf.location);
36
37
  this._tree[this.getFileName(leaf.location)] = leaf;
37
38
  return leaf;
38
39
  }
@@ -84,6 +85,9 @@ exports.CompileTree = CompileTree;
84
85
  // Removes header from SAS file
85
86
  // If string begins with a multiline comment, remove the comment
86
87
  // Ignore any preceding white space or line breaks
87
- const removeHeader = (content) => content.replace(new RegExp(`^\\s*\\/(\\*){1,2}([\\s\\S]*?)(\\*){1,2}\\/`), '');
88
+ const removeHeader = (content, filePath) => {
89
+ (0, doxygenHeader_1.throwIfDoxygenHeaderClosesEarly)(content, filePath);
90
+ return content.replace(new RegExp(`^\\s*\\/(\\*){1,2}([\\s\\S]*?)(\\*){1,2}\\/`), '');
91
+ };
88
92
  exports.removeHeader = removeHeader;
89
93
  //# sourceMappingURL=compileTree.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"compileTree.js","sourceRoot":"","sources":["../../src/compileTree/compileTree.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compileTree.js","sourceRoot":"","sources":["../../src/compileTree/compileTree.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,33 @@
1
+ /** Where a doxygen header starts and where SAS actually ends it. */
2
+ export interface DoxygenHeader {
3
+ /** Index of the `/*` that opens the header. */
4
+ start: number;
5
+ /** Index of the comment terminator, as the SAS lexer sees it, or `null`. */
6
+ close: number | null;
7
+ /** Index of a nested `/*` that closes before the header does, or `null`. */
8
+ nestedComment: number | null;
9
+ /** Index of the first double-asterisk terminator at or after the close, or `null`. */
10
+ terminator: number | null;
11
+ }
12
+ /**
13
+ * Reads the doxygen header a file opens with.
14
+ *
15
+ * Returns `null` when the file does not open with a doxygen header (`/**`). A
16
+ * plain block comment is not a header, and files that open with one are the
17
+ * subject of the lint rule for header style, not of this check.
18
+ */
19
+ export declare const getDoxygenHeader: (content: string) => DoxygenHeader | null;
20
+ /**
21
+ * Fails when a doxygen header is cut short.
22
+ *
23
+ * A header is a SAS block comment, and SAS block comments do not nest: the
24
+ * first close marker ends the comment. A block comment inside the header ends
25
+ * it at that inner marker, and so does header text holding a close marker. In
26
+ * both cases the rest of the header is compiled as SAS. Without this the
27
+ * failure lands hundreds of lines away from the header, named by nothing
28
+ * useful.
29
+ *
30
+ * @param content - the raw content of a SAS file.
31
+ * @param filePath - path reported in the error, when the caller knows it.
32
+ */
33
+ export declare const throwIfDoxygenHeaderClosesEarly: (content: string, filePath?: string | undefined) => void;
@@ -0,0 +1,100 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.throwIfDoxygenHeaderClosesEarly = exports.getDoxygenHeader = void 0;
4
+ const CLOSE = '*/';
5
+ const TERMINATOR = '**/';
6
+ const firstNonWhitespace = (content) => content.search(/\S/);
7
+ /**
8
+ * Reads the doxygen header a file opens with.
9
+ *
10
+ * Returns `null` when the file does not open with a doxygen header (`/**`). A
11
+ * plain block comment is not a header, and files that open with one are the
12
+ * subject of the lint rule for header style, not of this check.
13
+ */
14
+ const getDoxygenHeader = (content) => {
15
+ const start = firstNonWhitespace(content);
16
+ if (start === -1 || !content.startsWith('/**', start))
17
+ return null;
18
+ const close = content.indexOf(CLOSE, start + 2);
19
+ const nestedComment = content.indexOf('/*', start + 2);
20
+ return {
21
+ start,
22
+ close: close === -1 ? null : close,
23
+ nestedComment: nestedComment !== -1 && nestedComment < close ? nestedComment : null,
24
+ terminator: close === -1 ? null : getOwnTerminator(content, close)
25
+ };
26
+ };
27
+ exports.getDoxygenHeader = getDoxygenHeader;
28
+ // Finds the double-asterisk terminator that belongs to this header.
29
+ //
30
+ // Two things disqualify a candidate. It has to stand alone on its line, because
31
+ // the house style writes it that way and a terminator inside a statement ends
32
+ // that statement's comment. And it has to arrive before another header opens:
33
+ // one behind a later opener closes that header, not this one. Both bounds keep
34
+ // the verdict on one header local to it, so the same header is not reported or
35
+ // ignored depending on what happens to follow it.
36
+ const LATER_HEADER = /^[ \t]*\/\*\*/m;
37
+ const getOwnTerminator = (content, close) => {
38
+ let candidate = content.indexOf(TERMINATOR, close - 1);
39
+ while (candidate !== -1) {
40
+ const lineStart = content.lastIndexOf('\n', candidate - 1) + 1;
41
+ const lineLeading = !content.slice(lineStart, candidate).trim();
42
+ // Another header opens before this candidate, so nothing beyond it can be
43
+ // this header's end.
44
+ if (LATER_HEADER.test(content.slice(close + 2, candidate)))
45
+ return null;
46
+ if (lineLeading)
47
+ return candidate;
48
+ candidate = content.indexOf(TERMINATOR, candidate + 1);
49
+ }
50
+ return null;
51
+ };
52
+ const lineOf = (content, index) => content.slice(0, index).split('\n').length;
53
+ /**
54
+ * Fails when a doxygen header is cut short.
55
+ *
56
+ * A header is a SAS block comment, and SAS block comments do not nest: the
57
+ * first close marker ends the comment. A block comment inside the header ends
58
+ * it at that inner marker, and so does header text holding a close marker. In
59
+ * both cases the rest of the header is compiled as SAS. Without this the
60
+ * failure lands hundreds of lines away from the header, named by nothing
61
+ * useful.
62
+ *
63
+ * @param content - the raw content of a SAS file.
64
+ * @param filePath - path reported in the error, when the caller knows it.
65
+ */
66
+ const throwIfDoxygenHeaderClosesEarly = (content, filePath) => {
67
+ const header = (0, exports.getDoxygenHeader)(content);
68
+ // A header that closed at its own terminator was not cut short, and one with
69
+ // no terminator carries no evidence that it was meant to continue.
70
+ if (!header || header.close === null || header.terminator === null)
71
+ return;
72
+ if (header.terminator === header.close - 1)
73
+ return;
74
+ const nested = header.nestedComment;
75
+ const label = filePath ? `${filePath}: ` : '';
76
+ const closeLine = lineOf(content, header.close);
77
+ const terminatorLine = lineOf(content, header.terminator);
78
+ // The terminator stands alone on its line and the close marker is not
79
+ // whitespace, so the two are always on different lines.
80
+ const affected = `lines ${closeLine + 1}-${terminatorLine}`;
81
+ // `/*/` is a comment opener followed straight away by a close marker - the
82
+ // shape a glob such as `src/*/file.sas` leaves in header text.
83
+ const literalSequence = nested !== null && nested === header.close - 1;
84
+ const reword = literalSequence || nested === null;
85
+ const cause = literalSequence
86
+ ? `the /*/ on line ${closeLine} holds that close marker.`
87
+ : nested === null
88
+ ? `the close marker on line ${closeLine} is text in the header.`
89
+ : `the close marker on line ${closeLine} belongs to the block comment opened ${lineOf(content, nested) === closeLine
90
+ ? 'on the same line'
91
+ : `at line ${lineOf(content, nested)}`}.`;
92
+ throw new Error(`${label}the doxygen header is closed at line ${closeLine}, before its **/ terminator at line ${terminatorLine}: ` +
93
+ `${cause} ` +
94
+ `SAS block comments do not nest - a block comment ends at the first close marker it meets - so ${affected} - including the header's closing **/ - would be compiled as SAS. ` +
95
+ (reword
96
+ ? `Reword the header text so that it holds no comment terminator.`
97
+ : `Remove the block comment from the header, or move it below the header.`));
98
+ };
99
+ exports.throwIfDoxygenHeaderClosesEarly = throwIfDoxygenHeaderClosesEarly;
100
+ //# sourceMappingURL=doxygenHeader.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"doxygenHeader.js","sourceRoot":"","sources":["../../src/compileTree/doxygenHeader.ts"],"names":[],"mappings":"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"}
@@ -1 +1,2 @@
1
1
  export * from './compileTree';
2
+ export * from './doxygenHeader';
@@ -11,4 +11,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
11
11
  };
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
13
  __exportStar(require("./compileTree"), exports);
14
+ __exportStar(require("./doxygenHeader"), exports);
14
15
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/compileTree/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAA6B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/compileTree/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAA6B;AAC7B,kDAA+B"}
package/package.json CHANGED
@@ -17,7 +17,7 @@
17
17
  [
18
18
  "@semantic-release/exec",
19
19
  {
20
- "prepareCmd": "npm version ${nextRelease.version} --no-git-tag-version"
20
+ "prepareCmd": "npm version ${nextRelease.version} --no-git-tag-version --allow-same-version"
21
21
  }
22
22
  ],
23
23
  [
@@ -95,5 +95,5 @@
95
95
  "jwt-decode": "4.0.0",
96
96
  "prompts": "2.4.2"
97
97
  },
98
- "version": "4.0.1"
98
+ "version": "4.1.1"
99
99
  }
@@ -15,6 +15,7 @@ const _1 = require("./");
15
15
  const utils_2 = require("../utils");
16
16
  const file_1 = require("../file");
17
17
  const formatter_1 = require("../formatter");
18
+ const doxygenHeader_1 = require("../compileTree/doxygenHeader");
18
19
  // REFACTOR: move logic supporting SAS Macros dependencies to this file
19
20
  var DependencyType;
20
21
  (function (DependencyType) {
@@ -74,6 +75,10 @@ const getDependencies = (fileName, fileContent, folders, depType, compileTree) =
74
75
  }
75
76
  else {
76
77
  encodedFileContent = yield (0, file_1.readFile)(filePaths[0], depType === DependencyType.Binary ? 'base64' : undefined);
78
+ // Without a compile tree the file goes in as read, so its header
79
+ // reaches the compiled output unstripped and has to be checked here.
80
+ if (depType !== DependencyType.Binary)
81
+ (0, doxygenHeader_1.throwIfDoxygenHeaderClosesEarly)(encodedFileContent, filePaths[0]);
77
82
  }
78
83
  const depContent = compileDep(depType, encodedFileContent, dep.fileRef);
79
84
  foundDeps.push(depContent);
@@ -1 +1 @@
1
- {"version":3,"file":"getDependencies.js","sourceRoot":"","sources":["../../src/sasjsCli/getDependencies.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getDependencies.js","sourceRoot":"","sources":["../../src/sasjsCli/getDependencies.ts"],"names":[],"mappings":"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"}
@@ -13,8 +13,10 @@ exports.getAllDependencies = exports.loadDependenciesFile = void 0;
13
13
  const types_1 = require("../types");
14
14
  const utils_1 = require("../utils");
15
15
  const _1 = require("./");
16
+ const doxygenHeader_1 = require("../compileTree/doxygenHeader");
16
17
  const file_1 = require("../file");
17
18
  const loadDependenciesFile = ({ filePath, fileContent, configuration, target, type, programFolders, macroFolders, buildSourceFolder, macroCorePath, binaryFolders, compileTree }) => __awaiter(void 0, void 0, void 0, function* () {
19
+ (0, doxygenHeader_1.throwIfDoxygenHeaderClosesEarly)(fileContent, filePath);
18
20
  const { init, initPath, term, termPath, startUpVars, initLeaf, termLeaf } = yield (0, _1.getInitTerm)({
19
21
  configuration,
20
22
  target,
@@ -1 +1 @@
1
- {"version":3,"file":"loadDependenciesFile.js","sourceRoot":"","sources":["../../src/sasjsCli/loadDependenciesFile.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loadDependenciesFile.js","sourceRoot":"","sources":["../../src/sasjsCli/loadDependenciesFile.ts"],"names":[],"mappings":"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"}
package/types/config.d.ts CHANGED
@@ -49,11 +49,33 @@ export interface DeployConfig {
49
49
  }
50
50
  export interface StreamConfig {
51
51
  assetPaths: string[];
52
- streamWeb: boolean;
52
+ /**
53
+ * When true, the app in `webSourcePath` is converted to streaming services in
54
+ * `streamWebFolder` on the SAS side. Optional: a target that only builds a
55
+ * browser app (`mockWeb`) or only serves a pre-built frontend does not need
56
+ * it, and an absent value means "do not stream".
57
+ */
58
+ streamWeb?: boolean;
53
59
  streamWebFolder: string;
54
60
  webSourcePath: string;
55
61
  streamServiceName: string;
56
62
  streamLogo?: string;
63
+ /**
64
+ * Build the app in `webSourcePath` as a self-contained site whose backend
65
+ * runs in the browser: the project's JavaScript services execute in a service
66
+ * worker, so the app makes the same requests it would make to a SASjs server
67
+ * and needs no server to run. State written by those services is kept in the
68
+ * browser.
69
+ *
70
+ * Independent of `streamWeb` - a target can serve a real deployment and a
71
+ * browser build at the same time.
72
+ */
73
+ mockWeb?: boolean;
74
+ /**
75
+ * Where the browser build is written, relative to the project root.
76
+ * Defaults to `<buildDestinationFolder>/mock`.
77
+ */
78
+ mockWebFolder?: string;
57
79
  }
58
80
  export interface AuthConfig {
59
81
  access_token: string;
@@ -210,14 +210,45 @@ const validateStreamConfig = (streamConfig) => {
210
210
  if (!streamConfig) {
211
211
  throw new Error('Invalid stream config: JSON cannot be null or undefined.');
212
212
  }
213
- if (streamConfig.streamWeb !== true && streamConfig.streamWeb !== false) {
213
+ // Presence is optional - a target can build a browser app without ever
214
+ // streaming from SAS - but a value that is present has to be a boolean.
215
+ if (streamConfig.streamWeb !== undefined &&
216
+ typeof streamConfig.streamWeb !== 'boolean') {
214
217
  throw new Error('Invalid stream config: `streamWeb` cannot be a non-boolean value.');
215
218
  }
216
- if (streamConfig.streamWeb && !streamConfig.streamWebFolder) {
217
- throw new Error('Invalid stream config: `streamWebFolder` cannot be empty, null or undefined when `streamWeb` is true.');
218
- }
219
- if (streamConfig.streamWeb && !streamConfig.webSourcePath) {
220
- throw new Error('Invalid stream config: `webSourcePath` should contain the path to your frontend application eg build, dist, or src.');
219
+ // `streamWebFolder` follows the same contract as `webSourcePath`: the schema
220
+ // documents a default (web), which is applied when the key is absent, and a
221
+ // value that is present but blank is rejected as a typo.
222
+ if (streamConfig.streamWebFolder !== undefined &&
223
+ streamConfig.streamWebFolder !== null &&
224
+ !String(streamConfig.streamWebFolder).trim()) {
225
+ throw new Error('Invalid stream config: `streamWebFolder` cannot be empty - omit it to use the default (web).');
226
+ }
227
+ if (streamConfig.streamWeb === true && streamConfig.streamWebFolder == null) {
228
+ streamConfig.streamWebFolder = 'web';
229
+ }
230
+ if (streamConfig.mockWeb !== undefined &&
231
+ typeof streamConfig.mockWeb !== 'boolean') {
232
+ throw new Error('Invalid stream config: `mockWeb` cannot be a non-boolean value.');
233
+ }
234
+ if (streamConfig.mockWebFolder !== undefined &&
235
+ typeof streamConfig.mockWebFolder !== 'string') {
236
+ throw new Error('Invalid stream config: `mockWebFolder` cannot be a non-string value.');
237
+ }
238
+ // `webSourcePath` is optional: the schema documents `dist` as its default and
239
+ // most projects build into ./dist or ./build, so it is filled in below when a
240
+ // switch needs it. A value that is present but blank is a typo rather than a
241
+ // decision to accept the default, so it is rejected - the schema's minLength
242
+ // of 1 says the same thing.
243
+ if (streamConfig.webSourcePath !== undefined &&
244
+ streamConfig.webSourcePath !== null &&
245
+ !String(streamConfig.webSourcePath).trim()) {
246
+ throw new Error('Invalid stream config: `webSourcePath` cannot be empty - omit it to use the default (dist).');
247
+ }
248
+ // Both switches build from the same folder, so one default covers them.
249
+ if ((streamConfig.streamWeb === true || streamConfig.mockWeb === true) &&
250
+ streamConfig.webSourcePath == null) {
251
+ streamConfig.webSourcePath = 'dist';
221
252
  }
222
253
  if (streamConfig.streamLogo && typeof streamConfig.streamLogo !== 'string') {
223
254
  streamConfig.streamLogo = undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"targetValidators.js","sourceRoot":"","sources":["../../src/types/targetValidators.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"targetValidators.js","sourceRoot":"","sources":["../../src/types/targetValidators.ts"],"names":[],"mappings":"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"}