@trackunit/nx-utils 0.0.9 → 0.0.10

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.0.10](https://github.com/Trackunit/manager/compare/nx-utils/0.0.9...nx-utils/0.0.10) (2023-04-19)
+
 ## [0.0.9](https://github.com/Trackunit/manager/compare/nx-utils/0.0.8...nx-utils/0.0.9) (2023-04-19)
 
 ## [0.0.8](https://github.com/Trackunit/manager/compare/nx-utils/0.0.7...nx-utils/0.0.8) (2023-04-14)

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@trackunit/nx-utils",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "main": "src/index.js",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "dependencies": {
-    "@phenomnomnominal/tsquery": "4.2.0",
     "tslib": "2.4.1"
   },
   "types": "./src/index.d.ts"

package/src/index.js

@@ -9,8 +9,6 @@ Object.defineProperty(exports, "readFile", { enumerable: true, get: function ()
 Object.defineProperty(exports, "readJson", { enumerable: true, get: function () { return testing_1.readJson; } });
 Object.defineProperty(exports, "uniq", { enumerable: true, get: function () { return testing_1.uniq; } });
 Object.defineProperty(exports, "updateFile", { enumerable: true, get: function () { return testing_1.updateFile; } });
-tslib_1.__exportStar(require("./ast/astUtils"), exports);
-tslib_1.__exportStar(require("./fileUpdater"), exports);
 tslib_1.__exportStar(require("./nxTestUtils"), exports);
 tslib_1.__exportStar(require("./projectUtils"), exports);
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/nx/utils/src/index.ts"],"names":[],"mappings":";;;;AAAA,iDAAiD;AACjD,mDAAgG;AAAvF,0GAAA,eAAe,OAAA;AAAE,mGAAA,QAAQ,OAAA;AAAE,mGAAA,QAAQ,OAAA;AAAE,+FAAA,IAAI,OAAA;AAAE,qGAAA,UAAU,OAAA;AAC9D,yDAA+B;AAC/B,wDAA8B;AAC9B,wDAA8B;AAC9B,yDAA+B","sourcesContent":["// eslint-disable-next-line no-restricted-imports\nexport { checkFilesExist, readFile, readJson, uniq, updateFile } from \"@nrwl/nx-plugin/testing\";\nexport * from \"./ast/astUtils\";\nexport * from \"./fileUpdater\";\nexport * from \"./nxTestUtils\";\nexport * from \"./projectUtils\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/nx/utils/src/index.ts"],"names":[],"mappings":";;;;AAAA,iDAAiD;AACjD,mDAAgG;AAAvF,0GAAA,eAAe,OAAA;AAAE,mGAAA,QAAQ,OAAA;AAAE,mGAAA,QAAQ,OAAA;AAAE,+FAAA,IAAI,OAAA;AAAE,qGAAA,UAAU,OAAA;AAC9D,wDAA8B;AAC9B,yDAA+B","sourcesContent":["// eslint-disable-next-line no-restricted-imports\nexport { checkFilesExist, readFile, readJson, uniq, updateFile } from \"@nrwl/nx-plugin/testing\";\nexport * from \"./nxTestUtils\";\nexport * from \"./projectUtils\";\n"]}

package/src/ast/astUtils.d.ts

@@ -1,17 +0,0 @@
-/**
- * This function removes a property with a given name from an object literal
- * provided as a text string.
- *
- * @param {string} fileContent The source code as text
- * @param {string} propertyNames The properties to remove from the object
- */
-export declare function removePropertyWithName(fileContent: string, ...propertyNames: string[]): string;
-/**
- * This function adds a new property with a given name and value to an object literal
- * provided as a text string.
- *
- * @param {string} fileContent - the source code as text
- * @param {string} propertyName - the name of the property to add
- * @param {string | string[]} propertyValue - the value of the property to add
- */
-export declare function addPropertyWithName(fileContent: string, propertyName: string, propertyValue: string | string[] | Record<string, string>): string;

package/src/ast/astUtils.js

@@ -1,78 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addPropertyWithName = exports.removePropertyWithName = void 0;
-const tslib_1 = require("tslib");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
-const ts = tslib_1.__importStar(require("typescript"));
-/**
- * This function removes a property with a given name from an object literal
- * provided as a text string.
- *
- * @param {string} fileContent The source code as text
- * @param {string} propertyNames The properties to remove from the object
- */
-function removePropertyWithName(fileContent, ...propertyNames) {
-    const sourceFile = tsquery_1.tsquery.ast(fileContent);
-    const updatedSourceFile = tsquery_1.tsquery.map(sourceFile, "ObjectLiteralExpression", node => {
-        if (ts.isObjectLiteralExpression(node)) {
-            // Filter out the given property
-            const updatedProperties = node.properties.filter(property => {
-                return !(ts.isPropertyAssignment(property) &&
-                    ts.isIdentifier(property.name) &&
-                    propertyNames.includes(property.name.text));
-            });
-            return ts.factory.createObjectLiteralExpression(updatedProperties, true);
-        }
-        return node;
-    });
-    return ts.createPrinter().printFile(updatedSourceFile);
-}
-exports.removePropertyWithName = removePropertyWithName;
-/**
- * This function adds a new property with a given name and value to an object literal
- * provided as a text string.
- *
- * @param {string} fileContent - the source code as text
- * @param {string} propertyName - the name of the property to add
- * @param {string | string[]} propertyValue - the value of the property to add
- */
-function addPropertyWithName(fileContent, propertyName, propertyValue) {
-    const sourceFile = tsquery_1.tsquery.ast(fileContent);
-    const updatedSourceFile = tsquery_1.tsquery.map(sourceFile, "ObjectLiteralExpression", node => {
-        if (ts.isObjectLiteralExpression(node)) {
-            // Add a new property to the object literal
-            let updatedProperties;
-            if (typeof propertyValue === "string") {
-                updatedProperties = [
-                    ...node.properties,
-                    ts.factory.createPropertyAssignment(ts.factory.createIdentifier(propertyName), ts.factory.createStringLiteral(propertyValue)),
-                ];
-            }
-            else if (Array.isArray(propertyValue)) {
-                const arrayLiteral = ts.factory.createArrayLiteralExpression(propertyValue.map(value => ts.factory.createStringLiteral(value)));
-                updatedProperties = [
-                    ...node.properties,
-                    ts.factory.createPropertyAssignment(ts.factory.createIdentifier(propertyName), arrayLiteral),
-                ];
-            }
-            else if (typeof propertyValue === "object") {
-                updatedProperties = [
-                    ...node.properties,
-                    ts.factory.createPropertyAssignment(ts.factory.createIdentifier(propertyName), ts.factory.createObjectLiteralExpression(createObjectLiteralElementLike(propertyValue))),
-                ];
-            }
-            return ts.factory.createObjectLiteralExpression(updatedProperties, true);
-        }
-        return node;
-    });
-    return ts.createPrinter().printFile(updatedSourceFile);
-}
-exports.addPropertyWithName = addPropertyWithName;
-function createObjectLiteralElementLike(obj) {
-    const properties = [];
-    for (const [key, value] of Object.entries(obj)) {
-        properties.push(ts.factory.createPropertyAssignment(ts.factory.createStringLiteral(key), ts.factory.createStringLiteral(value)));
-    }
-    return properties;
-}
-//# sourceMappingURL=astUtils.js.map

package/src/ast/astUtils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"astUtils.js","sourceRoot":"","sources":["../../../../../../libs/nx/utils/src/ast/astUtils.ts"],"names":[],"mappings":"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","sourcesContent":["import { tsquery } from \"@phenomnomnominal/tsquery\";\nimport * as ts from \"typescript\";\n\n/**\n * This function removes a property with a given name from an object literal\n * provided as a text string.\n *\n * @param {string} fileContent The source code as text\n * @param {string} propertyNames The properties to remove from the object\n */\nexport function removePropertyWithName(fileContent: string, ...propertyNames: string[]) {\n  const sourceFile = tsquery.ast(fileContent);\n  const updatedSourceFile = tsquery.map(sourceFile, \"ObjectLiteralExpression\", node => {\n    if (ts.isObjectLiteralExpression(node)) {\n      // Filter out the given property\n      const updatedProperties = node.properties.filter(property => {\n        return !(\n          ts.isPropertyAssignment(property) &&\n          ts.isIdentifier(property.name) &&\n          propertyNames.includes(property.name.text)\n        );\n      });\n      return ts.factory.createObjectLiteralExpression(updatedProperties, true);\n    }\n    return node;\n  });\n  return ts.createPrinter().printFile(updatedSourceFile);\n}\n\n/**\n * This function adds a new property with a given name and value to an object literal\n * provided as a text string.\n *\n * @param {string} fileContent - the source code as text\n * @param {string} propertyName - the name of the property to add\n * @param {string | string[]} propertyValue - the value of the property to add\n */\nexport function addPropertyWithName(\n  fileContent: string,\n  propertyName: string,\n  propertyValue: string | string[] | Record<string, string>\n) {\n  const sourceFile = tsquery.ast(fileContent);\n  const updatedSourceFile = tsquery.map(sourceFile, \"ObjectLiteralExpression\", node => {\n    if (ts.isObjectLiteralExpression(node)) {\n      // Add a new property to the object literal\n      let updatedProperties;\n      if (typeof propertyValue === \"string\") {\n        updatedProperties = [\n          ...node.properties,\n          ts.factory.createPropertyAssignment(\n            ts.factory.createIdentifier(propertyName),\n            ts.factory.createStringLiteral(propertyValue)\n          ),\n        ];\n      } else if (Array.isArray(propertyValue)) {\n        const arrayLiteral = ts.factory.createArrayLiteralExpression(\n          propertyValue.map(value => ts.factory.createStringLiteral(value))\n        );\n        updatedProperties = [\n          ...node.properties,\n          ts.factory.createPropertyAssignment(ts.factory.createIdentifier(propertyName), arrayLiteral),\n        ];\n      } else if (typeof propertyValue === \"object\") {\n        updatedProperties = [\n          ...node.properties,\n          ts.factory.createPropertyAssignment(\n            ts.factory.createIdentifier(propertyName),\n            ts.factory.createObjectLiteralExpression(createObjectLiteralElementLike(propertyValue))\n          ),\n        ];\n      }\n      return ts.factory.createObjectLiteralExpression(updatedProperties, true);\n    }\n    return node;\n  });\n  return ts.createPrinter().printFile(updatedSourceFile);\n}\n\nfunction createObjectLiteralElementLike(obj: Record<string, string>): ts.ObjectLiteralElementLike[] {\n  const properties: ts.ObjectLiteralElementLike[] = [];\n  for (const [key, value] of Object.entries(obj)) {\n    properties.push(\n      ts.factory.createPropertyAssignment(ts.factory.createStringLiteral(key), ts.factory.createStringLiteral(value))\n    );\n  }\n  return properties;\n}\n"]}

package/src/fileUpdater.d.ts

@@ -1,8 +0,0 @@
-import { Tree } from "@nrwl/devkit";
-/**
- *
- * @param tree File system tree
- * @param path Path to source file in the Tree
- * @param updater Function that maps the current file content to a new to be written to the Tree
- */
-export declare const updateFileInTree: (tree: Tree, path: string, updater: (fileContent: string) => string) => void;

package/src/fileUpdater.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateFileInTree = void 0;
-/**
- *
- * @param tree File system tree
- * @param path Path to source file in the Tree
- * @param updater Function that maps the current file content to a new to be written to the Tree
- */
-const updateFileInTree = (tree, path, updater) => {
-    if (!tree.exists(path)) {
-        throw new Error("File not found: " + path);
-    }
-    const fileContent = tree.read(path, "utf-8");
-    if (!fileContent) {
-        throw new Error("File is empty: " + path);
-    }
-    const result = updater(fileContent);
-    if (result !== fileContent) {
-        tree.write(path, result);
-    }
-};
-exports.updateFileInTree = updateFileInTree;
-//# sourceMappingURL=fileUpdater.js.map

package/src/fileUpdater.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fileUpdater.js","sourceRoot":"","sources":["../../../../../libs/nx/utils/src/fileUpdater.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACI,MAAM,gBAAgB,GAAG,CAAC,IAAU,EAAE,IAAY,EAAE,OAAwC,EAAE,EAAE;IACrG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;KAC5C;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;KAC3C;IACD,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAEpC,IAAI,MAAM,KAAK,WAAW,EAAE;QAC1B,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KAC1B;AACH,CAAC,CAAC;AAdW,QAAA,gBAAgB,oBAc3B","sourcesContent":["import { Tree } from \"@nrwl/devkit\";\n\n/**\n *\n * @param tree File system tree\n * @param path Path to source file in the Tree\n * @param updater Function that maps the current file content to a new to be written to the Tree\n */\nexport const updateFileInTree = (tree: Tree, path: string, updater: (fileContent: string) => string) => {\n  if (!tree.exists(path)) {\n    throw new Error(\"File not found: \" + path);\n  }\n\n  const fileContent = tree.read(path, \"utf-8\");\n  if (!fileContent) {\n    throw new Error(\"File is empty: \" + path);\n  }\n  const result = updater(fileContent);\n\n  if (result !== fileContent) {\n    tree.write(path, result);\n  }\n};\n"]}

