@storm-software/workspace-tools 1.241.0 → 1.243.0

package/dist/{chunk-XHH2IY66.js → chunk-RAVLTWJV.js}

@@ -18,48 +18,48 @@ var _projectnameandrootutils = require('@nx/devkit/src/generators/project-name-a
 var _js = require('@nx/js');
 var _init = require('@nx/js/src/generators/init/init'); var _init2 = _interopRequireDefault(_init);
 var _generator = require('@nx/js/src/generators/setup-verdaccio/generator'); var _generator2 = _interopRequireDefault(_generator);
-async function typeScriptLibraryGeneratorFn(tree, schema, config) {
-  const options = await normalizeOptions(tree, {
-    ...schema
+async function typeScriptLibraryGeneratorFn(tree, options, config) {
+  const normalized = await normalizeOptions(tree, {
+    ...options
   });
   const tasks = [];
   tasks.push(await _init2.default.call(void 0, tree, {
-    ...options,
-    tsConfigName: options.rootProject ? "tsconfig.json" : "tsconfig.base.json"
+    ...normalized,
+    tsConfigName: normalized.rootProject ? "tsconfig.json" : "tsconfig.base.json"
   }));
   tasks.push(_devkit.addDependenciesToPackageJson.call(void 0, tree, {}, {
     "@storm-software/workspace-tools": "latest",
     "@storm-software/testing-tools": "latest",
-    ..._nullishCoalesce(schema.devDependencies, () => ( {}))
+    ..._nullishCoalesce(options.devDependencies, () => ( {}))
   }));
-  if (options.publishable) {
+  if (normalized.publishable) {
     tasks.push(await _generator2.default.call(void 0, tree, {
-      ...options,
+      ...normalized,
       skipFormat: true
     }));
   }
   const projectConfig = {
-    root: options.directory,
+    root: normalized.directory,
     projectType: "library",
-    sourceRoot: _chunkBUXJSVJGjs.joinPaths.call(void 0, _nullishCoalesce(options.directory, () => ( "")), "src"),
+    sourceRoot: _chunkBUXJSVJGjs.joinPaths.call(void 0, _nullishCoalesce(normalized.directory, () => ( "")), "src"),
     targets: {
       build: {
-        executor: schema.buildExecutor,
+        executor: options.buildExecutor,
         outputs: [
           "{options.outputPath}"
         ],
         options: {
           entry: [
-            _chunkBUXJSVJGjs.joinPaths.call(void 0, options.projectRoot, "src", "index.ts")
+            _chunkBUXJSVJGjs.joinPaths.call(void 0, normalized.projectRoot, "src", "index.ts")
           ],
-          outputPath: getOutputPath(options),
-          tsconfig: _chunkBUXJSVJGjs.joinPaths.call(void 0, options.projectRoot, "tsconfig.json"),
-          project: _chunkBUXJSVJGjs.joinPaths.call(void 0, options.projectRoot, "package.json"),
+          outputPath: getOutputPath(normalized),
+          tsconfig: _chunkBUXJSVJGjs.joinPaths.call(void 0, normalized.projectRoot, "tsconfig.json"),
+          project: _chunkBUXJSVJGjs.joinPaths.call(void 0, normalized.projectRoot, "package.json"),
           defaultConfiguration: "production",
           platform: "neutral",
           assets: [
             {
-              input: options.projectRoot,
+              input: normalized.projectRoot,
               glob: "*.md",
               output: "/"
             },
@@ -83,19 +83,19 @@ async function typeScriptLibraryGeneratorFn(tree, schema, config) {
       }
     }
   };
-  if (schema.platform) {
-    projectConfig.targets.build.options.platform = schema.platform === "worker" ? "node" : schema.platform;
+  if (options.platform) {
+    projectConfig.targets.build.options.platform = options.platform === "worker" ? "node" : options.platform;
   }
-  _chunk7YRW5HNXjs.addProjectTag.call(void 0, projectConfig, _chunk7YRW5HNXjs.ProjectTagConstants.Platform.TAG_ID, schema.platform === "node" ? _chunk7YRW5HNXjs.ProjectTagConstants.Platform.NODE : schema.platform === "worker" ? _chunk7YRW5HNXjs.ProjectTagConstants.Platform.WORKER : schema.platform === "browser" ? _chunk7YRW5HNXjs.ProjectTagConstants.Platform.BROWSER : _chunk7YRW5HNXjs.ProjectTagConstants.Platform.NEUTRAL, {
+  _chunk7YRW5HNXjs.addProjectTag.call(void 0, projectConfig, _chunk7YRW5HNXjs.ProjectTagConstants.Platform.TAG_ID, options.platform === "node" ? _chunk7YRW5HNXjs.ProjectTagConstants.Platform.NODE : options.platform === "worker" ? _chunk7YRW5HNXjs.ProjectTagConstants.Platform.WORKER : options.platform === "browser" ? _chunk7YRW5HNXjs.ProjectTagConstants.Platform.BROWSER : _chunk7YRW5HNXjs.ProjectTagConstants.Platform.NEUTRAL, {
     overwrite: false
   });
-  createProjectTsConfigJson(tree, options);
-  _devkit.addProjectConfiguration.call(void 0, tree, options.name, projectConfig);
+  createProjectTsConfigJson(tree, normalized);
+  _devkit.addProjectConfiguration.call(void 0, tree, normalized.name, projectConfig);
   let repository = {
     type: "github",
     url: _optionalChain([config, 'optionalAccess', _ => _.repository]) || `https://github.com/${_optionalChain([config, 'optionalAccess', _2 => _2.organization]) || "storm-software"}/${_optionalChain([config, 'optionalAccess', _3 => _3.namespace]) || _optionalChain([config, 'optionalAccess', _4 => _4.name]) || "repository"}.git`
   };
-  let description = schema.description || "A package developed by Storm Software used to create modern, scalable web applications.";
+  let description = options.description || "A package developed by Storm Software used to create modern, scalable web applications.";
   if (tree.exists("package.json")) {
     const packageJson = _devkit.readJson.call(void 0, tree, "package.json");
     if (_optionalChain([packageJson, 'optionalAccess', _5 => _5.repository])) {
@@ -105,18 +105,18 @@ async function typeScriptLibraryGeneratorFn(tree, schema, config) {
       description = packageJson.description;
     }
   }
-  if (!options.importPath) {
-    options.importPath = options.name;
+  if (!normalized.importPath) {
+    normalized.importPath = normalized.name;
   }
-  const packageJsonPath = _chunkBUXJSVJGjs.joinPaths.call(void 0, options.projectRoot, "package.json");
+  const packageJsonPath = _chunkBUXJSVJGjs.joinPaths.call(void 0, normalized.projectRoot, "package.json");
   if (tree.exists(packageJsonPath)) {
     _devkit.updateJson.call(void 0, tree, packageJsonPath, (json) => {
-      if (!options.importPath) {
-        options.importPath = options.name;
+      if (!normalized.importPath) {
+        normalized.importPath = normalized.name;
       }
-      json.name = options.importPath;
+      json.name = normalized.importPath;
       json.version = "0.0.1";
-      if (json.private && (options.publishable || options.rootProject)) {
+      if (json.private && (normalized.publishable || normalized.rootProject)) {
         json.private = void 0;
       }
       return {
@@ -125,7 +125,7 @@ async function typeScriptLibraryGeneratorFn(tree, schema, config) {
         description,
         repository: {
           ...repository,
-          directory: options.projectRoot
+          directory: normalized.projectRoot
         },
         type: "module",
         dependencies: {
@@ -138,37 +138,37 @@ async function typeScriptLibraryGeneratorFn(tree, schema, config) {
     });
   } else {
     _devkit.writeJson.call(void 0, tree, packageJsonPath, {
-      name: options.importPath,
+      name: normalized.importPath,
       version: "0.0.1",
       description,
       repository: {
         ...repository,
-        directory: options.projectRoot
+        directory: normalized.projectRoot
       },
-      private: !options.publishable || options.rootProject,
+      private: !normalized.publishable || normalized.rootProject,
       type: "module",
       publishConfig: {
         access: "public"
       }
     });
   }
-  if (tree.exists("package.json") && options.importPath) {
+  if (tree.exists("package.json") && normalized.importPath) {
     _devkit.updateJson.call(void 0, tree, "package.json", (json) => ({
       ...json,
       pnpm: {
         ..._optionalChain([json, 'optionalAccess', _7 => _7.pnpm]),
         overrides: {
           ..._optionalChain([json, 'optionalAccess', _8 => _8.pnpm, 'optionalAccess', _9 => _9.overrides]),
-          [_nullishCoalesce(options.importPath, () => ( ""))]: "workspace:*"
+          [_nullishCoalesce(normalized.importPath, () => ( ""))]: "workspace:*"
         }
       }
     }));
   }
-  _js.addTsConfigPath.call(void 0, tree, options.importPath, [
-    _chunkBUXJSVJGjs.joinPaths.call(void 0, options.projectRoot, "./src", `index.${options.js ? "js" : "ts"}`)
+  _js.addTsConfigPath.call(void 0, tree, normalized.importPath, [
+    _chunkBUXJSVJGjs.joinPaths.call(void 0, normalized.projectRoot, "./src", `index.${normalized.js ? "js" : "ts"}`)
   ]);
-  _js.addTsConfigPath.call(void 0, tree, _chunkBUXJSVJGjs.joinPaths.call(void 0, options.importPath, "/*"), [
-    _chunkBUXJSVJGjs.joinPaths.call(void 0, options.projectRoot, "./src", "/*")
+  _js.addTsConfigPath.call(void 0, tree, _chunkBUXJSVJGjs.joinPaths.call(void 0, normalized.importPath, "/*"), [
+    _chunkBUXJSVJGjs.joinPaths.call(void 0, normalized.projectRoot, "./src", "/*")
   ]);
   if (tree.exists("package.json")) {
     const packageJson = _devkit.readJson.call(void 0, tree, "package.json");
@@ -179,7 +179,7 @@ async function typeScriptLibraryGeneratorFn(tree, schema, config) {
       description = packageJson.description;
     }
   }
-  const tsconfigPath = _chunkBUXJSVJGjs.joinPaths.call(void 0, options.projectRoot, "tsconfig.json");
+  const tsconfigPath = _chunkBUXJSVJGjs.joinPaths.call(void 0, normalized.projectRoot, "tsconfig.json");
   if (tree.exists(tsconfigPath)) {
     _devkit.updateJson.call(void 0, tree, tsconfigPath, (json) => {
       json.composite ??= true;
@@ -187,10 +187,10 @@ async function typeScriptLibraryGeneratorFn(tree, schema, config) {
     });
   } else {
     _devkit.writeJson.call(void 0, tree, tsconfigPath, {
-      extends: `${_devkit.offsetFromRoot.call(void 0, options.projectRoot)}tsconfig.base.json`,
+      extends: `${_devkit.offsetFromRoot.call(void 0, normalized.projectRoot)}tsconfig.base.json`,
       composite: true,
       compilerOptions: {
-        outDir: `${_devkit.offsetFromRoot.call(void 0, options.projectRoot)}dist/out-tsc`
+        outDir: `${_devkit.offsetFromRoot.call(void 0, normalized.projectRoot)}dist/out-tsc`
       },
       files: [],
       include: [
@@ -249,9 +249,13 @@ function createProjectTsConfigJson(tree, options) {
   _devkit.writeJson.call(void 0, tree, _chunkBUXJSVJGjs.joinPaths.call(void 0, options.projectRoot, "tsconfig.json"), tsconfig);
 }
 _chunk3GQAWCBQjs.__name.call(void 0, createProjectTsConfigJson, "createProjectTsConfigJson");
-async function normalizeOptions(tree, options) {
+async function normalizeOptions(tree, options, config) {
+  let importPath = options.importPath;
+  if (!importPath && _optionalChain([config, 'optionalAccess', _21 => _21.namespace])) {
+    importPath = `@${_optionalChain([config, 'optionalAccess', _22 => _22.namespace])}/${options.name}`;
+  }
   if (options.publishable) {
-    if (!options.importPath) {
+    if (!importPath) {
       throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
     }
   }
@@ -260,14 +264,14 @@ async function normalizeOptions(tree, options) {
     bundler = "none";
   }
   const { Linter } = _devkit.ensurePackage.call(void 0, "@nx/eslint", _chunkHI4G4OOGjs.nxVersion);
-  const { projectName, names: projectNames, projectRoot, importPath } = await _projectnameandrootutils.determineProjectNameAndRootOptions.call(void 0, tree, {
+  const rootProject = false;
+  const { projectName, names: projectNames, projectRoot, importPath: normalizedImportPath } = await _projectnameandrootutils.determineProjectNameAndRootOptions.call(void 0, tree, {
     name: options.name,
     projectType: "library",
     directory: options.directory,
-    importPath: options.importPath,
-    rootProject: options.rootProject
+    importPath,
+    rootProject
   });
-  options.rootProject = projectRoot === ".";
   const normalized = _devkit.names.call(void 0, projectNames.projectFileName);
   const fileName = normalized.fileName;
   return {
@@ -293,7 +297,8 @@ async function normalizeOptions(tree, options) {
     projectNames,
     projectRoot,
     parsedTags: options.tags ? options.tags.split(",").map((s) => s.trim()) : [],
-    importPath
+    importPath: normalizedImportPath,
+    rootProject
   };
 }
 _chunk3GQAWCBQjs.__name.call(void 0, normalizeOptions, "normalizeOptions");

package/dist/{chunk-LNDWWYO3.mjs → chunk-RLGZCVPW.mjs}

@@ -1,19 +1,22 @@
 import {
   normalizeOptions,
   typeScriptLibraryGeneratorFn
-} from "./chunk-5AQJQ72E.mjs";
+} from "./chunk-C2REXPET.mjs";
 import {
   withRunGenerator
 } from "./chunk-SNFZL5BN.mjs";
+import {
+  joinPaths
+} from "./chunk-2AUNU6UA.mjs";
 import {
   __dirname,
   __name
 } from "./chunk-XUV4U54K.mjs";
 
 // src/generators/browser-library/generator.ts
-import { formatFiles, generateFiles, joinPathFragments, names, offsetFromRoot } from "@nx/devkit";
+import { formatFiles, generateFiles, names, offsetFromRoot } from "@nx/devkit";
 async function browserLibraryGeneratorFn(tree, schema, config) {
-  const filesDir = joinPathFragments(__dirname, "./files");
+  const filesDir = joinPaths(__dirname, "src", "generators", "browser-library", "files");
   const tsLibraryGeneratorOptions = {
     buildExecutor: "@storm-software/workspace-tools:unbuild",
     platform: "browser",

package/dist/{chunk-U4K5KWKS.mjs → chunk-T2NTGJ6O.mjs}

@@ -1,22 +1,25 @@
 import {
   normalizeOptions,
   typeScriptLibraryGeneratorFn
-} from "./chunk-5AQJQ72E.mjs";
+} from "./chunk-C2REXPET.mjs";
 import {
   typesNodeVersion
 } from "./chunk-EK75QNMS.mjs";
 import {
   withRunGenerator
 } from "./chunk-SNFZL5BN.mjs";
+import {
+  joinPaths
+} from "./chunk-2AUNU6UA.mjs";
 import {
   __dirname,
   __name
 } from "./chunk-XUV4U54K.mjs";
 
 // src/generators/node-library/generator.ts
-import { formatFiles, generateFiles, joinPathFragments, names, offsetFromRoot } from "@nx/devkit";
+import { formatFiles, generateFiles, names, offsetFromRoot } from "@nx/devkit";
 async function nodeLibraryGeneratorFn(tree, schema, config) {
-  const filesDir = joinPathFragments(__dirname, "./files");
+  const filesDir = joinPaths(__dirname, "src", "generators", "node-library", "files");
   const tsLibraryGeneratorOptions = {
     platform: "node",
     devDependencies: {

package/dist/{chunk-3SP4ZXOA.mjs → chunk-UHNTJRTW.mjs}

@@ -1,19 +1,22 @@
 import {
   normalizeOptions,
   typeScriptLibraryGeneratorFn
-} from "./chunk-5AQJQ72E.mjs";
+} from "./chunk-C2REXPET.mjs";
 import {
   withRunGenerator
 } from "./chunk-SNFZL5BN.mjs";
+import {
+  joinPaths
+} from "./chunk-2AUNU6UA.mjs";
 import {
   __dirname,
   __name
 } from "./chunk-XUV4U54K.mjs";
 
 // src/generators/neutral-library/generator.ts
-import { formatFiles, generateFiles, joinPathFragments, names, offsetFromRoot } from "@nx/devkit";
+import { formatFiles, generateFiles, names, offsetFromRoot } from "@nx/devkit";
 async function neutralLibraryGeneratorFn(tree, schema, config) {
-  const filesDir = joinPathFragments(__dirname, "./files");
+  const filesDir = joinPaths(__dirname, "src", "generators", "neutral-library", "files");
   const tsLibraryGeneratorOptions = {
     ...schema,
     platform: "neutral",

package/dist/executors.js

@@ -29,10 +29,10 @@ require('./chunk-RSILHGEU.js');
 var _chunkYSYBVJGRjs = require('./chunk-YSYBVJGR.js');
 
 
-var _chunkYWKUJJ34js = require('./chunk-YWKUJJ34.js');
+var _chunkHONSACRTjs = require('./chunk-HONSACRT.js');
 
 
-var _chunkHONSACRTjs = require('./chunk-HONSACRT.js');
+var _chunkYWKUJJ34js = require('./chunk-YWKUJJ34.js');
 
 
 var _chunkK7QVZAWDjs = require('./chunk-K7QVZAWD.js');

package/dist/executors.mjs

@@ -27,12 +27,12 @@ import "./chunk-EUCOXCI2.mjs";
 import {
   cargoBuildExecutor
 } from "./chunk-TGDWEUKX.mjs";
-import {
-  cargoClippyExecutor
-} from "./chunk-5XF4CY7D.mjs";
 import {
   cargoCheckExecutor
 } from "./chunk-UI3SQYV3.mjs";
+import {
+  cargoClippyExecutor
+} from "./chunk-5XF4CY7D.mjs";
 import {
   cargoDocExecutor
 } from "./chunk-ZERO7WV2.mjs";

package/dist/generator-AFivysTp.d.ts

@@ -0,0 +1,130 @@
+import { e as BaseGeneratorResult } from './types-DpaECebR.js';
+import * as _nx_devkit from '@nx/devkit';
+import { Tree } from '@nx/devkit';
+import { S as StormConfig } from './types-B5IG4iSJ.js';
+
+// Generated by @storm-software/untyped
+// Do not edit this file directly
+
+interface NeutralLibraryGeneratorSchema {
+ /**
+  * Directory
+  * 
+  * The directory to create the library in
+  * 
+ */
+ directory: string,
+
+ /**
+  * Name
+  * 
+  * The name of the library
+  * 
+ */
+ name: string,
+
+ /**
+  * Description
+  * 
+  * The description of the library
+  * 
+ */
+ description?: string,
+
+ /**
+  * Build Executor
+  * 
+  * The executor to use for building the library
+  * 
+  * @default "@storm-software/workspace-tools:unbuild"
+ */
+ buildExecutor?: string,
+
+ /**
+  * Platform
+  * 
+  * The platform to target with the library
+  * 
+  * @default "neutral"
+  * 
+  * @enum neutral
+ */
+ platform?: string,
+
+ /**
+  * Import Path
+  * 
+  * The import path for the library
+  * 
+ */
+ importPath?: string,
+
+ /**
+  * Tags
+  * 
+  * The tags for the library
+  * 
+ */
+ tags?: string,
+
+ /**
+  * Unit Test Runner
+  * 
+  * The unit test runner to use
+  * 
+  * 
+  * @enum jest,vitest,none
+ */
+ unitTestRunner?: string,
+
+ /**
+  * Test Environment
+  * 
+  * The test environment to use
+  * 
+  * 
+  * @enum jsdom,node
+ */
+ testEnvironment?: string,
+
+ /**
+  * Pascal Case Files
+  * 
+  * Use PascalCase for file names
+  * 
+  * @default false
+ */
+ pascalCaseFiles?: boolean,
+
+ /**
+  * Strict
+  * 
+  * Enable strict mode
+  * 
+  * @default true
+ */
+ strict?: boolean,
+
+ /**
+  * Publishable
+  * 
+  * Make the library publishable
+  * 
+  * @default false
+ */
+ publishable?: boolean,
+
+ /**
+  * Buildable
+  * 
+  * Make the library buildable
+  * 
+  * @default true
+ */
+ buildable?: boolean,
+}
+
+declare function neutralLibraryGeneratorFn(tree: Tree, schema: NeutralLibraryGeneratorSchema, config?: StormConfig): Promise<null>;
+declare const _default: (tree: Tree, _options: NeutralLibraryGeneratorSchema) => Promise<_nx_devkit.GeneratorCallback | BaseGeneratorResult>;
+
+export { type NeutralLibraryGeneratorSchema as N, _default as _, neutralLibraryGeneratorFn as n };

package/dist/generator-BAbOohf7.d.mts

@@ -0,0 +1,130 @@
+import { e as BaseGeneratorResult } from './types-44XkV3HO.mjs';
+import * as _nx_devkit from '@nx/devkit';
+import { Tree } from '@nx/devkit';
+import { S as StormConfig } from './types-B5IG4iSJ.mjs';
+
+// Generated by @storm-software/untyped
+// Do not edit this file directly
+
+interface NodeLibraryGeneratorSchema {
+ /**
+  * Directory
+  * 
+  * The directory to create the library in
+  * 
+ */
+ directory: string,
+
+ /**
+  * Name
+  * 
+  * The name of the library
+  * 
+ */
+ name: string,
+
+ /**
+  * Description
+  * 
+  * The description of the library
+  * 
+ */
+ description?: string,
+
+ /**
+  * Build Executor
+  * 
+  * The executor to use for building the library
+  * 
+  * @default "@storm-software/workspace-tools:unbuild"
+ */
+ buildExecutor?: string,
+
+ /**
+  * Platform
+  * 
+  * The platform to target with the library
+  * 
+  * @default "node"
+  * 
+  * @enum node,neutral
+ */
+ platform?: string,
+
+ /**
+  * Import Path
+  * 
+  * The import path for the library
+  * 
+ */
+ importPath?: string,
+
+ /**
+  * Tags
+  * 
+  * The tags for the library
+  * 
+ */
+ tags?: string,
+
+ /**
+  * Unit Test Runner
+  * 
+  * The unit test runner to use
+  * 
+  * 
+  * @enum jest,vitest,none
+ */
+ unitTestRunner?: string,
+
+ /**
+  * Test Environment
+  * 
+  * The test environment to use
+  * 
+  * 
+  * @enum jsdom,node
+ */
+ testEnvironment?: string,
+
+ /**
+  * Pascal Case Files
+  * 
+  * Use PascalCase for file names
+  * 
+  * @default false
+ */
+ pascalCaseFiles?: boolean,
+
+ /**
+  * Strict
+  * 
+  * Enable strict mode
+  * 
+  * @default true
+ */
+ strict?: boolean,
+
+ /**
+  * Publishable
+  * 
+  * Make the library publishable
+  * 
+  * @default false
+ */
+ publishable?: boolean,
+
+ /**
+  * Buildable
+  * 
+  * Make the library buildable
+  * 
+  * @default true
+ */
+ buildable?: boolean,
+}
+
+declare function nodeLibraryGeneratorFn(tree: Tree, schema: NodeLibraryGeneratorSchema, config?: StormConfig): Promise<null>;
+declare const _default: (tree: Tree, _options: NodeLibraryGeneratorSchema) => Promise<_nx_devkit.GeneratorCallback | BaseGeneratorResult>;
+
+export { type NodeLibraryGeneratorSchema as N, _default as _, nodeLibraryGeneratorFn as n };