vovk-cli 0.0.1-draft.381 → 0.0.1-draft.383

package/client-templates/ts/index.ts.ejs

@@ -2,7 +2,12 @@
 import type { VovkFetcher } from 'vovk';
 import { createRPC } from '<%= t.commonImports.module.createRPC %>';
 import { schema } from './schema<%= t.nodeNextResolutionExt.ts %>';
+<% if(t.isBundle) { %>
 import { openapi } from './openapi<%= t.nodeNextResolutionExt.ts %>';
+<% } else { %>
+// TODO: This is a temporary fix https://github.com/rolldown/tsdown/issues/528#issuecomment-3476284358
+import openapi dfrom './openapi.json' with { type: "json" };
+<% } %>
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { if(segment.segmentType !== 'mixin') { %>
 import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segment.segmentName].segmentImportPath %>";
 <% }

package/dist/bundle/index.mjs

@@ -5,27 +5,6 @@ import { generate } from '../generate/generate.mjs';
 import { BuiltInTemplateName } from '../getProjectInfo/getConfig/getTemplateDefs.mjs';
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 import { locateSegments } from '../locateSegments.mjs';
-/*
-async function tsdownBundle({
-  outDirAbsolute,
-  tsFullClientOutAbsoluteDirInput,
-}: {
-  outDirAbsolute: string;
-  tsFullClientOutAbsoluteDirInput: string;
-}) {
-  const { build } = await import('tsdown');
-
-  await build({
-    entry: path.join(tsFullClientOutAbsoluteDirInput, './index.ts'),
-    dts: true,
-    format: ['cjs', 'esm'],
-    hash: false,
-    fixedExtension: true,
-    clean: true,
-    ...tsdownBuildOptions,
-    outDir: outDirAbsolute,
-  });
-} */
 export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
     const { config, log, cwd, apiDirAbsolutePath } = projectInfo;
     const locatedSegments = await locateSegments({ dir: apiDirAbsolutePath, config, log });

package/module-templates/arktype/controller.ts.ejs

@@ -23,13 +23,11 @@ export default class <%= vars.ModuleName %> {
     })
     @get()
     static get<%= t.TheThings %> = withArk({
-        query: type({ search: type('string') }), 
-        handle(req) {
-            const search = req.nextUrl.searchParams.get('search');
+        handle() {
             <% if(t.withService) { %>
-            return <%= vars.ServiceName %>.get<%= t.TheThings %>(search);
+            return <%= vars.ServiceName %>.get<%= t.TheThings %>();
             <% } else { %>
-            return { results: [], search };
+            return { message: 'TODO: get <%= t.theThings %>' };
             <% } %>
         }
     });
@@ -39,30 +37,42 @@ export default class <%= vars.ModuleName %> {
     })
     @put('{id}')
     static update<%= t.TheThing %> = withArk({
-        body: type({
-          foo: type('"bar" | "baz"'),
-        }),
-        query: type({ q: type('string') }),
+        body: type({ todo: type('true') }),
         params: type({ id: type('string') }),
         async handle(req, params) {
             const { id } = params;
             const body = await req.json();
-            const q = req.nextUrl.searchParams.get('q');
             <% if(t.withService) { %>
-            return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, q, body);
+            return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, body);
             <% } else { %>
-            return { id, body, q };
+            return { message: `TODO: update <%= t.theThing %>`, id, body };
             <% } %>
         }
     });
 
     @post()
-    static create<%= t.TheThing %> = () => {
-        // ...
-    };
+    static create<%= t.TheThing %> = withArk({
+        body: type({ todo: type('true') }),
+        async handle(req) {
+            const body = await req.json();
+            <% if(t.withService) { %>
+            return <%= vars.ServiceName %>.create<%= t.TheThing %>(body);
+            <% } else { %>
+            return { message: `TODO: create <%= t.theThing %>`, body };
+            <% } %>
+        }
+    });
 
     @del('{id}')
