@malloydata/malloy 0.0.195-dev241003204819 → 0.0.195-dev241007154000

package/dist/model/malloy_types.js

@@ -22,8 +22,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDimensional = exports.isAtomicField = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = exports.isLiteral = exports.isSQLFragment = exports.isJoinOn = exports.isMatrixOperation = exports.isIndexSegment = exports.isRawSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.structHasErrors = exports.segmentHasErrors = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isCastType = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.paramHasValue = exports.isAsymmetricExpr = exports.exprIsLeaf = exports.exprHasE = exports.exprHasKids = void 0;
-exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = void 0;
+exports.mergeEvalSpaces = exports.isLiteral = exports.isScalarArray = exports.isBaseTable = exports.isSourceDef = exports.sourceBase = exports.isSegmentSQL = exports.isIndexSegment = exports.isRawSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.structHasErrors = exports.segmentHasErrors = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.isJoinedSource = exports.isJoined = exports.isJoinable = exports.isMatrixOperation = exports.isRepeatedRecord = exports.arrayEachFields = exports.fieldIsIntrinsic = exports.isCastType = exports.isAtomicFieldType = exports.isTemporalField = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.paramHasValue = exports.isAsymmetricExpr = exports.exprIsLeaf = exports.exprHasE = exports.exprHasKids = void 0;
+exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.getAtomicFields = exports.isAtomic = exports.isTurtleDef = exports.modelObjIsSource = exports.getIdentifier = void 0;
 function exprHasKids(e) {
     return 'kids' in e;
 }
@@ -116,15 +116,15 @@ function maxOfExpressionTypes(types) {
     return types.reduce(maxExpressionType, 'scalar');
 }
 exports.maxOfExpressionTypes = maxOfExpressionTypes;
-/**  Grants access to the expression property of a FieldDef */
+/**  Grants access to the expression properties of a FieldDef */
 function hasExpression(f) {
-    return f.e !== undefined;
+    return 'e' in f;
 }
 exports.hasExpression = hasExpression;
