chore(code-gen): cleanup 'NamedType' usages

compasjs · May 9, 2023 · 8a84348 · 8a84348
1 parent 4c56257
commit 8a84348
Show file tree

Hide file tree

Showing 46 changed files with 167 additions and 177 deletions.
diff --git a/packages/code-gen/src/api-client/js-axios.d.ts b/packages/code-gen/src/api-client/js-axios.d.ts
@@ -22,13 +22,13 @@ export function jsAxiosGetApiClientFile(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function jsAxiosGenerateFunction(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
-  route: import("../types.js").NamedType<
+  route: import("../../types/advanced-types").NamedType<
     import("../generated/common/types").ExperimentalRouteDefinition
   >,
   contextNames: Record<string, string>,

diff --git a/packages/code-gen/src/api-client/js-axios.js b/packages/code-gen/src/api-client/js-axios.js
@@ -139,7 +139,7 @@ export function jsAxiosGetApiClientFile(generateContext, route) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function jsAxiosGenerateFunction(

diff --git a/packages/code-gen/src/api-client/js-fetch.d.ts b/packages/code-gen/src/api-client/js-fetch.d.ts
@@ -22,13 +22,13 @@ export function jsFetchGetApiClientFile(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function jsFetchGenerateFunction(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
-  route: import("../types.js").NamedType<
+  route: import("../../types/advanced-types").NamedType<
     import("../generated/common/types").ExperimentalRouteDefinition
   >,
   contextNames: Record<string, string>,

diff --git a/packages/code-gen/src/api-client/js-fetch.js b/packages/code-gen/src/api-client/js-fetch.js
@@ -163,7 +163,7 @@ export function jsFetchGetApiClientFile(generateContext, route) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function jsFetchGenerateFunction(

diff --git a/packages/code-gen/src/api-client/react-query.d.ts b/packages/code-gen/src/api-client/react-query.d.ts
@@ -22,13 +22,13 @@ export function reactQueryGetApiClientFile(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function reactQueryGenerateFunction(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
-  route: import("../types.js").NamedType<
+  route: import("../../types/advanced-types").NamedType<
     import("../generated/common/types").ExperimentalRouteDefinition
   >,
   contextNames: Record<string, string>,

diff --git a/packages/code-gen/src/api-client/react-query.js b/packages/code-gen/src/api-client/react-query.js
@@ -173,7 +173,7 @@ export function reactQueryGetApiClientFile(generateContext, route) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function reactQueryGenerateFunction(
@@ -694,7 +694,7 @@ ${hookName}.setQueryData = (
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
  */
 function reactQueryWriteIsEnabled(generateContext, file, route) {
   const keysAffectingEnabled = [];
@@ -746,7 +746,7 @@ function reactQueryWriteIsEnabled(generateContext, file, route) {
  * Write the invalidations in the mutation hook
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
  */
 function reactQueryWriteInvalidations(file, route) {
   fileWrite(file, `const originalOnSuccess = options.onSuccess;`);

diff --git a/packages/code-gen/src/api-client/ts-axios.d.ts b/packages/code-gen/src/api-client/ts-axios.d.ts
@@ -22,13 +22,13 @@ export function tsAxiosGetApiClientFile(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function tsAxiosGenerateFunction(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
-  route: import("../types.js").NamedType<
+  route: import("../../types/advanced-types").NamedType<
     import("../generated/common/types").ExperimentalRouteDefinition
   >,
   contextNames: Record<string, string>,

diff --git a/packages/code-gen/src/api-client/ts-axios.js b/packages/code-gen/src/api-client/ts-axios.js
@@ -113,7 +113,7 @@ export function tsAxiosGetApiClientFile(generateContext, route) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function tsAxiosGenerateFunction(

diff --git a/packages/code-gen/src/api-client/ts-fetch.d.ts b/packages/code-gen/src/api-client/ts-fetch.d.ts
@@ -22,13 +22,13 @@ export function tsFetchGetApiClientFile(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function tsFetchGenerateFunction(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
-  route: import("../types.js").NamedType<
+  route: import("../../types/advanced-types").NamedType<
     import("../generated/common/types").ExperimentalRouteDefinition
   >,
   contextNames: Record<string, string>,

diff --git a/packages/code-gen/src/api-client/ts-fetch.js b/packages/code-gen/src/api-client/ts-fetch.js
@@ -171,7 +171,7 @@ export function tsFetchGetApiClientFile(generateContext, route) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function tsFetchGenerateFunction(

diff --git a/packages/code-gen/src/crud/events.js b/packages/code-gen/src/crud/events.js
@@ -52,7 +52,7 @@ export function crudEventsGenerate(generateContext) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudEventsGenerateForType(generateContext, file, crud) {
   crudRouteSwitch(
@@ -93,7 +93,7 @@ function crudEventsGenerateForType(generateContext, file, crud) {
 
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudEventsFile(generateContext, crud) {
   return fileContextCreateGeneric(generateContext, `${crud.group}/events.js`, {
@@ -104,7 +104,7 @@ function crudEventsFile(generateContext, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudEventsList(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -142,7 +142,7 @@ function crudEventsList(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudEventsSingle(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -169,7 +169,7 @@ function crudEventsSingle(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudEventsCreate(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -203,7 +203,7 @@ function crudEventsCreate(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudEventsUpdate(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -231,7 +231,7 @@ function crudEventsUpdate(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudEventsDelete(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -256,7 +256,7 @@ function crudEventsDelete(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudEventsTransform(generateContext, file, crud) {
   const model = crudInformationGetModel(crud);
@@ -277,7 +277,7 @@ function crudEventsTransform(generateContext, file, crud) {
 /**
  * Get metadata about inline relations for create and update events
  *
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudEventsGetInlineRelations(crud) {
   const result = [];
@@ -312,7 +312,7 @@ function crudEventsGetInlineRelations(crud) {
 /**
  * Get the transformer mapping for the provided crud
  *
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudEventsGetEntityTransformer(crud) {
   const model = crudInformationGetModel(crud);

diff --git a/packages/code-gen/src/crud/handlers.js b/packages/code-gen/src/crud/handlers.js
@@ -57,7 +57,7 @@ export function crudHandlersGenerate(generateContext) {
 
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudHandlersFile(generateContext, crud) {
   return fileContextCreateGeneric(generateContext, `${crud.group}/crud.js`, {
@@ -68,7 +68,7 @@ function crudHandlersFile(generateContext, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudHandlersStart(generateContext, file, crud) {
   const { modifierDocs, modifierDestructure } = crudHandlersGetModifiers(crud);
@@ -101,7 +101,7 @@ function crudHandlersStart(generateContext, file, crud) {
 }
 
 /**
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  * @returns {{
  *   modifierDocs: string[],
  *   modifierDestructure: string[],
@@ -191,7 +191,7 @@ function crudHandlersGetModifiers(crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudHandlersEnd(generateContext, file, crud) {
   fileWrite(file, `\n${fileFormatInlineComment(file, crud.group)}`);
@@ -201,7 +201,7 @@ function crudHandlersEnd(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudHandlersGenerateForType(generateContext, file, crud) {
   crudRouteSwitch(
@@ -225,7 +225,7 @@ function crudHandlersGenerateForType(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudHandlersList(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -276,7 +276,7 @@ function crudHandlersList(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudHandlersSingle(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -312,7 +312,7 @@ function crudHandlersSingle(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudHandlersCreate(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -363,7 +363,7 @@ function crudHandlersCreate(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudHandlersUpdate(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -392,7 +392,7 @@ function crudHandlersUpdate(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  */
 function crudHandlersDelete(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);

diff --git a/packages/code-gen/src/crud/query-builder.d.ts b/packages/code-gen/src/crud/query-builder.d.ts
@@ -1,7 +1,7 @@
 /**
  * Get the query builder to use for the provided crud and options
  *
- * @param {import("../types.js").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
  * @param {{
  *   includeOwnParam: boolean,
  *   includeJoins: boolean,
@@ -11,7 +11,7 @@
  * @returns {string}
  */
 export function crudQueryBuilderGet(
-  crud: import("../types.js").NamedType<
+  crud: import("../../types/advanced-types").NamedType<
     import("../generated/common/types").ExperimentalCrudDefinition
   >,
   options: {