@pylonts/dsl 1.0.5 → 1.0.6

package/dist/dto.d.ts

@@ -21,7 +21,8 @@ export interface ImportRef {
 export type DtoArrayFieldDef = BaseField & {
     type: 'array';
     jsType: 'array';
-    items: DtoField;
+    /** Element type: inline DtoField, or a reference to an existing DTO (rendered by name) */
+    items: DtoField | DtoMessage;
 };
 export type DtoObjectFieldDef = BaseField & {
     type: 'object';
@@ -58,7 +59,8 @@ export declare class DtoField implements SchemaBase {
 }
 export declare class DtoArrayField extends DtoField {
     field: DtoArrayFieldDef;
-    items(): DtoField;
+    /** Element type: inline DtoField or a referenced DtoMessage (rendered by name). */
+    items(): DtoField | DtoMessage;
 }
 export declare class DtoObjectField extends DtoField {
     field: DtoObjectFieldDef;

package/dist/dto.js

@@ -66,6 +66,7 @@ class DtoField {
 }
 exports.DtoField = DtoField;
 class DtoArrayField extends DtoField {
+    /** Element type: inline DtoField or a referenced DtoMessage (rendered by name). */
     items() {
         return this.field.items;
     }
@@ -110,11 +111,9 @@ function dtoField(field) {
     return new DtoField(field);
 }
 function dtoArrayField(def) {
-    // Reuse an existing DTO as the array element: expand its fields into an object.
-    const items = def.items instanceof DtoMessage
-        ? new DtoObjectField({ name: '', type: 'object', jsType: 'object', properties: def.items.fields })
-        : def.items;
-    return new DtoArrayField({ name: '', type: 'array', jsType: 'array', ...def, items });
+    // Items stay as-is: an inline DtoField is rendered inline, a DtoMessage is
+    // referenced by name (the driver renders Type.Array(<DtoName>)).
+    return new DtoArrayField({ name: '', type: 'array', jsType: 'array', ...def });
 }
 function dtoObjectField(def) {
     return new DtoObjectField({ name: '', type: 'object', jsType: 'object', ...def });

package/dist/typebox-driver.js

@@ -84,7 +84,11 @@ function renderField(f, indent, resolver) {
 }
 function renderValue(f, indent, resolver) {
     if (f instanceof dto_1.DtoArrayField) {
-        return `Type.Array(${renderField(f.items(), indent + 1, resolver)})`;
+        const items = f.items();
+        // Referenced DTO element — render by name (same-file export), not expanded.
+        if (items instanceof dto_1.DtoMessage)
+            return `Type.Array(${items.name})`;
+        return `Type.Array(${renderField(items, indent + 1, resolver)})`;
     }
     if (f instanceof dto_1.DtoObjectField) {
         return renderObject(f.properties(), indent + 1, resolver);
@@ -97,7 +101,9 @@ function renderValue(f, indent, resolver) {
 }
 function collectEnumImports(f, resolver, out) {
     if (f instanceof dto_1.DtoArrayField) {
-        collectEnumImports(f.items(), resolver, out);
+        const items = f.items();
+        if (!(items instanceof dto_1.DtoMessage))
+            collectEnumImports(items, resolver, out);
         return;
     }
     if (f instanceof dto_1.DtoObjectField) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pylonts/dsl",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Schema definition DSL with drivers: MySQL DDL, TS enum, TypeBox schema codegen.",
   "type": "commonjs",
   "main": "src/index.ts",

package/src/dto.ts

@@ -29,7 +29,8 @@ export interface ImportRef {
 export type DtoArrayFieldDef = BaseField & {
   type: 'array';
   jsType: 'array';
-  items: DtoField;
+  /** Element type: inline DtoField, or a reference to an existing DTO (rendered by name) */
+  items: DtoField | DtoMessage;
 };
 
 export type DtoObjectFieldDef = BaseField & {
@@ -104,7 +105,8 @@ export class DtoField implements SchemaBase {
 export class DtoArrayField extends DtoField {
   declare field: DtoArrayFieldDef;
 
-  items(): DtoField {
+  /** Element type: inline DtoField or a referenced DtoMessage (rendered by name). */
+  items(): DtoField | DtoMessage {
     return this.field.items;
   }
 }
@@ -153,11 +155,9 @@ export function dtoField(field: Field): DtoField {
 }
 
 export function dtoArrayField(def: { items: DtoField | DtoMessage } & Omit<BaseField, 'name'>): DtoArrayField {
-  // Reuse an existing DTO as the array element: expand its fields into an object.
-  const items = def.items instanceof DtoMessage
-    ? new DtoObjectField({ name: '', type: 'object', jsType: 'object', properties: def.items.fields })
-    : def.items;
-  return new DtoArrayField({ name: '', type: 'array', jsType: 'array', ...def, items });
+  // Items stay as-is: an inline DtoField is rendered inline, a DtoMessage is
+  // referenced by name (the driver renders Type.Array(<DtoName>)).
+  return new DtoArrayField({ name: '', type: 'array', jsType: 'array', ...def });
 }
 
 export function dtoObjectField(def: { properties: Record<string, DtoField> } & Omit<BaseField, 'name'>): DtoObjectField {

package/src/typebox-driver.ts

@@ -95,7 +95,10 @@ function renderField(f: DtoField, indent: number, resolver: EnumResolver | undef
 
 function renderValue(f: DtoField, indent: number, resolver: EnumResolver | undefined): string {
   if (f instanceof DtoArrayField) {
-    return `Type.Array(${renderField(f.items(), indent + 1, resolver)})`;
+    const items = f.items();
+    // Referenced DTO element — render by name (same-file export), not expanded.
+    if (items instanceof DtoMessage) return `Type.Array(${items.name})`;
+    return `Type.Array(${renderField(items, indent + 1, resolver)})`;
   }
   if (f instanceof DtoObjectField) {
     return renderObject(f.properties(), indent + 1, resolver);
@@ -113,7 +116,8 @@ function collectEnumImports(
   out: Map<string, ImportRef>,
 ): void {
   if (f instanceof DtoArrayField) {
-    collectEnumImports(f.items(), resolver, out);
+    const items = f.items();
+    if (!(items instanceof DtoMessage)) collectEnumImports(items, resolver, out);
     return;
   }
   if (f instanceof DtoObjectField) {