@halospv3/hce.shared-config 3.0.0 → 3.1.0-develop.2

package/src/dotnet/NugetRegistryInfo.ts

@@ -5,7 +5,7 @@ import type { NugetProjectProperties } from './NugetProjectProperties.js';
 /* eslint-enable @typescript-eslint/no-unused-vars */
 
 import { config as configDotenv } from '@dotenvx/dotenvx';
-import { type } from 'arktype';
+import { type, type Type } from 'arktype';
 import { detectFile, detectFileSync } from 'chardet';
 import { ok } from 'node:assert/strict';
 import type { ExecException } from 'node:child_process';
@@ -15,12 +15,11 @@ import { tmpdir } from 'node:os';
 import node_path from 'node:path';
 import { cwd, env } from 'node:process';
 import { setTimeout } from 'node:timers/promises';
-import { isNativeError } from 'node:util/types';
+import { isError } from '../utils/isError.js';
 import sanitizeFileName from 'sanitize-filename';
 import { getEnvVarValue } from '../utils/env.js';
 import { execAsync } from '../utils/execAsync.js';
 import { catchCsc2012, MSBuildEvaluationOutput, MSBuildProject } from './MSBuildProject.js';
-import type { ObjectType } from 'arktype/internal/methods/object.ts';
 import type { Default } from 'arktype/internal/attributes.ts';
 
 type TmpDirNamespace_Unix = `${ReturnType<typeof tmpdir>}/HCE.Shared/.NET/Dummies`;
@@ -49,7 +48,7 @@ export async function getGithubOutput(): Promise<ReturnType<typeof configDotenv>
     processEnv: {},
   });
 
-  if (isNativeError(envOutput.error))
+  if (isError(envOutput.error))
     throw envOutput.error;
   return envOutput.parsed;
 }
@@ -294,7 +293,7 @@ but the environment variable is empty or undefined.`);
    * {@link NRI.PackPackagesOptionsType.t.propertyOverrides `propertyOverrides`}
    * is a wrapper for MSBuild's `-property:<n>=<v>` properties override arg.
    */
-  static readonly PackPackagesOptionsType: ObjectType<{
+  static readonly PackPackagesOptionsType: Type<{
     propertyOverrides?: Record<string, string> | undefined;
     artifactsPath?: string | undefined;
     configuration?: 'Release' | 'Debug' | undefined;
@@ -345,7 +344,7 @@ but the environment variable is empty or undefined.`);
     }),
   );
 
