fix: module import

Author: DmitryAnansky

packages/core/src/config/config-resolvers.ts

@@ -3,7 +3,8 @@ import * as url from 'node:url';
 import * as fs from 'node:fs';
 import module from 'node:module';
 import { isAbsoluteUrl } from '../ref-utils.js';
-import { isNotString, keysOf } from '../utils.js';
+import { isNotString } from '../utils.js';
+import { keysOf } from '../utils/keys-of.js';
 import { isString } from '../utils/is-string.js';
 import { isPlainObject } from '../utils/is-plain-object.js';
 import { isDefined } from '../utils/is-defined.js';

packages/core/src/index.ts

@@ -1,11 +1,12 @@
-export { keysOf, isNotEmptyArray, type CollectFn, type Exact } from './utils.js';
 export { doesYamlFileExist } from './utils/does-yaml-file-exist.js';
 export { dequal } from './utils/dequal.js';
 export { isEmptyObject } from './utils/is-empty-object.js';
+export { isNotEmptyArray } from './utils/is-not-empty-array.js';
 export { isNotEmptyObject } from './utils/is-not-empty-object.js';
 export { isPlainObject } from './utils/is-plain-object.js';
 export { isString } from './utils/is-string.js';
 export { isTruthy } from './utils/is-truthy.js';
+export { keysOf } from './utils/keys-of.js';
 export { pause } from './utils/pause.js';
 export { pluralize } from './utils/pluralize.js';
 export { readFileFromUrl } from './utils/read-file-from-url.js';
@@ -110,6 +111,7 @@ export { logger, type LoggerInterface } from './logger.js';
 export { HandledError } from './utils/error.js';
 export { isBrowser } from './env.js';
 
+export type { CollectFn, Exact } from './utils.js';
 export type {
   Oas3Definition,
   Oas3_1Definition,

packages/core/src/rules/common/assertions/utils.ts

@@ -2,7 +2,7 @@ import { asserts, runOnKeysSet, runOnValuesSet } from './asserts.js';
 import { colorize } from '../../../logger.js';
 import { isRef } from '../../../ref-utils.js';
 import { isTruthy } from '../../../utils/is-truthy.js';
-import { keysOf } from '../../../utils.js';
+import { keysOf } from '../../../utils/keys-of.js';
 import { isString } from '../../../utils/is-string.js';
 import { regexFromString } from '../../../utils/regex-from-string.js';
 

packages/core/src/utils.ts

@@ -19,10 +19,6 @@ export function isEmptyArray(value: unknown): value is [] {
   return Array.isArray(value) && value.length === 0;
 }
 
-export function isNotEmptyArray<T>(args?: T[]): args is [T, ...T[]] {
-  return Array.isArray(args) && !!args.length;
-}
-
 export function splitCamelCaseIntoWords(str: string) {
   const camel = str
     .split(/(?:[-._])|([A-Z][a-z]+)/)
@@ -135,11 +131,6 @@ export function identity<T>(value: T): T {
   return value;
 }
 
-export function keysOf<T>(obj: T) {
-  if (!obj) return [];
-  return Object.keys(obj) as (keyof T)[];
-}
-
 export type CollectFn = (value: unknown) => void;
 
 export type Exact<T extends object> = T & { [key: string]: undefined };

packages/core/src/utils/is-not-empty-array.ts

@@ -0,0 +1,3 @@
+export function isNotEmptyArray<T>(args?: T[]): args is [T, ...T[]] {
+  return Array.isArray(args) && !!args.length;
+}

packages/core/src/utils/is-not-empty-object.ts

@@ -1,5 +1,5 @@
-import { isEmptyObject } from './is-empty-object';
-import { isPlainObject } from './is-plain-object';
+import { isEmptyObject } from './is-empty-object.js';
+import { isPlainObject } from './is-plain-object.js';
 
 export function isNotEmptyObject(obj: unknown): boolean {
   return isPlainObject(obj) && !isEmptyObject(obj);

packages/core/src/utils/keys-of.ts

@@ -0,0 +1,4 @@
+export function keysOf<T>(obj: T) {
+  if (!obj) return [];
+  return Object.keys(obj) as (keyof T)[];
+}