@oamm/textor 1.0.10 → 1.0.11

package/dist/index.js

@@ -576,7 +576,7 @@ async function isTextorGenerated(filePath, customSignatures = []) {
     }
 }
 async function verifyFileIntegrity(filePath, expectedHash, options = {}) {
-    const { force = false, acceptChanges = false, normalization = 'normalizeEOL', owner = null, actualOwner = null } = options;
+    const { force = false, acceptChanges = false, normalization = 'normalizeEOL', owner = null, actualOwner = null, signatures = [] } = options;
     if (force)
         return { valid: true };
     if (owner && actualOwner && owner !== actualOwner) {
@@ -586,7 +586,7 @@ async function verifyFileIntegrity(filePath, expectedHash, options = {}) {
             message: `Refusing to operate on ${filePath} - owned by ${actualOwner}, but requested by ${owner}. Use --force to override.`
         };
     }
-    const isGenerated = await isTextorGenerated(filePath);
+    const isGenerated = await isTextorGenerated(filePath, signatures);
     if (!isGenerated) {
         return {
             valid: false,
@@ -615,7 +615,7 @@ async function verifyFileIntegrity(filePath, expectedHash, options = {}) {
     return { valid: true };
 }
 async function safeDelete(filePath, options = {}) {
-    const { force = false, expectedHash = null, acceptChanges = false, owner = null, actualOwner = null } = options;
+    const { force = false, expectedHash = null, acceptChanges = false, owner = null, actualOwner = null, signatures = [] } = options;
     if (!existsSync(filePath)) {
         return { deleted: false, reason: 'not-found' };
     }
@@ -623,7 +623,8 @@ async function safeDelete(filePath, options = {}) {
         force,
         acceptChanges,
         owner,
-        actualOwner
+        actualOwner,
+        signatures
     });
     if (!integrity.valid) {
         return { deleted: false, reason: integrity.reason, message: integrity.message };
@@ -655,7 +656,8 @@ async function isSafeToDeleteDir(dirPath, stateFiles = {}, options = {}) {
             const fileState = stateFiles[normalizedPath];
             const integrity = await verifyFileIntegrity(filePath, fileState?.hash, {
                 ...options,
-                actualOwner: fileState?.owner
+                actualOwner: fileState?.owner,
+                signatures: options.signatures || []
             });
             return integrity.valid;
         }));
@@ -720,7 +722,8 @@ async function safeMove(fromPath, toPath, options = {}) {
         acceptChanges,
         normalization,
         owner,
-        actualOwner
+        actualOwner,
+        signatures: options.signatures || []
     });
     if (!integrity.valid) {
         throw new Error(integrity.message);
@@ -1772,7 +1775,8 @@ async function addSectionCommand(route, featurePath, options) {
         }
         if (routeFilePath) {
             if (existsSync(routeFilePath)) {
-                const isGenerated = await isTextorGenerated(routeFilePath);
+                const configSignatures = Object.values(config.signatures || {});
+                const isGenerated = await isTextorGenerated(routeFilePath, configSignatures);
                 if (!isGenerated && !options.force) {
                     throw new Error(`File already exists: ${routeFilePath}\nUse --force to overwrite.`);
                 }
@@ -2152,6 +2156,7 @@ async function removeSectionCommand(route, featurePath, options) {
         const normalizedFeaturePath = featureToDirectoryPath(targetFeaturePath);
         const pagesRoot = resolvePath(config, 'pages');
         const featuresRoot = resolvePath(config, 'features');
+        const configSignatures = Object.values(config.signatures || {});
         // Find route file in state if possible
         let routeFilePath = null;
         const routeRelPath = Object.keys(state.files).find(f => {
@@ -2193,7 +2198,8 @@ async function removeSectionCommand(route, featurePath, options) {
                 acceptChanges: options.acceptChanges,
                 normalization: config.hashing?.normalization,
                 owner: normalizedRoute,
-                actualOwner: fileState?.owner
+                actualOwner: fileState?.owner,
+                signatures: configSignatures
             });
             if (result.deleted) {
                 deletedFiles.push(routeFilePath);
@@ -2209,7 +2215,8 @@ async function removeSectionCommand(route, featurePath, options) {
                 stateFiles: state.files,
                 acceptChanges: options.acceptChanges,
                 normalization: config.hashing?.normalization,
-                owner: normalizedRoute
+                owner: normalizedRoute,
+                signatures: configSignatures
             });
             if (result.deleted) {
                 deletedDirs.push(featureDirPath);
@@ -2405,6 +2412,7 @@ async function moveSectionCommand(fromRoute, fromFeature, toRoute, toFeature, op
         const normalizedToFeature = actualToFeature ? featureToDirectoryPath(actualToFeature) : null;
         const pagesRoot = resolvePath(config, 'pages');
         const featuresRoot = resolvePath(config, 'features');
+        const configSignatures = Object.values(config.signatures || {});
         const fromSection = findSection(state, actualFromRoute);
         const routeExtension = (fromSection && fromSection.extension) || config.naming.routeExtension;
         const fromRouteFile = routeToFilePath(normalizedFromRoute, {
@@ -2437,7 +2445,8 @@ async function moveSectionCommand(fromRoute, fromFeature, toRoute, toFeature, op
             expectedHash: routeFileState?.hash,
             acceptChanges: options.acceptChanges,
             owner: normalizedFromRoute,
-            actualOwner: routeFileState?.owner
+            actualOwner: routeFileState?.owner,
+            signatures: configSignatures
         });
         movedFiles.push({ from: fromRoutePath, to: toRoutePath });
         // Update state for moved route file
@@ -2516,7 +2525,8 @@ async function moveSectionCommand(fromRoute, fromFeature, toRoute, toFeature, op
                     ...options,
                     fromName: fromFeatureComponentName,
                     toName: toFeatureComponentName,
-                    owner: normalizedFromRoute
+                    owner: normalizedFromRoute,
+                    signatures: configSignatures
                 });
                 movedFiles.push({ from: fromFeaturePath, to: toFeaturePath });
                 await cleanupEmptyDirs(path.dirname(fromFeaturePath), featuresRoot);
@@ -3045,6 +3055,7 @@ async function createComponentCommand(componentName, options) {
 async function removeComponentCommand(identifier, options) {
     try {
         const config = await loadConfig();
+        const configSignatures = Object.values(config.signatures || {});
         if (config.git?.requireCleanRepo && !await isRepoClean()) {
             throw new Error('Git repository is not clean. Please commit or stash your changes before proceeding.');
         }
@@ -3069,7 +3080,8 @@ async function removeComponentCommand(identifier, options) {
             stateFiles: state.files,
             acceptChanges: options.acceptChanges,
             normalization: config.hashing?.normalization,
-            owner: identifier
+            owner: identifier,
+            signatures: configSignatures
         });
         if (result.deleted || (result.reason === 'not-found' && component)) {
             if (result.deleted) {
@@ -3118,7 +3130,8 @@ async function listSectionsCommand() {
         }
         else {
             const extensions = [config.naming.routeExtension, '.ts', '.js'];
-            const sections = await findGeneratedFiles(pagesRoot, extensions);
+            const signatures = Object.values(config.signatures || {});
+            const sections = await findGeneratedFiles(pagesRoot, extensions, signatures);
             if (sections.length === 0) {
                 console.log('  No Textor-managed sections found.');
             }
@@ -3213,7 +3226,7 @@ async function listSectionsCommand() {
         process.exit(1);
     }
 }
-async function findGeneratedFiles(dir, extensions) {
+async function findGeneratedFiles(dir, extensions, signatures) {
     const results = [];
     const entries = await readdir(dir);
     const exts = Array.isArray(extensions) ? extensions : [extensions];
@@ -3221,10 +3234,10 @@ async function findGeneratedFiles(dir, extensions) {
         const fullPath = path.join(dir, entry);
         const stats = await stat(fullPath);
         if (stats.isDirectory()) {
-            results.push(...await findGeneratedFiles(fullPath, exts));
+            results.push(...await findGeneratedFiles(fullPath, exts, signatures));
         }
         else if (exts.some(ext => entry.endsWith(ext))) {
-            if (await isTextorGenerated(fullPath)) {
+            if (await isTextorGenerated(fullPath, signatures)) {
                 results.push(fullPath);
             }
         }
@@ -3273,10 +3286,11 @@ async function validateStateCommand(options) {
         }
         if (options.fix) {
             let fixedCount = 0;
+            const signatures = Object.values(config.signatures || {});
             // Fix modified files if they still have the Textor signature
             for (const mod of results.modified) {
                 const fullPath = path.join(process.cwd(), mod.path);
-                if (await isTextorGenerated(fullPath)) {
+                if (await isTextorGenerated(fullPath, signatures)) {
                     state.files[mod.path].hash = mod.newHash;
                     fixedCount++;
                 }