reactivated 0.34.1 → 0.35.0

package/dist/generator/constants.mjs

@@ -6,7 +6,7 @@ const stdinBuffer = fs.readFileSync(0);
 import { Project, VariableDeclarationKind, Writers, } from "ts-morph";
 const schema = JSON.parse(stdinBuffer.toString("utf8"));
 const project = new Project();
-const interfaces = project.createSourceFile("");
+const statemenets = [];
 const { urls, templates, types, values } = schema;
 for (const name of Object.keys(values)) {
     // Top level constants are deprecated.
@@ -14,7 +14,7 @@ for (const name of Object.keys(values)) {
     if (name.includes(".")) {
         continue;
     }
-    interfaces.addVariableStatement({
+    statemenets.push({
         declarationKind: VariableDeclarationKind.Const,
         isExported: true,
         declarations: [
@@ -25,7 +25,7 @@ for (const name of Object.keys(values)) {
         ],
     });
 }
-interfaces.addVariableStatement({
+statemenets.push({
     declarationKind: VariableDeclarationKind.Const,
     isExported: true,
     declarations: [
@@ -35,5 +35,7 @@ interfaces.addVariableStatement({
         },
     ],
 });
-process.stdout.write(interfaces.getText());
+const constantsSource = project.createSourceFile("");
+constantsSource.addVariableStatements(statemenets);
+process.stdout.write(constantsSource.getText());
 //# sourceMappingURL=constants.mjs.map

package/dist/generator/constants.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"constants.mjs","sourceRoot":"","sources":["../../src/generator/constants.mts"],"names":[],"mappings":";AAEA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,wDAAwD;AACxD,qEAAqE;AACrE,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAEvC,OAAO,EACH,OAAO,EAIP,uBAAuB,EAEvB,OAAO,GACV,MAAM,UAAU,CAAC;AAElB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;AAExD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;AAEhD,MAAM,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAC,GAAG,MAAM,CAAC;AAEhD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;IACpC,sCAAsC;IACtC,+DAA+D;IAC/D,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACpB,SAAS;KACZ;IAED,UAAU,CAAC,oBAAoB,CAAC;QAC5B,eAAe,EAAE,uBAAuB,CAAC,KAAK;QAC9C,UAAU,EAAE,IAAI;QAChB,YAAY,EAAE;YACV;gBACI,IAAI;gBACJ,WAAW,EAAE,OAAO,CAAC,SAAS,CAC1B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EACrC,OAAO,CACV;aACJ;SACJ;KACJ,CAAC,CAAC;CACN;AAED,UAAU,CAAC,oBAAoB,CAAC;IAC5B,eAAe,EAAE,uBAAuB,CAAC,KAAK;IAC9C,UAAU,EAAE,IAAI;IAChB,YAAY,EAAE;QACV;YACI,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC;SAC3E;KACJ;CACJ,CAAC,CAAC;AAEH,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC"}
+{"version":3,"file":"constants.mjs","sourceRoot":"","sources":["../../src/generator/constants.mts"],"names":[],"mappings":";AAEA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,wDAAwD;AACxD,qEAAqE;AACrE,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAEvC,OAAO,EACH,OAAO,EAIP,uBAAuB,EAEvB,OAAO,GACV,MAAM,UAAU,CAAC;AAElB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;AAExD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,MAAM,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAC,GAAG,MAAM,CAAC;AAEhD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;IACpC,sCAAsC;IACtC,+DAA+D;IAC/D,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACpB,SAAS;KACZ;IAED,WAAW,CAAC,IAAI,CAAC;QACb,eAAe,EAAE,uBAAuB,CAAC,KAAK;QAC9C,UAAU,EAAE,IAAI;QAChB,YAAY,EAAE;YACV;gBACI,IAAI;gBACJ,WAAW,EAAE,OAAO,CAAC,SAAS,CAC1B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EACrC,OAAO,CACV;aACJ;SACJ;KACJ,CAAC,CAAC;CACN;AAED,WAAW,CAAC,IAAI,CAAC;IACb,eAAe,EAAE,uBAAuB,CAAC,KAAK;IAC9C,UAAU,EAAE,IAAI;IAChB,YAAY,EAAE;QACV;YACI,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC;SAC3E;KACJ;CACJ,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;AACrD,eAAe,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;AAEnD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC"}

package/dist/generator.mjs

@@ -4,7 +4,7 @@ import fs from "fs";
 // json-schema-to-typescript messes up the descriptor even if unused.
 const stdinBuffer = fs.readFileSync(0);
 const { compile } = await import("json-schema-to-typescript");
-import { Project, Scope, VariableDeclarationKind, Writers, } from "ts-morph";
+import { Project, Scope, StructureKind, VariableDeclarationKind, Writers, } from "ts-morph";
 const schema = JSON.parse(stdinBuffer.toString("utf8"));
 const { urls: possibleEmptyUrls, templates, interfaces, rpc: uncastedRpc, types, values, } = schema;
 const rpc = uncastedRpc;
@@ -23,22 +23,53 @@ const urls = {
 };
 const project = new Project();
 const sourceFile = project.createSourceFile("");
-const classDeclaration = sourceFile.addClass({
+const rpcConstructorStructure = {
+    statements: [],
+    parameters: [
+        {
+            name: "requester",
+            type: "rpcUtils.Requester",
+            isReadonly: false,
+            scope: Scope.Public,
+            decorators: [],
+            hasQuestionToken: false,
+            hasOverrideKeyword: false,
+            kind: StructureKind.Parameter,
+            isRestParameter: false,
+        },
+    ],
+    typeParameters: [],
+    docs: [],
+    kind: StructureKind.Constructor,
+    overloads: [],
+};
+const rpcStructure = {
+    decorators: [],
+    typeParameters: [],
+    docs: [],
+    isAbstract: false,
+    implements: [],
     name: "RPC",
     isExported: true,
-});
-const rpcConstructor = classDeclaration.addConstructor({
-    parameters: [{ name: "requester", type: "rpcUtils.Requester", scope: Scope.Public }],
-});
-let rpcConstructorBody = "";
+    isDefaultExport: false,
+    hasDeclareKeyword: false,
+    kind: StructureKind.Class,
+    ctors: [rpcConstructorStructure],
+    properties: [],
+    methods: [],
+};
 for (const name of Object.keys(rpc)) {
     const { url, input, output, type, params } = rpc[name];
-    const functionDeclaration = classDeclaration.addMethod({
+    const methodStructure = {
+        kind: StructureKind.Method,
         name,
-    });
-    rpcConstructorBody += `this.${name} = (this.${name} as any).bind(this);\n`;
-    functionDeclaration.setIsAsync(true);
-    functionDeclaration.addParameter({
+        isAsync: true,
+        parameters: [],
+        statements: [],
+        returnType: "",
+    };
+    rpcConstructorStructure.statements.push(`this.${name} = (this.${name} as any).bind(this);\n`);
+    methodStructure.parameters?.push({
         name: "this",
         type: "void",
     });
@@ -48,17 +79,21 @@ for (const name of Object.keys(rpc)) {
         name: (writer) => writer.quote(name),
     };
     if (params.length >= 1) {
-        const paramsInterface = functionDeclaration.addInterface({
-            name: "WILL_BE_STRIPPED",
-        });
+        const paramsProperties = [];
         const iterator = [];
         for (const [paramType, paramName] of params) {
-            paramsInterface.addProperty({ name: paramName, type: "string | number" });
+            paramsProperties.push({ name: paramName, type: "string | number" });
             iterator.push(paramName);
         }
-        functionDeclaration.addParameter({
+        methodStructure.parameters?.push({
             name: "params",
-            type: paramsInterface.getText().replace("interface WILL_BE_STRIPPED", ""),
+            type: Writers.objectType({ properties: paramsProperties }),
+            isReadonly: false,
+            decorators: [],
+            hasQuestionToken: false,
+            hasOverrideKeyword: false,
+            kind: StructureKind.Parameter,
+            isRestParameter: false,
         });
         Object.assign(initializer, {
             paramsAndIterator: Writers.object({
@@ -66,24 +101,21 @@ for (const name of Object.keys(rpc)) {
                 params: "params",
             }),
         });
-        // Otherwise our interface will be inserted.
-        functionDeclaration.setBodyText("");
     }
     else {
         Object.assign(initializer, { paramsAndIterator: "null" });
     }
     if (input != null) {
-        const property = classDeclaration.addProperty({
-            // isStatic: true,
+        rpcStructure.properties?.push({
             name: input,
             type: `_Types["${input}"]`,
             initializer: JSON.stringify(values[input]),
         });
-        functionDeclaration.addParameter({
+        methodStructure.parameters?.push({
             name: "input",
             type: `forms.FormOrFormSetValues<_Types["${input}"]>`,
         });
-        functionDeclaration.setReturnType(`Promise<rpcUtils.Result<_Types["${output}"], forms.FormOrFormSetErrors<_Types["${input}"]>, _Types["RPCPermission"]>>`);
+        methodStructure.returnType = `Promise<rpcUtils.Result<_Types["${output}"], forms.FormOrFormSetErrors<_Types["${input}"]>, _Types["RPCPermission"]>>`;
         Object.assign(initializer, {
             input: Writers.object({
                 values: "input",
@@ -92,67 +124,23 @@ for (const name of Object.keys(rpc)) {
         });
     }
     else {
-        functionDeclaration.setReturnType(`Promise<rpcUtils.Result<_Types["${output}"], null, _Types["RPCPermission"]>>`);
+        methodStructure.returnType = `Promise<rpcUtils.Result<_Types["${output}"], null, _Types["RPCPermission"]>>`;
         Object.assign(initializer, { input: "null" });
     }
-    functionDeclaration.addVariableStatement({
+    methodStructure.statements?.push({
+        kind: StructureKind.VariableStatement,
         declarationKind: VariableDeclarationKind.Const,
         declarations: [
             {
                 name: "options",
                 initializer: Writers.object(initializer),
-                /*
-                    x: 123,
-                    y: (writer) => writer.quote("abc"),
-                    z: Writers.object({
-                        one: (writer) => writer.quote("1"),
-                    }),
-                    */
             },
         ],
     });
-    functionDeclaration.setBodyText(`${functionDeclaration.getBodyText()} return rpcUtils.rpcCall((this as any).requester, options)`);
-    /*
-
-    if (input != null) {
-        functionDeclaration.addParameter({
-            name: "input",
-            type: `forms.FormOrFormSetValues<_Types["${input}"]>`,
-        });
-        bodyText = bodyText.concat(`
-        const input = ${JSON.stringify({
-            type: "form",
-        })};
-        }
-        `);
-    }
-    else {
-    }
-    */
-    /*
-     if (instance.length === 1) {
-        functionDeclaration.addParameter({name: "instance", type: `string | number`});
-        functionDeclaration.setBodyText(`return rpcUtils.rpcCall("${url}", input, "${type}", instance)`);
-     }
-     else if (instance.length >= 2) {
-        const instanceInterface = functionDeclaration.addInterface({name: "WILL_BE_STRIPPED"});
-
-        for (const instanceArg of instance) {
-            instanceInterface.addProperty({name: instanceArg, type: "string | number"});
-        }
-        functionDeclaration.addParameter({name: "instance", type: instanceInterface.getText().replace("interface WILL_BE_STRIPPED", "")});
-        functionDeclaration.setBodyText(`const iterator = ${JSON.stringify(instance)}; return rpcUtils.rpcCall("${url}", input, "${type}", {iterator, params: instance})`);
-     }
-     else {
-        functionDeclaration.setBodyText(`return rpcUtils.rpcCall("${url}", input, "${type}")`);
-     }
-
-     functionDeclaration.addParameter({name: "input", type: `forms.FormOrFormSetValues<_Types["${input}"]>`});
-     functionDeclaration.setReturnType(`Promise<rpcUtils.Result<_Types["${output}"], forms.FormOrFormSetErrors<_Types["${input}"]>>>`);
-     functionDeclaration.setIsAsync(true);
-     */
+    methodStructure.statements?.push("return rpcUtils.rpcCall((this as any).requester, options)");
+    rpcStructure.methods?.push(methodStructure);
 }
-rpcConstructor.setBodyText(rpcConstructorBody);
+sourceFile.addClass(rpcStructure);
 if (Object.keys(urls).length !== 0) {
     sourceFile.addVariableStatement({
         declarationKind: VariableDeclarationKind.Const,
@@ -163,33 +151,34 @@ if (Object.keys(urls).length !== 0) {
             },
         ],
     });
-    const urlMap = sourceFile.addInterface({
+    const urlMap = {
         name: "URLMap",
-    });
-    urlMap.setIsExported(true);
+        properties: [],
+        // isExported: true,
+    };
     const withArguments = [""];
     const withoutArguments = [""];
+    const interfaces = [urlMap];
     for (const name of Object.keys(urls)) {
         const properties = urls[name].args;
         const normalizedName = name.replace(/[^\w]/g, "_");
-        const urlInterface = sourceFile.addInterface({
-            name: normalizedName,
-            properties: [{ name: "name", type: `'${name}'` }],
-        });
-        const argsInterface = sourceFile.addInterface({
-            name: `${normalizedName}_args`,
-        });
-        for (const propertyName of Object.keys(properties)) {
-            argsInterface.addProperty({
-                name: propertyName,
-                type: properties[propertyName],
-            });
-        }
-        urlInterface.addProperty({
-            name: "args",
-            type: `${normalizedName}_args`,
-        });
-        urlMap.addProperty({
+        interfaces.push(...[
+            {
+                name: normalizedName,
+                properties: [
+                    { name: "name", type: `'${name}'` },
+                    { name: "args", type: `${normalizedName}_args` },
+                ],
+            },
+            {
+                name: `${normalizedName}_args`,
+                properties: Object.keys(properties).map((propertyName) => ({
+                    name: propertyName,
+                    type: properties[propertyName],
+                })),
+            },
+        ]);
+        urlMap.properties.push({
             name: normalizedName,
             type: normalizedName,
         });
@@ -200,6 +189,7 @@ if (Object.keys(urls).length !== 0) {
             withArguments.push(normalizedName);
         }
     }
+    sourceFile.addInterfaces(interfaces);
     sourceFile.addTypeAlias({ name: "WithArguments", type: withArguments.join("|") });
     sourceFile.addTypeAlias({
         name: "WithoutArguments",
@@ -264,10 +254,11 @@ export const {Form, FormSet, Widget, useForm, useFormSet, ManagementForm} = form
 compile(types, "this is unused").then((ts) => {
     process.stdout.write("/* eslint-disable */\n");
     process.stdout.write(ts);
+    const statements = [];
     if (!fs.existsSync("./reactivated-skip-template-check")) {
         for (const name of Object.keys(templates)) {
             const propsName = templates[name];
-            sourceFile.addStatements(`
+            statements.push(`
 
 import ${name}Implementation from "@client/templates/${name}"
 export type ${name}Check = Checker<_Types["${propsName}"], typeof ${name}Implementation>;
@@ -282,7 +273,7 @@ export namespace templates {
     }
     for (const name of Object.keys(interfaces)) {
         const propsName = interfaces[name];
-        sourceFile.addStatements(`
+        statements.push(`
 
 export namespace interfaces {
     export type ${name} = _Types["${propsName}"];
@@ -291,6 +282,7 @@ export namespace interfaces {
 
         `);
     }
+    sourceFile.addStatements(statements);
     process.stdout.write(sourceFile.getText());
 });
 //# sourceMappingURL=generator.mjs.map

package/dist/generator.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator.mjs","sourceRoot":"","sources":["../src/generator.mts"],"names":[],"mappings":";AAEA,OAAO,EAAE,MAAM,IAAI,CAAC;AAGpB,wDAAwD;AACxD,qEAAqE;AACrE,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAEvC,MAAM,EAAC,OAAO,EAAC,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAE5D,OAAO,EAEH,OAAO,EACP,KAAK,EAIL,uBAAuB,EAEvB,OAAO,GACV,MAAM,UAAU,CAAC;AAElB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;AACxD,MAAM,EACF,IAAI,EAAE,iBAAiB,EACvB,SAAS,EACT,UAAU,EACV,GAAG,EAAE,WAAW,EAChB,KAAK,EACL,MAAM,GACT,GAAG,MAAM,CAAC;AAEX,MAAM,GAAG,GAAmC,WAAW,CAAC;AAExD,MAAM,IAAI,GAAiC;IACvC,GAAG,iBAAiB;IACpB,wBAAwB,EAAE;QACtB,KAAK,EAAE,0BAA0B;QACjC,IAAI,EAAE,EAAE;KACX;IACD,6BAA6B,EAAE;QAC3B,KAAK,EAAE,+BAA+B;QACtC,IAAI,EAAE;YACF,CAAC,EAAE,QAAQ;SACd;KACJ;CACJ,CAAC;AAEF,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;AAEhD,MAAM,gBAAgB,GAAG,UAAU,CAAC,QAAQ,CAAC;IACzC,IAAI,EAAE,KAAK;IACX,UAAU,EAAE,IAAI;CACnB,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC;IACnD,UAAU,EAAE,CAAC,EAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,oBAAoB,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAC,CAAC;CACrF,CAAC,CAAC;AAEH,IAAI,kBAAkB,GAAG,EAAE,CAAC;AAE5B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;IACjC,MAAM,EAAC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,SAAS,CAAC;QACnD,IAAI;KACP,CAAC,CAAC;IAEH,kBAAkB,IAAI,QAAQ,IAAI,YAAY,IAAI,wBAAwB,CAAC;IAC3E,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAErC,mBAAmB,CAAC,YAAY,CAAC;QAC7B,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,MAAM;KACf,CAAC,CAAC;IAEH,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,MAAM,WAAW,GAAG;QAChB,GAAG,EAAE,CAAC,MAAuB,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;QACnD,IAAI,EAAE,CAAC,MAAuB,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;KACxD,CAAC;IAEF,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;QACpB,MAAM,eAAe,GAAG,mBAAmB,CAAC,YAAY,CAAC;YACrD,IAAI,EAAE,kBAAkB;SAC3B,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,KAAK,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,MAAM,EAAE;YACzC,eAAe,CAAC,WAAW,CAAC,EAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,iBAAiB,EAAC,CAAC,CAAC;YACxE,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC5B;QACD,mBAAmB,CAAC,YAAY,CAAC;YAC7B,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,eAAe,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,4BAA4B,EAAE,EAAE,CAAC;SAC5E,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC;gBAC9B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;gBAClC,MAAM,EAAE,QAAQ;aACnB,CAAC;SACL,CAAC,CAAC;QACH,4CAA4C;QAC5C,mBAAmB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;KACvC;SAAM;QACH,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,EAAC,iBAAiB,EAAE,MAAM,EAAC,CAAC,CAAC;KAC3D;IAED,IAAI,KAAK,IAAI,IAAI,EAAE;QACf,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,CAAC;YAC1C,kBAAkB;YAClB,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,WAAW,KAAK,IAAI;YAC1B,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC7C,CAAC,CAAC;QACH,mBAAmB,CAAC,YAAY,CAAC;YAC7B,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,qCAAqC,KAAK,KAAK;SACxD,CAAC,CAAC;QACH,mBAAmB,CAAC,aAAa,CAC7B,mCAAmC,MAAM,yCAAyC,KAAK,gCAAgC,CAC1H,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC;gBAClB,MAAM,EAAE,OAAO;gBACf,IAAI,EAAE,CAAC,MAAuB,EAAE,EAAE,CAC9B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC;aAC5C,CAAC;SACL,CAAC,CAAC;KACN;SAAM;QACH,mBAAmB,CAAC,aAAa,CAC7B,mCAAmC,MAAM,qCAAqC,CACjF,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAC;KAC/C;IAED,mBAAmB,CAAC,oBAAoB,CAAC;QACrC,eAAe,EAAE,uBAAuB,CAAC,KAAK;QAC9C,YAAY,EAAE;YACV;gBACI,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;gBACxC;;;;;;sBAMM;aACT;SACJ;KACJ,CAAC,CAAC;IACH,mBAAmB,CAAC,WAAW,CAC3B,GAAG,mBAAmB,CAAC,WAAW,EAAE,4DAA4D,CACnG,CAAC;IACF;;;;;;;;;;;;;;;;MAgBE;IAEF;;;;;;;;;;;;;;;;;;;;;OAqBG;CACN;AACD,cAAc,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;AAE/C,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;IAChC,UAAU,CAAC,oBAAoB,CAAC;QAC5B,eAAe,EAAE,uBAAuB,CAAC,KAAK;QAC9C,YAAY,EAAE;YACV;gBACI,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aACpC;SACJ;KACJ,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,UAAU,CAAC,YAAY,CAAC;QACnC,IAAI,EAAE,QAAQ;KACjB,CAAC,CAAC;IACH,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAE3B,MAAM,aAAa,GAAG,CAAC,EAAE,CAAC,CAAC;IAC3B,MAAM,gBAAgB,GAAG,CAAC,EAAE,CAAC,CAAC;IAE9B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAClC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAyB,CAAC,CAAC,IAAI,CAAC;QACxD,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAEnD,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;YACzC,IAAI,EAAE,cAAc;YACpB,UAAU,EAAE,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,IAAI,GAAG,EAAC,CAAC;SAClD,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,UAAU,CAAC,YAAY,CAAC;YAC1C,IAAI,EAAE,GAAG,cAAc,OAAO;SACjC,CAAC,CAAC;QAEH,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YAChD,aAAa,CAAC,WAAW,CAAC;gBACtB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,UAAU,CAAC,YAAuC,CAAC;aAC5D,CAAC,CAAC;SACN;QACD,YAAY,CAAC,WAAW,CAAC;YACrB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,GAAG,cAAc,OAAO;SACjC,CAAC,CAAC;QAEH,MAAM,CAAC,WAAW,CAAC;YACf,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,cAAc;SACvB,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACtC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACzC;aAAM;YACH,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACtC;KACJ;IACD,UAAU,CAAC,YAAY,CAAC,EAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAC,CAAC,CAAC;IAChF,UAAU,CAAC,YAAY,CAAC;QACpB,IAAI,EAAE,kBAAkB;QACxB,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC;KACnC,CAAC,CAAC;IACH,UAAU,CAAC,aAAa,CAAC;;;;;;;;;;;;;;MAcvB,CAAC,CAAC;CACP;AAED,UAAU,CAAC,aAAa,CACpB,yEAAyE,CAC5E,CAAC;AAEF,UAAU,CAAC,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqCxB,CAAC,CAAC;AAEH,2BAA2B;AAC3B,OAAO,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;IACzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC/C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEzB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,mCAAmC,CAAC,EAAE;QACrD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACvC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;YAElC,UAAU,CAAC,aAAa,CAAC;;SAE5B,IAAI,0CAA0C,IAAI;cAC7C,IAAI,2BAA2B,SAAS,cAAc,IAAI;;;kBAGtD,IAAI,cAAc,SAAS;;;;SAIpC,CAAC,CAAC;SACF;KACJ;IAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACxC,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QACnC,UAAU,CAAC,aAAa,CAAC;;;kBAGf,IAAI,cAAc,SAAS;;;;SAIpC,CAAC,CAAC;KACN;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC"}
+{"version":3,"file":"generator.mjs","sourceRoot":"","sources":["../src/generator.mts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "reactivated",
-    "version": "0.34.1",
+    "version": "0.35.0",
     "description": "",
     "exports": {
         ".": "./dist/index.js",

package/src/generator/constants.mts

@@ -20,7 +20,7 @@ const schema = JSON.parse(stdinBuffer.toString("utf8"));
 
 const project = new Project();
 
-const interfaces = project.createSourceFile("");
+const statemenets = [];
 
 const {urls, templates, types, values} = schema;
 
@@ -31,7 +31,7 @@ for (const name of Object.keys(values)) {
         continue;
     }
 
-    interfaces.addVariableStatement({
+    statemenets.push({
         declarationKind: VariableDeclarationKind.Const,
         isExported: true,
         declarations: [
@@ -46,7 +46,7 @@ for (const name of Object.keys(values)) {
     });
 }
 
-interfaces.addVariableStatement({
+statemenets.push({
     declarationKind: VariableDeclarationKind.Const,
     isExported: true,
     declarations: [
@@ -57,4 +57,7 @@ interfaces.addVariableStatement({
     ],
 });
 
-process.stdout.write(interfaces.getText());
+const constantsSource = project.createSourceFile("");
+constantsSource.addVariableStatements(statemenets);
+
+process.stdout.write(constantsSource.getText());

package/src/generator.mts

@@ -19,6 +19,13 @@ import {
     VariableDeclarationKind,
     WriterFunction,
     Writers,
+    InterfaceDeclarationStructure,
+    OptionalKind,
+    MethodDeclarationStructure,
+    PropertyDeclarationStructure,
+    ParameterDeclarationStructure,
+    StatementedNodeStructure,
+    StatementStructures,
 } from "ts-morph";
 
 const schema = JSON.parse(stdinBuffer.toString("utf8"));
@@ -51,27 +58,60 @@ const project = new Project();
 
 const sourceFile = project.createSourceFile("");
 
-const classDeclaration = sourceFile.addClass({
+const rpcConstructorStructure = {
+    statements: [] as string[],
+    parameters: [
+        {
+            name: "requester",
+            type: "rpcUtils.Requester",
+            isReadonly: false,
+            scope: Scope.Public,
+            decorators: [],
+            hasQuestionToken: false,
+            hasOverrideKeyword: false,
+            kind: StructureKind.Parameter as const,
+            isRestParameter: false,
+        },
+    ],
+    typeParameters: [],
+    docs: [],
+    kind: StructureKind.Constructor as const,
+    overloads: [],
+};
+
+const rpcStructure = {
+    decorators: [],
+    typeParameters: [],
+    docs: [],
+    isAbstract: false,
+    implements: [],
     name: "RPC",
     isExported: true,
-});
-
-const rpcConstructor = classDeclaration.addConstructor({
-    parameters: [{name: "requester", type: "rpcUtils.Requester", scope: Scope.Public}],
-});
-
-let rpcConstructorBody = "";
+    isDefaultExport: false,
+    hasDeclareKeyword: false,
+    kind: StructureKind.Class as const,
+    ctors: [rpcConstructorStructure],
+    properties: [] as OptionalKind<PropertyDeclarationStructure>[],
+    methods: [] as OptionalKind<MethodDeclarationStructure>[],
+};
 
 for (const name of Object.keys(rpc)) {
     const {url, input, output, type, params} = rpc[name];
-    const functionDeclaration = classDeclaration.addMethod({
+
+    const methodStructure = {
+        kind: StructureKind.Method as const,
         name,
-    });
+        isAsync: true,
+        parameters: [] as OptionalKind<ParameterDeclarationStructure>[],
+        statements: [] as (string | StatementStructures)[],
+        returnType: "",
+    };
 
-    rpcConstructorBody += `this.${name} = (this.${name} as any).bind(this);\n`;
-    functionDeclaration.setIsAsync(true);
+    rpcConstructorStructure.statements.push(
+        `this.${name} = (this.${name} as any).bind(this);\n`,
+    );
 
-    functionDeclaration.addParameter({
+    methodStructure.parameters?.push({
         name: "this",
         type: "void",
     });
@@ -83,18 +123,22 @@ for (const name of Object.keys(rpc)) {
     };
 
     if (params.length >= 1) {
-        const paramsInterface = functionDeclaration.addInterface({
-            name: "WILL_BE_STRIPPED",
-        });
+        const paramsProperties = [];
 
         const iterator = [];
         for (const [paramType, paramName] of params) {
-            paramsInterface.addProperty({name: paramName, type: "string | number"});
+            paramsProperties.push({name: paramName, type: "string | number"});
             iterator.push(paramName);
         }
-        functionDeclaration.addParameter({
+        methodStructure.parameters?.push({
             name: "params",
-            type: paramsInterface.getText().replace("interface WILL_BE_STRIPPED", ""),
+            type: Writers.objectType({properties: paramsProperties}),
+            isReadonly: false,
+            decorators: [],
+            hasQuestionToken: false,
+            hasOverrideKeyword: false,
+            kind: StructureKind.Parameter as const,
+            isRestParameter: false,
         });
 
         Object.assign(initializer, {
@@ -103,26 +147,23 @@ for (const name of Object.keys(rpc)) {
                 params: "params",
             }),
         });
-        // Otherwise our interface will be inserted.
-        functionDeclaration.setBodyText("");
     } else {
         Object.assign(initializer, {paramsAndIterator: "null"});
     }
 
     if (input != null) {
-        const property = classDeclaration.addProperty({
-            // isStatic: true,
+        rpcStructure.properties?.push({
             name: input,
             type: `_Types["${input}"]`,
             initializer: JSON.stringify(values[input]),
         });
-        functionDeclaration.addParameter({
+        methodStructure.parameters?.push({
             name: "input",
             type: `forms.FormOrFormSetValues<_Types["${input}"]>`,
         });
-        functionDeclaration.setReturnType(
-            `Promise<rpcUtils.Result<_Types["${output}"], forms.FormOrFormSetErrors<_Types["${input}"]>, _Types["RPCPermission"]>>`,
-        );
+
+        methodStructure.returnType = `Promise<rpcUtils.Result<_Types["${output}"], forms.FormOrFormSetErrors<_Types["${input}"]>, _Types["RPCPermission"]>>`;
+
         Object.assign(initializer, {
             input: Writers.object({
                 values: "input",
@@ -131,73 +172,27 @@ for (const name of Object.keys(rpc)) {
             }),
         });
     } else {
-        functionDeclaration.setReturnType(
-            `Promise<rpcUtils.Result<_Types["${output}"], null, _Types["RPCPermission"]>>`,
-        );
+        methodStructure.returnType = `Promise<rpcUtils.Result<_Types["${output}"], null, _Types["RPCPermission"]>>`;
         Object.assign(initializer, {input: "null"});
     }
 
-    functionDeclaration.addVariableStatement({
+    methodStructure.statements?.push({
+        kind: StructureKind.VariableStatement,
         declarationKind: VariableDeclarationKind.Const,
         declarations: [
             {
                 name: "options",
                 initializer: Writers.object(initializer),
-                /*
-                    x: 123,
-                    y: (writer) => writer.quote("abc"),
-                    z: Writers.object({
-                        one: (writer) => writer.quote("1"),
-                    }),
-                    */
             },
         ],
     });
-    functionDeclaration.setBodyText(
-        `${functionDeclaration.getBodyText()} return rpcUtils.rpcCall((this as any).requester, options)`,
+    methodStructure.statements?.push(
+        "return rpcUtils.rpcCall((this as any).requester, options)",
     );
-    /*
-
-    if (input != null) {
-        functionDeclaration.addParameter({
-            name: "input",
-            type: `forms.FormOrFormSetValues<_Types["${input}"]>`,
-        });
-        bodyText = bodyText.concat(`
-        const input = ${JSON.stringify({
-            type: "form",
-        })};
-        }
-        `);
-    }
-    else {
-    }
-    */
-
-    /*
-     if (instance.length === 1) {
-        functionDeclaration.addParameter({name: "instance", type: `string | number`});
-        functionDeclaration.setBodyText(`return rpcUtils.rpcCall("${url}", input, "${type}", instance)`);
-     }
-     else if (instance.length >= 2) {
-        const instanceInterface = functionDeclaration.addInterface({name: "WILL_BE_STRIPPED"});
-
-        for (const instanceArg of instance) {
-            instanceInterface.addProperty({name: instanceArg, type: "string | number"});
-        }
-        functionDeclaration.addParameter({name: "instance", type: instanceInterface.getText().replace("interface WILL_BE_STRIPPED", "")});
-        functionDeclaration.setBodyText(`const iterator = ${JSON.stringify(instance)}; return rpcUtils.rpcCall("${url}", input, "${type}", {iterator, params: instance})`);
-     }
-     else {
-        functionDeclaration.setBodyText(`return rpcUtils.rpcCall("${url}", input, "${type}")`);
-     }
-
-     functionDeclaration.addParameter({name: "input", type: `forms.FormOrFormSetValues<_Types["${input}"]>`});
-     functionDeclaration.setReturnType(`Promise<rpcUtils.Result<_Types["${output}"], forms.FormOrFormSetErrors<_Types["${input}"]>>>`);
-     functionDeclaration.setIsAsync(true);
-     */
+    rpcStructure.methods?.push(methodStructure);
 }
-rpcConstructor.setBodyText(rpcConstructorBody);
+
+sourceFile.addClass(rpcStructure);
 
 if (Object.keys(urls).length !== 0) {
     sourceFile.addVariableStatement({
@@ -210,38 +205,43 @@ if (Object.keys(urls).length !== 0) {
         ],
     });
 
-    const urlMap = sourceFile.addInterface({
+    const urlMap = {
         name: "URLMap",
-    });
-    urlMap.setIsExported(true);
+        properties: [] as any,
+        // isExported: true,
+    };
 
     const withArguments = [""];
+
     const withoutArguments = [""];
 
+    const interfaces: OptionalKind<InterfaceDeclarationStructure>[] = [urlMap];
+
     for (const name of Object.keys(urls)) {
         const properties = urls[name as keyof typeof urls].args;
         const normalizedName = name.replace(/[^\w]/g, "_");
 
-        const urlInterface = sourceFile.addInterface({
-            name: normalizedName,
-            properties: [{name: "name", type: `'${name}'`}],
-        });
-        const argsInterface = sourceFile.addInterface({
-            name: `${normalizedName}_args`,
-        });
-
-        for (const propertyName of Object.keys(properties)) {
-            argsInterface.addProperty({
-                name: propertyName,
-                type: properties[propertyName as keyof typeof properties],
-            });
-        }
-        urlInterface.addProperty({
-            name: "args",
-            type: `${normalizedName}_args`,
-        });
+        interfaces.push(
+            ...[
+                {
+                    name: normalizedName,
+                    properties: [
+                        {name: "name", type: `'${name}'`},
+                        {name: "args", type: `${normalizedName}_args`},
+                    ],
+                },
+                {
+                    name: `${normalizedName}_args`,
+
+                    properties: Object.keys(properties).map((propertyName) => ({
+                        name: propertyName,
+                        type: properties[propertyName as keyof typeof properties],
+                    })),
+                },
+            ],
+        );
 
-        urlMap.addProperty({
+        urlMap.properties.push({
             name: normalizedName,
             type: normalizedName,
         });
@@ -252,6 +252,7 @@ if (Object.keys(urls).length !== 0) {
             withArguments.push(normalizedName);
         }
     }
+    sourceFile.addInterfaces(interfaces);
     sourceFile.addTypeAlias({name: "WithArguments", type: withArguments.join("|")});
     sourceFile.addTypeAlias({
         name: "WithoutArguments",
@@ -321,12 +322,13 @@ export const {Form, FormSet, Widget, useForm, useFormSet, ManagementForm} = form
 compile(types, "this is unused").then((ts) => {
     process.stdout.write("/* eslint-disable */\n");
     process.stdout.write(ts);
+    const statements = [];
 
     if (!fs.existsSync("./reactivated-skip-template-check")) {
         for (const name of Object.keys(templates)) {
             const propsName = templates[name];
 
-            sourceFile.addStatements(`
+            statements.push(`
 
 import ${name}Implementation from "@client/templates/${name}"
 export type ${name}Check = Checker<_Types["${propsName}"], typeof ${name}Implementation>;
@@ -342,7 +344,7 @@ export namespace templates {
 
     for (const name of Object.keys(interfaces)) {
         const propsName = interfaces[name];
-        sourceFile.addStatements(`
+        statements.push(`
 
 export namespace interfaces {
     export type ${name} = _Types["${propsName}"];
@@ -352,5 +354,7 @@ export namespace interfaces {
         `);
     }
 
+    sourceFile.addStatements(statements);
+
     process.stdout.write(sourceFile.getText());
 });