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(@aws-amplify/datastore): Support non-@model types in DataStore #5128

Merged
merged 17 commits into from
Mar 19, 2020

Conversation

manueliglesias
Copy link
Contributor

Issue #, if available:
See aws-amplify/amplify-cli#2988

Description of changes:
This change allows the usage of types with no @model directive.

Field values of a non-@model type will be stored alongside the @model instance

e.g. with the following schema, the JSON shown is stored

type Note @model {
  id: ID!
  content: String!
  metadata: Metadata
}

type Metadata {
  author: String!
  tags: [String]
  nested: Nested
}

type Nested {
  x: Int
}
{
  "__typename": "Note",
  "_lastChangedAt": 1584144474971,
  "_version": 1,
  "content": "Content 1584144474557",
  "createdAt": "2020-03-14T00:07:54.911Z",
  "id": "b41f57cc-4375-4bc5-83e2-1da694381f7f",
  "metadata": {
    "author": "Manolo",
    "tags": [
      "amazon",
      "aws",
      "mobile"
    ],
    "nested": {
      "x": 12345
    }
  },
  "updatedAt": "2020-03-14T00:07:54.911Z"
}

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@lgtm-com
Copy link

lgtm-com bot commented Mar 17, 2020

This pull request introduces 1 alert when merging 79bcdec into 97b3186 - view on LGTM.com

new alerts:

  • 1 for Unused variable, import, function or class

@codecov
Copy link

codecov bot commented Mar 17, 2020

Codecov Report

Merging #5128 into master will decrease coverage by 3.13%.
The diff coverage is 80.57%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5128      +/-   ##
==========================================
- Coverage   76.35%   73.21%   -3.14%     
==========================================
  Files         175      193      +18     
  Lines        9676    11441    +1765     
  Branches     1927     2218     +291     
==========================================
+ Hits         7388     8377     +989     
- Misses       2150     2916     +766     
- Partials      138      148      +10     
Impacted Files Coverage Δ
packages/datastore/__tests__/schema.ts 100.00% <ø> (ø)
packages/datastore/src/storage/storage.ts 67.59% <ø> (ø)
packages/datastore/src/sync/processors/mutation.ts 13.38% <0.00%> (ø)
packages/datastore/src/sync/processors/sync.ts 18.05% <0.00%> (ø)
packages/datastore/src/sync/index.ts 15.42% <42.85%> (ø)
packages/datastore/src/datastore/datastore.ts 70.80% <81.15%> (ø)
packages/datastore/__tests__/model.ts 100.00% <100.00%> (ø)
...ackages/datastore/src/storage/adapter/indexeddb.ts 73.26% <100.00%> (ø)
...ages/datastore/src/sync/processors/subscription.ts 43.91% <100.00%> (ø)
packages/datastore/src/sync/utils.ts 80.66% <100.00%> (ø)
... and 20 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0ddb6af...cf94d44. Read the comment docs.

Copy link
Contributor

@Amplifiyer Amplifiyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, small naming suggestions.

packages/datastore/src/datastore/datastore.ts Outdated Show resolved Hide resolved
packages/datastore/src/types.ts Outdated Show resolved Hide resolved
packages/datastore/src/datastore/datastore.ts Outdated Show resolved Hide resolved
@lgtm-com
Copy link

lgtm-com bot commented Mar 19, 2020

This pull request fixes 1 alert when merging 8defa36 into 0ddb6af - view on LGTM.com

fixed alerts:

  • 1 for Unused variable, import, function or class

Copy link
Contributor

@Amplifiyer Amplifiyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to 🚢 it

Copy link
Contributor

@Ashish-Nanda Ashish-Nanda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just one minor comment

packages/datastore/src/datastore/datastore.ts Outdated Show resolved Hide resolved
Copy link
Contributor

@Ashish-Nanda Ashish-Nanda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ship it! 🚢 🚀

@lgtm-com
Copy link

lgtm-com bot commented Mar 19, 2020

This pull request fixes 1 alert when merging cf94d44 into 0ddb6af - view on LGTM.com

fixed alerts:

  • 1 for Unused variable, import, function or class

