Move ss

Author: mpppk

pkgs/typed-api-spec/src/core/openapi/openapi.ts

@@ -17,7 +17,7 @@ import {
   ToOpenApiResponse,
 } from "./spec";
 import { StandardSchemaV1 } from "@standard-schema/spec";
-import { SSAnyApiResponse } from "../../ss";
+import { SSAnyApiResponse } from "../ss";
 import { toJsonSchemaApiEndpoints } from "../jsonschema";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

pkgs/typed-api-spec/src/ss/index.t-test.ts pkgs/typed-api-spec/src/core/ss.t-test.ts

@@ -1,14 +1,14 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { Equal, Expect } from "../core/type-test";
+import { Equal, Expect } from "./type-test";
 import { z } from "zod";
-import { ApiP } from "../core";
+import { ApiP } from ".";
 import {
   SSApiEndpoints,
   SSResponseValidators,
   SSValidators,
   ToSSResponseValidators,
   ToSSValidators,
-} from "../ss";
+} from "./ss";
 
 const SSResponse = z.object({ a: z.string() });
 const SSEndpoints = {

pkgs/typed-api-spec/src/ss/index.test.ts pkgs/typed-api-spec/src/core/ss.test.ts

@@ -1,10 +1,10 @@
 import { describe, it, expect, assert } from "vitest";
-import { newSSValidator, SSApiEndpoints } from "./index";
+import { newSSValidator, SSApiEndpoints } from "./ss";
 import * as v from "valibot";
-import { newValidatorPathNotFoundError } from "../core/validator/validate";
-import { AnyResponseSpecValidator } from "../core/validator/response";
-import { AnySpecValidator } from "../core/validator/request";
-import { newMethodInvalidError } from "../core";
+import { newValidatorPathNotFoundError } from "./validator/validate";
+import { AnyResponseSpecValidator } from "./validator/response";
+import { AnySpecValidator } from "./validator/request";
+import { newMethodInvalidError } from ".";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 
 describe("newSSValidator", () => {

pkgs/typed-api-spec/src/ss/index.ts pkgs/typed-api-spec/src/core/ss.ts

@@ -8,24 +8,24 @@ import {
   DefineResponse,
   Method,
   StatusCode,
-} from "../core";
+} from ".";
 import {
   checkValidatorsInput,
   Validator,
   ValidatorInputError,
-} from "../core/validator/validate";
+} from "./validator/validate";
 import { Result } from "../utils";
 import {
   AnySpecValidator,
   listDefinedRequestApiSpecKeys,
   SpecValidator,
   SpecValidatorGeneratorRawInput,
-} from "../core/validator/request";
+} from "./validator/request";
 import {
   listDefinedResponseApiSpecKeys,
   ResponseSpecValidator,
   ResponseSpecValidatorGeneratorRawInput,
-} from "../core/validator/response";
+} from "./validator/response";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type AnyStandardSchemaV1 = StandardSchemaV1<any>;
@@ -173,31 +173,4 @@ export const newSSValidator = <E extends SSApiEndpoints>(endpoints: E) => {
     );
   };
   return { req, res };
-  // return createValidator(
-  //   endpoints,
-  //   async (spec: SSApiSpec, input, key) => {
-  //     let r = spec[key]!["~standard"].validate(input[key]);
-  //     if (r instanceof Promise) r = await r;
-  //     return r;
-  //   },
-  //   async (spec: SSApiSpec, input, key) => {
-  //     const schema = spec["responses"][input.statusCode as StatusCode]?.[key];
-  //     let r = schema!["~standard"].validate(input[key]);
-  //     if (r instanceof Promise) r = await r;
-  //     return r;
-  //   },
-  // ) as {
-  //   req: SSRequestValidatorsGenerator<E>;
-  //   res: SSResponseValidatorsGenerator<E>;
-  // };
 };
-
-// const toResult = <T>(
-//   res: StandardSchemaV1.Result<T>,
-// ): Result<T, ReadonlyArray<StandardSchemaV1.Issue>> => {
-//   if (res.issues) {
-//     return Result.error(res.issues);
-//   } else {
-//     return Result.data(res.value);
-//   }
-// };

pkgs/typed-api-spec/src/express/index.ts

@@ -17,7 +17,7 @@ import { StatusCode } from "../core";
 import { ParsedQs } from "qs";
 import { AnySpecValidator, SpecValidatorMap } from "../core/validator/request";
 import { StandardSchemaV1 } from "@standard-schema/spec";
-import { newSSValidator, SSApiEndpoints } from "../ss";
+import { newSSValidator, SSApiEndpoints } from "../core/ss";
 
 /**
  * Express Request Handler, but with more strict type information.

pkgs/typed-api-spec/src/express/ss.ts

@@ -1,5 +1,5 @@
 import { Method } from "../core";
-import { SSApiEndpoints, ToApiEndpoints, ToSSValidators } from "../ss";
+import { SSApiEndpoints, ToApiEndpoints, ToSSValidators } from "../core/ss";
 import {
   RouterT,
   ToHandler as ToPureHandler,

pkgs/typed-api-spec/src/express/valibot.test.ts

@@ -9,7 +9,7 @@ import {
   newValidatorMethodNotFoundError,
   newValidatorPathNotFoundError,
 } from "../core/validator/validate";
-import { SSApiEndpoints, SSApiSpec, SSValidators } from "../ss";
+import { SSApiEndpoints, SSApiSpec, SSValidators } from "../core/ss";
 import { ToHandlers, typed } from "./ss";
 
 type SSValidateLocals<

pkgs/typed-api-spec/src/express/zod.test.ts

@@ -9,7 +9,7 @@ import {
   newValidatorMethodNotFoundError,
   newValidatorPathNotFoundError,
 } from "../core/validator/validate";
-import { SSApiEndpoints, SSApiSpec, SSValidators } from "../ss";
+import { SSApiEndpoints, SSApiSpec, SSValidators } from "../core/ss";
 import { ToHandlers, typed } from "./ss";
 
 type SSValidateLocals<

pkgs/typed-api-spec/src/fastify/zod.ts

@@ -1,5 +1,5 @@
 import { AnyApiResponses, Method, StatusCode } from "../core";
-import { SSApiEndpoint, SSApiEndpoints, SSApiSpec } from "../ss";
+import { SSApiEndpoint, SSApiEndpoints, SSApiSpec } from "../core/ss";
 
 const toFastifyResponse = <Responses extends AnyApiResponses>(
   responses: Responses,

pkgs/typed-api-spec/src/fetch/validation.ts

@@ -4,7 +4,7 @@ import { Method, SSResult, StatusCode } from "../core";
 import { AnySpecValidator, runSpecValidator } from "../core";
 import { AnyResponseSpecValidator, runResponseSpecValidator } from "../core";
 import { StandardSchemaV1 } from "@standard-schema/spec";
-import { newSSValidator, SSApiEndpoints } from "../ss";
+import { newSSValidator, SSApiEndpoints } from "../core/ss";
 
 const dummyHost = "https://example.com";
 

pkgs/typed-api-spec/src/zod/validation.ts

@@ -1,5 +1,5 @@
 import type FetchT from "../fetch/index.js";
-import { SSApiEndpoints, ToApiEndpoints } from "../ss/index.js";
+import { SSApiEndpoints, ToApiEndpoints } from "../core/ss.js";
 
 export const withZodValidation = async (spec: SSApiEndpoints, ft = fetch) => {
   const { withValidation } = await import("../fetch/index.js");