swaggular 0.2.3 → 0.2.4

package/dist/index.js

@@ -16,6 +16,7 @@ async function main() {
     try {
         const parsed = (0, args_1.getParseArgs)(process.argv.slice(2));
         const variables = (0, variables_1.toVariables)(parsed);
+        console.log('Generating interfaces and services using Swaggular@' + process.env.npm_package_version);
         swagger_parser_1.SwaggerParser.parse(variables.input, {
             mode: variables.groupingMode,
             segmentsToIgnore: variables.segmentsToIgnore,

package/dist/renderers/generate-interface.js

@@ -154,7 +154,11 @@ function generateComponentsSchemas() {
         const interData = {
             name: key,
             type: 'interface',
-            imports: properties.filter((p) => !(0, type_guard_1.isNativeType)(p.type)).map((p) => p.type),
+            imports: properties
+                .filter((p) => !(0, type_guard_1.isNativeType)(p.type))
+                .map((p) => {
+                return p.type.replaceAll('[]', '');
+            }),
             properties,
         };
         const generic = (0, generic_types_1.isGenericType)(interData);
@@ -175,7 +179,7 @@ function generateInterfacesFiles(locations) {
     const filesContent = [];
     for (const [key, value] of Object.entries(interfacesData)) {
         const location = [value.type === 'enum' ? 'enums' : 'dtos', ...(locations?.[key] ?? [])];
-        const content = generateContent(value, location.length);
+        const content = generateContent(value, location.length + 1);
         const extraName = value.type === 'enum' ? 'enum' : 'dto';
         filesContent.push({
             location: location,
@@ -188,9 +192,8 @@ function generateInterfacesFiles(locations) {
 }
 function generateContent(interfaceData, deep = 0) {
     const imports = [...interfaceData.imports];
-    const importsTemplate = imports.length > 0
-        ? `import { ${imports.join(', ')} } from "${'../'.repeat(deep)}models";`
-        : '';
+    const path = '../'.repeat(deep);
+    const importsTemplate = imports.length > 0 ? `import { ${imports.join(', ')} } from "${path}models";` : '';
     if (interfaceData.type === 'interface') {
         const content = `${importsTemplate}\n\nexport interface ${interfaceData.name} ${interfaceData.extendsFrom && interfaceData.extendsFrom.length > 0 ? `extends ${interfaceData.extendsFrom.join(', ')}` : ''} {
     ${interfaceData.properties

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swaggular",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {