@trackunit/nx-utils 0.0.6 → 0.0.8

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.0.8](https://github.com/Trackunit/manager/compare/nx-utils/0.0.7...nx-utils/0.0.8) (2023-04-14)
+
+## [0.0.7](https://github.com/Trackunit/manager/compare/nx-utils/0.0.6...nx-utils/0.0.7) (2023-04-14)
+
 ## [0.0.6](https://github.com/Trackunit/manager/compare/nx-utils/0.0.5...nx-utils/0.0.6) (2023-04-11)
 
 ## [0.0.5](https://github.com/Trackunit/manager/compare/nx-utils/0.0.4...nx-utils/0.0.5) (2023-04-09)

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@trackunit/nx-utils",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "main": "src/lib/index.ts",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
-  "types": "./src/index.d.ts",
   "dependencies": {
     "@phenomnomnominal/tsquery": "4.2.0",
     "tslib": "2.4.1"
   },
-  "peerDependencies": {}
+  "types": "./src/index.d.ts"
 }

package/src/ast/astUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removePropertyWithName = void 0;
+exports.addPropertyWithName = exports.removePropertyWithName = void 0;
 const tslib_1 = require("tslib");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const ts = tslib_1.__importStar(require("typescript"));
@@ -28,4 +28,38 @@ function removePropertyWithName(fileContent, propertyName) {
     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),
+                ];
+            }
+            return ts.factory.createObjectLiteralExpression(updatedProperties, true);
+        }
+        return node;
+    });
+    return ts.createPrinter().printFile(updatedSourceFile);
+}
+exports.addPropertyWithName = addPropertyWithName;
 //# sourceMappingURL=astUtils.js.map

package/src/ast/astUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"astUtils.js","sourceRoot":"","sources":["../../../../../../libs/nx/utils/src/ast/astUtils.ts"],"names":[],"mappings":";;;;AAAA,uDAAoD;AACpD,uDAAiC;AAEjC;;;;;;GAMG;AACH,SAAgB,sBAAsB,CAAC,WAAmB,EAAE,YAAoB;IAC9E,MAAM,UAAU,GAAG,iBAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,iBAAiB,GAAG,iBAAO,CAAC,GAAG,CAAC,UAAU,EAAE,yBAAyB,EAAE,IAAI,CAAC,EAAE;QAClF,IAAI,EAAE,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAAE;YACtC,gCAAgC;YAChC,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;gBAC1D,OAAO,CAAC,CACN,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC;oBACjC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAC9B,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,CACpC,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,OAAO,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC1E;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,CAAC,aAAa,EAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;AACzD,CAAC;AAjBD,wDAiBC","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} propertyName - the property to remove from the source code\n */\nexport function removePropertyWithName(fileContent: string, propertyName: 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          property.name.text === propertyName\n        );\n      });\n      return ts.factory.createObjectLiteralExpression(updatedProperties, true);\n    }\n    return node;\n  });\n  return ts.createPrinter().printFile(updatedSourceFile);\n}\n"]}
+{"version":3,"file":"astUtils.js","sourceRoot":"","sources":["../../../../../../libs/nx/utils/src/ast/astUtils.ts"],"names":[],"mappings":";;;;AAAA,uDAAoD;AACpD,uDAAiC;AAEjC;;;;;;GAMG;AACH,SAAgB,sBAAsB,CAAC,WAAmB,EAAE,YAAoB;IAC9E,MAAM,UAAU,GAAG,iBAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,iBAAiB,GAAG,iBAAO,CAAC,GAAG,CAAC,UAAU,EAAE,yBAAyB,EAAE,IAAI,CAAC,EAAE;QAClF,IAAI,EAAE,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAAE;YACtC,gCAAgC;YAChC,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;gBAC1D,OAAO,CAAC,CACN,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC;oBACjC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAC9B,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,CACpC,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,OAAO,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC1E;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,CAAC,aAAa,EAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;AACzD,CAAC;AAjBD,wDAiBC;AAED;;;;;;;GAOG;AACH,SAAgB,mBAAmB,CAAC,WAAmB,EAAE,YAAoB,EAAE,aAAgC;IAC7G,MAAM,UAAU,GAAG,iBAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,iBAAiB,GAAG,iBAAO,CAAC,GAAG,CAAC,UAAU,EAAE,yBAAyB,EAAE,IAAI,CAAC,EAAE;QAClF,IAAI,EAAE,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAAE;YACtC,2CAA2C;YAC3C,IAAI,iBAAiB,CAAC;YACtB,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;gBACrC,iBAAiB,GAAG;oBAClB,GAAG,IAAI,CAAC,UAAU;oBAClB,EAAE,CAAC,OAAO,CAAC,wBAAwB,CACjC,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,EACzC,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAC9C;iBACF,CAAC;aACH;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;gBACvC,MAAM,YAAY,GAAG,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAC1D,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAClE,CAAC;gBACF,iBAAiB,GAAG;oBAClB,GAAG,IAAI,CAAC,UAAU;oBAClB,EAAE,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;iBAC7F,CAAC;aACH;YACD,OAAO,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC1E;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,CAAC,aAAa,EAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;AACzD,CAAC;AA5BD,kDA4BC","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} propertyName - the property to remove from the source code\n */\nexport function removePropertyWithName(fileContent: string, propertyName: 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          property.name.text === propertyName\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(fileContent: string, propertyName: string, propertyValue: string | string[]) {\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      }\n      return ts.factory.createObjectLiteralExpression(updatedProperties, true);\n    }\n    return node;\n  });\n  return ts.createPrinter().printFile(updatedSourceFile);\n}\n"]}

