vite-plugin-ferry 0.1.3 → 0.1.4

package/README.md

@@ -44,7 +44,9 @@ import type { UserResource } from '@ferry/resources';
 
 ### Enums
 
-A PHP enum with labels:
+#### String-backed enum with labels
+
+When your enum has a `label()` method, Ferry generates a typed constant object:
 
 ```php
 // app/Enums/OrderStatus.php
@@ -76,9 +78,86 @@ export declare const OrderStatus: {
 };
 ```
 
+#### String-backed enum without labels
+
+Simple string enums become TypeScript enums:
+
+```php
+// app/Enums/Role.php
+enum Role: string
+{
+    case ADMIN = 'admin';
+    case USER = 'user';
+    case GUEST = 'guest';
+}
+```
+
+Generates:
+
+```ts
+// @ferry/enums
+export enum Role {
+  ADMIN = 'admin',
+  USER = 'user',
+  GUEST = 'guest',
+}
+```
+
+#### Int-backed enum
+
+Integer enums work the same way:
+
+```php
+// app/Enums/Priority.php
+enum Priority: int
+{
+    case LOW = 1;
+    case MEDIUM = 2;
+    case HIGH = 3;
+    case URGENT = 4;
+}
+```
+
+Generates:
+
+```ts
+// @ferry/enums
+export enum Priority {
+  LOW = 1,
+  MEDIUM = 2,
+  HIGH = 3,
+  URGENT = 4,
+}
+```
+
+#### Unit enum (no backing type)
+
+Unit enums use their case names as values:
+
+```php
+// app/Enums/Color.php
+enum Color
+{
+    case RED;
+    case GREEN;
+    case BLUE;
+}
+```
+
+Generates:
+
+```ts
+// @ferry/enums
+export enum Color {
+  RED = 'RED',
+  GREEN = 'GREEN',
+  BLUE = 'BLUE',
+}
+```
+
 ### Resources
 
-A Laravel JsonResource:
+#### Basic resource
 
 ```php
 // app/Http/Resources/UserResource.php
@@ -90,8 +169,8 @@ class UserResource extends JsonResource
             'id' => $this->resource->id,
             'name' => $this->resource->name,
             'email' => $this->resource->email,
+            'is_admin' => $this->resource->is_admin,
             'created_at' => $this->resource->created_at,
-            'posts' => PostResource::collection($this->whenLoaded('posts')),
         ];
     }
 }
@@ -105,11 +184,102 @@ export type UserResource = {
   id: string;
   name: string;
   email: string;
+  is_admin: boolean;
   created_at: string;
-  posts?: PostResource[];
 };
 ```
 
+#### Resource with relations
+
+Fields using `whenLoaded()` become optional and resolve to the correct resource type:
+
+```php
+// app/Http/Resources/PostResource.php
+class PostResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->resource->id,
+            'title' => $this->resource->title,
+            'slug' => $this->resource->slug,
+            'is_published' => $this->resource->is_published,
+            'author' => UserResource::make($this->whenLoaded('author')),
+            'comments' => CommentResource::collection($this->whenLoaded('comments')),
+            'created_at' => $this->resource->created_at,
+        ];
+    }
+}
+```
+
+Generates:
+
+```ts
+// @ferry/resources
+export type PostResource = {
+  id: string;
+  title: string;
+  slug: string;
+  is_published: boolean;
+  author?: UserResource[];
+  comments?: CommentResource[];
+  created_at: string;
+};
+```
+
+#### Resource with nested objects
+
+Inline array structures become typed objects:
+
+```php
+// app/Http/Resources/OrderResource.php
+class OrderResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->resource->id,
+            'total' => $this->resource->total,
+            'status' => $this->resource->status,
+            'items' => $this->resource->items,
+            'user' => $this->whenLoaded('user'),
+            'shipping_address' => [
+                'street' => $this->resource->address_street,
+                'city' => $this->resource->address_city,
+                'zip' => $this->resource->address_zip,
+            ],
+            'created_at' => $this->resource->created_at,
+        ];
+    }
+}
+```
+
+Generates:
+
+```ts
+// @ferry/resources
+export type OrderResource = {
+  id: string;
+  total: string;
+  status: string;
+  items: string;
+  user?: UserResource;
+  shipping_address: { street: string; city: string; zip: string };
+  created_at: string;
+};
+```
+
+## Publishing
+
+To publish a new version:
+
+```bash
+npm version patch  # or minor, major
+git push --follow-tags
+```
+
+This bumps the version, creates a commit and tag, then pushes both to trigger the publish workflow.
+
 ## License
 
 See [LICENSE](LICENSE) for details.