package/src/index.d.ts

@@ -1,5 +0,0 @@
-export { checkFilesExist, readFile, readJson, uniq, updateFile } from "@nrwl/nx-plugin/testing";
-export * from "./ast/astUtils";
-export * from "./fileUpdater";
-export * from "./nxTestUtils";
-export * from "./projectUtils";

package/src/nxTestUtils.d.ts

@@ -1,7 +0,0 @@
-/**
- * Ensures that a project has been setup in the e2e directory
- * It will also copy `@nrwl` packages to the e2e directory
- * When yarn install works in nx-plugin we can replace this file.
- * - https://github.com/nrwl/nx/issues/15263
- */
-export declare const ensureNxProject: (npmPackageName: string, pluginDistPath: string) => void;

package/src/projectUtils.d.ts

@@ -1,37 +0,0 @@
-/// <reference types="node" />
-export interface ProjectDistPath {
-    package: string;
-    path: string;
-}
-/**
- * Run a command asynchronously inside the e2e directory.
- *
- * @param command command to run
- * @param projectName the name of the project in e2e directory
- * @param opts options
- */
-export declare function runCommandAsync(command: string, projectName: string, opts?: {
-    silenceError?: boolean;
-    env?: NodeJS.ProcessEnv;
-}): Promise<{
-    stdout: string;
-    stderr: string;
-}>;
-/**
- * Run a nx command asynchronously inside the e2e directory
- *
- * @param command command to run
- * @param projectName the name of the project in e2e directory
- * @param opts options
- */
-export declare function runNxCommandAsync(command: string, projectName: string, opts?: {
-    silenceError?: boolean;
-    env?: NodeJS.ProcessEnv;
-}): Promise<{
-    stdout: string;
-    stderr: string;
-}>;
-/**
- * Ensure nx projects are in package.json in tmp nxRootDir
- */
-export declare const ensureNxProjects: (dependencies: ProjectDistPath[], devDependencies: ProjectDistPath[], nxRootDir: string, packageManager?: string) => Promise<void>;