package/src/index.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateFile = exports.uniq = exports.readJson = exports.readFile = exports.checkFilesExist = void 0;
 const tslib_1 = require("tslib");
+// eslint-disable-next-line no-restricted-imports
+var testing_1 = require("@nrwl/nx-plugin/testing");
+Object.defineProperty(exports, "checkFilesExist", { enumerable: true, get: function () { return testing_1.checkFilesExist; } });
+Object.defineProperty(exports, "readFile", { enumerable: true, get: function () { return testing_1.readFile; } });
+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("./nxTestUtils"), exports);
 tslib_1.__exportStar(require("./projectUtils"), exports);

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/nx/utils/src/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,wDAA8B;AAC9B,yDAA+B","sourcesContent":["export * from \"./ast/astUtils\";\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,yDAA+B;AAC/B,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 \"./nxTestUtils\";\nexport * from \"./projectUtils\";\n"]}

package/src/nxTestUtils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureNxProject = void 0;
+// eslint-disable-next-line no-restricted-imports
 const testing_1 = require("@nrwl/nx-plugin/testing");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");

package/src/nxTestUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"nxTestUtils.js","sourceRoot":"","sources":["../../../../../libs/nx/utils/src/nxTestUtils.ts"],"names":[],"mappings":";;;AAAA,qDAMiC;AACjC,iDAAyC;AACzC,2BAAmD;AACnD,+BAA+B;AAE/B,MAAM,OAAO,GAAG,IAAA,qBAAW,GAAE,CAAC;AAE9B,MAAM,eAAe,GAAG,CAAC,IAAa,EAAE,MAAgB,EAAE,EAAE;IAC1D,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,CAAC;IACrC,OAAO,IAAA,wBAAQ,EACb,QAAQ,OAAO,CAAC,OAAO,CACrB,IAAI,CACL,iCAAiC,WAAW,gGAC3C,IAAI,IAAI,EACV,EAAE,kBAEA,GAAG,EAAE,WAAW,IACb,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAExE,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;GAKG;AACI,MAAM,eAAe,GAAG,CAAC,cAAsB,EAAE,cAAsB,EAAE,EAAE;IAChF,IAAI,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE;QACvB,IAAA,WAAM,EAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACtC;IACD,IAAA,cAAS,EAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxC,IAAA,iBAAO,GAAE,CAAC;IACV,eAAe,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;IAChD,IAAA,mCAAyB,EAAC,cAAc,EAAE,cAAc,CAAC,CAAC;IAC1D,IAAA,oBAAU,EAAC,OAAO,GAAG,WAAW,EAAE,EAAE,CAAC,CAAC;IACtC,IAAA,kCAAwB,GAAE,CAAC;AAC7B,CAAC,CAAC;AAVW,QAAA,eAAe,mBAU1B","sourcesContent":["import {\n  cleanup,\n  patchPackageJsonForPlugin,\n  runPackageManagerInstall,\n  tmpProjPath,\n  updateFile,\n} from \"@nrwl/nx-plugin/testing\";\nimport { execSync } from \"child_process\";\nimport { existsSync, mkdirSync, rmSync } from \"fs\";\nimport { dirname } from \"path\";\n\nconst tmpPath = tmpProjPath();\n\nconst runNxNewCommand = (args?: string, silent?: boolean) => {\n  const localTmpDir = dirname(tmpPath);\n  return execSync(\n    `node ${require.resolve(\n      \"nx\"\n    )} new proj --nx-workspace-root=${localTmpDir} --no-interactive --skip-install --collection=@nrwl/workspace --npmScope=proj --preset=empty ${\n      args || \"\"\n    }`,\n    {\n      cwd: localTmpDir,\n      ...(silent && false ? { stdio: [\"ignore\", \"ignore\", \"ignore\"] } : {}),\n    }\n  );\n};\n\n/**\n * Ensures that a project has been setup in the e2e directory\n * It will also copy `@nrwl` packages to the e2e directory\n * When yarn install works in nx-plugin we can replace this file.\n * - https://github.com/nrwl/nx/issues/15263\n */\nexport const ensureNxProject = (npmPackageName: string, pluginDistPath: string) => {\n  if (existsSync(tmpPath)) {\n    rmSync(tmpPath, { recursive: true });\n  }\n  mkdirSync(tmpPath, { recursive: true });\n  cleanup();\n  runNxNewCommand(\"--package-manager=yarn\", true);\n  patchPackageJsonForPlugin(npmPackageName, pluginDistPath);\n  updateFile(tmpPath + \"yarn.lock\", \"\");\n  runPackageManagerInstall();\n};\n"]}
+{"version":3,"file":"nxTestUtils.js","sourceRoot":"","sources":["../../../../../libs/nx/utils/src/nxTestUtils.ts"],"names":[],"mappings":";;;AAAA,iDAAiD;AACjD,qDAMiC;AACjC,iDAAyC;AACzC,2BAAmD;AACnD,+BAA+B;AAE/B,MAAM,OAAO,GAAG,IAAA,qBAAW,GAAE,CAAC;AAE9B,MAAM,eAAe,GAAG,CAAC,IAAa,EAAE,MAAgB,EAAE,EAAE;IAC1D,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,CAAC;IACrC,OAAO,IAAA,wBAAQ,EACb,QAAQ,OAAO,CAAC,OAAO,CACrB,IAAI,CACL,iCAAiC,WAAW,gGAC3C,IAAI,IAAI,EACV,EAAE,kBAEA,GAAG,EAAE,WAAW,IACb,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAExE,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;GAKG;AACI,MAAM,eAAe,GAAG,CAAC,cAAsB,EAAE,cAAsB,EAAE,EAAE;IAChF,IAAI,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE;QACvB,IAAA,WAAM,EAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACtC;IACD,IAAA,cAAS,EAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxC,IAAA,iBAAO,GAAE,CAAC;IACV,eAAe,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;IAChD,IAAA,mCAAyB,EAAC,cAAc,EAAE,cAAc,CAAC,CAAC;IAC1D,IAAA,oBAAU,EAAC,OAAO,GAAG,WAAW,EAAE,EAAE,CAAC,CAAC;IACtC,IAAA,kCAAwB,GAAE,CAAC;AAC7B,CAAC,CAAC;AAVW,QAAA,eAAe,mBAU1B","sourcesContent":["// eslint-disable-next-line no-restricted-imports\nimport {\n  cleanup,\n  patchPackageJsonForPlugin,\n  runPackageManagerInstall,\n  tmpProjPath,\n  updateFile,\n} from \"@nrwl/nx-plugin/testing\";\nimport { execSync } from \"child_process\";\nimport { existsSync, mkdirSync, rmSync } from \"fs\";\nimport { dirname } from \"path\";\n\nconst tmpPath = tmpProjPath();\n\nconst runNxNewCommand = (args?: string, silent?: boolean) => {\n  const localTmpDir = dirname(tmpPath);\n  return execSync(\n    `node ${require.resolve(\n      \"nx\"\n    )} new proj --nx-workspace-root=${localTmpDir} --no-interactive --skip-install --collection=@nrwl/workspace --npmScope=proj --preset=empty ${\n      args || \"\"\n    }`,\n    {\n      cwd: localTmpDir,\n      ...(silent && false ? { stdio: [\"ignore\", \"ignore\", \"ignore\"] } : {}),\n    }\n  );\n};\n\n/**\n * Ensures that a project has been setup in the e2e directory\n * It will also copy `@nrwl` packages to the e2e directory\n * When yarn install works in nx-plugin we can replace this file.\n * - https://github.com/nrwl/nx/issues/15263\n */\nexport const ensureNxProject = (npmPackageName: string, pluginDistPath: string) => {\n  if (existsSync(tmpPath)) {\n    rmSync(tmpPath, { recursive: true });\n  }\n  mkdirSync(tmpPath, { recursive: true });\n  cleanup();\n  runNxNewCommand(\"--package-manager=yarn\", true);\n  patchPackageJsonForPlugin(npmPackageName, pluginDistPath);\n  updateFile(tmpPath + \"yarn.lock\", \"\");\n  runPackageManagerInstall();\n};\n"]}

