@omnifyjp/ts 6.8.0 → 6.8.1

package/dist/php/orphan-cleanup.js

@@ -66,25 +66,26 @@ function collectModularLayerDirs(configDir, config, category) {
     return dirs;
 }
 const BASE_SUBDIRS_SKIP = new Set(['Base', 'OmnifyBase']);
-function findEditableSubclassFile(roots, fileName) {
+function findEditableSubclassFile(roots, fileName, excludeAbsPath) {
     for (const root of roots) {
-        if (findFileByName(root, fileName))
+        const found = findFileAbsolutePath(root, fileName);
+        if (found && found !== excludeAbsPath)
             return true;
     }
     return false;
 }
-function findFileByName(dir, fileName) {
+function findFileAbsolutePath(dir, fileName) {
     if (!existsSync(dir))
-        return false;
+        return null;
     let info;
     try {
         info = statSync(dir);
     }
     catch {
-        return false;
+        return null;
     }
     if (!info.isDirectory()) {
-        return basename(dir) === fileName;
+        return basename(dir) === fileName ? resolve(dir) : null;
     }
     for (const entry of readdirSync(dir)) {
         if (BASE_SUBDIRS_SKIP.has(entry))
@@ -97,14 +98,15 @@ function findFileByName(dir, fileName) {
             continue;
         }
         if (info.isDirectory()) {
-            if (findFileByName(full, fileName))
-                return true;
+            const nested = findFileAbsolutePath(full, fileName);
+            if (nested)
+                return nested;
         }
         else if (entry === fileName) {
-            return true;
+            return resolve(full);
         }
     }
-    return false;
+    return null;
 }
 function collectEditableSearchRoots(configDir, config, layer, modularCategory, baseAbsPath) {
     const roots = [];
@@ -151,7 +153,7 @@ function pruneDisabledLayerBasesInRoots(configDir, config, spec, roots, expected
             const editableName = spec.toEditableFileName(entry);
             if (editableName) {
                 const editableRoots = collectEditableSearchRoots(configDir, config, spec.layerConfig, spec.modularCategory, fullPath);
-                if (findEditableSubclassFile(editableRoots, editableName)) {
+                if (findEditableSubclassFile(editableRoots, editableName, fullPath)) {
                     kept += 1;
                     continue;
                 }
@@ -210,12 +212,46 @@ export function hasEditableSubclassForBase(configDir, config, file) {
         if (!editableName)
             return false;
         const roots = collectEditableSearchRoots(configDir, config, spec.layerConfig, spec.modularCategory, resolve(configDir, file.path));
-        return findEditableSubclassFile(roots, editableName);
+        return findEditableSubclassFile(roots, editableName, resolve(configDir, file.path));
     }
     return false;
 }
+const SCAFFOLD_LAYER_BASE_SUFFIX = {
+    request: 'RequestBase.php',
+    resource: 'ResourceBase.php',
+    policy: 'PolicyBase.php',
+    controller: 'ControllerBase.php',
+    service: 'ServiceBase.php',
+};
+const SCAFFOLD_LAYER_EDITABLE_SUFFIX = {
+    request: 'Request.php',
+    resource: 'Resource.php',
+    policy: 'Policy.php',
+    controller: 'Controller.php',
+    service: 'Service.php',
+};
+/**
+ * Legacy `flatBase` puts regenerated bases directly at `layer.basePath` with
+ * the same filename as the user-editable stub (different directory). That
+ * directory is generated-only: resolveBaseClass() always targets basePath and
+ * only per-schema base classes are written there (issue #96).
+ */
+function disabledLayerFileMatchers(config, layerConfig, baseSuffix, editableSuffix) {
+    const modularMatches = (name) => name.endsWith(baseSuffix);
+    const modularToEditable = (name) => baseToEditableFileName(name, baseSuffix, editableSuffix);
+    if (config.structure === 'modular') {
+        return { matchesBaseFile: modularMatches, toEditableFileName: modularToEditable };
+    }
+    if (layerConfig.flatBase) {
+        return {
+            matchesBaseFile: (name) => name.endsWith('.php'),
+            toEditableFileName: (name) => (name.endsWith('.php') ? name : null),
+        };
+    }
+    return { matchesBaseFile: modularMatches, toEditableFileName: modularToEditable };
+}
 function scaffoldLayerSpecs(config) {
-    return [
+    const layers = [
         {
             layer: 'request',
             label: 'request base',
@@ -223,8 +259,6 @@ function scaffoldLayerSpecs(config) {
             layerConfig: config.requests,
             legacyBasePath: config.requests.basePath,
             modularCategory: 'Requests',
-            matchesBaseFile: (name) => name.endsWith('RequestBase.php'),
-            toEditableFileName: (name) => baseToEditableFileName(name, 'RequestBase.php', 'Request.php'),
         },
         {
             layer: 'resource',
@@ -233,8 +267,6 @@ function scaffoldLayerSpecs(config) {
             layerConfig: config.resources,
             legacyBasePath: config.resources.basePath,
             modularCategory: 'Resources',
-            matchesBaseFile: (name) => name.endsWith('ResourceBase.php'),
-            toEditableFileName: (name) => baseToEditableFileName(name, 'ResourceBase.php', 'Resource.php'),
         },
         {
             layer: 'policy',
@@ -243,8 +275,6 @@ function scaffoldLayerSpecs(config) {
             layerConfig: config.policies,
             legacyBasePath: config.policies.basePath,
             modularCategory: 'Policies',
-            matchesBaseFile: (name) => name.endsWith('PolicyBase.php'),
-            toEditableFileName: (name) => baseToEditableFileName(name, 'PolicyBase.php', 'Policy.php'),
         },
         {
             layer: 'controller',
@@ -253,8 +283,6 @@ function scaffoldLayerSpecs(config) {
             layerConfig: config.controllers,
             legacyBasePath: config.controllers.basePath,
             modularCategory: 'Controllers',
-            matchesBaseFile: (name) => name.endsWith('ControllerBase.php'),
-            toEditableFileName: (name) => baseToEditableFileName(name, 'ControllerBase.php', 'Controller.php'),
         },
         {
             layer: 'service',
@@ -263,10 +291,14 @@ function scaffoldLayerSpecs(config) {
             layerConfig: config.services,
             legacyBasePath: config.services.basePath,
             modularCategory: 'Services',
-            matchesBaseFile: (name) => name.endsWith('ServiceBase.php'),
-            toEditableFileName: (name) => baseToEditableFileName(name, 'ServiceBase.php', 'Service.php'),
         },
     ];
+    return layers.map((entry) => {
+        const baseSuffix = SCAFFOLD_LAYER_BASE_SUFFIX[entry.layer];
+        const editableSuffix = SCAFFOLD_LAYER_EDITABLE_SUFFIX[entry.layer];
+        const matchers = disabledLayerFileMatchers(config, entry.layerConfig, baseSuffix, editableSuffix);
+        return { ...entry, ...matchers };
+    });
 }
 /**
  * Delete orphan `*ServiceBase.php` files; flag orphan editable services

package/package.json

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