@comet/api-generator 9.0.0-beta.2 → 9.0.0-beta.3

package/lib/commands/generate/generateCrudSingle/generate-crud-single.d.ts

@@ -1,4 +1,4 @@
 import { type CrudSingleGeneratorOptions } from "@comet/cms-api";
-import { type EntityMetadata } from "@mikro-orm/postgresql";
-import { type GeneratedFile } from "../utils/write-generated-files";
+import type { EntityMetadata } from "@mikro-orm/postgresql";
+import type { GeneratedFile } from "../utils/write-generated-files";
 export declare function generateCrudSingle(generatorOptions: CrudSingleGeneratorOptions, metadata: EntityMetadata<any>): Promise<GeneratedFile[]>;

package/lib/commands/generate/generateCrudSingle/generate-crud-single.js

@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateCrudSingle = generateCrudSingle;
 const cms_api_1 = require("@comet/cms-api");
@@ -48,25 +39,24 @@ const path = __importStar(require("path"));
 const build_options_1 = require("../generateCrud/build-options");
 const generate_crud_input_1 = require("../generateCrudInput/generate-crud-input");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function generateCrudSingle(generatorOptions, metadata) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const classNameSingular = metadata.className;
-        const classNamePlural = !metadata.className.endsWith("s") ? `${metadata.className}s` : metadata.className;
-        const instanceNameSingular = classNameSingular[0].toLocaleLowerCase() + classNameSingular.slice(1);
-        const instanceNamePlural = classNamePlural[0].toLocaleLowerCase() + classNamePlural.slice(1);
-        const fileNameSingular = instanceNameSingular.replace(/[A-Z]/g, (i) => `-${i.toLocaleLowerCase()}`);
-        const fileNamePlural = instanceNamePlural.replace(/[A-Z]/g, (i) => `-${i.toLocaleLowerCase()}`);
-        const { targetDirectory } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
-        function generateCrudResolver() {
-            return __awaiter(this, void 0, void 0, function* () {
-                const generatedFiles = [];
-                const scopeProp = metadata.props.find((prop) => prop.name == "scope");
-                if (scopeProp && !scopeProp.targetMeta)
-                    throw new Error("Scope prop has no targetMeta");
-                const blockProps = metadata.props.filter((prop) => {
-                    return (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "input") && prop.type === "RootBlockType";
-                });
-                const serviceOut = `import { ObjectQuery } from "@mikro-orm/postgresql";
+async function generateCrudSingle(generatorOptions, metadata) {
+    const classNameSingular = metadata.className;
+    const classNamePlural = !metadata.className.endsWith("s") ? `${metadata.className}s` : metadata.className;
+    const instanceNameSingular = classNameSingular[0].toLocaleLowerCase() + classNameSingular.slice(1);
+    const instanceNamePlural = classNamePlural[0].toLocaleLowerCase() + classNamePlural.slice(1);
+    const fileNameSingular = instanceNameSingular.replace(/[A-Z]/g, (i) => `-${i.toLocaleLowerCase()}`);
+    const fileNamePlural = instanceNamePlural.replace(/[A-Z]/g, (i) => `-${i.toLocaleLowerCase()}`);
+    const { targetDirectory } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+    async function generateCrudResolver() {
+        const generatedFiles = [];
+        const scopeProp = metadata.props.find((prop) => prop.name == "scope");
+        if (scopeProp && !scopeProp.targetMeta) {
+            throw new Error("Scope prop has no targetMeta");
+        }
+        const blockProps = metadata.props.filter((prop) => {
+            return (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "input") && prop.type === "RootBlockType";
+        });
+        const serviceOut = `import { ObjectQuery } from "@mikro-orm/postgresql";
     import { Injectable } from "@nestjs/common";
     import { ${metadata.className} } from "${path.relative(targetDirectory, metadata.path).replace(/\.ts$/, "")}";
     
@@ -75,15 +65,15 @@ function generateCrudSingle(generatorOptions, metadata) {
         
     }
     `;
-                generatedFiles.push({ name: `${fileNamePlural}.service.ts`, content: serviceOut, type: "service" });
-                const resolverOut = `import { FindOptions, EntityManager } from "@mikro-orm/postgresql";
+        generatedFiles.push({ name: `${fileNamePlural}.service.ts`, content: serviceOut, type: "service" });
+        const resolverOut = `import { FindOptions, EntityManager } from "@mikro-orm/postgresql";
     import { Args, ID, Mutation, Query, Resolver } from "@nestjs/graphql";
     import { RequiredPermission, SortDirection, validateNotModified } from "@comet/cms-api";
     
     import { ${metadata.className} } from "${path.relative(targetDirectory, metadata.path).replace(/\.ts$/, "")}";
     ${scopeProp && scopeProp.targetMeta
-                    ? `import { ${scopeProp.targetMeta.className} } from "${path.relative(targetDirectory, scopeProp.targetMeta.path).replace(/\.ts$/, "")}";`
-                    : ""}
+            ? `import { ${scopeProp.targetMeta.className} } from "${path.relative(targetDirectory, scopeProp.targetMeta.path).replace(/\.ts$/, "")}";`
+            : ""}
     import { ${classNamePlural}Service } from "./${fileNamePlural}.service";
     import { ${classNameSingular}Input } from "./dto/${fileNameSingular}.input";
 
@@ -133,13 +123,11 @@ function generateCrudSingle(generatorOptions, metadata) {
         }
     }
     `;
-                generatedFiles.push({ name: `${fileNameSingular}.resolver.ts`, content: resolverOut, type: "resolver" });
-                return generatedFiles;
-            });
-        }
-        return [
-            ...(yield (0, generate_crud_input_1.generateCrudInput)(generatorOptions, metadata, { nested: false, excludeFields: [], generateUpdateInput: false })),
-            ...(yield generateCrudResolver()),
-        ];
-    });
+        generatedFiles.push({ name: `${fileNameSingular}.resolver.ts`, content: resolverOut, type: "resolver" });
+        return generatedFiles;
+    }
+    return [
+        ...(await (0, generate_crud_input_1.generateCrudInput)(generatorOptions, metadata, { nested: false, excludeFields: [], generateUpdateInput: false })),
+        ...(await generateCrudResolver()),
+    ];
 }

