@ng-forge/openapi-generator 1.2.0 → 1.3.0-next.2

package/bin/ng-forge-generator.js

@@ -26,6 +26,15 @@ function isReferenceObject(obj) {
 function isBinarySchema(schema) {
   return typeof schema === "object" && schema !== null && schema["format"] === "binary";
 }
+function hasOnlyDynamicKeys(schema) {
+  const s = schema;
+  if (Object.keys(schema.properties ?? {}).length > 0 || s["allOf"] || s["oneOf"] || s["anyOf"]) {
+    return false;
+  }
+  const patternProperties = s["patternProperties"];
+  const additionalProperties = s["additionalProperties"];
+  return Object.keys(patternProperties ?? {}).length > 0 || additionalProperties !== void 0 && additionalProperties !== false;
+}
 
 // packages/openapi-generator/src/parser/endpoint-extractor.ts
 var SUPPORTED_METHODS = ["get", "post", "put", "patch"];
@@ -78,7 +87,7 @@ function formatEndpointLabel(endpoint) {
 }
 
 // packages/openapi-generator/src/parser/schema-walker.ts
-function walkSchema(schema, requiredFields = [], seen = /* @__PURE__ */ new WeakSet()) {
+function walkSchema(schema, requiredFields = [], seen = /* @__PURE__ */ new WeakSet(), path) {
   const warnings = [];
   if (seen.has(schema)) {
     return { properties: [], warnings: ["Circular schema reference detected during allOf merge \u2014 nested schema skipped"] };
@@ -86,7 +95,7 @@ function walkSchema(schema, requiredFields = [], seen = /* @__PURE__ */ new Weak
   seen.add(schema);
   try {
     if (schema.allOf) {
-      return walkAllOf(schema.allOf, requiredFields, warnings, seen);
+      return walkAllOf(schema.allOf, requiredFields, warnings, seen, path);
     }
     if (schema.oneOf && schema.discriminator) {
       return walkOneOfWithDiscriminator(
@@ -109,7 +118,7 @@ function walkSchema(schema, requiredFields = [], seen = /* @__PURE__ */ new Weak
       return { properties: [], warnings };
     }
     if (schema.additionalProperties && schema.additionalProperties !== false) {
-      warnings.push("additionalProperties are not supported and were skipped");
+      warnings.push(`additionalProperties${path ? ` at '${path}'` : ""} are not supported and were skipped`);
     }
     const properties = [];
     const required = new Set(schema.required ?? requiredFields);
@@ -126,12 +135,12 @@ function walkSchema(schema, requiredFields = [], seen = /* @__PURE__ */ new Weak
     seen.delete(schema);
   }
 }
-function walkAllOf(schemas, requiredFields, warnings, seen) {
+function walkAllOf(schemas, requiredFields, warnings, seen, path) {
   const mergedProperties = /* @__PURE__ */ new Map();
   const allRequired = new Set(requiredFields);
   for (const schema of schemas) {
     if (isReferenceObject(schema)) continue;
-    const walked = walkSchema(schema, [], seen);
+    const walked = walkSchema(schema, [], seen, path);
     warnings.push(...walked.warnings);
     for (const prop of walked.properties) {
       mergedProperties.set(prop.name, prop);
@@ -258,7 +267,7 @@ function mapSchemaToFieldType(schema) {
     }
     return { fieldType: "array", isContainer: true, isAmbiguous: false, isPrimitiveArray: true };
   }
-  if (type === "object" || schema.properties) {
+  if (type === "object" || schema.properties || "patternProperties" in schema) {
     return { fieldType: "group", isContainer: true, isAmbiguous: false };
   }
   return { fieldType: "input", props: { type: "text" }, isContainer: false, isAmbiguous: false };
@@ -501,7 +510,7 @@ function mapSchemaToFieldsInternal(schema, requiredFields, options, seen) {
   }
   seen.add(schema);
   try {
-    const walked = walkSchema(schema, requiredFields);
+    const walked = walkSchema(schema, requiredFields, void 0, options.schemaName);
     const ambiguousFields = [];
     const warnings = [...walked.warnings];
     if (walked.discriminator) {
@@ -587,6 +596,14 @@ function mapPropertyToField(prop, options, seen, ambiguousFields, warnings) {
   const typeResult = mapSchemaToFieldType(prop.schema);
   const schemaPrefix = options.schemaName ?? "";
   const fieldPath = schemaPrefix ? `${schemaPrefix}.${prop.name}` : prop.name;
+  const dynamicKeyItems = typeResult.fieldType === "array" && propItems !== void 0 && hasOnlyDynamicKeys(propItems);
+  const hasDecision = options.decisions?.[fieldPath] !== void 0;
+  if (!ngForgeType && !hasDecision && (typeResult.fieldType === "group" && hasOnlyDynamicKeys(prop.schema) || dynamicKeyItems)) {
+    warnings.push(
+      `Property '${fieldPath}' only has dynamic keys (additionalProperties/patternProperties) and was skipped; key/value fields are not supported yet`
+    );
+    return void 0;
+  }
   let finalType;
   if (ngForgeType) {
     finalType = ngForgeType;
@@ -700,10 +717,15 @@ function mapPropertyToField(prop, options, seen, ambiguousFields, warnings) {
   if (typeResult.isContainer) {
     const nestedSchemaName = schemaPrefix ? `${schemaPrefix}.${prop.name}` : prop.name;
     const nestedOptions = { ...options, schemaName: nestedSchemaName };
-    if (typeResult.fieldType === "group" && prop.schema.properties) {
+    if (typeResult.fieldType === "group" && (prop.schema.properties || prop.schema.allOf)) {
       const innerResult = mapSchemaToFieldsInternal(prop.schema, prop.schema.required ?? [], nestedOptions, seen);
-      field.fields = innerResult.fields;
       ambiguousFields.push(...innerResult.ambiguousFields);
+      warnings.push(...innerResult.warnings);
+      if (innerResult.fields.length === 0) {
+        warnings.push(`Property '${fieldPath}' has no supported fields left and was skipped`);
+        return void 0;
+      }
+      field.fields = innerResult.fields;
     } else if (typeResult.fieldType === "array" && prop.schema["items"]) {
       const items = prop.schema["items"];
       const fieldLabel = singularize(toLabel(prop.name));
@@ -901,6 +923,13 @@ ${indent}}`;
 function isSkippedBinaryProperty(schema) {
   return isBinarySchema(schema) || isBinarySchema(schema["items"]);
 }
+function isSkippedDynamicKeyProperty(schema) {
+  const s = schema;
+  if (s["x-ng-forge-type"]) return false;
+  const items = s["items"];
+  const isObject = (x) => x["type"] === "object" || x["type"] === void 0;
+  return isObject(schema) && hasOnlyDynamicKeys(schema) || items !== void 0 && isObject(items) && hasOnlyDynamicKeys(items);
+}
 function generateInterface(schema, options) {
   const interfaceName = toInterfaceName(options.method, options.path, options.operationId);
   const lines = [];
@@ -1006,7 +1035,7 @@ function resolveSchemaProperties(schema, seen) {
   const required = new Set(schema.required ?? []);
   for (const [name, propSchema] of Object.entries(schema.properties ?? {})) {
     if (isReferenceObject(propSchema)) continue;
-    if (isSkippedBinaryProperty(propSchema)) continue;
+    if (isSkippedBinaryProperty(propSchema) || isSkippedDynamicKeyProperty(propSchema)) continue;
     properties.push([name, propSchema]);
   }
   return { properties, required };
@@ -1097,7 +1126,7 @@ function generateNestedInterface(name, schema, seen) {
   lines.push(`export interface ${name} {`);
   for (const [propName, propSchema] of Object.entries(schema.properties ?? {})) {
     if (isReferenceObject(propSchema)) continue;
-    if (isSkippedBinaryProperty(propSchema)) continue;
+    if (isSkippedBinaryProperty(propSchema) || isSkippedDynamicKeyProperty(propSchema)) continue;
     const optional = required.has(propName) ? "" : "?";
     const tsType = schemaToTsType(propName, propSchema, name, nestedInterfaces, seen);
     lines.push(`  ${propName}${optional}: ${tsType};`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ng-forge/openapi-generator",
-  "version": "1.2.0",
+  "version": "1.3.0-next.2",
   "description": "Generate @ng-forge/dynamic-forms configurations from OpenAPI specs",
   "type": "module",
   "license": "MIT",

package/src/generator/interface-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface-generator.d.ts","sourceRoot":"","sources":["../../../../../packages/openapi-generator/src/generator/interface-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5D,KAAK,YAAY,GAAG,SAAS,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;AAStE,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,yBAAyB,GAAG,MAAM,CAkClG"}
+{"version":3,"file":"interface-generator.d.ts","sourceRoot":"","sources":["../../../../../packages/openapi-generator/src/generator/interface-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5D,KAAK,YAAY,GAAG,SAAS,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;AAmBtE,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,yBAAyB,GAAG,MAAM,CAkClG"}

package/src/index.js

@@ -18,6 +18,15 @@ function isReferenceObject(obj) {
 function isBinarySchema(schema) {
   return typeof schema === "object" && schema !== null && schema["format"] === "binary";
 }
+function hasOnlyDynamicKeys(schema) {
+  const s = schema;
+  if (Object.keys(schema.properties ?? {}).length > 0 || s["allOf"] || s["oneOf"] || s["anyOf"]) {
+    return false;
+  }
+  const patternProperties = s["patternProperties"];
+  const additionalProperties = s["additionalProperties"];
+  return Object.keys(patternProperties ?? {}).length > 0 || additionalProperties !== void 0 && additionalProperties !== false;
+}
 
 // packages/openapi-generator/src/parser/endpoint-extractor.ts
 var SUPPORTED_METHODS = ["get", "post", "put", "patch"];
@@ -70,7 +79,7 @@ function formatEndpointLabel(endpoint) {
 }
 
 // packages/openapi-generator/src/parser/schema-walker.ts
-function walkSchema(schema, requiredFields = [], seen = /* @__PURE__ */ new WeakSet()) {
+function walkSchema(schema, requiredFields = [], seen = /* @__PURE__ */ new WeakSet(), path) {
   const warnings = [];
   if (seen.has(schema)) {
     return { properties: [], warnings: ["Circular schema reference detected during allOf merge \u2014 nested schema skipped"] };
@@ -78,7 +87,7 @@ function walkSchema(schema, requiredFields = [], seen = /* @__PURE__ */ new Weak
   seen.add(schema);
   try {
     if (schema.allOf) {
-      return walkAllOf(schema.allOf, requiredFields, warnings, seen);
+      return walkAllOf(schema.allOf, requiredFields, warnings, seen, path);
     }
     if (schema.oneOf && schema.discriminator) {
       return walkOneOfWithDiscriminator(
@@ -101,7 +110,7 @@ function walkSchema(schema, requiredFields = [], seen = /* @__PURE__ */ new Weak
       return { properties: [], warnings };
     }
     if (schema.additionalProperties && schema.additionalProperties !== false) {
-      warnings.push("additionalProperties are not supported and were skipped");
+      warnings.push(`additionalProperties${path ? ` at '${path}'` : ""} are not supported and were skipped`);
     }
     const properties = [];
     const required = new Set(schema.required ?? requiredFields);
@@ -118,12 +127,12 @@ function walkSchema(schema, requiredFields = [], seen = /* @__PURE__ */ new Weak
     seen.delete(schema);
   }
 }
-function walkAllOf(schemas, requiredFields, warnings, seen) {
+function walkAllOf(schemas, requiredFields, warnings, seen, path) {
   const mergedProperties = /* @__PURE__ */ new Map();
   const allRequired = new Set(requiredFields);
   for (const schema of schemas) {
     if (isReferenceObject(schema)) continue;
-    const walked = walkSchema(schema, [], seen);
+    const walked = walkSchema(schema, [], seen, path);
     warnings.push(...walked.warnings);
     for (const prop of walked.properties) {
       mergedProperties.set(prop.name, prop);
@@ -250,7 +259,7 @@ function mapSchemaToFieldType(schema) {
     }
     return { fieldType: "array", isContainer: true, isAmbiguous: false, isPrimitiveArray: true };
   }
-  if (type === "object" || schema.properties) {
+  if (type === "object" || schema.properties || "patternProperties" in schema) {
     return { fieldType: "group", isContainer: true, isAmbiguous: false };
   }
   return { fieldType: "input", props: { type: "text" }, isContainer: false, isAmbiguous: false };
@@ -493,7 +502,7 @@ function mapSchemaToFieldsInternal(schema, requiredFields, options, seen) {
   }
   seen.add(schema);
   try {
-    const walked = walkSchema(schema, requiredFields);
+    const walked = walkSchema(schema, requiredFields, void 0, options.schemaName);
     const ambiguousFields = [];
     const warnings = [...walked.warnings];
     if (walked.discriminator) {
@@ -579,6 +588,14 @@ function mapPropertyToField(prop, options, seen, ambiguousFields, warnings) {
   const typeResult = mapSchemaToFieldType(prop.schema);
   const schemaPrefix = options.schemaName ?? "";
   const fieldPath = schemaPrefix ? `${schemaPrefix}.${prop.name}` : prop.name;
+  const dynamicKeyItems = typeResult.fieldType === "array" && propItems !== void 0 && hasOnlyDynamicKeys(propItems);
+  const hasDecision = options.decisions?.[fieldPath] !== void 0;
+  if (!ngForgeType && !hasDecision && (typeResult.fieldType === "group" && hasOnlyDynamicKeys(prop.schema) || dynamicKeyItems)) {
+    warnings.push(
+      `Property '${fieldPath}' only has dynamic keys (additionalProperties/patternProperties) and was skipped; key/value fields are not supported yet`
+    );
+    return void 0;
+  }
   let finalType;
   if (ngForgeType) {
     finalType = ngForgeType;
@@ -692,10 +709,15 @@ function mapPropertyToField(prop, options, seen, ambiguousFields, warnings) {
   if (typeResult.isContainer) {
     const nestedSchemaName = schemaPrefix ? `${schemaPrefix}.${prop.name}` : prop.name;
     const nestedOptions = { ...options, schemaName: nestedSchemaName };
-    if (typeResult.fieldType === "group" && prop.schema.properties) {
+    if (typeResult.fieldType === "group" && (prop.schema.properties || prop.schema.allOf)) {
       const innerResult = mapSchemaToFieldsInternal(prop.schema, prop.schema.required ?? [], nestedOptions, seen);
-      field.fields = innerResult.fields;
       ambiguousFields.push(...innerResult.ambiguousFields);
+      warnings.push(...innerResult.warnings);
+      if (innerResult.fields.length === 0) {
+        warnings.push(`Property '${fieldPath}' has no supported fields left and was skipped`);
+        return void 0;
+      }
+      field.fields = innerResult.fields;
     } else if (typeResult.fieldType === "array" && prop.schema["items"]) {
       const items = prop.schema["items"];
       const fieldLabel = singularize(toLabel(prop.name));
@@ -893,6 +915,13 @@ ${indent}}`;
 function isSkippedBinaryProperty(schema) {
   return isBinarySchema(schema) || isBinarySchema(schema["items"]);
 }
+function isSkippedDynamicKeyProperty(schema) {
+  const s = schema;
+  if (s["x-ng-forge-type"]) return false;
+  const items = s["items"];
+  const isObject = (x) => x["type"] === "object" || x["type"] === void 0;
+  return isObject(schema) && hasOnlyDynamicKeys(schema) || items !== void 0 && isObject(items) && hasOnlyDynamicKeys(items);
+}
 function generateInterface(schema, options) {
   const interfaceName = toInterfaceName(options.method, options.path, options.operationId);
   const lines = [];
@@ -998,7 +1027,7 @@ function resolveSchemaProperties(schema, seen) {
   const required = new Set(schema.required ?? []);
   for (const [name, propSchema] of Object.entries(schema.properties ?? {})) {
     if (isReferenceObject(propSchema)) continue;
-    if (isSkippedBinaryProperty(propSchema)) continue;
+    if (isSkippedBinaryProperty(propSchema) || isSkippedDynamicKeyProperty(propSchema)) continue;
     properties.push([name, propSchema]);
   }
   return { properties, required };
@@ -1089,7 +1118,7 @@ function generateNestedInterface(name, schema, seen) {
   lines.push(`export interface ${name} {`);
   for (const [propName, propSchema] of Object.entries(schema.properties ?? {})) {
     if (isReferenceObject(propSchema)) continue;
-    if (isSkippedBinaryProperty(propSchema)) continue;
+    if (isSkippedBinaryProperty(propSchema) || isSkippedDynamicKeyProperty(propSchema)) continue;
     const optional = required.has(propName) ? "" : "?";
     const tsType = schemaToTsType(propName, propSchema, name, nestedInterfaces, seen);
     lines.push(`  ${propName}${optional}: ${tsType};`);

package/src/parser/schema-walker.d.ts

@@ -13,5 +13,5 @@ export interface WalkedSchema {
     };
     warnings: string[];
 }
-export declare function walkSchema(schema: SchemaObject, requiredFields?: string[], seen?: WeakSet<SchemaObject>): WalkedSchema;
+export declare function walkSchema(schema: SchemaObject, requiredFields?: string[], seen?: WeakSet<SchemaObject>, path?: string): WalkedSchema;
 //# sourceMappingURL=schema-walker.d.ts.map

package/src/parser/schema-walker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-walker.d.ts","sourceRoot":"","sources":["../../../../../packages/openapi-generator/src/parser/schema-walker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5D,MAAM,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;AAE7E,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,aAAa,CAAC,EAAE;QACd,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;KACvC,CAAC;IACF,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,GAAE,MAAM,EAAO,EAAE,IAAI,GAAE,OAAO,CAAC,YAAY,CAAiB,GAAG,YAAY,CAoEzI"}
+{"version":3,"file":"schema-walker.d.ts","sourceRoot":"","sources":["../../../../../packages/openapi-generator/src/parser/schema-walker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5D,MAAM,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;AAE7E,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,aAAa,CAAC,EAAE;QACd,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;KACvC,CAAC;IACF,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,wBAAgB,UAAU,CACxB,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAAO,EAC7B,IAAI,GAAE,OAAO,CAAC,YAAY,CAAiB,EAC3C,IAAI,CAAC,EAAE,MAAM,GACZ,YAAY,CAoEd"}

package/src/utils/openapi-utils.d.ts

@@ -1,5 +1,8 @@
 import type { OpenAPIV3 } from 'openapi-types';
+import type { SchemaObject } from '../parser/schema-walker.js';
 export declare function isReferenceObject(obj: unknown): obj is OpenAPIV3.ReferenceObject;
 /** Binary file content (`format: binary`) has no field type in this release (issue #485). */
 export declare function isBinarySchema(schema: unknown): boolean;
+/** Object schema whose keys are all dynamic: no fixed `properties`, only additionalProperties/patternProperties. */
+export declare function hasOnlyDynamicKeys(schema: SchemaObject): boolean;
 //# sourceMappingURL=openapi-utils.d.ts.map

package/src/utils/openapi-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openapi-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/openapi-generator/src/utils/openapi-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,SAAS,CAAC,eAAe,CAEhF;AAED,6FAA6F;AAC7F,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAEvD"}
+{"version":3,"file":"openapi-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/openapi-generator/src/utils/openapi-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,SAAS,CAAC,eAAe,CAEhF;AAED,6FAA6F;AAC7F,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAEvD;AAED,oHAAoH;AACpH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAQhE"}