chore(code-gen): combine all internal utils

packages/code-gen/src/database/generator.js

@@ -1,10 +1,9 @@
 import { AppError, noop } from "@compas/stdlib";
 import { structureModels } from "../processors/models.js";
-import { stringFormatNameForError } from "../string-format.js";
 import { targetCustomSwitch } from "../target/switcher.js";
 import { typesCacheGet } from "../types/cache.js";
 import { typesGeneratorUseTypeName } from "../types/generator.js";
-import { upperCaseFirst } from "../utils.js";
+import { stringFormatNameForError, upperCaseFirst } from "../utils.js";
 import {
   validatorGeneratorGenerateValidator,
   validatorGetNameAndImport,

packages/code-gen/src/database/postgres.js

@@ -16,9 +16,8 @@ import {
 import { structureModels } from "../processors/models.js";
 import { referenceUtilsGetProperty } from "../processors/reference-utils.js";
 import { structureResolveReference } from "../processors/structure.js";
-import { stringFormatNameForError } from "../string-format.js";
 import { typesOptionalityIsOptional } from "../types/optionality.js";
-import { upperCaseFirst } from "../utils.js";
+import { stringFormatNameForError, upperCaseFirst } from "../utils.js";
 
 /**
  * Write the DDL out for Postgres

packages/code-gen/src/processors/any-of.js

@@ -1,6 +1,6 @@
 import { AppError, isNil } from "@compas/stdlib";
-import { stringFormatNameForError } from "../string-format.js";
 import { typesOptionalityIsOptional } from "../types/optionality.js";
+import { stringFormatNameForError } from "../utils.js";
 import { referenceUtilsGetProperty } from "./reference-utils.js";
 import { structureNamedTypes, structureResolveReference } from "./structure.js";
 import { typeDefinitionTraverse } from "./type-definition-traverse.js";

packages/code-gen/src/processors/crud-validation.js

@@ -1,6 +1,8 @@
 import { AppError, isNil } from "@compas/stdlib";
-import { errorsThrowCombinedError } from "../errors.js";
-import { stringFormatNameForError } from "../string-format.js";
+import {
+  errorsThrowCombinedError,
+  stringFormatNameForError,
+} from "../utils.js";
 import {
   crudInformationGetHasCustomReadableType,
   crudInformationGetModel,

packages/code-gen/src/processors/model-keys.js

@@ -1,7 +1,9 @@
 import { AppError, isNil } from "@compas/stdlib";
 import { DateType, UuidType } from "../builders/index.js";
-import { errorsThrowCombinedError } from "../errors.js";
-import { stringFormatNameForError } from "../string-format.js";
+import {
+  errorsThrowCombinedError,
+  stringFormatNameForError,
+} from "../utils.js";
 import { structureModels } from "./models.js";
 import { referenceUtilsGetProperty } from "./reference-utils.js";
 

packages/code-gen/src/processors/model-name.js

@@ -1,6 +1,8 @@
 import { AppError } from "@compas/stdlib";
-import { errorsThrowCombinedError } from "../errors.js";
-import { stringFormatNameForError } from "../string-format.js";
+import {
+  errorsThrowCombinedError,
+  stringFormatNameForError,
+} from "../utils.js";
 import { structureModels } from "./models.js";
 
 /**

packages/code-gen/src/processors/model-relation.js

@@ -1,11 +1,11 @@
 import { AppError } from "@compas/stdlib";
 import { ReferenceType, RelationType } from "../builders/index.js";
-import { errorsThrowCombinedError } from "../errors.js";
+import { typesOptionalityIsOptional } from "../types/optionality.js";
 import {
+  errorsThrowCombinedError,
   stringFormatNameForError,
   stringFormatRelation,
-} from "../string-format.js";
-import { typesOptionalityIsOptional } from "../types/optionality.js";
+} from "../utils.js";
 import { modelKeyGetPrimary } from "./model-keys.js";
 import { structureModels } from "./models.js";
 import { structureNamedTypes, structureResolveReference } from "./structure.js";

packages/code-gen/src/processors/model-where.js

@@ -7,8 +7,7 @@ import {
   ObjectType,
   ReferenceType,
 } from "../builders/index.js";
-import { stringFormatNameForError } from "../string-format.js";
-import { upperCaseFirst } from "../utils.js";
+import { stringFormatNameForError, upperCaseFirst } from "../utils.js";
 import { modelKeyGetSearchable } from "./model-keys.js";
 import {
   modelRelationGetInformation,

packages/code-gen/src/processors/object-expansion.js

@@ -1,6 +1,8 @@
 import { AppError } from "@compas/stdlib";
-import { errorsThrowCombinedError } from "../errors.js";
-import { stringFormatNameForError } from "../string-format.js";
+import {
+  errorsThrowCombinedError,
+  stringFormatNameForError,
+} from "../utils.js";
 import { structureNamedTypes, structureResolveReference } from "./structure.js";
 import { typeDefinitionTraverse } from "./type-definition-traverse.js";
 

packages/code-gen/src/processors/route-invalidation.js

@@ -1,6 +1,8 @@
 import { AppError, isNil } from "@compas/stdlib";
-import { errorsThrowCombinedError } from "../errors.js";
-import { stringFormatNameForError } from "../string-format.js";
+import {
+  errorsThrowCombinedError,
+  stringFormatNameForError,
+} from "../utils.js";
 import { structureRoutes } from "./routes.js";
 import { structureResolveReference } from "./structure.js";
 

packages/code-gen/src/processors/route-trie.js

@@ -1,6 +1,8 @@
 import { AppError } from "@compas/stdlib";
-import { errorsThrowCombinedError } from "../errors.js";
-import { stringFormatNameForError } from "../string-format.js";
+import {
+  errorsThrowCombinedError,
+  stringFormatNameForError,
+} from "../utils.js";
 import { structureRoutes } from "./routes.js";
 
 /**

packages/code-gen/src/processors/structure-name-checks.js

@@ -1,6 +1,8 @@
 import { AppError } from "@compas/stdlib";
-import { errorsThrowCombinedError } from "../errors.js";
-import { stringFormatNameForError } from "../string-format.js";
+import {
+  errorsThrowCombinedError,
+  stringFormatNameForError,
+} from "../utils.js";
 import { structureNamedTypes } from "./structure.js";
 import { typeDefinitionTraverse } from "./type-definition-traverse.js";
 

packages/code-gen/src/processors/structure.js

@@ -1,7 +1,9 @@
 import { AppError, isNil } from "@compas/stdlib";
 import { isNamedTypeBuilderLike } from "../builders/index.js";
-import { errorsThrowCombinedError } from "../errors.js";
-import { stringFormatNameForError } from "../string-format.js";
+import {
+  errorsThrowCombinedError,
+  stringFormatNameForError,
+} from "../utils.js";
 import { typeDefinitionTraverse } from "./type-definition-traverse.js";
 
 /**

packages/code-gen/src/utils.d.ts

@@ -12,4 +12,48 @@ export function upperCaseFirst(str?: string | undefined): string;
  * @returns {string}
  */
 export function lowerCaseFirst(str?: string | undefined): string;
+/**
+ * Format a type name for error messages
+ *
+ * @param {undefined|{ group?: string, name?: string, type?: string }} type
+ * @returns {string}
+ */
+export function stringFormatNameForError(
+  type:
+    | undefined
+    | {
+        group?: string;
+        name?: string;
+        type?: string;
+      },
+): string;
+/**
+ * Format a full relation name
+ *
+ * @param {string} ownName
+ * @param {string} inverseName
+ * @param {string} ownKey
+ * @param {string} inverseKey
+ * @returns {string}
+ */
+export function stringFormatRelation(
+  ownName: string,
+  inverseName: string,
+  ownKey: string,
+  inverseKey: string,
+): string;
+/**
+ * Combine the messages of the provided errors and throw a new error.
+ *
+ * Early returns if an empty array is provided.
+ *
+ * Other supported properties:
+ * - messages: expected to be a string[]
+ *
+ * @param {import("@compas/stdlib").AppError[]} errors
+ * @returns {void}
+ */
+export function errorsThrowCombinedError(
+  errors: import("@compas/stdlib").AppError[],
+): void;
 //# sourceMappingURL=utils.d.ts.map