@depup/nx 22.5.4-depup.0

package/src/adapter/angular-json.js

@@ -0,0 +1,129 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NxAngularJsonPlugin = exports.NX_ANGULAR_JSON_PLUGIN_NAME = void 0;
+exports.shouldMergeAngularProjects = shouldMergeAngularProjects;
+exports.isAngularPluginInstalled = isAngularPluginInstalled;
+exports.toNewFormat = toNewFormat;
+exports.toOldFormat = toOldFormat;
+exports.renamePropertyWithStableKeys = renamePropertyWithStableKeys;
+const fs_1 = require("fs");
+const path = require("path");
+const fileutils_1 = require("../utils/fileutils");
+exports.NX_ANGULAR_JSON_PLUGIN_NAME = 'nx-angular-json-plugin';
+const createNodes = [
+    'angular.json',
+    (f, _, ctx) => [
+        [
+            'angular.json',
+            {
+                projects: readAngularJson(ctx.workspaceRoot),
+            },
+        ],
+    ],
+];
+exports.NxAngularJsonPlugin = {
+    name: exports.NX_ANGULAR_JSON_PLUGIN_NAME,
+    createNodes,
+    createNodesV2: createNodes,
+};
+exports.default = exports.NxAngularJsonPlugin;
+function shouldMergeAngularProjects(root, includeProjectsFromAngularJson) {
+    if ((0, fs_1.existsSync)(path.join(root, 'angular.json')) &&
+        // Include projects from angular.json if explicitly required.
+        // e.g. when invoked from `packages/devkit/src/utils/convert-nx-executor.ts`
+        (includeProjectsFromAngularJson ||
+            // Or if a workspace has `@nx/angular` installed then projects from `angular.json` to be considered by Nx.
+            isAngularPluginInstalled())) {
+        return true;
+    }
+    else {
+        return false;
+    }
+}
+function isAngularPluginInstalled() {
+    try {
+        // nx-ignore-next-line
+        require.resolve('@nx/angular');
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function readAngularJson(angularCliWorkspaceRoot) {
+    return toNewFormat((0, fileutils_1.readJsonFile)(path.join(angularCliWorkspaceRoot, 'angular.json'))).projects;
+}
+function toNewFormat(w) {
+    if (!w.projects) {
+        return w;
+    }
+    for (const name in w.projects ?? {}) {
+        const projectConfig = w.projects[name];
+        if (projectConfig.architect) {
+            renamePropertyWithStableKeys(projectConfig, 'architect', 'targets');
+        }
+        if (projectConfig.schematics) {
+            renamePropertyWithStableKeys(projectConfig, 'schematics', 'generators');
+        }
+        if (!projectConfig.name) {
+            projectConfig.name = name;
+        }
+        Object.values(projectConfig.targets || {}).forEach((target) => {
+            if (target.builder !== undefined) {
+                renamePropertyWithStableKeys(target, 'builder', 'executor');
+            }
+        });
+    }
+    if (w.schematics) {
+        renamePropertyWithStableKeys(w, 'schematics', 'generators');
+    }
+    if (w.version !== 2) {
+        w.version = 2;
+    }
+    return w;
+}
+function toOldFormat(w) {
+    if (w.projects) {
+        for (const name in w.projects) {
+            const projectConfig = w.projects[name];
+            if (typeof projectConfig === 'string') {
+                throw new Error("'project.json' files are incompatible with version 1 workspace schemas.");
+            }
+            if (projectConfig.targets) {
+                renamePropertyWithStableKeys(projectConfig, 'targets', 'architect');
+            }
+            if (projectConfig.generators) {
+                renamePropertyWithStableKeys(projectConfig, 'generators', 'schematics');
+            }
+            delete projectConfig.name;
+            Object.values(projectConfig.architect || {}).forEach((target) => {
+                if (target.executor !== undefined) {
+                    renamePropertyWithStableKeys(target, 'executor', 'builder');
+                }
+            });
+        }
+    }
+    if (w.generators) {
+        renamePropertyWithStableKeys(w, 'generators', 'schematics');
+    }
+    if (w.version !== 1) {
+        w.version = 1;
+    }
+    return w;
+}
+// we have to do it this way to preserve the order of properties
+// not to screw up the formatting
+function renamePropertyWithStableKeys(obj, from, to) {
+    const copy = { ...obj };
+    Object.keys(obj).forEach((k) => {
+        delete obj[k];
+    });
+    Object.keys(copy).forEach((k) => {
+        if (k === from) {
+            obj[to] = copy[k];
+        }
+        else {
+            obj[k] = copy[k];
+        }
+    });
+}

package/src/adapter/compat.d.ts

@@ -0,0 +1,3 @@
+export declare const allowedProjectExtensions: readonly ["tags", "implicitDependencies", "configFilePath", "$schema", "generators", "namedInputs", "name", "files", "root", "sourceRoot", "projectType", "release", "includedScripts", "metadata", "owners", "nxCloudImplicitDependencies"];
+export declare const allowedWorkspaceExtensions: readonly ["$schema", "implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "sync", "useLegacyCache", "maxCacheSize", "tui", "owners"];
+//# sourceMappingURL=compat.d.ts.map

package/src/adapter/compat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"AAgCA,eAAO,MAAM,wBAAwB,8OAiB3B,CAAC;AAQX,eAAO,MAAM,0BAA0B,yeAgC7B,CAAC"}

package/src/adapter/compat.js

@@ -0,0 +1,153 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.allowedWorkspaceExtensions = exports.allowedProjectExtensions = void 0;
+const project_graph_1 = require("../project-graph/project-graph");
+const configuration_1 = require("../config/configuration");
+const angular_json_1 = require("./angular-json");
+/* eslint-disable */
+const Module = require('module');
+const originalRequire = Module.prototype.require;
+let patched = false;
+// If we pass props on a project that angular doesn't know about,
+// it throws a warning that users see. We want to pass them still,
+// so older plugins writtin in Ng Devkit can update these.
+//
+// There are some props in here (root) that angular already knows about,
+// but it doesn't hurt to have them in here as well to help static analysis.
+exports.allowedProjectExtensions = [
+    'tags',
+    'implicitDependencies',
+    'configFilePath',
+    '$schema',
+    'generators',
+    'namedInputs',
+    'name',
+    'files',
+    'root',
+    'sourceRoot',
+    'projectType',
+    'release',
+    'includedScripts',
+    'metadata',
+    'owners',
+    'nxCloudImplicitDependencies',
+];
+// If we pass props on the workspace that angular doesn't know about,
+// it throws a warning that users see. We want to pass them still,
+// so older plugins writtin in Ng Devkit can update these.
+//
+// There are some props in here (root) that angular already knows about,
+// but it doesn't hurt to have them in here as well to help static analysis.
+exports.allowedWorkspaceExtensions = [
+    '$schema',
+    'implicitDependencies',
+    'affected',
+    'defaultBase',
+    'tasksRunnerOptions',
+    'workspaceLayout',
+    'plugins',
+    'targetDefaults',
+    'files',
+    'generators',
+    'namedInputs',
+    'extends',
+    'cli',
+    'pluginsConfig',
+    'defaultProject',
+    'installation',
+    'release',
+    'nxCloudAccessToken',
+    'nxCloudId',
+    'nxCloudUrl',
+    'nxCloudEncryptionKey',
+    'parallel',
+    'cacheDirectory',
+    'useDaemonProcess',
+    'useInferencePlugins',
+    'neverConnectToCloud',
+    'sync',
+    'useLegacyCache',
+    'maxCacheSize',
+    'tui',
+    'owners',
+];
+if (!patched) {
+    Module.prototype.require = function () {
+        const result = originalRequire.apply(this, arguments);
+        if (arguments[0].startsWith('@angular-devkit/core')) {
+            const ngCoreWorkspace = originalRequire.apply(this, [
+                `@angular-devkit/core/src/workspace/core`,
+            ]);
+            mockReadWorkspace(ngCoreWorkspace);
+            const readJsonUtils = originalRequire.apply(this, [
+                `@angular-devkit/core/src/workspace/json/reader`,
+            ]);
+            mockReadJsonWorkspace(readJsonUtils);
+        }
+        return result;
+    };
+    try {
+        require('@angular-devkit/build-angular/src/utils/version').Version.assertCompatibleAngularVersion =
+            () => { };
+    }
+    catch (e) { }
+    try {
+        require('@angular-devkit/build-angular/src/utils/version').assertCompatibleAngularVersion =
+            () => { };
+    }
+    catch (e) { }
+    try {
+        require('@angular/build/private').assertCompatibleAngularVersion = () => { };
+    }
+    catch (e) { }
+    patched = true;
+}
+function mockReadWorkspace(ngCoreWorkspace) {
+    mockMember(ngCoreWorkspace, 'readWorkspace', (originalReadWorkspace) => (path, ...rest) => {
+        path = 'angular.json';
+        return originalReadWorkspace.apply(this, [path, ...rest]);
+    });
+}
+/**
+ * Patch readJsonWorkspace to handle workspaces without a central workspace file.
+ * NOTE: We hide warnings that would be logged during this process.
+ */
+function mockReadJsonWorkspace(readJsonUtils) {
+    mockMember(readJsonUtils, 'readJsonWorkspace', (originalReadJsonWorkspace) => async (path, host, options) => {
+        const modifiedOptions = {
+            ...options,
+            allowedProjectExtensions: exports.allowedProjectExtensions,
+            allowedWorkspaceExtensions: exports.allowedWorkspaceExtensions,
+        };
+        try {
+            // Attempt angular CLI default behaviour
+            return await originalReadJsonWorkspace(path, host, modifiedOptions);
+        }
+        catch {
+            // This failed. Its most likely due to a lack of a workspace definition file,
+            // or other things that are different between NgCLI and Nx config files.
+            const projectGraph = await (0, project_graph_1.createProjectGraphAsync)();
+            const nxJson = (0, configuration_1.readNxJson)();
+            // Construct old workspace.json format from project graph
+            const w = {
+                ...nxJson,
+                ...(0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph),
+            };
+            // Read our v1 workspace schema
+            const workspaceConfiguration = (0, angular_json_1.toOldFormat)(w);
+            // readJsonWorkspace actually has AST parsing + more, so we
+            // still need to call it rather than just return our file
+            return originalReadJsonWorkspace.apply(this, [
+                'angular.json', // path name, doesn't matter
+                {
+                    // second arg is a host, only method used is readFile
+                    readFile: () => JSON.stringify(workspaceConfiguration),
+                },
+                modifiedOptions,
+            ]);
+        }
+    });
+}
+function mockMember(obj, method, factory) {
+    obj[method] = factory(obj[method]);
+}

package/src/adapter/ngcli-adapter.d.ts

@@ -0,0 +1,102 @@
+import { logging, Path, PathFragment, virtualFs } from '@angular-devkit/core';
+import { FileBuffer } from '@angular-devkit/core/src/virtual-fs/host/interface';
+import { Observable } from 'rxjs';
+import type { GenerateOptions } from '../command-line/generate/generate';
+import { ProjectConfiguration } from '../config/workspace-json-project-json';
+import { Tree } from '../generators/tree';
+import { ExecutorContext, GeneratorCallback } from '../config/misc-interfaces';
+export declare function createBuilderContext(builderInfo: {
+    builderName: string;
+    description: string;
+    optionSchema: any;
+}, context: ExecutorContext): Promise<import("@angular-devkit/architect").BuilderContext>;
+export declare function scheduleTarget(root: string, opts: {
+    project: string;
+    target: string;
+    configuration: string;
+    runOptions: any;
+    projects: Record<string, ProjectConfiguration>;
+}, verbose: boolean): Promise<Observable<import('@angular-devkit/architect').BuilderOutput>>;
+type AngularProjectConfiguration = ProjectConfiguration & {
+    prefix?: string;
+};
+export declare class NxScopedHost extends virtualFs.ScopedHost<any> {
+    private root;
+    constructor(root: string);
+    read(path: Path): Observable<FileBuffer>;
+    protected readMergedWorkspaceConfiguration(): Observable<any>;
+    write(path: Path, content: FileBuffer): Observable<void>;
+    isFile(path: Path): Observable<boolean>;
+    exists(path: Path): Observable<boolean>;
+    mergeProjectConfiguration(existing: AngularProjectConfiguration, updated: AngularProjectConfiguration, projectName: string): AngularProjectConfiguration;
+    readExistingAngularJson(): Observable<any>;
+    protected readJson<T = any>(path: string): Observable<T>;
+}
+/**
+ * Host used by Angular CLI builders. It reads the project configurations from
+ * the project graph to access the expanded targets.
+ */
+export declare class NxScopedHostForBuilders extends NxScopedHost {
+    protected readMergedWorkspaceConfiguration(): Observable<any>;
+}
+export declare function arrayBufferToString(buffer: any): string;
+/**
+ * Host used by Angular CLI schematics. It reads the project configurations from
+ * the project configuration files.
+ */
+export declare class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
+    private readonly host;
+    constructor(root: string, host: Tree);
+    read(path: Path): Observable<FileBuffer>;
+    exists(path: Path): Observable<boolean>;
+    isDirectory(path: Path): Observable<boolean>;
+    isFile(path: Path): Observable<boolean>;
+    list(path: Path): Observable<PathFragment[]>;
+}
+export declare function generate(root: string, opts: GenerateOptions, projects: Record<string, ProjectConfiguration>, verbose: boolean): Promise<number>;
+export declare function runMigration(root: string, packageName: string, migrationName: string, projects: Record<string, ProjectConfiguration>, isVerbose: boolean): Promise<{
+    loggingQueue: string[];
+    madeChanges: boolean;
+}>;
+/**
+ * If you have an Nx Devkit generator invoking the wrapped Angular Devkit schematic,
+ * and you don't want the Angular Devkit schematic to run, you can mock it up using this function.
+ *
+ * Unfortunately, there are some edge cases in the Nx-Angular devkit integration that
+ * can be seen in the unit tests context. This function is useful for handling that as well.
+ *
+ * In this case, you can mock it up.
+ *
+ * Example:
+ *
+ * ```typescript
+ *   mockSchematicsForTesting({
+ *     'mycollection:myschematic': (tree, params) => {
+ *        tree.write("README.md");
+ *     }
+ *   });
+ *
+ * ```
+ */
+export declare function mockSchematicsForTesting(schematics: {
+    [name: string]: (host: Tree, generatorOptions: {
+        [k: string]: any;
+    }) => Promise<void>;
+}): void;
+export declare function wrapAngularDevkitSchematic(collectionName: string, generatorName: string): (host: Tree, generatorOptions: {
+    [k: string]: any;
+}) => Promise<GeneratorCallback>;
+export declare const getLogger: (isVerbose?: boolean) => logging.Logger;
+/**
+ * Restores Nx tokens in options when possible by comparing new and previous
+ * options.
+ * The function preserves tokens in the following cases:
+ * 1. When the resolved previous value matches the new value exactly
+ * 2. When the previous value used {workspaceRoot}
+ * 3. When the previous value used {projectRoot} and the new value starts with
+ *    the project root path
+ * Those are the only safe cases, for all other cases, the new value is used as-is.
+ */
+export declare function restoreNxTokensInOptions<T extends Object | Array<unknown>>(newOptions: T, previousOptions: T, project: ProjectConfiguration): T;
+export {};
+//# sourceMappingURL=ngcli-adapter.d.ts.map

package/src/adapter/ngcli-adapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ngcli-adapter.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/ngcli-adapter.ts"],"names":[],"mappings":"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"}