Rename fetch to api

Author: ValentinCrochemore

src/generators/QuasarGenerator.js

@@ -72,8 +72,8 @@ export default class extends BaseGenerator {
       "types/list.ts",
 
       // utils
+      "utils/api.ts",
       "utils/date.ts",
-      "utils/fetch.ts",
     ]);
 
     handlebars.registerHelper("compare", hbh_comparison.compare);
@@ -274,9 +274,9 @@ export default {
       "types/view.ts",
 
       // utils
+      "utils/api.ts",
       "utils/date.ts",
       "utils/error.ts",
-      "utils/fetch.ts",
       "utils/mercure.ts",
     ].forEach((common) =>
       this.createFile(common, `${dir}/${common}`, context, false)

src/generators/QuasarGenerator.test.js

@@ -90,10 +90,10 @@ test("Generate a Quasar app", async () => {
   );
 
   // utils
+  expect(fs.existsSync(`${tmpobj.name}/utils/api.ts`)).toBe(true);
   expect(fs.existsSync(`${tmpobj.name}/utils/config.ts`)).toBe(true);
-  expect(fs.existsSync(`${tmpobj.name}/utils/error.ts`)).toBe(true);
   expect(fs.existsSync(`${tmpobj.name}/utils/date.ts`)).toBe(true);
-  expect(fs.existsSync(`${tmpobj.name}/utils/fetch.ts`)).toBe(true);
+  expect(fs.existsSync(`${tmpobj.name}/utils/error.ts`)).toBe(true);
 
   tmpobj.removeCallback();
 });

templates/quasar/stores/foo/create.ts

@@ -2,7 +2,7 @@ import { defineStore } from 'pinia';
 import { {{titleUcFirst}} } from 'src/types/{{lc}}';
 import type { SubmissionErrors } from 'src/types/error';
 import { SubmissionError } from 'src/utils/error';
-import fetch from 'src/utils/fetch';
+import api from 'src/utils/api';
 
 interface State {
   created?: {{titleUcFirst}};
@@ -26,7 +26,7 @@ export const use{{titleUcFirst}}CreateStore = defineStore('{{lc}}Create', {
       this.toggleLoading();
 
       try {
-        const response = await fetch('{{name}}', {
+        const response = await api('{{name}}', {
           method: 'POST',
           body: JSON.stringify(payload),
         });

templates/quasar/stores/foo/delete.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import { {{titleUcFirst}} } from 'src/types/{{lc}}';
-import fetch from 'src/utils/fetch';
+import api from 'src/utils/api';
 
 interface State {
   deleted?: {{titleUcFirst}};
@@ -27,7 +27,7 @@ export const use{{titleUcFirst}}DeleteStore = defineStore('{{lc}}Delete', {
       }
 
       try {
-        await fetch(item['@id'], { method: 'DELETE' });
+        await api(item['@id'], { method: 'DELETE' });
 
         this.toggleLoading();
         this.setDeleted(item);

templates/quasar/stores/foo/list.ts

@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia';
-import fetch from 'src/utils/fetch';
+import api from 'src/utils/api';
 import { {{titleUcFirst}} } from 'src/types/{{lc}}';
 import { View } from 'src/types/view';
 import { extractHubURL } from 'src/utils/mercure';
@@ -31,7 +31,7 @@ export const use{{titleUcFirst}}ListStore = defineStore('{{lc}}List', {
 
       try {
         const path = page ? `{{name}}?page=${page}` : '{{name}}';
-        const response = await fetch(path, { params });
+        const response = await api(path, { params });
         const data: PagedCollection<{{titleUcFirst}}> = await response.json();
         const hubUrl = extractHubURL(response);
 

templates/quasar/stores/foo/show.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import { {{titleUcFirst}} } from 'src/types/{{lc}}';
-import fetch from 'src/utils/fetch';
+import api from 'src/utils/api';
 import { extractHubURL } from 'src/utils/mercure';
 
 interface State {
@@ -23,7 +23,7 @@ export const use{{titleUcFirst}}ShowStore = defineStore('{{lc}}Show', {
       this.toggleLoading();
 
       try {
-        const response = await fetch(id);
+        const response = await api(id);
         const data: {{titleUcFirst}} = await response.json();
         const hubUrl = extractHubURL(response);
 

templates/quasar/stores/foo/update.ts

@@ -2,7 +2,7 @@ import { defineStore } from 'pinia';
 import { {{titleUcFirst}} } from 'src/types/{{lc}}';
 import type { SubmissionErrors } from 'src/types/error';
 import { SubmissionError } from 'src/utils/error';
-import fetch from 'src/utils/fetch';
+import api from 'src/utils/api';
 import { extractHubURL } from 'src/utils/mercure';
 
 interface State {
@@ -29,7 +29,7 @@ export const use{{titleUcFirst}}UpdateStore = defineStore('{{lc}}Update', {
       this.toggleLoading();
 
       try {
-        const response = await fetch(id);
+        const response = await api(id);
         const data: {{titleUcFirst}} = await response.json();
         const hubUrl = extractHubURL(response);
 
@@ -58,7 +58,7 @@ export const use{{titleUcFirst}}UpdateStore = defineStore('{{lc}}Update', {
       }
 
       try {
-        const response = await fetch(
+        const response = await api(
           this.retrieved['@id'] ?? payload['@id'] ?? '',
           {
             method: 'PUT',