@oamm/textor 1.0.7 → 1.0.8

package/dist/index.cjs

@@ -41,6 +41,7 @@ const CURRENT_CONFIG_VERSION = 2;
  * @property {boolean} features.createScriptsDir
  * @property {string} features.scriptsIndexFile
  * @property {string} features.layout
+ * @property {Object} features.layoutProps
  * @property {Object} components
  * @property {boolean} components.createSubComponentsDir
  * @property {boolean} components.createContext
@@ -106,7 +107,8 @@ const DEFAULT_CONFIG = {
         createReadme: false,
         createStories: false,
         createIndex: false,
-        layout: 'Main'
+        layout: 'Main',
+        layoutProps: {}
     },
     components: {
         framework: 'react',
@@ -876,27 +878,6 @@ async function formatFiles(filePaths, tool) {
     }
 }
 
-var filesystem = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    calculateHash: calculateHash,
-    cleanupEmptyDirs: cleanupEmptyDirs,
-    ensureDir: ensureDir,
-    ensureNotExists: ensureNotExists,
-    formatFiles: formatFiles,
-    getSignature: getSignature,
-    inferKind: inferKind,
-    isEmptyDir: isEmptyDir,
-    isTextorGenerated: isTextorGenerated,
-    safeDelete: safeDelete,
-    safeDeleteDir: safeDeleteDir,
-    safeMove: safeMove,
-    scanDirectory: scanDirectory,
-    secureJoin: secureJoin,
-    updateSignature: updateSignature,
-    verifyFileIntegrity: verifyFileIntegrity,
-    writeFileWithSignature: writeFileWithSignature
-});
-
 function renderNamePattern(pattern, data = {}, label = 'pattern') {
     if (typeof pattern !== 'string')
         return null;
@@ -958,13 +939,15 @@ function getTemplateOverride(templateName, extension, data = {}) {
  * - layoutImportPath: Path to import the layout
  * - featureImportPath: Path to import the feature component
  * - featureComponentName: Name of the feature component
+ * - layoutProps: Optional properties for the layout
  */
-function generateRouteTemplate(layoutName, layoutImportPath, featureImportPath, featureComponentName, extension = '.astro') {
+function generateRouteTemplate(layoutName, layoutImportPath, featureImportPath, featureComponentName, extension = '.astro', layoutProps = {}) {
     const override = getTemplateOverride('route', extension, {
         layoutName,
         layoutImportPath,
         featureImportPath,
-        featureComponentName
+        featureComponentName,
+        ...layoutProps
     });
     if (override)
         return override;
@@ -976,12 +959,24 @@ import ${featureComponentName} from '${featureImportPath}';
 <${featureComponentName} />
 `;
     }
+    const propsStr = Object.entries(layoutProps)
+        .map(([key, value]) => {
+        if (typeof value === 'string' && value.startsWith('{') && value.endsWith('}')) {
+            return `${key}=${value}`;
+        }
+        if (typeof value === 'string') {
+            return `${key}="${value}"`;
+        }
+        return `${key}={${JSON.stringify(value)}}`;
+    })
+        .join(' ');
+    const layoutOpening = propsStr ? `<${layoutName} ${propsStr}>` : `<${layoutName}>`;
     return `---
 import ${layoutName} from '${layoutImportPath}';
 import ${featureComponentName} from '${featureImportPath}';
 ---
 
-<${layoutName}>
+${layoutOpening}
   <${featureComponentName} />
 </${layoutName}>
 `;
@@ -1180,6 +1175,10 @@ function generateIndexTemplate(componentName, componentExtension) {
     const override = getTemplateOverride('index', '.ts', { componentName, componentExtension });
     if (override)
         return override;
+    if (componentExtension === '.astro') {
+        return `export * from './types';
+`;
+    }
     return `export { default as ${componentName} } from './${componentName}${componentExtension}';
 export * from './types';
 `;
@@ -1593,7 +1592,7 @@ async function addSectionCommand(route, featurePath, options) {
         const apiDirInside = secureJoin(featureDirPath, 'api');
         const servicesDirInside = secureJoin(featureDirPath, 'services');
         const schemasDirInside = secureJoin(featureDirPath, 'schemas');
-        const { framework, layout, createSubComponentsDir: shouldCreateSubComponentsDir, createScriptsDir: shouldCreateScriptsDir, createApi: shouldCreateApi, createServices: shouldCreateServices, createSchemas: shouldCreateSchemas, createHooks: shouldCreateHooks, createContext: shouldCreateContext, createTests: shouldCreateTests, createTypes: shouldCreateTypes, createReadme: shouldCreateReadme, createStories: shouldCreateStories, createIndex: shouldCreateIndex } = effectiveOptions;
+        const { framework, layout, layoutProps: configLayoutProps, createSubComponentsDir: shouldCreateSubComponentsDir, createScriptsDir: shouldCreateScriptsDir, createApi: shouldCreateApi, createServices: shouldCreateServices, createSchemas: shouldCreateSchemas, createHooks: shouldCreateHooks, createContext: shouldCreateContext, createTests: shouldCreateTests, createTypes: shouldCreateTypes, createReadme: shouldCreateReadme, createStories: shouldCreateStories, createIndex: shouldCreateIndex } = effectiveOptions;
         const featurePatterns = config.filePatterns?.features || {};
         const patternData = {
             componentName: featureComponentName,
@@ -1690,7 +1689,7 @@ async function addSectionCommand(route, featurePath, options) {
                     delete state.files[oldRelative];
                 }
                 // Update imports in the moved file
-                await updateImportsInFile$1(reorg.to, reorg.from, reorg.to);
+                await updateImportsInFile$2(reorg.to, reorg.from, reorg.to);
                 // Update hash in state after import updates
                 if (state.files[newRelative]) {
                     const content = await promises.readFile(reorg.to, 'utf-8');
@@ -1726,6 +1725,30 @@ async function addSectionCommand(route, featurePath, options) {
         if (shouldCreateScriptsDir)
             await ensureNotExists(scriptsIndexPath, options.force);
         let layoutImportPath = null;
+        const cliProps = options.prop || {};
+        const rawLayoutProps = { ...configLayoutProps, ...cliProps };
+        const layoutProps = {};
+        // Resolve variables in layoutProps
+        const substitutionData = enrichData({
+            componentName: featureComponentName,
+            layoutName: layout,
+            featureComponentName: featureComponentName
+        });
+        for (const [key, value] of Object.entries(rawLayoutProps)) {
+            if (typeof value === 'string') {
+                let resolvedValue = value;
+                for (const [varKey, varValue] of Object.entries(substitutionData)) {
+                    const regex = new RegExp(`{{${varKey}}}`, 'g');
+                    resolvedValue = resolvedValue.replace(regex, varValue);
+                    const underscoreRegex = new RegExp(`__${varKey}__`, 'g');
+                    resolvedValue = resolvedValue.replace(underscoreRegex, varValue);
+                }
+                layoutProps[key] = resolvedValue;
+            }
+            else {
+                layoutProps[key] = value;
+            }
+        }
         if (routeFilePath && layout !== 'none') {
             if (config.importAliases.layouts) {
                 layoutImportPath = `${config.importAliases.layouts}/${layout}.astro`;
@@ -1738,7 +1761,7 @@ async function addSectionCommand(route, featurePath, options) {
         let featureImportPath = null;
         if (routeFilePath) {
             if (config.importAliases.features) {
-                const entryPart = effectiveOptions.entry === 'index' ? '' : `/${featureComponentName}`;
+                const entryPart = effectiveOptions.entry === 'index' ? '/index' : `/${featureComponentName}`;
                 // In Astro, we can often omit the extension for .tsx files, but not for .astro files if using aliases sometimes.
                 // However, to be safe, we use the configured extension.
                 featureImportPath = `${config.importAliases.features}/${normalizedFeaturePath}${entryPart}${config.naming.featureExtension}`;
@@ -1766,7 +1789,7 @@ async function addSectionCommand(route, featurePath, options) {
                 routeSignature = getSignature(config, 'typescript');
             }
             else {
-                routeContent = generateRouteTemplate(layout, layoutImportPath, featureImportPath, featureComponentName, routeExtension);
+                routeContent = generateRouteTemplate(layout, layoutImportPath, featureImportPath, featureComponentName, routeExtension, layoutProps);
                 routeSignature = getSignature(config, 'astro');
             }
         }
@@ -1982,7 +2005,7 @@ async function addSectionCommand(route, featurePath, options) {
         throw error;
     }
 }
-async function updateImportsInFile$1(filePath, oldFilePath, newFilePath) {
+async function updateImportsInFile$2(filePath, oldFilePath, newFilePath) {
     if (!fs.existsSync(filePath))
         return;
     let content = await promises.readFile(filePath, 'utf-8');
@@ -2160,7 +2183,7 @@ async function removeSectionCommand(route, featurePath, options) {
                                             const newRelative = path.relative(process.cwd(), flatFilePath).replace(/\\/g, '/');
                                             state.files[newRelative] = { ...state.files[oldRelative] };
                                             delete state.files[oldRelative];
-                                            await updateImportsInFile(flatFilePath, loneFilePath, flatFilePath);
+                                            await updateImportsInFile$1(flatFilePath, loneFilePath, flatFilePath);
                                             // Update hash in state after import updates
                                             const content = await promises.readFile(flatFilePath, 'utf-8');
                                             state.files[newRelative].hash = calculateHash(content, config.hashing?.normalization);
@@ -2186,7 +2209,7 @@ async function removeSectionCommand(route, featurePath, options) {
         throw error;
     }
 }
-async function updateImportsInFile(filePath, oldFilePath, newFilePath) {
+async function updateImportsInFile$1(filePath, oldFilePath, newFilePath) {
     if (!fs.existsSync(filePath))
         return;
     let content = await promises.readFile(filePath, 'utf-8');
@@ -2331,40 +2354,58 @@ async function moveSectionCommand(fromRoute, fromFeature, toRoute, toFeature, op
             const toFeatureDirPath = secureJoin(featuresRoot, targetFeature);
             const fromFeatureComponentName = getFeatureComponentName(normalizedFromFeature);
             const toFeatureComponentName = getFeatureComponentName(targetFeature);
-            // Update component name in JSX
+            // First, update all relative imports in the file because it moved
+            await updateImportsInFile(toRoutePath, fromRoutePath, toRoutePath);
+            let content = await promises.readFile(toRoutePath, 'utf-8');
+            let changed = false;
+            // Update component name in JSX tags
             if (fromFeatureComponentName !== toFeatureComponentName) {
-                let content = await promises.readFile(toRoutePath, 'utf-8');
                 content = content.replace(new RegExp(`<${fromFeatureComponentName}`, 'g'), `<${toFeatureComponentName}`);
                 content = content.replace(new RegExp(`</${fromFeatureComponentName}`, 'g'), `</${toFeatureComponentName}`);
-                await promises.writeFile(toRoutePath, content, 'utf-8');
+                changed = true;
             }
             if (config.importAliases.features) {
-                if (normalizedFromFeature !== targetFeature) {
-                    const oldAliasPath = `${config.importAliases.features}/${normalizedFromFeature}`;
-                    const newAliasPath = `${config.importAliases.features}/${targetFeature}`;
-                    const ext = config.naming.featureExtension === '.astro' ? '.astro' : '';
-                    // Replace both the path and the component name if they are different
-                    await updateSignature(toRoutePath, `import ${fromFeatureComponentName} from '${oldAliasPath}/${fromFeatureComponentName}${ext}'`, `import ${toFeatureComponentName} from '${newAliasPath}/${toFeatureComponentName}${ext}'`);
-                    // Fallback for prefix only replacement
-                    await updateSignature(toRoutePath, oldAliasPath, newAliasPath);
+                const oldAliasPath = `${config.importAliases.features}/${normalizedFromFeature}`;
+                const newAliasPath = `${config.importAliases.features}/${targetFeature}`;
+                // Flexible regex to match import identifier and path with alias
+                const importRegex = new RegExp(`(import\\s+)(${fromFeatureComponentName})(\\s+from\\s+['"])${oldAliasPath}(/[^'"]+)?(['"])`, 'g');
+                if (importRegex.test(content)) {
+                    content = content.replace(importRegex, (match, p1, p2, p3, subPath, p5) => {
+                        let newSubPath = subPath || '';
+                        if (subPath && subPath.includes(fromFeatureComponentName)) {
+                            newSubPath = subPath.replace(fromFeatureComponentName, toFeatureComponentName);
+                        }
+                        return `${p1}${toFeatureComponentName}${p3}${newAliasPath}${newSubPath}${p5}`;
+                    });
+                    changed = true;
                 }
-                else if (fromFeatureComponentName !== toFeatureComponentName) {
-                    // Name changed but path didn't
-                    const aliasPath = `${config.importAliases.features}/${targetFeature}`;
-                    const ext = config.naming.featureExtension === '.astro' ? '.astro' : '';
-                    await updateSignature(toRoutePath, `import ${fromFeatureComponentName} from '${aliasPath}/${fromFeatureComponentName}${ext}'`, `import ${toFeatureComponentName} from '${aliasPath}/${toFeatureComponentName}${ext}'`);
+                else if (content.includes(oldAliasPath)) {
+                    // Fallback for path only replacement
+                    content = content.replace(new RegExp(oldAliasPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), newAliasPath);
+                    changed = true;
                 }
             }
             else {
-                const oldRelativeDir = getRelativeImportPath(fromRoutePath, fromFeatureDirPath);
+                const oldRelativeDir = getRelativeImportPath(toRoutePath, fromFeatureDirPath);
                 const newRelativeDir = getRelativeImportPath(toRoutePath, toFeatureDirPath);
-                const ext = config.naming.featureExtension === '.astro' ? '.astro' : '';
-                const oldImportPath = `import ${fromFeatureComponentName} from '${oldRelativeDir}/${fromFeatureComponentName}${ext}'`;
-                const newImportPath = `import ${toFeatureComponentName} from '${newRelativeDir}/${toFeatureComponentName}${ext}'`;
-                if (oldImportPath !== newImportPath) {
-                    await updateSignature(toRoutePath, oldImportPath, newImportPath);
+                // Flexible regex for relative imports
+                const relImportRegex = new RegExp(`(import\\s+)(${fromFeatureComponentName})(\\s+from\\s+['"])${oldRelativeDir}(/[^'"]+)?(['"])`, 'g');
+                if (relImportRegex.test(content)) {
+                    content = content.replace(relImportRegex, (match, p1, p2, p3, subPath, p5) => {
+                        let newSubPath = subPath || '';
+                        if (subPath && subPath.includes(fromFeatureComponentName)) {
+                            newSubPath = subPath.replace(fromFeatureComponentName, toFeatureComponentName);
+                        }
+                        return `${p1}${toFeatureComponentName}${p3}${newRelativeDir}${newSubPath}${p5}`;
+                    });
+                    changed = true;
                 }
             }
+            if (changed) {
+                await promises.writeFile(toRoutePath, content, 'utf-8');
+                // Update hash in state after changes
+                state.files[normalizedToRouteRelative].hash = calculateHash(content, config.hashing?.normalization);
+            }
         }
         if (!isRouteOnly && normalizedFromFeature && normalizedToFeature && normalizedFromFeature !== normalizedToFeature) {
             const fromFeaturePath = secureJoin(featuresRoot, normalizedFromFeature);
@@ -2423,7 +2464,6 @@ async function scanAndReplaceImports(config, state, fromInfo, toInfo, options) {
     const { fromFeaturePath, fromComponentName } = fromInfo;
     const { toFeaturePath, toComponentName } = toInfo;
     const allFiles = new Set();
-    const { scanDirectory, calculateHash } = await Promise.resolve().then(function () { return filesystem; });
     await scanDirectory(process.cwd(), allFiles);
     const featuresRoot = resolvePath(config, 'features');
     for (const relPath of allFiles) {
@@ -2538,7 +2578,6 @@ async function moveDirectory(fromPath, toPath, state, config, options = {}) {
                 if (hasChanged) {
                     await promises.writeFile(toEntryPath, content, 'utf-8');
                     // Re-calculate hash after content update
-                    const { calculateHash } = await Promise.resolve().then(function () { return filesystem; });
                     const updatedHash = calculateHash(content, config.hashing?.normalization);
                     const normalizedToRelative = path.relative(process.cwd(), toEntryPath).replace(/\\/g, '/');
                     if (fileState) {
@@ -2570,6 +2609,33 @@ async function moveDirectory(fromPath, toPath, state, config, options = {}) {
         await promises.rmdir(fromPath);
     }
 }
+async function updateImportsInFile(filePath, oldFilePath, newFilePath) {
+    if (!fs.existsSync(filePath))
+        return;
+    let content = await promises.readFile(filePath, 'utf-8');
+    const oldDir = path.dirname(oldFilePath);
+    const newDir = path.dirname(newFilePath);
+    if (oldDir === newDir)
+        return;
+    // Find all relative imports
+    const relativeImportRegex = /from\s+['"](\.\.?\/[^'"]+)['"]/g;
+    let match;
+    const replacements = [];
+    while ((match = relativeImportRegex.exec(content)) !== null) {
+        const relativePath = match[1];
+        const absoluteTarget = path.resolve(oldDir, relativePath);
+        const newRelativePath = getRelativeImportPath(newFilePath, absoluteTarget);
+        replacements.push({
+            full: match[0],
+            oldRel: relativePath,
+            newRel: newRelativePath
+        });
+    }
+    for (const repl of replacements) {
+        content = content.replace(repl.full, `from '${repl.newRel}'`);
+    }
+    await promises.writeFile(filePath, content, 'utf-8');
+}
 
 async function createComponentCommand(componentName, options) {
     try {