Remove circular dependency

Author: tolyo

@types/shared/utils.d.ts

@@ -431,39 +431,6 @@ export function shallowCopy(src: any, dst: any): any;
  * @param {string} errorMsg
  */
 export function assert(argument: boolean, errorMsg?: string): void;
-/**
- * Validate a value using a predicate function.
- * Throws if the predicate returns false.
- * IMPORTANT: use this function only for developper errors and not for user/data errors
- *
- * @param {ng.Validator} fn - Predicate validator function.
- * @param {*} arg - The value to validate.
- * @param {string} name - Parameter name (included in error message).
- * @returns {*} The validated value.
- * @throws {TypeError} If the value does not satisfy the validator.
- */
-export function validate(fn: ng.Validator, arg: any, name: string): any;
-/**
- * @param {*} arg - The value to validate.
- * @param {string} name - Parameter name (included in error message).
- * @returns {*} The validated value.
- * @throws {TypeError} If the value does not satisfy the validator.
- */
-export function validateRequired(arg: any, name: string): any;
-/**
- * @param {*} arg - The value to validate.
- * @param {string} name - Parameter name (included in error message).
- * @returns {*} The validated value.
- * @throws {TypeError} If the value does not satisfy the validator.
- */
-export function validateArray(arg: any, name: string): any;
-/**
- * @param {*} arg - The value to validate.
- * @param {string} name - Parameter name (included in error message).
- * @returns {*} The validated value.
- * @throws {TypeError} If the value does not satisfy the validator.
- */
-export function validateIsString(arg: any, name: string): any;
 /**
  * Throw error if the argument is falsy.
  */