-    static delete<%= t.TheThing %> = () => {
-        // ...
-    };
+    static delete<%= t.TheThing %> = withArk({
+        params: type({ id: type('string') }),
+        handle(_req, params) {
+            const { id } = params;
+            <% if(t.withService) { %>
+            return <%= vars.ServiceName %>.delete<%= t.TheThing %>(id);
+            <% } else { %>
+            return { message: `TODO: delete <%= t.theThing %>`, id };
+            <% } %>
+        }
+    });
 }

package/module-templates/type/controller.ts.ejs

@@ -20,12 +20,11 @@ export default class <%= vars.ControllerName %> {
         summary: 'Get <%= t.TheThings %>',
     })
     @get()
-    static get<%= t.TheThings %> = async (req: VovkRequest<null, { search: string }>) => {
-        const search = req.nextUrl.searchParams.get('search');
+    static get<%= t.TheThings %> = () => {
         <% if(t.withService) { %>
-        return <%= vars.ServiceName %>.get<%= t.TheThings %>(search);
+        return <%= vars.ServiceName %>.get<%= t.TheThings %>();
         <% } else { %>
-        return { results: [], search };
+        return { message: 'TODO: get <%= t.theThings %>' };
         <% } %>
     }
 
@@ -33,24 +32,33 @@ export default class <%= vars.ControllerName %> {
         summary: 'Update <%= t.TheThing %>',
     })
     @put('{id}')
-    static update<%= t.TheThing %> = async (req: VovkRequest<{ foo: 'bar' | 'baz' }, { q: string }>, params: { id: string }) => {
+    static update<%= t.TheThing %> = async (req: VovkRequest<{ todo: true }>, params: { id: string }) => {
         const { id } = params;
         const body = await req.json();
-        const q = req.nextUrl.searchParams.get('q');
         <% if(t.withService) { %>
-        return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, q, body);
+        return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, body);
         <% } else { %>
-        return { id, body, q };
+        return { message: `TODO: update <%= t.theThing %>`, id, body };
         <% } %>
     };
 
     @post()
