Merge pull request #17 from reyesoft/feature/better_store

Feature/better store

Author: pablorsk

.editorconfig

@@ -4,11 +4,14 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[src/**/*]
+indent_size = 4
+
 [*.md]
 trim_trailing_whitespace = false

CHANGELOG.md

@@ -0,0 +1,10 @@
+# 0.6.x
+
+## Localstorage cache
+
+- Save on localstore all data. When you request a resource or collection, first check memory. If its empty, read from store. If is empty, get the data from back-end.
+- typings and index.d.ts removed. We only use `import`
+
+# 0.5.x
+
+All data is merged on one single resource. If you request a request a single related resource, and on this request not include any another resource, related resources come from memory cache (if exists)

README.md

@@ -19,7 +19,7 @@ Jsonapi client library developed for AngularJS based on typescript.
 - [X] Filtering by regular expression
 - [x] Get a relationship from a URL (url like attributes->relationships->resource->links->self)
 - [x] Default values for a new resource
-- [x] [Properties on collections](https://github.com/reyesoft/ts-angular-jsonapi/blob/master/src/library/interfaces/collection.d.ts) like `$length`, `$isloading` or `$source` (_`empty`_ |`cache`|`server`)
+- [x] [Properties on collections](https://github.com/reyesoft/ts-angular-jsonapi/blob/master/src/library/interfaces/collection.d.ts) like `$length`, `$is_loading` or `$source` (_`empty`_ |`cache`|`server`)
 
 ## Usage
 
@@ -62,10 +62,6 @@ Like you know, the better way is with examples. Based on [endpoints example libr
 
 ### Defining a resource
 
-1. hola
-2. hola 2
-3. hola
-
 `authors.service.ts`
 
 ```typescript
@@ -191,8 +187,6 @@ let author = AuthorsService.get(
 );
 ```
 
-````
-
 ### Update a resource
 
 ```javascript
@@ -201,9 +195,8 @@ this.author.attributes.name += 'New Name';
 this.author.save(success => {
     console.log('author saved!');
     });
-````
+```
 
-````
 ### Handling errors
 
 ### Pagination
@@ -261,4 +254,3 @@ gulp dist
 ```
 
 And commit! Don't forget your pull request :)
-````

conf/gulp.conf.js

@@ -25,10 +25,17 @@ exports.paths = {
   tasks: 'gulp_tasks'
 };
 
+/**
+* used on gulp dist
+*/
+exports.htmlmin = {
+  ignoreCustomFragments: [/{{.*?}}/]
+};
+
 exports.path = {};
 for (const pathName in exports.paths) {
-  if (exports.paths.hasOwnProperty(pathName)) {
-    exports.path[pathName] = function pathJoin() {
+  if (Object.prototype.hasOwnProperty.call(exports.paths, pathName)) {
+    exports.path[pathName] = function () {
       const pathValue = exports.paths[pathName];
       const funcArgs = Array.prototype.slice.call(arguments);
       const joinArgs = [pathValue].concat(funcArgs);

conf/webpack-dist.conf.js

@@ -3,58 +3,77 @@ const conf = require('./gulp.conf');
 const path = require('path');
 
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const SplitByPathPlugin = require('webpack-split-by-path');
-const ExtractTextPlugin = require("extract-text-webpack-plugin");
+const FailPlugin = require('webpack-fail-plugin');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const pkg = require('../package.json');
 const autoprefixer = require('autoprefixer');
 var DeclarationBundlerPlugin = require('declaration-bundler-webpack-plugin');
 
 module.exports = {
-    module: {
-        // https://github.com/localForage/localForage#browserify-and-webpack
-        noParse: /node_modules\/localforage\/dist\/localforage.js/,
+  module: {
+    // https://github.com/localForage/localForage#browserify-and-webpack
+    noParse: /node_modules\/localforage\/dist\/localforage.js/,
 
+    loaders: [
+      {
+        test: /\.json$/,
         loaders: [
-            {
-                test: /\.ts$/,
-                exclude: /node_modules/,
-                loaders: [
-                    'ng-annotate',
-                    'ts'
-                ]
-            }
+          'json-loader'
         ]
-    },
-    plugins: [
-        new webpack.optimize.OccurrenceOrderPlugin(),
-        new webpack.NoErrorsPlugin()
-        // new webpack.optimize.UglifyJsPlugin({
-        //     compress: {unused: true, dead_code: true} // eslint-disable-line camelcase
-        // })
-    ],
-    output: {
-        // https://webpack.github.io/docs/library-and-externals.html
-        path: path.join(process.cwd(), conf.paths.dist),
-        library: 'Jsonapi',
-        libraryTarget: 'commonjs',
-        filename: 'ts-angular-jsonapi.js'
-    },
-    externals: {
-        'angular': 'angular'
-    },
-    resolve: {
-        extensions: [
-            '',
-            '.webpack.js',
-            '.web.js',
-            '.js',
-            '.ts'
+      },
+      {
+        test: /\.ts$/,
+        exclude: /node_modules/,
+        loader: 'tslint-loader',
+        enforce: 'pre'
+      },
+      {
+        test: /\.(css|scss)$/,
+        loaders: ExtractTextPlugin.extract({
+          fallback: 'style-loader',
+          use: 'css-loader?minimize!sass-loader!postcss-loader'
+        })
+      },
+      {
+        test: /\.ts$/,
+        exclude: /node_modules/,
+        loaders: [
+          'ng-annotate-loader',
+          'ts-loader'
+        ]
+      },
+      {
+        test: /\.html$/,
+        loaders: [
+          'html-loader'
         ]
-    },
-    entry: `./${conf.path.srcdist('index.ts')}`,
-    ts: {
-        configFileName: 'tsconfig.json'
-    },
-    tslint: {
-        configuration: require('../tslint.json')
-    }
+      }
+    ]
+  },
+  plugins: [
+    new webpack.optimize.OccurrenceOrderPlugin(),
+    new webpack.NoEmitOnErrorsPlugin()
+    // new webpack.optimize.UglifyJsPlugin({
+    //     compress: {unused: true, dead_code: true} // eslint-disable-line camelcase
+    // })
+  ],
+  output: {
+    // https://webpack.github.io/docs/library-and-externals.html
+    path: path.join(process.cwd(), conf.paths.dist),
+    library: 'Jsonapi',
+    libraryTarget: 'commonjs',
+    filename: 'ts-angular-jsonapi.js'
+  },
+  externals: {
+    'angular': 'angular'
+  },
+  resolve: {
+    extensions: [
+      '.webpack.js',
+      '.web.js',
+      '.js',
+      '.ts'
+    ]
+  },
+  entry: `./${conf.path.srcdist('index.ts')}`
 };

conf/webpack.conf.js

@@ -3,79 +3,89 @@ const conf = require('./gulp.conf');
 const path = require('path');
 
 const HtmlWebpackPlugin = require('html-webpack-plugin');
+const FailPlugin = require('webpack-fail-plugin');
 const autoprefixer = require('autoprefixer');
 
 module.exports = {
   module: {
     // https://github.com/localForage/localForage#browserify-and-webpack
     noParse: /node_modules\/localforage\/dist\/localforage.js/,
 
-    preLoaders: [
-      {
-        test: /\.ts$/,
-        exclude: /node_modules/,
-        loader: 'tslint'
-      }
-    ],
-
     loaders: [
       {
-        test: /.json$/,
+        test: /\.json$/,
         loaders: [
-          'json'
+          'json-loader'
         ]
       },
+      {
+        test: /\.ts$/,
+        exclude: /node_modules/,
+        loader: 'tslint-loader',
+        enforce: 'pre'
+      },
       {
         test: /\.(css|scss)$/,
         loaders: [
-          'style',
-          'css',
-          'sass',
-          'postcss'
+          'style-loader',
+          'css-loader',
+          'sass-loader',
+          'postcss-loader'
         ]
       },
       {
-          test: /\.(eot|woff|woff2|svg|ttf)([\?]?.*)$/, loader: "file-loader"
+        test: /\.(eot|woff|woff2|svg|ttf)([\?]?.*)$/, loader: "file-loader"
       },
       {
         test: /\.ts$/,
         exclude: /node_modules/,
         loaders: [
-          'ng-annotate',
-          'ts'
+          'ng-annotate-loader',
+          'ts-loader'
+        ]
+      },
+      {
+        test: /\.html$/,
+        loaders: [
+          'html-loader'
         ]
       }
     ]
   },
   plugins: [
     new webpack.optimize.OccurrenceOrderPlugin(),
-    new webpack.NoErrorsPlugin(),
+    new webpack.NoEmitOnErrorsPlugin(),
+    FailPlugin,
     new HtmlWebpackPlugin({
-      template: conf.path.src('demo/index.html'),
-      inject: true
+      template: conf.path.src('demo/index.html') // ,
+      // inject: true
+    }),
+    new webpack.LoaderOptionsPlugin({
+      options: {
+        postcss: () => [autoprefixer],
+        resolve: {},
+        ts: {
+          configFileName: 'tsconfig.json'
+        },
+        tslint: {
+          configuration: require('../tslint.json')
+        }
+      },
+      debug: true
     })
   ],
-  postcss: () => [autoprefixer],
-  debug: true,
-  devtool: 'cheap-module-eval-source-map',
+  devtool: 'source-map',
   output: {
     path: path.join(process.cwd(), conf.paths.tmp),
     filename: 'index.js'
   },
   resolve: {
     extensions: [
-      '',
       '.webpack.js',
       '.web.js',
       '.js',
       '.ts'
     ]
   },
-  entry: `./${conf.path.src('demo/index')}`,
-  ts: {
-    configFileName: 'tsconfig.json'
-  },
-  tslint: {
-    configuration: require('../tslint.json')
-  }
+  entry: `./${conf.path.src('demo/index')}`
 };