@aneuhold/core-ts-lib 2.2.7 → 2.2.8

package/lib/services/PackageService.ts

@@ -22,61 +22,187 @@ export default class PackageService {
    * project has any pending changes first, then update the version of the
    * jsr.json to match the package.json file, then run the
    * `jsr publish --dry-run` command, and finally cleanup the changes made.
+   *
+   * @param alternativePackageNames Optional array of alternative package names to validate publishing under
+   *
+   * **Warning:** This method uses simple string replacement for package names, which may have unintended effects
+   * if the package name appears in unexpected places. Use with caution.
    */
-  static async validateJsrPublish(): Promise<void> {
+  static async validateJsrPublish(alternativePackageNames?: string[]): Promise<void> {
     if (await FileSystemService.hasPendingChanges()) {
       DR.logger.error('Please commit or stash your changes before publishing.');
       process.exit(1);
     }
-    await PackageService.replaceMonorepoImportsWithNpmSpecifiers();
-    const { packageName, version: currentVersion } =
-      await PackageService.updateJsrFromPackageJson();
-    const successfulDryRun = await PackageService.publishJsrDryRun(
-      packageName,
-      currentVersion
-    );
-    await PackageService.revertGitChanges();
 
-    if (!successfulDryRun) {
-      process.exit(1);
-    } else {
-      DR.logger.success('Successfully validated JSR publishing.');
+    const { packageName: originalPackageName } = await PackageService.getPackageInfo();
+    const packageNamesToValidate = [originalPackageName, ...(alternativePackageNames || [])];
+
+    for (const packageName of packageNamesToValidate) {
+      const isAlternativeName = packageName !== originalPackageName;
+
+      DR.logger.info(`Validating JSR publishing for package: ${packageName}`);
+
+      if (isAlternativeName) {
+        await PackageService.replacePackageName(originalPackageName, packageName);
+      }
+
+      await PackageService.replaceMonorepoImportsWithNpmSpecifiers();
+      const { version: currentVersion } = await PackageService.updateJsrFromPackageJson();
+      const successfulDryRun = await PackageService.publishJsrDryRun(packageName, currentVersion);
+
+      await PackageService.resetGitChanges();
+
+      if (!successfulDryRun) {
+        process.exit(1);
+      }
     }
+
+    DR.logger.success('Successfully validated JSR publishing for all package names.');
   }
 
-  static async publishToJsr(): Promise<void> {
+  /**
+   * Publishes the current project to JSR.
+   *
+   * @param alternativePackageNames Optional array of alternative package names to publish under
+   *
+   * **Warning:** This method uses simple string replacement for package names, which may have unintended effects
+   * if the package name appears in unexpected places. Use with caution.
+   */
+  static async publishToJsr(alternativePackageNames?: string[]): Promise<void> {
     if (await FileSystemService.hasPendingChanges()) {
       DR.logger.error('Please commit or stash your changes before publishing.');
       process.exit(1);
     }
-    await PackageService.replaceMonorepoImportsWithNpmSpecifiers();
-    await PackageService.updateJsrFromPackageJson();
-    const result = await PackageService.publishJsr();
-    await PackageService.revertGitChanges();
 
-    if (!result) {
-      process.exit(1);
-    } else {
-      DR.logger.success('Successfully published to JSR.');
+    const { packageName: originalPackageName } = await PackageService.getPackageInfo();
+    const packageNamesToPublish = [originalPackageName, ...(alternativePackageNames || [])];
+
+    for (const packageName of packageNamesToPublish) {
+      const isAlternativeName = packageName !== originalPackageName;
+
+      DR.logger.info(`Publishing to JSR for package: ${packageName}`);
+
+      if (isAlternativeName) {
+        await PackageService.replacePackageName(originalPackageName, packageName);
+      }
+
+      await PackageService.replaceMonorepoImportsWithNpmSpecifiers();
+      await PackageService.updateJsrFromPackageJson();
+      const result = await PackageService.publishJsr();
+
+      await PackageService.resetGitChanges();
+
+      if (!result) {
+        process.exit(1);
+      }
     }
+
+    DR.logger.success('Successfully published to JSR for all package names.');
   }
 
   /**
    * Validates the current project for publishing to npm. This will run
    * `npm publish --access public --dry-run` and check for version conflicts
    * on the npm registry.
+   *
+   * @param alternativePackageNames Optional array of alternative package names to validate publishing under
+   *
+   * **Warning:** This method uses simple string replacement for package names, which may have unintended effects
+   * if the package name appears in unexpected places. Use with caution.
    */
-  static async validateNpmPublish(): Promise<void> {
-    const { packageName, version: currentVersion } =
+  static async validateNpmPublish(alternativePackageNames?: string[]): Promise<void> {
+    if (await FileSystemService.hasPendingChanges()) {
+      DR.logger.error('Please commit or stash your changes before publishing.');
+      process.exit(1);
+    }
+
+    const { packageName: originalPackageName, version: currentVersion } =
       await PackageService.getPackageInfo();
+    const packageNamesToValidate = [originalPackageName, ...(alternativePackageNames || [])];
+
+    for (const packageName of packageNamesToValidate) {
+      const isAlternativeName = packageName !== originalPackageName;
+
+      DR.logger.info(`Validating npm publishing for package: ${packageName}`);
+
+      if (isAlternativeName) {
+        await PackageService.replacePackageName(originalPackageName, packageName);
+      }
+
+      const successfulDryRun = await PackageService.publishNpmDryRun();
+      if (!successfulDryRun) {
+        if (isAlternativeName) {
+          await PackageService.resetGitChanges();
+        }
+        process.exit(1);
+      }
+
+      await PackageService.checkNpmVersionConflicts(packageName, currentVersion);
+
+      if (isAlternativeName) {
+        await PackageService.resetGitChanges();
+      }
+    }
+
+    DR.logger.success('Successfully validated npm publishing for all package names.');
+  }
 
-    const successfulDryRun = await PackageService.publishNpmDryRun();
-    if (!successfulDryRun) {
+  /**
+   * Publishes the current project to npm.
+   *
+   * @param alternativePackageNames Optional array of alternative package names to publish under
+   *
+   * **Warning:** This method uses simple string replacement for package names, which may have unintended effects
+   * if the package name appears in unexpected places. Use with caution.
+   */
+  static async publishToNpm(alternativePackageNames?: string[]): Promise<void> {
+    if (await FileSystemService.hasPendingChanges()) {
+      DR.logger.error('Please commit or stash your changes before publishing.');
       process.exit(1);
     }
 
-    await PackageService.checkNpmVersionConflicts(packageName, currentVersion);
-    DR.logger.success('Successfully validated npm publishing.');
+    const { packageName: originalPackageName } = await PackageService.getPackageInfo();
+    const packageNamesToPublish = [originalPackageName, ...(alternativePackageNames || [])];
+
+    for (const packageName of packageNamesToPublish) {
+      const isAlternativeName = packageName !== originalPackageName;
+
+      DR.logger.info(`Publishing to npm for package: ${packageName}`);
+
+      if (isAlternativeName) {
+        await PackageService.replacePackageName(originalPackageName, packageName);
+      }
+
+      const result = await PackageService.publishNpm();
+
+      if (isAlternativeName) {
+        await PackageService.resetGitChanges();
+      }
+
+      if (!result) {
+        process.exit(1);
+      }
+    }
+
+    DR.logger.success('Successfully published to npm for all package names.');
+  }
+
+  /**
+   * Test method for string replacement functionality. This method allows testing
+   * the string replacement behavior without performing actual publishing operations.
+   *
+   * @param originalString The original string to replace
+   * @param newString The new string to replace it with
+   *
+   * **Warning:** This method uses simple string replacement, which may have unintended effects
+   * if the string appears in unexpected places. Use with caution.
+   */
+  static async testStringReplacement(originalString: string, newString: string): Promise<void> {
+    DR.logger.info(`Testing string replacement from "${originalString}" to "${newString}"`);
+
+    await PackageService.replacePackageName(originalString, newString);
+
+    DR.logger.info('Test completed - package name replacement has been applied');
   }
 
   /**
@@ -101,9 +227,7 @@ export default class PackageService {
 
     try {
       const { packageName, version } = await PackageService.getPackageInfo();
-      const packageJsonData = JSON.parse(
-        await readFile(packageJsonPath, 'utf-8')
-      ) as PackageJson;
+      const packageJsonData = JSON.parse(await readFile(packageJsonPath, 'utf-8')) as PackageJson;
       const jsrJsonData = JSON.parse(
         await readFile(jsrJsonPath, 'utf-8')
       ) as JsonWithVersionProperty;
@@ -112,15 +236,10 @@ export default class PackageService {
       jsrJsonData.version = version;
 
       // Resolve wildcard dependencies in package.json for JSR compatibility
-      await this.resolveWildcardDependenciesInPackageJson(
-        packageJsonData,
-        packageJsonPath
-      );
+      await this.resolveWildcardDependenciesInPackageJson(packageJsonData, packageJsonPath);
 
       await writeFile(jsrJsonPath, JSON.stringify(jsrJsonData, null, 2));
-      DR.logger.info(
-        'Updated jsr.json from package.json to version ' + version
-      );
+      DR.logger.info('Updated jsr.json from package.json to version ' + version);
 
       return {
         packageName,
@@ -128,9 +247,7 @@ export default class PackageService {
       };
     } catch (error) {
       const errorString = ErrorUtils.getErrorString(error);
-      DR.logger.error(
-        `Failed to update jsr.json from package.json: ${errorString}`
-      );
+      DR.logger.error(`Failed to update jsr.json from package.json: ${errorString}`);
       throw error;
     }
   }
@@ -152,16 +269,13 @@ export default class PackageService {
       const childPackages = await DependencyService.getChildPackageJsons('../');
 
       // Helper function to resolve dependencies
-      const resolveDependencies = (
-        deps: Record<string, string> | undefined
-      ): void => {
+      const resolveDependencies = (deps: Record<string, string> | undefined): void => {
         if (!deps) return;
 
         for (const [depName, depVersion] of Object.entries(deps)) {
           if (depVersion === '*' && depName in childPackages) {
             // Replace wildcard with "*" + actual version from the monorepo
-            deps[depName] =
-              `*${childPackages[depName].packageJsonContents.version}`;
+            deps[depName] = `*${childPackages[depName].packageJsonContents.version}`;
           }
         }
       };
@@ -173,19 +287,12 @@ export default class PackageService {
       resolveDependencies(packageJsonData.optionalDependencies);
 
       // Write the updated package.json
-      await writeFile(
-        packageJsonPath,
-        JSON.stringify(packageJsonData, null, 2)
-      );
+      await writeFile(packageJsonPath, JSON.stringify(packageJsonData, null, 2));
 
-      DR.logger.info(
-        'Resolved wildcard dependencies in package.json for JSR compatibility'
-      );
+      DR.logger.info('Resolved wildcard dependencies in package.json for JSR compatibility');
     } catch (error) {
       const errorString = ErrorUtils.getErrorString(error);
-      DR.logger.error(
-        `Failed to resolve wildcard dependencies: ${errorString}`
-      );
+      DR.logger.error(`Failed to resolve wildcard dependencies: ${errorString}`);
       throw error;
     }
   }
@@ -208,17 +315,13 @@ export default class PackageService {
 
     DR.logger.info('Running `jsr publish --dry-run`');
     try {
-      const { stdout, stderr } = await execAsync(
-        'jsr publish --allow-dirty --dry-run'
-      );
+      const { stdout, stderr } = await execAsync('jsr publish --allow-dirty --dry-run');
       if (stderr) {
         DR.logger.info(stderr);
       }
       DR.logger.info(stdout);
     } catch (error) {
-      DR.logger.error(
-        `Failed to run 'jsr publish --dry-run': ${ErrorUtils.getErrorString(error)}`
-      );
+      DR.logger.error(`Failed to run 'jsr publish --dry-run': ${ErrorUtils.getErrorString(error)}`);
       return false;
     }
     return true;
@@ -266,9 +369,7 @@ export default class PackageService {
     }
 
     try {
-      const packageJsonData = JSON.parse(
-        await readFile(packageJsonPath, 'utf-8')
-      ) as PackageJson;
+      const packageJsonData = JSON.parse(await readFile(packageJsonPath, 'utf-8')) as PackageJson;
 
       return {
         packageName: packageJsonData.name,
@@ -309,9 +410,7 @@ export default class PackageService {
     packageName: string,
     currentVersion: string
   ): Promise<void> {
-    DR.logger.info(
-      `Checking npm registry for existing versions of ${packageName}...`
-    );
+    DR.logger.info(`Checking npm registry for existing versions of ${packageName}...`);
 
     try {
       const { stdout } = await execAsync(`npm view ${packageName}`);
@@ -320,28 +419,19 @@ export default class PackageService {
       const latestVersionMatch = stdout.match(/latest:\s*([^\s|]+)/);
       if (latestVersionMatch) {
         const latestVersion = latestVersionMatch[1];
-        PackageService.checkVersionConflict(
-          currentVersion,
-          latestVersion,
-          'npm'
-        );
+        PackageService.checkVersionConflict(currentVersion, latestVersion, 'npm');
       }
     } catch (error) {
       const errorString = ErrorUtils.getErrorString(error);
 
       // If the package doesn't exist on npm, that's fine for first publish
       if (errorString.includes('404') || errorString.includes('not found')) {
-        DR.logger.info(
-          'Package not found on npm - this appears to be a first publish.'
-        );
+        DR.logger.info('Package not found on npm - this appears to be a first publish.');
         return;
       }
 
       // Re-throw version conflict errors
-      if (
-        errorString.includes('already exists') ||
-        errorString.includes('is lower than')
-      ) {
+      if (errorString.includes('already exists') || errorString.includes('is lower than')) {
         throw error;
       }
 
@@ -415,9 +505,7 @@ export default class PackageService {
     // Get all TypeScript files in the src directory
     const allFiles = await FileSystemService.getAllFilePathsRelative(srcDir);
     const tsFiles = allFiles
-      .filter(
-        (filePath) => filePath.endsWith('.ts') && !filePath.endsWith('.spec.ts')
-      )
+      .filter((filePath) => filePath.endsWith('.ts') && !filePath.endsWith('.spec.ts'))
       .map((filePath) => path.join(srcDir, filePath));
 
     DR.logger.info(
@@ -459,9 +547,7 @@ export default class PackageService {
           );
         }
       } catch (error) {
-        DR.logger.error(
-          `Failed to process file ${filePath}: ${ErrorUtils.getErrorString(error)}`
-        );
+        DR.logger.error(`Failed to process file ${filePath}: ${ErrorUtils.getErrorString(error)}`);
       }
     }
 
@@ -470,19 +556,6 @@ export default class PackageService {
     );
   }
 
-  private static async revertGitChanges(): Promise<void> {
-    DR.logger.info(
-      'Reverting changes made to jsr.json, package.json, and source files'
-    );
-    try {
-      await execAsync('git checkout -- jsr.json package.json src/');
-    } catch (error) {
-      DR.logger.error(
-        `Failed to revert changes: ${ErrorUtils.getErrorString(error)}`
-      );
-    }
-  }
-
   /**
    * Checks for version conflicts on JSR by looking up the current package
    * and comparing versions. Throws an error if the current version already
@@ -505,31 +578,19 @@ export default class PackageService {
       if (latestVersionMatch) {
         const latestVersion = latestVersionMatch[1];
 
-        PackageService.checkVersionConflict(
-          currentVersion,
-          latestVersion,
-          'JSR'
-        );
+        PackageService.checkVersionConflict(currentVersion, latestVersion, 'JSR');
       }
     } catch (error) {
       const errorString = ErrorUtils.getErrorString(error);
 
       // If the package doesn't exist on JSR, that's fine for first publish
-      if (
-        errorString.includes('Package not found') ||
-        errorString.includes('404')
-      ) {
-        DR.logger.info(
-          'Package not found on JSR - this appears to be a first publish.'
-        );
+      if (errorString.includes('Package not found') || errorString.includes('404')) {
+        DR.logger.info('Package not found on JSR - this appears to be a first publish.');
         return;
       }
 
       // Re-throw version conflict errors
-      if (
-        errorString.includes('already exists') ||
-        errorString.includes('is lower than')
-      ) {
+      if (errorString.includes('already exists') || errorString.includes('is lower than')) {
         throw error;
       }
 
@@ -555,10 +616,7 @@ export default class PackageService {
     );
 
     // Compare versions using semver-like comparison
-    const comparison = StringService.compareSemanticVersions(
-      currentVersion,
-      latestVersion
-    );
+    const comparison = StringService.compareSemanticVersions(currentVersion, latestVersion);
 
     if (comparison === 0) {
       throw new Error(
@@ -572,4 +630,68 @@ export default class PackageService {
 
     DR.logger.info('Version check passed - ready to publish.');
   }
+
+  /**
+   * Replaces the package name in all files in the root directory, but no child directories,
+   * with a new name.
+   *
+   * @param originalPackageName The original package name to replace
+   * @param newPackageName The new package name to use
+   */
+  private static async replacePackageName(
+    originalPackageName: string,
+    newPackageName: string
+  ): Promise<void> {
+    DR.logger.info(`Replacing package name from "${originalPackageName}" to "${newPackageName}"`);
+
+    const rootDir = process.cwd();
+
+    // Replace in all files in the root directory
+    await FileSystemService.replaceInFiles({
+      searchString: originalPackageName,
+      replaceString: newPackageName,
+      rootPath: rootDir,
+      includePatterns: ['*'],
+      excludePatterns: []
+    });
+
+    DR.logger.info(`Successfully replaced package name in configuration files`);
+  }
+
+  /**
+   * Performs a git reset to discard all changes in the working directory.
+   * This is used between alternative package name operations.
+   */
+  private static async resetGitChanges(): Promise<void> {
+    DR.logger.info('Resetting git changes');
+    try {
+      await execAsync('git reset --hard HEAD');
+    } catch (error) {
+      DR.logger.error(`Failed to reset git changes: ${ErrorUtils.getErrorString(error)}`);
+      throw error;
+    }
+  }
+
+  /**
+   * Publishes the current project to npm.
+   *
+   * @returns true if the publish was successful, false otherwise.
+   */
+  private static async publishNpm(): Promise<boolean> {
+    DR.logger.info('Running `npm publish --access public`');
+    return new Promise((resolve) => {
+      const child = spawn('npm publish', ['--access', 'public'], {
+        stdio: 'inherit',
+        shell: true
+      });
+
+      child.on('exit', (code) => {
+        if (code === 0) {
+          resolve(true);
+        } else {
+          resolve(false);
+        }
+      });
+    });
+  }
 }

package/lib/utils/ErrorUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ErrorUtils.d.ts","sourceRoot":"","sources":["../../src/utils/ErrorUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM;IAUlE;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAI/D;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM;CAS9C"}
+{"version":3,"file":"ErrorUtils.d.ts","sourceRoot":"","sources":["../../src/utils/ErrorUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM;IAQlE;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAI/D;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM;CAS9C"}

package/lib/utils/ErrorUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ErrorUtils.js","sourceRoot":"","sources":["../../src/utils/ErrorUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,SAAmB,EAAE,eAAuB;QAChE,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,WAAW,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;QACrC,CAAC;QACD,MAAM,IAAI,KAAK,CACb,GAAG,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAC5D,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,YAAoB,EAAE,eAAuB;QAC7D,UAAU,CAAC,cAAc,CAAC,CAAC,YAAY,CAAC,EAAE,eAAe,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,KAAc;QAClC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC,OAAO,CAAC;QACvB,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACrC,OAAO,KAAK,CAAC;QACf,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"ErrorUtils.js","sourceRoot":"","sources":["../../src/utils/ErrorUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,SAAmB,EAAE,eAAuB;QAChE,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,WAAW,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;QACrC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,GAAG,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,YAAoB,EAAE,eAAuB;QAC7D,UAAU,CAAC,cAAc,CAAC,CAAC,YAAY,CAAC,EAAE,eAAe,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,KAAc;QAClC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC,OAAO,CAAC;QACvB,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACrC,OAAO,KAAK,CAAC;QACf,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;CACF"}

package/lib/utils/ErrorUtils.ts

@@ -13,9 +13,7 @@ export default class ErrorUtils {
     for (let i = 0; i < errorList.length; i += 1) {
       errorString += `${errorList[i]}\n`;
     }
-    throw new Error(
-      `${errorString}${JSON.stringify(erroneousObject, null, 2)}`
-    );
+    throw new Error(`${errorString}${JSON.stringify(erroneousObject, null, 2)}`);
   }
 
   /**

package/package.json

@@ -2,7 +2,7 @@
   "name": "@aneuhold/core-ts-lib",
   "author": "Anton G. Neuhold Jr.",
   "license": "MIT",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "description": "A core library for all of my TypeScript projects",
   "type": "module",
   "scripts": {

package/lib/services/DateService/DateService.spec.ts

@@ -1,98 +0,0 @@
-import DateService from './DateService.js';
-
-describe('DateService', () => {
-  describe('addWeeks', () => {
-    it('should successfully add weeks to a date', () => {
-      const result = DateService.addWeeks(new Date(2024, 0, 1), 1);
-      expect(result).toEqual(new Date(2024, 0, 8));
-    });
-
-    it('should successfully add weeks to a date that crosses months', () => {
-      const result = DateService.addWeeks(new Date(2024, 0, 23), 2);
-      expect(result).toEqual(new Date(2024, 1, 6));
-    });
-
-    it('should successfully add weeks to a date that crosses years', () => {
-      const result = DateService.addWeeks(new Date(2024, 11, 25), 1);
-      expect(result).toEqual(new Date(2025, 0, 1));
-    });
-  });
-
-  describe('getWeekOfMonth', () => {
-    it('should successfully get the week of month for a date', () => {
-      const result = DateService.getWeekOfMonth(new Date(2024, 0, 14));
-      expect(result).toEqual(3);
-
-      const result2 = DateService.getWeekOfMonth(new Date(2024, 0, 1));
-      expect(result2).toEqual(1);
-
-      const result3 = DateService.getWeekOfMonth(new Date(2024, 0, 31));
-      expect(result3).toEqual(5);
-    });
-  });
-
-  describe('getWeekDayOfXWeekOfMonth', () => {
-    it('should successfully get the 2nd monday of January 2024', () => {
-      const result = DateService.getWeekDayOfXWeekOfMonth(
-        new Date(2024, 0, 1),
-        1,
-        2
-      );
-      expect(result).toEqual(new Date(2024, 0, 8));
-    });
-
-    it('should successfully get the 3rd monday of January 2024', () => {
-      const result = DateService.getWeekDayOfXWeekOfMonth(
-        new Date(2024, 0, 1),
-        1,
-        3
-      );
-      expect(result).toEqual(new Date(2024, 0, 15));
-    });
-
-    it('should successfully get the 3rd tuesday of January 2024', () => {
-      const result = DateService.getWeekDayOfXWeekOfMonth(
-        new Date(2024, 0, 1),
-        2,
-        3
-      );
-      expect(result).toEqual(new Date(2024, 0, 16));
-    });
-
-    it('should successfully get the 1st Saturday of January 2024', () => {
-      const result = DateService.getWeekDayOfXWeekOfMonth(
-        new Date(2024, 0, 1),
-        6,
-        1
-      );
-      expect(result).toEqual(new Date(2024, 0, 6));
-    });
-
-    it('should successfully get the 1st sunday of January 2024', () => {
-      const result = DateService.getWeekDayOfXWeekOfMonth(
-        new Date(2024, 0, 1),
-        0,
-        1
-      );
-      expect(result).toEqual(new Date(2024, 0, 7));
-    });
-
-    it('should successfully get the last sunday of January 2024', () => {
-      const result = DateService.getWeekDayOfXWeekOfMonth(
-        new Date(2024, 0, 1),
-        0,
-        'last'
-      );
-      expect(result).toEqual(new Date(2024, 0, 28));
-    });
-
-    it('should return null if the week and day do not exist', () => {
-      const result = DateService.getWeekDayOfXWeekOfMonth(
-        new Date(2024, 0, 1),
-        0,
-        5
-      );
-      expect(result).toEqual(null);
-    });
-  });
-});