@goast/kotlin 0.3.12 → 0.3.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (100) hide show
  1. package/cjs/lib/generators/models/model-generator.js +4 -3
  2. package/cjs/lib/generators/services/okhttp3-clients/okhttp3-client-generator.js +3 -2
  3. package/cjs/lib/generators/services/okhttp3-clients/okhttp3-clients-generator.js +6 -4
  4. package/cjs/lib/generators/services/spring-controllers/spring-controller-generator.js +6 -5
  5. package/esm/lib/ast/node.js +1 -1
  6. package/esm/lib/ast/nodes/annotation.js +1 -1
  7. package/esm/lib/ast/nodes/call.js +1 -1
  8. package/esm/lib/ast/nodes/class.js +1 -1
  9. package/esm/lib/ast/nodes/collection-literal.js +1 -1
  10. package/esm/lib/ast/nodes/constructor.js +1 -1
  11. package/esm/lib/ast/nodes/doc-tag.js +1 -1
  12. package/esm/lib/ast/nodes/doc.js +1 -1
  13. package/esm/lib/ast/nodes/enum-value.js +1 -1
  14. package/esm/lib/ast/nodes/enum.js +1 -1
  15. package/esm/lib/ast/nodes/function.js +1 -1
  16. package/esm/lib/ast/nodes/interface.js +1 -1
  17. package/esm/lib/ast/nodes/lambda-type.js +1 -1
  18. package/esm/lib/ast/nodes/lambda.js +1 -1
  19. package/esm/lib/ast/nodes/object.js +1 -1
  20. package/esm/lib/ast/nodes/parameter.js +1 -1
  21. package/esm/lib/ast/nodes/property.js +1 -1
  22. package/esm/lib/ast/nodes/reference.js +1 -1
  23. package/esm/lib/ast/nodes/string.js +1 -1
  24. package/esm/lib/ast/utils/get-kotlin-builder-options.js +1 -1
  25. package/esm/lib/ast/utils/write-kt-annotations.js +1 -1
  26. package/esm/lib/ast/utils/write-kt-arguments.js +1 -1
  27. package/esm/lib/ast/utils/write-kt-enum-values.js +1 -1
  28. package/esm/lib/ast/utils/write-kt-generic-parameters.js +1 -1
  29. package/esm/lib/ast/utils/write-kt-members.js +1 -1
  30. package/esm/lib/ast/utils/write-kt-node.js +1 -1
  31. package/esm/lib/ast/utils/write-kt-parameters.js +1 -1
  32. package/esm/lib/file-builder.js +1 -1
  33. package/esm/lib/generators/file-generator.js +1 -1
  34. package/esm/lib/generators/models/model-generator.js +4 -4
  35. package/esm/lib/generators/models/models-generator.js +1 -1
  36. package/esm/lib/generators/services/okhttp3-clients/okhttp3-client-generator.js +3 -3
  37. package/esm/lib/generators/services/okhttp3-clients/okhttp3-clients-generator.js +6 -5
  38. package/esm/lib/generators/services/spring-controllers/spring-controller-generator.js +6 -6
  39. package/esm/lib/generators/services/spring-controllers/spring-controllers-generator.js +1 -1
  40. package/esm/lib/import-collection.js +1 -1
  41. package/package.json +2 -2
  42. package/types/lib/ast/node.d.ts +1 -1
  43. package/types/lib/ast/nodes/annotation.d.ts +1 -1
  44. package/types/lib/ast/nodes/argument.d.ts +1 -1
  45. package/types/lib/ast/nodes/call.d.ts +1 -1
  46. package/types/lib/ast/nodes/class.d.ts +1 -1
  47. package/types/lib/ast/nodes/collection-literal.d.ts +1 -1
  48. package/types/lib/ast/nodes/constructor.d.ts +1 -1
  49. package/types/lib/ast/nodes/doc-tag.d.ts +1 -1
  50. package/types/lib/ast/nodes/doc.d.ts +1 -1
  51. package/types/lib/ast/nodes/enum-value.d.ts +1 -1
  52. package/types/lib/ast/nodes/enum.d.ts +1 -1
  53. package/types/lib/ast/nodes/function.d.ts +1 -1
  54. package/types/lib/ast/nodes/generic-parameter.d.ts +1 -1
  55. package/types/lib/ast/nodes/init-block.d.ts +1 -1
  56. package/types/lib/ast/nodes/interface.d.ts +1 -1
  57. package/types/lib/ast/nodes/lambda-type.d.ts +1 -1
  58. package/types/lib/ast/nodes/lambda.d.ts +1 -1
  59. package/types/lib/ast/nodes/object.d.ts +1 -1
  60. package/types/lib/ast/nodes/parameter.d.ts +1 -1
  61. package/types/lib/ast/nodes/property.d.ts +1 -1
  62. package/types/lib/ast/nodes/reference.d.ts +1 -1
  63. package/types/lib/ast/nodes/string.d.ts +1 -1
  64. package/types/lib/ast/nodes/types.d.ts +1 -1
  65. package/types/lib/ast/references/jackson.d.ts +56 -56
  66. package/types/lib/ast/references/jakarta.d.ts +24 -24
  67. package/types/lib/ast/references/java.d.ts +59 -59
  68. package/types/lib/ast/references/kotlin.d.ts +195 -195
  69. package/types/lib/ast/references/okhttp3.d.ts +16 -16
  70. package/types/lib/ast/references/reactor.d.ts +22 -22
  71. package/types/lib/ast/references/spring.d.ts +107 -107
  72. package/types/lib/ast/references/swagger.d.ts +32 -32
  73. package/types/lib/ast/utils/get-kotlin-builder-options.d.ts +1 -1
  74. package/types/lib/ast/utils/to-kt-node.d.ts +1 -1
  75. package/types/lib/ast/utils/write-kt-annotations.d.ts +1 -1
  76. package/types/lib/ast/utils/write-kt-arguments.d.ts +1 -1
  77. package/types/lib/ast/utils/write-kt-enum-values.d.ts +1 -1
  78. package/types/lib/ast/utils/write-kt-generic-parameters.d.ts +1 -1
  79. package/types/lib/ast/utils/write-kt-members.d.ts +1 -1
  80. package/types/lib/ast/utils/write-kt-node.d.ts +1 -1
  81. package/types/lib/ast/utils/write-kt-parameters.d.ts +1 -1
  82. package/types/lib/config.d.ts +1 -1
  83. package/types/lib/file-builder.d.ts +1 -1
  84. package/types/lib/generators/file-generator.d.ts +1 -1
  85. package/types/lib/generators/models/args.d.ts +1 -1
  86. package/types/lib/generators/models/model-generator.d.ts +2 -2
  87. package/types/lib/generators/models/models-generator.d.ts +1 -1
  88. package/types/lib/generators/models/models.d.ts +1 -1
  89. package/types/lib/generators/services/okhttp3-clients/args.d.ts +1 -1
  90. package/types/lib/generators/services/okhttp3-clients/models.d.ts +1 -1
  91. package/types/lib/generators/services/okhttp3-clients/okhttp3-client-generator.d.ts +1 -1
  92. package/types/lib/generators/services/okhttp3-clients/okhttp3-clients-generator.d.ts +1 -1
  93. package/types/lib/generators/services/okhttp3-clients/refs.d.ts +163 -163
  94. package/types/lib/generators/services/spring-controllers/args.d.ts +1 -1
  95. package/types/lib/generators/services/spring-controllers/models.d.ts +1 -1
  96. package/types/lib/generators/services/spring-controllers/spring-controller-generator.d.ts +1 -1
  97. package/types/lib/generators/services/spring-controllers/spring-controllers-generator.d.ts +1 -1
  98. package/types/lib/import-collection.d.ts +1 -1
  99. package/types/lib/types.d.ts +1 -1
  100. package/types/lib/utils.d.ts +1 -1
