@depup/angular__cli 21.2.1-depup.1

package/src/command-builder/utilities/json-schema.d.ts

@@ -0,0 +1,64 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+import { json } from '@angular-devkit/core';
+import type { Argv, Options as YargsOptions } from 'yargs';
+import { EventCustomDimension } from '../../analytics/analytics-parameters';
+/**
+ * An option description that can be used by yargs to create a command.
+ * See: https://github.com/yargs/yargs/blob/main/docs/options.mjs
+ */
+export interface Option extends YargsOptions {
+    /**
+     * The name of the option.
+     */
+    name: string;
+    /**
+     * Whether this option is required or not.
+     */
+    required?: boolean;
+    /**
+     * Format field of this option.
+     */
+    format?: string;
+    /**
+     * Whether this option should be hidden from the help output. It will still show up in JSON help.
+     */
+    hidden?: boolean;
+    /**
+     * If this option can be used as an argument, the position of the argument. Otherwise omitted.
+     */
+    positional?: number;
+    /**
+     * Whether or not to report this option to the Angular Team, and which custom field to use.
+     * If this is falsey, do not report this option.
+     */
+    userAnalytics?: string;
+    /**
+     * Type of the values in a key/value pair field.
+     */
+    itemValueType?: 'string';
+}
+/**
+ * Parses a JSON schema to a list of options that can be used by yargs.
+ *
+ * @param registry A schema registry to use for flattening the schema.
+ * @param schema The JSON schema to parse.
+ * @param interactive Whether to prompt the user for missing options.
+ * @returns A list of options.
+ *
+ * @note The schema definition are not resolved at this stage. This means that `$ref` will not be resolved,
+ * and custom keywords like `x-prompt` will not be processed.
+ */
+export declare function parseJsonSchemaToOptions(registry: json.schema.SchemaRegistry, schema: json.JsonObject, interactive?: boolean): Promise<Option[]>;
+/**
+ * Adds schema options to a command also this keeps track of options that are required for analytics.
+ * **Note:** This method should be called from the command bundler method.
+ *
+ * @returns A map from option name to analytics configuration.
+ */
+export declare function addSchemaOptionsToCommand<T>(localYargs: Argv<T>, options: Option[], includeDefaultValues: boolean): Map<string, EventCustomDimension>;

package/src/command-builder/utilities/json-schema.js

