@craft-ng/dev-tools 0.5.1-beta.0 → 0.6.0-beta.2

package/README.md

@@ -147,6 +147,71 @@ The service migration also:
 statically resolvable component routes with `craftRoute`, generates or reuses
 their `GenDeps_*` type, and adds the file-level DI check.
 
+For new routes, use the `craft` façade rather than the migration command:
+
+```bash
+npx craft route add /users/:userId --component src/app/users/user-detail.ts#UserDetailComponent
+npx craft route add /users/:userId --create-component users/user-detail
+npx craft route add /legacy --redirect-to /users --parent src/app/app.routes.ts#appRoutes
+npx craft route split --parent src/app/app.routes.ts#appRoutes --prefix users --target src/app/users/users.routes.ts
+```
+
+The same route engine is also published as a native Nx generator and as an
+Angular CLI schematic. Both use a virtual workspace tree, so their host CLI
+provides project-name resolution and `--dry-run` without direct filesystem
+writes:
+
+```bash
+# Nx workspace
+npx nx g @craft-ng/dev-tools:route /users/:userId \
+  --project=my-app \
+  --create-component=users/UserDetail
+
+npx nx g @craft-ng/dev-tools:route-split \
+  --project=my-app \
+  --parent=apps/my-app/src/app/app.routes.ts#appRoutes \
+  --prefix=users \
+  --target=apps/my-app/src/app/users/users.routes.ts
+
+# Angular CLI workspace
+npx ng g @craft-ng/dev-tools:route /users/:userId \
+  --project=my-app \
+  --create-component=users/UserDetail
+```
+
+Without route target options, the generator asks for the target kind. Component
+creation then asks for the path relative to the application's `src/app` base,
+followed by the component name. Before mutating the virtual tree it prints the
+planned `CREATE` and `UPDATE` operations and asks for confirmation. Use `--yes`
+for non-interactive automation; Nx/Angular `--dry-run` prints the preview without
+asking for confirmation or writing files.
+
+When `--parent` is omitted in an interactive terminal, the generator discovers
+every `craftRoutes(...)` collection in the selected Angular project and lists
+its exported routes name, source file, and prefix. Select `0` to retain route
+path-based auto-detection, or choose a collection number. Scripted calls can
+still pass `--parent=path/to/routes.ts#routesName` directly.
+
+Pass `--skip-validation` when another task will run lint and the Angular build.
+Otherwise validation runs after the virtual tree has been committed. Nx
+workspaces compose the native `@nx/angular:component` generator; Angular CLI
+workspaces compose the local `@schematics/angular:component` schematic. New
+components use an inline template and inline styles, so the generator creates a
+single component `.ts` file rather than separate `.ts`, `.html`, and `.css`
+files. Component filenames are always normalized to kebab-case: a component
+name such as `DemoPage` produces `demo-page.ts` while retaining the `DemoPage`
+class name.
+
+The add command defaults to a lazy routes file per feature and generates
+`componentDeps`, `withRetry`, the cascade DI proof, exception assertion,
+`.withParent`, and the parent mount assertion. Both commands print their plan
+before writing. `--dry-run`, `--yes`, `--json`, `--project`, `--parent`, and
+`--feature-file` support scripted usage. After writing, ESLint autofix and the
+project TypeScript diagnostics run automatically; failed validation leaves the
+changes in place and returns a non-zero exit code with diagnostics.
+Component creation uses the local Angular CLI in an `angular.json` workspace,
+or the local Nx Angular schematic in an `nx.json` workspace.
+
 Start with a dry run:
 
 ```bash
@@ -197,6 +262,7 @@ export default [
       'craft-ng/prefer-craft-http-client': 'error',
       'craft-ng/prefer-browser-boundaries': 'error',
       'craft-ng/require-lazy-load-with-retry': 'error',
+      'craft-ng/require-cascade-route-di-check': 'error',
     }
   }
 ];

package/generators.json

@@ -0,0 +1,26 @@
+{
+  "generators": {
+    "route": {
+      "factory": "./src/generators/route/generator#routeGenerator",
+      "schema": "./src/generators/route/schema.json",
+      "description": "Add a type-safe Craft NG route."
+    },
+    "route-split": {
+      "factory": "./src/generators/route/generator#routeSplitGenerator",
+      "schema": "./src/generators/route/split-schema.json",
+      "description": "Split Craft NG routes into a lazy collection."
+    }
+  },
+  "schematics": {
+    "route": {
+      "factory": "./src/generators/route/compat#routeSchematic",
+      "schema": "./src/generators/route/schema.json",
+      "description": "Add a type-safe Craft NG route."
+    },
+    "route-split": {
+      "factory": "./src/generators/route/compat#routeSplitSchematic",
+      "schema": "./src/generators/route/split-schema.json",
+      "description": "Split Craft NG routes into a lazy collection."
+    }
+  }
+}

package/package.json

@@ -1,7 +1,11 @@
 {
   "name": "@craft-ng/dev-tools",
-  "version": "0.5.1-beta.0",
+  "version": "0.6.0-beta.2",
   "description": "Development tools for ng-craft: ESLint configs, ESLint rules, and codemods",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ng-angular-stack/ng-craft.git"
+  },
   "type": "module",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -16,7 +20,10 @@
     },
     "./package.json": "./package.json"
   },
+  "generators": "./generators.json",
+  "schematics": "./generators.json",
   "bin": {
+    "craft": "./src/bin/craft.js",
     "craft-brand": "./src/bin/craft-brand.js",
     "craft-migrate": "./src/bin/craft-migrate.js",
     "craft-migrate-primitives": "./src/bin/craft-migrate-primitives.js",
@@ -24,10 +31,12 @@
     "craft-migrate-routes": "./src/bin/craft-migrate-routes.js"
   },
   "files": [
+    "generators.json",
     "src/**/*",
     "README.md"
   ],
   "dependencies": {
+    "@nx/devkit": "^22.3.1",
     "tslib": "^2.3.0",
     "ts-morph": "^24.0.0",
     "ts-node": "^10.9.2",
@@ -35,6 +44,8 @@
   },
   "peerDependencies": {
     "@angular-eslint/eslint-plugin": ">=21.0.0",
+    "@nx/angular": ">=21.0.0 <24.0.0",
+    "@schematics/angular": ">=20.0.0 <23.0.0",
     "@typescript-eslint/eslint-plugin": ">=8.0.0",
     "eslint": ">=9.0.0"
   },
@@ -42,6 +53,12 @@
     "@angular-eslint/eslint-plugin": {
       "optional": true
     },
+    "@nx/angular": {
+      "optional": true
+    },
+    "@schematics/angular": {
+      "optional": true
+    },
     "@typescript-eslint/eslint-plugin": {
       "optional": true
     },

package/src/bin/craft.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/src/bin/craft.js

@@ -0,0 +1,166 @@
+#!/usr/bin/env node
+import { __awaiter } from "tslib";
+import { createInterface } from 'node:readline/promises';
+import { stdin as input, stdout as output } from 'node:process';
+import { listAngularProjects, runRouteAdd, runRouteSplit, } from '../scripts/routes/route-command.js';
+function main(argv) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        if (argv[0] !== 'route' || !['add', 'split'].includes((_a = argv[1]) !== null && _a !== void 0 ? _a : '')) {
+            printHelp();
+            return argv.includes('--help') ? 0 : 1;
+        }
+        const command = argv[1];
+        const parsed = parseArgs(argv.slice(2));
+        if (parsed.help) {
+            printHelp();
+            return 0;
+        }
+        const common = {
+            rootDir: parsed.values['root'],
+            project: parsed.values['project'],
+            parent: parsed.values['parent'],
+            dryRun: parsed.flags.has('dry-run'),
+            yes: parsed.flags.has('yes'),
+            json: parsed.flags.has('json'),
+        };
+        const readline = createInterface({ input, output });
+        try {
+            if (!common.project && !common.yes) {
+                const projects = listAngularProjects(common.rootDir);
+                if (projects.length > 1) {
+                    output.write(projects
+                        .map((project, index) => `${index + 1}. ${project}`)
+                        .join('\n') + '\n');
+                    const selected = Number(yield readline.question('Angular project number: '));
+                    common.project = projects[selected - 1];
+                    if (!common.project)
+                        throw new Error('Invalid project selection.');
+                }
+            }
+            const confirm = (_plan) => __awaiter(this, void 0, void 0, function* () { return /^y(?:es)?$/i.test(yield readline.question('Apply this plan? [y/N] ')); });
+            let result;
+            if (command === 'add') {
+                const options = Object.assign(Object.assign({}, common), { path: (_b = parsed.positionals[0]) !== null && _b !== void 0 ? _b : (yield readline.question('Route path: ')), component: parsed.values['component'], createComponent: parsed.values['create-component'], featureFile: parsed.values['feature-file'], redirectTo: parsed.values['redirect-to'], confirm });
+                if (!options.component &&
+                    !options.createComponent &&
+                    !options.redirectTo) {
+                    const kind = (yield readline.question('Target: [e]xisting component, [c]reate component, [r]edirect? ')).toLowerCase();
+                    if (kind.startsWith('e')) {
+                        options.component = yield readline.question('Component <file#Class>: ');
+                    }
+                    else if (kind.startsWith('c')) {
+                        options.createComponent = yield readline.question('Angular component name/path: ');
+                    }
+                    else if (kind.startsWith('r')) {
+                        options.redirectTo = yield readline.question('Redirect target: ');
+                    }
+                }
+                result = yield runRouteAdd(options);
+            }
+            else {
+                const parent = common.parent;
+                const prefix = parsed.values['prefix'];
+                const target = parsed.values['target'];
+                if (!parent || !prefix || !target) {
+                    throw new Error('route split requires --parent, --prefix, and --target.');
+                }
+                const options = Object.assign(Object.assign({}, common), { parent,
+                    prefix,
+                    target,
+                    confirm });
+                result = yield runRouteSplit(options);
+            }
+            printResult(result, common.json === true);
+            return result.exitCode;
+        }
+        finally {
+            readline.close();
+        }
+    });
+}
+function parseArgs(argv) {
+    const values = {};
+    const flags = new Set();
+    const positionals = [];
+    let help = false;
+    const valueOptions = new Set([
+        'root',
+        'project',
+        'parent',
+        'component',
+        'create-component',
+        'feature-file',
+        'redirect-to',
+        'prefix',
+        'target',
+    ]);
+    const flagOptions = new Set(['dry-run', 'yes', 'json']);
+    for (let index = 0; index < argv.length; index += 1) {
+        const argument = argv[index];
+        if (argument === '--help' || argument === '-h') {
+            help = true;
+        }
+        else if (argument.startsWith('--')) {
+            const name = argument.slice(2);
+            if (valueOptions.has(name)) {
+                const value = argv[++index];
+                if (!value || value.startsWith('--')) {
+                    throw new Error(`Missing value for --${name}.`);
+                }
+                values[name] = value;
+            }
+            else if (flagOptions.has(name)) {
+                flags.add(name);
+            }
+            else {
+                throw new Error(`Unknown option --${name}.`);
+            }
+        }
+        else {
+            positionals.push(argument);
+        }
+    }
+    return { values, flags, positionals, help };
+}
+function printResult(result, json) {
+    if (json) {
+        console.log(JSON.stringify(result, null, 2));
+        return;
+    }
+    for (const diagnostic of result.diagnostics) {
+        console.error(`${diagnostic.code}: ${diagnostic.message}`);
+    }
+    if (result.changedFiles.length > 0) {
+        console.log(`Changed:\n${result.changedFiles.map((file) => `  ${file}`).join('\n')}`);
+    }
+}
+function printHelp() {
+    console.log(`Usage:
+  craft route add [path] [options]
+  craft route split --parent <file#collection> --prefix <path> --target <file>
+
+Options:
+  --root <dir>                 Workspace root (defaults to cwd)
+  --project <name|tsconfig>    Angular project or tsconfig
+  --parent <file#collection>   Parent craftRoutes collection
+  --component <file#Class>     Existing routed component
+  --create-component <name>    Generate with the local Angular CLI or Nx
+  --feature-file <file>        Create/use an explicit lazy feature collection
+  --redirect-to <path>         Add a static redirect
+  --prefix <path>              Static prefix moved by route split
+  --target <file>              New lazy collection written by route split
+  --dry-run                    Print the plan without writing
+  --yes                        Apply without confirmation
+  --json                       Emit machine-readable output
+`);
+}
+main(process.argv.slice(2))
+    .then((exitCode) => {
+    process.exitCode = exitCode;
+})
+    .catch((error) => {
+    console.error(error instanceof Error ? error.message : error);
+    process.exitCode = 1;
+});
+//# sourceMappingURL=craft.js.map

package/src/bin/craft.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"craft.js","sourceRoot":"","sources":["../../../../../libs/dev-tools/src/bin/craft.ts"],"names":[],"mappings":"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"}

package/src/eslint-rules/craft-computed-name-match.cjs

@@ -1,125 +1,8 @@
-module.exports = {
-  meta: {
-    type: 'problem',
-    docs: {
-      description:
-        "Ensure craftComputed(name, ...) is called with a string literal first argument that matches the declared variable or class property name.",
-    },
-    fixable: 'code',
-    schema: [],
-    messages: {
-      missingName:
-        "craftComputed must be called with a string literal name matching '{{declaredName}}' as the first argument.",
-      mismatchedName:
-        "craftComputed first argument '{{actual}}' must match the declared name '{{declaredName}}'.",
-    },
-  },
-  create(context) {
-    const sourceCode = context.sourceCode ?? context.getSourceCode();
-
-    return {
-      CallExpression(node) {
-        if (
-          node.callee.type !== 'Identifier' ||
-          node.callee.name !== 'craftComputed'
-        ) {
-          return;
-        }
-
-        const declaredName = getDeclaredName(node);
-        if (!declaredName) {
-          return;
-        }
-
-        const firstArg = node.arguments[0];
-
-        if (!firstArg) {
-          context.report({
-            node,
-            messageId: 'missingName',
-            data: { declaredName },
-            fix(fixer) {
-              const openParen = sourceCode.getTokenAfter(
-                node.callee,
-                (token) => token.type === 'Punctuator' && token.value === '(',
-              );
-              if (!openParen) return null;
-              return fixer.insertTextAfter(openParen, `'${declaredName}'`);
-            },
-          });
-          return;
-        }
-
-        if (isStringLiteral(firstArg)) {
-          const actual = getStringLiteralValue(firstArg);
-          if (actual === declaredName) {
-            return;
-          }
-          context.report({
-            node: firstArg,
-            messageId: 'mismatchedName',
-            data: { declaredName, actual },
-            fix(fixer) {
-              return fixer.replaceText(firstArg, `'${declaredName}'`);
-            },
-          });
-          return;
-        }
-
-        context.report({
-          node: firstArg,
-          messageId: 'missingName',
-          data: { declaredName },
-          fix(fixer) {
-            return fixer.insertTextBefore(firstArg, `'${declaredName}', `);
-          },
-        });
-      },
-    };
-  },
-};
-
-function getDeclaredName(callNode) {
-  const parent = callNode.parent;
-  if (!parent) return undefined;
-
-  if (
-    parent.type === 'VariableDeclarator' &&
-    parent.init === callNode &&
-    parent.id.type === 'Identifier'
-  ) {
-    return parent.id.name;
-  }
-
-  if (
-    parent.type === 'PropertyDefinition' &&
-    parent.value === callNode &&
-    !parent.computed &&
-    parent.key.type === 'Identifier'
-  ) {
-    return parent.key.name;
-  }
-
-  return undefined;
-}
-
-function isStringLiteral(node) {
-  if (node.type === 'Literal' && typeof node.value === 'string') {
-    return true;
-  }
-  if (
-    node.type === 'TemplateLiteral' &&
-    node.expressions.length === 0 &&
-    node.quasis.length === 1
-  ) {
-    return true;
-  }
-  return false;
-}
-
-function getStringLiteralValue(node) {
-  if (node.type === 'Literal') {
-    return node.value;
-  }
-  return node.quasis[0].value.cooked;
-}
+const { createNameMatchRule } = require('./craft-name-match-utils.cjs');
+
+module.exports = createNameMatchRule({
+  calleeName: 'craftComputed',
+  description:
+    "Ensure craftComputed(name, ...) is called with a string literal first argument that matches the declared variable or class property name.",
+  supportsObjectConfigForm: false,
+});

package/src/eslint-rules/craft-method-name-match.cjs

@@ -1,166 +1,8 @@
-module.exports = {
-  meta: {
-    type: 'problem',
-    docs: {
-      description:
-        "Ensure craftMethod(name, ...) is called with a string literal first argument (or { name } object) that matches the declared variable or class property name.",
-    },
-    fixable: 'code',
-    schema: [],
-    messages: {
-      missingName:
-        "craftMethod must be called with a string literal name matching '{{declaredName}}' as the first argument.",
-      mismatchedName:
-        "craftMethod first argument '{{actual}}' must match the declared name '{{declaredName}}'.",
-    },
-  },
-  create(context) {
-    const sourceCode = context.sourceCode ?? context.getSourceCode();
-
-    return {
-      CallExpression(node) {
-        if (
-          node.callee.type !== 'Identifier' ||
-          node.callee.name !== 'craftMethod'
-        ) {
-          return;
-        }
-
-        const declaredName = getDeclaredName(node);
-        if (!declaredName) {
-          return;
-        }
-
-        const firstArg = node.arguments[0];
-
-        if (!firstArg) {
-          context.report({
-            node,
-            messageId: 'missingName',
-            data: { declaredName },
-            fix(fixer) {
-              const openParen = sourceCode.getTokenAfter(
-                node.callee,
-                (token) => token.type === 'Punctuator' && token.value === '(',
-              );
-              if (!openParen) return null;
-              return fixer.insertTextAfter(openParen, `'${declaredName}'`);
-            },
-          });
-          return;
-        }
-
-        // Handle object config form: { name: 'methodName', providers: [...] }
-        if (firstArg.type === 'ObjectExpression') {
-          const nameProp = firstArg.properties.find(
-            (p) =>
-              p.type === 'Property' &&
-              !p.computed &&
-              p.key.type === 'Identifier' &&
-              p.key.name === 'name',
-          );
-          if (!nameProp) {
-            context.report({
-              node: firstArg,
-              messageId: 'missingName',
-              data: { declaredName },
-            });
-            return;
-          }
-          const nameValue = nameProp.value;
-          if (isStringLiteral(nameValue)) {
-            const actual = getStringLiteralValue(nameValue);
-            if (actual === declaredName) {
-              return;
-            }
-            context.report({
-              node: nameValue,
-              messageId: 'mismatchedName',
-              data: { declaredName, actual },
-              fix(fixer) {
-                return fixer.replaceText(nameValue, `'${declaredName}'`);
-              },
-            });
-          } else {
-            context.report({
-              node: nameValue,
-              messageId: 'mismatchedName',
-              data: { declaredName, actual: sourceCode.getText(nameValue) },
-            });
-          }
-          return;
-        }
-
-        if (isStringLiteral(firstArg)) {
-          const actual = getStringLiteralValue(firstArg);
-          if (actual === declaredName) {
-            return;
-          }
-          context.report({
-            node: firstArg,
-            messageId: 'mismatchedName',
-            data: { declaredName, actual },
-            fix(fixer) {
-              return fixer.replaceText(firstArg, `'${declaredName}'`);
-            },
-          });
-          return;
-        }
-
-        context.report({
-          node: firstArg,
-          messageId: 'missingName',
-          data: { declaredName },
-          fix(fixer) {
-            return fixer.insertTextBefore(firstArg, `'${declaredName}', `);
-          },
-        });
-      },
-    };
-  },
-};
-
-function getDeclaredName(callNode) {
-  const parent = callNode.parent;
-  if (!parent) return undefined;
-
-  if (
-    parent.type === 'VariableDeclarator' &&
-    parent.init === callNode &&
-    parent.id.type === 'Identifier'
-  ) {
-    return parent.id.name;
-  }
-
-  if (
-    parent.type === 'PropertyDefinition' &&
-    parent.value === callNode &&
-    !parent.computed &&
-    parent.key.type === 'Identifier'
-  ) {
-    return parent.key.name;
-  }
-
-  return undefined;
-}
-
-function isStringLiteral(node) {
-  if (node.type === 'Literal' && typeof node.value === 'string') {
-    return true;
-  }
-  if (
-    node.type === 'TemplateLiteral' &&
-    node.expressions.length === 0 &&
-    node.quasis.length === 1
-  ) {
-    return true;
-  }
-  return false;
-}
-
-function getStringLiteralValue(node) {
-  if (node.type === 'Literal') {
-    return node.value;
-  }
-  return node.quasis[0].value.cooked;
-}
+const { createNameMatchRule } = require('./craft-name-match-utils.cjs');
+
+module.exports = createNameMatchRule({
+  calleeName: 'craftMethod',
+  description:
+    "Ensure craftMethod(name, ...) is called with a string literal first argument (or { name } object) that matches the declared variable or class property name.",
+  supportsObjectConfigForm: true,
+});