@malloydata/malloy 0.0.342 → 0.0.343

package/dist/api/foundation/compile.d.ts

@@ -65,6 +65,10 @@ export declare class Malloy {
      * Get the property definitions for a registered connection type.
      */
     static getConnectionProperties(typeName: string): ConnectionPropertyDefinition[] | undefined;
+    /**
+     * Get the human-readable display name for a registered connection type.
+     */
+    static getConnectionTypeDisplayName(typeName: string): string | undefined;
     /**
      * Get the names of all registered connection types.
      */

package/dist/api/foundation/compile.js

@@ -57,6 +57,12 @@ class Malloy {
     static getConnectionProperties(typeName) {
         return (0, registry_1.getConnectionProperties)(typeName);
     }
+    /**
+     * Get the human-readable display name for a registered connection type.
+     */
+    static getConnectionTypeDisplayName(typeName) {
+        return (0, registry_1.getConnectionTypeDisplayName)(typeName);
+    }
     /**
      * Get the names of all registered connection types.
      */

package/dist/connection/registry.d.ts

@@ -2,7 +2,7 @@ import type { Connection, ConnectionConfig, LookupConnection } from './types';
 /**
  * A factory function that creates a Connection from a config object.
  */
-export type ConnectionTypeFactory = (config: ConnectionConfig) => Connection;
+export type ConnectionTypeFactory = (config: ConnectionConfig) => Promise<Connection>;
 /**
  * The type of a connection property value.
  */
@@ -24,27 +24,35 @@ export interface ConnectionPropertyDefinition {
  * A connection type definition: factory plus property metadata.
  */
 export interface ConnectionTypeDef {
+    displayName: string;
     factory: ConnectionTypeFactory;
     properties: ConnectionPropertyDefinition[];
 }
 /**
- * A sensitive value in a config file. Either a plain string (already resolved)
- * or an environment variable reference.
+ * An environment variable reference in a config file.
  */
-export type SecretValue = string | {
+export type ValueRef = {
     env: string;
 };
 /**
- * Resolve a sensitive value. Plain strings pass through, {env: "X"} looks up
- * process.env["X"], anything else returns undefined.
+ * The type of a config property value: a literal, an env reference, or undefined.
+ */
+export type ConfigValue = string | number | boolean | ValueRef | undefined;
+/**
+ * Type guard for ValueRef.
+ */
+export declare function isValueRef(value: ConfigValue): value is ValueRef;
+/**
+ * Resolve a ValueRef to a string by looking up the environment variable.
+ * Returns undefined if the env var is not set.
  */
-export declare function resolveSecret(value: unknown): string | undefined;
+export declare function resolveValue(vr: ValueRef): string | undefined;
 /**
  * A single connection entry in a JSON config.
  */
 export interface ConnectionConfigEntry {
     is: string;
-    [key: string]: string | number | boolean | SecretValue | undefined;
+    [key: string]: ConfigValue;
 }
 /**
  * The editable intermediate representation of a connections config file.
@@ -66,6 +74,13 @@ export declare function registerConnectionType(typeName: string, def: Connection
  * @returns The property definitions, or undefined if the type is not registered.
  */
 export declare function getConnectionProperties(typeName: string): ConnectionPropertyDefinition[] | undefined;
+/**
+ * Get the display name for a registered connection type.
+ *
+ * @param typeName The connection type name.
+ * @returns The human-readable display name, or undefined if the type is not registered.
+ */
+export declare function getConnectionTypeDisplayName(typeName: string): string | undefined;
 /**
  * Get the names of all registered connection types.
  */

package/dist/connection/registry.js

@@ -4,26 +4,27 @@
  * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveSecret = resolveSecret;
+exports.isValueRef = isValueRef;
+exports.resolveValue = resolveValue;
 exports.registerConnectionType = registerConnectionType;
 exports.getConnectionProperties = getConnectionProperties;
+exports.getConnectionTypeDisplayName = getConnectionTypeDisplayName;
 exports.getRegisteredConnectionTypes = getRegisteredConnectionTypes;
 exports.readConnectionsConfig = readConnectionsConfig;
 exports.writeConnectionsConfig = writeConnectionsConfig;
 exports.createConnectionsFromConfig = createConnectionsFromConfig;
 /**
- * Resolve a sensitive value. Plain strings pass through, {env: "X"} looks up
- * process.env["X"], anything else returns undefined.
+ * Type guard for ValueRef.
  */
-function resolveSecret(value) {
-    if (typeof value === 'string')
-        return value;
-    if (value !== null && typeof value === 'object' && 'env' in value) {
-        const envName = value.env;
-        if (typeof envName === 'string')
-            return process.env[envName];
-    }
-    return undefined;
+function isValueRef(value) {
+    return typeof value === 'object' && value !== null && 'env' in value;
+}
+/**
+ * Resolve a ValueRef to a string by looking up the environment variable.
+ * Returns undefined if the env var is not set.
+ */
+function resolveValue(vr) {
+    return process.env[vr.env];
 }
 // Module-level registry
 const registry = new Map();
@@ -46,6 +47,16 @@ function getConnectionProperties(typeName) {
     var _a;
     return (_a = registry.get(typeName)) === null || _a === void 0 ? void 0 : _a.properties;
 }
+/**
+ * Get the display name for a registered connection type.
+ *
+ * @param typeName The connection type name.
+ * @returns The human-readable display name, or undefined if the type is not registered.
+ */
+function getConnectionTypeDisplayName(typeName) {
+    var _a;
+    return (_a = registry.get(typeName)) === null || _a === void 0 ? void 0 : _a.displayName;
+}
 /**
  * Get the names of all registered connection types.
  */
@@ -104,26 +115,23 @@ function createConnectionsFromConfig(config) {
                 throw new Error(`No registered connection type "${entry.is}" for connection "${connectionName}". ` +
                     'Did you forget to import the connection package?');
             }
-            const sensitiveProps = new Set(typeDef.properties
-                .filter(p => p.type === 'password' || p.type === 'secret')
-                .map(p => p.name));
             const connConfig = { name: connectionName };
             for (const [key, value] of Object.entries(entry)) {
                 if (key === 'is')
                     continue;
                 if (value !== undefined) {
-                    if (sensitiveProps.has(key)) {
-                        const resolved = resolveSecret(value);
+                    if (isValueRef(value)) {
+                        const resolved = resolveValue(value);
                         if (resolved !== undefined) {
                             connConfig[key] = resolved;
                         }
                     }
-                    else if (typeof value !== 'object') {
+                    else {
                         connConfig[key] = value;
                     }
                 }
             }
-            const connection = typeDef.factory(connConfig);
+            const connection = await typeDef.factory(connConfig);
             cache.set(connectionName, connection);
             return connection;
         },

package/dist/index.d.ts

@@ -9,8 +9,8 @@ export type { PreparedQuery, Field, AtomicField, ExploreField, QueryField, Sorta
 export type { QueryOptionsReader, RunSQLOptions } from './run_sql_options';
 export type { EventStream, ModelString, ModelURL, QueryString, QueryURL, URLReader, InvalidationKey, } from './runtime_types';
 export type { Connection, ConnectionConfig, ConnectionParameterValue, FetchSchemaOptions, InfoConnection, LookupConnection, PersistSQLResults, PooledConnection, TestableConnection, StreamingConnection, } from './connection/types';
-export { registerConnectionType, getConnectionProperties, getRegisteredConnectionTypes, readConnectionsConfig, writeConnectionsConfig, createConnectionsFromConfig, resolveSecret, } from './connection/registry';
-export type { ConnectionTypeFactory, ConnectionPropertyType, ConnectionPropertyDefinition, ConnectionTypeDef, ConnectionConfigEntry, ConnectionsConfig, SecretValue, } from './connection/registry';
+export { registerConnectionType, getConnectionProperties, getConnectionTypeDisplayName, getRegisteredConnectionTypes, readConnectionsConfig, writeConnectionsConfig, createConnectionsFromConfig, isValueRef, resolveValue, } from './connection/registry';
+export type { ConnectionTypeFactory, ConnectionPropertyType, ConnectionPropertyDefinition, ConnectionTypeDef, ConnectionConfigEntry, ConnectionsConfig, ConfigValue, ValueRef, } from './connection/registry';
 export { toAsyncGenerator } from './connection_utils';
 export { modelDefToModelInfo, sourceDefToSourceInfo } from './to_stable';
 export * as API from './api';

package/dist/index.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Runtime = exports.Malloy = exports.Model = exports.MalloyTranslator = exports.malloyToQuery = exports.constantExprToSQL = exports.isDateUnit = exports.isTimestampUnit = exports.composeSQLExpr = exports.indent = exports.expressionIsUngroupedAggregate = exports.expressionIsScalar = exports.expressionIsCalculation = exports.expressionIsAnalytic = exports.expressionIsAggregate = exports.mkFieldDef = exports.mkArrayDef = exports.isBasicArray = exports.isRepeatedRecord = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoined = exports.isCompoundArrayData = exports.isBasicAtomic = exports.isAtomic = exports.isSourceDef = exports.TinyParser = exports.Dialect = exports.spread = exports.literal = exports.variadicParam = exports.param = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.MySQLDialect = exports.SnowflakeDialect = exports.PostgresDialect = exports.TrinoDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
-exports.makeDigest = exports.PersistSource = exports.annotationToTaglines = exports.annotationToTag = exports.sqlKey = exports.API = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.resolveSecret = exports.createConnectionsFromConfig = exports.writeConnectionsConfig = exports.readConnectionsConfig = exports.getRegisteredConnectionTypes = exports.getConnectionProperties = exports.registerConnectionType = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = void 0;
+exports.makeDigest = exports.PersistSource = exports.annotationToTaglines = exports.annotationToTag = exports.sqlKey = exports.API = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.resolveValue = exports.isValueRef = exports.createConnectionsFromConfig = exports.writeConnectionsConfig = exports.readConnectionsConfig = exports.getRegisteredConnectionTypes = exports.getConnectionTypeDisplayName = exports.getConnectionProperties = exports.registerConnectionType = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -138,11 +138,13 @@ Object.defineProperty(exports, "CacheManager", { enumerable: true, get: function
 var registry_1 = require("./connection/registry");
 Object.defineProperty(exports, "registerConnectionType", { enumerable: true, get: function () { return registry_1.registerConnectionType; } });
 Object.defineProperty(exports, "getConnectionProperties", { enumerable: true, get: function () { return registry_1.getConnectionProperties; } });
+Object.defineProperty(exports, "getConnectionTypeDisplayName", { enumerable: true, get: function () { return registry_1.getConnectionTypeDisplayName; } });
 Object.defineProperty(exports, "getRegisteredConnectionTypes", { enumerable: true, get: function () { return registry_1.getRegisteredConnectionTypes; } });
 Object.defineProperty(exports, "readConnectionsConfig", { enumerable: true, get: function () { return registry_1.readConnectionsConfig; } });
 Object.defineProperty(exports, "writeConnectionsConfig", { enumerable: true, get: function () { return registry_1.writeConnectionsConfig; } });
 Object.defineProperty(exports, "createConnectionsFromConfig", { enumerable: true, get: function () { return registry_1.createConnectionsFromConfig; } });
-Object.defineProperty(exports, "resolveSecret", { enumerable: true, get: function () { return registry_1.resolveSecret; } });
+Object.defineProperty(exports, "isValueRef", { enumerable: true, get: function () { return registry_1.isValueRef; } });
+Object.defineProperty(exports, "resolveValue", { enumerable: true, get: function () { return registry_1.resolveValue; } });
 var connection_utils_1 = require("./connection_utils");
 Object.defineProperty(exports, "toAsyncGenerator", { enumerable: true, get: function () { return connection_utils_1.toAsyncGenerator; } });
 var to_stable_1 = require("./to_stable");

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.342";
+export declare const MALLOY_VERSION = "0.0.343";

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

package/package.json

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