refactor: address issues in the comments

Author: dev-geddy

src/code-gen-process.ts

@@ -445,11 +445,11 @@ export class CodeGenProcess {
     const jsonldOutputFiles: TranslatorIO[] = [];
 
     // Check if we have JSON-LD schemas and options enabled
-    const hasJsonLdSchemas = configuration.components?.some?.(
-      (component) =>
-        component.schemaType === "jsonld-context" ||
-        component.schemaType === "jsonld-entity" ||
-        component.schemaType === "jsonld-type",
+    const hasJsonLdSchemas = configuration.modelTypes?.some?.(
+      (modelType) =>
+        modelType.typeData?.schemaType === "jsonld-context" ||
+        modelType.typeData?.schemaType === "jsonld-entity" ||
+        modelType.typeData?.schemaType === "jsonld-type",
     );
 
     if (hasJsonLdSchemas) {
@@ -533,11 +533,11 @@ export class CodeGenProcess {
       configuration.config;
 
     // Check if we have JSON-LD schemas
-    const hasJsonLdSchemas = configuration.components?.some?.(
-      (component) =>
-        component.schemaType === "jsonld-context" ||
-        component.schemaType === "jsonld-entity" ||
-        component.schemaType === "jsonld-type",
+    const hasJsonLdSchemas = configuration.modelTypes?.some?.(
+      (modelType) =>
+        modelType.typeData?.schemaType === "jsonld-context" ||
+        modelType.typeData?.schemaType === "jsonld-entity" ||
+        modelType.typeData?.schemaType === "jsonld-type",
     );
 
     return await this.createOutputFileInfo(

src/jsonld-schema-resolver.ts

@@ -114,16 +114,24 @@ export class JsonLdSchemaResolver {
       };
     }
 
-    // Process other properties
-    Object.entries(schema).forEach(([key, value]) => {
-      if (!key.startsWith("@")) {
-        resolvedSchema.properties[key] = this.resolveProperty(
-          key,
-          value,
-          schema["@context"],
-        );
-      }
-    });
+    // Process properties from the properties object if it exists
+    if (schema.properties && typeof schema.properties === "object") {
+      Object.entries(schema.properties).forEach(([key, value]) => {
+        // Skip @ properties and x-jsonld properties as they're handled elsewhere
+        if (!key.startsWith("@") && !key.startsWith("x-jsonld")) {
+          resolvedSchema.properties[key] = this.resolveProperty(
+            key,
+            value,
+            schema["@context"],
+          );
+        }
+      });
+    }
+
+    // Copy required array if it exists
+    if (Array.isArray(schema.required)) {
+      resolvedSchema.required.push(...schema.required);
+    }
 
     return resolvedSchema;
   }

templates/base/jsonld-context-data-contract.ejs

@@ -1,7 +1,13 @@
 <%
-const { contract, utils } = it;
+const { modelTypes, utils } = it;
 const { formatDescription, require, _ } = utils;
+
+// Filter for JSON-LD context types
+const jsonldContexts = modelTypes.filter(contract =>
+  contract.typeData?.schemaType === "jsonld-context"
+);
 %>
+<% for (const contract of jsonldContexts) { %>
 <% if (contract.description) { %>
 /**
  * <%~ formatDescription(contract.description) %>
@@ -12,4 +18,6 @@ export interface <%~ contract.name %> {
     <%~ includeFile('@base/object-field-jsdoc.ejs', { ...it, field }) %>
     <%~ field.name %><%~ field.isRequired ? '' : '?' %>: <%~ field.value %>;
   <% } %>
-}
+}
+
+<% } %>

templates/base/jsonld-entity-data-contract.ejs

@@ -1,7 +1,13 @@
 <%
-const { contract, utils } = it;
+const { modelTypes, utils } = it;
 const { formatDescription, require, _ } = utils;
+
+// Filter for JSON-LD entity types
+const jsonldEntities = modelTypes.filter(contract =>
+  contract.typeData?.schemaType === "jsonld-entity"
+);
 %>
+<% for (const contract of jsonldEntities) { %>
 <% if (contract.description) { %>
 /**
  * <%~ formatDescription(contract.description) %>
@@ -17,4 +23,6 @@ export interface <%~ contract.name %> extends JsonLdEntity {
     <%~ includeFile('@base/object-field-jsdoc.ejs', { ...it, field }) %>
     <%~ field.name %><%~ field.isRequired ? '' : '?' %>: <%~ field.value %><%~ field.isNullable ? ' | null' : ''%>;
   <% } %>
-}
+}
+
+<% } %>