package/src/projectUtils.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureNxProjects = exports.runNxCommandAsync = exports.runCommandAsync = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+// eslint-disable-next-line no-restricted-imports
 const testing_1 = require("@nrwl/nx-plugin/testing");
 const child_process_1 = require("child_process");
 const fs = tslib_1.__importStar(require("fs"));
 const path_1 = require("path");
 const runNxNewCommand = (nxRoot, args, silent) => {
     const localTmpDir = (0, testing_1.tmpProjPath)();
-    return (0, child_process_1.execSync)(`node ${require.resolve("@nrwl/tao")} new ${nxRoot} --nx-workspace-root=${localTmpDir} --no-interactive --skip-install --collection=@nrwl/workspace --npmScope=proj --preset=empty ${args || ""}`, Object.assign({ cwd: localTmpDir }, (silent && false ? { stdio: ["ignore", "ignore", "ignore"] } : {})));
+    return (0, child_process_1.execSync)(`node ${require.resolve("@nrwl/tao")} new ${nxRoot} --nx-workspace-root=${localTmpDir} --no-interactive --skip-install --collection=@nrwl/workspace --npmScope=proj --preset=ts ${args || ""}`, Object.assign({ cwd: localTmpDir }, (silent && false ? { stdio: ["ignore", "ignore", "ignore"] } : {})));
 };
 /**
  * Run a command asynchronously inside the e2e directory.
@@ -26,6 +27,12 @@ function runCommandAsync(command, projectName, opts = {
             cwd: (0, testing_1.tmpProjPath)(projectName),
             env: Object.assign(Object.assign({}, process.env), opts.env),
         }, (err, stdout, stderr) => {
+            if (command.includes("--verbose") || (stderr === null || stderr === void 0 ? void 0 : stderr.length) > 0) {
+                // eslint-disable-next-line no-console
+                console.log(`Stdout for cmd: ${command}:\n`, stdout);
+                // eslint-disable-next-line no-console
+                console.log(`Stderr for cmd: ${command}:\n`, stderr);
+            }
             if (!opts.silenceError && err) {
                 reject(err);
             }
@@ -57,6 +64,7 @@ function runNxCommandAsync(command, projectName, opts = {
 exports.runNxCommandAsync = runNxCommandAsync;
 const newNxProject = (nxRootDir, nxRootPath, dependencies, devDependencies, packageManager) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     runNxNewCommand(nxRootDir, `--package-manager=${packageManager}`, true);
+    updateWorkspaceLayout(nxRootPath);
     patchDistProjects(dependencies, "dependencies");
     patchDistProjects(devDependencies, "devDependencies");
     patchDistProjects(dependencies, "peerDependencies");
@@ -69,6 +77,7 @@ const newNxProject = (nxRootDir, nxRootPath, dependencies, devDependencies, pack
     patchMainPackageJson(nxRootPath, devDependencies, "dependencies");
     patchMainPackageJson(nxRootPath, devDependencies, "devDependencies");
     patchMainPackageJson(nxRootPath, devDependencies, "peerDependencies");
+    updatePackageJson(nxRootPath);
     yield runCommandAsync("yarn", nxRootDir);
 });
 function getAbsPath(distPath) {
@@ -83,6 +92,8 @@ const ensureNxProjects = (dependencies, devDependencies, nxRootDir, packageManag
         fs.rmSync(nxRootPath, { recursive: true });
     }
     fs.mkdirSync(nxRootPath, { recursive: true });
+    // eslint-disable-next-line no-console
+    console.log("Using NX root dir:", nxRootPath);
     yield newNxProject(nxRootDir, nxRootPath, dependencies, devDependencies, packageManager);
 });
 exports.ensureNxProjects = ensureNxProjects;
@@ -132,4 +143,22 @@ const patchDistProjects = (paths, type) => {
         (0, devkit_1.writeJsonFile)(absPackageJson, newPackageJson);
     }
 };
+const updateWorkspaceLayout = (nxRootPath) => {
+    const nxJsonPath = (0, path_1.join)(nxRootPath, "nx.json");
+    const nxJson = (0, devkit_1.readJsonFile)(nxJsonPath);
+    nxJson.workspaceLayout = {
+        appsDir: "apps",
+        libsDir: "libs",
+    };
+    (0, devkit_1.writeJsonFile)(nxJsonPath, nxJson);
+};
+const updatePackageJson = (nxRootPath) => {
+    const absPackageJson = (0, path_1.join)(nxRootPath, "package.json");
+    const newNxPackageJson = (0, devkit_1.readJsonFile)(absPackageJson);
+    const managerPackageJsonPath = (0, path_1.join)(__dirname, "..", "..", "..", "..", "package.json");
+    const managerPackageJson = (0, devkit_1.readJsonFile)(managerPackageJsonPath);
+    newNxPackageJson.engines = managerPackageJson.engines;
+    newNxPackageJson.volta = managerPackageJson.volta;
+    (0, devkit_1.writeJsonFile)(absPackageJson, newNxPackageJson);
+};
 //# sourceMappingURL=projectUtils.js.map

package/src/projectUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectUtils.js","sourceRoot":"","sources":["../../../../../libs/nx/utils/src/projectUtils.ts"],"names":[],"mappings":"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","sourcesContent":["import { readJsonFile, writeJsonFile } from \"@nrwl/devkit\";\nimport { fileExists, tmpProjPath } from \"@nrwl/nx-plugin/testing\";\nimport { exec, execSync } from \"child_process\";\nimport * as fs from \"fs\";\nimport { join } from \"path\";\nexport interface ProjectDistPath {\n  package: string;\n  path: string;\n}\n\nconst runNxNewCommand = (nxRoot: string, args?: string, silent?: boolean) => {\n  const localTmpDir = tmpProjPath();\n  return execSync(\n    `node ${require.resolve(\n      \"@nrwl/tao\"\n    )} new ${nxRoot} --nx-workspace-root=${localTmpDir} --no-interactive --skip-install --collection=@nrwl/workspace --npmScope=proj --preset=empty ${\n      args || \"\"\n    }`,\n    {\n      cwd: localTmpDir,\n      ...(silent && false ? { stdio: [\"ignore\", \"ignore\", \"ignore\"] } : {}),\n    }\n  );\n};\n\n/**\n * Run a command asynchronously inside the e2e directory.\n *\n * @param command command to run\n * @param projectName the name of the project in e2e directory\n * @param opts options\n */\nexport function runCommandAsync(\n  command: string,\n  projectName: string,\n  opts: { silenceError?: boolean; env?: NodeJS.ProcessEnv } = {\n    silenceError: false,\n  }\n): Promise<{ stdout: string; stderr: string }> {\n  return new Promise((resolve, reject) => {\n    exec(\n      command,\n      {\n        cwd: tmpProjPath(projectName),\n        env: { ...process.env, ...opts.env },\n      },\n      (err, stdout, stderr) => {\n        if (!opts.silenceError && err) {\n          reject(err);\n        }\n        resolve({ stdout, stderr });\n      }\n    );\n  });\n}\n\n/**\n * Run a nx command asynchronously inside the e2e directory\n *\n * @param command command to run\n * @param projectName the name of the project in e2e directory\n * @param opts options\n */\nexport function runNxCommandAsync(\n  command: string,\n  projectName: string,\n  opts: { silenceError?: boolean; env?: NodeJS.ProcessEnv } = {\n    silenceError: false,\n  }\n): Promise<{ stdout: string; stderr: string }> {\n  if (fileExists(tmpProjPath(join(projectName, \"package.json\")))) {\n    return runCommandAsync(`yarn nx ${command}`, projectName, opts);\n  } else if (process.platform === \"win32\") {\n    return runCommandAsync(`./nx.bat ${command}`, projectName, opts);\n  } else {\n    return runCommandAsync(`./nx ${command}`, projectName, opts);\n  }\n}\n\nconst newNxProject = async (\n  nxRootDir: string,\n  nxRootPath: string,\n  dependencies: ProjectDistPath[],\n  devDependencies: ProjectDistPath[],\n  packageManager: string\n) => {\n  runNxNewCommand(nxRootDir, `--package-manager=${packageManager}`, true);\n  patchDistProjects(dependencies, \"dependencies\");\n  patchDistProjects(devDependencies, \"devDependencies\");\n\n  patchDistProjects(dependencies, \"peerDependencies\");\n  patchDistProjects(devDependencies, \"peerDependencies\");\n  patchMainPackageJson(nxRootPath, dependencies, \"dependencies\", true);\n\n  patchMainPackageJson(nxRootPath, devDependencies, \"devDependencies\", true);\n\n  patchMainPackageJson(nxRootPath, dependencies, \"dependencies\");\n  patchMainPackageJson(nxRootPath, dependencies, \"devDependencies\");\n  patchMainPackageJson(nxRootPath, dependencies, \"peerDependencies\");\n\n  patchMainPackageJson(nxRootPath, devDependencies, \"dependencies\");\n  patchMainPackageJson(nxRootPath, devDependencies, \"devDependencies\");\n  patchMainPackageJson(nxRootPath, devDependencies, \"peerDependencies\");\n  await runCommandAsync(\"yarn\", nxRootDir);\n};\n\nfunction getAbsPath(distPath: string) {\n  return join(process.cwd(), distPath);\n}\n\n/**\n * Ensure nx projects are in package.json in tmp nxRootDir\n */\nexport const ensureNxProjects = async (\n  dependencies: ProjectDistPath[],\n  devDependencies: ProjectDistPath[],\n  nxRootDir: string,\n  packageManager = \"yarn\"\n) => {\n  const nxRootPath = tmpProjPath(nxRootDir);\n  if (fs.existsSync(nxRootPath)) {\n    fs.rmSync(nxRootPath, { recursive: true });\n  }\n  fs.mkdirSync(nxRootPath, { recursive: true });\n  await newNxProject(nxRootDir, nxRootPath, dependencies, devDependencies, packageManager);\n};\n\n/**\n *\n * @param paths paths\n * @param type type\n * @param forceAdd force it\n */\nconst patchMainPackageJson = (\n  testDir: string,\n  paths: ProjectDistPath[],\n  type: \"dependencies\" | \"devDependencies\" | \"peerDependencies\",\n  forceAdd = false\n) => {\n  const absPackageJson = join(testDir, \"package.json\");\n  const packageJson = readJsonFile(absPackageJson);\n  const packageDeps = packageJson?.[type] || {};\n\n  const newPackageJson = { ...packageJson };\n\n  for (const pkg of paths) {\n    const absDistPath = `file:/${getAbsPath(pkg.path)}`;\n    if (packageDeps[pkg.package] && packageDeps[pkg.package] !== absDistPath) {\n      // eslint-disable-next-line no-console\n      console.log(`Update ${pkg.package} => ${absDistPath}`);\n      packageDeps[pkg.package] = absDistPath;\n    } else if (forceAdd) {\n      // eslint-disable-next-line no-console\n      console.log(`Added ${pkg.package} => ${absDistPath}`);\n      packageDeps[pkg.package] = absDistPath;\n    }\n  }\n  newPackageJson[type] = packageDeps;\n  writeJsonFile(absPackageJson, newPackageJson);\n};\n\nconst patchDistProjects = (paths: ProjectDistPath[], type: \"dependencies\" | \"devDependencies\" | \"peerDependencies\") => {\n  for (const path of paths) {\n    const absDistPath1 = getAbsPath(path.path);\n    const absPackageJson = join(absDistPath1, \"package.json\");\n    const packageJson = readJsonFile(absPackageJson);\n    const packageDeps = packageJson?.[type] || {};\n\n    for (const pkg of paths) {\n      const absDistPath = `file:/${getAbsPath(pkg.path)}`;\n      if (packageDeps[pkg.package] && packageDeps[pkg.package] !== absDistPath) {\n        // eslint-disable-next-line no-console\n        console.log(` In ${path.package} => Update ${pkg.package} => ${absDistPath}`);\n        packageDeps[pkg.package] = absDistPath;\n      }\n    }\n    const newPackageJson = { ...packageJson };\n    newPackageJson[type] = packageDeps;\n    writeJsonFile(absPackageJson, newPackageJson);\n  }\n};\n"]}
+{"version":3,"file":"projectUtils.js","sourceRoot":"","sources":["../../../../../libs/nx/utils/src/projectUtils.ts"],"names":[],"mappings":"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","sourcesContent":["import { readJsonFile, writeJsonFile } from \"@nrwl/devkit\";\n// eslint-disable-next-line no-restricted-imports\nimport { fileExists, tmpProjPath } from \"@nrwl/nx-plugin/testing\";\nimport { exec, execSync } from \"child_process\";\nimport * as fs from \"fs\";\nimport { join } from \"path\";\nexport interface ProjectDistPath {\n  package: string;\n  path: string;\n}\n\nconst runNxNewCommand = (nxRoot: string, args?: string, silent?: boolean) => {\n  const localTmpDir = tmpProjPath();\n  return execSync(\n    `node ${require.resolve(\n      \"@nrwl/tao\"\n    )} new ${nxRoot} --nx-workspace-root=${localTmpDir} --no-interactive --skip-install --collection=@nrwl/workspace --npmScope=proj --preset=ts ${\n      args || \"\"\n    }`,\n    {\n      cwd: localTmpDir,\n      ...(silent && false ? { stdio: [\"ignore\", \"ignore\", \"ignore\"] } : {}),\n    }\n  );\n};\n\n/**\n * Run a command asynchronously inside the e2e directory.\n *\n * @param command command to run\n * @param projectName the name of the project in e2e directory\n * @param opts options\n */\nexport function runCommandAsync(\n  command: string,\n  projectName: string,\n  opts: { silenceError?: boolean; env?: NodeJS.ProcessEnv } = {\n    silenceError: false,\n  }\n): Promise<{ stdout: string; stderr: string }> {\n  return new Promise((resolve, reject) => {\n    exec(\n      command,\n      {\n        cwd: tmpProjPath(projectName),\n        env: { ...process.env, ...opts.env },\n      },\n      (err, stdout, stderr) => {\n        if (command.includes(\"--verbose\") || stderr?.length > 0) {\n          // eslint-disable-next-line no-console\n          console.log(`Stdout for cmd: ${command}:\\n`, stdout);\n          // eslint-disable-next-line no-console\n          console.log(`Stderr for cmd: ${command}:\\n`, stderr);\n        }\n        if (!opts.silenceError && err) {\n          reject(err);\n        }\n        resolve({ stdout, stderr });\n      }\n    );\n  });\n}\n\n/**\n * Run a nx command asynchronously inside the e2e directory\n *\n * @param command command to run\n * @param projectName the name of the project in e2e directory\n * @param opts options\n */\nexport function runNxCommandAsync(\n  command: string,\n  projectName: string,\n  opts: { silenceError?: boolean; env?: NodeJS.ProcessEnv } = {\n    silenceError: false,\n  }\n): Promise<{ stdout: string; stderr: string }> {\n  if (fileExists(tmpProjPath(join(projectName, \"package.json\")))) {\n    return runCommandAsync(`yarn nx ${command}`, projectName, opts);\n  } else if (process.platform === \"win32\") {\n    return runCommandAsync(`./nx.bat ${command}`, projectName, opts);\n  } else {\n    return runCommandAsync(`./nx ${command}`, projectName, opts);\n  }\n}\n\nconst newNxProject = async (\n  nxRootDir: string,\n  nxRootPath: string,\n  dependencies: ProjectDistPath[],\n  devDependencies: ProjectDistPath[],\n  packageManager: string\n) => {\n  runNxNewCommand(nxRootDir, `--package-manager=${packageManager}`, true);\n  updateWorkspaceLayout(nxRootPath);\n  patchDistProjects(dependencies, \"dependencies\");\n  patchDistProjects(devDependencies, \"devDependencies\");\n\n  patchDistProjects(dependencies, \"peerDependencies\");\n  patchDistProjects(devDependencies, \"peerDependencies\");\n  patchMainPackageJson(nxRootPath, dependencies, \"dependencies\", true);\n\n  patchMainPackageJson(nxRootPath, devDependencies, \"devDependencies\", true);\n\n  patchMainPackageJson(nxRootPath, dependencies, \"dependencies\");\n  patchMainPackageJson(nxRootPath, dependencies, \"devDependencies\");\n  patchMainPackageJson(nxRootPath, dependencies, \"peerDependencies\");\n\n  patchMainPackageJson(nxRootPath, devDependencies, \"dependencies\");\n  patchMainPackageJson(nxRootPath, devDependencies, \"devDependencies\");\n  patchMainPackageJson(nxRootPath, devDependencies, \"peerDependencies\");\n\n  updatePackageJson(nxRootPath);\n\n  await runCommandAsync(\"yarn\", nxRootDir);\n};\n\nfunction getAbsPath(distPath: string) {\n  return join(process.cwd(), distPath);\n}\n\n/**\n * Ensure nx projects are in package.json in tmp nxRootDir\n */\nexport const ensureNxProjects = async (\n  dependencies: ProjectDistPath[],\n  devDependencies: ProjectDistPath[],\n  nxRootDir: string,\n  packageManager = \"yarn\"\n) => {\n  const nxRootPath = tmpProjPath(nxRootDir);\n  if (fs.existsSync(nxRootPath)) {\n    fs.rmSync(nxRootPath, { recursive: true });\n  }\n  fs.mkdirSync(nxRootPath, { recursive: true });\n  // eslint-disable-next-line no-console\n  console.log(\"Using NX root dir:\", nxRootPath);\n  await newNxProject(nxRootDir, nxRootPath, dependencies, devDependencies, packageManager);\n};\n\n/**\n *\n * @param paths paths\n * @param type type\n * @param forceAdd force it\n */\nconst patchMainPackageJson = (\n  testDir: string,\n  paths: ProjectDistPath[],\n  type: \"dependencies\" | \"devDependencies\" | \"peerDependencies\",\n  forceAdd = false\n) => {\n  const absPackageJson = join(testDir, \"package.json\");\n  const packageJson = readJsonFile(absPackageJson);\n  const packageDeps = packageJson?.[type] || {};\n\n  const newPackageJson = { ...packageJson };\n\n  for (const pkg of paths) {\n    const absDistPath = `file:/${getAbsPath(pkg.path)}`;\n    if (packageDeps[pkg.package] && packageDeps[pkg.package] !== absDistPath) {\n      // eslint-disable-next-line no-console\n      console.log(`Update ${pkg.package} => ${absDistPath}`);\n      packageDeps[pkg.package] = absDistPath;\n    } else if (forceAdd) {\n      // eslint-disable-next-line no-console\n      console.log(`Added ${pkg.package} => ${absDistPath}`);\n      packageDeps[pkg.package] = absDistPath;\n    }\n  }\n  newPackageJson[type] = packageDeps;\n  writeJsonFile(absPackageJson, newPackageJson);\n};\n\nconst patchDistProjects = (paths: ProjectDistPath[], type: \"dependencies\" | \"devDependencies\" | \"peerDependencies\") => {\n  for (const path of paths) {\n    const absDistPath1 = getAbsPath(path.path);\n    const absPackageJson = join(absDistPath1, \"package.json\");\n    const packageJson = readJsonFile(absPackageJson);\n    const packageDeps = packageJson?.[type] || {};\n\n    for (const pkg of paths) {\n      const absDistPath = `file:/${getAbsPath(pkg.path)}`;\n      if (packageDeps[pkg.package] && packageDeps[pkg.package] !== absDistPath) {\n        // eslint-disable-next-line no-console\n        console.log(` In ${path.package} => Update ${pkg.package} => ${absDistPath}`);\n        packageDeps[pkg.package] = absDistPath;\n      }\n    }\n    const newPackageJson = { ...packageJson };\n    newPackageJson[type] = packageDeps;\n    writeJsonFile(absPackageJson, newPackageJson);\n  }\n};\nconst updateWorkspaceLayout = (nxRootPath: string) => {\n  const nxJsonPath = join(nxRootPath, \"nx.json\");\n  const nxJson = readJsonFile(nxJsonPath);\n  nxJson.workspaceLayout = {\n    appsDir: \"apps\",\n    libsDir: \"libs\",\n  };\n  writeJsonFile(nxJsonPath, nxJson);\n};\nconst updatePackageJson = (nxRootPath: string) => {\n  const absPackageJson = join(nxRootPath, \"package.json\");\n  const newNxPackageJson = readJsonFile(absPackageJson);\n  const managerPackageJsonPath = join(__dirname, \"..\", \"..\", \"..\", \"..\", \"package.json\");\n  const managerPackageJson = readJsonFile(managerPackageJsonPath);\n  newNxPackageJson.engines = managerPackageJson.engines;\n  newNxPackageJson.volta = managerPackageJson.volta;\n  writeJsonFile(absPackageJson, newNxPackageJson);\n};\n"]}