@angular-eslint/schematics 17.3.1-alpha.2 → 17.3.1-alpha.4

package/dist/add-eslint-to-project/index.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_1 = require("@nx/devkit");
 const utils_1 = require("../utils");
 exports.default = (0, devkit_1.convertNxGenerator)(async (tree, options) => {
-    var _a;
     const projectName = (0, utils_1.determineTargetProjectName__NX)(tree, options.project);
     if (!projectName) {
         throw new Error('\n' +
@@ -15,5 +14,5 @@ E.g. npx ng g @angular-eslint/schematics:add-eslint-to-project {{YOUR_PROJECT_NA
     }
     // Update the lint builder and config in angular.json
     (0, utils_1.addESLintTargetToProject__NX)(tree, projectName, 'lint');
-    (0, utils_1.createESLintConfigForProject__NX)(tree, projectName, (_a = options.setParserOptionsProject) !== null && _a !== void 0 ? _a : false);
+    (0, utils_1.createESLintConfigForProject__NX)(tree, projectName, options.setParserOptionsProject ?? false);
 });

package/dist/application/index.js

@@ -1,27 +1,15 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_1 = require("@nx/devkit");
 const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
 const utils_1 = require("../utils");
 exports.default = (0, devkit_1.convertNxGenerator)(async (tree, options) => {
-    var _a;
     // Remove angular-eslint specific options before passing to the Angular schematic
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { setParserOptionsProject } = options, angularOptions = __rest(options, ["setParserOptionsProject"]);
+    const { setParserOptionsProject, ...angularOptions } = options;
     const applicationGenerator = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'application');
     await applicationGenerator(tree, angularOptions);
     // Update the lint builder and config in angular.json
     (0, utils_1.addESLintTargetToProject__NX)(tree, options.name, 'lint');
-    (0, utils_1.createESLintConfigForProject__NX)(tree, options.name, (_a = options.setParserOptionsProject) !== null && _a !== void 0 ? _a : false);
+    (0, utils_1.createESLintConfigForProject__NX)(tree, options.name, options.setParserOptionsProject ?? false);
 });

package/dist/application/schema.json

@@ -61,19 +61,19 @@
         "items": [
           {
             "value": "css",
-            "label": "CSS"
+            "label": "CSS             [ https://developer.mozilla.org/docs/Web/CSS                     ]"
           },
           {
             "value": "scss",
-            "label": "SCSS   [ https://sass-lang.com/documentation/syntax#scss                ]"
+            "label": "Sass (SCSS)     [ https://sass-lang.com/documentation/syntax#scss                ]"
           },
           {
             "value": "sass",
-            "label": "Sass   [ https://sass-lang.com/documentation/syntax#the-indented-syntax ]"
+            "label": "Sass (Indented) [ https://sass-lang.com/documentation/syntax#the-indented-syntax ]"
           },
           {
             "value": "less",
-            "label": "Less   [ http://lesscss.org                                             ]"
+            "label": "Less            [ http://lesscss.org                                             ]"
           }
         ]
       },

package/dist/library/index.js

@@ -1,27 +1,15 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_1 = require("@nx/devkit");
 const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
 const utils_1 = require("../utils");
 exports.default = (0, devkit_1.convertNxGenerator)(async (tree, options) => {
-    var _a;
     // Remove angular-eslint specific options before passing to the Angular schematic
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { setParserOptionsProject } = options, angularOptions = __rest(options, ["setParserOptionsProject"]);
+    const { setParserOptionsProject, ...angularOptions } = options;
     const libraryGenerator = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'library');
     await libraryGenerator(tree, angularOptions);
     // Update the lint builder and config in angular.json
     (0, utils_1.addESLintTargetToProject__NX)(tree, options.name, 'lint');
-    (0, utils_1.createESLintConfigForProject__NX)(tree, options.name, (_a = options.setParserOptionsProject) !== null && _a !== void 0 ? _a : false);
+    (0, utils_1.createESLintConfigForProject__NX)(tree, options.name, options.setParserOptionsProject ?? false);
 });

package/dist/migrations/update-12-0-0/update-12-0-0.js

