@arcteninc/core 0.0.52 → 0.0.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcteninc/core",
-  "version": "0.0.52",
+  "version": "0.0.53",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",

package/scripts/cli-extract-types-auto.ts

@@ -731,18 +731,54 @@ function serializeTypeCustom(
           }
           
           // Build the schema for this type
+          // For interfaces, get properties from both the type and the declaration
           const props = checker.getPropertiesOfType(type);
-          if (props.length > 0) {
-            const properties: Record<string, JsonSchemaProperty> = {};
-            const required: string[] = [];
-            
-            // Use the same visited set for properties to detect recursion
+          const properties: Record<string, JsonSchemaProperty> = {};
+          const required: string[] = [];
+          
+          // Extract properties from the interface/type alias declaration
+          if (ts.isInterfaceDeclaration(firstDecl)) {
+            for (const member of firstDecl.members) {
+              if (ts.isPropertySignature(member) && ts.isIdentifier(member.name)) {
+                const propName = member.name.text;
+                const isOptional = member.questionToken !== undefined;
+                
+                if (member.type) {
+                  const propType = checker.getTypeFromTypeNode(member.type);
+                  const propResult = serializeTypeCustom(propType, checker, defs, visited, depth + 1);
+                  properties[propName] = propResult.schema;
+                  
+                  if (!isOptional && !propResult.isOptional) {
+                    required.push(propName);
+                  }
+                }
+              }
+            }
+          } else if (ts.isTypeAliasDeclaration(firstDecl) && firstDecl.type) {
+            // For type aliases, resolve the underlying type
+            const underlyingType = checker.getTypeFromTypeNode(firstDecl.type);
+            if (underlyingType.flags & ts.TypeFlags.Object) {
+              const aliasProps = checker.getPropertiesOfType(underlyingType);
+              for (const prop of aliasProps) {
+                const propName = prop.getName();
+                const propType = checker.getTypeOfSymbolAtLocation(prop, prop.valueDeclaration || prop.declarations?.[0] || null as any);
+                const isOptional = (prop.flags & ts.SymbolFlags.Optional) !== 0;
+                
+                const propResult = serializeTypeCustom(propType, checker, defs, visited, depth + 1);
+                properties[propName] = propResult.schema;
+                
+                if (!isOptional && !propResult.isOptional) {
+                  required.push(propName);
+                }
+              }
+            }
+          } else if (props.length > 0) {
+            // Fallback: use getPropertiesOfType if declaration parsing didn't work
             for (const prop of props) {
               const propName = prop.getName();
-              const propType = checker.getTypeOfSymbolAtLocation(prop, prop.valueDeclaration || prop.declarations?.[0] || checker.getDeclaredTypeOfSymbol(prop).symbol?.valueDeclaration || null as any);
+              const propType = checker.getTypeOfSymbolAtLocation(prop, prop.valueDeclaration || prop.declarations?.[0] || null as any);
               const isOptional = (prop.flags & ts.SymbolFlags.Optional) !== 0;
               
-              // Recursively serialize the property type (will detect recursion via visited set)
               const propResult = serializeTypeCustom(propType, checker, defs, visited, depth + 1);
               properties[propName] = propResult.schema;
               
@@ -750,15 +786,15 @@ function serializeTypeCustom(
                 required.push(propName);
               }
             }
-            
-            // Update the placeholder with the actual schema
-            defs[defsKey] = {
-              type: 'object',
-              properties,
-              ...(required.length > 0 && { required })
-            };
           }
           
+          // Update the placeholder with the actual schema (even if empty, to avoid infinite loops)
+          defs[defsKey] = {
+            type: 'object',
+            properties,
+            ...(required.length > 0 && { required })
+          };
+          
           // Return reference
           return { isOptional: false, schema: { $ref: `#/$defs/${defsKey}` } };
         }