@@ -0,0 +1,349 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseJsonSchemaToOptions = parseJsonSchemaToOptions;
+exports.addSchemaOptionsToCommand = addSchemaOptionsToCommand;
+const core_1 = require("@angular-devkit/core");
+/**
+ * A Yargs check function that validates that the given options are in the form of `key=value`.
+ * @param keyValuePairOptions A set of options that should be in the form of `key=value`.
+ * @param args The parsed arguments.
+ * @returns `true` if the options are valid, otherwise an error is thrown.
+ */
+function checkStringMap(keyValuePairOptions, args) {
+    for (const key of keyValuePairOptions) {
+        const value = args[key];
+        if (!Array.isArray(value)) {
+            // Value has been parsed.
+            continue;
+        }
+        for (const pair of value) {
+            if (pair === undefined) {
+                continue;
+            }
+            if (!pair.includes('=')) {
+                throw new Error(`Invalid value for argument: ${key}, Given: '${pair}', Expected key=value pair`);
+            }
+        }
+    }
+    return true;
+}
+/**
+ * A Yargs coerce function that converts an array of `key=value` strings to an object.
+ * @param value An array of `key=value` strings.
+ * @returns An object with the keys and values from the input array.
+ */
+function coerceToStringMap(value) {
+    const stringMap = {};
+    for (const pair of value) {
+        // This happens when the flag isn't passed at all.
+        if (pair === undefined) {
+            continue;
+        }
+        const eqIdx = pair.indexOf('=');
+        if (eqIdx === -1) {
+            // In the case it is not valid skip processing this option and handle the error in `checkStringMap`
+            return value;
+        }
+        const key = pair.slice(0, eqIdx);
+        stringMap[key] = pair.slice(eqIdx + 1);
+    }
+    return stringMap;
+}
+/**
+ * Checks if a JSON schema node represents a string map.
+ * A string map is an object with `additionalProperties` of type `string`.
+ * @param node The JSON schema node to check.
+ * @returns `true` if the node represents a string map, otherwise `false`.
+ */
+function isStringMap(node) {
+    // Exclude fields with more specific kinds of properties.
+    if (node.properties || node.patternProperties) {
+        return false;
+    }
+    // Restrict to additionalProperties with string values.
+    return (core_1.json.isJsonObject(node.additionalProperties) &&
+        !node.additionalProperties.enum &&
+        node.additionalProperties.type === 'string');
+}
+const SUPPORTED_PRIMITIVE_TYPES = new Set(['boolean', 'number', 'string']);
+/**
+ * Checks if a string is a supported primitive type.
+ * @param value The string to check.
+ * @returns `true` if the string is a supported primitive type, otherwise `false`.
+ */
+function isSupportedPrimitiveType(value) {
+    return SUPPORTED_PRIMITIVE_TYPES.has(value);
+}
+/**
+ * Recursively checks if a JSON schema for an array's items is a supported primitive type.
+ * It supports `oneOf` and `anyOf` keywords.
+ * @param schema The JSON schema for the array's items.
+ * @returns `true` if the schema is a supported primitive type, otherwise `false`.
+ */
+function isSupportedArrayItemSchema(schema) {
+    if (typeof schema.type === 'string' && isSupportedPrimitiveType(schema.type)) {
+        return true;
+    }
+    if (core_1.json.isJsonArray(schema.enum)) {
+        return true;
+    }
+    if (core_1.json.isJsonArray(schema.items)) {
+        return schema.items.some((item) => (0, core_1.isJsonObject)(item) && isSupportedArrayItemSchema(item));
+    }
+    if (core_1.json.isJsonArray(schema.oneOf) &&
+        schema.oneOf.some((item) => (0, core_1.isJsonObject)(item) && isSupportedArrayItemSchema(item))) {
+        return true;
+    }
+    if (core_1.json.isJsonArray(schema.anyOf) &&
+        schema.anyOf.some((item) => (0, core_1.isJsonObject)(item) && isSupportedArrayItemSchema(item))) {
+        return true;
+    }
+    return false;
+}
+/**
+ * Gets the supported types for a JSON schema node.
+ * @param current The JSON schema node to get the supported types for.
+ * @returns An array of supported types.
+ */
+function getSupportedTypes(current) {
+    const typeSet = core_1.json.schema.getTypesOfSchema(current);
+    if (typeSet.size === 0) {
+        return [];
+    }
+    return [...typeSet].filter((type) => {
+        switch (type) {
+            case 'boolean':
+            case 'number':
+            case 'string':
+                return true;
+            case 'array':
+                return (0, core_1.isJsonObject)(current.items) && isSupportedArrayItemSchema(current.items);
+            case 'object':
+                return isStringMap(current);
+            default:
+                return false;
+        }
+    });
+}
+/**
+ * Gets the enum values for a JSON schema node.
+ * @param current The JSON schema node to get the enum values for.
+ * @returns An array of enum values.
+ */
+function getEnumValues(current) {
+    if (core_1.json.isJsonArray(current.enum)) {
+        return current.enum.sort();
+    }
+    if ((0, core_1.isJsonObject)(current.items)) {
+        const enumValues = getEnumValues(current.items);
+        if (enumValues?.length) {
+            return enumValues;
+        }
+    }
+    if (typeof current.type === 'string' && isSupportedPrimitiveType(current.type)) {
+        return [];
+    }
+    const subSchemas = (core_1.json.isJsonArray(current.oneOf) && current.oneOf) ||
+        (core_1.json.isJsonArray(current.anyOf) && current.anyOf);
+    if (subSchemas) {
+        // Find the first enum.
+        for (const subSchema of subSchemas) {
+            if ((0, core_1.isJsonObject)(subSchema)) {
+                const enumValues = getEnumValues(subSchema);
+                if (enumValues) {
+                    return enumValues;
+                }
+            }
+        }
+    }
+    return [];
+}
+/**
+ * Gets the default value for a JSON schema node.
+ * @param current The JSON schema node to get the default value for.
+ * @param type The type of the JSON schema node.
+ * @returns The default value, or `undefined` if there is no default value.
+ */
+function getDefaultValue(current, type) {
+    const defaultValue = current.default;
+    if (defaultValue === undefined) {
+        return undefined;
+    }
+    if (type === 'array') {
+        return Array.isArray(defaultValue) && defaultValue.length > 0 ? defaultValue : undefined;
+    }
+    if (typeof defaultValue === type) {
+        return defaultValue;
+    }
+    return undefined;
+}
+/**
+ * Gets the aliases for a JSON schema node.
+ * @param current The JSON schema node to get the aliases for.
+ * @returns An array of aliases.
+ */
+function getAliases(current) {
+    if (core_1.json.isJsonArray(current.aliases)) {
+        return [...current.aliases].map(String);
+    }
+    if (current.alias) {
+        return [String(current.alias)];
+    }
+    return [];
+}
+/**
+ * Parses a JSON schema to a list of options that can be used by yargs.
+ *
+ * @param registry A schema registry to use for flattening the schema.
+ * @param schema The JSON schema to parse.
+ * @param interactive Whether to prompt the user for missing options.
+ * @returns A list of options.
+ *
+ * @note The schema definition are not resolved at this stage. This means that `$ref` will not be resolved,
+ * and custom keywords like `x-prompt` will not be processed.
+ */
+async function parseJsonSchemaToOptions(registry, schema, interactive = true) {
+    const options = [];
+    function visitor(current, pointer, parentSchema) {
+        if (!parentSchema ||
+            core_1.json.isJsonArray(current) ||
+            pointer.split(/\/(?:properties|items|definitions)\//g).length > 2) {
+            // Ignore root, arrays, and subitems.
+            return;
+        }
+        if (pointer.includes('/not/')) {
+            // We don't support anyOf/not.
+            throw new Error('The "not" keyword is not supported in JSON Schema.');
+        }
+        const ptr = core_1.json.schema.parseJsonPointer(pointer);
+        if (ptr[ptr.length - 2] !== 'properties') {
+            // Skip any non-property items.
+            return;
+        }
+        const name = ptr.at(-1);
+        const types = getSupportedTypes(current);
+        if (types.length === 0) {
+            // This means it's not usable on the command line. e.g. an Object.
+            return;
+        }
+        const [type] = types;
+        const $default = current.$default;
+        const $defaultIndex = (0, core_1.isJsonObject)($default) && $default['$source'] === 'argv' ? $default['index'] : undefined;
+        const positional = typeof $defaultIndex === 'number' ? $defaultIndex : undefined;
+        let required = core_1.json.isJsonArray(schema.required) && schema.required.includes(name);
+        if (required && interactive && current['x-prompt']) {
+            required = false;
+        }
+        const visible = current.visible !== false;
+        const xDeprecated = current['x-deprecated'];
+        const enumValues = getEnumValues(current);
+        const option = {
+            name,
+            description: String(current.description ?? ''),
+            default: getDefaultValue(current, type),
+            choices: enumValues?.length ? enumValues : undefined,
+            required,
+            alias: getAliases(current),
+            format: typeof current.format === 'string' ? current.format : undefined,
+            hidden: !!current.hidden || !visible,
+            userAnalytics: typeof current['x-user-analytics'] === 'string' ? current['x-user-analytics'] : undefined,
+            deprecated: xDeprecated === true || typeof xDeprecated === 'string' ? xDeprecated : undefined,
+            positional,
+            ...(type === 'object'
+                ? {
+                    type: 'array',
+                    itemValueType: 'string',
+                }
+                : {
+                    type,
+                }),
+        };
+        options.push(option);
+    }
+    const flattenedSchema = await registry.ɵflatten(schema);
+    core_1.json.schema.visitJsonSchema(flattenedSchema, visitor);
+    // Sort by positional and name.
+    return options.sort((a, b) => {
+        if (a.positional) {
+            return b.positional ? a.positional - b.positional : a.name.localeCompare(b.name);
+        }
+        else if (b.positional) {
+            return -1;
+        }
+        return a.name.localeCompare(b.name);
+    });
+}
+/**
+ * Adds schema options to a command also this keeps track of options that are required for analytics.
+ * **Note:** This method should be called from the command bundler method.
+ *
+ * @returns A map from option name to analytics configuration.
+ */
+function addSchemaOptionsToCommand(localYargs, options, includeDefaultValues) {
+    const booleanOptionsWithNoPrefix = new Set();
+    const keyValuePairOptions = new Set();
+    const optionsWithAnalytics = new Map();
+    for (const option of options) {
+        const { default: defaultVal, positional, deprecated, description, alias, userAnalytics, type, itemValueType, hidden, name, choices, } = option;
+        let dashedName = core_1.strings.dasherize(name);
+        // Handle options which have been defined in the schema with `no` prefix.
+        if (type === 'boolean' && dashedName.startsWith('no-')) {
+            dashedName = dashedName.slice(3);
+            booleanOptionsWithNoPrefix.add(dashedName);
+        }
+        if (itemValueType) {
+            keyValuePairOptions.add(dashedName);
+        }
+        const sharedOptions = {
+            alias,
+            hidden,
+            description,
+            deprecated,
+            choices,
+            coerce: itemValueType ? coerceToStringMap : undefined,
+            // This should only be done when `--help` is used otherwise default will override options set in angular.json.
+            ...(includeDefaultValues ? { default: defaultVal } : {}),
+        };
+        if (positional === undefined) {
+            localYargs = localYargs.option(dashedName, {
+                array: itemValueType ? true : undefined,
+                type: itemValueType ?? type,
+                ...sharedOptions,
+            });
+        }
+        else {
+            localYargs = localYargs.positional(dashedName, {
+                type: type === 'array' || type === 'count' ? 'string' : type,
+                ...sharedOptions,
+            });
+        }
+        // Record option of analytics.
+        if (userAnalytics !== undefined) {
+            optionsWithAnalytics.set(name, userAnalytics);
+        }
+    }
+    // Valid key/value options
+    if (keyValuePairOptions.size) {
+        localYargs.check(checkStringMap.bind(null, keyValuePairOptions), false);
+    }
+    // Handle options which have been defined in the schema with `no` prefix.
+    if (booleanOptionsWithNoPrefix.size) {
+        localYargs.middleware((options) => {
+            for (const key of booleanOptionsWithNoPrefix) {
+                if (key in options) {
+                    options[`no-${key}`] = !options[key];
+                    delete options[key];
+                }
+            }
+        }, false);
+    }
+    return optionsWithAnalytics;
+}
+//# sourceMappingURL=json-schema.js.map

package/src/command-builder/utilities/json-schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"json-schema.js","sourceRoot":"","sources":["json-schema.ts"],"names":[],"mappings":"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"}

