Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(map): Resolve namespace resolution for Map Types #9

Merged
merged 11 commits into from
Oct 20, 2023
Merged

feat(map): Resolve namespace resolution for Map Types #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d12bcaa
feat(map): resolves namespace for Map Type
jonathan-casey Sep 26, 2023
af9dcc4
chore(dep): add concerto-core dep
jonathan-casey Sep 26, 2023
595838c
feat(map): extend test coverage
jonathan-casey Sep 26, 2023
f877b87
chore(dep): add node types
jonathan-casey Sep 26, 2023
754e9bd
feat(map): define ns recursively
jonathan-casey Oct 20, 2023
c1afe87
feat(*): add scalar support
jonathan-casey Oct 20, 2023
f099dd6
feat(map): use latest concerto-core
jonathan-casey Oct 20, 2023
1c1b392
feat(map): test coverage for resolving imports on maps
jonathan-casey Oct 20, 2023
7b847fb
feat(map): test refactor
jonathan-casey Oct 20, 2023
e145900
chore(*): no circular dependency
jonathan-casey Oct 20, 2023
0faf117
feat(map): resolve decorators on MapDeclarations and Scalars
jonathan-casey Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion lib/metamodelutil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function createNameTable(priorModels, metaModel) {
'Asset': concertoNs,
'Participant': concertoNs,
'Transaction ': concertoNs,
'Event': concertoNs,
'Event': concertoNs
};

// First list the imported names in order (overriding as we go along)
Expand Down Expand Up @@ -147,6 +147,11 @@ function resolveTypeNames(metaModel, table) {
});
}
break;
case `${MetaModelNamespace}.MapDeclaration`: {
resolveTypeNames(metaModel.key, table);
resolveTypeNames(metaModel.value, table);
}
break;
case `${MetaModelNamespace}.EnumProperty`:
case `${MetaModelNamespace}.ObjectProperty`:
case `${MetaModelNamespace}.RelationshipProperty`: {
Expand All @@ -168,6 +173,26 @@ function resolveTypeNames(metaModel, table) {
metaModel.type.namespace = resolveName(name, table);
}
break;
case `${MetaModelNamespace}.ObjectMapKeyType`:
case `${MetaModelNamespace}.ObjectMapValueType`: {
metaModel.type.namespace = resolveName(metaModel.type.name, table);
dselman marked this conversation as resolved.
Show resolved Hide resolved
(metaModel.decorators || []).forEach((decorator) => {
resolveTypeNames(decorator, table);
});
}
break;
case `${MetaModelNamespace}.StringScalar`:
case `${MetaModelNamespace}.BooleanScalar`:
case `${MetaModelNamespace}.DateTimeScalar`:
case `${MetaModelNamespace}.DoubleScalar`:
case `${MetaModelNamespace}.LongScalar`:
case `${MetaModelNamespace}.IntegerScalar`: {
metaModel.namespace = resolveName(metaModel.name, table);
dselman marked this conversation as resolved.
Show resolved Hide resolved
(metaModel.decorators || []).forEach((decorator) => {
resolveTypeNames(decorator, table);
});
}
break;
}
return metaModel;
}
Expand Down
Loading
Loading