@omnifyjp/ts 6.3.4 → 6.3.5

package/dist/php/model-generator.js

@@ -24,7 +24,7 @@ export function generateModels(reader, config) {
             if (extended.length > 0) {
                 files.push(generateExtendAttributesTrait(name, schema, extended, reader, config));
             }
-            files.push(generatePackageUserModel(name, pkgNs, config, extended.length > 0));
+            files.push(generatePackageUserModel(name, pkgNs, config, extended.length > 0, schema.kind === 'pivot'));
         }
     }
     return files;
@@ -1057,10 +1057,17 @@ function buildAccessors(expandedProperties) {
     return methods.join('\n');
 }
 /** Generate a user model for a package schema that extends the package's model class. */
-function generatePackageUserModel(name, packageNamespace, config, hasExtendAttributes = false) {
+function generatePackageUserModel(name, packageNamespace, config, hasExtendAttributes = false, isPivot = false) {
     const modelName = toPascalCase(name);
     const modelNamespace = config.models.namespace;
-    const packageModelClass = `${packageNamespace}\\${modelName}`;
+    // #178: a `kind: pivot` schema's editable model is emitted under the
+    // dedicated `Pivot/` subfolder on the package side too (v5.8.5), so the
+    // parent this stub extends is `<Pkg>\Models\Pivot\<Name>`. Naming the
+    // flat `<Pkg>\Models\<Name>` pointed at a class no generator ever writes,
+    // and the stub fataled with "Class not found" the moment it autoloaded.
+    const packageModelClass = isPivot
+        ? `${packageNamespace}\\Pivot\\${modelName}`
+        : `${packageNamespace}\\${modelName}`;
     const traitName = extendAttributesTraitName(name);
     // This file is created once and never rewritten, so the `use` line can only
     // be put here for a model that does not exist yet. A project whose model

package/dist/php/policy-generator.js

@@ -19,6 +19,8 @@ const ACTION_METHOD_MAP = {
 };
 /** All standard actions (used for wildcard expansion). */
 const ALL_ACTIONS = ['view', 'list', 'create', 'edit', 'delete'];
+/** FQCN of the acting user every policy method takes. */
+const ACTOR_FQN = 'App\\Models\\User';
 /** Actions that receive both $user and $record parameters. */
 const RECORD_ACTIONS = new Set(['view', 'edit', 'delete']);
 // ============================================================================
@@ -93,6 +95,19 @@ function generateBasePolicyClass(name, schema, reader, config) {
         : (config.models.userEditableGroupByFolder
             ? nestByGroup({ path: '', namespace: config.models.userEditableNamespace }, schema.group).namespace
             : config.models.userEditableNamespace);
+    // Issue #177: the acting user is always `App\\Models\\User`, but the policed
+    // model is imported from its own namespace — and for a schema named `User`
+    // outside `App\\Models` the two short names collide. PHP rejects the file at
+    // compile time (`Cannot use ... as User because the name is already in use`),
+    // which is a fatal, not a catchable Throwable. Alias the actor so both stay
+    // distinct, and keep the signatures pointing at the class each parameter
+    // actually needs. When the policed model IS `App\\Models\\User` the two are
+    // the same class: one import, no alias.
+    const modelFqn = `${modelNamespace}\\${modelName}`;
+    const actorClass = modelName === 'User' && modelFqn !== ACTOR_FQN ? 'ActingUser' : 'User';
+    const actorImport = actorClass === 'User'
+        ? `use ${ACTOR_FQN};`
+        : `use ${ACTOR_FQN} as ${actorClass};`;
     // Issue #98 v5.8.14: when no Cedar-style `policies:` array is defined,
     // emit the standard CRUD scaffold with `return true;` bodies.
     // The project secures the policy by overriding methods in the
@@ -112,23 +127,23 @@ function generateBasePolicyClass(name, schema, reader, config) {
         const body = hasExplicitPolicies
             ? generateMethodBody(action, expandedPolicies, schema, reader, hasRecord)
             : '        return true;';
-        methods.push(buildMethod(methodName, modelName, hasRecord, body));
+        methods.push(buildMethod(methodName, modelName, hasRecord, body, actorClass));
     }
     // SoftDelete: restore + forceDelete
     if (hasSoftDelete) {
         const restoreBody = hasExplicitPolicies
             ? generateMethodBody('delete', expandedPolicies, schema, reader)
             : '        return true;';
-        methods.push(buildMethod('restore', modelName, true, restoreBody));
+        methods.push(buildMethod('restore', modelName, true, restoreBody, actorClass));
         const forceDeleteBody = hasExplicitPolicies
             ? generateMethodBody('delete', expandedPolicies, schema, reader)
             : '        return true;';
-        methods.push(buildMethod('forceDelete', modelName, true, forceDeleteBody));
+        methods.push(buildMethod('forceDelete', modelName, true, forceDeleteBody, actorClass));
     }
     const cidrHelper = needsCidrHelper ? buildCidrHelper() : '';
     const imports = [...new Set([
-            `use ${modelNamespace}\\${modelName};`,
-            'use App\\Models\\User;',
+            `use ${modelFqn};`,
+            actorImport,
             'use Illuminate\\Auth\\Access\\HandlesAuthorization;',
         ])].join('\n');
     const content = `<?php
@@ -280,14 +295,16 @@ function generateMethodBody(action, policies, schema, reader, hasRecord = true)
 // ============================================================================
 // Method builder
 // ============================================================================
-function buildMethod(methodName, modelName, hasRecord, body) {
+function buildMethod(methodName, modelName, hasRecord, body, 
+/** Short name the acting user is imported under — aliased on collision (#177). */
+actorClass = 'User') {
     const recordParam = hasRecord ? `, ${modelName} $record` : '';
     const returnType = 'bool';
     return `
     /**
      * Determine whether the user can ${methodName}.
      */
-    public function ${methodName}(User $user${recordParam}): ${returnType}
+    public function ${methodName}(${actorClass} $user${recordParam}): ${returnType}
     {
 ${body}
     }`;

package/dist/php/resource-generator.js

@@ -72,12 +72,23 @@ function generateBaseResource(name, schema, reader, config) {
     const timestamps = resolveTimestamps(options);
     const hasSoftDelete = options.softDelete ?? false;
     const hasId = options.id ?? true;
+    // #179: the class this file declares owns its own short name. With
+    // `flatBase` the base class is `<Name>Resource`, the same short name a
+    // self-referencing association (`parent: Department`) wants to import from
+    // the editable namespace — and `use App\\Http\\Resources\\DepartmentResource;`
+    // next to `class DepartmentResource` is a compile-time fatal. Reserving the
+    // declared FQN makes the importer fall back to the inline FQCN, which is the
+    // collision handling #174 already specified.
+    const declaredClassName = config.structure === 'modular'
+        ? `${modelName}ResourceBase`
+        : resolveBaseClass(config.resources, `${modelName}Resource`, 'Base').className;
     const fields = [];
     // #174: reference other Resources by short name + `use` import, the way Pint
     // would rewrite them, so `generate` and the formatter stop disagreeing.
     const importer = createClassImporter(baseNamespace, [
         'Illuminate\\Http\\Request',
         'Illuminate\\Http\\Resources\\Json\\JsonResource',
+        `${baseNamespace}\\${declaredClassName}`,
     ]);
     if (hasId) {
         fields.push("            'id' => $this->id,");

package/dist/php/sibling-skip.d.ts

@@ -34,6 +34,19 @@
  * malformed input.
  */
 export declare function findAppRootAncestor(filePath: string): string | null;
+/**
+ * The omnify root that governs `filePath`: the closest ancestor directory
+ * holding an `omnify.yaml`. Null when there is none within 12 levels.
+ *
+ * Issue #178: a project with omnify packages inside `app/` (`app/Idp/`,
+ * `app/Auth/`, each its own omnify root) runs `generate` once per root, and
+ * the `app/`-wide basename scan reaches straight across those boundaries. The
+ * root run then skipped `app/Models/<Pivot>.php` because the package had
+ * emitted `app/Idp/Models/Pivot/<Pivot>.php`, and the package run skipped its
+ * own stub because the root had emitted the flat one — two different classes
+ * suppressing each other, permanently, since neither is ever rewritten.
+ */
+export declare function findOmnifyRoot(filePath: string): string | null;
 /**
  * Scan `rootDir` recursively for a file whose basename matches
  * `baseName`, excluding `excludePath` itself. Returns the first

package/dist/php/sibling-skip.js

@@ -48,6 +48,30 @@ export function findAppRootAncestor(filePath) {
     }
     return null;
 }
+/**
+ * The omnify root that governs `filePath`: the closest ancestor directory
+ * holding an `omnify.yaml`. Null when there is none within 12 levels.
+ *
+ * Issue #178: a project with omnify packages inside `app/` (`app/Idp/`,
+ * `app/Auth/`, each its own omnify root) runs `generate` once per root, and
+ * the `app/`-wide basename scan reaches straight across those boundaries. The
+ * root run then skipped `app/Models/<Pivot>.php` because the package had
+ * emitted `app/Idp/Models/Pivot/<Pivot>.php`, and the package run skipped its
+ * own stub because the root had emitted the flat one — two different classes
+ * suppressing each other, permanently, since neither is ever rewritten.
+ */
+export function findOmnifyRoot(filePath) {
+    let cur = dirname(filePath);
+    for (let i = 0; i < 12; i++) {
+        if (existsSync(join(cur, 'omnify.yaml')))
+            return cur;
+        const parent = dirname(cur);
+        if (parent === cur)
+            break;
+        cur = parent;
+    }
+    return null;
+}
 /**
  * Scan `rootDir` recursively for a file whose basename matches
  * `baseName`, excluding `excludePath` itself. Returns the first
@@ -64,6 +88,11 @@ export function findAppRootAncestor(filePath) {
  * codegen-owned", which matches `Omnify/`, `OmnifyBase/`, etc.
  */
 export function findSiblingWithSameBasename(rootDir, baseName, excludePath) {
+    // #178: only a file generated from the SAME omnify root can be a relocated
+    // version of this stub. One from another root is a different class that
+    // merely shares a filename, and skipping on it leaves the class nothing
+    // declares.
+    const ownerRoot = findOmnifyRoot(excludePath);
     let scanned = 0;
     const stack = [rootDir];
     while (stack.length > 0) {
@@ -104,6 +133,8 @@ export function findSiblingWithSameBasename(rootDir, baseName, excludePath) {
                 stack.push(fullPath);
             }
             else if (entry === baseName && fullPath !== excludePath) {
+                if (findOmnifyRoot(fullPath) !== ownerRoot)
+                    continue;
                 return fullPath;
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/ts",
-  "version": "6.3.4",
+  "version": "6.3.5",
   "description": "TypeScript model type generator from Omnify schemas.json",
   "type": "module",
   "main": "dist/index.js",