package/src/command-builder/utilities/normalize-options-middleware.d.ts

@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+import type { Arguments, Argv } from 'yargs';
+/**
+ * A Yargs middleware that normalizes non Array options when the argument has been provided multiple times.
+ *
+ * By default, when an option is non array and it is provided multiple times in the command line, yargs
+ * will not override it's value but instead it will be changed to an array unless `duplicate-arguments-array` is disabled.
+ * But this option also have an effect on real array options which isn't desired.
+ *
+ * See: https://github.com/yargs/yargs-parser/pull/163#issuecomment-516566614
+ */
+export declare function createNormalizeOptionsMiddleware(localeYargs: Argv): (args: Arguments) => void;

package/src/command-builder/utilities/normalize-options-middleware.js

@@ -0,0 +1,37 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNormalizeOptionsMiddleware = createNormalizeOptionsMiddleware;
+/**
+ * A Yargs middleware that normalizes non Array options when the argument has been provided multiple times.
+ *
+ * By default, when an option is non array and it is provided multiple times in the command line, yargs
+ * will not override it's value but instead it will be changed to an array unless `duplicate-arguments-array` is disabled.
+ * But this option also have an effect on real array options which isn't desired.
+ *
+ * See: https://github.com/yargs/yargs-parser/pull/163#issuecomment-516566614
+ */
+function createNormalizeOptionsMiddleware(localeYargs) {
+    return (args) => {
+        // `getOptions` is not included in the types even though it's public API.
+        // https://github.com/yargs/yargs/issues/2098
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const { array } = localeYargs.getOptions();
+        const arrayOptions = new Set(array);
+        for (const [key, value] of Object.entries(args)) {
+            if (key !== '_' && Array.isArray(value) && !arrayOptions.has(key)) {
+                const newValue = value.pop();
+                // eslint-disable-next-line no-console
+                console.warn(`Option '${key}' has been specified multiple times. The value '${newValue}' will be used.`);
+                args[key] = newValue;
+            }
+        }
+    };
+}
+//# sourceMappingURL=normalize-options-middleware.js.map