-function isTimeFieldType(s) {
+function isTemporalField(s) {
     return s === 'date' || s === 'timestamp';
 }
-exports.isTimeFieldType = isTimeFieldType;
+exports.isTemporalField = isTemporalField;
 function isAtomicFieldType(s) {
     return [
         'string',
@@ -134,6 +134,8 @@ function isAtomicFieldType(s) {
         'boolean',
         'json',
         'sql native',
+        'record',
+        'array',
         'error',
     ].includes(s);
 }
@@ -143,19 +145,37 @@ function isCastType(s) {
 }
 exports.isCastType = isCastType;
 // this field definition represents something in the database.
-function FieldIsIntrinsic(f) {
-    if (isAtomicFieldType(f.type) && !hasExpression(f)) {
-        return true;
-    }
-    else if (f.type === 'struct' &&
-        (f.structSource.type === 'inline' || f.structSource.type === 'nested')) {
-        return true;
-    }
-    else {
-        return false;
-    }
+function fieldIsIntrinsic(f) {
+    return isAtomicFieldType(f.type) && !hasExpression(f);
+}
+exports.fieldIsIntrinsic = fieldIsIntrinsic;
+function arrayEachFields(arrayOf) {
+    return [
+        { name: 'each', ...arrayOf, e: { node: 'field', path: ['value'] } },
+        { name: 'value', ...arrayOf },
+    ];
+}
+exports.arrayEachFields = arrayEachFields;
+function isRepeatedRecord(fd) {
+    return fd.type === 'array' && fd.elementTypeDef.type === 'record_element';
+}
+exports.isRepeatedRecord = isRepeatedRecord;
+function isMatrixOperation(x) {
+    return ['left', 'right', 'full', 'inner'].includes(x);
+}
+exports.isMatrixOperation = isMatrixOperation;
+function isJoinable(sd) {
+    return ['table', 'sql_select', 'query_source', 'array', 'record'].includes(sd.type);
+}
+exports.isJoinable = isJoinable;
+function isJoined(fd) {
+    return 'join' in fd;
+}
+exports.isJoined = isJoined;
+function isJoinedSource(sd) {
+    return isSourceDef(sd) && isJoined(sd);
 }
-exports.FieldIsIntrinsic = FieldIsIntrinsic;
+exports.isJoinedSource = isJoinedSource;
 function isDateUnit(str) {
     return ['day', 'week', 'month', 'quarter', 'year'].includes(str);
 }
@@ -191,7 +211,7 @@ function isByExpression(by) {
 }
 exports.isByExpression = isByExpression;
 function refIsStructDef(ref) {
-    return typeof ref !== 'string' && ref.type === 'struct';
+    return typeof ref !== 'string';
 }
 exports.refIsStructDef = refIsStructDef;
 function segmentHasErrors(segment) {
@@ -250,18 +270,41 @@ function isIndexSegment(pe) {
     return pe.type === 'index';
 }
 exports.isIndexSegment = isIndexSegment;
-function isMatrixOperation(x) {
-    return ['left', 'right', 'full', 'inner'].includes(x);
-}
-exports.isMatrixOperation = isMatrixOperation;
-function isJoinOn(sr) {
-    return ['one', 'many', 'cross'].includes(sr.type);
+function isSegmentSQL(f) {
+    return 'sql' in f;
+}
+exports.isSegmentSQL = isSegmentSQL;
+// The gesture {...sourceStruct moreProperties}  happens everywhere, now that
+// structs aren't all identical, we need a way to make one from any of the
+// exisitng structs
+function sourceBase(sd) {
+    return { ...sd };
+}
+exports.sourceBase = sourceBase;
+function isSourceDef(sd) {
+    return (sd.type === 'table' ||
+        sd.type === 'sql_select' ||
+        sd.type === 'query_source' ||
+        sd.type === 'query_result' ||
+        sd.type === 'finalize' ||
+        sd.type === 'nest_source');
+}
+exports.isSourceDef = isSourceDef;
+/** Is this the "FROM" table of a query tree */
+function isBaseTable(def) {
+    if (isJoined(def)) {
+        return false;
+    }
+    if (isSourceDef(def)) {
+        return true;
+    }
+    return false;
 }
-exports.isJoinOn = isJoinOn;
-function isSQLFragment(f) {
-    return f.sql !== undefined;
+exports.isBaseTable = isBaseTable;
+function isScalarArray(def) {
+    return def.type === 'array' && def.elementTypeDef.type !== 'record_element';
 }
-exports.isSQLFragment = isSQLFragment;
+exports.isScalarArray = isScalarArray;
 function isLiteral(evalSpace) {
     return evalSpace === 'literal';
 }
@@ -276,28 +319,6 @@ function mergeEvalSpaces(...evalSpaces) {
     return 'input';
 }
 exports.mergeEvalSpaces = mergeEvalSpaces;
-function isSQLBlockStruct(sd) {
-    const src = sd.structSource;
-    return src.type === 'sql' && src.method === 'subquery';
-}
-exports.isSQLBlockStruct = isSQLBlockStruct;
-function isFieldTypeDef(f) {
-    return (f.type === 'string' ||
-        f.type === 'date' ||
-        f.type === 'number' ||
-        f.type === 'timestamp' ||
-        f.type === 'boolean' ||
-        f.type === 'json');
-}
-exports.isFieldTypeDef = isFieldTypeDef;
-function isFieldTimeBased(f) {
-    return f.type === 'date' || f.type === 'timestamp';
-}
-exports.isFieldTimeBased = isFieldTimeBased;
-function isFieldStructDef(f) {
-    return f.type === 'struct';
-}
-exports.isFieldStructDef = isFieldStructDef;
 /** Get the output name for a NamedObject */
 function getIdentifier(n) {
     if (n.as !== undefined) {
@@ -306,46 +327,22 @@ function getIdentifier(n) {
     return n.name;
 }
 exports.getIdentifier = getIdentifier;
+function modelObjIsSource(nmo) {
+    return isSourceDef(nmo);
+}
+exports.modelObjIsSource = modelObjIsSource;
 function isTurtleDef(def) {
     return def.type === 'turtle';
 }
 exports.isTurtleDef = isTurtleDef;
-function isAtomicField(def) {
+function isAtomic(def) {
     return isAtomicFieldType(def.type);
 }
-exports.isAtomicField = isAtomicField;
-function isDimensional(field) {
-    var _a;
-    if ('resultMetadata' in field) {
-        return ((_a = field.resultMetadata) === null || _a === void 0 ? void 0 : _a.fieldKind) === 'dimension';
-    }
-    return false;
-}
-exports.isDimensional = isDimensional;
-function isPhysical(field) {
-    return ((isFieldTypeDef(field) && field.e === undefined) ||
-        (isFieldStructDef(field) &&
-            (field.structSource.type === 'nested' ||
-                field.structSource.type === 'inline')));
-}
-exports.isPhysical = isPhysical;
-function getDimensions(structDef) {
-    return structDef.fields.filter(isDimensional);
-}
-exports.getDimensions = getDimensions;
-function getPhysicalFields(structDef) {
-    return structDef.fields.filter(isPhysical);
-}
-exports.getPhysicalFields = getPhysicalFields;
-function isMeasureLike(field) {
-    var _a, _b;
-    if ('resultMetadata' in field) {
-        return (((_a = field.resultMetadata) === null || _a === void 0 ? void 0 : _a.fieldKind) === 'measure' ||
-            ((_b = field.resultMetadata) === null || _b === void 0 ? void 0 : _b.fieldKind) === 'struct');
-    }
-    return false;
+exports.isAtomic = isAtomic;
+function getAtomicFields(structDef) {
+    return structDef.fields.filter(isAtomic);
 }
-exports.isMeasureLike = isMeasureLike;
+exports.getAtomicFields = getAtomicFields;
 function isValueString(value, field) {
     return field.type === 'string';
 }

package/dist/model/sql_block.d.ts

@@ -1,7 +1,7 @@
-import { SQLBlockSource, SQLPhrase } from './malloy_types';
+import { SQLSentence, SQLPhraseSegment } from './malloy_types';
 /**
- * The factory for SQLBlocks. Exists because the name is computed
+ * The factory for SQLSentences. Exists because the name is computed
  * from the components of the block and that name needs to be
- * unique, but predictable.
+ * unique, but predictable so that it can be used to cache schema fetches.
  */
-export declare function makeSQLBlock(select: SQLPhrase[], connection?: string): SQLBlockSource;
+export declare function makeSQLSentence(select: SQLPhraseSegment[], connection: string): SQLSentence;

package/dist/model/sql_block.js

@@ -22,25 +22,22 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeSQLBlock = void 0;
+exports.makeSQLSentence = void 0;
 const malloy_types_1 = require("./malloy_types");
 const utils_1 = require("./utils");
 /**
- * The factory for SQLBlocks. Exists because the name is computed
+ * The factory for SQLSentences. Exists because the name is computed
  * from the components of the block and that name needs to be
- * unique, but predictable.
+ * unique, but predictable so that it can be used to cache schema fetches.
  */
-function makeSQLBlock(select, connection) {
-    const theBlock = {
-        name: `md5:/${connection || '$default'}//${nameFor(select)}`,
+function makeSQLSentence(select, connection) {
+    return {
+        name: `sql://${connection}/${nameFor(select)}`,
+        connection,
         select,
     };
-    if (connection) {
-        theBlock.connection = connection;
-    }
-    return theBlock;
 }
-exports.makeSQLBlock = makeSQLBlock;
+exports.makeSQLSentence = makeSQLSentence;
 // This feels like wrongness on toast, before SQL contained a query we
 // could compute a stable hash from the select property to use to
 // indentify this piece of SQL. Now the actual SQL isn't known until
@@ -50,7 +47,7 @@ exports.makeSQLBlock = makeSQLBlock;
 // here for later, and that the whole "how to determine the name of a query"
 // algorithm needs to change
 function nameFor(select) {
-    const phrases = select.map(el => (0, malloy_types_1.isSQLFragment)(el) ? el.sql : JSON.stringify(el));
+    const phrases = select.map(el => (0, malloy_types_1.isSegmentSQL)(el) ? el.sql : JSON.stringify(el));
     return (0, utils_1.generateHash)(phrases.join(';'));
 }
 //# sourceMappingURL=sql_block.js.map

package/dist/tags.js

@@ -280,10 +280,10 @@ class TagErrorListener {
         this.log.push(logMsg);
     }
     semanticError(cx, code, msg) {
+        const left = this.fromChar + cx.start.charPositionInLine;
         const errAt = {
             line: this.atLine,
-            // mtoy TODO get this right
-            character: 0,
+            character: left,
         };
         const range = { start: errAt, end: errAt };
         const logMsg = {

package/dist/version.d.ts

@@ -0,0 +1 @@
+export declare const MALLOY_VERSION = "0.0.195";

package/dist/version.js

@@ -0,0 +1,6 @@
+"use strict";
+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.195';
+//# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.195-dev241003204819",
+  "version": "0.0.195-dev241007154000",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -37,7 +37,8 @@
     "clean": "tsc --build --clean && rm -rf src/lang/lib dist",
     "build": "npm run build-parser && tsc --build",
     "malloyc": "ts-node ../../scripts/malloy-to-json",
-    "prepublishOnly": "npm run clean && npm run build"
+    "prepublishOnly": "npm run clean && npm run build",
+    "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
     "antlr4ts": "^0.5.0-alpha.4",

package/dist/lang/ast/space-seed.d.ts

@@ -1,16 +0,0 @@
-import { StructDef } from '../../model/malloy_types';
-import { FieldSpace } from './types/field-space';
-export type SourceSpec = StructDef | FieldSpace;
-/**
- * Based on how things are constructed, a DynamicSpace can be seeded
- * with a StructDef, or from another field space.
- */
-export declare class SpaceSeed {
-    readonly sourceSpec: SourceSpec;
-    private readonly spaceSpec;
-    private asFS?;
-    private asStruct?;
-    constructor(sourceSpec: SourceSpec);
-    get structDef(): StructDef;
-    get fieldSpace(): FieldSpace;
-}

package/dist/lang/ast/space-seed.js

@@ -1,59 +0,0 @@
-"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.SpaceSeed = void 0;
-const static_space_1 = require("./field-space/static-space");
-function isFieldSpace(x) {
-    return x.type === 'fieldSpace';
-}
-/**
- * Based on how things are constructed, a DynamicSpace can be seeded
- * with a StructDef, or from another field space.
- */
-class SpaceSeed {
-    constructor(sourceSpec) {
-        this.sourceSpec = sourceSpec;
-        this.spaceSpec = sourceSpec;
-    }
-    get structDef() {
-        if (isFieldSpace(this.spaceSpec)) {
-            if (!this.asStruct) {
-                this.asStruct = this.spaceSpec.structDef();
-            }
-            return this.asStruct;
-        }
-        return this.spaceSpec;
-    }
-    get fieldSpace() {
-        if (isFieldSpace(this.spaceSpec)) {
-            return this.spaceSpec;
-        }
-        if (!this.asFS) {
-            this.asFS = new static_space_1.StaticSpace(this.spaceSpec);
-        }
-        return this.asFS;
-    }
-}
-exports.SpaceSeed = SpaceSeed;
-//# sourceMappingURL=space-seed.js.map