refactor: update paginationRegExp initialization to use config

Author: fml09

packages/openapi-ts/src/openApi/2.0.x/parser/pagination.ts

@@ -29,7 +29,7 @@ export const paginationField = ({
         in: undefined;
       };
 }): boolean | string => {
-  const paginationRegExp = getPaginationKeywordsRegExp();
+  const paginationRegExp = getPaginationKeywordsRegExp(context.config);
   paginationRegExp.lastIndex = 0;
   if (paginationRegExp.test(name)) {
     return true;
@@ -84,11 +84,14 @@ export const paginationField = ({
   }
 
   for (const name in schema.properties) {
-    const paginationRegExp = getPaginationKeywordsRegExp();
+    const paginationRegExp = getPaginationKeywordsRegExp(context.config);
     paginationRegExp.lastIndex = 0;
 
     if (paginationRegExp.test(name)) {
-      const property = schema.properties[name]!;
+      const property = schema.properties[name];
+
+      // Skip if property doesn't exist
+      if (!property) continue;
 
       if (typeof property !== 'boolean' && !('$ref' in property)) {
         const schemaType = getSchemaType({ schema: property });

packages/openapi-ts/src/openApi/3.0.x/parser/pagination.ts

@@ -28,7 +28,7 @@ export const paginationField = ({
   name: string;
   schema: SchemaObject | ReferenceObject;
 }): boolean | string => {
-  const paginationRegExp = getPaginationKeywordsRegExp();
+  const paginationRegExp = getPaginationKeywordsRegExp(context.config);
   paginationRegExp.lastIndex = 0;
   if (paginationRegExp.test(name)) {
     return true;
@@ -73,11 +73,14 @@ export const paginationField = ({
   }
 
   for (const name in schema.properties) {
-    const paginationRegExp = getPaginationKeywordsRegExp();
+    const paginationRegExp = getPaginationKeywordsRegExp(config);
     paginationRegExp.lastIndex = 0;
 
     if (paginationRegExp.test(name)) {
-      const property = schema.properties[name]!;
+      const property = schema.properties[name];
+
+      // Skip if property doesn't exist
+      if (!property) continue;
 
       if (typeof property !== 'boolean' && !('$ref' in property)) {
         const schemaType = getSchemaType({ schema: property });
@@ -92,6 +95,7 @@ export const paginationField = ({
 
   for (const allOf of schema.allOf ?? []) {
     const pagination = paginationField({
+      config,
       context,
       name,
       schema: allOf,

packages/openapi-ts/src/openApi/3.1.x/parser/pagination.ts

@@ -24,7 +24,7 @@ export const paginationField = ({
   name: string;
   schema: SchemaObject;
 }): boolean | string => {
-  const paginationRegExp = getPaginationKeywordsRegExp();
+  const paginationRegExp = getPaginationKeywordsRegExp(context.config);
   paginationRegExp.lastIndex = 0;
   if (paginationRegExp.test(name)) {
     return true;
@@ -69,11 +69,14 @@ export const paginationField = ({
   }
 
   for (const name in schema.properties) {
-    const paginationRegExp = getPaginationKeywordsRegExp();
+    const paginationRegExp = getPaginationKeywordsRegExp(context.config);
     paginationRegExp.lastIndex = 0;
 
     if (paginationRegExp.test(name)) {
-      const property = schema.properties[name]!;
+      const property = schema.properties[name];
+
+      // Skip if property doesn't exist
+      if (!property) continue;
 
       if (typeof property !== 'boolean') {
         // TODO: resolve deeper references
@@ -85,8 +88,13 @@ export const paginationField = ({
             (schema) => schema.type !== 'null',
           );
           if (nonNullCompositionSchemas.length === 1) {
+            const firstSchema = nonNullCompositionSchemas[0];
+
+            // Skip if schema doesn't exist
+            if (!firstSchema) continue;
+
             const schemaTypes = getSchemaTypes({
-              schema: nonNullCompositionSchemas[0]!,
+              schema: firstSchema,
             });
             if (isPaginationType(schemaTypes)) {
               return name;

packages/openapi-ts/src/plugins/@tanstack/query-core/plugin-legacy.ts

@@ -900,7 +900,7 @@ export const handlerLegacy: Plugin.LegacyHandler<
         let paginationField!: Model | OperationParameter;
 
         const paginationParameter = operation.parameters.find((parameter) => {
-          const paginationRegExp = getPaginationKeywordsRegExp();
+          const paginationRegExp = getPaginationKeywordsRegExp(config);
           paginationRegExp.lastIndex = 0;
           if (paginationRegExp.test(parameter.name)) {
             paginationField = parameter;
@@ -917,7 +917,9 @@ export const handlerLegacy: Plugin.LegacyHandler<
               (model) => model.meta?.$ref === ref,
             );
             return refModel?.properties.find((property) => {
-              const paginationRegExp = getPaginationKeywordsRegExp();
+              const paginationRegExp = getPaginationKeywordsRegExp(
+                plugin.config,
+              );
               paginationRegExp.lastIndex = 0;
               if (paginationRegExp.test(property.name)) {
                 paginationField = property;
@@ -927,7 +929,7 @@ export const handlerLegacy: Plugin.LegacyHandler<
           }
 
           return parameter.properties.find((property) => {
-            const paginationRegExp = getPaginationKeywordsRegExp();
+            const paginationRegExp = getPaginationKeywordsRegExp(plugin.config);
             paginationRegExp.lastIndex = 0;
             if (paginationRegExp.test(property.name)) {
               paginationField = property;