@malloydata/malloy-interfaces 0.0.243-dev250314171809 → 0.0.243

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import type * as Malloy from './types';
 export * from './types';
 export { queryToMalloy } from './to_malloy';
-export { nestUnions } from './nest_unions';
+export { nestUnions, unnestUnions, convertFromThrift, convertToThrift, } from './nest_unions';
 export declare const test: Malloy.ModelInfo;
 export declare const res: Malloy.Result;
 export declare const thingy1: Malloy.Query;

package/dist/index.js

@@ -20,12 +20,15 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.thingy4sddfdfsd = exports.thingy4sdfsd = exports.thingy4dfdsfs = exports.thingy4asdfas = exports.thingy4asdfasdf = exports.thingy3dfdf = exports.thingy3 = exports.thingy2asdf = exports.thingyssdfg = exports.thingy123r = exports.thingy1 = exports.res = exports.test = exports.nestUnions = exports.queryToMalloy = void 0;
+exports.thingy4sddfdfsd = exports.thingy4sdfsd = exports.thingy4dfdsfs = exports.thingy4asdfas = exports.thingy4asdfasdf = exports.thingy3dfdf = exports.thingy3 = exports.thingy2asdf = exports.thingyssdfg = exports.thingy123r = exports.thingy1 = exports.res = exports.test = exports.convertToThrift = exports.convertFromThrift = exports.unnestUnions = exports.nestUnions = exports.queryToMalloy = void 0;
 __exportStar(require("./types"), exports);
 var to_malloy_1 = require("./to_malloy");
 Object.defineProperty(exports, "queryToMalloy", { enumerable: true, get: function () { return to_malloy_1.queryToMalloy; } });
 var nest_unions_1 = require("./nest_unions");
 Object.defineProperty(exports, "nestUnions", { enumerable: true, get: function () { return nest_unions_1.nestUnions; } });
