svelte-reflector 1.3.6 → 1.3.8

package/dist/core/module/ModuleClassBuilder.js

@@ -67,6 +67,9 @@ export class ModuleClassBuilder {
           ]);
         }
       `;
+            if (bundle.length > 0) {
+                this.imports.addReflectorImport("bundleStrict");
+            }
             return `
         class ${outputName} {
           ${attributes.join(";")}
@@ -75,9 +78,9 @@ export class ModuleClassBuilder {
 
           ${bundle.length > 0 ? `
           bundle() {
-            return {
+            return bundleStrict({
               ${bundle.join(",")}
-            }
+            })
           }
           ` : ""}
         }
@@ -92,12 +95,15 @@ export class ModuleClassBuilder {
                 bundle.push(prop.bundleBuild());
             });
         }
+        if (bundle.length > 0) {
+            this.imports.addReflectorImport("bundleStrict");
+        }
         const bundleBuild = bundle.length > 0
             ? `
       bundle() {
-        return {
+        return bundleStrict({
           ${bundle.join(",")}
-        }
+        })
       }
     `
             : "";

package/dist/core/module/ModuleSchemaFileBuilder.js

@@ -18,7 +18,7 @@ export class ModuleSchemaFileBuilder {
         }
         const treatedSchemas = schemas.map((s) => `${s.interface};\n${s.schema};`);
         const imports = [
-            `import { build, BuildedInput } from "${config.reflectorAlias}/reflector.svelte";`,
+            `import { build, BuildedInput, bundleStrict } from "${config.reflectorAlias}/reflector.svelte";`,
             `import { validateInputs } from "${config.validatorsImport}";`,
         ];
         if (enumDeps.size > 0) {

package/dist/core/schema/SchemaClassRenderer.js

@@ -34,20 +34,20 @@ export class SchemaClassRenderer {
             keys.push(prop.classBuild());
             bundleParams.push(prop.bundleBuild());
         });
-        const constructorCode = `constructor(params?: { data?: ${name}Interface | undefined, empty?: boolean }) { 
-        ${constructorThis.join(";\n")}
+        const constructorCode = `constructor(params?: { data?: ${name}Interface | undefined, empty?: boolean }) { 
+        ${constructorThis.join(";\n")}
       }`;
-        const schema = `
-    export class ${name} {
-      ${keys.join(";")}
-
-      ${constructorCode}
-
-      ${staticMethod}
-
-      bundle(){
-        return { ${bundleParams.join(",")} }
-      }
+        const schema = `
+    export class ${name} {
+      ${keys.join(";")}
+
+      ${constructorCode}
+
+      ${staticMethod}
+
+      bundle(){
+        return bundleStrict({ ${bundleParams.join(",")} })
+      }
     };`;
         return { interface: reflectorInterface.builded, schema };
     }

package/dist/props/primitive.property.js