@@ -18,11 +18,10 @@ function migrateToAccessibilityLabelHasAssociatedControlSchema(rule) {
     };
 }
 function migrateFromAccessibilityLabelFor({ overrides, rules }) {
-    var _a;
-    migrateToAccessibilityLabelHasAssociatedControlSchema(rules === null || rules === void 0 ? void 0 : rules['@angular-eslint/template/accessibility-label-for']);
+    migrateToAccessibilityLabelHasAssociatedControlSchema(rules?.['@angular-eslint/template/accessibility-label-for']);
     migrateToAccessibilityLabelHasAssociatedControlName(rules);
-    for (const override of overrides !== null && overrides !== void 0 ? overrides : []) {
-        migrateToAccessibilityLabelHasAssociatedControlSchema((_a = override.rules) === null || _a === void 0 ? void 0 : _a['@angular-eslint/template/accessibility-label-for']);
+    for (const override of overrides ?? []) {
+        migrateToAccessibilityLabelHasAssociatedControlSchema(override.rules?.['@angular-eslint/template/accessibility-label-for']);
         migrateToAccessibilityLabelHasAssociatedControlName(override.rules);
     }
 }
@@ -62,9 +61,8 @@ function addEqeqeq() {
                 return;
             }
             return (0, utils_1.updateJsonInTree)(filePath.toString(), (json) => {
-                var _a;
                 addEqeqeqIfNeeded(json.rules);
-                ((_a = json.overrides) !== null && _a !== void 0 ? _a : []).forEach((override) => addEqeqeqIfNeeded(override.rules));
+                (json.overrides ?? []).forEach((override) => addEqeqeqIfNeeded(override.rules));
                 return json;
             });
         }),

package/dist/migrations/update-14-0-0/update-14-0-0.js