+Object.defineProperty(exports, "unnestUnions", { enumerable: true, get: function () { return nest_unions_1.unnestUnions; } });
+Object.defineProperty(exports, "convertFromThrift", { enumerable: true, get: function () { return nest_unions_1.convertFromThrift; } });
+Object.defineProperty(exports, "convertToThrift", { enumerable: true, get: function () { return nest_unions_1.convertToThrift; } });
 exports.test = {
     entries: [
         {

package/dist/nest_unions.js

@@ -9,10 +9,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToThrift = exports.convertFromThrift = exports.unnestUnions = exports.nestUnions = void 0;
 const types_1 = require("./types");
 function nestUnions(obj) {
-    if (obj === null) {
+    if (obj === null || obj === undefined) {
         return obj;
     }
-    else if (typeof obj === 'string' || typeof obj === 'number') {
+    else if (typeof obj === 'string' ||
+        typeof obj === 'number' ||
+        typeof obj === 'boolean') {
         return obj;
     }
     else if (Array.isArray(obj)) {
@@ -42,7 +44,9 @@ function unnestUnions(obj, type) {
     if (obj === null || obj === undefined) {
         return obj;
     }
-    else if (typeof obj === 'string' || typeof obj === 'number') {
+    else if (typeof obj === 'string' ||
+        typeof obj === 'number' ||
+        typeof obj === 'boolean') {
         return obj;
     }
     else if (Array.isArray(obj)) {
@@ -84,15 +88,21 @@ function convertFromThrift(obj, type) {
     if (obj === null || obj === undefined) {
         return obj;
     }
-    else if (typeof obj === 'string') {
+    else if (typeof obj === 'string' || typeof obj === 'boolean') {
         return obj;
     }
     else if (typeof obj === 'number') {
-        const typeDefinition = types_1.MALLOY_INTERFACE_TYPES[type];
-        if (typeDefinition && typeDefinition.type === 'enum') {
-            return typeDefinition.values[obj - 1];
+        if (type === 'number')
+            return obj;
+        const typeDefinition = getType(type);
+        if (typeDefinition.type !== 'enum') {
+            throw new Error(`Found a number where a ${type} was expected`);
         }
-        return obj;
+        const entry = Object.entries(typeDefinition.values).find(([, value]) => value === obj);
+        if (entry === undefined) {
+            throw new Error(`${obj} is not a valid enum value for ${type}`);
+        }
+        return entry[0];
     }
     else if (Array.isArray(obj)) {
         return obj.map(value => convertFromThrift(value, type));
@@ -140,7 +150,7 @@ function convertToThrift(obj, type) {
     if (obj === null || obj === undefined) {
         return obj;
     }
-    else if (typeof obj === 'number') {
+    else if (typeof obj === 'number' || typeof obj === 'boolean') {
         return obj;
     }
     else if (typeof obj === 'string') {
@@ -148,7 +158,11 @@ function convertToThrift(obj, type) {
             return obj;
         const typeDefinition = getType(type);
         if (typeDefinition.type === 'enum') {
-            return typeDefinition.values.indexOf(obj) + 1;
+            const value = typeDefinition.values[obj];
+            if (value === undefined) {
+                throw new Error(`${obj} is not a valid enum value for ${type}`);
+            }
+            return value;
         }
     }
     else if (Array.isArray(obj)) {

package/dist/types.d.ts

@@ -14,7 +14,7 @@ type MalloyInterfaceType = {
 } | {
     name: string;
     type: 'enum';
-    values: string[];
+    values: Record<string, number>;
 };
 export declare const MALLOY_INTERFACE_TYPES: Record<string, MalloyInterfaceType>;
 export type Aggregate = {

package/dist/types.js

@@ -366,7 +366,13 @@ exports.MALLOY_INTERFACE_TYPES = {
     'DateTimeframe': {
         'type': 'enum',
         'name': 'DateTimeframe',
-        'values': ['year', 'quarter', 'month', 'week', 'day'],
+        'values': {
+            'year': 1,
+            'quarter': 2,
+            'month': 3,
+            'week': 4,
+            'day': 5,
+        },
     },
     'DateType': {
         'type': 'struct',
@@ -653,7 +659,12 @@ exports.MALLOY_INTERFACE_TYPES = {
     'LogSeverity': {
         'type': 'enum',
         'name': 'LogSeverity',
-        'values': ['debug', 'info', 'warn', 'error'],
+        'values': {
+            'debug': 1,
+            'info': 2,
+            'warn': 3,
+            'error': 4,
+        },
     },
     'MeasureInfo': {
         'type': 'struct',
@@ -756,7 +767,10 @@ exports.MALLOY_INTERFACE_TYPES = {
     'NumberSubtype': {
         'type': 'enum',
         'name': 'NumberSubtype',
-        'values': ['integer', 'decimal'],
+        'values': {
+            'integer': 1,
+            'decimal': 2,
+        },
     },
     'NumberType': {
         'type': 'struct',
@@ -788,7 +802,10 @@ exports.MALLOY_INTERFACE_TYPES = {
     'OrderByDirection': {
         'type': 'enum',
         'name': 'OrderByDirection',
-        'values': ['asc', 'desc'],
+        'values': {
+            'asc': 1,
+            'desc': 2,
+        },
     },
     'ParameterInfo': {
         'type': 'struct',
@@ -1006,7 +1023,11 @@ exports.MALLOY_INTERFACE_TYPES = {
     'Relationship': {
         'type': 'enum',
         'name': 'Relationship',
-        'values': ['one', 'many', 'cross'],
+        'values': {
+            'one': 1,
+            'many': 2,
+            'cross': 3,
+        },
     },
     'Result': {
         'type': 'struct',
@@ -1302,16 +1323,16 @@ exports.MALLOY_INTERFACE_TYPES = {
     'TimestampTimeframe': {
         'type': 'enum',
         'name': 'TimestampTimeframe',
-        'values': [
-            'year',
-            'quarter',
-            'month',
-            'week',
-            'day',
-            'hour',
-            'minute',
-            'second',
-        ],
+        'values': {
+            'year': 1,
+            'quarter': 2,
+            'month': 3,
+            'week': 4,
+            'day': 5,
+            'hour': 6,
+            'minute': 7,
+            'second': 8,
+        },
     },
     'TimestampType': {
         'type': 'struct',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy-interfaces",
-  "version": "0.0.243-dev250314171809",
+  "version": "0.0.243",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/scripts/hacky_gen_types.ts

@@ -28,7 +28,7 @@ type MalloyInterfaceType =
       fields: Record<string, MalloyInterfaceFieldType>;
     }
   | {name: string; type: 'union'; options: Record<string, string>}
-  | {name: string; type: 'enum'; values: string[]};
+  | {name: string; type: 'enum'; values: Record<string, number>};
 
 const types: Record<string, MalloyInterfaceType> = {};
 
@@ -46,10 +46,11 @@ for (const file of fs.readdirSync('./generated-types')) {
   );
   if (isAnEnum) {
     const name = isAnEnum[1];
-    const values: string[] = [];
-    const matches = actualTypes.matchAll(/ {4}([A-Z_]+) = \d+/g);
+    const values: Record<string, number> = {};
+    const matches = actualTypes.matchAll(/ {4}([A-Z_]+) = (\d+)/g);
     for (const match of matches) {
-      values.push(match[1].toLowerCase());
+      const [name, valueString] = [match[1].toLowerCase(), match[2]];
+      values[name] = parseInt(valueString);
     }
     types[name] = {
       type: 'enum',
@@ -152,7 +153,7 @@ type MalloyInterfaceType =
       fields: Record<string, MalloyInterfaceFieldType>;
     }
   | {name: string; type: 'union'; options: Record<string, string>}
-  | {name: string; type: 'enum'; values: string[]};
+  | {name: string; type: 'enum'; values: Record<string, number>};
 `);
 
 console.log(
@@ -172,7 +173,7 @@ for (const typeName in types) {
   const type = types[typeName];
   if (type.type === 'enum') {
     console.log(
-      `export type ${type.name} = ${type.values
+      `export type ${type.name} = ${Object.keys(type.values)
         .map(v => `'${v}'`)
         .join(' | ')};\n`
     );