@sasjs/lint 4.6.1 → 4.8.0

package/utils/parseMacros.js

@@ -3,10 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseMacros = void 0;
 const trimComments_1 = require("./trimComments");
 const splitLines_1 = require("./splitLines");
+/** The `%macro` statement, in any capitalisation. */
+const macroStatement = /^%macro\b/i;
+/** The `%mend` statement, in any capitalisation. */
+const mendStatement = /^%mend\b/i;
+/**
+ * The name in a `%macro` declaration, as written.
+ *
+ * The name runs to the first character that cannot belong to it: whitespace, an
+ * opening parenthesis, the `/` that introduces the options, or an end of
+ * statement. Reading it by pattern rather than from a fixed offset is what makes
+ * `%MACRO`, `%macro  s` and `%macro\ts` yield the same name - the keyword and the
+ * whitespace before the name can each be a different length.
+ */
+const declarationName = /^%macro\b\s*([^\s(;/]*)/i;
+/** The name in a `%mend` statement, as written. */
+const mendName = /^%mend\b\s*([^\s;]*)/i;
+/** The name a macro statement carries, or an empty string when it has none. */
+const getName = (statement, pattern) => {
+    const match = pattern.exec(statement);
+    return match ? match[1].trim() : '';
+};
 const parseMacros = (text, config) => {
     const lines = (0, splitLines_1.splitLines)(text);
     const macros = [];
     let isCommentStarted = false;
+    let isQuoteStarted = '';
     let macroStack = [];
     let isReadingMacroDefinition = false;
     let isStatementContinues = true;
@@ -14,8 +36,14 @@ const parseMacros = (text, config) => {
     let tempMacroDeclarationLines = [];
     let tempStartLineNumbers = [];
     lines.forEach((line, lineIndex) => {
-        const { statement: trimmedLine, commentStarted } = (0, trimComments_1.trimComments)(line, isCommentStarted);
-        isCommentStarted = commentStarted;
+        // The state a line STARTS in belongs to the line's statements, and the state
+        // it ENDS in belongs to the next line. Reading the second into the statement
+        // loop swallowed the code that precedes a comment opening mid-line
+        // (sasjs/lint#274).
+        const stateBeforeLine = isCommentStarted;
+        const { statement: trimmedLine, commentStarted: stateAfterLine, quoteStarted: quoteAfterLine } = (0, trimComments_1.trimComments)(line, stateBeforeLine, false, isQuoteStarted);
+        isCommentStarted = stateAfterLine;
+        isQuoteStarted = quoteAfterLine;
         isStatementContinues = !trimmedLine.endsWith(';');
         const statements = trimmedLine.split(';');
         if (isReadingMacroDefinition) {
@@ -31,8 +59,11 @@ const parseMacros = (text, config) => {
             });
         }
         statements.forEach((statement, statementIndex) => {
-            const { statement: trimmedStatement, commentStarted } = (0, trimComments_1.trimComments)(statement, isCommentStarted);
-            isCommentStarted = commentStarted;
+            // The statements were split from the line's ALREADY trimmed text, so they
+            // carry no comment and no quoted value: trimming them again either swallowed
+            // the code after a comment that closes at the start of the line (`... */
+            // %macro foo;`) or re-read a `/*` inside a multi-line string as a comment.
+            const trimmedStatement = statement.trim();
             if (isReadingMacroDefinition) {
                 tempMacroDeclaration =
                     tempMacroDeclaration +
@@ -41,12 +72,7 @@ const parseMacros = (text, config) => {
                 tempStartLineNumbers.push(lineIndex + 1);
                 if (!Object.is(statements.length - 1, statementIndex)) {
                     isReadingMacroDefinition = false;
-                    const name = tempMacroDeclaration
-                        .slice(7, tempMacroDeclaration.length)
-                        .trim()
-                        .split('/')[0]
-                        .split('(')[0]
-                        .trim();
+                    const name = getName(tempMacroDeclaration, declarationName);
                     macroStack.push({
                         name,
                         startLineNumbers: tempStartLineNumbers,
@@ -63,7 +89,7 @@ const parseMacros = (text, config) => {
                     });
                 }
             }
-            if (trimmedStatement.startsWith('%macro')) {
+            if (macroStatement.test(trimmedStatement)) {
                 const startLineNumber = lineIndex + 1;
                 if (isStatementContinues &&
                     Object.is(statements.length - 1, statementIndex)) {
@@ -73,12 +99,7 @@ const parseMacros = (text, config) => {
                     isReadingMacroDefinition = true;
                     return;
                 }
-                const name = trimmedStatement
-                    .slice(7, trimmedStatement.length)
-                    .trim()
-                    .split('/')[0]
-                    .split('(')[0]
-                    .trim();
+                const name = getName(trimmedStatement, declarationName);
                 macroStack.push({
                     name,
                     startLineNumbers: [startLineNumber],
@@ -94,12 +115,16 @@ const parseMacros = (text, config) => {
                     termination: ''
                 });
             }
-            else if (trimmedStatement.startsWith('%mend')) {
+            else if (mendStatement.test(trimmedStatement)) {
                 if (macroStack.length) {
                     const macro = macroStack.pop();
-                    const mendMacroName = trimmedStatement.split(' ').filter((s) => !!s)[1] || '';
+                    const mendMacroName = getName(trimmedStatement, mendName);
                     macro.endLineNumber = lineIndex + 1;
-                    macro.hasMacroNameInMend = mendMacroName === macro.name;
+                    // SAS matches a macro name without regard to case, so `%mend s` closes
+                    // `%macro S()`. The name is kept as written for the rules that point at
+                    // it, and only the comparison folds the case.
+                    macro.hasMacroNameInMend =
+                        mendMacroName.toLowerCase() === macro.name.toLowerCase();
                     macro.mismatchedMendMacroName = macro.hasMacroNameInMend
                         ? ''
                         : mendMacroName;

package/utils/parseMacros.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseMacros.js","sourceRoot":"","sources":["../../src/utils/parseMacros.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parseMacros.js","sourceRoot":"","sources":["../../src/utils/parseMacros.ts"],"names":[],"mappings":"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"}

package/utils/trimComments.d.ts

@@ -1,4 +1,24 @@
-export declare const trimComments: (statement: string, commentStarted?: boolean, trimEnd?: boolean) => {
+/**
+ * Removes the block comments from a statement, or from one line of a statement.
+ *
+ * The scan tracks two states the previous implementation did not:
+ *
+ * - a quoted value, because SAS accepts both quote characters, so an opening
+ *   comment marker inside a string is data rather than the start of a comment;
+ * - a comment that is still open at the end of the text, which is reported back
+ *   as `commentStarted` so the caller carries it into the next line. The old
+ *   implementation lost that state when the opening marker had no closing
+ *   delimiter on the same line, and returned the comment's content as code
+ *   (sasjs/lint#274).
+ *
+ * A quoted value is carried across lines too (`quoteStarted`), because a SAS
+ * literal really does continue onto the next physical line: measured on a live
+ * engine, `x = "ab` / `cd";` is one string and `length(x)` is 4. An UNTERMINATED
+ * quote is carried as far as the text goes, which is also what the engine does -
+ * it consumes the rest of the file as string content.
+ */
+export declare const trimComments: (statement: string, commentStarted?: boolean, trimEnd?: boolean, quoteStarted?: string) => {
     statement: string;
     commentStarted: boolean;
+    quoteStarted: string;
 };

package/utils/trimComments.js

@@ -1,40 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trimComments = void 0;
-const trimComments = (statement, commentStarted = false, trimEnd = false) => {
-    let trimmed = trimEnd ? (statement || '').trimEnd() : (statement || '').trim();
-    if (commentStarted || trimmed.startsWith('/*')) {
-        const parts = trimmed.startsWith('/*')
-            ? trimmed.slice(2).split('*/')
-            : trimmed.split('*/');
-        if (parts.length === 2) {
-            return {
-                statement: parts.pop().trim(),
-                commentStarted: false
-            };
+/**
+ * Removes the block comments from a statement, or from one line of a statement.
+ *
+ * The scan tracks two states the previous implementation did not:
+ *
+ * - a quoted value, because SAS accepts both quote characters, so an opening
+ *   comment marker inside a string is data rather than the start of a comment;
+ * - a comment that is still open at the end of the text, which is reported back
+ *   as `commentStarted` so the caller carries it into the next line. The old
+ *   implementation lost that state when the opening marker had no closing
+ *   delimiter on the same line, and returned the comment's content as code
+ *   (sasjs/lint#274).
+ *
+ * A quoted value is carried across lines too (`quoteStarted`), because a SAS
+ * literal really does continue onto the next physical line: measured on a live
+ * engine, `x = "ab` / `cd";` is one string and `length(x)` is 4. An UNTERMINATED
+ * quote is carried as far as the text goes, which is also what the engine does -
+ * it consumes the rest of the file as string content.
+ */
+const trimComments = (statement, commentStarted = false, trimEnd = false, quoteStarted = '') => {
+    const text = statement || '';
+    let result = '';
+    let quote = quoteStarted;
+    let inComment = commentStarted;
+    for (let index = 0; index < text.length; index++) {
+        const character = text[index];
+        if (inComment) {
+            if (character === '*' && text[index + 1] === '/') {
+                inComment = false;
+                index++;
+            }
+            continue;
         }
-        else if (parts.length > 2) {
-            parts.shift();
-            return (0, exports.trimComments)(parts.join('*/'), false);
+        if (quote) {
+            result += character;
+            if (character === quote)
+                quote = '';
+            continue;
         }
-        else {
-            return { statement: '', commentStarted: true };
+        if (character === "'" || character === '"') {
+            quote = character;
+            result += character;
+            continue;
         }
+        if (character === '/' && text[index + 1] === '*') {
+            inComment = true;
+            index++;
+            continue;
+        }
+        result += character;
     }
-    else if (trimmed.includes('/*')) {
-        const statementBeforeCommentStarts = trimmed.slice(0, trimmed.indexOf('/*'));
-        trimmed = trimmed.slice(trimmed.indexOf('/*') + 2);
-        const remainingStatement = trimmed.slice(trimmed.indexOf('*/') + 2);
-        const result = (0, exports.trimComments)(remainingStatement, false, true);
-        const completeStatement = statementBeforeCommentStarts + result.statement;
-        return {
-            statement: trimEnd
-                ? completeStatement.trimEnd()
-                : completeStatement.trim(),
-            commentStarted: result.commentStarted
-        };
-    }
-    return { statement: trimmed, commentStarted: false };
+    return {
+        statement: trimEnd ? result.trimEnd() : result.trim(),
+        commentStarted: inComment,
+        quoteStarted: quote
+    };
 };
 exports.trimComments = trimComments;
 //# sourceMappingURL=trimComments.js.map

package/utils/trimComments.js.map

@@ -1 +1 @@
-{"version":3,"file":"trimComments.js","sourceRoot":"","sources":["../../src/utils/trimComments.ts"],"names":[],"mappings":";;;AAAO,MAAM,YAAY,GAAG,CAC1B,SAAiB,EACjB,iBAA0B,KAAK,EAC/B,UAAmB,KAAK,EACwB,EAAE;IAClD,IAAI,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;IAE9E,IAAI,cAAc,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/C,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;YACpC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;YAC9B,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACvB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO;gBACL,SAAS,EAAG,KAAK,CAAC,GAAG,EAAa,CAAC,IAAI,EAAE;gBACzC,cAAc,EAAE,KAAK;aACtB,CAAA;QACH,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,KAAK,CAAC,KAAK,EAAE,CAAA;YACb,OAAO,IAAA,oBAAY,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAA;QAC9C,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAA;QAChD,CAAC;IACH,CAAC;SAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,MAAM,4BAA4B,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;QAC5E,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAClD,MAAM,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAEnE,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAC,kBAAkB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QAC5D,MAAM,iBAAiB,GAAG,4BAA4B,GAAG,MAAM,CAAC,SAAS,CAAA;QACzE,OAAO;YACL,SAAS,EAAE,OAAO;gBAChB,CAAC,CAAC,iBAAiB,CAAC,OAAO,EAAE;gBAC7B,CAAC,CAAC,iBAAiB,CAAC,IAAI,EAAE;YAC5B,cAAc,EAAE,MAAM,CAAC,cAAc;SACtC,CAAA;IACH,CAAC;IACD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,CAAA;AACtD,CAAC,CAAA;AArCY,QAAA,YAAY,gBAqCxB"}
+{"version":3,"file":"trimComments.js","sourceRoot":"","sources":["../../src/utils/trimComments.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACI,MAAM,YAAY,GAAG,CAC1B,SAAiB,EACjB,iBAA0B,KAAK,EAC/B,UAAmB,KAAK,EACxB,eAAuB,EAAE,EAC6C,EAAE;IACxE,MAAM,IAAI,GAAG,SAAS,IAAI,EAAE,CAAA;IAC5B,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,KAAK,GAAG,YAAY,CAAA;IACxB,IAAI,SAAS,GAAG,cAAc,CAAA;IAE9B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;QAE7B,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,SAAS,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBACjD,SAAS,GAAG,KAAK,CAAA;gBACjB,KAAK,EAAE,CAAA;YACT,CAAC;YAED,SAAQ;QACV,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,SAAS,CAAA;YACnB,IAAI,SAAS,KAAK,KAAK;gBAAE,KAAK,GAAG,EAAE,CAAA;YACnC,SAAQ;QACV,CAAC;QAED,IAAI,SAAS,KAAK,GAAG,IAAI,SAAS,KAAK,GAAG,EAAE,CAAC;YAC3C,KAAK,GAAG,SAAS,CAAA;YACjB,MAAM,IAAI,SAAS,CAAA;YACnB,SAAQ;QACV,CAAC;QAED,IAAI,SAAS,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACjD,SAAS,GAAG,IAAI,CAAA;YAChB,KAAK,EAAE,CAAA;YACP,SAAQ;QACV,CAAC;QAED,MAAM,IAAI,SAAS,CAAA;IACrB,CAAC;IAED,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE;QACrD,cAAc,EAAE,SAAS;QACzB,YAAY,EAAE,KAAK;KACpB,CAAA;AACH,CAAC,CAAA;AAjDY,QAAA,YAAY,gBAiDxB"}