Major refactor (part 2) towards FUTURE.md

Author: SamuelMarks

…c/service/analysis/form-model.builder.ts src/analysis/form-model.builder.tssrc/service/analysis/form-model.builder.ts renamed to src/analysis/form-model.builder.ts src/service/analysis/form-model.builder.ts renamed to src/analysis/form-model.builder.ts

@@ -1,8 +1,9 @@
-import { FormProperty, Resource, SwaggerDefinition } from "../../core/types.js";
-import { SwaggerParser } from "../../core/parser.js";
-import { camelCase, getTypeScriptType, pascalCase, singular } from "../../core/utils.js";
-import { mapSchemaToFormControl } from "../emit/admin/form-control.mapper.js";
-import { FormAnalysisResult, FormControlModel, PolymorphicOptionModel } from "./form-types.js";
+import { FormProperty, Resource, SwaggerDefinition } from "@src/core/types/index.js";
+import { SwaggerParser } from '@src/core/parser.js';
+import { getTypeScriptType, pascalCase, singular } from "@src/core/utils/index.js";
+import { mapSchemaToFormControl } from "@src/generators/angular/admin/form-control.mapper.js";
+
+import { FormAnalysisResult, FormControlModel } from "./form-types.js";
 
 export class FormModelBuilder {
     private parser: SwaggerParser;
@@ -27,7 +28,7 @@ export class FormModelBuilder {
         if (oneOfProp) {
             this.result.isPolymorphic = true;
             this.result.discriminatorPropName = oneOfProp.schema.discriminator!.propertyName;
-            this.analyzePolymorphism(oneOfProp, resource.modelName);
+            this.analyzePolymorphism(oneOfProp);
         }
 
         // 2. Build Top Level Controls & Interfaces
@@ -183,7 +184,7 @@ export class FormModelBuilder {
         return controls;
     }
 
-    private analyzePolymorphism(prop: FormProperty, rootModelName: string) {
+    private analyzePolymorphism(prop: FormProperty) {
         const options = this.parser.getPolymorphicSchemaOptions(prop.schema);
         this.result.discriminatorOptions = options.map(o => o.name);
         this.result.polymorphicOptions = [];

src/service/analysis/form-types.ts src/analysis/form-types.tssrc/service/analysis/form-types.ts renamed to src/analysis/form-types.ts

@@ -1,4 +1,4 @@
-import { SwaggerDefinition } from "../../core/types.js";
+import { SwaggerDefinition } from "@src/core/types/index.js";
 
 export type ControlType = 'control' | 'group' | 'array';
 

…c/service/analysis/list-model.builder.ts src/analysis/list-model.builder.tssrc/service/analysis/list-model.builder.ts renamed to src/analysis/list-model.builder.ts src/service/analysis/list-model.builder.ts renamed to src/analysis/list-model.builder.ts

@@ -1,5 +1,6 @@
-import { FormProperty, Resource } from "../../core/types.js";
-import { camelCase, pascalCase } from "../../core/utils.js";
+import { Resource } from "@src/core/types/index.js";
+import { pascalCase } from "@src/core/utils/index.js";
+
 import { ListAction, ListColumn, ListViewModel } from "./list-types.js";
 
 export class ListModelBuilder {

src/service/analysis/list-types.ts src/analysis/list-types.tssrc/service/analysis/list-types.ts renamed to src/analysis/list-types.ts

@@ -1,4 +1,4 @@
-import { ResourceOperation } from "../../core/types.js";
+import { ResourceOperation } from "@src/core/types/index.js";
 
 export interface ListColumn {
     key: string; // Property name (e.g. 'email')

…vice/analysis/service-method-analyzer.ts src/analysis/service-method-analyzer.tssrc/service/analysis/service-method-analyzer.ts renamed to src/analysis/service-method-analyzer.ts src/service/analysis/service-method-analyzer.ts renamed to src/analysis/service-method-analyzer.ts

@@ -3,13 +3,13 @@ import {
     Parameter,
     PathInfo,
     SwaggerDefinition
-} from '../../core/types.js';
+} from '@src/core/types/index.js';
 import {
     camelCase,
     getTypeScriptType,
     isDataTypeInterface
-} from '../../core/utils.js';
-import { SwaggerParser } from '../../core/parser.js';
+} from '@src/core/utils/index.js';
+import { SwaggerParser } from '@src/core/parser.js';
 import { OptionalKind, ParameterDeclarationStructure } from 'ts-morph';
 import { BodyVariant, ParamSerialization, ServiceMethodModel } from './service-method-types.js';
 
@@ -39,10 +39,10 @@ export class ServiceMethodAnalyzer {
             const serialization: ParamSerialization = {
                 paramName: this.isXmlContent(p) ? `${paramName}Serialized` : paramName,
                 originalName: p.name,
-                style: p.style,
                 explode: p.explode ?? (p.in === 'cookie' ? true : false), // Cookie default explode is true
                 allowReserved: p.allowReserved ?? false,
-                serializationLink: this.isJsonContent(p) ? 'json' : undefined
+                serializationLink: this.isJsonContent(p) ? 'json' : undefined,
+                ...(p.style != null && {style: p.style})
             };
 
             switch (p.in) {
@@ -96,10 +96,10 @@ export class ServiceMethodAnalyzer {
             queryParams,
             headerParams,
             cookieParams,
-            body,
             security: effectiveSecurity,
             hasServers: !!basePath,
-            basePath
+            ...(body != null && { body }),
+            ...(basePath != null && { basePath })
         };
     }
 
@@ -141,7 +141,7 @@ export class ServiceMethodAnalyzer {
                 name: camelCase(param.name),
                 type: paramType,
                 hasQuestionToken: !param.required,
-                leadingTrivia: param.deprecated ? [`/** @deprecated */ `] : undefined
+                ...(param.deprecated && {leadingTrivia: [`/** @deprecated */ `]})
             });
         });
 

…service/analysis/service-method-types.ts src/analysis/service-method-types.tssrc/service/analysis/service-method-types.ts renamed to src/analysis/service-method-types.ts src/service/analysis/service-method-types.ts renamed to src/analysis/service-method-types.ts

@@ -5,8 +5,8 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import yaml from 'js-yaml';
 import { generateFromConfig } from './index.js';
-import { GeneratorConfig, GeneratorConfigOptions } from './core/types.js';
-import { isUrl } from './core/utils.js';
+import { GeneratorConfig, GeneratorConfigOptions } from "@src/core/types/index.js";
+import { isUrl } from "@src/core/utils/index.js";
 
 const packageJsonPath = new URL('../package.json', import.meta.url);
 const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));

src/cli.ts

@@ -1,6 +1,7 @@
 import { Project } from 'ts-morph';
-import { SwaggerParser } from './parser.js';
+
 import { GeneratorConfig } from './types/config.js';
+import { SwaggerParser } from './parser.js';
 
 /**
  * Abstract contracts for framework-specific generators.