package/src/command-builder/utilities/normalize-options-middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-options-middleware.js","sourceRoot":"","sources":["normalize-options-middleware.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAaH,4EAmBC;AA5BD;;;;;;;;GAQG;AACH,SAAgB,gCAAgC,CAAC,WAAiB;IAChE,OAAO,CAAC,IAAe,EAAE,EAAE;QACzB,yEAAyE;QACzE,6CAA6C;QAC7C,8DAA8D;QAC9D,MAAM,EAAE,KAAK,EAAE,GAAI,WAAmB,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QAEpC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,IAAI,GAAG,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAClE,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;gBAC7B,sCAAsC;gBACtC,OAAO,CAAC,IAAI,CACV,WAAW,GAAG,mDAAmD,QAAQ,iBAAiB,CAC3F,CAAC;gBACF,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/src/command-builder/utilities/schematic-engine-host.d.ts

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+import { RuleFactory } from '@angular-devkit/schematics';
+import { FileSystemCollectionDesc, NodeModulesEngineHost } from '@angular-devkit/schematics/tools';
+export declare class SchematicEngineHost extends NodeModulesEngineHost {
+    protected _resolveReferenceString(refString: string, parentPath: string, collectionDescription?: FileSystemCollectionDesc): {
+        ref: RuleFactory<{}>;
+        path: string;
+    } | null;
+}