-  public static readonly PackDummyPackagesOptionsType: ObjectType<{
+  public static readonly PackDummyPackagesOptionsType: Type<{
     propertyOverrides?: Record<string, string> | undefined;
     artifactsPath?: string | undefined;
     configuration?: 'Release' | 'Debug' | undefined;
@@ -559,7 +558,7 @@ but the environment variable is empty or undefined.`);
    * Specific to this API:
    * If you want to use this API's default root value (\`${cwd()}/publish`), assign an empty string.
    */
-  static readonly PushPackagesOptionsType: ObjectType<{
+  static readonly PushPackagesOptionsType: Type<{
     root: string;
     apiKey?: string | undefined;
     configFile?: string | undefined;
@@ -612,7 +611,7 @@ but the environment variable is empty or undefined.`);
    * {@link NRI.PushPackagesOptionsType} sans {@link NRI.PushPackagesOptionsType.t.root}.
    * The result of {@link getDummiesDir} is used, instead.
    */
-  public static readonly PushDummyPackagesOptionsType: ObjectType<{
+  public static readonly PushDummyPackagesOptionsType: Type<{
     apiKey?: string | undefined;
     configFile?: string | undefined;
     disableBuffering?: boolean | undefined;
@@ -730,7 +729,7 @@ but the environment variable is empty or undefined.`);
       ),
       true,
     ).catch((error: unknown) => {
-      const _error: Error = isNativeError(error) ? error : new Error(JSON.stringify(error));
+      const _error: Error = isError(error) ? error : new Error(JSON.stringify(error));
       throw opts.apiKey
         ? _censorTokenInError(_error, opts.apiKey)
         : _error;
@@ -792,7 +791,7 @@ but the environment variable is empty or undefined.`);
     const pushCmd: string = this.GetPushDummyCommand(opts);
     return await execAsync(pushCmd, true)
       .catch((error: unknown) => {
-        const _error: Error = isNativeError(error) ? error : new Error(String(error));
+        const _error: Error = isError(error) ? error : new Error(String(error));
         throw opts.apiKey
           ? _censorTokenInError(_error, opts.apiKey)
           : _error;
@@ -906,7 +905,7 @@ const NRI: typeof NugetRegistryInfo = NugetRegistryInfo;
  * The base type for {@link NRIOpts} and related types. Extend this type while
  * overriding member types via {@link NRIOptsBase.merge}
  */
-export const NRIOptsBase: ObjectType<{
+export const NRIOptsBase: Type<{
   project: MSBuildProject | {
     readonly Items: Readonly<Required<MSBuildEvaluationOutput>['Items']>;
     readonly Properties: Readonly<NugetProjectProperties>;
@@ -960,7 +959,7 @@ export const NRIOptsBase: ObjectType<{
 /**
  * The type of the parameter for {@link NugetRegistryInfo}'s constructor.
  */
-export const NRIOpts: ObjectType<{
+export const NRIOpts: Type<{
   project: MSBuildProject | {
     readonly Items: Readonly<Required<MSBuildEvaluationOutput>['Items']>;
     readonly Properties: Readonly<NugetProjectProperties>;

package/src/dotnet/helpers.ts

@@ -1,11 +1,10 @@
-import { type } from 'arktype';
+import { type, type Type } from 'arktype';
 import path from 'node:path';
 import { cwd } from 'node:process';
 import { MSBuildProject } from './MSBuildProject.js';
 import { MSBuildProjectProperties as MSBPP } from './MSBuildProjectProperties.js';
 import { NugetRegistryInfo } from './NugetRegistryInfo.js';
 import type { Default } from 'arktype/internal/attributes.ts';
-import type { ObjectType } from 'arktype/internal/methods/object.ts';
 
 const ourDefaultPubDir = path.join('.', 'publish') as `.${'/' | '\\'}publish`;
 
@@ -369,7 +368,7 @@ function formatDotnetNugetSign(
   }
 }
 
-const DotnetNugetSignOptions: ObjectType<
+const DotnetNugetSignOptions: Type<
   {
     timestamper: Default<string, 'https://rfc3161.ai.moda/'>;
     certificatePassword?: string | undefined;

package/src/eslintConfig.ts

@@ -2,7 +2,7 @@ import eslint from '@eslint/js';
 import { defineConfig, globalIgnores as setGlobalIgnores } from 'eslint/config';
 import { type Linter } from 'eslint';
 import stylistic, { type RuleOptions } from '@stylistic/eslint-plugin';
-import jsonc from 'eslint-plugin-jsonc';
+import json from '@eslint/json';
 import globals from 'globals/globals.json' with { type: 'json' };
 import tseslint from 'typescript-eslint';
 
@@ -24,59 +24,19 @@ const globalIgnores: ReturnType<typeof setGlobalIgnores> = setGlobalIgnores([
   '**/*.tsbuildinfo',
   '**/bin/**/*',
   '**/obj/**/*',
+  '.pnp.cjs',
+  '.pnp.loader.mjs',
+  '.yarn/sdks/**',
 ]);
 
-const json_json = {
-  /** jsonc config union types are a pain to work with. Each union member is mutually exclusive to the others */
-  ...jsonc.configs['flat/recommended-with-json']
-    .map(v => v as JsoncCfgReducerIn)
-    .flatMap(a => jsonCfgReducer(a, {}))
-    // eslint-disable-next-line unicorn/no-array-reduce
-    .reduce((accumulator, element) => jsonCfgReducer(accumulator, element), {} as JsoncCfgReducerOut),
-  name: 'flat/recommended-with-json - https://github.com/ota-meshi/eslint-plugin-jsonc' as const,
-  files: ['*.json', '**/*.json'] as ['*.json', '**/*.json'],
-  ignores: globalIgnores.ignores,
-};
-const json_json5 = {
-  /** jsonc config union types are a pain to work with. Each union member is mutually exclusive to the others */
-  ...jsonc.configs['flat/recommended-with-json5']
-    .map(v => v as JsoncCfgReducerIn)
-    .flatMap(a => jsonCfgReducer(a, {}))
-    // eslint-disable-next-line unicorn/no-array-reduce
-    .reduce((accumulator, element) => jsonCfgReducer(accumulator, element), {} as JsoncCfgReducerOut),
-  name: 'flat/recommended-with-json5 - https://github.com/ota-meshi/eslint-plugin-jsonc' as const,
-  files: ['*.json5', '**/*.json5'] as ['*.json5', '**/*.json5'],
-  ignores: globalIgnores.ignores,
-};
-const json_jsonc = {
-  /** jsonc config union types are a pain to work with. Each union member is mutually exclusive to the others */
-  ...jsonc.configs['flat/recommended-with-jsonc']
-    .map(v => v as JsoncCfgReducerIn)
-    .flatMap(a => jsonCfgReducer(a, {}))
-    // eslint-disable-next-line unicorn/no-array-reduce
-    .reduce((accumulator, element) => jsonCfgReducer(accumulator, element), {} as JsoncCfgReducerOut),
-  name: 'flat/recommended-with-jsonc - https://github.com/ota-meshi/eslint-plugin-jsonc' as const,
-  files: ['*.jsonc', '**/*.jsonc'] as ['*.jsonc', '**/*.jsonc'],
-  ignores: globalIgnores.ignores,
-};
-
 const stylisticWarn: Linter.Config = stylistic.configs.customize({
   quoteProps: 'as-needed',
   semi: true,
   indent: 2,
+  severity: 'warn',
 });
 stylisticWarn.rules ??= {};
 
-// change all stylistic error-severity to warn-severity. Style violations should not imply code errors.
-for (const key in stylisticWarn.rules) {
-  const element = stylisticWarn.rules[key];
-  if (Array.isArray(element) && (element[0] === 2 || element[0] === 'error'))
-    element[0] = 'warn';
-  else if (element === 2 || element === 'error') {
-    stylisticWarn.rules[key] = 'warn';
-  }
-}
-
 stylisticWarn.rules['@stylistic/no-extra-parens'] = [
   'warn',
   'all',
@@ -96,9 +56,10 @@ stylisticWarn.rules['@stylistic/semi'] = [
 ] satisfies Linter.RuleEntry<RuleOptions['@stylistic/semi']>;
 
 const config: ReturnType<typeof defineConfig> = defineConfig(
-  json_json,
-  json_json5,
-  json_jsonc,
+  { ...json.configs.recommended, name: 'JSON Recommended', files: ['**/*.json'], language: 'json/json' },
+  { name: 'JSON - Allow empty keys in package-lock.json', files: ['**/package-lock.json'], rules: { 'json/no-empty-keys': 'off' } },
+  { ...json.configs.recommended, name: 'JSONC Recommended', files: ['**/*.jsonc'], language: 'json/jsonc' },
+  { ...json.configs.recommended, name: 'JSON5 Recommended', files: ['**/*.json5'], language: 'json/json5' },
   {
     name: 'TSJS',
     extends: [
@@ -128,56 +89,3 @@ const config: ReturnType<typeof defineConfig> = defineConfig(
   globalIgnores,
 );
 export default config;
-
-type JsoncCfgReducerIn = Partial<typeof jsonc.configs['flat/recommended-with-jsonc'][number]>
-  | Partial<typeof jsonc.configs['flat/recommended-with-json5'][number]>;
-
-interface JsoncCfgReducerOut {
-  files: NonNullable<(typeof jsonc.configs)['flat/base'][number]['files']> | ['*.json', '**/*.json', '*.json5', '**/*.json5', '*.jsonc', '**/*.jsonc'];
-  plugins: typeof jsonc.configs['flat/base'][number]['plugins'];
-  languageOptions: {
-    parser: typeof import('jsonc-eslint-parser');
-  };
-  rules: NonNullable<
-    typeof jsonc['configs']['flat/recommended-with-json5'][number]['rules']
-    | typeof jsonc.configs['flat/recommended-with-jsonc'][number]['rules']
-  >;
-}
-
-/**
- * Merge erroneously mutually-exclusive configs from `eslint-plugin-jsonc`.
- * @param a A config exported by `eslint-plugin-jsonc` -OR- the output of this function.
- * @param b A config exported by `eslint-plugin-jsonc` -OR- the output of this function.
- * @returns A merged combination of {@link a} and {@link b}.
- */
-function jsonCfgReducer(
-  a: JsoncCfgReducerIn | JsoncCfgReducerOut,
-  b: JsoncCfgReducerIn | JsoncCfgReducerOut,
-): JsoncCfgReducerOut {
-  const baseRules = jsonc.configs['flat/base']
-    .find(
-      v => v.rules !== undefined,
-    )?.rules ?? (() => { throw new Error('Unable to find jsonc base rules'); })();
-
-  return {
-    files: jsonc.configs['flat/base']
-      .filter(v => v.files !== undefined)
-      .flatMap(v => v.files),
-    plugins: {
-      jsonc: jsonc.configs['flat/base']
-        .find(v =>
-          v.plugins?.jsonc !== undefined,
-        )?.plugins?.jsonc ?? (() => { throw new Error('Unable to find jsonc plugin'); })(),
-    },
-    languageOptions: {
-      parser: jsonc.configs['flat/base']
-        .find(v => v.languageOptions?.parser)
-        ?.languageOptions?.parser ?? (() => { throw new Error('Unable to find jsonc parser'); })(),
-    },
-    rules: {
-      ...a.rules,
-      ...b.rules,
-      ...baseRules,
-    },
-  };
-}

package/src/utils/execAsync.ts

@@ -1,10 +1,9 @@
 /* eslint-disable jsdoc/no-defaults */
-import { type } from 'arktype';
-import type { ObjectType } from 'arktype/internal/methods/object.ts';
+import { type, type Type } from 'arktype';
 import { exec } from 'node:child_process';
 import { constants } from 'node:os';
 import { promisify } from 'node:util';
-import { isNativeError } from 'node:util/types';
+import { isError } from './isError.js';
 
 /**
  * A `promisify(exec)` wrapper to optionally assign the child process's STDERR as the {@link Error.prototype.cause}.
@@ -19,7 +18,7 @@ export async function execAsync(command: string, setStderrAsCause = false): Prom
   stderr: string;
 }> {
   return await promisify(exec)(command).catch((error: unknown): never => {
-    if (!isNativeError(error))
+    if (!isError(error))
       throw new Error(JSON.stringify(error));
 
     if (setStderrAsCause && 'stderr' in error && typeof error.stderr === 'string' && error.stderr !== '')
@@ -40,7 +39,7 @@ export async function execAsync(command: string, setStderrAsCause = false): Prom
   });
 }
 
-const T_ExecException: ObjectType<{
+const T_ExecException: Type<{
   name: string;
   message: string;
   stack?: string | undefined;

package/src/utils/isError.ts

@@ -0,0 +1,18 @@
+import { isNativeError } from 'node:util/types';
+
+/** @import 'typescript/lib/lib.esnext.error.d.ts' */
+
+/**
+ * Compatibility wrapper for ES2026 (Node.js 25)
+ * {@link Error.isError Error.isError}
+ * with failover to the deprecated {@link isNativeError utils.types.isNativeError}.
+ * @param error A parameter which may be an Error.
+ * @returns `true` if {@link error} is derived from or is sufficiently similar to {@link Error}. Else, `false`.
+ * Note: DOMExceptions will result in `false`
+ */
+export function isError(error: unknown): error is Error {
+  return 'isError' in Error && typeof Error.isError === 'function' && Error.isError.length > 0
+    ? (Error.isError as typeof isError)(error)
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
+    : isNativeError(error);
+}

package/src/utils/miscTypes.ts

@@ -1,7 +1,6 @@
 import { type, type Type } from 'arktype';
-import type { StringType } from 'arktype/internal/methods/string.ts';
 
-export const tBooleanString: StringType<'false' | 'true'> = type('"true" | "false"');
+export const tBooleanString: Type<'false' | 'true'> = type('"true" | "false"');
 export type BooleanString = typeof tBooleanString.infer;
 
 export const tEmptyOrBooleanString: Type<'' | 'false' | 'true'> = type(tBooleanString.or('""'));