package/dist/generators/resources.d.ts

@@ -1,4 +1,4 @@
-import { type EnumDefinition } from '../utils/php-parser.js';
+import { type ResourceFieldInfo } from '../utils/php-parser.js';
 export type ResourceGeneratorOptions = {
     resourcesDir: string;
     enumsDir: string;
@@ -7,18 +7,11 @@ export type ResourceGeneratorOptions = {
     packageName: string;
     prettyPrint?: boolean;
 };
-export type FieldInfo = {
-    type: string;
-    optional: boolean;
-};
-/**
- * Parse fields from a PHP array block (from toArray() method).
- */
-export declare function parseFieldsFromArrayBlock(block: string, resourceClass: string, docShape: Record<string, string> | null, resourcesDir: string, modelsDir: string, enumsDir: string, collectedEnums: Record<string, EnumDefinition>): Record<string, FieldInfo>;
+export type FieldInfo = ResourceFieldInfo;
 /**
  * Generate TypeScript type declarations for resources.
  */
-export declare function generateResourceTypeScript(resources: Record<string, Record<string, FieldInfo>>, fallbacks: string[], referencedEnums: Set<string>): string;
+export declare function generateResourceTypeScript(resources: Record<string, Record<string, ResourceFieldInfo>>, fallbacks: string[], referencedEnums: Set<string>): string;
 /**
  * Generate runtime JavaScript for resources.
  * Resources are type-only, so this just exports an empty object.

package/dist/generators/resources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/generators/resources.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,KAAK,cAAc,EACpB,MAAM,wBAAwB,CAAC;AAUhC,MAAM,MAAM,wBAAwB,GAAG;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAgIF;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,EACvC,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAC7C,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAyF3B;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,EACpD,SAAS,EAAE,MAAM,EAAE,EACnB,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAC3B,MAAM,CAuCR;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CAEhD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,IAAI,CAqEzE"}
+{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/generators/resources.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,wBAAwB,CAAC;AAUhC,MAAM,MAAM,wBAAwB,GAAG;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAGF,MAAM,MAAM,SAAS,GAAG,iBAAiB,CAAC;AAE1C;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,EAC5D,SAAS,EAAE,MAAM,EAAE,EACnB,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAC3B,MAAM,CAuCR;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CAEhD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,IAAI,CAoEzE"}

package/dist/generators/resources.js

@@ -2,182 +2,9 @@ import ts from 'typescript';
 import { existsSync } from 'node:fs';
 import { join, parse } from 'node:path';
 import { getPhpFiles, readFileSafe, writeFileEnsureDir } from '../utils/file.js';
-import { extractDocblockArrayShape, extractReturnArrayBlock, parseEnumContent, parseModelCasts, } from '../utils/php-parser.js';
-import { mapDocTypeToTs, mapPhpTypeToTs, parseTsObjectStringToPairs } from '../utils/type-mapper.js';
+import { extractDocblockArrayShape, parseResourceFieldsAst, } from '../utils/php-parser.js';
+import { mapDocTypeToTs } from '../utils/type-mapper.js';
 import { printNode, createTypeAlias, createImportType, parseTypeString, createTypeLiteral, } from '../utils/ts-generator.js';
-/**
- * Map a PHP cast to a TypeScript type, potentially collecting enum references.
- */
-function mapCastToType(cast, enumsDir, collectedEnums) {
-    const original = cast;
-    // Try to find enum in app/Enums
-    const match = original.match(/([A-Za-z0-9_\\]+)$/);
-    const short = match ? match[1].replace(/^\\+/, '') : original;
-    const enumPath = join(enumsDir, `${short}.php`);
-    if (existsSync(enumPath)) {
-        const content = readFileSafe(enumPath);
-        if (content) {
-            const def = parseEnumContent(content);
-            if (def) {
-                collectedEnums[def.name] = def;
-                return def.name;
-            }
-        }
-    }
-    return mapPhpTypeToTs(cast);
-}
-/**
- * Infer TypeScript type from a PHP resource value expression.
- */
-function inferTypeFromValue(value, key, resourceClass, resourcesDir, modelsDir, enumsDir, collectedEnums) {
-    let optional = false;
-    // Resource::collection
-    const collMatch = value.match(/([A-Za-z0-9_]+)::collection\s*\(\s*(.*?)\s*\)/);
-    if (collMatch) {
-        const res = collMatch[1];
-        const inside = collMatch[2];
-        if (inside.includes('whenLoaded('))
-            optional = true;
-        return { type: `${res}[]`, optional };
-    }
-    // whenLoaded
-    const whenLoadedMatch = value.match(/whenLoaded\(\s*["']([A-Za-z0-9_]+)["']\s*\)/);
-    if (whenLoadedMatch) {
-        const name = whenLoadedMatch[1];
-        optional = true;
-        const candidate = `${name[0].toUpperCase()}${name.slice(1)}Resource`;
-        const resPath = join(resourcesDir, `${candidate}.php`);
-        if (existsSync(resPath)) {
-            return { type: candidate, optional };
-        }
-        return { type: 'Record<string, any>', optional };
-    }
-    // $this->resource->property
-    const propMatch = value.match(/\$this->resource->([A-Za-z0-9_]+)/);
-    if (propMatch) {
-        const prop = propMatch[1];
-        // Boolean checks
-        if (/\?\s*true\s*:\s*false|===\s*(true|false)|==\s*(true|false)/i.test(value)) {
-            return { type: 'boolean', optional: false };
-        }
-        if (/\$this->resource->(is|has)[A-Za-z0-9_]*\s*\(/i.test(value)) {
-            return { type: 'boolean', optional: false };
-        }
-        const lower = prop.toLowerCase();
-        if (lower.startsWith('is_') || lower.startsWith('has_') || /^(is|has)[A-Z]/.test(prop)) {
-            return { type: 'boolean', optional: false };
-        }
-        // IDs and UUIDs
-        if (prop === 'id' || prop.endsWith('_id') || lower === 'uuid') {
-            return { type: 'string', optional: false };
-        }
-        // Check model casts
-        const modelCandidate = resourceClass.replace(/Resource$/, '');
-        const modelPath = join(modelsDir, `${modelCandidate}.php`);
-        if (existsSync(modelPath)) {
-            const modelContent = readFileSafe(modelPath);
-            if (modelContent) {
-                const casts = parseModelCasts(modelContent);
-                if (casts[prop]) {
-                    const cast = casts[prop];
-                    const trim = cast.trim();
-                    const tsType = trim.startsWith('{') || trim.includes(':') || /array\s*\{/.test(trim)
-                        ? trim
-                        : mapCastToType(cast, enumsDir, collectedEnums);
-                    return { type: tsType, optional: false };
-                }
-            }
-        }
-        // Number heuristics
-        if (['last4', 'count', 'total'].includes(prop) || /\d$/.test(prop)) {
-            return { type: 'number', optional: false };
-        }
-        // String heuristics
-        if (['id', 'uuid', 'slug', 'name', 'repository', 'region', 'email'].includes(prop)) {
-            return { type: 'string', optional: false };
-        }
-        // Timestamps
-        if (prop.endsWith('_at') || ['created_at', 'updated_at', 'lastActive'].includes(prop)) {
-            return { type: 'string', optional: false };
-        }
-        return { type: 'string', optional: false };
-    }
-    return { type: 'any', optional: false };
-}
-/**
- * Parse fields from a PHP array block (from toArray() method).
- */
-export function parseFieldsFromArrayBlock(block, resourceClass, docShape, resourcesDir, modelsDir, enumsDir, collectedEnums) {
-    const lines = block.split(/\r?\n/);
-    const fields = {};
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i].trim();
-        if (!line || line.startsWith('//'))
-            continue;
-        const match = line.match(/["'](?<key>[A-Za-z0-9_]+)["']\s*=>\s*(?<value>.*?)(?:,\s*$|$)/);
-        if (!match || !match.groups)
-            continue;
-        const key = match.groups.key;
-        let value = match.groups.value.trim();
-        // Boolean heuristic
-        const lowerKey = key.toLowerCase();
-        if (lowerKey.startsWith('is_') || lowerKey.startsWith('has_') || /^(is|has)[A-Z]/.test(key)) {
-            fields[key] = { type: 'boolean', optional: false };
-            continue;
-        }
-        // Handle nested arrays
-        if (value.startsWith('[')) {
-            let bracketDepth = (value.match(/\[/g) || []).length - (value.match(/\]/g) || []).length;
-            const innerLines = [];
-            const rest = value.replace(/^\[\s*/, '');
-            if (rest)
-                innerLines.push(rest);
-            let j = i + 1;
-            while (j < lines.length && bracketDepth > 0) {
-                const l = lines[j];
-                bracketDepth += (l.match(/\[/g) || []).length - (l.match(/\]/g) || []).length;
-                innerLines.push(l.trim());
-                j++;
-            }
-            i = j - 1;
-            const innerBlock = innerLines.join('\n');
-            const nested = parseFieldsFromArrayBlock(innerBlock, resourceClass, docShape, resourcesDir, modelsDir, enumsDir, collectedEnums);
-            // Apply docblock shape if available
-            if (docShape && docShape[key]) {
-                const docType = docShape[key].trim();
-                if (docType.startsWith('{')) {
-                    const docInner = parseTsObjectStringToPairs(docType);
-                    for (const dk of Object.keys(docInner)) {
-                        nested[dk] = { type: docInner[dk], optional: false };
-                    }
-                }
-            }
-            const props = [];
-            for (const nkey of Object.keys(nested)) {
-                const ninfo = nested[nkey];
-                const ntype = ninfo.type || 'any';
-                const nopt = ninfo.optional ? '?' : '';
-                props.push(`${nkey}${nopt}: ${ntype}`);
-            }
-            const inline = `{ ${props.join('; ')} }`;
-            fields[key] = { type: inline, optional: false };
-            continue;
-        }
-        // Use docblock type if available
-        if (docShape && docShape[key]) {
-            fields[key] = { type: docShape[key], optional: false };
-            continue;
-        }
-        // Infer type from value
-        const info = inferTypeFromValue(value, key, resourceClass, resourcesDir, modelsDir, enumsDir, collectedEnums);
-        if (docShape && docShape[key] && (!info.type || info.type === 'any')) {
-            info.type = docShape[key];
-            info.optional = info.optional ?? false;
-        }
-        fields[key] = info;
-    }
-    return fields;
-}
 /**
  * Generate TypeScript type declarations for resources.
  */
@@ -241,13 +68,19 @@ export function generateResources(options) {
             const content = readFileSafe(filePath) || '';
             const className = parse(file).name;
             const docShape = extractDocblockArrayShape(content);
-            const arrayBlock = extractReturnArrayBlock(content);
-            if (!arrayBlock) {
+            const mappedDocShape = docShape ? mapDocTypeToTsForShape(docShape) : null;
+            const fields = parseResourceFieldsAst(content, {
+                resourcesDir,
+                modelsDir,
+                enumsDir,
+                docShape: mappedDocShape,
+                collectedEnums,
+            });
+            if (!fields) {
                 fallbacks.push(className);
                 resources[className] = {};
             }
             else {
-                const fields = parseFieldsFromArrayBlock(arrayBlock, className, docShape ? mapDocTypeToTsForShape(docShape) : null, resourcesDir, modelsDir, enumsDir, collectedEnums);
                 resources[className] = fields;
             }
         }

package/dist/utils/php-parser.d.ts

@@ -23,9 +23,26 @@ export declare function parseModelCasts(phpContent: string): Record<string, stri
  * This is a pure function that takes PHP source code as input.
  */
 export declare function extractDocblockArrayShape(phpContent: string): Record<string, string> | null;
+export type ResourceFieldInfo = {
+    type: string;
+    optional: boolean;
+};
+export type ResourceArrayEntry = {
+    key: string;
+    fieldInfo: ResourceFieldInfo;
+    nested?: Record<string, ResourceArrayEntry>;
+};
+export type ParseResourceOptions = {
+    resourcesDir?: string;
+    modelsDir?: string;
+    enumsDir?: string;
+    docShape?: Record<string, string> | null;
+    collectedEnums?: Record<string, EnumDefinition>;
+    resourceClass?: string;
+};
 /**
- * Extract the return array block from a toArray() method in PHP content.
- * This is a pure function that takes PHP source code as input.
+ * Parse resource fields from PHP content using AST.
+ * Returns null if parsing fails or no toArray method is found.
  */
-export declare function extractReturnArrayBlock(phpContent: string): string | null;
+export declare function parseResourceFieldsAst(phpContent: string, options?: Omit<ParseResourceOptions, 'resourceClass'>): Record<string, ResourceFieldInfo> | null;
 //# sourceMappingURL=php-parser.d.ts.map

package/dist/utils/php-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"php-parser.d.ts","sourceRoot":"","sources":["../../src/utils/php-parser.ts"],"names":[],"mappings":"AAiBA,MAAM,MAAM,QAAQ,GAAG;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB,CAAC;AA6FF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAsF1E;AA4CD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAwC1E;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAwE3F;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CASzE"}
+{"version":3,"file":"php-parser.d.ts","sourceRoot":"","sources":["../../src/utils/php-parser.ts"],"names":[],"mappings":"AAqBA,MAAM,MAAM,QAAQ,GAAG;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB,CAAC;AA6FF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAsF1E;AA4CD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAwC1E;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAwE3F;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,iBAAiB,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACzC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAChD,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AA8RF;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAM,GACxD,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,IAAI,CAqC1C"}

package/dist/utils/php-parser.js

@@ -1,3 +1,7 @@
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import { readFileSafe } from './file.js';
+import { mapPhpTypeToTs } from './type-mapper.js';
 // Import php-parser (CommonJS module with constructor)
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const PhpParser = require('php-parser');
@@ -339,16 +343,289 @@ export function extractDocblockArrayShape(phpContent) {
     return pairs;
 }
 /**
- * Extract the return array block from a toArray() method in PHP content.
- * This is a pure function that takes PHP source code as input.
+ * Check if an AST node contains a whenLoaded call.
  */
-export function extractReturnArrayBlock(phpContent) {
-    const match = phpContent.match(/function\s+toArray\s*\([^)]*\)\s*:\s*array\s*\{([\s\S]*?)\n\s*\}/);
-    if (!match)
+function containsWhenLoaded(node) {
+    if (node.kind === 'call') {
+        const call = node;
+        if (call.what.kind === 'propertylookup') {
+            const lookup = call.what;
+            const offset = lookup.offset;
+            const name = offset.kind === 'identifier' ? offset.name : null;
+            if (name === 'whenLoaded')
+                return true;
+        }
+    }
+    // Check arguments recursively
+    const obj = node;
+    for (const key of Object.keys(obj)) {
+        const val = obj[key];
+        if (val && typeof val === 'object') {
+            if (val.kind && containsWhenLoaded(val))
+                return true;
+            if (Array.isArray(val)) {
+                for (const item of val) {
+                    if (item && item.kind && containsWhenLoaded(item))
+                        return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+/**
+ * Extract resource name from a static call like Resource::make() or Resource::collection().
+ */
+function extractStaticCallResource(call) {
+    if (call.what.kind !== 'staticlookup')
         return null;
-    const body = match[1];
-    const returnMatch = body.match(/return\s*\[\s*([\s\S]*?)\s*\];/);
-    if (!returnMatch)
+    const lookup = call.what;
+    if (lookup.what.kind !== 'name')
         return null;
-    return returnMatch[1];
+    const resource = lookup.what.name;
+    const offset = lookup.offset;
+    const method = offset.kind === 'identifier' ? offset.name : null;
+    if (!method)
+        return null;
+    return { resource, method };
+}
+/**
+ * Extract resource name from a new expression like new Resource().
+ */
+function extractNewResource(newExpr) {
+    if (newExpr.what.kind !== 'name')
+        return null;
+    return newExpr.what.name;
+}
+/**
+ * Extract property name from $this->resource->property.
+ */
+function extractResourceProperty(node) {
+    if (node.kind !== 'propertylookup')
+        return null;
+    const lookup = node;
+    const what = lookup.what;
+    // Check for $this->resource
+    if (what.kind === 'propertylookup') {
+        const inner = what;
+        if (inner.what.kind === 'variable' && inner.what.name === 'this') {
+            const innerOffset = inner.offset;
+            const innerName = innerOffset.kind === 'identifier' ? innerOffset.name : null;
+            if (innerName === 'resource') {
+                const offset = lookup.offset;
+                return offset.kind === 'identifier' ? offset.name : null;
+            }
+        }
+    }
+    return null;
+}
+/**
+ * Map a PHP cast to a TypeScript type, potentially collecting enum references.
+ */
+function mapCastToType(cast, enumsDir, collectedEnums) {
+    const original = cast;
+    // Try to find enum in app/Enums
+    const match = original.match(/([A-Za-z0-9_\\]+)$/);
+    const short = match ? match[1].replace(/^\\+/, '') : original;
+    const enumPath = join(enumsDir, `${short}.php`);
+    if (existsSync(enumPath)) {
+        const content = readFileSafe(enumPath);
+        if (content) {
+            const def = parseEnumContent(content);
+            if (def) {
+                collectedEnums[def.name] = def;
+                return def.name;
+            }
+        }
+    }
+    return mapPhpTypeToTs(cast);
+}
+/**
+ * Check if a resource file exists.
+ */
+function resourceExists(resourceName, resourcesDir) {
+    if (!resourcesDir)
+        return true; // Trust the name if no dir provided
+    return existsSync(join(resourcesDir, `${resourceName}.php`));
+}
+/**
+ * Infer TypeScript type from an AST value node.
+ */
+function inferTypeFromAstNode(node, key, options = {}) {
+    const { resourcesDir, modelsDir, enumsDir, docShape, collectedEnums = {}, resourceClass = '' } = options;
+    const optional = containsWhenLoaded(node);
+    // Use docblock type if available
+    if (docShape && docShape[key]) {
+        return { type: docShape[key], optional };
+    }
+    // Boolean heuristics from key name
+    const lowerKey = key.toLowerCase();
+    if (lowerKey.startsWith('is_') || lowerKey.startsWith('has_') || /^(is|has)[A-Z]/.test(key)) {
+        return { type: 'boolean', optional };
+    }
+    // Handle static calls: Resource::collection() or Resource::make()
+    if (node.kind === 'call') {
+        const call = node;
+        const staticInfo = extractStaticCallResource(call);
+        if (staticInfo) {
+            const { resource, method } = staticInfo;
+            // Collection or Collection::make returns any[]
+            if (resource === 'Collection') {
+                return { type: 'any[]', optional };
+            }
+            // Resource::collection or Resource::make returns Resource[]
+            if (method === 'collection' || method === 'make') {
+                if (resourceExists(resource, resourcesDir)) {
+                    return { type: `${resource}[]`, optional };
+                }
+                return { type: 'any[]', optional };
+            }
+        }
+        // Check if it's a whenLoaded call without a wrapper resource
+        if (call.what.kind === 'propertylookup') {
+            const lookup = call.what;
+            const offset = lookup.offset;
+            const name = offset.kind === 'identifier' ? offset.name : null;
+            if (name === 'whenLoaded') {
+                // Try to find matching resource (only if resourcesDir is provided)
+                if (resourcesDir) {
+                    const args = call.arguments;
+                    if (args.length > 0 && args[0].kind === 'string') {
+                        const relationName = args[0].value;
+                        const candidate = `${relationName[0].toUpperCase()}${relationName.slice(1)}Resource`;
+                        if (existsSync(join(resourcesDir, `${candidate}.php`))) {
+                            return { type: candidate, optional: true };
+                        }
+                    }
+                }
+                return { type: 'Record<string, any>', optional: true };
+            }
+        }
+    }
+    // Handle new Resource()
+    if (node.kind === 'new') {
+        const newExpr = node;
+        const resource = extractNewResource(newExpr);
+        if (resource) {
+            if (resourceExists(resource, resourcesDir)) {
+                return { type: resource, optional };
+            }
+            return { type: 'any', optional };
+        }
+        return { type: 'any', optional };
+    }
+    // Handle $this->resource->property
+    const prop = extractResourceProperty(node);
+    if (prop) {
+        const lower = prop.toLowerCase();
+        // Boolean checks
+        if (lower.startsWith('is_') || lower.startsWith('has_') || /^(is|has)[A-Z]/.test(prop)) {
+            return { type: 'boolean', optional: false };
+        }
+        // IDs and UUIDs
+        if (prop === 'id' || prop.endsWith('_id') || lower === 'uuid' || prop.endsWith('Id')) {
+            return { type: 'string', optional: false };
+        }
+        // Check model casts
+        if (modelsDir && resourceClass) {
+            const modelCandidate = resourceClass.replace(/Resource$/, '');
+            const modelPath = join(modelsDir, `${modelCandidate}.php`);
+            if (existsSync(modelPath)) {
+                const modelContent = readFileSafe(modelPath);
+                if (modelContent) {
+                    const casts = parseModelCasts(modelContent);
+                    if (casts[prop]) {
+                        const cast = casts[prop];
+                        const trim = cast.trim();
+                        const tsType = trim.startsWith('{') || trim.includes(':') || /array\s*\{/.test(trim)
+                            ? trim
+                            : mapCastToType(cast, enumsDir || '', collectedEnums);
+                        return { type: tsType, optional: false };
+                    }
+                }
+            }
+        }
+        // Timestamps
+        if (prop.endsWith('_at') || prop.endsWith('At')) {
+            return { type: 'string', optional: false };
+        }
+        return { type: 'string', optional: false };
+    }
+    // Handle nested arrays
+    if (node.kind === 'array') {
+        const arrayNode = node;
+        const nestedFields = parseArrayEntries(arrayNode.items, options);
+        if (Object.keys(nestedFields).length > 0) {
+            const props = Object.entries(nestedFields).map(([k, v]) => {
+                const opt = v.fieldInfo.optional ? '?' : '';
+                return `${k}${opt}: ${v.fieldInfo.type}`;
+            });
+            return { type: `{ ${props.join('; ')} }`, optional };
+        }
+        return { type: 'any[]', optional };
+    }
+    return { type: 'any', optional };
+}
+/**
+ * Parse array entries from AST array items.
+ */
+function parseArrayEntries(items, options = {}) {
+    const result = {};
+    for (const item of items) {
+        if (item.kind !== 'entry')
+            continue;
+        const entry = item;
+        if (!entry.key)
+            continue;
+        const key = getStringValue(entry.key);
+        if (!key)
+            continue;
+        const fieldInfo = inferTypeFromAstNode(entry.value, key, options);
+        result[key] = { key, fieldInfo };
+        // Handle nested arrays
+        if (entry.value.kind === 'array') {
+            const nested = parseArrayEntries(entry.value.items, options);
+            if (Object.keys(nested).length > 0) {
+                result[key].nested = nested;
+            }
+        }
+    }
+    return result;
+}
+/**
+ * Parse resource fields from PHP content using AST.
+ * Returns null if parsing fails or no toArray method is found.
+ */
+export function parseResourceFieldsAst(phpContent, options = {}) {
+    const ast = parsePhp(phpContent);
+    if (!ast)
+        return null;
+    // Find the class
+    const classNode = findNodeByKind(ast, 'class');
+    if (!classNode)
+        return null;
+    // Extract class name for model cast lookups
+    const className = typeof classNode.name === 'string'
+        ? classNode.name
+        : classNode.name.name;
+    // Find toArray method
+    const methods = findAllNodesByKind(classNode, 'method');
+    const toArrayMethod = methods.find((m) => {
+        const methodName = typeof m.name === 'string' ? m.name : m.name.name;
+        return methodName === 'toArray';
+    });
+    if (!toArrayMethod || !toArrayMethod.body)
+        return null;
+    // Find return statement with array
+    const returnNode = findNodeByKind(toArrayMethod.body, 'return');
+    if (!returnNode || !returnNode.expr || returnNode.expr.kind !== 'array')
+        return null;
+    const arrayNode = returnNode.expr;
+    const entries = parseArrayEntries(arrayNode.items, { ...options, resourceClass: className });
+    // Convert to flat field info
+    const result = {};
+    for (const [key, entry] of Object.entries(entries)) {
+        result[key] = entry.fieldInfo;
+    }
+    return result;
 }

package/package.json

@@ -3,7 +3,7 @@
   "prettier": "@aniftyco/prettier",
   "description": "Ferries Laravel types to your TypeScript frontend",
   "type": "module",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "repository": "https://github.com/aniftyco/vite-plugin-ferry",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",