@malloydata/malloy 0.0.362 → 0.0.363

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

@@ -223,6 +223,9 @@ type MessageParameterTypes = {
     'invalid-source-from-query': string;
     'invalid-source-from-function': string;
     'invalid-source-from-connection': string;
+    'invalid-source-from-user-type': string;
+    'user-type-not-found': string;
+    'not-a-user-type': string;
     'invalid-source-source': string;
     'unnamed-source-argument': string;
     'duplicate-source-argument': string;
@@ -249,10 +252,11 @@ type MessageParameterTypes = {
     'failed-to-compute-arrow-source': string;
     'failed-to-compute-source-from-query': string;
     'failed-to-compute-source-to-extend': string;
+    'failed-to-compute-source-to-type': string;
     'cannot-use-as-query': string;
     'source-or-query-not-found': string;
     'illegal-query-argument': string;
-    'cannot-use-struct-as-source': string;
+    'cannot-use-user-type-as-source': string;
     'illegal-refinement-of-source': string;
     'invalid-source-as-query': string;
     'invalid-sql-source-interpolation': string;
@@ -260,6 +264,13 @@ type MessageParameterTypes = {
     'query-definition-name-conflict': string;
     'query-definition-from-non-query': string;
     'source-definition-name-conflict': string;
+    'user-type-definition-name-conflict': string;
+    'virtual-source-not-yet-implemented': string;
+    'virtual-source-missing-user-type-refs': string;
+    'virtual-source-unknown-dialect': string;
+    'user-type-field-missing': string;
+    'user-type-type-mismatch': string;
+    'user-type-field-conflict': string;
     'parameter-name-conflict': string;
     'parameter-shadowing-field': string;
     'invalid-import-url': string;

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

@@ -197,6 +197,7 @@ export declare class MalloyTranslator extends MalloyTranslation {
     importZone: Zone<string>;
     pretranslatedModels: Map<string, ModelDef>;
     sqlQueryZone: Zone<SQLSourceDef>;
+    connectionDialectZone: Zone<string>;
     logger: BaseMessageLogger;
     readonly root: MalloyTranslator;
     constructor(rootURL: string, importURL?: string | null, preload?: ParseUpdate | null, eventStream?: EventStream | null);
@@ -208,6 +209,7 @@ interface ErrorData {
     urls: Record<string, string>;
     compileSQL: Record<string, string>;
     translations: Record<string, string>;
+    connectionDialects: Record<string, string>;
 }
 export interface URLData {
     urls: ZoneData<string>;
@@ -221,7 +223,10 @@ export interface SchemaData {
 export interface SQLSources {
     compileSQL: ZoneData<SQLSourceDef>;
 }
-export interface UpdateData extends URLData, SchemaData, SQLSources, ModelData {
+export interface ConnectionDialects {
+    connectionDialects: ZoneData<string>;
+}
+export interface UpdateData extends URLData, SchemaData, SQLSources, ModelData, ConnectionDialects {
     errors: Partial<ErrorData>;
 }
 export type ParseUpdate = Partial<UpdateData>;

package/dist/lang/parse-malloy.js

@@ -146,6 +146,12 @@ class ImportsAndTablesStep {
                     range: this.parseReferences.tables[ref].firstReference,
                 });
             }
+            for (const connName in this.parseReferences.connectionDialects) {
+                that.root.connectionDialectZone.reference(connName, {
+                    url: that.sourceURL,
+                    range: this.parseReferences.connectionDialects[connName].firstReference,
+                });
+            }
             for (const relativeRef in this.parseReferences.urls) {
                 const firstRef = this.parseReferences.urls[relativeRef];
                 try {
@@ -186,6 +192,14 @@ class ImportsAndTablesStep {
             }
             allMissing = { tables };
         }
+        const missingDialects = that.root.connectionDialectZone.getUndefined();
+        if (missingDialects) {
+            const connectionDialects = {};
+            for (const connName of missingDialects) {
+                connectionDialects[connName] = { connectionName: connName };
+            }
+            allMissing = { ...allMissing, connectionDialects };
+        }
         const missingImports = ((_a = that.root.importZone.getUndefined()) !== null && _a !== void 0 ? _a : []).filter(url => that.root.pretranslatedModels.get(url) === undefined);
         if (missingImports.length > 0) {
             allMissing = {
@@ -784,6 +798,7 @@ class MalloyTranslator extends MalloyTranslation {
         this.importZone = new zone_1.Zone();
         this.pretranslatedModels = new Map();
         this.sqlQueryZone = new zone_1.Zone();
+        this.connectionDialectZone = new zone_1.Zone();
         this.root = this;
         this.logger = new parse_log_1.BaseMessageLogger(eventStream);
         if (preload) {
@@ -791,10 +806,11 @@ class MalloyTranslator extends MalloyTranslation {
         }
     }
     update(dd) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this.schemaZone.updateFrom(dd.tables, (_a = dd.errors) === null || _a === void 0 ? void 0 : _a.tables);
         this.importZone.updateFrom(dd.urls, (_b = dd.errors) === null || _b === void 0 ? void 0 : _b.urls);
         this.sqlQueryZone.updateFrom(dd.compileSQL, (_c = dd.errors) === null || _c === void 0 ? void 0 : _c.compileSQL);
+        this.connectionDialectZone.updateFrom(dd.connectionDialects, (_d = dd.errors) === null || _d === void 0 ? void 0 : _d.connectionDialects);
         for (const url in dd.translations) {
             this.pretranslatedModels.set(url, dd.translations[url]);
         }

package/dist/lang/parse-tree-walkers/find-external-references.d.ts

@@ -8,6 +8,9 @@ type NeedTables = Record<string, {
     tablePath: string;
     firstReference: DocumentRange;
 }>;
+type NeedConnectionDialects = Record<string, {
+    firstReference: DocumentRange;
+}>;
 export declare function constructTableKey(connectionName: string | undefined, tablePath: string): string;
 /**
  * This function parses an old-style `tableURI` into a connection name and
@@ -25,6 +28,7 @@ export declare function deprecatedParseTableURI(tableURI: string): {
 export interface FindReferencesData {
     tables: NeedTables;
     urls: NeedImports;
+    connectionDialects: NeedConnectionDialects;
 }
 export declare function findReferences(trans: MalloyTranslation, tokens: CommonTokenStream, parseTree: ParseTree): FindReferencesData;
 export {};

package/dist/lang/parse-tree-walkers/find-external-references.js

@@ -53,6 +53,7 @@ class FindExternalReferences {
         this.tokens = tokens;
         this.needTables = {};
         this.needImports = {};
+        this.needConnectionDialects = {};
     }
     registerTableReference(connectionName, tablePath, reference) {
         const key = constructTableKey(connectionName, tablePath);
@@ -70,6 +71,14 @@ class FindExternalReferences {
         const reference = this.trans.rangeFromContext(pcx);
         this.registerTableReference(connId, tablePath, reference);
     }
+    enterVirtualSource(pcx) {
+        const connId = (0, parse_utils_1.getId)(pcx.connectionId());
+        if (connId && !this.needConnectionDialects[connId]) {
+            this.needConnectionDialects[connId] = {
+                firstReference: this.trans.rangeFromContext(pcx),
+            };
+        }
+    }
     enterImportURL(pcx) {
         const url = getPlainString(pcx);
         if (!this.needImports[url]) {
@@ -108,6 +117,7 @@ function findReferences(trans, tokens, parseTree) {
     return {
         tables: finder.needTables,
         urls: finder.needImports,
+        connectionDialects: finder.needConnectionDialects,
     };
 }
 //# sourceMappingURL=find-external-references.js.map

package/dist/lang/test/test-translator.d.ts

@@ -1,4 +1,4 @@
-import type { DocumentLocation, FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, QueryFieldDef, StructDef, TurtleDef, SourceDef, TableSourceDef, SQLSourceDef } from '../../model/malloy_types';
+import type { DocumentLocation, FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, QueryFieldDef, StructDef, TurtleDef, SourceDef, TableSourceDef, SQLSourceDef, UserTypeDef } from '../../model/malloy_types';
 import { MalloyElement } from '../ast';
 import type { NameSpace } from '../ast/types/name-space';
 import type { ModelEntry } from '../ast/types/model-entry';
@@ -59,6 +59,7 @@ export declare class TestTranslator extends MalloyTranslator {
     unresolved(): DataRequestResponse;
     getSourceDef(srcName: string): SourceDef | undefined;
     getQuery(queryName: string | number): Query | undefined;
+    getUserTypeDef(name: string): UserTypeDef | undefined;
 }
 export declare class BetaExpression extends TestTranslator {
     readonly sourceName: string;

package/dist/lang/test/test-translator.js

@@ -423,6 +423,8 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         for (const actualSchema of exports.mockSchema) {
             this.schemaZone.define(`${actualSchema.connection}:${actualSchema.tablePath}`, actualSchema);
         }
+        this.connectionDialectZone.define('_db_', exports.TEST_DIALECT);
+        this.connectionDialectZone.define('_bq_', 'standardsql');
     }
     translate() {
         return super.translate(this.internalModel);
@@ -518,6 +520,14 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         }
         return undefined;
     }
+    getUserTypeDef(name) {
+        const t = this.translate().modelDef;
+        const s = t === null || t === void 0 ? void 0 : t.contents[name];
+        if (s && (0, malloy_types_1.isUserTypeDef)(s)) {
+            return s;
+        }
+        return undefined;
+    }
 }
 exports.TestTranslator = TestTranslator;
 TestTranslator.inspectCompile = false;

package/dist/lang/translate-response.d.ts

@@ -36,7 +36,12 @@ export interface SQLSourceRequest {
 export interface NeedCompileSQL {
     compileSQL: SQLSourceRequest;
 }
-interface NeededData extends NeedURLData, NeedSchemaData, NeedCompileSQL {
+export interface NeedConnectionDialects {
+    connectionDialects: Record<string, {
+        connectionName: string;
+    }>;
+}
+interface NeededData extends NeedURLData, NeedSchemaData, NeedCompileSQL, NeedConnectionDialects {
 }
 export type DataRequestResponse = Partial<NeededData> & ResponseBase;
 export declare function isNeedResponse(dr: DataRequestResponse): dr is NeededData;

package/dist/lang/translate-response.js

@@ -24,6 +24,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNeedResponse = isNeedResponse;
 function isNeedResponse(dr) {
-    return !!dr && (dr.tables || dr.urls || dr.compileSQL) !== undefined;
+    return (!!dr &&
+        (dr.tables || dr.urls || dr.compileSQL || dr.connectionDialects) !==
+            undefined);
 }
 //# sourceMappingURL=translate-response.js.map

package/dist/model/malloy_types.d.ts

@@ -728,6 +728,9 @@ export interface CompositeSourceDef extends SourceDefBase {
     type: 'composite';
     sources: SourceDef[];
 }
+export interface VirtualSourceDef extends SourceDefBase {
+    type: 'virtual';
+}
 export interface SQLStringSegment {
     sql: string;
 }
@@ -797,7 +800,7 @@ export declare function isSourceDef(sd: NamedModelObject | FieldDef): sd is Sour
  * These factories explicitly copy only safe fields, preventing accidental
  * propagation of sourceID/extends which must only be set in DefineSource.
  */
-export type SourceDef = TableSourceDef | SQLSourceDef | QuerySourceDef | QueryResultDef | FinalizeSourceDef | NestSourceDef | CompositeSourceDef;
+export type SourceDef = TableSourceDef | SQLSourceDef | QuerySourceDef | QueryResultDef | FinalizeSourceDef | NestSourceDef | VirtualSourceDef | CompositeSourceDef;
 /** Sources that can be persisted (materialized to tables) */
 export type PersistableSourceDef = SQLSourceDef | QuerySourceDef;
 export declare function isPersistableSourceDef(sd: SourceDef): sd is PersistableSourceDef;
@@ -953,7 +956,18 @@ export type QueryFieldDef = AtomicFieldDef | TurtleDef | RefToField;
 export type TypedDef = AtomicTypeDef | JoinFieldDef | TurtleDef | RefToField | StructDef;
 /** Get the output name for a NamedObject */
 export declare function getIdentifier(n: AliasedName): string;
-export type NamedModelObject = SourceDef | NamedQueryDef | FunctionDef | ConnectionDef;
+export interface UserTypeFieldDef {
+    name: string;
+    typeDef: AtomicTypeDef;
+    annotation?: Annotation;
+}
+export interface UserTypeDef extends NamedObject {
+    type: 'userType';
+    fields: UserTypeFieldDef[];
+    annotation?: Annotation;
+}
+export declare function isUserTypeDef(sd: NamedModelObject): sd is UserTypeDef;
+export type NamedModelObject = SourceDef | NamedQueryDef | FunctionDef | ConnectionDef | UserTypeDef;
 export interface DependencyTree {
     [url: string]: DependencyTree;
 }
@@ -1069,6 +1083,11 @@ export interface SearchValueMapResult {
         weight: number;
     }[];
 }
+/**
+ * Maps virtual source names to actual table paths, keyed by connection name.
+ * Uses Map instead of Record because both keys are user-provided strings.
+ */
+export type VirtualMap = Map<string, Map<string, string>>;
 export interface PrepareResultOptions {
     defaultRowLimit?: number;
     isPartialQuery?: boolean;
@@ -1077,6 +1096,8 @@ export interface PrepareResultOptions {
     buildManifest?: BuildManifest;
     /** Map from connectionName to connectionDigest (from Connection.getDigest()) */
     connectionDigests?: SafeRecord<string>;
+    /** Map from connectionName → virtualName → tablePath for virtual source resolution */
+    virtualMap?: VirtualMap;
 }
 type UTD = AtomicTypeDef | TypedDef | FunctionParameterTypeDef | FunctionReturnTypeDef | undefined;
 /**

package/dist/model/malloy_types.js

@@ -89,6 +89,7 @@ exports.isLiteral = isLiteral;
 exports.mergeEvalSpaces = mergeEvalSpaces;
 exports.isBasicAtomic = isBasicAtomic;
 exports.getIdentifier = getIdentifier;
+exports.isUserTypeDef = isUserTypeDef;
 exports.isCompoundArrayData = isCompoundArrayData;
 exports.isTurtle = isTurtle;
 exports.isAtomic = isAtomic;
@@ -478,6 +479,7 @@ function isSourceDef(sd) {
         sd.type === 'query_result' ||
         sd.type === 'finalize' ||
         sd.type === 'nest_source' ||
+        sd.type === 'virtual' ||
         sd.type === 'composite');
 }
 function isPersistableSourceDef(sd) {
@@ -524,6 +526,9 @@ function getIdentifier(n) {
     }
     return n.name;
 }
+function isUserTypeDef(sd) {
+    return sd.type === 'userType';
+}
 /** Type guard: is this array value compound (array of records) vs basic (array of scalars)? */
 function isCompoundArrayData(v) {
     return (Array.isArray(v) &&
@@ -585,7 +590,12 @@ exports.TD = {
         }
         function checkFields(a, b) {
             const aSchema = {};
-            for (const aEnt of a['fields'] || []) {
+            const aFields = a['fields'] || [];
+            const bFields = b['fields'] || [];
+            if (aFields.length !== bFields.length) {
+                return false;
+            }
+            for (const aEnt of aFields) {
                 if (aEnt.name) {
                     aSchema[aEnt.name] = aEnt;
                 }
@@ -593,7 +603,7 @@ exports.TD = {
                     return false;
                 }
             }
-            for (const bEnt of b['fields'] || []) {
+            for (const bEnt of bFields) {
                 if (!exports.TD.eq(aSchema[bEnt.name], bEnt)) {
                     return false;
                 }

package/dist/model/query_model_impl.js

@@ -46,6 +46,9 @@ class QueryModelImpl {
             else if (s.type === 'query') {
                 /* TODO */
             }
+            else if (s.type === 'userType') {
+                // User type definitions are metadata only, not queryable
+            }
             else {
                 throw new Error('Internal Error: Unknown structure type');
             }

package/dist/model/query_query.js

@@ -514,10 +514,18 @@ class QueryQuery extends query_node_1.QueryField {
         return outputStruct;
     }
     getStructSourceSQL(qs, stageWriter) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         switch (qs.structDef.type) {
             case 'table':
                 return this.parent.dialect.quoteTablePath(qs.structDef.tablePath);
+            case 'virtual': {
+                const virtualMap = (_a = qs.prepareResultOptions) === null || _a === void 0 ? void 0 : _a.virtualMap;
+                const tablePath = (_b = virtualMap === null || virtualMap === void 0 ? void 0 : virtualMap.get(qs.structDef.connection)) === null || _b === void 0 ? void 0 : _b.get(qs.structDef.name);
+                if (!tablePath) {
+                    throw new Error(`No virtual map entry for '${qs.structDef.name}' on connection '${qs.structDef.connection}'`);
+                }
+                return this.parent.dialect.quoteTablePath(tablePath);
+            }
             case 'composite':
                 // TODO: throw an error here; not simple because we call into this
                 // code currently before the composite source is resolved in some cases
@@ -525,7 +533,7 @@ class QueryQuery extends query_node_1.QueryField {
             case 'finalize':
                 return qs.structDef.name;
             case 'sql_select':
-                return `(${(0, sql_compiled_1.getCompiledSQL)(qs.structDef, (_a = qs.prepareResultOptions) !== null && _a !== void 0 ? _a : {}, path => this.parent.dialect.quoteTablePath(path), (query, opts) => {
+                return `(${(0, sql_compiled_1.getCompiledSQL)(qs.structDef, (_c = qs.prepareResultOptions) !== null && _c !== void 0 ? _c : {}, path => this.parent.dialect.quoteTablePath(path), (query, opts) => {
                     // Compile query to isolated SQL (not into parent's stageWriter)
                     const ret = this.compileQueryToStages(query, opts !== null && opts !== void 0 ? opts : {}, undefined, false);
                     return ret.sql;
@@ -533,7 +541,7 @@ class QueryQuery extends query_node_1.QueryField {
             case 'nest_source':
                 return qs.structDef.pipeSQL;
             case 'query_source': {
-                const { buildManifest, connectionDigests } = (_b = qs.prepareResultOptions) !== null && _b !== void 0 ? _b : {};
+                const { buildManifest, connectionDigests } = (_d = qs.prepareResultOptions) !== null && _d !== void 0 ? _d : {};
                 // Check manifest for this source
                 if (buildManifest && connectionDigests) {
                     const connDigest = (0, malloy_types_1.safeRecordGet)(connectionDigests, qs.structDef.connection);

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.362";
+export declare const MALLOY_VERSION = "0.0.363";

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.362",
+  "version": "0.0.363",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -47,9 +47,9 @@
     "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": {
-    "@malloydata/malloy-filter": "0.0.362",
-    "@malloydata/malloy-interfaces": "0.0.362",
-    "@malloydata/malloy-tag": "0.0.362",
+    "@malloydata/malloy-filter": "0.0.363",
+    "@malloydata/malloy-interfaces": "0.0.363",
+    "@malloydata/malloy-tag": "0.0.363",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",