@goast/kotlin 0.3.12 → 0.3.13

package/cjs/lib/generators/models/model-generator.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultKotlinModelGenerator = void 0;
+const tslib_1 = require("tslib");
 /* eslint-disable unused-imports/no-unused-vars */
 const path_1 = require("path");
-const fs_extra_1 = require("fs-extra");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const core_1 = require("@goast/core");
 const ast_1 = require("../../ast");
 const file_builder_1 = require("../../file-builder");
@@ -19,8 +20,8 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
             const packageName = this.getPackageName(ctx, { schema: ctx.schema });
             const filePath = `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}/${typeName}.kt`;
             console.log(`Generating model ${packageName}.${typeName} to ${filePath}...`);
-            (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(filePath));
-            (0, fs_extra_1.writeFileSync)(filePath, new file_builder_1.KotlinFileBuilder(packageName, ctx.config).append(this.getFileContent(ctx, {})).toString());
+            fs_extra_1.default.ensureDirSync((0, path_1.dirname)(filePath));
+            fs_extra_1.default.writeFileSync(filePath, new file_builder_1.KotlinFileBuilder(packageName, ctx.config).append(this.getFileContent(ctx, {})).toString());
             return { type: ast_1.kt.reference(typeName, packageName) };
         }
         else {

package/cjs/lib/generators/services/okhttp3-clients/okhttp3-client-generator.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultKotlinOkHttp3Generator = void 0;
+const tslib_1 = require("tslib");
 /* eslint-disable unused-imports/no-unused-vars */
 const fs_1 = require("fs");
 const path_1 = require("path");
-const fs_extra_1 = require("fs-extra");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const core_1 = require("@goast/core");
 const ast_1 = require("../../../ast");
 const file_builder_1 = require("../../../file-builder");
@@ -15,7 +16,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
         const typeName = this.getApiClientName(ctx, {});
         const packageName = this.getPackageName(ctx, {});
         const filePath = this.getFilePath(ctx, { packageName });
-        (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(filePath));
+        fs_extra_1.default.ensureDirSync((0, path_1.dirname)(filePath));
         console.log(`Generating client for service ${ctx.service.name} to ${filePath}...`);
         const builder = new file_builder_1.KotlinFileBuilder(packageName, ctx.config);
         builder.append(this.getClientFileContent(ctx, {}));

package/cjs/lib/generators/services/okhttp3-clients/okhttp3-clients-generator.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KotlinOkHttp3ClientsGenerator = void 0;
+const tslib_1 = require("tslib");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const fs_extra_1 = require("fs-extra");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const core_1 = require("@goast/core");
 const models_1 = require("./models");
 const okhttp3_client_generator_1 = require("./okhttp3-client-generator");
@@ -62,10 +63,11 @@ class KotlinOkHttp3ClientsGenerator extends core_1.OpenApiServicesGenerationProv
     copyInfrastructureFiles(ctx) {
         const sourceDir = (0, path_1.resolve)((0, path_1.dirname)(require.resolve('@goast/kotlin')), '../assets/client/okhttp3');
         const targetDir = (0, path_1.resolve)(ctx.config.outputDir, ctx.infrastructurePackageName.replace(/\./g, '/'));
-        (0, fs_extra_1.ensureDirSync)(targetDir);
-        const files = (0, fs_extra_1.readdirSync)(sourceDir);
+        fs_extra_1.default.ensureDirSync(targetDir);
+        const files = fs_extra_1.default.readdirSync(sourceDir);
         for (const file of files) {
-            const fileContent = (0, fs_extra_1.readFileSync)((0, path_1.resolve)(sourceDir, file))
+            const fileContent = fs_extra_1.default
+                .readFileSync((0, path_1.resolve)(sourceDir, file))
                 .toString()
                 .replace(/@PACKAGE_NAME@/g, ctx.infrastructurePackageName);
             (0, fs_1.writeFileSync)((0, path_1.resolve)(targetDir, file), fileContent);

package/cjs/lib/generators/services/spring-controllers/spring-controller-generator.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultKotlinSpringControllerGenerator = void 0;
 exports.listToFlux = listToFlux;
+const tslib_1 = require("tslib");
 /* eslint-disable unused-imports/no-unused-vars */
-const fs_extra_1 = require("fs-extra");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const core_1 = require("@goast/core");
 const ast_1 = require("../../../ast");
 const file_builder_1 = require("../../../file-builder");
@@ -13,7 +14,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     generate(ctx) {
         const packageName = this.getPackageName(ctx, {});
         const dirPath = this.getDirectoryPath(ctx, { packageName });
-        (0, fs_extra_1.ensureDirSync)(dirPath);
+        fs_extra_1.default.ensureDirSync(dirPath);
         console.log(`Generating service ${ctx.service.id} to ${dirPath}...`);
         return {
             apiInterface: this.generateApiInterfaceFile(ctx, { dirPath, packageName }),
@@ -30,7 +31,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         console.log(`  Generating API interface ${typeName} to ${fileName}...`);
         const builder = new file_builder_1.KotlinFileBuilder(packageName, ctx.config);
         builder.append(this.getApiInterfaceFileContent(ctx, { interfaceName: typeName }));
-        (0, fs_extra_1.writeFileSync)(filePath, builder.toString());
+        fs_extra_1.default.writeFileSync(filePath, builder.toString());
         return { typeName, packageName };
     }
     getApiInterfaceFileContent(ctx, args) {
@@ -159,7 +160,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         console.log(`  Generating API controller ${typeName} to ${fileName}...`);
         const builder = new file_builder_1.KotlinFileBuilder(packageName, ctx.config);
         builder.append(this.getApiControllerFileContent(ctx, { controllerName: typeName }));
-        (0, fs_extra_1.writeFileSync)(filePath, builder.toString());
+        fs_extra_1.default.writeFileSync(filePath, builder.toString());
         return { typeName, packageName };
     }
     getApiControllerFileContent(ctx, args) {
@@ -217,7 +218,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         console.log(`  Generating API delegate ${typeName} to ${fileName}...`);
         const builder = new file_builder_1.KotlinFileBuilder(packageName, ctx.config);
         builder.append(this.getApiDelegateInterfaceFileContent(ctx, { delegateInterfaceName: typeName }));
-        (0, fs_extra_1.writeFileSync)(filePath, builder.toString());
+        fs_extra_1.default.writeFileSync(filePath, builder.toString());
         return { typeName, packageName };
     }
     getApiDelegateInterfaceFileContent(ctx, args) {

package/esm/lib/generators/models/model-generator.js

@@ -1,6 +1,6 @@
 /* eslint-disable unused-imports/no-unused-vars */
 import { dirname } from 'path';
-import { ensureDirSync, writeFileSync } from 'fs-extra';
+import fs from 'fs-extra';
 import { appendValueGroup, createOverwriteProxy, getSchemaReference, modify, modifyEach, notNullish, resolveAnyOfAndAllOf, toCasing, } from '../../../index.js';
 import { kt } from '../../ast/index.js';
 import { KotlinFileBuilder } from '../../file-builder.js';
@@ -16,8 +16,8 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             const packageName = this.getPackageName(ctx, { schema: ctx.schema });
             const filePath = `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}/${typeName}.kt`;
             console.log(`Generating model ${packageName}.${typeName} to ${filePath}...`);
-            ensureDirSync(dirname(filePath));
-            writeFileSync(filePath, new KotlinFileBuilder(packageName, ctx.config).append(this.getFileContent(ctx, {})).toString());
+            fs.ensureDirSync(dirname(filePath));
+            fs.writeFileSync(filePath, new KotlinFileBuilder(packageName, ctx.config).append(this.getFileContent(ctx, {})).toString());
             return { type: kt.reference(typeName, packageName) };
         }
         else {

package/esm/lib/generators/services/okhttp3-clients/okhttp3-client-generator.js

@@ -1,7 +1,7 @@
 /* eslint-disable unused-imports/no-unused-vars */
 import { writeFileSync } from 'fs';
 import { dirname } from 'path';
-import { ensureDirSync } from 'fs-extra';
+import fs from 'fs-extra';
 import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, toCasing, resolveAnyOfAndAllOf, } from '../../../../index.js';
 import { kt } from '../../../ast/index.js';
 import { KotlinFileBuilder } from '../../../file-builder.js';
@@ -12,7 +12,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         const typeName = this.getApiClientName(ctx, {});
         const packageName = this.getPackageName(ctx, {});
         const filePath = this.getFilePath(ctx, { packageName });
-        ensureDirSync(dirname(filePath));
+        fs.ensureDirSync(dirname(filePath));
         console.log(`Generating client for service ${ctx.service.name} to ${filePath}...`);
         const builder = new KotlinFileBuilder(packageName, ctx.config);
         builder.append(this.getClientFileContent(ctx, {}));

package/esm/lib/generators/services/okhttp3-clients/okhttp3-clients-generator.js

@@ -1,6 +1,6 @@
 import { writeFileSync } from 'fs';
 import { dirname, resolve } from 'path';
-import { ensureDirSync, readFileSync, readdirSync } from 'fs-extra';
+import fs from 'fs-extra';
 import { Factory, OpenApiServicesGenerationProviderBase } from '../../../../index.js';
 import { defaultKotlinOkHttp3ClientsGeneratorConfig, } from './models.js';
 import { DefaultKotlinOkHttp3Generator } from './okhttp3-client-generator.js';
@@ -59,10 +59,11 @@ export class KotlinOkHttp3ClientsGenerator extends OpenApiServicesGenerationProv
     copyInfrastructureFiles(ctx) {
         const sourceDir = resolve(dirname(require.resolve('@goast/kotlin')), '../assets/client/okhttp3');
         const targetDir = resolve(ctx.config.outputDir, ctx.infrastructurePackageName.replace(/\./g, '/'));
-        ensureDirSync(targetDir);
-        const files = readdirSync(sourceDir);
+        fs.ensureDirSync(targetDir);
+        const files = fs.readdirSync(sourceDir);
         for (const file of files) {
-            const fileContent = readFileSync(resolve(sourceDir, file))
+            const fileContent = fs
+                .readFileSync(resolve(sourceDir, file))
                 .toString()
                 .replace(/@PACKAGE_NAME@/g, ctx.infrastructurePackageName);
             writeFileSync(resolve(targetDir, file), fileContent);

package/esm/lib/generators/services/spring-controllers/spring-controller-generator.js

@@ -1,5 +1,5 @@
 /* eslint-disable unused-imports/no-unused-vars */
-import { ensureDirSync, writeFileSync } from 'fs-extra';
+import fs from 'fs-extra';
 import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, notNullish, toCasing, resolveAnyOfAndAllOf, } from '../../../../index.js';
 import { kt } from '../../../ast/index.js';
 import { KotlinFileBuilder } from '../../../file-builder.js';
@@ -9,7 +9,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     generate(ctx) {
         const packageName = this.getPackageName(ctx, {});
         const dirPath = this.getDirectoryPath(ctx, { packageName });
-        ensureDirSync(dirPath);
+        fs.ensureDirSync(dirPath);
         console.log(`Generating service ${ctx.service.id} to ${dirPath}...`);
         return {
             apiInterface: this.generateApiInterfaceFile(ctx, { dirPath, packageName }),
@@ -26,7 +26,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         console.log(`  Generating API interface ${typeName} to ${fileName}...`);
         const builder = new KotlinFileBuilder(packageName, ctx.config);
         builder.append(this.getApiInterfaceFileContent(ctx, { interfaceName: typeName }));
-        writeFileSync(filePath, builder.toString());
+        fs.writeFileSync(filePath, builder.toString());
         return { typeName, packageName };
     }
     getApiInterfaceFileContent(ctx, args) {
@@ -155,7 +155,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         console.log(`  Generating API controller ${typeName} to ${fileName}...`);
         const builder = new KotlinFileBuilder(packageName, ctx.config);
         builder.append(this.getApiControllerFileContent(ctx, { controllerName: typeName }));
-        writeFileSync(filePath, builder.toString());
+        fs.writeFileSync(filePath, builder.toString());
         return { typeName, packageName };
     }
     getApiControllerFileContent(ctx, args) {
@@ -213,7 +213,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         console.log(`  Generating API delegate ${typeName} to ${fileName}...`);
         const builder = new KotlinFileBuilder(packageName, ctx.config);
         builder.append(this.getApiDelegateInterfaceFileContent(ctx, { delegateInterfaceName: typeName }));
-        writeFileSync(filePath, builder.toString());
+        fs.writeFileSync(filePath, builder.toString());
         return { typeName, packageName };
     }
     getApiDelegateInterfaceFileContent(ctx, args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "repository": "https://github.com/MaSch0212/goast.git",
   "description": "Provides gOAst generators for generating Kotlin code from OpenAPI specifications.",
   "keywords": [
@@ -25,7 +25,7 @@
     "fs-extra": "^11.2.0",
     "node-fetch": "^2.7.0",
     "yaml": "^2.6.0",
-    "@goast/core": "0.3.7",
+    "@goast/core": "0.3.8",
     "tslib": "2.6.3"
   },
   "packageManager": "pnpm@9.5.0",