vite-plugin-ferry 0.1.2 → 0.1.4

package/dist/generators/resources.js

@@ -1,221 +1,53 @@
+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, getModelCasts, parseEnumFile, } from '../utils/php-parser.js';
-import { mapDocTypeToTs, mapPhpTypeToTs, parseTsObjectStringToPairs } from '../utils/type-mapper.js';
-/**
- * Map a PHP cast to a TypeScript type, potentially collecting enum references.
- */
-function mapCastToType(cast, enumsDir, collectedEnums) {
-    const original = cast;
-    const lower = cast.toLowerCase();
-    // 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 def = parseEnumFile(enumPath);
-        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 casts = getModelCasts(modelPath);
-            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).
- */
-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;
-}
+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';
 /**
  * Generate TypeScript type declarations for resources.
  */
 export function generateResourceTypeScript(resources, fallbacks, referencedEnums) {
-    const lines = [];
-    lines.push('// This file is auto-generated by the primcloud Vite plugin.');
-    lines.push('// Do not edit directly.');
-    lines.push('');
+    const nodes = [];
     // Import referenced enums from @app/enums
     if (referencedEnums.size > 0) {
-        const enumImports = Array.from(referencedEnums).sort().join(', ');
-        lines.push(`import type { ${enumImports} } from '@app/enums';`);
-        lines.push('');
+        const enumImports = Array.from(referencedEnums).sort();
+        nodes.push(createImportType(enumImports, '@app/enums'));
     }
     // Generate resource types
     for (const className of Object.keys(resources)) {
         const fields = resources[className];
         if (fallbacks.includes(className)) {
-            lines.push(`export type ${className} = Record<string, any>;`);
-            lines.push('');
+            // Fallback type: Record<string, any>
+            const recordType = ts.factory.createTypeReferenceNode(ts.factory.createIdentifier('Record'), [
+                ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+                ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword),
+            ]);
+            nodes.push(createTypeAlias(className, recordType));
             continue;
         }
-        lines.push(`export type ${className} = {`);
-        for (const key of Object.keys(fields)) {
+        // Create type literal with all fields
+        const properties = Object.keys(fields).map((key) => {
             const info = fields[key];
-            const type = info.type || 'any';
-            const optional = info.optional ? '?' : '';
-            lines.push(`    ${key}${optional}: ${type};`);
-        }
-        lines.push('};');
-        lines.push('');
+            return {
+                name: key,
+                type: parseTypeString(info.type || 'any'),
+                optional: info.optional,
+            };
+        });
+        nodes.push(createTypeAlias(className, createTypeLiteral(properties)));
     }
-    return lines.join('\n');
+    if (nodes.length === 0)
+        return '';
+    return nodes.map(printNode).join('\n\n') + '\n';
 }
 /**
  * Generate runtime JavaScript for resources.
  * Resources are type-only, so this just exports an empty object.
  */
 export function generateResourceRuntime() {
-    const lines = [];
-    lines.push('// Auto-generated by primcloud Vite plugin');
-    lines.push('// Resources are type-only exports');
-    lines.push('');
-    lines.push('export default {};');
-    return lines.join('\n');
+    return 'export default {};';
 }
 /**
  * Generate resource type files (TypeScript declarations and runtime JavaScript).
@@ -236,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/index.d.ts

@@ -1,6 +1,7 @@
 import type { Plugin } from 'vite';
 export type ResourceTypesPluginOptions = {
     cwd?: string;
+    prettyPrint?: boolean;
 };
 /**
  * Vite plugin for generating TypeScript types from Laravel PHP files.

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAMnC,MAAM,MAAM,0BAA0B,GAAG;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,UAAU,KAAK,CAC3B,OAAO,GAAE,0BAER,GACA,MAAM,CAmFR"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAMnC,MAAM,MAAM,0BAA0B,GAAG;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,OAAO,GAAE,0BAA+B,GAAG,MAAM,CAyF9E"}

package/dist/index.js

@@ -11,18 +11,19 @@ import { setupResourceWatcher } from './watchers/resources.js';
  * - @app/resources - Laravel JsonResource types
  * - @app/schemas - (future) Zod schemas from FormRequests
  */
-export default function ferry(options = {
-    cwd: process.cwd(),
-}) {
+export default function ferry(options = {}) {
     const namespace = '@ferry';
     const name = 'vite-plugin-ferry';
+    // Apply defaults
+    const cwd = options.cwd ?? process.cwd();
+    const prettyPrint = options.prettyPrint ?? true;
     // Directory paths
-    const enumsDir = join(options.cwd, 'app/Enums');
-    const resourcesDir = join(options.cwd, 'app/Http/Resources');
-    const modelsDir = join(options.cwd, 'app/Models');
+    const enumsDir = join(cwd, 'app/Enums');
+    const resourcesDir = join(cwd, 'app/Http/Resources');
+    const modelsDir = join(cwd, 'app/Models');
     // Output directories for each package
-    const enumsOutputDir = join(options.cwd, 'node_modules', ...namespace.split('/'), 'enums');
-    const resourcesOutputDir = join(options.cwd, 'node_modules', ...namespace.split('/'), 'resources');
+    const enumsOutputDir = join(cwd, 'node_modules', ...namespace.split('/'), 'enums');
+    const resourcesOutputDir = join(cwd, 'node_modules', ...namespace.split('/'), 'resources');
     /**
      * Generate all packages.
      */
@@ -32,6 +33,7 @@ export default function ferry(options = {
             enumsDir,
             outputDir: enumsOutputDir,
             packageName: `${namespace}/enums`,
+            prettyPrint,
         });
         // Generate @app/resources package
         generateResources({
@@ -40,6 +42,7 @@ export default function ferry(options = {
             modelsDir,
             outputDir: resourcesOutputDir,
             packageName: `${namespace}/resources`,
+            prettyPrint,
         });
     }
     return {

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

@@ -1,6 +1,6 @@
 export type EnumCase = {
     key: string;
-    value: string;
+    value: string | number;
     label?: string;
 };
 export type EnumDefinition = {
@@ -9,23 +9,40 @@ export type EnumDefinition = {
     cases: EnumCase[];
 };
 /**
- * Parse a PHP enum file and extract its definition.
+ * Parse PHP enum content and extract its definition.
+ * This is a pure function that takes PHP source code as input.
  */
-export declare function parseEnumFile(enumPath: string): EnumDefinition | null;
+export declare function parseEnumContent(phpContent: string): EnumDefinition | null;
 /**
- * Parse PHP array pairs from a string like "'key' => 'value'".
+ * Parse model casts from PHP model content.
+ * This is a pure function that takes PHP source code as input.
  */
-export declare function parsePhpArrayPairs(inside: string): Record<string, string>;
+export declare function parseModelCasts(phpContent: string): Record<string, string>;
 /**
- * Extract model casts from a PHP model file.
- */
-export declare function getModelCasts(modelPath: string): Record<string, string>;
-/**
- * Extract docblock array shape from PHP file content.
+ * Extract docblock array shape from PHP content.
+ * 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 a PHP resource.
+ * 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":"AAEA,MAAM,MAAM,QAAQ,GAAG;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,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;AAEF;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CA8CrE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAoBzE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA4BvE;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAqE3F;AAED;;GAEG;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"}