@space-arch/nx-plugin-std 1.7.0 → 1.7.1

package/dist/generators/pkg/__snapshots__/pkg-generator.spec.ts.snap

@@ -123,7 +123,7 @@ exports[`ts-reference-based not publishable package > should generate expected p
           "{options.reportsDirectory}"
         ],
         "options": {
-          "reportsDirectory": "../../../coverage/packages/foo/bar-baz"
+          "reportsDirectory": "coverage/packages/foo/bar-baz"
         }
       }
     }
@@ -210,7 +210,7 @@ exports[`ts-reference-based publishable package > should generate expected packa
           "{options.reportsDirectory}"
         ],
         "options": {
-          "reportsDirectory": "../../../coverage/packages/foo/bar-baz"
+          "reportsDirectory": "coverage/packages/foo/bar-baz"
         }
       },
       "lint": {

package/dist/generators/pkg/lib/tsReferenceBased.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tsReferenceBased.d.ts","sourceRoot":"","sources":["../../../../src/generators/pkg/lib/tsReferenceBased.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAiC,MAAM,YAAY,CAAC;AAMtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAUzD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,kBAAkB,iBA4ElE"}
+{"version":3,"file":"tsReferenceBased.d.ts","sourceRoot":"","sources":["../../../../src/generators/pkg/lib/tsReferenceBased.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAiC,MAAM,YAAY,CAAC;AAMtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAUzD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,kBAAkB,iBA6ElE"}

package/dist/generators/pkg/lib/util/deleteTsModuleSettings.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nx/devkit';
+export declare function deleteTsModuleSettings(tree: Tree, path: string): void;
+//# sourceMappingURL=deleteTsModuleSettings.d.ts.map

package/dist/generators/pkg/lib/util/deleteTsModuleSettings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deleteTsModuleSettings.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pkg/lib/util/deleteTsModuleSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAKvC,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAW9D"}

package/dist/generators/pkg/lib/util/deleteTsModuleSettings.js

@@ -0,0 +1,14 @@
+import { updateTsConfigLibJson } from "./updateTsConfigLibJson.js";
+import { updateTsConfigSpecJson } from "./updateTsConfigSpecJson.js";
+export function deleteTsModuleSettings(tree, path) {
+    updateTsConfigLibJson(tree, path, json => {
+        delete json.compilerOptions.module;
+        delete json.compilerOptions.moduleResolution;
+        return json;
+    });
+    updateTsConfigSpecJson(tree, path, json => {
+        delete json.compilerOptions.module;
+        delete json.compilerOptions.moduleResolution;
+        return json;
+    });
+}

package/dist/generators/pkg/lib/util/setJsTsOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setJsTsOptions.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pkg/lib/util/setJsTsOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAMvC,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAatD"}
+{"version":3,"file":"setJsTsOptions.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pkg/lib/util/setJsTsOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAMvC,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAMtD"}

package/dist/generators/pkg/lib/util/setJsTsOptions.js

@@ -1,15 +1,9 @@
+import { deleteTsModuleSettings } from "./deleteTsModuleSettings.js";
 import { updateArrayProperty } from "./updateArrayProperty.js";
 import { updateTsConfigLibJson } from "./updateTsConfigLibJson.js";
-import { updateTsConfigSpecJson } from "./updateTsConfigSpecJson.js";
 export function setJsTsOptions(tree, path) {
-    updateTsConfigSpecJson(tree, path, json => {
-        json.compilerOptions.module = 'nodenext';
-        json.compilerOptions.moduleResolution = 'nodenext';
-        return json;
-    });
+    deleteTsModuleSettings(tree, path);
     updateTsConfigLibJson(tree, path, json => {
-        json.compilerOptions.module = 'nodenext';
-        json.compilerOptions.moduleResolution = 'nodenext';
         updateArrayProperty(json.compilerOptions, 'types', ['node', 'vite/client']);
         return json;
     });

package/dist/generators/pkg/lib/util/setReactTsOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setReactTsOptions.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pkg/lib/util/setReactTsOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAqB,MAAM,YAAY,CAAC;AAqB1D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAmDzD"}
+{"version":3,"file":"setReactTsOptions.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pkg/lib/util/setReactTsOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAqB,MAAM,YAAY,CAAC;AAsB1D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAiDzD"}

package/dist/generators/pkg/lib/util/setReactTsOptions.js

@@ -1,4 +1,5 @@
 import { joinPathFragments } from '@nx/devkit';
+import { deleteTsModuleSettings } from "./deleteTsModuleSettings.js";
 import { updateArrayProperty } from "./updateArrayProperty.js";
 import { updateTsConfigLibJson } from "./updateTsConfigLibJson.js";
 import { updateTsConfigSpecJson } from "./updateTsConfigSpecJson.js";
@@ -18,16 +19,13 @@ const BABELRC = `
 `.trim();
 export function setReactTsOptions(tree, path) {
     tree.write(joinPathFragments(path, '.babelrc'), BABELRC);
+    deleteTsModuleSettings(tree, path);
     updateTsConfigSpecJson(tree, path, json => {
         json.compilerOptions.jsx = 'react-jsx';
-        json.compilerOptions.module = 'esnext';
-        json.compilerOptions.moduleResolution = 'bundler';
         return json;
     });
     updateTsConfigLibJson(tree, path, json => {
         json.compilerOptions.jsx = 'react-jsx';
-        json.compilerOptions.module = 'esnext';
-        json.compilerOptions.moduleResolution = 'bundler';
         updateArrayProperty(json.compilerOptions, 'types', [
             'node',
             '@nx/react/typings/cssmodule.d.ts',

package/dist/generators/zed-eslint/schema.d.ts

@@ -0,0 +1 @@
+export type ZedEslintGeneratorSchema = object;

package/dist/generators/zed-eslint/schema.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "ZedEslint",
+  "title": "",
+  "type": "object",
+  "properties": {},
+  "required": []
+}

package/dist/generators/zed-eslint/zed-eslint.d.ts

@@ -0,0 +1,5 @@
+import type { Tree } from '@nx/devkit';
+import type { ZedEslintGeneratorSchema } from './schema.js';
+export declare function zedEslintGenerator(tree: Tree, _options: ZedEslintGeneratorSchema): Promise<void>;
+export default zedEslintGenerator;
+//# sourceMappingURL=zed-eslint.d.ts.map

package/dist/generators/zed-eslint/zed-eslint.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"zed-eslint.d.ts","sourceRoot":"","sources":["../../../src/generators/zed-eslint/zed-eslint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAE5D,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,wBAAwB,iBAqBnC;AAoDD,eAAe,kBAAkB,CAAC"}

package/dist/generators/zed-eslint/zed-eslint.js

@@ -0,0 +1,37 @@
+import { getProjects, joinPathFragments, logger } from '@nx/devkit';
+export async function zedEslintGenerator(tree, _options) {
+    const projects = getProjects(tree);
+    logger.info('Listing all projects..');
+    const projectDirsSet = new Set(['./']);
+    for (const p of projects.values()) {
+        if (p.root === '.')
+            continue;
+        if (hasEslintConfig(tree, p.root)) {
+            projectDirsSet.add(`./${p.root}/`);
+        }
+    }
+    logger.info(`Collected directories: ${projectDirsSet.size}`);
+    writeDirs(tree, [...projectDirsSet].sort((a, b) => a.localeCompare(b)));
+}
+function hasEslintConfig(tree, dir) {
+    const exts = ['js', 'mjs', 'cjs', 'ts', 'mts', 'cts', 'json'];
+    return exts.some(ext => tree.exists(joinPathFragments(dir, `eslint.config.${ext}`)));
+}
+function writeDirs(tree, dirs) {
+    logger.info('Reading local zed settings.json');
+    const settings = getSettings(tree);
+    logger.info('Writing local zed settings.json');
+    Object.assign(settings.lsp.eslint.settings, { workingDirectories: dirs });
+    tree.write(joinPathFragments('.zed', 'settings.json'), JSON.stringify(settings, null, 2));
+}
+function getSettings(tree) {
+    const settingsString = tree.read(joinPathFragments('.zed', 'settings.json'), 'utf-8');
+    if (!settingsString) {
+        return { lsp: { eslint: { settings: { workingDirectories: [] } } } };
+    }
+    return JSON.parse(removeComments(settingsString));
+}
+function removeComments(jsoncString) {
+    return jsoncString.replace(/\/\/.*$/gm, '').trim();
+}
+export default zedEslintGenerator;

package/generators.json

@@ -19,6 +19,11 @@
       "factory": "./dist/generators/mv/mv-generator",
       "schema": "./dist/generators/mv/schema.json",
       "description": "mv generator"
+    },
+    "zed-eslint": {
+      "factory": "./dist/generators/zed-eslint/zed-eslint",
+      "schema": "./dist/generators/zed-eslint/schema.json",
+      "description": "zed-eslint generator"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@space-arch/nx-plugin-std",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Standard Nx plugin for Space Architects workspace",
   "main": "./dist/index.js",
   "module": "./dist/index.js",