@manueliglesias manueliglesias merged commit b884ea2 into aws-amplify:master Mar 19, 2020
jordanranz added a commit that referenced this pull request Mar 27, 2020
* Adding database abstraction for AsyncStorage

* Add storage adapter for React Native using AsyncStorage

* Add separate default adapters for Web and React Native

* Make error messages more meaningful

* Add support for Reachability in React Native

* Add @react-native-community/netinfo to devDependencies

* Pin down the version of crypto-js

* Enable publish from rn-datastore branch

* Preparing release

* chore(release): Publish [ci skip]

 - @aws-amplify/analytics@2.2.5
 - aws-amplify-angular@4.1.6
 - aws-amplify-react@3.1.6
 - aws-amplify@2.2.5
 - @aws-amplify/datastore@1.0.7
 - @aws-amplify/pubsub@2.1.6

* Allow in PubSub to add async custom headers

Allow in PubSub the same capabilities as API for custom headers:
* Async header
* Override headers (Authorization)

Check issue #4928 for explanations.

* chore(deps-dev): bump codecov from 1.0.1 to 3.6.5 (#4951)

Bumps [codecov](https://github.com/codecov/codecov-node) from 1.0.1 to 3.6.5.
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/commits)

Signed-off-by: dependabot[bot] <support@github.com>

* (fix:@aws-amplify/pubsub) Fix for unsubscription new subscription race condition (#4956)

* Fix for unsubscription new subscription race condition

* Update packages/pubsub/src/Providers/AWSAppSyncRealTimeProvider.ts

* Fix to initialize only once and handle disconnection from network  (#4921)

* initialize only once

* Fix onerror handler for WebSocket

* Change log level for unsubscribe message

* Add regions and fix typo

* Handle disconnection

* chore(deps): bump nokogiri from 1.10.4 to 1.10.8 in /docs (#4974)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.4 to 1.10.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.10.4...v1.10.8)

Signed-off-by: dependabot[bot] <support@github.com>

* Use the db instance property of the Adapter class for all database operations (#4995)

Use the db instance property of the Adapter class for all database operations

* Removing unused code

* Remove rn-datastore branch publish config

* Preparing release

* chore(release): Publish [ci skip]

 - amazon-cognito-identity-js@3.2.5
 - @aws-amplify/analytics@2.2.6
 - @aws-amplify/api@2.1.6
 - @aws-amplify/auth@2.1.6
 - aws-amplify-angular@4.1.7
 - aws-amplify-react@3.1.7
 - aws-amplify@2.2.6
 - @aws-amplify/cache@2.1.6
 - @aws-amplify/core@2.2.5
 - @aws-amplify/datastore@1.0.8
 - @aws-amplify/interactions@2.1.6
 - @aws-amplify/predictions@2.1.6
 - @aws-amplify/pubsub@2.1.7
 - @aws-amplify/pushnotification@2.1.6
 - @aws-amplify/storage@2.2.1
 - @aws-amplify/xr@1.1.6

* fix(core): move react-native dependency from dev

* fix(core): revert dep addition. Add to peer and devDeps

* ci: Add React Native integration testing with Detox (#5007)

* Make deploy wait on integ_rn_ios_storage (#5009)

* feat(@aws-amplify/api): pass additionalHeaders to graphql function (#5001)

Additional headers are merged **after** merging in headers set at config time.
Additional headers will overwrite any existing values and merge the rest.

* chore(@aws-amplify/api): fix non-breaking typo in function (#5034)

* fix(@aws-amplify/datastore): Fix query and delete types (#5032)

Fixes #4827

* Fix(@aws-amplify/interactions) fixes 4750 to properly use the spread operator (#4806)

* fix(@aws-amplify/datastore) Adding socket disconnection detection (#5086)

* Export necessary providers and types from the package root to avoid importing from generated paths (#5085)

* fix(aws-amplify-react): Fix Federated icons when using React Bo… (#5073)

* Explicitly set box-sizing, as CSS resets override to border-box

* Explicitly set line-height, as CSS resets override line-height

* Upgrade aws-sdk clients which resolves react native issues (#5124)

* Export necessary providers and types from the package root to avoid importing from generated paths

* Upgrade aws-sdk clients which resolves react native issues

* Enable integration tests on modularization branch (#5125)

* chore: Fix setup-dev script (#5035)

Let `unlink-all` succeed always

Co-authored-by: Iglesias <manuelig@3c22fb19fec4.ant.amazon.com>

* fix(@aws-amplify/datastore): Storage should be re-initialized after DataStore.clear() (#5083)

* fix(@aws-amplify/datastore): Fix #5076 storage not re-initialized after DataStore.clear()

* Adding comments

Co-authored-by: Manuel Iglesias <manuelig@amazon.com>
Co-authored-by: Ashish Nanda <ashish.nanda.5591@gmail.com>

* fix(aws-amplify-react): BREAKING - Remove "import '@aws-amplify… (#5138)

Importing non-JS files relies on a bundler & breaks SSR.

It works with CRA because CRA *builds all dependencies*, just-in-case.

* feat(@aws-amplify/datastore): Support non-@model types in DataStore (#5128)

* Upgrade immer

* Return sooner if predicates are empty

* Fix bug when trying to delete a model instance that is not persisted

* Support non-@model types

* Generate datastore coverage report and RN integ test

* Fix tslint error

* Remove  unit test case for onGetPost

* Remove unused code

* Rename instance initializer to initializeInstance

* Rename SchemaType to SchemaNonModel

* Rename types to nonModels in schema.js

* Rename type to nonModel

* Make nonModels optional in schema.js

* Remove generic constraint from createTypeClass

* Rename ModelOrTypeConstructorMap to TypeConstructorMap

* Rename createModelAndTypeClassses to createTypeClasses

* Rename createTypeClass to createNonModelClass

* chore: remove datastore form RN integ tests (#5139)

* Fix export type of datastore storage in unit tests

* test(@aws-amplify/datastore): Fix unit tests

* [RN] Migrate zen-observable to zen-observable-ts and fix zen-push import (#5155)

* Migrate zen-observable to zen-observable-ts and fix zen-push import

* Fix unit tests

* Pin aws-sdk versions and rename presignRequest to presign (#5171)

* Migrate zen-observable to zen-observable-ts and fix zen-push import

* Fix unit tests

* Pin aws-sdk versions and rename presignRequest to presign

* Upgrade aws-sdk clients from alpha to beta (#5209)

* Migrate zen-observable to zen-observable-ts and fix zen-push import

* Fix unit tests

* Pin aws-sdk versions and rename presignRequest to presign

* Upgrade aws-sdk clients from alpha to beta

* Update expiration type to Date as per change in aws-sdk

* Fix unit tests as per expiration type change

* Fix jest failures, update snapshot

* Update storage changelog

Co-authored-by: Ashish Nanda <ashish.nanda.5591@gmail.com>
Co-authored-by: Rodriguez Elorza <elorzafe@amazon.com>
Co-authored-by: aws-amplify-bot <aws@amazon.com>
Co-authored-by: Sebastien Schwartz <schwartz.seb@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Manuel Iglesias <manuelig@amazon.com>
Co-authored-by: Ivan Artemiev <29709626+iartemiev@users.noreply.github.com>
Co-authored-by: Jens Bodal <jensbodal@gmail.com>
Co-authored-by: Ashika <35131273+ashika01@users.noreply.github.com>
Co-authored-by: Manuel Iglesias <6154160+manueliglesias@users.noreply.github.com>
Co-authored-by: Praveen Gupta <51211245+Amplifiyer@users.noreply.github.com>
Co-authored-by: Eric Clemmons <eric@smarterspam.com>
Co-authored-by: Iglesias <manuelig@3c22fb19fec4.ant.amazon.com>
Co-authored-by: Yirako <yirako@users.noreply.github.com>
Co-authored-by: pravgupt@amazon.com <pravgupt@8c85905cd208.ant.amazon.com>
@github-actions
Copy link

This pull request has been automatically locked since there hasn't been any recent activity after it was closed. Please open a new issue for related bugs.

Looking for a help forum? We recommend joining the Amplify Community Discord server *-help channels or Discussions for those types of questions.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 11, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants