@malloydata/malloy 0.0.56-dev230707230009 → 0.0.56-dev230710162623

package/dist/lang/malloy-to-ast.js

@@ -185,6 +185,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                     safeParts.push(part);
                 }
             }
+            (0, parse_utils_1.unIndent)(safeParts);
             return safeParts.join('');
         }
         // string: shortString | sqlString; So this will never happen
@@ -199,6 +200,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                 sqlStr.push(part);
             }
         }
+        // Until SQL writer properly indents turducken, it actually looks better
+        // in the output to NOT de-indent the SQL sources
+        // unIndent(sqlStr.elements);
         sqlStr.complete();
         this.astAt(sqlStr, pcx);
     }

package/dist/lang/parse-utils.d.ts

@@ -14,7 +14,7 @@ export declare type HasString = ParserRuleContext & {
     string: () => StringContext;
 };
 declare type StringPart = ParserRuleContext | string;
-export declare function getStringParts(cx: SqlStringContext): StringPart[];
+export declare function getStringParts(cx: SqlStringContext): Generator<StringPart>;
 /**
  * Parses the interior of a string, doing all \ substitutions. In most cases
  * a lexical analyzer has already recognized this as a string. As a convenience,
@@ -47,4 +47,5 @@ export declare type HasID = ParserRuleContext & {
  */
 export declare function getId(cx: HasID): string;
 export declare function getOptionalId(cx: ParserRuleContext): string | undefined;
+export declare function unIndent(parts: (string | unknown)[]): void;
 export {};

package/dist/lang/parse-utils.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOptionalId = exports.getId = exports.getIsNotes = exports.getNotes = exports.parseString = exports.getStringParts = exports.getStringIfShort = exports.getShortString = void 0;
+exports.unIndent = exports.getOptionalId = exports.getId = exports.getIsNotes = exports.getNotes = exports.parseString = exports.getStringParts = exports.getStringIfShort = exports.getShortString = void 0;
 /**
  * Take the text of a matched string, including the matching quote
  * characters, and return the actual contents of the string after
@@ -47,26 +47,23 @@ function getStringIfShort(cx) {
     }
 }
 exports.getStringIfShort = getStringIfShort;
-function getStringParts(cx) {
+function* getStringParts(cx) {
     var _a;
     if (cx) {
-        const strParts = [];
         for (const part of cx.sqlInterpolation()) {
             const upToOpen = part.OPEN_CODE().text;
             if (upToOpen.length > 2) {
-                strParts.push(upToOpen.slice(0, upToOpen.length - 2));
+                yield upToOpen.slice(0, upToOpen.length - 2);
             }
             if (part.query()) {
-                strParts.push(part.query());
+                yield part.query();
             }
         }
         const lastChars = (_a = cx.SQL_END()) === null || _a === void 0 ? void 0 : _a.text.slice(0, -3);
         if (lastChars && lastChars.length > 0) {
-            strParts.push(lastChars);
+            yield lastChars;
         }
-        return strParts;
     }
-    return [];
 }
 exports.getStringParts = getStringParts;
 var ParseState;
@@ -185,4 +182,57 @@ function getOptionalId(cx) {
     }
 }
 exports.getOptionalId = getOptionalId;
+function* linesOf(allText) {
+    while (allText.length > 0) {
+        const lineMatch = allText.match(/^.*?\r?\n/);
+        let nextLine = allText;
+        if (lineMatch) {
+            nextLine = lineMatch[0];
+        }
+        yield nextLine;
+        allText = allText.slice(nextLine.length);
+    }
+}
+function minIndent(allText) {
+    let leftMost;
+    for (const line of linesOf(allText)) {
+        // look for lines starting with spaces, that have a non blank character somewhere
+        const leadingMatch = line.match(/^( *).*[^\s]/);
+        if (leadingMatch) {
+            const indentBy = leadingMatch[1].length;
+            if (leftMost === undefined || indentBy < leftMost) {
+                leftMost = indentBy;
+            }
+        }
+    }
+    return leftMost;
+}
+function unIndent(parts) {
+    let removeSpaces;
+    for (const part of parts) {
+        if (typeof part === 'string') {
+            const newLeft = minIndent(part);
+            if (newLeft !== undefined &&
+                (removeSpaces === undefined || newLeft < removeSpaces)) {
+                removeSpaces = newLeft;
+            }
+        }
+    }
+    if (removeSpaces) {
+        for (let i = 0; i <= parts.length; i += 1) {
+            const ent = parts[i];
+            if (typeof ent === 'string') {
+                let newEnt = '';
+                for (let line of linesOf(ent)) {
+                    if (line[0] === ' ') {
+                        line = line.slice(removeSpaces);
+                    }
+                    newEnt += line;
+                }
+                parts[i] = newEnt;
+            }
+        }
+    }
+}
+exports.unIndent = unIndent;
 //# sourceMappingURL=parse-utils.js.map

package/dist/lang/test/strings.spec.js

@@ -25,7 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("./parse-expects");
 const parse_utils_1 = require("../parse-utils");
 const test_translator_1 = require("./test-translator");
-describe('test internal string parsing', () => {
+describe('quote comprehension inside strings', () => {
     test('\\b', () => {
         expect((0, parse_utils_1.parseString)('\\b')).toEqual('\b');
     });
@@ -58,8 +58,36 @@ describe('test internal string parsing', () => {
         expect((0, parse_utils_1.parseString)('|42|', '|')).toEqual('42');
     });
 });
-describe('all strings are parsed in all places', () => {
+describe('string parsing in language', () => {
     const tz = 'America/Mexico_City';
+    test('multi-line indent increasing', () => {
+        const checking = new test_translator_1.BetaExpression(`"""
+      left
+        mid
+          right
+    """`);
+        expect(checking).toTranslate();
+        const v = checking.generated().value[0];
+        expect(v).toMatchObject({ literal: '\nleft\n  mid\n    right\n' });
+    });
+    test('multi-line indent decreasing', () => {
+        const checking = new test_translator_1.BetaExpression(`"""
+          right
+        mid
+      left
+    """`);
+        expect(checking).toTranslate();
+        const v = checking.generated().value[0];
+        expect(v).toMatchObject({ literal: '\n    right\n  mid\nleft\n' });
+    });
+    test('multi-line indent keep', () => {
+        const checking = new test_translator_1.BetaExpression(`"""right
+        mid
+      left"""`);
+        expect(checking).toTranslate();
+        const v = checking.generated().value[0];
+        expect(v).toMatchObject({ literal: 'right\n        mid\n      left' });
+    });
     test('timezone single quote', () => {
         const m = new test_translator_1.TestTranslator(`run: a-> {timezone: '${tz}'; project: *}`);
         expect(m).toParse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.56-dev230707230009",
+  "version": "0.0.56-dev230710162623",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",