@@ -637,7 +604,4 @@ export function instantiateWasm(
  */
 export function isArrowFunction(fn: any): boolean;
 export const isProxySymbol: unique symbol;
-export const BADARG: "badarg";
-export const BADARGKEY: "badarg: key";
-export const BADARGVALUE: "badarg: value";
 export const ngAttrPrefixes: string[];

@types/shared/validate.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Validate a value using a predicate function.
+ * Throws if the predicate returns false.
+ * IMPORTANT: use this function only for developper errors and not for user/data errors
+ *
+ * @param {ng.Validator} fn - Predicate validator function.
+ * @param {*} arg - The value to validate.
+ * @param {string} name - Parameter name (included in error message).
+ * @returns {*} The validated value.
+ * @throws {TypeError} If the value does not satisfy the validator.
+ */
+export function validate(fn: ng.Validator, arg: any, name: string): any;
+/**
+ * @param {*} arg - The value to validate.
+ * @param {string} name - Parameter name (included in error message).
+ * @returns {*} The validated value.
+ * @throws {TypeError} If the value does not satisfy the validator.
+ */
+export function validateRequired(arg: any, name: string): any;
+/**
+ * @param {*} arg - The value to validate.
+ * @param {string} name - Parameter name (included in error message).
+ * @returns {*} The validated value.
+ * @throws {TypeError} If the value does not satisfy the validator.
+ */
+export function validateArray(arg: any, name: string): any;
+/**
+ * @param {*} arg - The value to validate.
+ * @param {string} name - Parameter name (included in error message).
+ * @returns {*} The validated value.
+ * @throws {TypeError} If the value does not satisfy the validator.
+ */
+export function validateIsString(arg: any, name: string): any;
+export const BADARG: "badarg";
+export const BADARGKEY: "badarg: key";
+export const BADARGVALUE: "badarg: value";

src/core/di/injector.js

@@ -8,11 +8,11 @@ import {
   isString,
   isUndefined,
   minErr,
-  validateArray,
 } from "../../shared/utils.js";
 import { InjectorService, ProviderInjector } from "./internal-injector.js";
 import { createPersistentProxy } from "../../services/storage/storage.js";
-import { $injectTokens } from "../../injection-tokens";
+import { $injectTokens } from "../../injection-tokens.js";
+import { validateArray } from "../../shared/validate.js";
 
 const $injectorMinErr = minErr($injectTokens.$injector);
 

src/core/di/ng-module/ng-module.js

@@ -4,12 +4,11 @@ import {
   instantiateWasm,
   isFunction,
   isString,
-  validate,
   isDefined,
-  validateRequired,
   isObject,
 } from "../../../shared/utils.js";
 import { isInjectable } from "../../../shared/predicates.js";
+import { validate, validateRequired } from "../../../shared/validate.js";
 
 /**
  * Modules are collections of application configuration information for components:

src/core/filter/filter.js

@@ -7,13 +7,8 @@ import {
   $IncludedByStateFilter,
   $IsStateFilter,
 } from "../../router/state-filters.js";
-import {
-  BADARG,
-  assert,
-  isDefined,
-  isFunction,
-  isString,
-} from "../../shared/utils.js";
+import { assert, isDefined, isFunction } from "../../shared/utils.js";
+import { validate, validateIsString } from "../../shared/validate.js";
 
 /* @ignore */
 const SUFFIX = "Filter";
@@ -52,8 +47,8 @@ export class FilterProvider {
    * @return {ng.FilterProvider}
    */
   register(name, factory) {
-    assert(isString(name), `${BADARG}:name ${name}`);
-    assert(isFunction(factory), `${BADARG}:factory ${factory}`);
+    validateIsString(name, "name");
+    validate(isFunction, factory, "factory");
     this.$provide.factory(name + SUFFIX, factory);
 
     return this;
@@ -66,7 +61,7 @@ export class FilterProvider {
      * @returns {ng.FilterService}
      */
     ($injector) => (name) => {
-      assert(isString(name), `${BADARG}:name ${name}`);
+      validateIsString(name, "name");
 
       return $injector.get(name + SUFFIX);
     },

src/directive/options/options.js

@@ -7,7 +7,6 @@ import {
   isArrayLike,
   isDefined,
   minErr,
-  validateRequired,
 } from "../../shared/utils.js";
 
 const ngOptionsMinErr = minErr("ngOptions");
@@ -420,7 +419,6 @@ export function ngOptionsDirective($compile, $parse) {
       // compile the element since there might be bindings in it
       const linkFn = $compile(selectCtrl.emptyOption);
 
-      validateRequired(linkFn, "linkFn");
       selectElement.prepend(selectCtrl.emptyOption);
       linkFn(scope);
 

src/services/cookie/cookie.js

@@ -1,15 +1,17 @@
 import { $injectTokens } from "../../injection-tokens.js";
 import {
-  BADARG,
-  BADARGVALUE,
   assert,
   isDefined,
   isNullOrUndefined,
   isNumber,
   isString,
+} from "../../shared/utils.js";
+import {
   validateIsString,
   validateRequired,
-} from "../../shared/utils.js";
+  BADARGVALUE,
+  BADARG,
+} from "../../shared/validate.js";
 
 /**
  * Service provider that creates a {@link CookieService $cookie} service.

src/services/rest/rest.js

@@ -1,10 +1,6 @@
 import { $injectTokens } from "../../injection-tokens.js";
-import {
-  assert,
-  BADARG,
-  isNullOrUndefined,
-  isString,
-} from "../../shared/utils.js";
+import { assert, isNullOrUndefined, isString } from "../../shared/utils.js";
+import { BADARG } from "../../shared/validate.js";
 import { expandUriTemplate } from "./rfc.js";
 
 /**

src/shared/utils.js

@@ -1,10 +1,6 @@
 import { PREFIX_REGEXP, SPECIAL_CHARS_REGEXP } from "./constants.js";
-import { isInjectable } from "./predicates";
 
 export const isProxySymbol = Symbol("isProxy");
-export const BADARG = "badarg";
-export const BADARGKEY = "badarg: key";
-export const BADARGVALUE = "badarg: value";
 
 /**
  *
@@ -956,79 +952,6 @@ export function assert(argument, errorMsg = "Assertion failed") {
   }
 }
 
-/** @type {Map<ng.Validator, string>} */
-const reasons = new Map([
-  [notNullOrUndefined, "required"],
-  [Array.isArray, "notarray"],
-  [isInjectable, "notinjectable"],
-  [isDefined, "required"],
-  [isString, "notstring"],
-]);
-
-/**
- *
- * @param {ng.Validator} val
- * @returns {string}
- */
-function getReason(val) {
-  return reasons.get(val) ?? "fail";
-}
-
-/**
- * Validate a value using a predicate function.
- * Throws if the predicate returns false.
- * IMPORTANT: use this function only for developper errors and not for user/data errors
- *
- * @param {ng.Validator} fn - Predicate validator function.
- * @param {*} arg - The value to validate.
- * @param {string} name - Parameter name (included in error message).
- * @returns {*} The validated value.
- * @throws {TypeError} If the value does not satisfy the validator.
- */
-export function validate(fn, arg, name) {
-  if (fn(arg)) return arg;
-
-  let v;
-
-  try {
-    v = JSON.stringify(arg);
-  } catch {
-    v = String(arg);
-  }
-
-  throw new TypeError(`badarg:${getReason(fn)} ${name}=${v}`);
-}
-
-/**
- * @param {*} arg - The value to validate.
- * @param {string} name - Parameter name (included in error message).
- * @returns {*} The validated value.
- * @throws {TypeError} If the value does not satisfy the validator.
- */
-export function validateRequired(arg, name) {
-  return validate(notNullOrUndefined, arg, name);
-}
-
-/**
- * @param {*} arg - The value to validate.
- * @param {string} name - Parameter name (included in error message).
- * @returns {*} The validated value.
- * @throws {TypeError} If the value does not satisfy the validator.
- */
-export function validateArray(arg, name) {
-  return validate(Array.isArray, arg, name);
-}
-
-/**
- * @param {*} arg - The value to validate.
- * @param {string} name - Parameter name (included in error message).
- * @returns {*} The validated value.
- * @throws {TypeError} If the value does not satisfy the validator.
- */
-export function validateIsString(arg, name) {
-  return validate(isString, arg, name);
-}
-
 /**
  * Throw error if the argument is falsy.
  */

src/shared/validate.js

@@ -0,0 +1,79 @@
+import { isInjectable } from "./predicates.js";
+import { isDefined, isString, notNullOrUndefined } from "./utils.js";
+
+export const BADARG = "badarg";
+export const BADARGKEY = "badarg: key";
+export const BADARGVALUE = "badarg: value";
+
+/** @type {Map<ng.Validator, string>} */
+const reasons = new Map([
+  [notNullOrUndefined, "required"],
+  [Array.isArray, "notarray"],
+  [isInjectable, "notinjectable"],
+  [isDefined, "required"],
+  [isString, "notstring"],
+]);
+
+/**
+ *
+ * @param {ng.Validator} val
+ * @returns {string}
+ */
+function getReason(val) {
+  return reasons.get(val) ?? "fail";
+}
+
+/**
+ * Validate a value using a predicate function.
+ * Throws if the predicate returns false.
+ * IMPORTANT: use this function only for developper errors and not for user/data errors
+ *
+ * @param {ng.Validator} fn - Predicate validator function.
+ * @param {*} arg - The value to validate.
+ * @param {string} name - Parameter name (included in error message).
+ * @returns {*} The validated value.
+ * @throws {TypeError} If the value does not satisfy the validator.
+ */
+export function validate(fn, arg, name) {
+  if (fn(arg)) return arg;
+
+  let v;
+
+  try {
+    v = JSON.stringify(arg);
+  } catch {
+    v = String(arg);
+  }
+
+  throw new TypeError(`badarg:${getReason(fn)} ${name}=${v}`);
+}
+
+/**
+ * @param {*} arg - The value to validate.
+ * @param {string} name - Parameter name (included in error message).
+ * @returns {*} The validated value.
+ * @throws {TypeError} If the value does not satisfy the validator.
+ */
+export function validateRequired(arg, name) {
+  return validate(notNullOrUndefined, arg, name);
+}
+
+/**
+ * @param {*} arg - The value to validate.
+ * @param {string} name - Parameter name (included in error message).
+ * @returns {*} The validated value.
+ * @throws {TypeError} If the value does not satisfy the validator.
+ */
+export function validateArray(arg, name) {
+  return validate(Array.isArray, arg, name);
+}
+
+/**
+ * @param {*} arg - The value to validate.
+ * @param {string} name - Parameter name (included in error message).
+ * @returns {*} The validated value.
+ * @throws {TypeError} If the value does not satisfy the validator.
+ */
+export function validateIsString(arg, name) {
+  return validate(isString, arg, name);
+}