@malloydata/malloy-interfaces 0.0.241 → 0.0.242-dev250313012122

package/package.json

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

package/scripts/hacky_gen_types.ts

@@ -1,43 +1,37 @@
-import * as fs from 'fs';
-
-// eslint-disable-next-line no-console
-console.log(`/*
+/* eslint-disable no-console */
+/*
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-/*
- * Autogenerated.
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-*/`);
+import * as fs from 'fs';
 
 function snakeToCamel(m: string) {
-  return m.replace(/_([a-z])/g, g => g[1].toUpperCase());
+  const uncapped = m
+    .replace(/_([a-z])/g, g => g[1].toUpperCase())
+    .replace(/json/g, 'JSON')
+    .replace(/sql/g, 'SQL');
+  return uncapped[0].toUpperCase() + uncapped.slice(1);
 }
 
-function fixEnum(m: string) {
-  m = m.replace(/enum ([A-Za-z]+)Type {/, 'type $1Type = ');
-  return m.replace(/ {2}[A-Za-z]+With[A-Za-z_]+ = ("[a-z_]+"),?\n}?/g, '| $1');
-}
+type MalloyInterfaceFieldType = {
+  type: string;
+  optional: boolean;
+  array: boolean;
+};
 
-function fixEnum2(m: string) {
-  m = m.replace(/export enum ([A-Za-z_]+) {\n/g, 'export type $1 =');
-  m = m.replace(/ {2}([A-Z_]+) = \d+,?\n/g, m =>
-    m.replace(/ {2}([A-Z_]+) = \d+,?\n/, '| "$1"').toLowerCase()
-  );
-  return m.replace(/\}/, '');
-}
+type MalloyInterfaceType =
+  | {
+      name: string;
+      type: 'struct';
+      fields: Record<string, MalloyInterfaceFieldType>;
+    }
+  | {name: string; type: 'union'; options: Record<string, string>}
+  | {name: string; type: 'enum'; values: string[]};
 
-function fixUnionType(m: string) {
-  m = m.replace(/\n {2}(__type: [A-Za-z_]+Type.[A-Za-z_]+);\n/, '$1} &');
-  m = m.replace(/ {2}[a-z_]+\?: undefined;\n/g, '');
-  m = m.replace(/ {2}[a-z_]+: ([A-Za-z_]+);\n/, ' $1');
-  m = m.replace(/}$/, ';');
-  return m;
-}
+const types: Record<string, MalloyInterfaceType> = {};
 
