@craft-ng/dev-tools 0.1.4 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-ng/dev-tools",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Development tools for ng-craft: ESLint configs, ESLint rules, and codemods",
   "type": "module",
   "main": "./src/index.js",

package/src/eslint-rules/brand-angular-deps-match.cjs

@@ -1,7 +1,10 @@
 const fs = require('node:fs');
 const path = require('node:path');
 
-process.env.TS_NODE_PROJECT ??= path.resolve(__dirname, '../tsconfig.codemod.json');
+process.env.TS_NODE_PROJECT ??= path.resolve(
+  __dirname,
+  '../tsconfig.codemod.json',
+);
 require('ts-node/register/transpile-only');
 
 const { Project } = require('ts-morph');
@@ -35,13 +38,24 @@ module.exports = {
           return;
         }
 
-        const sourceFile = getProjectSourceFile(getProject(getCwd(context)), filePath, text);
+        const sourceFile = getProjectSourceFile(
+          getProject(getCwd(context)),
+          filePath,
+          text,
+        );
         const analysis = analyzeSourceFileDependencies(sourceFile);
-        if (!analysis.classDeclaration || analysis.skipped || !analysis.className) {
+        if (
+          !analysis.classDeclaration ||
+          analysis.skipped ||
+          !analysis.className
+        ) {
           return;
         }
 
-        const existing = readExistingDependencyGroups(sourceFile, analysis.className);
+        const existing = readExistingDependencyGroups(
+          sourceFile,
+          analysis.className,
+        );
         if (!existing.found) {
           return;
         }
@@ -137,7 +151,14 @@ function getCwd(context) {
   return context.cwd ?? process.cwd();
 }
 
-function reportIfMismatch(context, sourceCode, existing, propertyName, expected, actual) {
+function reportIfMismatch(
+  context,
+  sourceCode,
+  existing,
+  propertyName,
+  expected,
+  actual,
+) {
   if (isSameDependencyList(expected, actual)) {
     return;
   }
@@ -145,7 +166,9 @@ function reportIfMismatch(context, sourceCode, existing, propertyName, expected,
   reportNode(
     context,
     sourceCode,
-    existing.propertyNodes[propertyName] ?? existing.depsObjectNode ?? existing.exportAssignmentNode,
+    existing.propertyNodes[propertyName] ??
+      existing.depsObjectNode ??
+      existing.exportAssignmentNode,
     `deps.${propertyName} does not match the Angular symbol. Expected ${formatDependencyList(expected)} but found ${formatDependencyList(actual)}.`,
   );
 }
@@ -165,7 +188,10 @@ function getNodeLoc(sourceCode, node) {
 }
 
 function isSameDependencyList(left, right) {
-  return left.length === right.length && left.every((value, index) => value === right[index]);
+  return (
+    left.length === right.length &&
+    left.every((value, index) => value === right[index])
+  );
 }
 
 function formatDependencyList(dependencies) {

package/src/eslint-rules/no-direct-angular-class-export.cjs

@@ -1,7 +1,10 @@
 const fs = require('node:fs');
 const path = require('node:path');
 
-process.env.TS_NODE_PROJECT ??= path.resolve(__dirname, '../tsconfig.codemod.json');
+process.env.TS_NODE_PROJECT ??= path.resolve(
+  __dirname,
+  '../tsconfig.codemod.json',
+);
 require('ts-node/register/transpile-only');
 
 const { Project, Node, SyntaxKind } = require('ts-morph');
@@ -32,7 +35,11 @@ module.exports = {
           return;
         }
 
-        const sourceFile = getProjectSourceFile(getProject(getCwd(context)), filePath, text);
+        const sourceFile = getProjectSourceFile(
+          getProject(getCwd(context)),
+          filePath,
+          text,
+        );
         const angularClasses = sourceFile
           .getClasses()
           .map((classDeclaration) => ({
@@ -42,7 +49,12 @@ module.exports = {
           .filter((entry) => Boolean(entry.angularKind));
 
         for (const { classDeclaration, angularKind } of angularClasses) {
-          reportDirectClassExport(context, sourceCode, classDeclaration, angularKind);
+          reportDirectClassExport(
+            context,
+            sourceCode,
+            classDeclaration,
+            angularKind,
+          );
           reportIdentifierExportAssignment(
             context,
             sourceCode,
@@ -50,7 +62,13 @@ module.exports = {
             classDeclaration,
             angularKind,
           );
-          reportNamedExports(context, sourceCode, sourceFile, classDeclaration, angularKind);
+          reportNamedExports(
+            context,
+            sourceCode,
+            sourceFile,
+            classDeclaration,
+            angularKind,
+          );
         }
       },
     };
@@ -107,7 +125,12 @@ function getCwd(context) {
   return context.cwd ?? process.cwd();
 }
 
-function reportDirectClassExport(context, sourceCode, classDeclaration, angularKind) {
+function reportDirectClassExport(
+  context,
+  sourceCode,
+  classDeclaration,
+  angularKind,
+) {
   const hasDirectExportModifier = classDeclaration
     .getModifiers()
     .some(
@@ -159,7 +182,13 @@ function reportIdentifierExportAssignment(
   }
 }
 
-function reportNamedExports(context, sourceCode, sourceFile, classDeclaration, angularKind) {
+function reportNamedExports(
+  context,
+  sourceCode,
+  sourceFile,
+  classDeclaration,
+  angularKind,
+) {
   const className = classDeclaration.getName();
   if (!className) {
     return;

package/src/scripts/angular-brand-codemod.d.ts

@@ -8,6 +8,8 @@ export type TransformResult = {
     className?: string;
     dependencies: string[];
     dependencyGroups: DependencyGroups;
+    generatedTypeName?: string;
+    generatedDependencyGroups: GeneratedDependencyGroups;
 };
 export type AngularBrandCodemodOptions = {
     helperImportPath?: string;
@@ -31,6 +33,19 @@ export type DependencyGroups = {
     importDeps: string[];
     providers: string[];
 };
+export type GeneratedDependencyEntry = {
+    key: string;
+    typeText: string;
+    typeImport?: {
+        moduleSpecifier: string;
+        name: string;
+    };
+};
+export type GeneratedDependencyGroups = {
+    deps: GeneratedDependencyEntry[];
+    provided: GeneratedDependencyEntry[];
+    missingProvider: GeneratedDependencyEntry[];
+};
 export type DependencyAnalysisResult = Omit<TransformResult, 'changed'> & {
     classDeclaration?: ClassDeclaration;
 };
@@ -61,9 +76,9 @@ export declare function extractDecoratorMetadataDeps(classDeclaration: ClassDecl
 export declare function extractConstructorDeps(classDeclaration: ClassDeclaration): DependencyExtractionResult;
 export declare function extractInjectCallDeps(classDeclaration: ClassDeclaration): DependencyExtractionResult;
 export declare function mergeDeps(...dependencyGroups: readonly string[][]): string[];
+export declare function writeGeneratedDepsTypeAlias(sourceFile: SourceFile, className: string, generatedDependencyGroups: GeneratedDependencyGroups): void;
+export declare function migrateLegacyBrandExport(sourceFile: SourceFile, classDeclaration: ClassDeclaration, className: string): void;
 export declare function ensureHelperImports(sourceFile: SourceFile, helperImportPath: string): void;
-export declare function removeConflictingExports(sourceFile: SourceFile, classDeclaration: ClassDeclaration, className: string): void;
-export declare function writeDefaultBrandExport(sourceFile: SourceFile, className: string, dependencyGroups: DependencyGroups): void;
 export declare function readExistingDependencyGroups(sourceFile: SourceFile, className?: string): ExistingDependencyGroupsResult;
 export declare function formatDependencyGroups(dependencyGroups: DependencyGroups): string;
 export declare function runAngularBrandCodemod(options?: AngularBrandCodemodOptions & {