vovk-cli 0.0.1-beta.50 → 0.0.1-beta.51

package/dist/init/index.mjs

@@ -14,7 +14,6 @@ import { updateTypeScriptConfig } from './updateTypeScriptConfig.mjs';
 import { updateDependenciesWithoutInstalling } from './updateDependenciesWithoutInstalling.mjs';
 import { logUpdateDependenciesError } from './logUpdateDependenciesError.mjs';
 import { chalkHighlightThing } from '../utils/chalkHighlightThing.mjs';
-import { createStandardSchemaValidatorFile } from './createStandardSchemaValidatorFile.mjs';
 export class Init {
     root;
     log;
@@ -111,12 +110,6 @@ export class Init {
                 }
             }
         }
-        if (validationLibrary === 'valibot' || validationLibrary === 'arktype' || validationLibrary === 'zod') {
-            createStandardSchemaValidatorFile({
-                root,
-                validationLibrary,
-            });
-        }
         try {
             const { configAbsolutePath } = await createConfig({
                 root,

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

@@ -9,7 +9,7 @@ sourceName: <%= vars.ModuleName %>
 compiledName: <%= t.TheThing + 'RPC' %>
 ---
 
-import { endpoint, prefix, get, put, post, del, operation } from 'vovk';
+import { procedure, prefix, get, put, post, del, operation } from 'vovk';
 import { type } from 'arktype';
 <% if(t.withService) { %>
 import <%= vars.ServiceName %> from './<%= vars.ServiceName %><%= t.nodeNextResolutionExt.ts %>';
@@ -21,7 +21,7 @@ export default class <%= vars.ModuleName %> {
       summary: 'Get <%= t.theThings %>',
     })
     @get()
-    static get<%= t.TheThings %> = endpoint({
+    static get<%= t.TheThings %> = procedure({
         handle() {
             <% if(t.withService) { %>
             return <%= vars.ServiceName %>.get<%= t.TheThings %>();
@@ -35,7 +35,7 @@ export default class <%= vars.ModuleName %> {
       summary: 'Get single <%= t.theThing %>',
     })
     @get('{id}')
-    static getSingle<%= t.TheThing %> = endpoint({
+    static getSingle<%= t.TheThing %> = procedure({
         params: type({ id: type('string') }),
         handle(_req, { id }) {
             <% if(t.withService) { %>
@@ -50,7 +50,7 @@ export default class <%= vars.ModuleName %> {
         summary: 'Update <%= t.theThing %>',
     })
     @put('{id}')
-    static update<%= t.TheThing %> = endpoint({
+    static update<%= t.TheThing %> = procedure({
         body: type({ todo: type('true') }),
         params: type({ id: type('string') }),
         async handle(req, { id }) {
@@ -67,7 +67,7 @@ export default class <%= vars.ModuleName %> {
       summary: 'Create <%= t.theThing %>',
     })
     @post()
-    static create<%= t.TheThing %> = endpoint({
+    static create<%= t.TheThing %> = procedure({
         body: type({ todo: type('true') }),
         async handle(req) {
             const body = await req.json();
@@ -83,7 +83,7 @@ export default class <%= vars.ModuleName %> {
       summary: 'Delete <%= t.theThing %>',
     })
     @del('{id}')
-    static delete<%= t.TheThing %> = endpoint({
+    static delete<%= t.TheThing %> = procedure({
         params: type({ id: type('string') }),
         handle(_req, params) {
             const { id } = params;

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

@@ -9,7 +9,7 @@ sourceName: <%= vars.ModuleName %>
 compiledName: <%= t.TheThing + 'RPC' %>
 ---
 
-import { endpoint, prefix, get, put, post, del, operation } from 'vovk';
+import { procedure, prefix, get, put, post, del, operation } from 'vovk';
 import * as v from 'valibot';
 import { toStandardJsonSchema } from '@valibot/to-json-schema';
 <% if(t.withService) { %>
@@ -22,7 +22,7 @@ export default class <%= vars.ModuleName %> {
       summary: 'Get <%= t.theThings %>',
     })
     @get()
-    static get<%= t.TheThings %> = endpoint({
+    static get<%= t.TheThings %> = procedure({
         handle() {
             <% if(t.withService) { %>
             return <%= vars.ServiceName %>.get<%= t.TheThings %>();
@@ -36,7 +36,7 @@ export default class <%= vars.ModuleName %> {
         summary: 'Get single <%= t.theThing %>',
     })
     @get('{id}')
-    static getSingle<%= t.TheThing %> = endpoint({
+    static getSingle<%= t.TheThing %> = procedure({
         params: toStandardJsonSchema(v.object({ id: v.string() })),
         handle(_req, { id }) {
             <% if(t.withService) { %>
@@ -51,7 +51,7 @@ export default class <%= vars.ModuleName %> {
         summary: 'Update <%= t.theThing %>',
     })
     @put('{id}')
-    static update<%= t.TheThing %> = endpoint({
+    static update<%= t.TheThing %> = procedure({
         body: toStandardJsonSchema(v.object({ todo: v.literal(true) })),
         params: toStandardJsonSchema(v.object({ id: v.string() })),
         async handle(req, { id }) {
@@ -68,7 +68,7 @@ export default class <%= vars.ModuleName %> {
         summary: 'Create <%= t.theThing %>',
     })
     @post()
-    static create<%= t.TheThing %> = endpoint({
+    static create<%= t.TheThing %> = procedure({
         body: toStandardJsonSchema(v.object({ todo: v.literal(true) })),
         async handle(req) {
             const body = await req.json();
@@ -84,7 +84,7 @@ export default class <%= vars.ModuleName %> {
         summary: 'Delete <%= t.theThing %>',
     })
     @del('{id}')
-    static delete<%= t.TheThing %> = endpoint({
+    static delete<%= t.TheThing %> = procedure({
         params: toStandardJsonSchema(v.object({ id: v.string() })),
         handle(_req, { id }) {
             <% if(t.withService) { %>

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

@@ -9,7 +9,7 @@ sourceName: <%= vars.ModuleName %>
 compiledName: <%= t.TheThing + 'RPC' %>
 ---
 
-import { endpoint, prefix, get, put, post, del, operation } from 'vovk';
+import { procedure, prefix, get, put, post, del, operation } from 'vovk';
 import { z } from 'zod';
 <% if(t.withService) { %>
 import <%= vars.ServiceName %> from './<%= vars.ServiceName %><%= t.nodeNextResolutionExt.ts %>';
@@ -21,7 +21,7 @@ export default class <%= vars.ModuleName %> {
       summary: 'Get <%= t.theThings %>',
     })
     @get()
-    static get<%= t.TheThings %> = endpoint({
+    static get<%= t.TheThings %> = procedure({
         handle() {
             <% if(t.withService) { %>
             return <%= vars.ServiceName %>.get<%= t.TheThings %>();
@@ -35,7 +35,7 @@ export default class <%= vars.ModuleName %> {
       summary: 'Get single <%= t.theThing %>',
     })
     @get('{id}')
-    static getSingle<%= t.TheThing %> = endpoint({
+    static getSingle<%= t.TheThing %> = procedure({
       params: z.object({
         id: z.string(),
       }),
@@ -52,7 +52,7 @@ export default class <%= vars.ModuleName %> {
         summary: 'Update <%= t.theThing %>',
     })
     @put('{id}')
-    static update<%= t.TheThing %> = endpoint({
+    static update<%= t.TheThing %> = procedure({
         body: z.object({
           todo: z.literal(true),
         }),
@@ -71,7 +71,7 @@ export default class <%= vars.ModuleName %> {
         summary: 'Create <%= t.theThing %>',
     })
     @post()
-    static create<%= t.TheThing %> = endpoint({
+    static create<%= t.TheThing %> = procedure({
         body: z.object({
             todo: z.literal(true),
         }),
@@ -89,7 +89,7 @@ export default class <%= vars.ModuleName %> {
         summary: 'Delete <%= t.theThing %>',
     })
     @del('{id}')
-    static delete<%= t.TheThing %> = endpoint({
+    static delete<%= t.TheThing %> = procedure({
         params: z.object({
             id: z.string(),
         }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-beta.50",
+  "version": "0.0.1-beta.51",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-beta.56",
+    "vovk": "^3.0.0-beta.59",
     "vovk-ajv": "^0.0.0-beta.4",
     "vovk-client": "^0.0.4-beta.4",
     "vovk-python": "^0.0.1-beta.4",

package/dist/init/createStandardSchemaValidatorFile.d.mts

@@ -1,10 +0,0 @@
-declare const CODE_BY_LIBRARY: {
-    zod: string;
-    valibot: string;
-    arktype: string;
-};
-export declare function createStandardSchemaValidatorFile({ root, validationLibrary, }: {
-    root: string;
-    validationLibrary: keyof typeof CODE_BY_LIBRARY;
-}): Promise<void>;
-export {};

package/dist/init/createStandardSchemaValidatorFile.mjs

@@ -1,56 +0,0 @@
-import fs from 'fs/promises';
-import path from 'path';
-import { getRelativeSrcRoot } from '../getProjectInfo/getConfig/getRelativeSrcRoot.mjs';
-const CODE_BY_LIBRARY = {
-    zod: `import { z } from 'zod/v4';
-import { createStandardValidation } from 'vovk';
-
-export const withZod = createStandardValidation({
-  toJSONSchema: (model: z.core.$ZodType) => z.toJSONSchema(model),
-});`,
-    valibot: `import { createStandardValidation } from 'vovk';
-import { toJsonSchema } from '@valibot/to-json-schema';
-
-export const withValibot = createStandardValidation({
-  toJSONSchema: (model) => toJsonSchema(model, {
-    overrideSchema(context) {
-      if (context.valibotSchema.type === 'file') {
-        return { type: 'string', format: 'binary' };
-      }
-    },
-  }),
-});`,
-    arktype: `import { createStandardValidation } from 'vovk';
-import type { type } from 'arktype';
-
-export const withArk = createStandardValidation({
-  toJSONSchema: (model: type) => model.toJsonSchema({
-    fallback: { 
-      proto: (ctx) => ctx.proto === File ? {
-        type: "string",
-        format: "binary",
-      } : ctx.base,
-      default: (ctx) => ctx.base
-    }
-  })
-});`,
-};
-function getCode(validationLibrary) {
-    const code = CODE_BY_LIBRARY[validationLibrary];
-    if (!code)
-        throw new Error(`Unknown validation library: ${validationLibrary}`);
-    return code;
-}
-export async function createStandardSchemaValidatorFile({ root, validationLibrary, }) {
-    const code = getCode(validationLibrary);
-    const srcRoot = (await getRelativeSrcRoot({ cwd: root })) ?? '.';
-    const libDir = path.resolve(root, srcRoot, 'lib');
-    const filenameByLibrary = {
-        arktype: 'withArk.ts',
-        valibot: 'withValibot.ts',
-        zod: 'withZod.ts',
-    };
-    const filePath = path.join(libDir, filenameByLibrary[validationLibrary]);
-    await fs.mkdir(libDir, { recursive: true });
-    await fs.writeFile(filePath, code);
-}