-let allTypes = '';
 for (const file of fs.readdirSync('./generated-types')) {
   if (file === 'index.ts') continue;
   const text = fs.readFileSync(`./generated-types/${file}`, 'utf8');
@@ -46,44 +40,175 @@ for (const file of fs.readdirSync('./generated-types')) {
   const firstNonTypeLine = lines.findIndex(
     line => line.endsWith('Args;') || line.endsWith('Args {')
   );
-  let actualTypes = lines.slice(firstTypeLine, firstNonTypeLine).join('\n');
-  actualTypes = actualTypes.replace(
-    /export interface I([A-Za-z_]+) {/g,
-    'export type $1 = {'
+  const actualTypes = lines.slice(firstTypeLine, firstNonTypeLine).join('\n');
+  const isAnEnum = actualTypes.match(
+    /export enum ([A-Za-z]+) {\n( {4}([A-Z_]+) = \d+,?\n)+}/
   );
-  actualTypes = actualTypes.replace(/([A-Za-z]+)\.I\1/g, '$1');
-  actualTypes = actualTypes.replace(/([A-Za-z]+)\.\1/g, '$1');
-  actualTypes = actualTypes.replace(/= I/g, '= ');
-  actualTypes = actualTypes.replace(/\| I/g, '| ');
-  actualTypes = actualTypes.replace(/ {4}/g, '  ');
-  actualTypes = actualTypes.replace(
-    /enum ([A-Za-z]+)Type {\n( {2}\1With([A-Za-z_]+) = "[a-z_]+",?\n)+}/g,
-    fixEnum
+  if (isAnEnum) {
+    const name = isAnEnum[1];
+    const values: string[] = [];
+    const matches = actualTypes.matchAll(/ {4}([A-Z_]+) = \d+/g);
+    for (const match of matches) {
+      values.push(match[1].toLowerCase());
+    }
+    types[name] = {
+      type: 'enum',
+      name,
+      values,
+    };
+    continue;
+  }
+  const isUnion = actualTypes.match(
+    /export enum ([A-Za-z]+)Type {\n(?: {4}[A-Za-z]+With[A-Za-z_]+ = "([a-z_]+)",?\n)+}/
   );
-  actualTypes = actualTypes.replace(
-    /export type ([A-Za-z]+)With([A-Za-z_]+) = {\n {2}(__type: \1Type.\1With\2);\n( {2}[a-z_]+\?: undefined;\n)*( {2}[a-z_]+: [A-Za-z_]+;\n)( {2}[a-z_]+\?: undefined;\n)*}/g,
-    fixUnionType
-  );
-  actualTypes = actualTypes.replace(
-    /__type: ([A-Za-z]+)Type\.\1With[A-Za-z_]+/g,
-    m =>
-      m
-        .replace(
-          /__type: [A-Za-z]+Type\.[A-Za-z]+With([A-Za-z_]+)/,
-          '__type: "$1"'
-        )
-        .toLowerCase()
-  );
-  actualTypes = actualTypes.replace(
-    /export enum ([A-Za-z_]+) {\n( {2}[A-Z_]+ = \d+,?\n)+}/g,
-    fixEnum2
-  );
-  actualTypes = actualTypes.replace(/Json/g, 'JSON');
-  actualTypes = actualTypes.replace(/Sql/g, 'SQL');
-  actualTypes = actualTypes.replace(/__type/g, 'kind');
-  actualTypes = actualTypes.replace(/With[A-Za-z_]+/g, snakeToCamel);
-  allTypes += actualTypes + '\n';
+  if (isUnion) {
+    const name = isUnion[1];
+    const options: Record<string, string> = {};
+    const optionMatches = actualTypes.matchAll(
+      / {4}([a-z_]+): ([A-Za-z]+).I[A-Za-z]+;/g
+    );
+    for (const optionMatch of optionMatches) {
+      const [name, type] = [optionMatch[1], optionMatch[2]];
+      options[name] = type;
+    }
+    types[name] = {
+      type: 'union',
+      name,
+      options,
+    };
+    continue;
+  }
+  // ... for "clarity"
+  const isStruct = true;
+  if (isStruct) {
+    const nameMatch = actualTypes.match(/export interface I([A-Za-z]+) {/)!;
+    const name = nameMatch[1];
+    const fields: Record<string, MalloyInterfaceFieldType> = {};
+    const fieldMatches = actualTypes.matchAll(
+      / {4}([a-z_]+)(\?)?: (?:([a-z]+)|([A-Za-z]+)\.[A-Za-z]+|(?:Array<([a-z]+)>)|(?:Array<([A-Za-z]+)\.[A-Za-z]+>));/g
+    );
+    for (const fieldMatch of fieldMatches) {
+      const [
+        name,
+        optionalQ,
+        basicType,
+        specialType,
+        arrayBasicType,
+        arraySpecialType,
+      ] = [
+        fieldMatch[1],
+        fieldMatch[2],
+        fieldMatch[3],
+        fieldMatch[4],
+        fieldMatch[5],
+        fieldMatch[6],
+      ];
+      const optional = optionalQ === '?';
+      const type =
+        (basicType && {type: basicType, optional, array: false}) ??
+        (specialType && {type: specialType, optional, array: false}) ??
+        (arrayBasicType && {
+          type: arrayBasicType,
+          array: true,
+          optional,
+        }) ??
+        (arraySpecialType && {
+          type: arraySpecialType,
+          array: true,
+          optional,
+        });
+      if (!type) throw new Error(`Invalid type ${fieldMatch[0]}`);
+      fields[name] = type;
+    }
+    types[name] = {
+      type: 'struct',
+      name,
+      fields,
+    };
+  }
+}
+
+console.log(`/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+/*
+ * Autogenerated.
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+
+type MalloyInterfaceFieldType = {
+  type: string;
+  optional: boolean;
+  array: boolean;
+};
+
+type MalloyInterfaceType =
+  | {
+      name: string;
+      type: 'struct';
+      fields: Record<string, MalloyInterfaceFieldType>;
+    }
+  | {name: string; type: 'union'; options: Record<string, string>}
+  | {name: string; type: 'enum'; values: string[]};
+`);
+
+console.log(
+  `export const MALLOY_INTERFACE_TYPES: Record<string, MalloyInterfaceType> = ${JSON.stringify(
+    types,
+    null,
+    2
+  )
+    .replace(/"/g, "'")
+    .replace(/'\n/g, "',\n")
+    .replace(/true\n/g, 'true,\n')
+    .replace(/false\n/g, 'false,\n')
+    .replace(/}\n/g, '},\n')}\n`
+);
+
+for (const typeName in types) {
+  const type = types[typeName];
+  if (type.type === 'enum') {
+    console.log(
+      `export type ${type.name} = ${type.values
+        .map(v => `'${v}'`)
+        .join(' | ')};\n`
+    );
+  } else if (type.type === 'struct') {
+    console.log(`export type ${type.name} = {
+${Object.entries(type.fields)
+  .map(
+    ([name, field]) =>
+      `  ${name}${
+        field.optional ? '?' : ''
+      }: ${malloyInterfaceFieldTypeToString(field)};`
+  )
+  .join('\n')}
+}\n`);
+  } else if (type.type === 'union') {
+    console.log(
+      `export type ${type.name}Type = ${Object.keys(type.options)
+        .map(kind => `'${kind}'`)
+        .join(' | ')};\n`
+    );
+    console.log(
+      `export type ${type.name} = ${Object.keys(type.options)
+        .map(kind => `${type.name}With${snakeToCamel(kind)}`)
+        .join(' | ')};\n`
+    );
+    for (const kind in type.options) {
+      const childType = type.options[kind];
+      console.log(
+        `export type ${type.name}With${snakeToCamel(
+          kind
+        )} = {kind: '${kind}'} & ${childType};\n`
+      );
+    }
+  }
 }
 
-// eslint-disable-next-line no-console
-console.log(allTypes);
+function malloyInterfaceFieldTypeToString(type: MalloyInterfaceFieldType) {
+  return type.array ? `Array<${type.type}>` : type.type;
+}