@malloydata/malloy 0.0.55-dev230707013046 → 0.0.55-dev230707183945

package/dist/lang/string-parser.js

@@ -0,0 +1,105 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseString = void 0;
+var ParseState;
+(function (ParseState) {
+    ParseState[ParseState["Normal"] = 0] = "Normal";
+    ParseState[ParseState["ReverseVirgule"] = 1] = "ReverseVirgule";
+    ParseState[ParseState["Unicode"] = 2] = "Unicode";
+})(ParseState || (ParseState = {}));
+/**
+ * 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,
+ * strip off the quoting outer chartacters if asked, then parse the interior of
+ * the string. The intention is to be compatible with JSON strings, in terms
+ * of which \X substitutions are processed.
+ * @param str is the string to parse
+ * @param surround is the quoting character, default means quotes already stripped
+ * @returns a string with the \ processing completed
+ */
+function parseString(str, surround = '') {
+    let inner = str.slice(surround.length);
+    let state = ParseState.Normal;
+    if (surround.length) {
+        inner = inner.slice(0, -surround.length);
+    }
+    let out = '';
+    let unicode = '';
+    for (const c of inner) {
+        switch (state) {
+            case ParseState.Normal: {
+                if (c === '\\') {
+                    state = ParseState.ReverseVirgule;
+                }
+                else {
+                    out += c;
+                }
+                break;
+            }
+            case ParseState.ReverseVirgule: {
+                let outc = c;
+                if (c === 'u') {
+                    state = ParseState.Unicode;
+                    unicode = '';
+                    continue;
+                }
+                if (c === 'b') {
+                    outc = '\b';
+                }
+                else if (c === 'f') {
+                    outc = '\f';
+                }
+                else if (c === 'n') {
+                    outc = '\n';
+                }
+                else if (c === 'r') {
+                    outc = '\r';
+                }
+                else if (c === 't') {
+                    outc = '\t';
+                }
+                out += outc;
+                state = ParseState.Normal;
+                break;
+            }
+            case ParseState.Unicode: {
+                if ('ABCDEFabcdef0123456789'.includes(c)) {
+                    unicode += c;
+                    if (unicode.length === 4) {
+                        out += String.fromCharCode(parseInt(unicode, 16));
+                        state = ParseState.Normal;
+                    }
+                }
+                else {
+                    // Don't think we ever get here ...
+                    state = ParseState.Normal;
+                }
+            }
+        }
+    }
+    return out;
+}
+exports.parseString = parseString;
+//# sourceMappingURL=string-parser.js.map

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

@@ -1106,7 +1106,10 @@ describe('literals', () => {
         expect((0, test_translator_1.expr) `42`).toTranslate();
     });
     test('string', () => {
-        expect((0, test_translator_1.expr) `'fortywo-two'`).toTranslate();
+        const m = new test_translator_1.BetaExpression("'forty two'");
+        expect(m).toTranslate();
+        const m42 = m.generated().value[0];
+        expect(m42).toMatchObject({ literal: 'forty two' });
     });
     test('string with quoted quote', () => {
         const str = "'Isn" + '\\' + "'t this nice'";
@@ -2785,6 +2788,34 @@ describe('sql expressions', () => {
             expect(m).toTranslate();
         }
     });
+    test('sql expression legal with single quote', () => {
+        const m = (0, test_translator_1.model) `
+      source: na is bigquery.sql('SELECT 1 as one')
+    `;
+        expect(m).toParse();
+        const compileSql = m.translator.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            m.translator.update({
+                compileSQL: { [compileSql.name]: getSelectOneStruct(compileSql) },
+            });
+            expect(m).toTranslate();
+        }
+    });
+    test('sql expression legal with double quote', () => {
+        const m = (0, test_translator_1.model) `
+      source: na is bigquery.sql("SELECT 1 as one")
+    `;
+        expect(m).toParse();
+        const compileSql = m.translator.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            m.translator.update({
+                compileSQL: { [compileSql.name]: getSelectOneStruct(compileSql) },
+            });
+            expect(m).toTranslate();
+        }
+    });
     test('reference to sql expression in extended source', () => {
         const m = (0, test_translator_1.model) `
       source: na is bigquery.sql("""SELECT 1 as one""") {

package/dist/lang/test/strings.spec.d.ts

@@ -0,0 +1 @@
+import './parse-expects';

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

@@ -0,0 +1,60 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./parse-expects");
+const string_parser_1 = require("../string-parser");
+describe('test internal string parsing', () => {
+    test('\\b', () => {
+        expect((0, string_parser_1.parseString)('\\b')).toEqual('\b');
+    });
+    test('\\f', () => {
+        expect((0, string_parser_1.parseString)('\\f')).toEqual('\f');
+    });
+    test('\\n', () => {
+        expect((0, string_parser_1.parseString)('\\n')).toEqual('\n');
+    });
+    test('\\r', () => {
+        expect((0, string_parser_1.parseString)('\\r')).toEqual('\r');
+    });
+    test('\\t', () => {
+        expect((0, string_parser_1.parseString)('\\t')).toEqual('\t');
+    });
+    test('unicode ?', () => {
+        expect((0, string_parser_1.parseString)('\\u003f')).toEqual('?');
+        expect((0, string_parser_1.parseString)('\\u003F')).toEqual('?');
+    });
+    test('normal stuff', () => {
+        expect((0, string_parser_1.parseString)('normal stuff')).toEqual('normal stuff');
+    });
+    test('stuff & nonsense', () => {
+        expect((0, string_parser_1.parseString)('stuff \\u0026 nonsense')).toEqual('stuff & nonsense');
+    });
+    test('one thing\\nnext thing', () => {
+        expect((0, string_parser_1.parseString)('one thing\\nnext thing')).toEqual('one thing\nnext thing');
+    });
+    test('quote stripping works', () => {
+        expect((0, string_parser_1.parseString)('|42|', '|')).toEqual('42');
+    });
+});
+//# sourceMappingURL=strings.spec.js.map

package/package.json

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