3.0.12

.gitignore

@@ -1,4 +1,22 @@
-node_modules/
+.nogit/
+
+# artifacts
 coverage/
 public/
 pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,5 +1,7 @@
-# gitzone standard
+# gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+variables:
+  GIT_STRATEGY: clone
 
 cache:
   paths:
@@ -26,6 +28,7 @@ mirror:
 snyk:
   stage: security
   script:
+    - npmci npm prepare
     - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
@@ -36,44 +39,35 @@ snyk:
 # ====================
 # test stage
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
 
-testLTS:
+testStable:
-  stage: test
-  script:
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
   stage: test
   script:
+  - npmci npm prepare
   - npmci node install stable
   - npmci npm install
   - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - priv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
   - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm publish
   only:
   - tags
@@ -86,19 +80,11 @@ release:
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - npmci command npm install -g tslint typescript
-    - docker run
+    - npmci npm install
-        --env SOURCE_CODE="$PWD"
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
   tags:
   - docker
   - priv
@@ -114,12 +100,15 @@ trigger:
   - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:18-dind
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci command npm install -g @gitzone/tsdoc
+    - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
     - docker
     - notpriv
@@ -130,13 +119,3 @@ pages:
     paths:
     - public
   allow_failure: true
-
-windowsCompatibility:
-  image: stefanscherer/node-windows:10-build-tools
-  stage: metadata
-  script:
-  - npm install & npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - windows
-  allow_failure: true

.snyk

@@ -0,0 +1,4 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.13.3
+ignore: {}
+patch: {}

README.md

@@ -1,25 +1,20 @@
-# smartjson
+# @pushrocks/smartjson
-
 typed json handlers
 
-## Availabililty
+## Availabililty and Links
-
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartjson)
-[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartjson)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartjson)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartjson)
+* [github.com (source mirror)](https://github.com/pushrocks/smartjson)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartjson)
+* [docs (typedoc)](https://pushrocks.gitlab.io/smartjson/)
-[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartjson/)
 
 ## Status for master
-
+[![build status](https://gitlab.com/pushrocks/smartjson/badges/master/build.svg)](https://gitlab.com/pushrocks/smartjson/commits/master)
-[![build status](https://GitLab.com/pushrocks/smartjson/badges/master/build.svg)](https://GitLab.com/pushrocks/smartjson/commits/master)
+[![coverage report](https://gitlab.com/pushrocks/smartjson/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartjson/commits/master)
-[![coverage report](https://GitLab.com/pushrocks/smartjson/badges/master/coverage.svg)](https://GitLab.com/pushrocks/smartjson/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartjson.svg)](https://www.npmjs.com/package/@pushrocks/smartjson)
-[![npm downloads per month](https://img.shields.io/npm/dm/smartjson.svg)](https://www.npmjs.com/package/smartjson)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartjson/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartjson)
-[![Dependency Status](https://david-dm.org/pushrocks/smartjson.svg)](https://david-dm.org/pushrocks/smartjson)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartjson/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartjson/master/dependencies/npm)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/smartjson/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartjson)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 ## Usage
 
@@ -30,9 +25,11 @@ Use TypeScript for best in class instellisense.
 SmartJson makes it easy to fold and enfold classes into and from JSON
 
 ```javascript
-import { Foldable, foldDec } from 'smartjson';
+import { Smartjson, foldDec } from 'smartjson';
+
+class AwesomeClass extends Smartjson {
+  static stringify;
 
-class AwesomeClass extends Foldable {
   computedValue: string;
 
   @foldDec() // mark anotherValueToStore as foldable
@@ -48,9 +45,9 @@ myAwesomeInstance.enfoldFromObject({ anotherValueToStore: 'hi' });
 foldedObject = myAwesomeInstance.foldToObject(); // will return {anotherValueToStore: 'hi'}
 ```
 
-For further information read the linked docs at the top of this README.
+For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
 
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

npmextra.json

@@ -1,5 +1,16 @@
 {
   "npmci": {
     "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "projectType": "npm",
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartjson",
+      "shortDescription": "typed json handlers",
+      "npmPackagename": "@pushrocks/smartjson",
+      "license": "MIT"
+    }
   }
 }

package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pushrocks/smartjson",
-  "version": "2.0.2",
+  "version": "3.0.12",
   "private": false,
   "description": "typed json handlers",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "scripts": {
-    "test": "(tstest test/)",
+    "test": "(tstest test/ --web)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web)"
   },
   "repository": {
     "type": "git",
@@ -20,13 +20,30 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartjson#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsrun": "^1.1.12",
+    "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.15",
+    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.0.1",
+    "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^10.9.4"
+    "@types/node": "^14.11.2",
+    "tslint": "^6.1.3",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "lodash": "^4.17.10"
+    "@types/buffer-json": "^2.0.0",
-  }
+    "@types/fast-json-stable-stringify": "^2.0.0",
+    "buffer-json": "^2.0.0",
+    "fast-json-stable-stringify": "^2.1.0",
+    "lodash.clonedeep": "^4.5.0"
+  },
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

test/test.ts

@@ -1,9 +1,9 @@
-import { tap, expect } from "@pushrocks/tapbundle";
+import { tap, expect } from '@pushrocks/tapbundle';
 
-import { Foldable, foldDec } from "../ts/index";
+import { Smartjson, foldDec } from '../ts/index';
 
-class SomeClass extends Foldable {
+class SomeClass extends Smartjson {
-  @foldDec() thisis: string = "test";
+  @foldDec() thisis: string = 'test';
   constructor() {
     super();
     console.log(this.saveableProperties);
@@ -12,24 +12,24 @@ class SomeClass extends Foldable {
 
 let mySomeClass: SomeClass;
 
-tap.test("should create a Foldable extended instance", async () => {
+tap.test('should create a Foldable extended instance', async () => {
   mySomeClass = new SomeClass();
   expect(mySomeClass).to.be.instanceof(SomeClass);
-  expect(mySomeClass).to.be.instanceof(Foldable);
+  expect(mySomeClass).to.be.instanceof(Smartjson);
 });
 
-tap.test("should create a folded object", async () => {
+tap.test('should create a folded object', async () => {
   let foldedObject = mySomeClass.foldToObject();
   expect(foldedObject)
-    .property("thisis")
+    .property('thisis')
-    .to.equal("test");
+    .to.equal('test');
 });
 
-tap.test("should enfold from object", async () => {
+tap.test('should enfold from object', async () => {
-  mySomeClass.enfoldFromObject({ thisis: "test2" });
+  const mySomeClass2 = SomeClass.enfoldFromObject({ thisis: 'test2' });
-  expect(mySomeClass)
+  expect(mySomeClass2)
-    .property("thisis")
+    .property('thisis')
-    .to.equal("test2");
+    .to.equal('test2');
 });
 
-tap.start()
+tap.start();

ts/index.ts

@@ -1,28 +1,48 @@
-let lodash = require('lodash');
+import * as plugins from './smartjson.plugins';
-
-export class Foldable {
-  saveableProperties: string[];
 
+export class Smartjson {
+  // ======
+  // STATIC
+  // ======
   /**
-   * folds a class into an object
+   * allows you to parse a json
    */
-  foldToObject() {
+  public static parse = plugins.bufferJson.parse;
-    let newFoldedObject = {};
+
-    for (let keyName of this.saveableProperties) {
+  public static stringify = (objArg: any, optionsArg: plugins.IStableJsonTypes['Options']) => {
-      newFoldedObject[keyName] = lodash.cloneDeep(this[keyName]);
+    const bufferedJson = plugins.bufferJson.stringify(objArg);
-    }
+    objArg = JSON.parse(bufferedJson);
-    return newFoldedObject;
+    return plugins.stableJson(objArg, optionsArg);
   }
   
   /**
    * enfolds data from an object
    */
-  enfoldFromObject(objectArg) {
+  public static enfoldFromObject(objectArg) {
-    for (let keyName in objectArg) {
+    const newInstance = new this();
-      if (this.saveableProperties.indexOf(keyName) !== -1) {
+    for (const keyName in objectArg) {
-        this[keyName] = objectArg[keyName];
+      if (newInstance.saveableProperties.indexOf(keyName) !== -1) {
+        newInstance[keyName] = objectArg[keyName];
       }
     }
+    return newInstance;
+  }
+
+  // ========
+  // INSTANCE
+  // ========
+
+  public saveableProperties: string[];
+
+  /**
+   * folds a class into an object
+   */
+  public foldToObject() {
+    const newFoldedObject: { [key: string]: any } = {};
+    for (const keyName of this.saveableProperties) {
+      newFoldedObject[keyName] = plugins.lodashCloneDeep(this[keyName]);
+    }
+    return newFoldedObject;
   }
 }
 

ts/smartjson.plugins.ts

@@ -0,0 +1,20 @@
+// third party scope
+import lodashCloneDeep from 'lodash.clonedeep';
+import stableJson2 from 'fast-json-stable-stringify';
+import bufferJson from 'buffer-json';
+
+const stableJson = stableJson2 as any;
+
+export { bufferJson, lodashCloneDeep, stableJson };
+
+export interface IStableJsonTypes {
+  Comparator: (a: IStableJsonTypes['CompareDescriptor'], b: IStableJsonTypes['CompareDescriptor']) => number;
+  CompareDescriptor: {
+      key: string;
+      value: any;
+  };
+  Options: {
+    cmp?: (a: IStableJsonTypes['CompareDescriptor'], b: IStableJsonTypes['CompareDescriptor']) => number;
+    cycles?: boolean;
+  };
+}

tsconfig.json

@@ -1,7 +1,8 @@
 {
     "compilerOptions": {
         "experimentalDecorators": true,
-        "target": "es2016",
+        "esModuleInterop": true,
+        "target": "es2017",
         "module": "commonjs"
     }
 }

tslint.json

@@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
 }