Merge pull request #102 from wellwind/codex/determine-current-state

refactor: align builders with feature aliases

Author: wellwind

builders/package.json

@@ -4,7 +4,7 @@
   "description": "Builders for blog",
   "builders": "builders.json",
   "scripts": {
-    "build": "tsc -p tsconfig.json"
+    "build": "tsc -p tsconfig.json && node ./scripts/alias-paths.cjs"
   },
   "dependencies": {
     "@angular-devkit/architect": "~0.1700.0",

builders/scripts/alias-paths.cjs

@@ -0,0 +1,104 @@
+const fs = require('fs');
+const path = require('path');
+
+const distRoot = path.resolve(__dirname, '../dist');
+const projectRoot = path.resolve(distRoot, '..', '..');
+const projectSrcRoot = path.join(projectRoot, 'src');
+
+const aliasPatterns = [
+  { match: '@features/', isPrefix: true, target: path.join(distRoot, 'src/features') },
+  { match: '@features', isPrefix: false, target: path.join(distRoot, 'src/features/index') },
+  { match: '@shared/core/', isPrefix: true, target: path.join(distRoot, 'src/shared/core') },
+  { match: '@shared/core', isPrefix: false, target: path.join(distRoot, 'src/shared/core/index') },
+];
+
+function resolveAlias(specifier) {
+  for (const pattern of aliasPatterns) {
+    if (pattern.isPrefix) {
+      if (specifier.startsWith(pattern.match)) {
+        return path.join(pattern.target, specifier.slice(pattern.match.length));
+      }
+    } else if (specifier === pattern.match) {
+      return pattern.target;
+    }
+  }
+  return null;
+}
+
+function toRelative(filePath, absolutePath) {
+  let relative = path.relative(path.dirname(filePath), absolutePath);
+  if (!relative.startsWith('.')) {
+    relative = `./${relative}`;
+  }
+  return relative.replace(/\\/g, '/');
+}
+
+function rewriteFile(filePath) {
+  const content = fs.readFileSync(filePath, 'utf8');
+  const updated = content.replace(/require\((['"])([^'"]+)\1\)/g, (match, quote, specifier) => {
+    const resolved = resolveAlias(specifier);
+    if (!resolved) {
+      return match;
+    }
+    const relativeSpecifier = toRelative(filePath, resolved);
+    return `require(${quote}${relativeSpecifier}${quote})`;
+  });
+
+  if (updated !== content) {
+    fs.writeFileSync(filePath, updated, 'utf8');
+  }
+}
+
+function walk(dir, callback) {
+  const entries = fs.readdirSync(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    const entryPath = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      walk(entryPath, callback);
+    } else if (entry.isFile()) {
+      callback(entryPath);
+    }
+  }
+}
+
+function rewriteDistRequires() {
+  if (!fs.existsSync(distRoot)) {
+    return;
+  }
+
+  walk(distRoot, filePath => {
+    if (filePath.endsWith('.js')) {
+      rewriteFile(filePath);
+    }
+  });
+}
+
+function cleanupProjectArtifacts() {
+  const targets = [
+    path.join(projectSrcRoot, 'features'),
+    path.join(projectSrcRoot, 'shared')
+  ];
+
+  for (const target of targets) {
+    if (!fs.existsSync(target)) {
+      continue;
+    }
+
+    walk(target, filePath => {
+      if (filePath.endsWith('.js')) {
+        const tsPath = filePath.slice(0, -3) + '.ts';
+        if (fs.existsSync(tsPath)) {
+          fs.rmSync(filePath);
+        }
+      } else if (filePath.endsWith('.js.map')) {
+        const tsPath = filePath.slice(0, -7) + '.ts';
+        if (fs.existsSync(tsPath)) {
+          fs.rmSync(filePath);
+        }
+      }
+    });
+  }
+}
+
+rewriteDistRequires();
+cleanupProjectArtifacts();

builders/src/generate-blog-posts-json/index.ts

@@ -1,4 +1,4 @@
-import { getMarkdownMeta } from './../../../utils/get-markdown-meta';
+import { getMarkdownMeta } from '@features/post-detail/domain';
 import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { JsonObject } from '@angular-devkit/core';
 import { readdirSync, writeFileSync } from 'fs';

builders/src/generate-prerender-urls/index.ts

@@ -2,8 +2,8 @@ import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/ar
 import { JsonObject } from '@angular-devkit/core';
 import { readdirSync, writeFileSync } from 'fs';
 import { range } from 'ramda';
-import { slugify } from '../../../utils/slugify';
-import { getMarkdownMeta } from '../../../utils/get-markdown-meta';
+import { slugify } from '@shared/core';
+import { getMarkdownMeta } from '@features/post-detail/domain';
 
 interface Options extends JsonObject {
   markdownPostsPath: string;

builders/src/generate-rss/index.ts

@@ -3,8 +3,8 @@ import { JsonObject } from '@angular-devkit/core';
 import { Feed } from 'feed';
 import { readdirSync, writeFileSync } from 'fs';
 import { descend, prop, sortWith, take } from 'ramda';
-import { MarkdownMeta } from '../../../utils';
-import { getMarkdownMeta } from '../../../utils/get-markdown-meta';
+import { MarkdownMeta } from '@shared/core';
+import { getMarkdownMeta } from '@features/post-detail/domain';
 
 interface Options extends JsonObject {
   markdownPostsPath: string;

builders/tsconfig.json

@@ -9,6 +9,25 @@
       "es5",
       "scripthost",
       "es2015.collection"
-    ]
-  }
+    ],
+    "rootDir": "../",
+    "baseUrl": "../",
+    "paths": {
+      "@features": [
+        "src/features/index.ts"
+      ],
+      "@features/*": [
+        "src/features/*"
+      ],
+      "@shared/core": [
+        "src/shared/core/index.ts"
+      ],
+      "@shared/core/*": [
+        "src/shared/core/*"
+      ]
+    }
+  },
+  "include": [
+    "src/**/*.ts"
+  ]
 }

docs/phase-2-plan.md

@@ -9,7 +9,7 @@ import { getRouteData, getRouteParam } from 'src/app/site-common/route-utils';
 import { BlogPostSubtitleComponent } from '../../site-common/blog-post-subtitle.component';
 import { PaginationComponent } from '../../site-common/pagination.component';
 import { PostDateAsPathPipe } from '../../site-common/post-date-as-path.pipe';
-import { getPagePosts } from '../get-page-posts';
+import { getPagePosts } from '@features/blog/domain';
 
 const PAGE_SIZE = 10;
 

src/app/blog/blog-archives/blog-archives.component.ts

@@ -4,7 +4,7 @@ import { descend, prop, sortWith } from 'ramda';
 import { PostMetaWithSlug } from '@shared/core';
 import { Observable, map } from 'rxjs';
 import { SitePostService } from '../../site-common/site-post.service';
-import { findPosts } from '../find-posts';
+import { findPosts } from '@features/blog/domain';
 
 @Injectable({
   providedIn: 'root'

src/app/blog/blog-categories/blog-categories-posts-resolve.ts

@@ -17,7 +17,7 @@ import { PaginationComponent } from '../../site-common/pagination.component';
 import { PostDateAsPathPipe } from '../../site-common/post-date-as-path.pipe';
 import { SiteMetaService } from '../../site-common/site-meta.service';
 import { UnslugifyPipe } from '../../site-common/unslugify.pipe';
-import { getPagePosts } from '../get-page-posts';
+import { getPagePosts } from '@features/blog/domain';
 
 const PAGE_SIZE = 10;