From 654a9737b93018b60ab4b2a84f5285ed0b1df76e Mon Sep 17 00:00:00 2001 From: nurodev Date: Sun, 28 Apr 2024 12:50:20 +0100 Subject: [PATCH] Removed global params for now --- .../src/_shared/_shared.validators.ts | 21 ++----------------- packages/uuid.rocks/src/index.ts | 6 ++---- packages/uuid.rocks/src/json/json.types.ts | 2 -- .../uuid.rocks/src/json/json.validators.ts | 15 +++---------- packages/uuid.rocks/src/plain/plain.types.ts | 2 -- .../uuid.rocks/src/plain/plain.validators.ts | 9 ++++---- packages/uuid.rocks/src/runtimeSafe.ts | 6 ++---- 7 files changed, 13 insertions(+), 48 deletions(-) diff --git a/packages/uuid.rocks/src/_shared/_shared.validators.ts b/packages/uuid.rocks/src/_shared/_shared.validators.ts index c645646..cda8f73 100644 --- a/packages/uuid.rocks/src/_shared/_shared.validators.ts +++ b/packages/uuid.rocks/src/_shared/_shared.validators.ts @@ -28,22 +28,5 @@ export const UUIDSchema = z.union([ NanoIDSchema, ]); -export const GlobalParamsSchema = z - .object({ - /** Uses the [nanoid](https://www.npmjs.com/package/nanoid) package to generate ID’s. Supports &len= param to adjust ID length. If this is not a number it will be silently ignored. If used in combonation with bulk api, may fail if len is too long. */ - nanoid: z.boolean(), - - /** Switches from standard uuidv4 format to [Readable UUIDs](https://github.com/Debdut/uuid-readable), that are Shakespearean grammatically correct sentences. */ - readable: z.boolean(), - - /** Switches from standard UUIDv4 to a [Short ID](https://www.npmjs.com/package/short-uuid). These ID’s are converted from UUIDv4 ID’s so they are just as unique & colission free. */ - short: z.boolean(), - - /** - * Uses the [ulidx](https://www.npmjs.com/package/ulidx) package to generate ULID’s. - * - * Eg. 01FB0CCPD8R0H9KAJBFQJDFYJB - */ - ulid: z.boolean(), - }) - .partial(); +// TODO(@nurodev): Implement global search params once I have time to narrow down each endpoints support for each param. +export const GlobalParamsSchema = z.object({}); diff --git a/packages/uuid.rocks/src/index.ts b/packages/uuid.rocks/src/index.ts index c2f41bf..b7b48d5 100644 --- a/packages/uuid.rocks/src/index.ts +++ b/packages/uuid.rocks/src/index.ts @@ -7,7 +7,6 @@ import type { JsonBulkParams, JsonMap, JsonMapParams, - JsonParams, } from "./json/json.types"; import type { NanoID, NanoIDParams } from "./nanoid/nanoid.types"; import type { @@ -18,7 +17,6 @@ import type { PlainMapParams, PlainNamespaceMap, PlainNamespaceMapParams, - PlainParams, } from "./plain/plain.types"; import type { Stats } from "./stats/stats.types"; @@ -26,7 +24,7 @@ const u = initUntypeable(); const router = u.router({ /** Gets single uuid with JSON output */ - "/json": u.input().output(), + "/json": u.input().output(), /** Gets uuids in bulk (up to 20k) with JSON output */ "/json/bulk": u.input().output(), @@ -38,7 +36,7 @@ const router = u.router({ "/nanoid": u.input().output(), /** Gets single UUID in plaintext */ - "/plain": u.input().output(), + "/plain": u.input().output(), /** Gets uuids in bulk (up to 20k) in plaintext */ "/plain/bulk": u.input().output(), diff --git a/packages/uuid.rocks/src/json/json.types.ts b/packages/uuid.rocks/src/json/json.types.ts index 6a77514..c45e89a 100644 --- a/packages/uuid.rocks/src/json/json.types.ts +++ b/packages/uuid.rocks/src/json/json.types.ts @@ -5,11 +5,9 @@ import type { JsonBulkSchema, JsonMapParamsSchema, JsonMapSchema, - JsonParamsSchema, JsonSchema, } from "./json.validators"; -export type JsonParams = z.infer; export type Json = z.infer; export type JsonBulkParams = z.infer; diff --git a/packages/uuid.rocks/src/json/json.validators.ts b/packages/uuid.rocks/src/json/json.validators.ts index a355448..916b633 100644 --- a/packages/uuid.rocks/src/json/json.validators.ts +++ b/packages/uuid.rocks/src/json/json.validators.ts @@ -1,13 +1,6 @@ import { z } from "zod"; -import { GlobalParamsSchema, UUIDSchema } from "../_shared/_shared.validators"; - -export const JsonParamsSchema = GlobalParamsSchema.pick({ - nanoid: true, - readable: true, - short: true, - ulid: true, -}); +import { UUIDSchema } from "../_shared/_shared.validators"; export const JsonSchema = z.object({ apiVersion: z.string(), @@ -18,9 +11,7 @@ export const JsonSchema = z.object({ uuid: UUIDSchema, }); -export const JsonBulkParamsSchema = GlobalParamsSchema.pick({ - readable: true, -}).extend({ +export const JsonBulkParamsSchema = z.object({ count: z.number().int().positive().max(20000), }); @@ -31,7 +22,7 @@ export const JsonBulkSchema = z.object({ timestamp: z.coerce.date(), }); -export const JsonMapParamsSchema = GlobalParamsSchema.extend({ +export const JsonMapParamsSchema = z.object({ key: z.string().min(1), }); diff --git a/packages/uuid.rocks/src/plain/plain.types.ts b/packages/uuid.rocks/src/plain/plain.types.ts index 32fe2fe..83697c6 100644 --- a/packages/uuid.rocks/src/plain/plain.types.ts +++ b/packages/uuid.rocks/src/plain/plain.types.ts @@ -7,11 +7,9 @@ import type { PlainMapSchema, PlainNamespaceMapParamsSchema, PlainNamespaceMapSchema, - PlainParamsSchema, PlainSchema, } from "./plain.validators"; -export type PlainParams = z.infer; export type Plain = z.infer; export type PlainBulkParams = z.infer; diff --git a/packages/uuid.rocks/src/plain/plain.validators.ts b/packages/uuid.rocks/src/plain/plain.validators.ts index 63c0489..abab116 100644 --- a/packages/uuid.rocks/src/plain/plain.validators.ts +++ b/packages/uuid.rocks/src/plain/plain.validators.ts @@ -1,21 +1,20 @@ import { z } from "zod"; -import { GlobalParamsSchema, UUIDSchema } from "../_shared/_shared.validators"; +import { UUIDSchema } from "../_shared/_shared.validators"; -export const PlainParamsSchema = GlobalParamsSchema; export const PlainSchema = UUIDSchema; -export const PlainBulkParamsSchema = GlobalParamsSchema.extend({ +export const PlainBulkParamsSchema = z.object({ count: z.number().int().positive().max(20000), }); export const PlainBulkSchema = z.string(); // TODO: Improve this schema to check for UUID's broken up with a new line. -export const PlainMapParamsSchema = GlobalParamsSchema.extend({ +export const PlainMapParamsSchema = z.object({ key: z.string().min(1), }); export const PlainMapSchema = UUIDSchema; -export const PlainNamespaceMapParamsSchema = GlobalParamsSchema.extend({ +export const PlainNamespaceMapParamsSchema = z.object({ namespace: z.string().min(1), key: z.string().min(1), }); diff --git a/packages/uuid.rocks/src/runtimeSafe.ts b/packages/uuid.rocks/src/runtimeSafe.ts index a1c3518..c51c79d 100644 --- a/packages/uuid.rocks/src/runtimeSafe.ts +++ b/packages/uuid.rocks/src/runtimeSafe.ts @@ -6,7 +6,6 @@ import { JsonBulkSchema, JsonMapParamsSchema, JsonMapSchema, - JsonParamsSchema, JsonSchema, } from "./json/json.validators"; import { NanoIDSchema, NanoIdParamsSchema } from "./nanoid/nanoid.validators"; @@ -18,7 +17,6 @@ import { PlainNamespaceMapSchema, PlainMapParamsSchema, PlainMapSchema, - PlainParamsSchema, } from "./plain/plain.validators"; import { StatsSchema } from "./stats/stats.validators"; @@ -26,7 +24,7 @@ const u = initUntypeable(); export const uuidRocksSafeRouter = u.router({ /** Gets single uuid with JSON output */ - "/json": u.input(JsonParamsSchema).output(JsonSchema), + "/json": u.input(GlobalParamsSchema).output(JsonSchema), /** Gets uuids in bulk (up to 20k) with JSON output */ "/json/bulk": u.input(JsonBulkParamsSchema).output(JsonBulkSchema), @@ -38,7 +36,7 @@ export const uuidRocksSafeRouter = u.router({ "/nanoid": u.input(NanoIdParamsSchema).output(NanoIDSchema), /** Gets single UUID in plaintext */ - "/plain": u.input(PlainParamsSchema).output(PlainSchema), + "/plain": u.input(GlobalParamsSchema).output(PlainSchema), /** Gets uuids in bulk (up to 20k) in plaintext */ "/plain/bulk": u.input(PlainBulkParamsSchema).output(PlainBulkSchema),