cleaning up generation

Author: skiniks

packages/lex-cli/src/generator/index.ts

@@ -5,23 +5,22 @@ import { type DocumentSchema, documentSchema } from './schema.js';
 
 export interface GenerateDefinitionsOptions {
   files: string[];
-  main: boolean;
   banner?: string;
   description?: string;
   debug?: boolean;
   onProgress?: (filename: string, index: number, total: number) => void;
 }
 
 export async function generateDefinitions(opts: GenerateDefinitionsOptions) {
-  const { files, main, banner, description } = opts;
+  const { files, banner, description } = opts;
 
   let queries = '';
   let procedures = '';
   let records = '';
   let subscriptions = '';
 
   let code = `/* eslint-disable */
-// This file is automatically generated, do not edit!`;
+// This file is automatically generated by @tsky/lex-cli, do not edit!`;
 
   if (description) {
     code += `\n\n/**
@@ -30,14 +29,7 @@ export async function generateDefinitions(opts: GenerateDefinitionsOptions) {
  */`;
   }
 
-  if (main) {
-    code += `\n\n${banner ?? ''}\n${mainPrelude}`;
-  }
-  else {
-    code += `\n\nimport "@tsky/lexicons";${banner ?? ''}
-
-declare module "@tsky/lexicons" {`;
-  }
+  code += `\n\n${banner ?? ''}\n${mainPrelude}`;
 
   for await (const filename of files.sort(sortName)) {
     let document: DocumentSchema;
@@ -305,31 +297,15 @@ declare module "@tsky/lexicons" {`;
     }
 
     code += writeJsdoc(descs);
-
-    if (main) {
-      code += `export declare namespace ${tsNamespace} {`;
-    }
-    else {
-      code += `namespace ${tsNamespace} {`;
-    }
-
+    code += `export declare namespace ${tsNamespace} {`;
     code += chunk;
     code += '}\n\n';
   }
 
-  if (main) {
-    code += `export declare interface Records {${records}}\n\n`;
-    code += `export declare interface Queries {${queries}}\n\n`;
-    code += `export declare interface Procedures {${procedures}}\n\n`;
-    code += `export declare interface Subscriptions {${subscriptions}}\n\n`;
-  }
-  else {
-    code += `interface Records {${records}}\n\n`;
-    code += `interface Queries {${queries}}\n\n`;
-    code += `interface Procedures {${procedures}}\n\n`;
-    code += `interface Subscriptions {${subscriptions}}\n\n`;
-    code += '}';
-  }
+  code += `export declare interface Records {${records}}\n\n`;
+  code += `export declare interface Queries {${queries}}\n\n`;
+  code += `export declare interface Procedures {${procedures}}\n\n`;
+  code += `export declare interface Subscriptions {${subscriptions}}\n\n`;
 
   return code;
 }

packages/lex-cli/src/index.ts

@@ -57,7 +57,6 @@ cli.register(
       try {
         code = await generateDefinitions({
           files: this.files,
-          main: true,
           banner: this.banner,
           description: this.desc,
         });

packages/lexicons/src/lib/lexicons.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-// This file is automatically generated, do not edit!
+// This file is automatically generated by @tsky/lex-cli, do not edit!
 
 /**
  * @module