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.

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

feat: Support Amplify Android Lazy Types and Custom Selection Set #699

Merged
merged 38 commits into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
968a755
Android CSS and LL support
tylerjroach Aug 16, 2023
31908c5
Further model updates
tylerjroach Aug 17, 2023
51517a6
Fix LazyModel generation logic
tylerjroach Aug 18, 2023
2bcf5ad
Only generate ModelPath if model type
tylerjroach Aug 18, 2023
307e850
lint
tylerjroach Aug 18, 2023
cf92b52
Fix LazyModel in builder
tylerjroach Aug 21, 2023
acc0b7c
Merge branch 'main' into tjroach/css-and-ll
tylerjroach Sep 5, 2023
0f6f4bd
android lazy + css support
tylerjroach Sep 5, 2023
00d01df
android updates
tylerjroach Sep 5, 2023
df021ab
Add nullability requirements to CopyOfBuilder
tylerjroach Sep 6, 2023
ba52cbf
Update to use ModelReference types
tylerjroach Sep 13, 2023
886c41c
Merge branch 'main' into tjroach/css-and-ll
tylerjroach Sep 13, 2023
f46d5a1
Adding tests (#697)
lawmicha Sep 13, 2023
06f41f7
Merge branch 'main' into tjroach/css-and-ll
tylerjroach Sep 14, 2023
79ad44a
lint
tylerjroach Sep 14, 2023
7665309
generate CompositePKParent files correctly
lawmicha Sep 14, 2023
f2b8d64
WIP: attempt to check if datastore is enabled
tylerjroach Sep 14, 2023
279d803
Generate lazy if datastore is disbled
tylerjroach Sep 14, 2023
655f1f2
Fix indentation
tylerjroach Sep 18, 2023
e69515b
PR Comments
tylerjroach Sep 18, 2023
c9e2599
Merge branch 'main' into tjroach/css-and-ll
tylerjroach Sep 18, 2023
2ddc1a8
add isDataStoreEnabled true tests
lawmicha Sep 18, 2023
3981820
lint
tylerjroach Sep 18, 2023
9a4b2fb
Merge branch 'main' into tjroach/css-and-ll
tylerjroach Sep 25, 2023
413d2b9
Update tests
tylerjroach Sep 25, 2023
1fb6644
Add targetNames to belongsTo
tylerjroach Sep 25, 2023
1a0e6b4
Create manyToMany join model path files
lawmicha Sep 27, 2023
4697935
Merge pull request #722 from aws-amplify/tjroach/css-and-ll.join-mode…
tylerjroach Sep 27, 2023
840a197
Update API.md
tylerjroach Sep 28, 2023
de9450b
add more test cases
lawmicha Sep 28, 2023
0a0ff3d
refactor join model preset code
lawmicha Sep 29, 2023
fd368a1
Merge pull request #725 from aws-amplify/tjroach/css-and-ll.join-mode…
tylerjroach Sep 29, 2023
a2b29ae
PR comment
tylerjroach Sep 29, 2023
018d253
pr comment
tylerjroach Sep 29, 2023
bb6c5e7
Fix unnecessary forEach iterations
tylerjroach Oct 3, 2023
b318558
Merge branch 'main' into tjroach/css-and-ll
tylerjroach Oct 4, 2023
a0de407
Update packages/appsync-modelgen-plugin/src/visitors/appsync-java-vis…
tylerjroach Oct 4, 2023
676c0cb
Only add targetNames for HasOne on Android if lazy load support enabled
tylerjroach Oct 4, 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
2 changes: 2 additions & 0 deletions packages/amplify-codegen/src/commands/models.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const { validateAmplifyFlutterMinSupportedVersion } = require('../utils/validate
const defaultDirectiveDefinitions = require('../utils/defaultDirectiveDefinitions');
const getProjectRoot = require('../utils/getProjectRoot');
const { getModelSchemaPathParam, hasModelSchemaPathParam } = require('../utils/getModelSchemaPathParam');
const { isDataStoreEnabled } = require('graphql-transformer-core');

/**
* Amplify Context type.
Expand Down Expand Up @@ -260,6 +261,7 @@ async function generateModels(context, generateOptions = null) {
const generatedCode = await generateModelsHelper({
schema: loadSchema(apiResourcePath),
directives: await getDirectives(context, apiResourcePath),
isDataStoreEnabled: await isDataStoreEnabled(apiResourcePath),
alharris-at marked this conversation as resolved.
Show resolved Hide resolved
target: modelgenFrontendToTargetMap[frontend],
generateIndexRules: readFeatureFlag(context, 'codegen.generateIndexRules'),
emitAuthProvider: readFeatureFlag(context, 'codegen.emitAuthProvider'),
Expand Down
1 change: 1 addition & 0 deletions packages/appsync-modelgen-plugin/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export const addToSchema: (config: AppSyncModelPluginConfig) => string;
export type AppSyncModelCodeGenPresetConfig = {
overrideOutputDir: string | null;
target: Target;
isDataStoreEnabled?: boolean;
};

// @public (undocumented)
Expand Down
Loading