Merge branch 'dart' of https://gitlab.hibas.dev/hibas123/JsonRPC into dart
This commit is contained in:
commit
327d7dfac6
@ -35,7 +35,6 @@ export class DartTarget extends CompileTarget<{ dart_library_name: string }> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
generateImports(a: lineAppender, def: TypeDefinition | ServiceDefinition) {
|
generateImports(a: lineAppender, def: TypeDefinition | ServiceDefinition) {
|
||||||
|
|
||||||
def.depends.forEach((dep) => {
|
def.depends.forEach((dep) => {
|
||||||
a(0, this.getImport(dep));
|
a(0, this.getImport(dep));
|
||||||
});
|
});
|
||||||
@ -52,14 +51,24 @@ export class DartTarget extends CompileTarget<{ dart_library_name: string }> {
|
|||||||
if (field.array) {
|
if (field.array) {
|
||||||
a(1, `List<${toDartType(field.type)}>? ${field.name};`);
|
a(1, `List<${toDartType(field.type)}>? ${field.name};`);
|
||||||
} else if (field.map) {
|
} else if (field.map) {
|
||||||
a(1, `Map<${toDartType(field.map)},${toDartType(field.type)}>? ${field.name};`);
|
a(
|
||||||
|
1,
|
||||||
|
`Map<${toDartType(field.map)},${toDartType(field.type)}>? ${
|
||||||
|
field.name
|
||||||
|
};`
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
a(1, `${toDartType(field.type)}? ${field.name};`);
|
a(1, `${toDartType(field.type)}? ${field.name};`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
a(0, ``);
|
a(0, ``);
|
||||||
a(1, `${definition.name}({${definition.fields.map(e => `this.${e.name}`).join(",")}});`);
|
a(
|
||||||
|
1,
|
||||||
|
`${definition.name}({${definition.fields
|
||||||
|
.map((e) => `this.${e.name}`)
|
||||||
|
.join(", ")}});`
|
||||||
|
);
|
||||||
a(0, ``);
|
a(0, ``);
|
||||||
a(1, `${definition.name}.fromJson(Map<String, dynamic> json) {`);
|
a(1, `${definition.name}.fromJson(Map<String, dynamic> json) {`);
|
||||||
for (const field of definition.fields) {
|
for (const field of definition.fields) {
|
||||||
@ -71,20 +80,28 @@ export class DartTarget extends CompileTarget<{ dart_library_name: string }> {
|
|||||||
} else {
|
} else {
|
||||||
return `${field.type}.fromJson(${value})`;
|
return `${field.type}.fromJson(${value})`;
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
if (field.array) {
|
if (field.array) {
|
||||||
a(3, `this.${field.name} = [];`);
|
a(3, `this.${field.name} = [];`);
|
||||||
a(3, `(json["${field.name}"] as List<dynamic>).forEach((e) => {`)
|
a(3, `(json["${field.name}"] as List<dynamic>).forEach((e) => {`);
|
||||||
a(4, `this.${field.name}!.add(${parseField("e")})`);
|
a(4, `this.${field.name}!.add(${parseField("e")})`);
|
||||||
a(3, `});`)
|
a(3, `});`);
|
||||||
} else if (field.map) {
|
} else if (field.map) {
|
||||||
a(3, `this.${field.name} = {};`);
|
a(3, `this.${field.name} = {};`);
|
||||||
a(3, `(json["${field.name}"] as Map<${toDartType(field.map)},dynamic>).forEach((key, value) => {`)
|
a(
|
||||||
|
3,
|
||||||
|
`(json["${field.name}"] as Map<${toDartType(
|
||||||
|
field.map
|
||||||
|
)},dynamic>).forEach((key, value) => {`
|
||||||
|
);
|
||||||
a(4, `this.${field.name}![key] = ${parseField("value")}`);
|
a(4, `this.${field.name}![key] = ${parseField("value")}`);
|
||||||
a(3, `});`)
|
a(3, `});`);
|
||||||
} else {
|
} else {
|
||||||
a(3, `this.${field.name} = ${parseField(`json["${field.name}"]`)};`);
|
a(
|
||||||
|
3,
|
||||||
|
`this.${field.name} = ${parseField(`json["${field.name}"]`)};`
|
||||||
|
);
|
||||||
}
|
}
|
||||||
a(2, `} else {`);
|
a(2, `} else {`);
|
||||||
a(3, `this.${field.name} = null;`);
|
a(3, `this.${field.name} = null;`);
|
||||||
@ -93,6 +110,32 @@ export class DartTarget extends CompileTarget<{ dart_library_name: string }> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
a(1, `}`);
|
a(1, `}`);
|
||||||
|
|
||||||
|
a(1, `Map<String, dynamic> toJson() {`);
|
||||||
|
a(2, `Map<String, dynamic> res = {};`);
|
||||||
|
for (const field of definition.fields) {
|
||||||
|
if (conversion[field.type]) {
|
||||||
|
a(2, `res["${field.name}"] = this.${field.name};`);
|
||||||
|
} else {
|
||||||
|
if (field.array) {
|
||||||
|
a(
|
||||||
|
2,
|
||||||
|
`res["${field.name}"] = this.${field.name}?.map((entry) => entry.toJson()).toList();`
|
||||||
|
);
|
||||||
|
} else if (field.map) {
|
||||||
|
// dict.map((key, value) => MapEntry(key, value.toString()));
|
||||||
|
a(
|
||||||
|
2,
|
||||||
|
`res["${field.name}"] = this.${field.name}?.map((key, value) => MapEntry(key, value.toJson()));`
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
a(2, `res["${field.name}"] = this.${field.name};`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
a(2, `return res;`);
|
||||||
|
a(1, `}`);
|
||||||
|
|
||||||
a(0, `}`);
|
a(0, `}`);
|
||||||
|
|
||||||
this.writeFile(`lib/src/${definition.name}.dart`, getResult());
|
this.writeFile(`lib/src/${definition.name}.dart`, getResult());
|
||||||
@ -103,9 +146,9 @@ export class DartTarget extends CompileTarget<{ dart_library_name: string }> {
|
|||||||
|
|
||||||
a(0, `enum ${definition.name} {`);
|
a(0, `enum ${definition.name} {`);
|
||||||
for (const entry of definition.values) {
|
for (const entry of definition.values) {
|
||||||
const isLast = definition.values[definition.values.length - 1] == entry;
|
const isLast =
|
||||||
|
definition.values[definition.values.length - 1] == entry;
|
||||||
a(1, `${entry.name}(${entry.value})${isLast ? ";" : ","}`);
|
a(1, `${entry.name}(${entry.value})${isLast ? ";" : ","}`);
|
||||||
|
|
||||||
}
|
}
|
||||||
a(0, ``);
|
a(0, ``);
|
||||||
a(1, `final int val;`);
|
a(1, `final int val;`);
|
||||||
@ -120,22 +163,17 @@ export class DartTarget extends CompileTarget<{ dart_library_name: string }> {
|
|||||||
a(4, `return null;`);
|
a(4, `return null;`);
|
||||||
a(2, `}`);
|
a(2, `}`);
|
||||||
a(1, `}`);
|
a(1, `}`);
|
||||||
a(0, `}`);
|
|
||||||
|
|
||||||
a(0, ``);
|
a(0, ``);
|
||||||
|
|
||||||
// a(0, `extension ${definition.name}Ext on ${definition.name} {`);
|
a(1, `int toJson() {`);
|
||||||
// a(1, `int get val {`);
|
a(2, `return this.val;`);
|
||||||
// a(2, `switch(this) {`);
|
a(1, `}`);
|
||||||
// for(const entry of definition.values) {
|
|
||||||
// a(3, `case ${definition.name}.${entry.name}:`);
|
a(0, ``);
|
||||||
// a(4, `return ${entry.value};`);
|
a(0, `}`);
|
||||||
// }
|
|
||||||
// a(3, `default:`);
|
a(0, ``);
|
||||||
// a(4, `return -double.maxFinite.toInt();`);
|
|
||||||
// a(2, `}`);
|
|
||||||
// a(1, `}`);
|
|
||||||
// a(0, `}`);
|
|
||||||
|
|
||||||
this.writeFile(`lib/src/${definition.name}.dart`, getResult());
|
this.writeFile(`lib/src/${definition.name}.dart`, getResult());
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user