@omnifyjp/omnify 3.3.0 → 3.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/omnify",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "Schema-driven code generation for Laravel, TypeScript, and SQL",
   "license": "MIT",
   "repository": {
@@ -36,10 +36,10 @@
     "zod": "^3.24.0"
   },
   "optionalDependencies": {
-    "@omnifyjp/omnify-darwin-arm64": "3.3.0",
-    "@omnifyjp/omnify-darwin-x64": "3.3.0",
-    "@omnifyjp/omnify-linux-x64": "3.3.0",
-    "@omnifyjp/omnify-linux-arm64": "3.3.0",
-    "@omnifyjp/omnify-win32-x64": "3.3.0"
+    "@omnifyjp/omnify-darwin-arm64": "3.4.0",
+    "@omnifyjp/omnify-darwin-x64": "3.4.0",
+    "@omnifyjp/omnify-linux-x64": "3.4.0",
+    "@omnifyjp/omnify-linux-arm64": "3.4.0",
+    "@omnifyjp/omnify-win32-x64": "3.4.0"
   }
 }

package/ts-dist/php/types.js

@@ -70,15 +70,58 @@ function pathToNamespace(p) {
         .map(s => s.charAt(0).toUpperCase() + s.slice(1))
         .join('\\');
 }
-// Default paths
-const DEFAULT_MODEL_PATH = 'app/Models/Omnify';
-const DEFAULT_REQUEST_PATH = 'app/Http/Requests';
-const DEFAULT_RESOURCE_PATH = 'app/Http/Resources';
+/**
+ * Convert a PHP namespace to a Laravel filesystem path
+ * (e.g., App\Models → app/Models, App\Models\Omnify → app/Models/Omnify).
+ *
+ * Lowercases the leading "App" segment to match Laravel's autoload convention.
+ */
+function namespaceToPath(ns) {
+    const parts = ns.split('\\').filter(Boolean);
+    if (parts.length === 0)
+        return '';
+    if (parts[0] === 'App')
+        parts[0] = 'app';
+    return parts.join('/');
+}
+/**
+ * Resolve the path/namespace pair for a target (model, policy, etc.) so they
+ * always stay in sync. Either side can be overridden independently:
+ *   - both unset → use defaults
+ *   - only path set → derive namespace from path
+ *   - only namespace set → derive path from namespace (prevents autoload
+ *     mismatches like generating App\Foo into app/Foo/Bar/)
+ *   - both set → use as-is (caller is responsible for keeping them aligned)
+ */
+function resolvePathAndNamespace(rootPath, override, defaultPath, nsFromPath) {
+    const hasPath = override?.path !== undefined;
+    const hasNs = override?.namespace !== undefined;
+    if (hasNs && !hasPath) {
+        const namespace = override.namespace;
+        const path = withRoot(rootPath, namespaceToPath(namespace));
+        return { path, namespace };
+    }
+    const path = withRoot(rootPath, override?.path ?? defaultPath);
+    const namespace = hasNs ? override.namespace : nsFromPath(path);
+    return { path, namespace };
+}
+// Default paths.
+//
+// Hybrid projects (manual team code + Omnify codegen) need Omnify-generated
+// files to live in their own `Omnify/` subfolder so they don't collide with
+// hand-written controllers/services/requests/resources of the same name.
+// See issue #32. Models keep the standard `app/Models` location because
+// editable models are first-class entities the team owns directly; the
+// regenerated base classes already live under `app/Modules/{Schema}/Models/`
+// in modular structure.
+const DEFAULT_MODEL_PATH = 'app/Models';
+const DEFAULT_REQUEST_PATH = 'app/Http/Requests/Omnify';
+const DEFAULT_RESOURCE_PATH = 'app/Http/Resources/Omnify';
 const DEFAULT_FACTORY_PATH = 'database/factories';
 const DEFAULT_PROVIDER_PATH = 'app/Providers';
 const DEFAULT_POLICY_PATH = 'app/Policies/Omnify';
-const DEFAULT_CONTROLLER_PATH = 'app/Http/Controllers';
-const DEFAULT_SERVICE_PATH = 'app/Services';
+const DEFAULT_CONTROLLER_PATH = 'app/Http/Controllers/Omnify';
+const DEFAULT_SERVICE_PATH = 'app/Services/Omnify';
 const DEFAULT_ROUTE_PATH = 'routes/api/omnify';
 const DEFAULT_CONFIG_FILE_PATH = 'config/omnify-schemas.php';
 const DEFAULT_MODULES_PATH = 'app/Modules';
@@ -115,22 +158,14 @@ export function derivePhpConfig(overrides) {
         return p;
     };
     const nsFromPath = (p) => pathToNamespace(stripRoot(p));
-    const modelPath = withRoot(rootPath, overrides?.model?.path ?? DEFAULT_MODEL_PATH);
-    const modelNs = overrides?.model?.namespace ?? nsFromPath(modelPath);
-    const requestPath = withRoot(rootPath, overrides?.request?.path ?? DEFAULT_REQUEST_PATH);
-    const requestNs = overrides?.request?.namespace ?? nsFromPath(requestPath);
-    const resourcePath = withRoot(rootPath, overrides?.resource?.path ?? DEFAULT_RESOURCE_PATH);
-    const resourceNs = overrides?.resource?.namespace ?? nsFromPath(resourcePath);
-    const factoryPath = withRoot(rootPath, overrides?.factory?.path ?? DEFAULT_FACTORY_PATH);
-    const factoryNs = overrides?.factory?.namespace ?? nsFromPath(factoryPath);
-    const providerPath = withRoot(rootPath, overrides?.provider?.path ?? DEFAULT_PROVIDER_PATH);
-    const providerNs = overrides?.provider?.namespace ?? nsFromPath(providerPath);
-    const policyPath = withRoot(rootPath, overrides?.policy?.path ?? DEFAULT_POLICY_PATH);
-    const policyNs = overrides?.policy?.namespace ?? nsFromPath(policyPath);
-    const controllerPath = withRoot(rootPath, overrides?.controller?.path ?? DEFAULT_CONTROLLER_PATH);
-    const controllerNs = overrides?.controller?.namespace ?? nsFromPath(controllerPath);
-    const servicePath = withRoot(rootPath, overrides?.service?.path ?? DEFAULT_SERVICE_PATH);
-    const serviceNs = overrides?.service?.namespace ?? nsFromPath(servicePath);
+    const { path: modelPath, namespace: modelNs } = resolvePathAndNamespace(rootPath, overrides?.model, DEFAULT_MODEL_PATH, nsFromPath);
+    const { path: requestPath, namespace: requestNs } = resolvePathAndNamespace(rootPath, overrides?.request, DEFAULT_REQUEST_PATH, nsFromPath);
+    const { path: resourcePath, namespace: resourceNs } = resolvePathAndNamespace(rootPath, overrides?.resource, DEFAULT_RESOURCE_PATH, nsFromPath);
+    const { path: factoryPath, namespace: factoryNs } = resolvePathAndNamespace(rootPath, overrides?.factory, DEFAULT_FACTORY_PATH, nsFromPath);
+    const { path: providerPath, namespace: providerNs } = resolvePathAndNamespace(rootPath, overrides?.provider, DEFAULT_PROVIDER_PATH, nsFromPath);
+    const { path: policyPath, namespace: policyNs } = resolvePathAndNamespace(rootPath, overrides?.policy, DEFAULT_POLICY_PATH, nsFromPath);
+    const { path: controllerPath, namespace: controllerNs } = resolvePathAndNamespace(rootPath, overrides?.controller, DEFAULT_CONTROLLER_PATH, nsFromPath);
+    const { path: servicePath, namespace: serviceNs } = resolvePathAndNamespace(rootPath, overrides?.service, DEFAULT_SERVICE_PATH, nsFromPath);
     const routePath = withRoot(rootPath, overrides?.route?.path ?? DEFAULT_ROUTE_PATH);
     const configFilePath = withRoot(rootPath, overrides?.config?.path ?? DEFAULT_CONFIG_FILE_PATH);
     const nestedsetNs = overrides?.nestedset?.namespace ?? 'Aimeos\\Nestedset';