package/lib/commands/generate/generateFiles.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -18,7 +9,7 @@ const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
 const cms_api_1 = require("@comet/cms-api");
 const cli_1 = require("@mikro-orm/cli");
-const lazy_metadata_storage_1 = require("@nestjs/graphql/dist/schema-builder/storages/lazy-metadata.storage");
+const lazy_metadata_storage_js_1 = require("@nestjs/graphql/dist/schema-builder/storages/lazy-metadata.storage.js");
 const prettier_1 = require("prettier");
 const build_options_1 = require("./generateCrud/build-options");
 const generate_crud_1 = require("./generateCrud/generate-crud");
@@ -30,16 +21,16 @@ const write_generated_files_1 = require("./utils/write-generated-files");
  * Generates CRUD files for all entities or a specific entity available at file path.
  * @param file
  */
-const generateFiles = (
+const generateFiles = async (
 /**
  * File path to the entity for which to generate CRUD files.
  *
  * @default undefined -> generate all entities
  */
-file) => __awaiter(void 0, void 0, void 0, function* () {
+file) => {
     let orm = null;
     try {
-        orm = yield cli_1.CLIHelper.getORM(undefined, undefined, { dbName: "generator" });
+        orm = await cli_1.CLIHelper.getORM(undefined, undefined, { dbName: "generator" });
     }
     catch (e) {
         node_console_1.default.warn(e);
@@ -47,7 +38,7 @@ file) => __awaiter(void 0, void 0, void 0, function* () {
     if (orm != null) {
         const writtenFiles = [];
         const entities = orm.em.getMetadata().getAll();
-        lazy_metadata_storage_1.LazyMetadataStorage.load();
+        lazy_metadata_storage_js_1.LazyMetadataStorage.load();
         for (const name in entities) {
             const entity = entities[name];
             if (!entity.class) {
@@ -59,32 +50,32 @@ file) => __awaiter(void 0, void 0, void 0, function* () {
                     const generatorOptions = Reflect.getMetadata(cms_api_1.CRUD_GENERATOR_METADATA_KEY, entity.class);
                     if (generatorOptions) {
                         node_console_1.default.log(`🚀 start generateCrud for Entity ${entity.path}`);
-                        const files = yield (0, generate_crud_1.generateCrud)(generatorOptions, entity);
+                        const files = await (0, generate_crud_1.generateCrud)(generatorOptions, entity);
                         const { targetDirectory } = (0, build_options_1.buildOptions)(entity, generatorOptions);
-                        yield (0, write_generated_files_1.writeGeneratedFiles)(files, targetDirectory);
-                        writtenFiles.push(...files.map((f) => { var _a; return (0, node_fs_1.realpathSync)(`${(_a = f.targetDirectory) !== null && _a !== void 0 ? _a : targetDirectory}/${f.name}`); }));
+                        await (0, write_generated_files_1.writeGeneratedFiles)(files, targetDirectory);
+                        writtenFiles.push(...files.map((f) => (0, node_fs_1.realpathSync)(`${f.targetDirectory ?? targetDirectory}/${f.name}`)));
                     }
                 }
                 {
                     const generatorOptions = Reflect.getMetadata(cms_api_1.CRUD_SINGLE_GENERATOR_METADATA_KEY, entity.class);
                     if (generatorOptions) {
                         node_console_1.default.log(`🚀 start generateCrudSingle for Entity ${entity.path}`);
-                        const files = yield (0, generate_crud_single_1.generateCrudSingle)(generatorOptions, entity);
+                        const files = await (0, generate_crud_single_1.generateCrudSingle)(generatorOptions, entity);
                         const { targetDirectory } = (0, build_options_1.buildOptions)(entity, generatorOptions);
-                        yield (0, write_generated_files_1.writeGeneratedFiles)(files, targetDirectory);
-                        writtenFiles.push(...files.map((f) => { var _a; return (0, node_fs_1.realpathSync)(`${(_a = f.targetDirectory) !== null && _a !== void 0 ? _a : targetDirectory}/${f.name}`); }));
+                        await (0, write_generated_files_1.writeGeneratedFiles)(files, targetDirectory);
+                        writtenFiles.push(...files.map((f) => (0, node_fs_1.realpathSync)(`${f.targetDirectory ?? targetDirectory}/${f.name}`)));
                     }
                 }
             }
         }
         if (writtenFiles.length > 0) {
             node_console_1.default.log(`Formatting ${writtenFiles.length} generated files...`);
-            yield Promise.all(writtenFiles.map((filepath) => __awaiter(void 0, void 0, void 0, function* () {
-                const [content, options] = yield Promise.all([(0, promises_1.readFile)(filepath, "utf-8"), (0, prettier_1.resolveConfig)(filepath)]);
-                const formatted = yield (0, prettier_1.format)(content, Object.assign(Object.assign({}, options), { filepath }));
-                yield (0, promises_1.writeFile)(filepath, formatted);
-            })));
+            await Promise.all(writtenFiles.map(async (filepath) => {
+                const [content, options] = await Promise.all([(0, promises_1.readFile)(filepath, "utf-8"), (0, prettier_1.resolveConfig)(filepath)]);
+                const formatted = await (0, prettier_1.format)(content, { ...options, filepath });
+                await (0, promises_1.writeFile)(filepath, formatted);
+            }));
         }
     }
-});
+};
 exports.generateFiles = generateFiles;

package/lib/commands/generate/utils/build-name-variants.d.ts

@@ -1,4 +1,4 @@
-import { type EntityMetadata } from "@mikro-orm/postgresql";
+import type { EntityMetadata } from "@mikro-orm/postgresql";
 export declare function buildNameVariants(metadata: EntityMetadata<any>): {
     classNameSingular: string;
     classNamePlural: string;

package/lib/commands/generate/utils/find-hooks-service.d.ts

@@ -1,6 +1,6 @@
-import { type CrudGeneratorOptions } from "@comet/cms-api";
-import { type EntityMetadata } from "@mikro-orm/core";
-import { type Imports } from "./generate-imports-code";
+import type { CrudGeneratorOptions } from "@comet/cms-api";
+import type { EntityMetadata } from "@mikro-orm/core";
+import type { Imports } from "./generate-imports-code";
 export declare function findHooksService({ generatorOptions, metadata, targetDirectory, }: {
     generatorOptions: CrudGeneratorOptions;
     metadata: EntityMetadata;

package/lib/commands/generate/utils/find-hooks-service.js

@@ -38,8 +38,7 @@ const path = __importStar(require("path"));
 const ts_morph_1 = require("ts-morph");
 const ts_morph_helper_1 = require("./ts-morph-helper");
 function findReturnTypeImport(type, serviceSourceFile, targetDirectory) {
-    var _a;
-    const symbol = (_a = type.getSymbol()) !== null && _a !== void 0 ? _a : type.getAliasSymbol();
+    const symbol = type.getSymbol() ?? type.getAliasSymbol();
     if (!symbol) {
         // Primitive type, no import needed
         return null;
@@ -68,8 +67,7 @@ function findReturnTypeImport(type, serviceSourceFile, targetDirectory) {
     }
 }
 function unwrapPromiseType(type) {
-    var _a;
-    if (((_a = type.getSymbol()) === null || _a === void 0 ? void 0 : _a.getName()) === "Promise") {
+    if (type.getSymbol()?.getName() === "Promise") {
         const typeArgs = type.getTypeArguments();
         if (typeArgs.length > 0) {
             return typeArgs[0];
@@ -84,7 +82,6 @@ function unwrapArrayType(type) {
     throw new Error(`Return type must be an array`);
 }
 function findHooksService({ generatorOptions, metadata, targetDirectory, }) {
-    var _a;
     if (!generatorOptions.hooksService) {
         return null;
     }
@@ -122,7 +119,7 @@ function findHooksService({ generatorOptions, metadata, targetDirectory, }) {
                 imports.push({ name: hooksServiceClassName, importPath });
             }
             const serviceClassRef = initializer.getSymbolOrThrow();
-            const serviceClassDeclaration = ((_a = serviceClassRef.getAliasedSymbol()) !== null && _a !== void 0 ? _a : serviceClassRef).getDeclarations().find(ts_morph_1.Node.isClassDeclaration);
+            const serviceClassDeclaration = (serviceClassRef.getAliasedSymbol() ?? serviceClassRef).getDeclarations().find(ts_morph_1.Node.isClassDeclaration);
             if (!serviceClassDeclaration) {
                 throw new Error("hooksService class declaration not found");
             }

package/lib/commands/generate/utils/ts-morph-helper.d.ts

@@ -1,4 +1,4 @@
-import { type EntityMetadata } from "@mikro-orm/postgresql";
+import type { EntityMetadata } from "@mikro-orm/postgresql";
 import { ClassDeclaration } from "ts-morph";
 export declare function morphTsClass(metadata: EntityMetadata<any>): ClassDeclaration;
 export declare function morphTsProperty(name: string, metadata: EntityMetadata<any>): import("ts-morph").PropertyDeclaration;

package/lib/commands/generate/utils/ts-morph-helper.js

@@ -52,33 +52,35 @@ const project = new ts_morph_1.Project({
 });
 function morphTsSource(metadata) {
     let tsSource = project.getSourceFile(metadata.path);
-    if (!tsSource)
+    if (!tsSource) {
         tsSource = project.addSourceFileAtPath(metadata.path);
+    }
     return tsSource;
 }
 function morphTsClass(metadata) {
     const tsSource = morphTsSource(metadata);
     const tsClass = tsSource.getClass(metadata.className);
-    if (!tsClass)
+    if (!tsClass) {
         throw new Error(`Class ${metadata.className} not found in ${metadata.path}`);
+    }
     return tsClass;
 }
 function morphTsProperty(name, metadata) {
     let currentClass = morphTsClass(metadata);
     while (currentClass) {
         const prop = currentClass.getProperty(name);
-        if (prop)
+        if (prop) {
             return prop;
+        }
         currentClass = currentClass.getBaseClass();
     }
     throw new Error(`Property ${name} not found in ${metadata.className}`);
 }
 function findImportPath(importName, targetDirectory, metadata) {
-    var _a;
     const tsSource = morphTsSource(metadata);
     for (const tsImport of tsSource.getImportDeclarations()) {
         for (const namedImport of tsImport.getNamedImports()) {
-            if (((_a = namedImport.getAliasNode()) === null || _a === void 0 ? void 0 : _a.getText()) == importName) {
+            if (namedImport.getAliasNode()?.getText() == importName) {
                 throw new Error("Aliased enum import is not supported");
             }
             if (namedImport.getNameNode().getText() == importName) {
@@ -88,8 +90,9 @@ function findImportPath(importName, targetDirectory, metadata) {
                     throw new Error(`Can't resolve import ${importPath}`);
                 }
                 const exportedDeclarations = importSource.getExportedDeclarations().get(importName);
-                if (!exportedDeclarations)
+                if (!exportedDeclarations) {
                     throw new Error(`Can't get exported declaration for ${importName}`);
+                }
                 const exportedDeclaration = exportedDeclarations[0];
                 if (importPath.startsWith("./") || importPath.startsWith("../")) {
                     const absolutePath = path.resolve(path.dirname(metadata.path), importPath);
@@ -129,11 +132,10 @@ function findEnumName(propertyName, metadata) {
         .replace(/\[\]$/, "");
 }
 function findEnumImportPath(enumName, targetDirectory, metadata) {
-    var _a;
     const tsSource = morphTsSource(metadata);
     if (tsSource.getEnum(enumName)) {
         //enum defined in same file as entity
-        if (!((_a = tsSource.getEnum(enumName)) === null || _a === void 0 ? void 0 : _a.isExported())) {
+        if (!tsSource.getEnum(enumName)?.isExported()) {
             throw new Error(`Enum ${enumName} is not exported in ${metadata.path}`);
         }
         return path.relative(targetDirectory, metadata.path).replace(/\.ts$/, "");
@@ -145,11 +147,10 @@ function findEnumImportPath(enumName, targetDirectory, metadata) {
     }
 }
 function findValidatorImportPath(validatorName, targetDirectory, metadata) {
-    var _a, _b;
     const tsSource = morphTsSource(metadata);
     //validator defined in same file as entity
     if (tsSource.getVariableDeclaration(validatorName) || tsSource.getFunction(validatorName)) {
-        if (!(((_a = tsSource.getVariableDeclaration(validatorName)) === null || _a === void 0 ? void 0 : _a.isExported()) || ((_b = tsSource.getFunction(validatorName)) === null || _b === void 0 ? void 0 : _b.isExported()))) {
+        if (!(tsSource.getVariableDeclaration(validatorName)?.isExported() || tsSource.getFunction(validatorName)?.isExported())) {
             throw new Error(`Validator ${validatorName} is not exported in ${metadata.path}`);
         }
         return path.relative(`${targetDirectory}/dto`, metadata.path).replace(/\.ts$/, "");
@@ -161,19 +162,20 @@ function findValidatorImportPath(validatorName, targetDirectory, metadata) {
 }
 function findBlockName(propertyName, metadata) {
     const tsProp = morphTsProperty(propertyName, metadata);
-    if (!tsProp)
+    if (!tsProp) {
         throw new Error("property not found");
+    }
     const rootBlockDecorator = tsProp.getDecorators().find((i) => i.getName() == "RootBlock");
-    if (!rootBlockDecorator)
+    if (!rootBlockDecorator) {
         throw new Error(`RootBlock decorator not found for property ${propertyName}`);
+    }
     return rootBlockDecorator.getArguments()[0].getText();
 }
 function findBlockImportPath(blockName, targetDirectory, metadata) {
-    var _a;
     const tsSource = morphTsSource(metadata);
     if (tsSource.getVariableDeclaration(blockName)) {
         //block defined in same file as entity
-        if (!((_a = tsSource.getVariableDeclaration(blockName)) === null || _a === void 0 ? void 0 : _a.isExported())) {
+        if (!tsSource.getVariableDeclaration(blockName)?.isExported()) {
             throw new Error(`Block ${blockName} is not exported in ${metadata.path}`);
         }
         return path.relative(targetDirectory, metadata.path).replace(/\.ts$/, "");
@@ -185,13 +187,12 @@ function findBlockImportPath(blockName, targetDirectory, metadata) {
     }
 }
 function findInputClassImportPath(className, targetDirectory, metadata) {
-    var _a;
     const tsSource = morphTsSource(metadata);
     let returnImportPath;
     let classDeclaration;
     if (tsSource.getClass(className)) {
         //block defined in same file as entity
-        if (!((_a = tsSource.getClass(className)) === null || _a === void 0 ? void 0 : _a.isExported())) {
+        if (!tsSource.getClass(className)?.isExported()) {
             throw new Error(`Class ${className} is not exported in ${metadata.path}`);
         }
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -219,14 +220,17 @@ function getFieldDecoratorClassName(propertyName, metadata) {
         return false;
     }
     const typeFnArg = fieldDecorator.getArguments()[0];
-    if (!typeFnArg)
+    if (!typeFnArg) {
         throw new Error(`${propertyName}: @Field is missing argument`);
-    if (typeFnArg.getKind() != ts_morph_1.SyntaxKind.ArrowFunction)
+    }
+    if (typeFnArg.getKind() != ts_morph_1.SyntaxKind.ArrowFunction) {
         throw new Error(`${propertyName}: @Field first argument must be an ArrowFunction`);
+    }
     const typeReturningArrowFunction = typeFnArg;
     const body = typeReturningArrowFunction.getBody();
-    if (body.getKind() != ts_morph_1.SyntaxKind.Identifier)
+    if (body.getKind() != ts_morph_1.SyntaxKind.Identifier) {
         throw new Error(`${propertyName}: @Field first argument must be an ArrowFunction returning an Identifier`);
+    }
     const identifier = body;
     const className = identifier.getText();
     return className;

package/lib/commands/generate/utils/write-generated-file.js

@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -50,23 +41,21 @@ exports.removeUnusedImports = removeUnusedImports;
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const typescript_1 = __importDefault(require("typescript"));
-function writeGeneratedFile(filePath, contents) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const header = `// This file has been generated by comet api-generator.
+async function writeGeneratedFile(filePath, contents) {
+    const header = `// This file has been generated by comet api-generator.
     // You may choose to use this file as scaffold by moving this file out of generated folder and removing this comment.
     `;
-        yield fs_1.promises.mkdir(path.dirname(filePath), { recursive: true });
-        const sourceFile = typescript_1.default.createSourceFile(filePath, header + contents, typescript_1.default.ScriptTarget.ES2024, true, typescript_1.default.ScriptKind.TS);
-        const result = typescript_1.default.transform(sourceFile, [removeUnusedImports()]);
-        const printer = typescript_1.default.createPrinter({
-            newLine: typescript_1.default.NewLineKind.LineFeed,
-            removeComments: false,
-        });
-        const prettyCode = printer.printFile(result.transformed[0]);
-        result.dispose();
-        yield fs_1.promises.writeFile(filePath, prettyCode);
-        console.log(`generated ${filePath}`);
+    await fs_1.promises.mkdir(path.dirname(filePath), { recursive: true });
+    const sourceFile = typescript_1.default.createSourceFile(filePath, header + contents, typescript_1.default.ScriptTarget.ES2024, true, typescript_1.default.ScriptKind.TS);
+    const result = typescript_1.default.transform(sourceFile, [removeUnusedImports()]);
+    const printer = typescript_1.default.createPrinter({
+        newLine: typescript_1.default.NewLineKind.LineFeed,
+        removeComments: false,
     });
+    const prettyCode = printer.printFile(result.transformed[0]);
+    result.dispose();
+    await fs_1.promises.writeFile(filePath, prettyCode);
+    console.log(`generated ${filePath}`);
 }
 function removeUnusedImports() {
     return (context) => {

package/lib/commands/generate/utils/write-generated-files.js

@@ -1,21 +1,9 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeGeneratedFiles = writeGeneratedFiles;
 const write_generated_file_1 = require("./write-generated-file");
-function writeGeneratedFiles(files, targetDirectory) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        for (const file of files) {
-            yield (0, write_generated_file_1.writeGeneratedFile)(`${(_a = file.targetDirectory) !== null && _a !== void 0 ? _a : targetDirectory}/${file.name}`, file.content);
-        }
-    });
+async function writeGeneratedFiles(files, targetDirectory) {
+    for (const file of files) {
+        await (0, write_generated_file_1.writeGeneratedFile)(`${file.targetDirectory ?? targetDirectory}/${file.name}`, file.content);
+    }
 }

package/lib/commands/generate/watchMode/handleChildProcess.d.ts

@@ -1,2 +1,2 @@
-import { type ChildProcessWithoutNullStreams } from "child_process";
+import type { ChildProcessWithoutNullStreams } from "child_process";
 export declare function handleChildProcess(child: ChildProcessWithoutNullStreams): Promise<string>;

package/lib/commands/generate/watchMode/watchMode.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,7 +20,7 @@ const waitForExit = (proc) => {
  *
  * Watches the `src` directory for changes and triggers child processes of generator for the changed file, to process it.
  */
-const watchMode = () => __awaiter(void 0, void 0, void 0, function* () {
+const watchMode = async () => {
     /**
      * Collection of last ChildProcesses for each file
      */
@@ -40,19 +31,19 @@ const watchMode = () => __awaiter(void 0, void 0, void 0, function* () {
             pollInterval: 200,
         },
         ignored: (path, stats) => {
-            if (stats === null || stats === void 0 ? void 0 : stats.isFile()) {
+            if (stats?.isFile()) {
                 return !path.endsWith(".entity.ts");
             }
             return false;
         },
     })
-        .on("change", (path) => __awaiter(void 0, void 0, void 0, function* () {
+        .on("change", async (path) => {
         node_console_1.default.log(`🚀 File changed: ${path}`);
         // Kill running processes for the changed file
         if (childProcesses[path]) {
             if (childProcesses[path].exitCode == null) {
                 childProcesses[path].kill();
-                yield waitForExit(childProcesses[path]);
+                await waitForExit(childProcesses[path]);
                 node_console_1.default.log("💀 Killed running process for file: ", path);
             }
             delete childProcesses[path];
@@ -71,9 +62,9 @@ const watchMode = () => __awaiter(void 0, void 0, void 0, function* () {
         catch (e) {
             node_console_1.default.error(`❌ Error processing ${path} with error: ${e}`);
         }
-    }))
+    })
         .on("error", (error) => {
         node_console_1.default.error(`Watcher error: ${error}`);
     });
-});
+};
 exports.watchMode = watchMode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/api-generator",
-  "version": "9.0.0-beta.2",
+  "version": "9.0.0-beta.3",
   "description": "Comet API Generator CLI tool",
   "repository": {
     "directory": "packages/api/api-generator",
@@ -25,15 +25,15 @@
     "ts-morph": "^25.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
-    "@comet/cms-api": "9.0.0-beta.2"
+    "@comet/cms-api": "9.0.0-beta.3"
   },
   "devDependencies": {
-    "@mikro-orm/cli": "^6.4.16",
-    "@mikro-orm/core": "^6.4.16",
-    "@mikro-orm/postgresql": "^6.4.16",
+    "@mikro-orm/cli": "^6.6.12",
+    "@mikro-orm/core": "^6.6.12",
+    "@mikro-orm/postgresql": "^6.6.12",
     "@nestjs/graphql": "^13.2.3",
     "@types/jest": "^29.5.14",
-    "@types/node": "^24.12.0",
+    "@types/node": "^24.12.2",
     "@types/pluralize": "^0.0.33",
     "class-validator": "^0.14.3",
     "eslint": "^9.39.2",
@@ -42,9 +42,9 @@
     "prettier": "^3.6.2",
     "reflect-metadata": "^0.2.2",
     "rimraf": "^6.1.2",
-    "ts-jest": "^29.4.6",
+    "ts-jest": "^29.4.9",
     "uuid": "^11.1.0",
-    "@comet/eslint-config": "9.0.0-beta.2"
+    "@comet/eslint-config": "9.0.0-beta.3"
   },
   "peerDependencies": {
     "@mikro-orm/cli": "^6.0.0",