@malloydata/malloy 0.0.341 → 0.0.342

package/dist/connection/registry.d.ts

@@ -6,7 +6,7 @@ export type ConnectionTypeFactory = (config: ConnectionConfig) => Connection;
 /**
  * The type of a connection property value.
  */
-export type ConnectionPropertyType = 'string' | 'number' | 'boolean' | 'password' | 'file' | 'text';
+export type ConnectionPropertyType = 'string' | 'number' | 'boolean' | 'password' | 'secret' | 'file' | 'text';
 /**
  * Describes a single configuration property for a connection type.
  */
@@ -27,12 +27,24 @@ export interface ConnectionTypeDef {
     factory: ConnectionTypeFactory;
     properties: ConnectionPropertyDefinition[];
 }
+/**
+ * A sensitive value in a config file. Either a plain string (already resolved)
+ * or an environment variable reference.
+ */
+export type SecretValue = string | {
+    env: string;
+};
+/**
+ * Resolve a sensitive value. Plain strings pass through, {env: "X"} looks up
+ * process.env["X"], anything else returns undefined.
+ */
+export declare function resolveSecret(value: unknown): string | undefined;
 /**
  * A single connection entry in a JSON config.
  */
 export interface ConnectionConfigEntry {
     is: string;
-    [key: string]: string | number | boolean | undefined;
+    [key: string]: string | number | boolean | SecretValue | undefined;
 }
 /**
  * The editable intermediate representation of a connections config file.

package/dist/connection/registry.js

@@ -4,12 +4,27 @@
  * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveSecret = resolveSecret;
 exports.registerConnectionType = registerConnectionType;
 exports.getConnectionProperties = getConnectionProperties;
 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.
+ */
+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;
+}
 // Module-level registry
 const registry = new Map();
 /**
@@ -89,12 +104,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) {
-                    connConfig[key] = value;
+                    if (sensitiveProps.has(key)) {
+                        const resolved = resolveSecret(value);
+                        if (resolved !== undefined) {
+                            connConfig[key] = resolved;
+                        }
+                    }
+                    else if (typeof value !== 'object') {
+                        connConfig[key] = value;
+                    }
                 }
             }
             const connection = typeDef.factory(connConfig);

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, } from './connection/registry';
-export type { ConnectionTypeFactory, ConnectionPropertyType, ConnectionPropertyDefinition, ConnectionTypeDef, ConnectionConfigEntry, ConnectionsConfig, } from './connection/registry';
+export { registerConnectionType, getConnectionProperties, getRegisteredConnectionTypes, readConnectionsConfig, writeConnectionsConfig, createConnectionsFromConfig, resolveSecret, } from './connection/registry';
+export type { ConnectionTypeFactory, ConnectionPropertyType, ConnectionPropertyDefinition, ConnectionTypeDef, ConnectionConfigEntry, ConnectionsConfig, SecretValue, } 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.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.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;
 /*
  * Copyright 2023 Google LLC
  *
@@ -142,6 +142,7 @@ Object.defineProperty(exports, "getRegisteredConnectionTypes", { enumerable: tru
 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; } });
 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.341";
+export declare const MALLOY_VERSION = "0.0.342";

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.341",
+  "version": "0.0.342",
   "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.341",
-    "@malloydata/malloy-interfaces": "0.0.341",
-    "@malloydata/malloy-tag": "0.0.341",
+    "@malloydata/malloy-filter": "0.0.342",
+    "@malloydata/malloy-interfaces": "0.0.342",
+    "@malloydata/malloy-tag": "0.0.342",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",