@@ -27,17 +27,15 @@ function migration() {
             },
         ]),
         (0, utils_1.updateJsonInTree)('angular.json', (json) => {
-            var _a;
             // Migrate any workspaces which use the original defaultCollection (but only if set to `@angular-eslint/schematics`)
-            if (((_a = json.cli) === null || _a === void 0 ? void 0 : _a.defaultCollection) !== '@angular-eslint/schematics') {
+            if (json.cli?.defaultCollection !== '@angular-eslint/schematics') {
                 return json;
             }
             return (0, utils_1.updateSchematicCollections)(json);
         }),
         // Migrate from @typescript-eslint/experimental-utils package name to @typescript-eslint/utils
         (host, context) => (0, utils_1.updateJsonInTree)('package.json', (json) => {
-            var _a;
-            const devDep = (_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@typescript-eslint/experimental-utils'];
+            const devDep = json.devDependencies?.['@typescript-eslint/experimental-utils'];
             if (!devDep) {
                 return json;
             }

package/dist/migrations/update-2-0-0/update-2-0-0.js

@@ -6,7 +6,7 @@ const utils_1 = require("../../utils");
 const updatedAngularESLintVersion = '^2.0.0';
 const updatedTypeScriptESLintVersion = '4.16.1';
 function updateIfExists(deps, depName, updatedVersion) {
-    if (deps === null || deps === void 0 ? void 0 : deps[depName]) {
+    if (deps?.[depName]) {
         deps[depName] = updatedVersion;
     }
 }

package/dist/migrations/update-3-0-0/update-3-0-0.js

@@ -5,7 +5,7 @@ const tasks_1 = require("@angular-devkit/schematics/tasks");
 const utils_1 = require("../../utils");
 const updatedAngularESLintVersion = '^3.0.0';
 function updateIfExists(deps, depName, updatedVersion) {
-    if (deps === null || deps === void 0 ? void 0 : deps[depName]) {
+    if (deps?.[depName]) {
         deps[depName] = updatedVersion;
     }
 }
@@ -63,14 +63,13 @@ function removeNegativeValuesFromComponentMaxInlineDeclarations(rule) {
         return;
     const [, currentSchema] = rule;
     rule[1] = Object.entries(currentSchema).reduce((accumulator, [key, value]) => {
-        return Number(value) < 0 ? accumulator : Object.assign(Object.assign({}, accumulator), { [key]: value });
+        return Number(value) < 0 ? accumulator : { ...accumulator, [key]: value };
     }, {});
 }
 function updateComponentMaxInlineDeclarationsSchema({ overrides, rules, }) {
-    var _a;
-    removeNegativeValuesFromComponentMaxInlineDeclarations(rules === null || rules === void 0 ? void 0 : rules['@angular-eslint/component-max-inline-declarations']);
-    for (const override of overrides !== null && overrides !== void 0 ? overrides : []) {
-        removeNegativeValuesFromComponentMaxInlineDeclarations((_a = override.rules) === null || _a === void 0 ? void 0 : _a['@angular-eslint/component-max-inline-declarations']);
+    removeNegativeValuesFromComponentMaxInlineDeclarations(rules?.['@angular-eslint/component-max-inline-declarations']);
+    for (const override of overrides ?? []) {
+        removeNegativeValuesFromComponentMaxInlineDeclarations(override.rules?.['@angular-eslint/component-max-inline-declarations']);
     }
 }
 function updateComponentMaxInlineDeclarations() {

package/dist/migrations/update-4-0-0/update-4-0-0.js

@@ -5,7 +5,7 @@ const tasks_1 = require("@angular-devkit/schematics/tasks");
 const utils_1 = require("../../utils");
 const updatedAngularESLintVersion = '^4.0.0';
 function updateIfExists(deps, depName, updatedVersion) {
-    if (deps === null || deps === void 0 ? void 0 : deps[depName]) {
+    if (deps?.[depName]) {
         deps[depName] = updatedVersion;
     }
 }

package/dist/ng-add/index.js

@@ -7,7 +7,6 @@ const utils_1 = require("../utils");
 const packageJSON = require('../../package.json');
 function addAngularESLintPackages() {
     return (host, context) => {
-        var _a;
         if (!host.exists('package.json')) {
             throw new Error('Could not find a `package.json` file at the root of your workspace');
         }
@@ -33,7 +32,7 @@ function addAngularESLintPackages() {
          * @angular-eslint/schematics package to the dependencies section, so clean that up
          * at this point
          */
-        if ((_a = json.dependencies) === null || _a === void 0 ? void 0 : _a['@angular-eslint/schematics']) {
+        if (json.dependencies?.['@angular-eslint/schematics']) {
             delete json.dependencies['@angular-eslint/schematics'];
         }
         json.devDependencies['@angular-eslint/schematics'] = packageJSON.version;

package/dist/utils.js

@@ -155,12 +155,12 @@ function visitNotIgnoredFiles(visitor, dir = (0, core_1.normalize)('')) {
             ig.add(host.read('.gitignore').toString());
         }
         function visit(_dir) {
-            if (_dir && (ig === null || ig === void 0 ? void 0 : ig.ignores(_dir))) {
+            if (_dir && ig?.ignores(_dir)) {
                 return;
             }
             const dirEntry = host.getDir(_dir);
             dirEntry.subfiles.forEach((file) => {
-                if (ig === null || ig === void 0 ? void 0 : ig.ignores((0, core_1.join)(_dir, file))) {
+                if (ig?.ignores((0, core_1.join)(_dir, file))) {
                     return;
                 }
                 const maybeRule = visitor((0, core_1.join)(_dir, file), host, context);
@@ -240,13 +240,16 @@ function createProjectESLintConfig(projectRoot, projectType, prefix, setParserOp
         extends: `${offsetFromRoot(projectRoot)}.eslintrc.json`,
         ignorePatterns: ['!**/*'],
         overrides: [
-            Object.assign(Object.assign({ files: ['*.ts'] }, (setParserOptionsProject
-                ? {
-                    parserOptions: {
-                        project: setESLintProjectBasedOnProjectType(projectRoot, projectType, hasE2e),
-                    },
-                }
-                : null)), { rules: {
+            {
+                files: ['*.ts'],
+                ...(setParserOptionsProject
+                    ? {
+                        parserOptions: {
+                            project: setESLintProjectBasedOnProjectType(projectRoot, projectType, hasE2e),
+                        },
+                    }
+                    : null),
+                rules: {
                     '@angular-eslint/directive-selector': [
                         'error',
                         { type: 'attribute', prefix, style: 'camelCase' },
@@ -255,7 +258,8 @@ function createProjectESLintConfig(projectRoot, projectType, prefix, setParserOp
                         'error',
                         { type: 'element', prefix, style: 'kebab-case' },
                     ],
-                } }),
+                },
+            },
             {
                 files: ['*.html'],
                 rules: {},
@@ -268,13 +272,16 @@ function createProjectESLintConfig__NX(projectRoot, projectType, prefix, setPars
         extends: `${(0, devkit_1.offsetFromRoot)(projectRoot)}.eslintrc.json`,
         ignorePatterns: ['!**/*'],
         overrides: [
-            Object.assign(Object.assign({ files: ['*.ts'] }, (setParserOptionsProject
-                ? {
-                    parserOptions: {
-                        project: setESLintProjectBasedOnProjectType(projectRoot, projectType, hasE2e),
-                    },
-                }
-                : null)), { rules: {
+            {
+                files: ['*.ts'],
+                ...(setParserOptionsProject
+                    ? {
+                        parserOptions: {
+                            project: setESLintProjectBasedOnProjectType(projectRoot, projectType, hasE2e),
+                        },
+                    }
+                    : null),
+                rules: {
                     '@angular-eslint/directive-selector': [
                         'error',
                         { type: 'attribute', prefix, style: 'camelCase' },
@@ -283,7 +290,8 @@ function createProjectESLintConfig__NX(projectRoot, projectType, prefix, setPars
                         'error',
                         { type: 'element', prefix, style: 'kebab-case' },
                     ],
-                } }),
+                },
+            },
             {
                 files: ['*.html'],
                 rules: {},
@@ -295,7 +303,7 @@ function createESLintConfigForProject__NX(tree, projectName, setParserOptionsPro
     const existingProjectConfig = readProjectConfiguration(tree, projectName);
     const targets = existingProjectConfig.architect || existingProjectConfig.targets;
     const { root: projectRoot, projectType, prefix } = existingProjectConfig;
-    const hasE2e = !!(targets === null || targets === void 0 ? void 0 : targets.e2e);
+    const hasE2e = !!targets?.e2e;
     /**
      * If the root is an empty string it must be the initial project created at the
      * root by the Angular CLI's workspace schematic
@@ -334,10 +342,9 @@ function createESLintConfigForProject(projectName, setParserOptionsProject) {
 exports.createESLintConfigForProject = createESLintConfigForProject;
 function createRootESLintConfigFile(projectName) {
     return (tree) => {
-        var _a;
         const angularJSON = readJsonInTree(tree, getWorkspacePath(tree));
         let lintPrefix = null;
-        if ((_a = angularJSON.projects) === null || _a === void 0 ? void 0 : _a[projectName]) {
+        if (angularJSON.projects?.[projectName]) {
             const { prefix } = angularJSON.projects[projectName];
             lintPrefix = prefix;
         }
@@ -351,7 +358,10 @@ function sortObjectByKeys(obj) {
     return Object.keys(obj)
         .sort()
         .reduce((result, key) => {
-        return Object.assign(Object.assign({}, result), { [key]: obj[key] });
+        return {
+            ...result,
+            [key]: obj[key],
+        };
     }, {});
 }
 exports.sortObjectByKeys = sortObjectByKeys;
@@ -394,8 +404,7 @@ exports.determineTargetProjectName = determineTargetProjectName;
 function determineTargetProjectHasE2E(
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
 angularJSON, projectName) {
-    var _a;
-    return !!((_a = getTargetsConfigFromProject(angularJSON.projects[projectName])) === null || _a === void 0 ? void 0 : _a.e2e);
+    return !!getTargetsConfigFromProject(angularJSON.projects[projectName])?.e2e;
 }
 /**
  * See `schematicCollections` docs here:
@@ -416,7 +425,10 @@ function updateSchematicDefaults(angularJson, schematicFullName, defaultValues)
     angularJson.schematics = angularJson.schematics || {};
     angularJson.schematics[schematicFullName] =
         angularJson.schematics[schematicFullName] || {};
-    angularJson.schematics[schematicFullName] = Object.assign(Object.assign({}, angularJson.schematics[schematicFullName]), defaultValues);
+    angularJson.schematics[schematicFullName] = {
+        ...angularJson.schematics[schematicFullName],
+        ...defaultValues,
+    };
     return angularJson;
 }
 exports.updateSchematicDefaults = updateSchematicDefaults;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/schematics",
-  "version": "17.3.1-alpha.2",
+  "version": "17.3.1-alpha.4",
   "description": "Angular Schematics for angular-eslint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -33,8 +33,8 @@
     "save": "devDependencies"
   },
   "dependencies": {
-    "@angular-eslint/eslint-plugin": "17.3.1-alpha.2",
-    "@angular-eslint/eslint-plugin-template": "17.3.1-alpha.2",
+    "@angular-eslint/eslint-plugin": "17.3.1-alpha.4",
+    "@angular-eslint/eslint-plugin-template": "17.3.1-alpha.4",
     "@nx/devkit": "^17.2.8 || ^18.0.0",
     "ignore": "5.3.1",
     "nx": "^17.2.8 || ^18.0.0",