rename rest.defaultVersion to rest.version

rizen · rizen · commit 187fcd00d125 · 2024-03-16T11:30:36.000-05:00
diff --git a/components/Dropzone.vue b/components/Dropzone.vue
@@ -16,7 +16,7 @@ import '../node_modules/dropzone/dist/dropzone.css'
 Dropzone.autoDiscover = false
 
 const getSignedURL = async (file) => {
-    const response = await useRest(`/api/${rest.defaultVersion}/s3file?includeMeta=true`, {
+    const response = await useRest(`/api/${rest.version}/s3file?includeMeta=true`, {
         method: 'POST', body: {
             contentType: file.type,
             filename: file.name,
diff --git a/composables/currentUserStore.mjs b/composables/currentUserStore.mjs
@@ -12,7 +12,7 @@ export const useCurrentUserStore = defineStore('currentUser', {
     }),
     actions: {
         async fetch() {
-            const response = await useRest(`/api/${rest.defaultVersion}/user/whoami`, {
+            const response = await useRest(`/api/${rest.version}/user/whoami`, {
                 query,
             });
             if (response.data && typeof response.data == 'object') {
@@ -27,7 +27,7 @@ export const useCurrentUserStore = defineStore('currentUser', {
             this.links = data.links || {};
         },
         async login(login, password) {
-            const response = await useRest(`/api/${rest.defaultVersion}/session`, {
+            const response = await useRest(`/api/${rest.version}/session`, {
                 method: 'post',
                 body: {
                     login,
@@ -42,7 +42,7 @@ export const useCurrentUserStore = defineStore('currentUser', {
             return response;
         },
         async logout() {
-            const response = await useRest(`/api/${rest.defaultVersion}/session`, {
+            const response = await useRest(`/api/${rest.version}/session`, {
                 method: 'delete',
             });
             this.setState({});
@@ -68,7 +68,7 @@ export const useCurrentUserStore = defineStore('currentUser', {
             return response;
         },
         async create(newUser) {
-            const response = await useRest(`/api/${rest.defaultVersion}/user`, {
+            const response = await useRest(`/api/${rest.version}/user`, {
                 method: 'post',
                 body: newUser,
                 query: { includeOptions: true },
diff --git a/composables/systemWideAlertStore.mjs b/composables/systemWideAlertStore.mjs
@@ -11,19 +11,19 @@ export const useSystemWideAlertStore = defineStore('system-wide-alert', {
             this.severity = data.severity;
         },
         async get() {
-            const response = await useRest(`/api/${rest.defaultVersion}/system-wide-alert`);
+            const response = await useRest(`/api/${rest.version}/system-wide-alert`);
             if (response.data) {
                 this.setState(response.data);
             }
         },
         async delete() {
-            const response = await useRest(`/api/${rest.defaultVersion}/system-wide-alert`, { method: 'delete' });
+            const response = await useRest(`/api/${rest.version}/system-wide-alert`, { method: 'delete' });
             if (response.data) {
                 this.setState(response.data);
             }
         },
         async post() {
-            const response = await useRest(`/api/${rest.defaultVersion}/system-wide-alert`, {
+            const response = await useRest(`/api/${rest.version}/system-wide-alert`, {
                 method: 'post',
                 body: this.$state,
             });
diff --git a/composables/useMessageBus.mjs b/composables/useMessageBus.mjs
@@ -29,7 +29,7 @@ export default async function useMessageBus() {
     const reconnect = () => setTimeout(tryToSetup, wait);
 
     const setupBusHandler = () => {
-        bus = new EventSource(`/api/${rest.defaultVersion}/user/messagebus`);
+        bus = new EventSource(`/api/${rest.version}/user/messagebus`);
         bus.onmessage = (event) => {
             const message = JSON.parse(event.data);
             switch (message.type) {
diff --git a/pages/index.vue b/pages/index.vue
@@ -5,6 +5,6 @@
 
 <script setup>
 async function doit() {
-    console.log(await $fetch(`/api/${rest.defaultVersion}/test?foo=bar`))
+    console.log(await $fetch(`/api/${rest.version}/test?foo=bar`))
 }
 </script>
diff --git a/pages/user/[id]/profile.vue b/pages/user/[id]/profile.vue
@@ -30,8 +30,8 @@ const route = useRoute();
 const dt = useDateTime();
 
 const user = useVingRecord({
-    fetchApi: `/api/${rest.defaultVersion}/user/${route.params.id}`,
-    createApi: `/api/${rest.defaultVersion}/user`,
+    fetchApi: `/api/${rest.version}/user/${route.params.id}`,
+    createApi: `/api/${rest.version}/user`,
     query: { includeMeta: true, includeOptions: true },
 });
 await user.fetch()
diff --git a/pages/user/[id]/reset-password.vue b/pages/user/[id]/reset-password.vue
@@ -43,7 +43,7 @@ const config = useRuntimeConfig();
 const notify = useNotifyStore();
 async function resetPassword() {
     notify.info('Please wait while we reset your password...');
-    const response = await useRest(`/api/${rest.defaultVersion}/user/${route.params.id}/reset-password`, {
+    const response = await useRest(`/api/${rest.version}/user/${route.params.id}/reset-password`, {
         method: 'post',
         query: { includeOptions: true },
         body: { code: newPassword.code, password: newPassword.password },
diff --git a/pages/user/admin/[id].vue b/pages/user/admin/[id].vue
@@ -79,8 +79,8 @@ const notify = useNotifyStore();
 const id = route.params.id.toString();
 const user = useVingRecord({
     id,
-    fetchApi: `/api/${rest.defaultVersion}/user/${id}`,
-    createApi: `/api/${rest.defaultVersion}/user`,
+    fetchApi: `/api/${rest.version}/user/${id}`,
+    createApi: `/api/${rest.version}/user`,
     query: { includeMeta: true, includeOptions: true },
     onUpdate() {
         notify.success('Updated user.');
diff --git a/pages/user/admin/index.vue b/pages/user/admin/index.vue
@@ -82,8 +82,8 @@ definePageMeta({
 
 const dt = useDateTime();
 const users = useVingKind({
-    listApi: `/api/${rest.defaultVersion}/user`,
-    createApi: `/api/${rest.defaultVersion}/user`,
+    listApi: `/api/${rest.version}/user`,
+    createApi: `/api/${rest.version}/user`,
     query: { includeMeta: true, sortBy: 'username', sortOrder: 'asc' },
     newDefaults: { username: '', realName: '', email: '' },
 });
diff --git a/pages/user/reset-password.vue b/pages/user/reset-password.vue
@@ -35,7 +35,7 @@ const email = ref('')
 const notify = useNotifyStore();
 async function sendPasswordReset() {
     const parser = new ua(navigator.userAgent);
-    const response = await useRest(`/api/${rest.defaultVersion}/user/send-password-reset`, {
+    const response = await useRest(`/api/${rest.version}/user/send-password-reset`, {
         method: 'post',
         query: { includeOptions: true },
         body: { browser: parser.getBrowser().name, os: parser.getOS().name, email: email.value }
diff --git a/pages/user/settings/apikeys/index.vue b/pages/user/settings/apikeys/index.vue
@@ -133,7 +133,7 @@ const dt = useDateTime();
 const currentUser = useCurrentUserStore();
 const apikeys = useVingKind({
     listApi: currentUser.links?.apikeys.href,
-    createApi: `/api/${rest.defaultVersion}/apikey`,
+    createApi: `/api/${rest.version}/apikey`,
     query: { includeMeta: true },
     newDefaults: { name: '', reason: '', url: 'http://', userId: currentUser.props?.id },
 });
diff --git a/ving.json b/ving.json
@@ -10,6 +10,6 @@
         ]
     },
     "rest": {
-        "defaultVersion": "v1"
+        "version": "v1"
     }
 }
diff --git a/ving/generator/nuxtapis.mjs b/ving/generator/nuxtapis.mjs
@@ -95,7 +95,7 @@ export default defineEventHandler(async (event) => {
 
 export const generateRest = (params) => {
     const context = { ...getContext({}), ...params };
-    const folderName = `server/api/${ving.getConfig().rest.defaultVersion}${context.name.toLowerCase()}`;
+    const folderName = `server/api/${ving.getConfig().rest.version}${context.name.toLowerCase()}`;
     let gen = Promise.resolve(context);
     let filePath = `${folderName}/[id].delete.mjs`;
     if (!(params.skipExisting && fs.existsSync(filePath)))
diff --git a/ving/generator/nuxtpages.mjs b/ving/generator/nuxtpages.mjs
@@ -141,8 +141,8 @@ const indexTemplate = ({ name, schema }) =>
 <script setup>
 const dt = useDateTime();
 const ${schema.tableName} = useVingKind({
-    listApi: \`/api/\${rest.defaultVersion}/${name.toLowerCase()}\`,
-    createApi: \`/api/\${rest.defaultVersion}/${name.toLowerCase()}\`,
+    listApi: \`/api/\${rest.version}/${name.toLowerCase()}\`,
+    createApi: \`/api/\${rest.version}/${name.toLowerCase()}\`,
     query: { includeMeta: true, sortBy: 'createdAt', sortOrder: 'desc' },
     newDefaults: { ${newDefaults(schema)} },
 });
@@ -195,7 +195,7 @@ const route = useRoute();
 const id = route.params.id.toString();
 const ${name.toLowerCase()} = useVingRecord({
     id,
-    fetchApi: \`/api/\${rest.defaultVersion}/${name.toLowerCase()}/\${id}\`,
+    fetchApi: \`/api/\${rest.version}/${name.toLowerCase()}/\${id}\`,
     query: { includeMeta: true, includeOptions: true },
     async onDelete() {
         await navigateTo('/${name.toLowerCase()}');
@@ -284,8 +284,8 @@ const notify = useNotifyStore();
 const id = route.params.id.toString();
 const ${name.toLowerCase()} = useVingRecord({
     id,
-    fetchApi: \`/api/\${rest.defaultVersion}/${name.toLowerCase()}/\${id}\`,
-    createApi: \`/api/\${rest.defaultVersion}/${name.toLowerCase()}\`,
+    fetchApi: \`/api/\${rest.version}/${name.toLowerCase()}/\${id}\`,
+    createApi: \`/api/\${rest.version}/${name.toLowerCase()}\`,
     query: { includeMeta: true, includeOptions: true },
     onUpdate() {
         notify.success('Updated ${makeWords(name)}.');
diff --git a/ving/record/VingRecord.mjs b/ving/record/VingRecord.mjs
@@ -158,7 +158,7 @@ export class VingRecord {
         out.props.id = this.get('id');
         if (include !== undefined && include.links) {
             const vingConfig = ving.getConfig();
-            out.links = { base: { href: `/api/${vingConfig.rest.defaultVersion}/${schema.kind?.toLowerCase()}`, methods: ['GET', 'POST'] } };
+            out.links = { base: { href: `/api/${vingConfig.rest.version}/${schema.kind?.toLowerCase()}`, methods: ['GET', 'POST'] } };
             out.links.self = { href: `${out.links.base.href}/${this.#props.id}`, methods: ['GET', 'PUT', 'DELETE'] };
         }
         if (include !== undefined && include.options) {
diff --git a/ving/session.mjs b/ving/session.mjs
@@ -147,11 +147,11 @@ class ProtoSession {
             if (params.include.links) {
                 out.links = {
                     base: {
-                        href: `/api/${rest.defaultVersion}/user/session`,
+                        href: `/api/${rest.version}/user/session`,
                         methods: ["GET", "POST"],
                     },
                     self: {
-                        href: `/api/${rest.defaultVersion}/user/session/${this.id}`,
+                        href: `/api/${rest.version}/user/session/${this.id}`,
                         methods: ["GET", "PUT", "DELETE"],
                     },
                 }
diff --git a/ving/tests/Users.vingrecord.test.mjs b/ving/tests/Users.vingrecord.test.mjs
@@ -47,7 +47,7 @@ describe('Users', async () => {
         expect(description.meta?.displayName).toBe('captain');
         expect(description.props.username).toBe('captain');
         if (description.links !== undefined) {
-            expect(description.links.base.href).toBe(`/api/${vingConfig.rest.defaultVersion}/user`);
+            expect(description.links.base.href).toBe(`/api/${vingConfig.rest.version}/user`);
         }
         if (description.options !== undefined) {
             expect(description.options.useAsDisplayName).toBeTypeOf('object');
@@ -65,7 +65,7 @@ describe('Users', async () => {
         expect(description.props.username).toBe('captain');
         expect(description.props.admin).toBe(false);
         if (description.links !== undefined) {
-            expect(description.links.base.href).toBe(`/api/${vingConfig.rest.defaultVersion}/user`);
+            expect(description.links.base.href).toBe(`/api/${vingConfig.rest.version}/user`);
         }
         if (description.options !== undefined) {
             expect(description.options.useAsDisplayName).toBeTypeOf('object');
@@ -78,7 +78,7 @@ describe('Users', async () => {
         expect(description.props.username).toBe(undefined);
         expect(description.props.admin).toBe(undefined);
         if (description.links !== undefined) {
-            expect(description.links.base.href).toBe(`/api/${vingConfig.rest.defaultVersion}/user`);
+            expect(description.links.base.href).toBe(`/api/${vingConfig.rest.version}/user`);
         }
         expect(description.options).toEqual({});
         if (description.options !== undefined) {
diff --git a/ving/tests/session.api.test.mjs b/ving/tests/session.api.test.mjs
@@ -6,7 +6,7 @@ import { getConfig } from '#ving/config.mjs';
 
 const Users = await useKind('User');
 const vingConfig = getConfig();
-const base = `http://localhost:3000/api/${vingConfig.rest.defaultVersion}/`;
+const base = `http://localhost:3000/api/${vingConfig.rest.version}/`;
 
 describe('Session API', async () => {
     await Users.delete.where(eq(Users.table.username, 'rita'));
diff --git a/ving/tests/test.api.test.mjs b/ving/tests/test.api.test.mjs
@@ -3,7 +3,7 @@ import axios from 'axios'
 import { getConfig } from '#ving/config.mjs';
 
 const vingConfig = getConfig();
-const base = `http://localhost:3000/api/${vingConfig.rest.defaultVersion}/`;
+const base = `http://localhost:3000/api/${vingConfig.rest.version}/`;
 describe('Test API', async () => {
 
     test(`get ${base}`, async () => {
diff --git a/ving/tests/user.api.test.mjs b/ving/tests/user.api.test.mjs
@@ -6,7 +6,7 @@ import { getConfig } from '#ving/config.mjs';
 
 const Users = await useKind('User');
 const vingConfig = getConfig();
-const base = `http://localhost:3000/api/${vingConfig.rest.defaultVersion}/`;
+const base = `http://localhost:3000/api/${vingConfig.rest.version}/`;
 
 describe('User API', async () => {
     await Users.delete.where(eq(Users.table.username, 'brooks'));

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@`
`5`	`5`
`6`	`6`	`<script setup>`
`7`	`7`	`async function doit() {`
`8`		- console.log(await $fetch(`/api/${rest.defaultVersion}/test?foo=bar`))
	`8`	+ console.log(await $fetch(`/api/${rest.version}/test?foo=bar`))
`9`	`9`	`}`
`10`	`10`	`</script>`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@`
`10`	`10`	`]`
`11`	`11`	`},`
`12`	`12`	`"rest": {`
`13`		`- "defaultVersion": "v1"`
	`13`	`+ "version": "v1"`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ export class VingRecord {`
`158`	`158`	`out.props.id = this.get('id');`
`159`	`159`	`if (include !== undefined && include.links) {`
`160`	`160`	`const vingConfig = ving.getConfig();`
`161`		- out.links = { base: { href: `/api/${vingConfig.rest.defaultVersion}/${schema.kind?.toLowerCase()}`, methods: ['GET', 'POST'] } };
	`161`	+ out.links = { base: { href: `/api/${vingConfig.rest.version}/${schema.kind?.toLowerCase()}`, methods: ['GET', 'POST'] } };
`162`	`162`	out.links.self = { href: `${out.links.base.href}/${this.#props.id}`, methods: ['GET', 'PUT', 'DELETE'] };
`163`	`163`	`}`
`164`	`164`	`if (include !== undefined && include.options) {`