@@ -1,9 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DefaultKotlinModelGenerator = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  /* eslint-disable unused-imports/no-unused-vars */
5
6
  const path_1 = require("path");
6
- const fs_extra_1 = require("fs-extra");
7
+ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
7
8
  const core_1 = require("@goast/core");
8
9
  const ast_1 = require("../../ast");
9
10
  const file_builder_1 = require("../../file-builder");
@@ -19,8 +20,8 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
19
20
  const packageName = this.getPackageName(ctx, { schema: ctx.schema });
20
21
  const filePath = `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}/${typeName}.kt`;
21
22
  console.log(`Generating model ${packageName}.${typeName} to ${filePath}...`);
22
- (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(filePath));
23
- (0, fs_extra_1.writeFileSync)(filePath, new file_builder_1.KotlinFileBuilder(packageName, ctx.config).append(this.getFileContent(ctx, {})).toString());
23
+ fs_extra_1.default.ensureDirSync((0, path_1.dirname)(filePath));
24
+ fs_extra_1.default.writeFileSync(filePath, new file_builder_1.KotlinFileBuilder(packageName, ctx.config).append(this.getFileContent(ctx, {})).toString());
24
25
  return { type: ast_1.kt.reference(typeName, packageName) };
25
26
  }
26
27
  else {
@@ -1,10 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DefaultKotlinOkHttp3Generator = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  /* eslint-disable unused-imports/no-unused-vars */
5
6
  const fs_1 = require("fs");
6
7
  const path_1 = require("path");
7
- const fs_extra_1 = require("fs-extra");
8
+ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
8
9
  const core_1 = require("@goast/core");
9
10
  const ast_1 = require("../../../ast");
10
11
  const file_builder_1 = require("../../../file-builder");
@@ -15,7 +16,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
15
16
  const typeName = this.getApiClientName(ctx, {});
16
17
  const packageName = this.getPackageName(ctx, {});
17
18
  const filePath = this.getFilePath(ctx, { packageName });
18
- (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(filePath));
19
+ fs_extra_1.default.ensureDirSync((0, path_1.dirname)(filePath));
19
20
  console.log(`Generating client for service ${ctx.service.name} to ${filePath}...`);
20
21
  const builder = new file_builder_1.KotlinFileBuilder(packageName, ctx.config);
21
22
  builder.append(this.getClientFileContent(ctx, {}));
@@ -1,9 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.KotlinOkHttp3ClientsGenerator = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  const fs_1 = require("fs");
5
6
  const path_1 = require("path");
6
- const fs_extra_1 = require("fs-extra");
7
+ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
7
8
  const core_1 = require("@goast/core");
8
9
  const models_1 = require("./models");
9
10
  const okhttp3_client_generator_1 = require("./okhttp3-client-generator");
@@ -62,10 +63,11 @@ class KotlinOkHttp3ClientsGenerator extends core_1.OpenApiServicesGenerationProv
62
63
  copyInfrastructureFiles(ctx) {
63
64
  const sourceDir = (0, path_1.resolve)((0, path_1.dirname)(require.resolve('@goast/kotlin')), '../assets/client/okhttp3');
64
65
  const targetDir = (0, path_1.resolve)(ctx.config.outputDir, ctx.infrastructurePackageName.replace(/\./g, '/'));
65
- (0, fs_extra_1.ensureDirSync)(targetDir);
66
- const files = (0, fs_extra_1.readdirSync)(sourceDir);
66
+ fs_extra_1.default.ensureDirSync(targetDir);
67
+ const files = fs_extra_1.default.readdirSync(sourceDir);
67
68
  for (const file of files) {
68
- const fileContent = (0, fs_extra_1.readFileSync)((0, path_1.resolve)(sourceDir, file))
69
+ const fileContent = fs_extra_1.default
70
+ .readFileSync((0, path_1.resolve)(sourceDir, file))
69
71
  .toString()
70
72
  .replace(/@PACKAGE_NAME@/g, ctx.infrastructurePackageName);
71
73
  (0, fs_1.writeFileSync)((0, path_1.resolve)(targetDir, file), fileContent);
@@ -2,8 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DefaultKotlinSpringControllerGenerator = void 0;
4
4
  exports.listToFlux = listToFlux;
5
+ const tslib_1 = require("tslib");
5
6
  /* eslint-disable unused-imports/no-unused-vars */
6
- const fs_extra_1 = require("fs-extra");
7
+ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
7
8
  const core_1 = require("@goast/core");
8
9
  const ast_1 = require("../../../ast");
9
10
  const file_builder_1 = require("../../../file-builder");
@@ -13,7 +14,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
13
14
  generate(ctx) {
14
15
  const packageName = this.getPackageName(ctx, {});
15
16
  const dirPath = this.getDirectoryPath(ctx, { packageName });
16
- (0, fs_extra_1.ensureDirSync)(dirPath);
17
+ fs_extra_1.default.ensureDirSync(dirPath);
17
18
  console.log(`Generating service ${ctx.service.id} to ${dirPath}...`);
18
19
  return {
19
20
  apiInterface: this.generateApiInterfaceFile(ctx, { dirPath, packageName }),
@@ -30,7 +31,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
30
31
  console.log(` Generating API interface ${typeName} to ${fileName}...`);
31
32
  const builder = new file_builder_1.KotlinFileBuilder(packageName, ctx.config);
32
33
  builder.append(this.getApiInterfaceFileContent(ctx, { interfaceName: typeName }));
33
- (0, fs_extra_1.writeFileSync)(filePath, builder.toString());
34
+ fs_extra_1.default.writeFileSync(filePath, builder.toString());
34
35
  return { typeName, packageName };
35
36
  }
36
37
  getApiInterfaceFileContent(ctx, args) {
@@ -159,7 +160,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
159
160
  console.log(` Generating API controller ${typeName} to ${fileName}...`);
160
161
  const builder = new file_builder_1.KotlinFileBuilder(packageName, ctx.config);
161
162
  builder.append(this.getApiControllerFileContent(ctx, { controllerName: typeName }));
162
- (0, fs_extra_1.writeFileSync)(filePath, builder.toString());
163
+ fs_extra_1.default.writeFileSync(filePath, builder.toString());
163
164
  return { typeName, packageName };
164
165
  }
165
166
  getApiControllerFileContent(ctx, args) {
@@ -217,7 +218,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
217
218
  console.log(` Generating API delegate ${typeName} to ${fileName}...`);
218
219
  const builder = new file_builder_1.KotlinFileBuilder(packageName, ctx.config);
219
220
  builder.append(this.getApiDelegateInterfaceFileContent(ctx, { delegateInterfaceName: typeName }));
220
- (0, fs_extra_1.writeFileSync)(filePath, builder.toString());
221
+ fs_extra_1.default.writeFileSync(filePath, builder.toString());
221
222
  return { typeName, packageName };
222
223
  }
223
224
  getApiDelegateInterfaceFileContent(ctx, args) {
@@ -1,4 +1,4 @@
1
- import { AstNode } from '../../index.js';
1
+ import { AstNode } from '@goast/core';
2
2
  export class KtNode extends AstNode {
3
3
  constructor(options) {
4
4
  super(options);
@@ -1,4 +1,4 @@
1
- import { notNullish } from '../../../index.js';
1
+ import { notNullish } from '@goast/core';
2
2
  import { ktArgument } from './argument.js';
3
3
  import { KtNode } from '../node.js';
4
4
  import { writeKtAnnotations } from '../utils/write-kt-annotations.js';
@@ -1,4 +1,4 @@
1
- import { notNullish } from '../../../index.js';
1
+ import { notNullish } from '@goast/core';
2
2
  import { ktArgument } from './argument.js';
3
3
  import { KtNode } from '../node.js';
4
4
  import { writeKtNode, writeKtNodes } from '../utils/write-kt-node.js';
@@ -1,4 +1,4 @@
1
- import { createOverwriteProxy, notNullish, } from '../../../index.js';
1
+ import { createOverwriteProxy, notNullish, } from '@goast/core';
2
2
  import { ktAnnotation } from './annotation.js';
3
3
  import { ktArgument } from './argument.js';
4
4
  import { ktDoc } from './doc.js';
@@ -1,4 +1,4 @@
1
- import { notNullish } from '../../../index.js';
1
+ import { notNullish } from '@goast/core';
2
2
  import { KtNode } from '../node.js';
3
3
  import { writeKtNodes } from '../utils/write-kt-node.js';
4
4
  export class KtCollectionLiteral extends KtNode {
@@ -1,4 +1,4 @@
1
- import { notNullish, } from '../../../index.js';
1
+ import { notNullish, } from '@goast/core';
2
2
  import { ktAnnotation } from './annotation.js';
3
3
  import { ktArgument } from './argument.js';
4
4
  import { ktParameter } from './parameter.js';
@@ -1,4 +1,4 @@
1
- import { notNullish, basicAppendValueGroup, } from '../../../index.js';
1
+ import { notNullish, basicAppendValueGroup, } from '@goast/core';
2
2
  import { isKotlinAppendValue } from '../../file-builder.js';
3
3
  import { KtNode } from '../node.js';
4
4
  import { writeKtNodes } from '../utils/write-kt-node.js';
@@ -1,4 +1,4 @@
1
- import { createOverwriteProxy, notNullish, getIsInstanceOf, } from '../../../index.js';
1
+ import { createOverwriteProxy, notNullish, getIsInstanceOf, } from '@goast/core';
2
2
  import { ktDocTag } from './doc-tag.js';
3
3
  import { KtGenericParameter } from './generic-parameter.js';
4
4
  import { KtParameter } from './parameter.js';
@@ -1,4 +1,4 @@
1
- import { notNullish } from '../../../index.js';
1
+ import { notNullish } from '@goast/core';
2
2
  import { ktAnnotation } from './annotation.js';
3
3
  import { ktArgument } from './argument.js';
4
4
  import { KtNode } from '../node.js';
@@ -1,4 +1,4 @@
1
- import { createOverwriteProxy, notNullish, } from '../../../index.js';
1
+ import { createOverwriteProxy, notNullish, } from '@goast/core';
2
2
  import { ktAnnotation } from './annotation.js';
3
3
  import { ktDoc } from './doc.js';
4
4
  import { ktEnumValue } from './enum-value.js';
@@ -1,4 +1,4 @@
1
- import { notNullish, } from '../../../index.js';
1
+ import { notNullish, } from '@goast/core';
2
2
  import { ktAnnotation } from './annotation.js';
3
3
  import { ktDoc } from './doc.js';
4
4
  import { ktGenericParameter } from './generic-parameter.js';
@@ -1,4 +1,4 @@
1
- import { notNullish, createOverwriteProxy, } from '../../../index.js';
1
+ import { notNullish, createOverwriteProxy, } from '@goast/core';
2
2
  import { ktAnnotation } from './annotation.js';
3
3
  import { ktDoc } from './doc.js';
4
4
  import { ktGenericParameter } from './generic-parameter.js';
@@ -1,4 +1,4 @@
1
- import { notNullish } from '../../../index.js';
1
+ import { notNullish } from '@goast/core';
2
2
  import { ktParameter } from './parameter.js';
3
3
  import { KtNode } from '../node.js';
4
4
  import { writeKtNode, writeKtNodes } from '../utils/write-kt-node.js';
@@ -1,4 +1,4 @@
1
- import { notNullish } from '../../../index.js';
1
+ import { notNullish } from '@goast/core';
2
2
  import { KtNode } from '../node.js';
3
3
  import { writeKtNodes } from '../utils/write-kt-node.js';
4
4
  export class KtLambda extends KtNode {
@@ -1,4 +1,4 @@
1
- import { notNullish } from '../../../index.js';
1
+ import { notNullish } from '@goast/core';
2
2
  import { ktArgument } from './argument.js';
3
3
  import { KtNode } from '../node.js';
4
4
  import { writeKtMembers } from '../utils/write-kt-members.js';
@@ -1,4 +1,4 @@
1
- import { notNullish } from '../../../index.js';
1
+ import { notNullish } from '@goast/core';
2
2
  import { ktAnnotation } from './annotation.js';
3
3
  import { KtNode } from '../node.js';
4
4
  import { writeKtNode } from '../utils/write-kt-node.js';
@@ -1,5 +1,5 @@
1
1
  /* eslint-disable @typescript-eslint/no-non-null-assertion */
2
- import { notNullish } from '../../../index.js';
2
+ import { notNullish } from '@goast/core';
3
3
  import { ktAnnotation } from './annotation.js';
4
4
  import { ktArgument } from './argument.js';
5
5
  import { KtNode } from '../node.js';
@@ -1,4 +1,4 @@
1
- import { notNullish } from '../../../index.js';
1
+ import { notNullish } from '@goast/core';
2
2
  import { ktGenericParameter } from './generic-parameter.js';
3
3
  import { KotlinFileBuilder } from '../../file-builder.js';
4
4
  import { KtNode } from '../node.js';
@@ -1,4 +1,4 @@
1
- import { spliceString } from '../../../index.js';
1
+ import { spliceString } from '@goast/core';
2
2
  import { ktArgument } from './argument.js';
3
3
  import { KtNode } from '../node.js';
4
4
  import { writeKtNodes } from '../utils/write-kt-node.js';
@@ -1,4 +1,4 @@
1
- import { defaultOpenApiGeneratorConfig } from '../../../index.js';
1
+ import { defaultOpenApiGeneratorConfig } from '@goast/core';
2
2
  import { defaultKotlinGeneratorConfig } from '../../config.js';
3
3
  import { KotlinFileBuilder } from '../../file-builder.js';
4
4
  const ktConfigSymbol = Symbol();
@@ -1,4 +1,4 @@
1
- import { toArray, notNullish } from '../../../index.js';
1
+ import { toArray, notNullish } from '@goast/core';
2
2
  import { writeKtNode } from './write-kt-node.js';
3
3
  export function writeKtAnnotations(builder, nodes, options) {
4
4
  const filteredNodes = toArray(nodes).filter(notNullish);
@@ -1,4 +1,4 @@
1
- import { notNullish, toArray } from '../../../index.js';
1
+ import { notNullish, toArray } from '@goast/core';
2
2
  import { writeKtNode, writeKtNodes } from './write-kt-node.js';
3
3
  import { KtLambda } from '../nodes/lambda.js';
4
4
  export function writeKtArguments(builder, nodes) {
@@ -1,4 +1,4 @@
1
- import { toArray, notNullish } from '../../../index.js';
1
+ import { toArray, notNullish } from '@goast/core';
2
2
  import { writeKtNode } from './write-kt-node.js';
3
3
  export function writeKtEnumValues(builder, nodes) {
4
4
  const filteredNodes = toArray(nodes).filter(notNullish);
@@ -1,4 +1,4 @@
1
- import { toArray, notNullish } from '../../../index.js';
1
+ import { toArray, notNullish } from '@goast/core';
2
2
  import { writeKtNode } from './write-kt-node.js';
3
3
  export function writeKtGenericParameters(builder, nodes) {
4
4
  const filteredNodes = toArray(nodes).filter(notNullish);
@@ -1,4 +1,4 @@
1
- import { notNullish, isAppendValue, isAppendValueGroup } from '../../../index.js';
1
+ import { notNullish, isAppendValue, isAppendValueGroup } from '@goast/core';
2
2
  import { writeKtNode } from './write-kt-node.js';
3
3
  import { KtProperty } from '../nodes/property.js';
4
4
  export function writeKtMembers(builder, members, options) {
@@ -1,4 +1,4 @@
1
- import { toArray, notNullish } from '../../../index.js';
1
+ import { toArray, notNullish } from '@goast/core';
2
2
  import { KtNode } from '../node.js';
3
3
  export function writeKtNode(builder, node) {
4
4
  if (node instanceof KtNode) {
@@ -1,4 +1,4 @@
1
- import { toArray, notNullish } from '../../../index.js';
1
+ import { toArray, notNullish } from '@goast/core';
2
2
  import { writeKtNode } from './write-kt-node.js';
3
3
  export function writeKtParameters(builder, nodes) {
4
4
  const filteredNodes = toArray(nodes).filter(notNullish);
@@ -1,4 +1,4 @@
1
- import { SourceBuilder, isAppendValue } from '../index.js';
1
+ import { SourceBuilder, isAppendValue } from '@goast/core';
2
2
  import { KtNode } from './ast/node.js';
3
3
  import { defaultKotlinGeneratorConfig } from './config.js';
4
4
  import { ImportCollection } from './import-collection.js';
@@ -1,4 +1,4 @@
1
- import { toCasing } from '../../index.js';
1
+ import { toCasing } from '@goast/core';
2
2
  import { toKotlinPropertyName, toKotlinStringLiteral } from '../utils.js';
3
3
  export class KotlinFileGenerator {
4
4
  toPropertyName(context, name) {
@@ -1,7 +1,7 @@
1
1
  /* eslint-disable unused-imports/no-unused-vars */
2
2
  import { dirname } from 'path';
3
- import { ensureDirSync, writeFileSync } from 'fs-extra';
4
- import { appendValueGroup, createOverwriteProxy, getSchemaReference, modify, modifyEach, notNullish, resolveAnyOfAndAllOf, toCasing, } from '../../../index.js';
3
+ import fs from 'fs-extra';
4
+ import { appendValueGroup, createOverwriteProxy, getSchemaReference, modify, modifyEach, notNullish, resolveAnyOfAndAllOf, toCasing, } from '@goast/core';
5
5
  import { kt } from '../../ast/index.js';
6
6
  import { KotlinFileBuilder } from '../../file-builder.js';
7
7
  import { KotlinFileGenerator } from '../file-generator.js';
@@ -16,8 +16,8 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
16
16
  const packageName = this.getPackageName(ctx, { schema: ctx.schema });
17
17
  const filePath = `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}/${typeName}.kt`;
18
18
  console.log(`Generating model ${packageName}.${typeName} to ${filePath}...`);
19
- ensureDirSync(dirname(filePath));
20
- writeFileSync(filePath, new KotlinFileBuilder(packageName, ctx.config).append(this.getFileContent(ctx, {})).toString());
19
+ fs.ensureDirSync(dirname(filePath));
20
+ fs.writeFileSync(filePath, new KotlinFileBuilder(packageName, ctx.config).append(this.getFileContent(ctx, {})).toString());
21
21
  return { type: kt.reference(typeName, packageName) };
22
22
  }
23
23
  else {
@@ -1,4 +1,4 @@
1
- import { Factory, OpenApiSchemasGenerationProviderBase } from '../../../index.js';
1
+ import { Factory, OpenApiSchemasGenerationProviderBase } from '@goast/core';
2
2
  import { DefaultKotlinModelGenerator } from './model-generator.js';
3
3
  import { defaultKotlinModelsGeneratorConfig, } from './models.js';
4
4
  export class KotlinModelsGenerator extends OpenApiSchemasGenerationProviderBase {
@@ -1,8 +1,8 @@
1
1
  /* eslint-disable unused-imports/no-unused-vars */
2
2
  import { writeFileSync } from 'fs';
3
3
  import { dirname } from 'path';
4
- import { ensureDirSync } from 'fs-extra';
5
- import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, toCasing, resolveAnyOfAndAllOf, } from '../../../../index.js';
4
+ import fs from 'fs-extra';
5
+ import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, toCasing, resolveAnyOfAndAllOf, } from '@goast/core';
6
6
  import { kt } from '../../../ast/index.js';
7
7
  import { KotlinFileBuilder } from '../../../file-builder.js';
8
8
  import { modifyString } from '../../../utils.js';
@@ -12,7 +12,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
12
12
  const typeName = this.getApiClientName(ctx, {});
13
13
  const packageName = this.getPackageName(ctx, {});
14
14
  const filePath = this.getFilePath(ctx, { packageName });
15
- ensureDirSync(dirname(filePath));
15
+ fs.ensureDirSync(dirname(filePath));
16
16
  console.log(`Generating client for service ${ctx.service.name} to ${filePath}...`);
17
17
  const builder = new KotlinFileBuilder(packageName, ctx.config);
18
18
  builder.append(this.getClientFileContent(ctx, {}));
@@ -1,7 +1,7 @@
1
1
  import { writeFileSync } from 'fs';
2
2
  import { dirname, resolve } from 'path';
3
- import { ensureDirSync, readFileSync, readdirSync } from 'fs-extra';
4
- import { Factory, OpenApiServicesGenerationProviderBase } from '../../../../index.js';
3
+ import fs from 'fs-extra';
4
+ import { Factory, OpenApiServicesGenerationProviderBase } from '@goast/core';
5
5
  import { defaultKotlinOkHttp3ClientsGeneratorConfig, } from './models.js';
6
6
  import { DefaultKotlinOkHttp3Generator } from './okhttp3-client-generator.js';
7
7
  import { getReferenceFactories } from './refs.js';
@@ -59,10 +59,11 @@ export class KotlinOkHttp3ClientsGenerator extends OpenApiServicesGenerationProv
59
59
  copyInfrastructureFiles(ctx) {
60
60
  const sourceDir = resolve(dirname(require.resolve('@goast/kotlin')), '../assets/client/okhttp3');
61
61
  const targetDir = resolve(ctx.config.outputDir, ctx.infrastructurePackageName.replace(/\./g, '/'));
62
- ensureDirSync(targetDir);
63
- const files = readdirSync(sourceDir);
62
+ fs.ensureDirSync(targetDir);
63
+ const files = fs.readdirSync(sourceDir);
64
64
  for (const file of files) {
65
- const fileContent = readFileSync(resolve(sourceDir, file))
65
+ const fileContent = fs
66
+ .readFileSync(resolve(sourceDir, file))
66
67
  .toString()
67
68
  .replace(/@PACKAGE_NAME@/g, ctx.infrastructurePackageName);
68
69
  writeFileSync(resolve(targetDir, file), fileContent);
@@ -1,6 +1,6 @@
1
1
  /* eslint-disable unused-imports/no-unused-vars */
2
- import { ensureDirSync, writeFileSync } from 'fs-extra';
3
- import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, notNullish, toCasing, resolveAnyOfAndAllOf, } from '../../../../index.js';
2
+ import fs from 'fs-extra';
3
+ import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, notNullish, toCasing, resolveAnyOfAndAllOf, } from '@goast/core';
4
4
  import { kt } from '../../../ast/index.js';
5
5
  import { KotlinFileBuilder } from '../../../file-builder.js';
6
6
  import { modifyString } from '../../../utils.js';
@@ -9,7 +9,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
9
9
  generate(ctx) {
10
10
  const packageName = this.getPackageName(ctx, {});
11
11
  const dirPath = this.getDirectoryPath(ctx, { packageName });
12
- ensureDirSync(dirPath);
12
+ fs.ensureDirSync(dirPath);
13
13
  console.log(`Generating service ${ctx.service.id} to ${dirPath}...`);
14
14
  return {
15
15
  apiInterface: this.generateApiInterfaceFile(ctx, { dirPath, packageName }),
@@ -26,7 +26,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
26
26
  console.log(` Generating API interface ${typeName} to ${fileName}...`);
27
27
  const builder = new KotlinFileBuilder(packageName, ctx.config);
28
28
  builder.append(this.getApiInterfaceFileContent(ctx, { interfaceName: typeName }));
29
- writeFileSync(filePath, builder.toString());
29
+ fs.writeFileSync(filePath, builder.toString());
30
30
  return { typeName, packageName };
31
31
  }
32
32
  getApiInterfaceFileContent(ctx, args) {
@@ -155,7 +155,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
155
155
  console.log(` Generating API controller ${typeName} to ${fileName}...`);
156
156
  const builder = new KotlinFileBuilder(packageName, ctx.config);
157
157
  builder.append(this.getApiControllerFileContent(ctx, { controllerName: typeName }));
158
- writeFileSync(filePath, builder.toString());
158
+ fs.writeFileSync(filePath, builder.toString());
159
159
  return { typeName, packageName };
160
160
  }
161
161
  getApiControllerFileContent(ctx, args) {
@@ -213,7 +213,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
213
213
  console.log(` Generating API delegate ${typeName} to ${fileName}...`);
214
214
  const builder = new KotlinFileBuilder(packageName, ctx.config);
215
215
  builder.append(this.getApiDelegateInterfaceFileContent(ctx, { delegateInterfaceName: typeName }));
216
- writeFileSync(filePath, builder.toString());
216
+ fs.writeFileSync(filePath, builder.toString());
217
217
  return { typeName, packageName };
218
218
  }
219
219
  getApiDelegateInterfaceFileContent(ctx, args) {
@@ -1,4 +1,4 @@
1
- import { Factory, OpenApiServicesGenerationProviderBase } from '../../../../index.js';
1
+ import { Factory, OpenApiServicesGenerationProviderBase } from '@goast/core';
2
2
  import { defaultKotlinServicesGeneratorConfig, } from './models.js';
3
3
  import { DefaultKotlinSpringControllerGenerator } from './spring-controller-generator.js';
4
4
  export class KotlinSpringControllersGenerator extends OpenApiServicesGenerationProviderBase {
@@ -1,4 +1,4 @@
1
- import { StringBuilder } from '../index.js';
1
+ import { StringBuilder } from '@goast/core';
2
2
  import { defaultKotlinGeneratorConfig } from './config.js';
3
3
  export const defaultImportCollectionOptions = {
4
4
  globalImports: defaultKotlinGeneratorConfig.globalImports,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@goast/kotlin",
3
- "version": "0.3.12",
3
+ "version": "0.3.14",
4
4
  "repository": "https://github.com/MaSch0212/goast.git",
5
5
  "description": "Provides gOAst generators for generating Kotlin code from OpenAPI specifications.",
6
6
  "keywords": [
@@ -25,7 +25,7 @@
25
25
  "fs-extra": "^11.2.0",
26
26
  "node-fetch": "^2.7.0",
27
27
  "yaml": "^2.6.0",
28
- "@goast/core": "0.3.7",
28
+ "@goast/core": "0.3.8",
29
29
  "tslib": "2.6.3"
30
30
  },
31
31
  "packageManager": "pnpm@9.5.0",
@@ -1,4 +1,4 @@
1
- import { AstNode, AstNodeOptions, SourceBuilder } from '../..';
1
+ import { AstNode, AstNodeOptions, SourceBuilder } from '@goast/core';
2
2
  export declare abstract class KtNode<TBuilder extends SourceBuilder, TInjects extends string = never> extends AstNode<TBuilder, TInjects> {
3
3
  constructor(options: AstNodeOptions<typeof AstNode<TBuilder, TInjects>>);
4
4
  }
@@ -1,4 +1,4 @@
1
- import { AstNodeOptions, Nullable, Prettify, SourceBuilder } from '../../..';
1
+ import { AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
2
2
  import { KtArgument } from './argument';
3
3
  import { KtType, KtValue } from './types';
4
4
  import { KtNode } from '../node';
@@ -1,4 +1,4 @@
1
- import { AstNodeOptions, Nullable, Prettify, SourceBuilder } from '../../..';
1
+ import { AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
2
2
  import { KtValue } from './types';
3
3
  import { KtNode } from '../node';
4
4
  import { writeKtArguments } from '../utils/write-kt-arguments';
@@ -1,4 +1,4 @@
1
- import { ArrayItem, AstNodeOptions, Nullable, Prettify, SourceBuilder } from '../../..';
1
+ import { ArrayItem, AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
2
2
  import { KtArgument } from './argument';
3
3
  import { KtType, KtValue } from './types';
4
4
  import { KtNode } from '../node';
@@ -1,4 +1,4 @@
1
- import { AppendValue, AstNodeOptions, BasicAppendValue, Nullable, Prettify, SourceBuilder } from '../../..';
1
+ import { AppendValue, AstNodeOptions, BasicAppendValue, Nullable, Prettify, SourceBuilder } from '@goast/core';
2
2
  import { KtAnnotation } from './annotation';
3
3
  import { KtConstructor } from './constructor';
4
4
  import { KtDoc } from './doc';
@@ -1,4 +1,4 @@
1
- import { SourceBuilder, AstNodeOptions, Nullable } from '../../..';
1
+ import { SourceBuilder, AstNodeOptions, Nullable } from '@goast/core';
2
2
  import { KtValue } from './types';
3
3
  import { KtNode } from '../node';
4
4
  import { writeKtNodes } from '../utils/write-kt-node';
@@ -1,4 +1,4 @@
1
- import { AppendValue, AstNodeOptions, BasicAppendValue, Nullable, Prettify, SourceBuilder } from '../../..';
1
+ import { AppendValue, AstNodeOptions, BasicAppendValue, Nullable, Prettify, SourceBuilder } from '@goast/core';
2
2
  import { KtAnnotation } from './annotation';
3
3
  import { KtArgument } from './argument';
4
4
  import { KtParameter } from './parameter';
@@ -1,4 +1,4 @@
1
- import { SourceBuilder, AstNodeOptions, StringSuggestions, ParametersWithOverloads, Prettify, SingleOrMultiple, Nullable, BasicAppendValue } from '../../..';
1
+ import { SourceBuilder, AstNodeOptions, StringSuggestions, ParametersWithOverloads, Prettify, SingleOrMultiple, Nullable, BasicAppendValue } from '@goast/core';
2
2
  import { KtNode } from '../node';
3
3
  import { KtAppendValue } from '../utils/write-kt-node';
4
4
  type Injects = never;
@@ -1,4 +1,4 @@
1
- import { SourceBuilder, AstNodeOptions, Prettify, Nullable, BasicAppendValue } from '../../..';
1
+ import { SourceBuilder, AstNodeOptions, Prettify, Nullable, BasicAppendValue } from '@goast/core';
2
2
  import { KtDocTag } from './doc-tag';
3
3
  import { KtGenericParameter } from './generic-parameter';
4
4
  import { KtParameter } from './parameter';
@@ -1,4 +1,4 @@
1
- import { AppendValue, AstNodeOptions, Nullable, Prettify, SourceBuilder } from '../../..';
1
+ import { AppendValue, AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
2
2
  import { KtAnnotation } from './annotation';
3
3
  import { KtArgument } from './argument';
4
4
  import { KtDoc } from './doc';
@@ -1,4 +1,4 @@
1
- import { AppendValue, AstNodeOptions, Nullable, Prettify, SourceBuilder } from '../../..';
1
+ import { AppendValue, AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
2
2
  import { KtAnnotation } from './annotation';
3
3
  import { KtClass } from './class';
4
4
  import { KtConstructor } from './constructor';
@@ -1,4 +1,4 @@
1
- import { SourceBuilder, AstNodeOptions, AppendValue, Prettify, Nullable, BasicAppendValue } from '../../..';
1
+ import { SourceBuilder, AstNodeOptions, AppendValue, Prettify, Nullable, BasicAppendValue } from '@goast/core';
2
2
  import { KtAnnotation } from './annotation';
3
3
  import { KtDoc } from './doc';
4
4
  import { KtGenericParameter } from './generic-parameter';
@@ -1,4 +1,4 @@
1
- import { AstNodeOptions, BasicAppendValue, Nullable, Prettify, SourceBuilder } from '../../..';
1
+ import { AstNodeOptions, BasicAppendValue, Nullable, Prettify, SourceBuilder } from '@goast/core';
2
2
  import { KtType } from './types';
3
3
  import { KtNode } from '../node';
4
4
  import { writeKtGenericParameters } from '../utils/write-kt-generic-parameters';
@@ -1,4 +1,4 @@
1
- import { AppendValue, AstNodeOptions, Prettify, SourceBuilder } from '../../..';
1
+ import { AppendValue, AstNodeOptions, Prettify, SourceBuilder } from '@goast/core';
2
2
  import { KtNode } from '../node';
3
3
  import { writeKtNodes } from '../utils/write-kt-node';
4
4
  type Injects = never;
@@ -1,4 +1,4 @@
1
- import { SourceBuilder, AppendValue, AstNodeOptions, Prettify, Nullable, BasicAppendValue } from '../../..';
1
+ import { SourceBuilder, AppendValue, AstNodeOptions, Prettify, Nullable, BasicAppendValue } from '@goast/core';
2
2
  import { KtAnnotation } from './annotation';
3
3
  import { KtClass } from './class';
4
4
  import { KtDoc } from './doc';
@@ -1,4 +1,4 @@
1
- import { SourceBuilder, AstNodeOptions, Nullable } from '../../..';
1
+ import { SourceBuilder, AstNodeOptions, Nullable } from '@goast/core';
2
2
  import { KtType } from './types';
3
3
  import { KtNode } from '../node';
4
4
  import { writeKtNodes } from '../utils/write-kt-node';