@malloydata/malloy 0.0.222 → 0.0.223-dev241213043533

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

@@ -1446,22 +1446,17 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.astAt(new ast.ExperimentalExperiment('compilerTestExperimentTranslate'), pcx);
     }
     visitRecordRef(pcx) {
-        const pathCx = pcx.fieldPath();
-        const tailEl = pathCx.fieldName().at(-1);
-        if (tailEl) {
-            const elementKey = (0, parse_utils_1.getId)(tailEl);
-            const idRef = new ast.ExprIdReference(this.getFieldPath(pathCx, ast.ExpressionFieldReference));
-            return new ast.RecordElement(elementKey, idRef);
-        }
-        throw this.internalError(pathCx, 'IMPOSSIBLY A PATH CONTAINED ZERO ELEMENTS');
+        const idRef = new ast.ExprIdReference(this.getFieldPath(pcx.fieldPath(), ast.ExpressionFieldReference));
+        return this.astAt(new ast.RecordElement({ path: idRef }), pcx);
     }
     visitRecordExpr(pcx) {
-        const elementKey = (0, parse_utils_1.getId)(pcx.recordKey());
-        const elementVal = this.getFieldExpr(pcx.fieldExpr());
-        return new ast.RecordElement(elementKey, elementVal);
+        const value = this.getFieldExpr(pcx.fieldExpr());
+        const keyCx = pcx.recordKey();
+        const recInit = keyCx ? { key: (0, parse_utils_1.getId)(keyCx), value } : { value };
+        return this.astAt(new ast.RecordElement(recInit), pcx);
     }
     visitExprLiteralRecord(pcx) {
-        const els = this.only(pcx.recordElement().map(elCx => this.astAt(this.visit(elCx), elCx)), visited => visited instanceof ast.RecordElement && visited, 'a key value pair');
+        const els = this.only(pcx.recordElement().map(elCx => this.astAt(this.visit(elCx), elCx)), visited => visited instanceof ast.RecordElement && visited, 'a legal record property description');
         return new ast.RecordLiteral(els);
     }
     visitExprArrayLiteral(pcx) {

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

@@ -324,6 +324,7 @@ type MessageParameterTypes = {
     'sql-is-not-null': string;
     'sql-is-null': string;
     'illegal-record-property-type': string;
+    'record-literal-needs-keys': string;
     'not-yet-implemented': string;
     'sql-case': string;
     'case-then-type-does-not-match': {

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

@@ -271,5 +271,19 @@ describe('literals', () => {
         });
         test('a string containing a tab', () => expect((0, test_translator_1.expr) `'\t'`).toParse());
     });
+    describe('compound literals', () => {
+        test('simple record literal', () => {
+            expect('{answer is 42}').compilesTo('{answer:42}');
+        });
+        test('record literal with path', () => {
+            expect('{aninline.column}').compilesTo('{column:aninline.column}');
+        });
+        test('array of records with same schema', () => {
+            expect('[{name is "one", val is 1},{name is "two", val is 2}]').compilesTo('[{name:"one", val:1}, {name:"two", val:2}]');
+        });
+        test('array of records with head schema', () => {
+            expect('[{name is "one", val is 1},{"two", 2}]').compilesTo('[{name:"one", val:1}, {name:"two", val:2}]');
+        });
+    });
 });
 //# sourceMappingURL=literals.spec.js.map

package/dist/lang/test/parse-expects.js

@@ -148,6 +148,17 @@ function eToStr(e, symbols) {
             return `"${e.literal}"`;
         case 'timeLiteral':
             return `@${e.literal}`;
+        case 'recordLiteral': {
+            const parts = [];
+            for (const [name, val] of Object.entries(e.kids)) {
+                parts.push(`${name}:${subExpr(val)}`);
+            }
+            return `{${parts.join(', ')}}`;
+        }
+        case 'arrayLiteral': {
+            const parts = e.kids.values.map(k => subExpr(k));
+            return `[${parts.join(', ')}]`;
+        }
         case 'regexpLiteral':
             return `/${e.literal}/`;
         case 'trunc':

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.222";
+export declare const MALLOY_VERSION = "0.0.223";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.222';
+exports.MALLOY_VERSION = '0.0.223';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.222",
+  "version": "0.0.223-dev241213043533",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",