-    static create<%= t.TheThing %> = () => {
-        // ...
+    static create<%= t.TheThing %> = async (req: VovkRequest<{ todo: true }>) => {
+        const body = await req.json();
+        <% if(t.withService) { %>
+        return <%= vars.ServiceName %>.create<%= t.TheThing %>(body);
+        <% } else { %>
+        return { message: `TODO: create <%= t.theThing %>`, body };
+        <% } %>
     };
 
     @del('{id}')
-    static delete<%= t.TheThing %> = () => {
-        // ...
+    static delete<%= t.TheThing %> = (_req: VovkRequest<unknown>, params: { id: string }) => {
+        const { id } = params;
+        <% if(t.withService) { %>
+        return <%= vars.ServiceName %>.delete<%= t.TheThing %>(id);
+        <% } else { %>
+        return { message: `TODO: delete <%= t.theThing %>`, id };
+        <% } %>
     };
 }

package/module-templates/type/service.ts.ejs

@@ -8,21 +8,30 @@ fileName: <%= vars.ServiceName + '.ts' %>
 sourceName: <%= vars.ServiceName %>
 ---
 
-import type { VovkBody, VovkQuery } from 'vovk';
+import type { VovkBody, VovkParams } from 'vovk';
 import type <%= vars.ControllerName %> from './<%= vars.ControllerName %><%= t.nodeNextResolutionExt.ts %>';
 
 export default class <%= vars.ServiceName %> {
-  static get<%= t.TheThings %> = (search: VovkQuery<typeof <%= vars.ControllerName %>.get<%= t.TheThings %>>['search']) => {
-    return { results: [], search };
+  static get<%= t.TheThings %> = () => {
+    return { message: 'TODO: get <%= t.theThings %>' };
   };
 
   static update<%= t.TheThing %> = (
-    id: string,
-    q: VovkQuery<typeof <%= vars.ControllerName %>.update<%= t.TheThing %>>['q'],
+    id: VovkParams<typeof <%= vars.ControllerName %>.update<%= t.TheThing %>>['id'],
     body: VovkBody<typeof <%= vars.ControllerName %>.update<%= t.TheThing %>>
   ) => {
-    return { id, q, body };
+    return { message: `TODO: update <%= t.theThing %>`, id, body };
   };
 
-  // ...
+  static create<%= t.TheThing %> = (
+    body: VovkBody<typeof <%= vars.ControllerName %>.create<%= t.TheThing %>>
+  ) => {
+    return { message: `TODO: create <%= t.theThing %>`, body };
+  };
+
+  static delete<%= t.TheThing %> = (
+    id: VovkParams<typeof <%= vars.ControllerName %>.delete<%= t.TheThing %>>['id']
+  ) => {
+    return { message: `TODO: delete <%= t.theThing %>`, id };
+  };
 }

package/module-templates/valibot/controller.ts.ejs

@@ -23,13 +23,11 @@ export default class <%= vars.ModuleName %> {
     })
     @get()
     static get<%= t.TheThings %> = withValibot({
-        query: v.object({ search: v.string() }), 
-        handle(req) {
-            const search = req.nextUrl.searchParams.get('search');
+        handle() {
             <% if(t.withService) { %>
-            return <%= vars.ServiceName %>.get<%= t.TheThings %>(search);
+            return <%= vars.ServiceName %>.get<%= t.TheThings %>();
             <% } else { %>
-            return { results: [], search };
+            return { message: 'TODO: get <%= t.theThings %>' };
             <% } %>
         }
     });
@@ -39,30 +37,42 @@ export default class <%= vars.ModuleName %> {
     })
     @put('{id}')
     static update<%= t.TheThing %> = withValibot({
-        body: v.object({
-          foo: v.union([v.literal('bar'), v.literal('baz')]),
-        }),
-        query: v.object({ q: v.string() }),
+        body: v.object({ todo: v.literal(true) }),
         params: v.object({ id: v.string() }),
         async handle(req, params) {
             const { id } = params;
             const body = await req.json();
-            const q = req.nextUrl.searchParams.get('q');
             <% if(t.withService) { %>
-            return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, q, body);
+            return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, body);
             <% } else { %>
-            return { id, body, q };
+            return { message: `TODO: update <%= t.theThing %>`, id, body };
             <% } %>
         }
     });
 
     @post()
-    static create<%= t.TheThing %> = () => {
-        // ...
-    };
+    static create<%= t.TheThing %> = withValibot({
+        body: v.object({ todo: v.literal(true) }),
+        async handle(req) {
+            const body = await req.json();
+            <% if(t.withService) { %>
+            return <%= vars.ServiceName %>.create<%= t.TheThing %>(body);
+            <% } else { %>
+            return { message: `TODO: create <%= t.theThing %>`, body };
+            <% } %>
+        }
+    });
 
     @del('{id}')
-    static delete<%= t.TheThing %> = () => {
-        // ...
-    };
+    static delete<%= t.TheThing %> = withValibot({
+        params: v.object({ id: v.string() }),
+        handle(_req, params) {
+            const { id } = params;
+            <% if(t.withService) { %>
+            return <%= vars.ServiceName %>.delete<%= t.TheThing %>(id);
+            <% } else { %>
+            return { message: `TODO: delete <%= t.theThing %>`, id };
+            <% } %>
+        }
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.381",
+  "version": "0.0.1-draft.383",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,11 +35,11 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.463",
-    "vovk-ajv": "^0.0.0-draft.109",
-    "vovk-client": "^0.0.4-draft.136",
-    "vovk-python": "^0.0.1-draft.78",
-    "vovk-rust": "^0.0.1-draft.64"
+    "vovk": "^3.0.0-draft.465",
+    "vovk-ajv": "^0.0.0-draft.111",
+    "vovk-client": "^0.0.4-draft.138",
+    "vovk-python": "^0.0.1-draft.80",
+    "vovk-rust": "^0.0.1-draft.66"
   },
   "optionalDependencies": {
     "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.44"