svelte-reflector 1.0.28 → 1.0.31

package/dist/main.js

@@ -101,7 +101,6 @@ export class Reflector {
         });
         this.schemaFile.changeData([
             'import { build, BuildedInput } from "$reflector/reflector.svelte";',
-            'import { validateInputs } from "$lib/sanitizers/validateFormats";',
             // ...Array.from(enums),
             ...treatedSchemas,
         ].join("\n\n"));
@@ -110,16 +109,16 @@ export class Reflector {
       type ValidatorResult = string | null;
       type ValidatorFn<T> = (v: T) => ValidatorResult;
 
-      export class Behavior { onError?: (e) => void; onSuccess?: () => void }
+      export class Behavior { onError?: (e) => void; onSuccess?: (v) => void }
 
       export class BuildedInput<T> {
         value = $state<T>(null as any);
         display = $state<T>(null as any);
         required: boolean;
         placeholder: T;
-        private readonly validator?: ValidatorFn<T>;
+        readonly validator?: ValidatorFn<T>;
 
-        constructor(params: { key?: T; example: T; required: boolean; validator?: ValidatorFn<T> }) {
+        constructor(params: { key?: T | undefined; example: T; required: boolean; validator?: ValidatorFn<T> }) {
           const { example, required, key, validator } = params;
 
           const initial = key ?? example;
@@ -141,7 +140,7 @@ export class Reflector {
       }
 
       export function build<T>(params: {
-        key?: T;
+        key?: T | undefined;
         example: T;
         required: boolean;
         validator?: ValidatorFn<T>;

package/dist/method.d.ts

@@ -5,6 +5,7 @@ export declare class Method {
     name: string;
     description: string | undefined;
     endpoint: string;
+    isValid: boolean;
     request: Request;
     paths: PrimitiveProp[];
     headers: PrimitiveProp[];
@@ -18,6 +19,7 @@ export declare class Method {
     private readonly gee;
     private getProps;
     private buildCallMethod;
+    private readonly methodReturn;
     build(): string;
     private buildDescription;
 }

package/dist/method.js

@@ -6,6 +6,7 @@ export class Method {
     // zodProperties: Property[];
     description;
     endpoint;
+    isValid = true;
     request;
     paths = [];
     headers = [];
@@ -62,31 +63,35 @@ export class Method {
     }
     buildCallMethod() {
         const beforeResponse = [];
-        // const props = this.getProps();
-        const diamond = this.request.responseType ? `${this.request.responseType}Interface` : "null";
-        if (this.request.apiType === "get") {
-            if (this.request.attributeType === "list") {
-                beforeResponse.push(`const {data: { data }} = response`, "\n\n", `this.list = ${this.request.responseType}.from(data)`);
-                const inside = `
-          const response = await repo.api.get<{data: ${diamond}}, unknown>({
+        const preBuild = () => {
+            return this.request.responseType ? [`${this.request.responseType}Interface`, "const response ="] : ["null", ""];
+        };
+        const [diamond, response] = preBuild();
+        if (this.request.attributeType === "list") {
+            beforeResponse.push(`this.list = ${this.request.responseType}.from(response.data)`);
+            const inside = `
+          ${response} await repo.api.get<${diamond}, unknown>({
             endpoint,
             queryData: { ${this.gee(this.querys)} }
           })
           ${beforeResponse.join(";")}
         `;
-                return { inside, outside: "" };
-            }
-            else if (this.request.attributeType === "entity") {
-                const entityName = treatByUppercase(this.request.responseType ?? "");
+            return { inside, outside: "" };
+        }
+        else if (this.request.attributeType === "entity") {
+            if (this.request.responseType) {
+                const entityName = treatByUppercase(this.request.responseType);
                 beforeResponse.push(`this.${entityName} = new ${this.request.responseType}(response)`);
-                const inside = `
-          const response = await repo.api.get<${diamond}, unknown>({
+            }
+            let querys = this.querys.length > 0 ? `queryData: {${this.querys.map((q) => q.name).join(",")}}` : "";
+            const inside = `
+          ${response} await repo.api.get<${diamond}, unknown>({
             endpoint,
+            ${querys}
           })
           ${beforeResponse.join(";")}
         `;
-                return { inside, outside: "" };
-            }
+            return { inside, outside: "" };
         }
         else if (this.request.apiType === "post" || this.request.apiType === "put" || this.request.apiType === "patch") {
             let data;
@@ -101,7 +106,7 @@ export class Method {
             }
             const outside = ["this.loading = true", data, headers].join("\n");
             const inside = `
-        const response = await repo.api.${this.request.apiType}<${diamond}>({
+        ${response} await repo.api.${this.request.apiType}<${diamond}>({
           endpoint,
           ${hasData ? "data," : ""}
           ${hasHeaders ? "headers," : ""}
@@ -111,7 +116,7 @@ export class Method {
         }
         else if (this.request.apiType === "delete") {
             const inside = `
-        const response = await repo.api.delete<${diamond}, unknown>({
+        ${response} await repo.api.delete<${diamond}, unknown>({
           endpoint,
         })
       `;
@@ -120,38 +125,38 @@ export class Method {
         }
         return { inside: "", outside: "" };
     }
+    methodReturn = () => {
+        if (this.request.attributeType === "list") {
+            return "this.list";
+        }
+        if (!this.request.responseType) {
+            // this.isValid = false;
+        }
+        return this.request.responseType ? `new ${this.request.responseType}(response)` : "null";
+    };
     build() {
         const { inside, outside } = this.buildCallMethod();
         if (this.name === "list")
             this.name = "listAll";
-        // const hasProprierties = this.querys.length > 0;
-        // if (!hasProprierties && this.request.apiType === "delete") {
-        //   createDangerMessage(`${this.name} não vai funcionar, pois não aceita parâmetros na requisição.`);
-        // }
         const description = this.buildDescription();
         const a = "`";
-        const methodReturn = () => {
-            if (this.request.attributeType === "list") {
-                return "this.list";
-            }
-            return this.request.responseType ? `new ${this.request.responseType}(response)` : "null";
-        };
+        const endpoint = `${a}${getFullEndpoint(this.endpoint)}${a}`;
         return `
       ${description}
       async ${this.name}(behavior: Behavior = new Behavior()) {
         const {onError, onSuccess} = behavior
         ${this.getProps()}
-        const endpoint = ${a}${getFullEndpoint(this.endpoint)}${a}
+        const endpoint = ${endpoint}
 
         ${outside}
 
         try{
           ${inside}
-          onSuccess?.()
+          onSuccess?.(response)
 
-          return ${methodReturn()}
+          return ${this.methodReturn()}
         } catch(e) {
-          onError?.(e)
+          return onError?.(e)
         } finally {
           this.loading = false
         }

package/dist/module.js

@@ -86,6 +86,11 @@ export class Module {
             moduleClear.add(`clear${capitalizedName}() { this.${name} = new ${capitalizedName}() }`);
         };
         if (querys.length > 0) {
+            querys.forEach((q) => {
+                if (q.name === "permissions") {
+                    // console.log(q);
+                }
+            });
             getParams({ name: "querys", props: querys });
         }
         if (headers.length > 0) {
@@ -100,6 +105,10 @@ export class Module {
         const form = [];
         for (const method of this.methods) {
             const { bodyType, responseType, attributeType } = method.request;
+            // if (!method.isValid) {
+            //   console.log(`Método ${method.name} não foi adicionado devido à falta de tipagem na resposta`)
+            //   continue;
+            // }
             if (attributeType === "form" && bodyType) {
                 form.push({
                     name: method.name,
@@ -216,6 +225,11 @@ export class Module {
     }
     buildClass(params) {
         const { moduleInit, moduleAttributes, moduleClear } = params;
+        const reset = moduleAttributes.length > 1
+            ? `reset() {
+          ${moduleInit.join(";")}
+        }`
+            : "";
         return `
       export class ${this.moduleName}Module {
         ${moduleAttributes.join(";")}
@@ -226,9 +240,7 @@ export class Module {
 
         ${moduleClear.join("\n\n")}
 
-        reset() {
-          ${moduleInit.join(";")}
-        }
+        ${reset}
       }
     `;
     }

package/dist/primitive-property.js

@@ -36,7 +36,7 @@ export class PrimitiveProp {
     getEmptyExample(params) {
         const { schemaObject, type } = params;
         if (type === "number") {
-            return 0;
+            return 1;
         }
         else if (type === "boolean") {
             return false;
@@ -45,7 +45,7 @@ export class PrimitiveProp {
             return `'${schemaObject.enum[0]}'`;
         }
         else {
-            return "''";
+            return "";
         }
     }
     thisDot() {

package/package.json

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