@malloydata/malloy 0.0.199 → 0.0.200-dev241012235421

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { DuckDBDialect, StandardSQLDialect, TrinoDialect, PostgresDialect, SnowflakeDialect, MySQLDialect, registerDialect, arg, qtz, overload, minScalar, anyExprType, minAggregate, maxScalar, sql, makeParam, param, variadicParam, literal, spread, Dialect, } from './dialect';
 export type { DialectFieldList, DialectFunctionOverloadDef, QueryInfo, MalloyStandardFunctionImplementations, DefinitionBlueprint, DefinitionBlueprintMap, OverloadedDefinitionBlueprint, } from './dialect';
-export type { QueryDataRow, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, SQLSentence, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryRunStats, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FieldValueType, ExpressionTypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, LeafAtomicTypeDef, LeafAtomicDef, AtomicTypeDef, AtomicFieldDef, JoinedArrayDef, JoinedArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, } from './model';
+export type { QueryDataRow, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, SQLSentence, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryRunStats, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FieldValueType, ExpressionTypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, LeafAtomicTypeDef, LeafAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, } from './model';
 export { arrayEachFields, isRepeatedRecord, isSourceDef, Segment, isLeafAtomic, isJoined, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, expressionIsCalculation, indent, composeSQLExpr, } from './model';
 export { MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';

package/dist/lang/ast/view-elements/reference-view.js

@@ -70,7 +70,7 @@ class ReferenceView extends view_1.View {
         if (fieldDef === undefined) {
             throw new Error('Expected field to have definition');
         }
-        if ((0, malloy_types_1.isAtomicFieldType)(fieldDef.type)) {
+        if ((0, malloy_types_1.isAtomic)(fieldDef)) {
             const newSegment = {
                 type: 'reduce',
                 queryFields: [this.reference.refToField],

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

@@ -660,7 +660,7 @@ describe('query:', () => {
             expect('run:ab->{ select: b.astr }').toTranslate();
         });
         const afields = test_translator_1.aTableDef.fields
-            .filter(f => (0, model_1.isAtomicFieldType)(f.type))
+            .filter(f => (0, model_1.isAtomic)(f))
             .map(f => f.name)
             .sort();
         test('expands star correctly', () => {

package/dist/model/malloy_types.d.ts

@@ -369,16 +369,12 @@ export interface NativeUnsupportedTypeDef {
     rawType?: string;
 }
 export type NativeUnsupportedFieldDef = NativeUnsupportedTypeDef & AtomicFieldDef;
-export interface ArrayTypeDef {
+export interface ArrayTypeDef extends JoinBase, StructDefBase {
     type: 'array';
     elementTypeDef: Exclude<AtomicTypeDef, RecordTypeDef> | RecordElementTypeDef;
-}
-export type ArrayFieldDef = ArrayTypeDef & AtomicFieldDef;
-export interface JoinedArrayTypeDef extends ArrayTypeDef, JoinBase, StructDefBase {
-    type: 'array';
     join: 'many';
 }
-export type JoinedArrayDef = JoinedArrayTypeDef & AtomicFieldDef;
+export type ArrayDef = ArrayTypeDef & AtomicFieldDef;
 export declare function arrayEachFields(arrayOf: AtomicTypeDef): AtomicFieldDef[];
 export interface RecordTypeDef extends StructDefBase, JoinBase {
     type: 'record';
@@ -387,7 +383,7 @@ export interface RecordTypeDef extends StructDefBase, JoinBase {
 export interface RecordElementTypeDef {
     type: 'record_element';
 }
-export interface RepeatedRecordTypeDef extends JoinedArrayTypeDef {
+export interface RepeatedRecordTypeDef extends ArrayDef {
     type: 'array';
     elementTypeDef: RecordElementTypeDef;
     join: 'many';
@@ -410,7 +406,7 @@ export interface JoinBase {
     matrixOperation?: MatrixOperation;
     onExpression?: Expr;
 }
-export type Joinable = TableSourceDef | SQLSourceDef | QuerySourceDef | RecordFieldDef | JoinedArrayDef;
+export type Joinable = TableSourceDef | SQLSourceDef | QuerySourceDef | RecordFieldDef | ArrayDef;
 export type JoinFieldDef = JoinBase & Joinable;
 export type JoinFieldTypes = 'table' | 'sql_select' | 'query_source' | 'array' | 'record';
 export declare function isJoinable(sd: StructDef): sd is Joinable;
@@ -604,7 +600,7 @@ export type SourceDef = TableSourceDef | SQLSourceDef | QuerySourceDef | QueryRe
 /** Is this the "FROM" table of a query tree */
 export declare function isBaseTable(def: StructDef): def is SourceDef;
 export declare function isScalarArray(def: FieldDef | StructDef): boolean;
-export type StructDef = SourceDef | RecordFieldDef | JoinedArrayDef;
+export type StructDef = SourceDef | RecordFieldDef | ArrayDef;
 export type ExpressionValueType = AtomicFieldType | 'null' | 'duration' | 'any' | 'regular expression';
 export type FieldValueType = ExpressionValueType | 'turtle' | JoinFieldTypes;
 export interface ExpressionTypeDesc {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.199";
+export declare const MALLOY_VERSION = "0.0.200";

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.199';
+exports.MALLOY_VERSION = '0.0.200';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.199",
+  "version": "0.0.200-dev241012235421",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",