@@ -103,8 +103,9 @@ export class PrimitiveProp {
         else if (this.customType) {
             typeParam = `<${this.effectiveType}>`;
         }
+        const nullableParam = this.isNullable ? "nullable: true, " : "";
         return `
-      build${typeParam}({ key: ${keyExpr}, placeholder: ${this.example}, example: ${buildedExample}, required: ${required}, ${buildedValidator()}})
+      build${typeParam}({ key: ${keyExpr}, placeholder: ${this.example}, example: ${buildedExample}, required: ${required}, ${nullableParam}${buildedValidator()}})
     `;
     }
     thisDot() {

package/dist/runtime/reflector.svelte.ts

@@ -1,210 +1,221 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import toast from "$lib/utils/toast.svelte";
-import { goto } from "$app/navigation";
-import { page } from "$app/state";
-import { browser } from "$app/environment";
-import { SvelteURL } from "svelte/reactivity";
-
-type ValidatorResult = string | null;
-type ValidatorFn<T> = (v: T) => ValidatorResult;
-type BundleResult<T> = T extends { bundle: () => infer R } ? R : T;
-
-export type ApiCallParams<TResponse, TPaths = void> = TPaths extends void
-  ? { behavior?: Behavior<TResponse, ApiErrorResponse> }
-  : { behavior?: Behavior<TResponse, ApiErrorResponse>; paths?: TPaths };
-
-type PartialBuildedInput<T> = {
-  [K in Exclude<keyof T, "bundle">]?: BuildedInput<T[K]>;
-} & {
-  bundle: unknown;
-};
-
-export interface QueryContract {
-  event: string;
-  key: string;
-}
-
-type SeiLa = HTMLInputElement | HTMLButtonElement;
-export type SvelteEvent = {
-  currentTarget: EventTarget & SeiLa;
-};
-
-export interface ApiErrorResponse {
-  error: string;
-  message: string;
-}
-
-export class Behavior<TSuccess = unknown, TError = unknown> {
-  onError?: (e: TError) => Promise<void> | void;
-  onSuccess?: (v: TSuccess) => Promise<void> | void;
-}
-
-export class BuildedInput<T> {
-  value = $state<T>(null as any);
-  display = $state<T>(null as any);
-  required: boolean;
-  placeholder: T;
-  readonly kind = "builded";
-  readonly validator?: ValidatorFn<T>;
-
-  constructor(params: {
-    key?: T | undefined;
-    example: T;
-    required: boolean;
-    placeholder: T;
-    validator?: ValidatorFn<T>;
-  }) {
-    const { example, required, key, validator, placeholder } = params;
-
-    const initial = key === undefined ? example : key;
-
-    this.value = initial;
-    this.display = initial;
-    this.required = required;
-    this.placeholder = placeholder;
-
-    if (validator) {
-      this.validator = validator;
-    }
-  }
-
-  validate(): ValidatorResult {
-    if (!this.validator) return null;
-    return this.validator(this.value);
-  }
-}
-
-export class EnumQueryBuilder<T> {
-  readonly key: string = "";
-  values = $derived(page.url.searchParams.getAll(this.key)) as T[];
-  selected = $state<T | null>(null);
-
-  constructor(params: { key: string }) {
-    const { key } = params;
-
-    this.key = key;
-  }
-
-  add = () => {
-    if (!this.selected) return;
-    const values = [...this.values, this.selected] as string[];
-    changeArrayParam({ key: this.key, values });
-    this.selected = null;
-  };
-
-  remove = (index: number) => {
-    const values = [
-      ...this.values.slice(0, index),
-      ...this.values.slice(index + 1),
-    ] as string[];
-    return changeArrayParam({ key: this.key, values });
-  };
-}
-
-export function build<T>(params: {
-  key?: T | undefined;
-  example: T;
-  placeholder: T;
-  required: boolean;
-  validator?: ValidatorFn<T>;
-}): BuildedInput<T> {
-  return new BuildedInput(params);
-}
-
-export function isFormValid<T>(schema: PartialBuildedInput<T>): boolean {
-  delete (schema as { bundle?: unknown }).bundle;
-
-  const arrayOfBuildedInputs = Object.values(schema) as BuildedInput<unknown>[];
-
-  const isValid = arrayOfBuildedInputs.every((a) => {
-    const result = a?.validate?.() ?? null;
-
-    if (result) {
-      throw new Error(`O valor ${a.value} do campo está incorreto. ${result}`);
-    }
-
-    return result === null;
-  });
-
-  if (!isValid) {
-    toast.error({
-      title: "Erro ao fazer a requisição",
-      description: "Um ou mais campos preenchidos estão incorretos.",
-    });
-  }
-
-  return isValid;
-}
-
-export function genericArrayBundler(data: string[]): string[];
-export function genericArrayBundler<T extends { bundle: () => BundleResult<T> }>(
-  data: T[],
-): BundleResult<T>[];
-export function genericArrayBundler<T extends { bundle: () => BundleResult<T> }>(
-  data: T[] | string[],
-) {
-  if (data.length === 0) return [];
-  if (typeof data[0] === "string") return data;
-  return (data as T[]).map((item) => item.bundle());
-}
-
-export function changeParam({ event, key }: QueryContract) {
-  const newValue = event;
-  const url = new SvelteURL(page.url);
-  url.searchParams.set(key, String(newValue));
-  goto(url, { replaceState: true, keepFocus: true });
-}
-
-type StringOrNumber = string | number;
-
-type QueryWithArrayType = {
-  key: string;
-  value: string | number | null | StringOrNumber[];
-};
-
-export class QueryBuilder {
-  readonly key: string = "";
-  value = $state<string | null>(null);
-  readonly kind = "query";
-
-  constructor(params: { key: string }) {
-    const { key } = params;
-    this.key = key;
-
-    const urlValue = page.url.searchParams.get(key);
-    this.value = urlValue !== null ? urlValue : null;
-  }
-
-  update(event: string | number | null) {
-    if (event === null || event === undefined) return;
-    this.value = String(event);
-    return changeParam({ key: this.key, event: this.value });
-  }
-}
-
-export function setQueryGroup(group: QueryWithArrayType[]) {
-  if (!browser) return;
-
-  const url = new SvelteURL(page.url);
-
-  for (const p of group) {
-    const { key, value } = p;
-
-    if (Array.isArray(value)) {
-      url.searchParams.delete(key);
-      value.forEach((v) => url.searchParams.append(key, String(v)));
-      continue;
-    }
-
-    url.searchParams.set(key, String(value));
-  }
-
-  goto(url, { replaceState: true, keepFocus: false });
-}
-
-export function changeArrayParam({ values, key }: { values: string[]; key: string }) {
-  const url = new SvelteURL(page.url);
-  url.searchParams.delete(key);
-  values.forEach((value) => url.searchParams.append(key, value));
-  goto(url, { replaceState: true, keepFocus: true });
-}
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import toast from "$lib/utils/toast.svelte";
+import { goto } from "$app/navigation";
+import { page } from "$app/state";
+import { browser } from "$app/environment";
+import { SvelteURL } from "svelte/reactivity";
+
+type ValidatorResult = string | null;
+type ValidatorFn<T> = (v: T) => ValidatorResult;
+type BundleResult<T> = T extends { bundle: () => infer R } ? R : T;
+
+export type ApiCallParams<TResponse, TPaths = void> = TPaths extends void
+  ? { behavior?: Behavior<TResponse, ApiErrorResponse> }
+  : { behavior?: Behavior<TResponse, ApiErrorResponse>; paths?: TPaths };
+
+type PartialBuildedInput<T> = {
+  [K in Exclude<keyof T, "bundle">]?: BuildedInput<T[K]>;
+} & {
+  bundle: unknown;
+};
+
+export interface QueryContract {
+  event: string;
+  key: string;
+}
+
+type SeiLa = HTMLInputElement | HTMLButtonElement;
+export type SvelteEvent = {
+  currentTarget: EventTarget & SeiLa;
+};
+
+export interface ApiErrorResponse {
+  error: string;
+  message: string;
+}
+
+export class Behavior<TSuccess = unknown, TError = unknown> {
+  onError?: (e: TError) => Promise<void> | void;
+  onSuccess?: (v: TSuccess) => Promise<void> | void;
+}
+
+export class BuildedInput<T> {
+  value = $state<T>(null as any);
+  display = $state<T>(null as any);
+  required: boolean;
+  nullable: boolean;
+  placeholder: T;
+  readonly kind = "builded";
+  readonly validator?: ValidatorFn<T>;
+
+  constructor(params: {
+    key?: T | undefined;
+    example: T;
+    required: boolean;
+    nullable?: boolean;
+    placeholder: T;
+    validator?: ValidatorFn<T>;
+  }) {
+    const { example, required, nullable, key, validator, placeholder } = params;
+
+    const initial = key === undefined ? example : key;
+
+    this.value = initial;
+    this.display = initial;
+    this.required = required;
+    this.nullable = nullable ?? false;
+    this.placeholder = placeholder;
+
+    if (validator) {
+      this.validator = validator;
+    }
+  }
+
+  validate(): ValidatorResult {
+    if (!this.validator) return null;
+    return this.validator(this.value);
+  }
+}
+
+export class EnumQueryBuilder<T> {
+  readonly key: string = "";
+  values = $derived(page.url.searchParams.getAll(this.key)) as T[];
+  selected = $state<T | null>(null);
+
+  constructor(params: { key: string }) {
+    const { key } = params;
+
+    this.key = key;
+  }
+
+  add = () => {
+    if (!this.selected) return;
+    const values = [...this.values, this.selected] as string[];
+    changeArrayParam({ key: this.key, values });
+    this.selected = null;
+  };
+
+  remove = (index: number) => {
+    const values = [
+      ...this.values.slice(0, index),
+      ...this.values.slice(index + 1),
+    ] as string[];
+    return changeArrayParam({ key: this.key, values });
+  };
+}
+
+export function build<T>(params: {
+  key?: T | undefined;
+  example: T;
+  placeholder: T;
+  required: boolean;
+  nullable?: boolean;
+  validator?: ValidatorFn<T>;
+}): BuildedInput<T> {
+  return new BuildedInput(params);
+}
+
+export function isFormValid<T>(schema: PartialBuildedInput<T>): boolean {
+  delete (schema as { bundle?: unknown }).bundle;
+
+  const arrayOfBuildedInputs = Object.values(schema) as BuildedInput<unknown>[];
+
+  const isValid = arrayOfBuildedInputs.every((a) => {
+    const result = a?.validate?.() ?? null;
+
+    if (result) {
+      throw new Error(`O valor ${a.value} do campo está incorreto. ${result}`);
+    }
+
+    return result === null;
+  });
+
+  if (!isValid) {
+    toast.error({
+      title: "Erro ao fazer a requisição",
+      description: "Um ou mais campos preenchidos estão incorretos.",
+    });
+  }
+
+  return isValid;
+}
+
+export function genericArrayBundler(data: string[]): string[];
+export function genericArrayBundler<T extends { bundle: () => BundleResult<T> }>(
+  data: T[],
+): BundleResult<T>[];
+export function genericArrayBundler<T extends { bundle: () => BundleResult<T> }>(
+  data: T[] | string[],
+) {
+  if (data.length === 0) return [];
+  if (typeof data[0] === "string") return data;
+  return (data as T[]).map((item) => item.bundle());
+}
+
+export function changeParam({ event, key }: QueryContract) {
+  const newValue = event;
+  const url = new SvelteURL(page.url);
+  url.searchParams.set(key, String(newValue));
+  goto(url, { replaceState: true, keepFocus: true });
+}
+
+type StringOrNumber = string | number;
+
+type QueryWithArrayType = {
+  key: string;
+  value: string | number | null | StringOrNumber[];
+};
+
+export class QueryBuilder {
+  readonly key: string = "";
+  value = $state<string | null>(null);
+  readonly kind = "query";
+
+  constructor(params: { key: string }) {
+    const { key } = params;
+    this.key = key;
+
+    const urlValue = page.url.searchParams.get(key);
+    this.value = urlValue !== null ? urlValue : null;
+  }
+
+  update(event: string | number | null) {
+    if (event === null || event === undefined) return;
+    this.value = String(event);
+    return changeParam({ key: this.key, event: this.value });
+  }
+}
+
+export function setQueryGroup(group: QueryWithArrayType[]) {
+  if (!browser) return;
+
+  const url = new SvelteURL(page.url);
+
+  for (const p of group) {
+    const { key, value } = p;
+
+    if (Array.isArray(value)) {
+      url.searchParams.delete(key);
+      value.forEach((v) => url.searchParams.append(key, String(v)));
+      continue;
+    }
+
+    url.searchParams.set(key, String(value));
+  }
+
+  goto(url, { replaceState: true, keepFocus: false });
+}
+
+export function changeArrayParam({ values, key }: { values: string[]; key: string }) {
+  const url = new SvelteURL(page.url);
+  url.searchParams.delete(key);
+  values.forEach((value) => url.searchParams.append(key, value));
+  goto(url, { replaceState: true, keepFocus: true });
+}
+
+export function bundleStrict<T extends Record<string, unknown>>(
+  payload: T,
+): { [K in keyof T as Exclude<T[K], undefined> extends never ? never : K]: Exclude<T[K], undefined> };
+export function bundleStrict(payload: Record<string, unknown>): Record<string, unknown> {
+  return Object.fromEntries(Object.entries(payload).filter(([, v]) => v !== undefined));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-reflector",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "description": "Reflects zod types from openAPI schemas",
   "type": "module",
   "main": "./dist/index.js",