Commit beab1079 authored by Ruben Seggers's avatar Ruben Seggers
Browse files

sort export iOS, bugfix Edge inherits from Item

parent d3cbcc82
Showing with 11 additions and 6 deletions
+11 -6
......@@ -8,7 +8,7 @@ const outputFile = './schema.swift';
function getItemFamily() {
let itemFamily = [], bgColors = [], fgColors = [], typeFunctions = [];
for (const entity of Object.keys(entityHierarchy)) {
for (const entity of Object.keys(entityHierarchy).sort()) {
if (entity === 'Item') continue;
itemFamily.push(`case type${entity} = "${entity}"`);
bgColors.push(`case .type${entity}: return Color(hex: "${entityHierarchy[entity]['backgroundColor']}")`);
......@@ -21,7 +21,7 @@ function getItemFamily() {
function getDataItemClasses() {
let propertiesAndRelationsItem = entityHierarchy['Item']['properties'].concat(Object.keys(entityHierarchy['Item']['relations']));
let dataItemClasses = [];
for (const entity of Object.keys(entityHierarchy)) {
for (const entity of Object.keys(entityHierarchy).sort()) {
if (['Datasource', 'UserState', 'ViewArguments', 'CVUStateDefinition'].includes(entity)) continue;
let classDescription = `\n/// ${entityHierarchy[entity]['description']}\n`;
......@@ -44,9 +44,14 @@ function getDataItemClasses() {
let ancestry = helpers.getAncestry(entityHierarchy[entity]['path'].split('/'));
let propertiesAndRelations = [];
for (const _item in ancestry) {
propertiesAndRelations = propertiesAndRelations.concat(entityHierarchy[_item]['properties']);
propertiesAndRelations = propertiesAndRelations.concat(Object.keys(entityHierarchy[_item]['relations']));
if (entity === 'Edge') {
propertiesAndRelations = propertiesAndRelations.concat(entityHierarchy[entity]['properties']);
propertiesAndRelations = propertiesAndRelations.concat(Object.keys(entityHierarchy[entity]['relations']));
} else {
for (const _item in ancestry) {
propertiesAndRelations = propertiesAndRelations.concat(entityHierarchy[_item]['properties']);
propertiesAndRelations = propertiesAndRelations.concat(Object.keys(entityHierarchy[_item]['relations']));
}
}
let properties = "";
......@@ -177,7 +182,7 @@ ${propertiesDecoder}${relationsDecoder}${additionalFunctionality}
function getDataItemListToArray() {
let dataItems = [];
for (const [index, entity] of Object.keys(entityHierarchy).entries()) {
for (const [index, entity] of Object.keys(entityHierarchy).sort().entries()) {
if (['Datasource', 'SyncState', 'UserState', 'ViewArguments'].includes(entity)) continue;
if (entity === 'Edge') {
dataItems.push(`else if let list = object as? Results<Edge> { return list.itemsArray() }`);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment