@webda/core 1.6.0-beta.1 → 2.0.0-beta.0

package/lib/utils/waiter.d.ts

@@ -75,7 +75,7 @@ export declare class WaitDelayerFactories {
  * @param logger logger to use to report
  * @param delayer function that return pause between each call default to WaitExponential(1000)
  */
-export declare function WaitFor<T = any>(callback: (resolve: (value?: T) => void, reject: (reason?: any) => void) => Promise<boolean>, retries: number, title?: string, logger?: Logger, delayer?: WaitDelayer): Promise<T>;
+export declare function WaitFor<T = any>(callback: (resolve: (value?: T) => void, reject?: (reason?: any) => void) => Promise<boolean>, retries: number, title?: string, logger?: Logger, delayer?: WaitDelayer): Promise<T>;
 /**
  * Return a promise that can be cancelled
  */

package/lib/utils/waiter.js.map

@@ -1 +1 @@
-{"version":3,"file":"waiter.js","sourceRoot":"","sources":["../../src/utils/waiter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"waiter.js","sourceRoot":"","sources":["../../src/utils/waiter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webda/core",
-  "version": "1.6.0-beta.1",
+  "version": "2.0.0-beta.0",
   "description": "Expose API with Lambda",
   "keywords": [
     "aws",
@@ -13,24 +13,28 @@
   "typings": "lib/index.d.ts",
   "scripts": {
     "build": "tsc",
+    "grammar": "antlr4ts -visitor src/stores/webdaql/WebdaQLLexer.g4 src/stores/webdaql/WebdaQLParser.g4 && yarn run lint:fix",
     "pretest": "npm run build",
     "lint": "prettier --check src/**/*",
     "lint:fix": "prettier --write src/**/*",
-    "test": "nyc mocha --recursive --exit --timeout=100000 -r ../../node_modules/ts-node/register src/**/*.spec.ts src/*.spec.ts"
+    "test": "nyc mocha --recursive --exit --timeout=100000 -r ../../node_modules/ts-node/register src/**/*.spec.ts src/*.spec.ts src/**/**/*.spec.ts"
   },
   "dependencies": {
     "@types/json-schema": "^7.0.8",
-    "@webda/workout": "^1.6.0-beta.1",
+    "@webda/workout": "^2.0.0-beta.0",
     "accept-language": "^3.0.18",
     "ajv": "^8.6.2",
+    "ajv-formats": "^2.1.1",
+    "antlr4ts": "^0.5.0-alpha.4",
     "bcryptjs": "^2.4.3",
-    "cookie": "^0.4.1",
-    "dateformat": "^4.5.1",
-    "deepmerge": "^4.2.2",
-    "email-templates": "^8.0.7",
+    "cookie": "^0.5.0",
+    "dateformat": "^5.0.3",
+    "deepmerge-ts": "^4.0.3",
+    "email-templates": "^9.0.0",
     "fs-finder": "^1.8.1",
-    "glob": "^7.1.7",
+    "glob": "^8.0.1",
     "global": "^4.4.0",
+    "jsonc-parser": "^3.0.0",
     "jsonpath": "^1.1.1",
     "jsonwebtoken": "^8.5.1",
     "merge": "^2.1.1",
@@ -38,32 +42,34 @@
     "mustache": "^4.2.0",
     "node-cron": "^3.0.0",
     "nodemailer": "^6.6.3",
-    "openapi-types": "^10.0.0",
+    "openapi-types": "^11.0.0",
     "sanitize-html": "^2.4.0",
     "semver": "^7.3.5",
     "ts-method-cache": "^3.3.1",
     "uri-templates": "^0.2.0",
     "uuid": "^8.3.2",
-    "yaml": "^1.10.2"
+    "yaml": "^2.0.0"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
-    "@testdeck/mocha": "^0.1.2",
+    "@testdeck/mocha": "^0.2.0",
     "@types/node": "14.0.0",
     "@types/nodemailer": "^6.4.4",
-    "axios": "^0.24.0",
+    "antlr4ts-cli": "^0.5.0-alpha.4",
+    "axios": "^0.27.2",
     "fs-extra": "^10.0.0",
-    "mocha": "^9.0.2",
+    "mocha": "^10.0.0",
     "nyc": "^15.1.0",
     "prettier": "^2.3.2",
-    "sinon": "^12.0.1",
+    "sinon": "^13.0.1",
     "source-map-support": "^0.5.19",
     "ts-node": "^10.1.0",
-    "typescript": "~4.4.3"
+    "typescript": "~4.6.3"
   },
   "files": [
     "lib",
-    "test"
+    "test",
+    "webda.module.json"
   ],
   "nyc": {
     "extends": "@istanbuljs/nyc-config-typescript",
@@ -77,7 +83,8 @@
     "exclude": [
       "src/test.ts",
       "**/*.spec.ts",
-      "test/**/*"
+      "test/**/*",
+      "src/stores/webdaql/WebdaQL*.ts"
     ]
   },
   "homepage": "https://webda.io",
@@ -87,5 +94,5 @@
   "webda": {
     "namespace": "Webda"
   },
-  "gitHead": "348aa239847c88956fa756c798d700bd48fff1fe"
+  "gitHead": "5a559bca55832e9a6526794117e2f78188eba3d0"
 }

package/test/config-file-no-reload.json

@@ -42,7 +42,7 @@
       }
     },
     "DefinedMailer": {
-      "type": "Test/Mailer"
+      "type": "WebdaTest/Mailer"
     },
     "Users": {
       "type": "MemoryStore"
@@ -51,6 +51,7 @@
       "type": "MemoryStore"
     },
     "FileConfigurationService": {
+      "type": "Webda/FileConfiguration",
       "source": "./my-cnf.json",
       "default": {
         "webda": {

package/test/config-file-reload.json

@@ -41,7 +41,7 @@
       }
     },
     "DefinedMailer": {
-      "type": "Test/Mailer"
+      "type": "WebdaTest/Mailer"
     },
     "Users": {
       "type": "MemoryStore"
@@ -50,6 +50,7 @@
       "type": "MemoryStore"
     },
     "FileConfigurationService": {
+      "type": "Webda/FileConfiguration",
       "source": "./my-cnf.json",
       "default": {
         "webda": {

package/test/config-invitation.json

@@ -0,0 +1,63 @@
+{
+  "version": 2,
+  "parameters": {
+    "sessionSecret": "Lp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5EN"
+  },
+  "module": {},
+  "services": {
+    "Authentication": {
+      "successRedirect": "https://webda.io/user.html",
+      "registerRedirect": "https://webda.io/register.html",
+      "failureRedirect": "/login-error",
+      "email": {
+        "from": "",
+        "subject": "",
+        "html": "",
+        "text": "",
+        "mailer": "DebugMailer",
+        "postValidation": false
+      }
+    },
+    "DebugMailer": {
+      "type": "Webda/DebugMailer"
+    },
+    "IdentsMapper": {
+      "type": "Webda/Mapper",
+      "source": "Idents",
+      "targetAttribute": "_idents",
+      "target": "Users",
+      "attribute": "_user",
+      "fields": "type,_lastUpdate,counter",
+      "cascade": true
+    },
+    "Idents": {
+      "asyncDelete": true,
+      "expose": {
+        "restrict": {
+          "create": true,
+          "update": true,
+          "get": true
+        }
+      },
+      "model": "Webda/Ident",
+      "type": "MemoryStore",
+      "validator": "IdentValidator"
+    },
+    "Users": {
+      "expose": {
+        "url": "/users"
+      },
+      "type": "MemoryStore",
+      "model": "Webda/User"
+    },
+    "Companies": {
+      "type": "MemoryStore",
+      "model": "Webda/AclModel",
+      "expose": true
+    },
+    "Invitations": {
+      "type": "MemoryStore",
+      "model": "Webda/CoreModel"
+    }
+  }
+}

package/test/config-kube-reload.json

@@ -41,7 +41,7 @@
       }
     },
     "DefinedMailer": {
-      "type": "Test/Mailer"
+      "type": "WebdaTest/Mailer"
     },
     "Users": {
       "type": "MemoryStore"
@@ -50,6 +50,7 @@
       "type": "MemoryStore"
     },
     "KubernetesConfigurationService": {
+      "type": "Webda/KubernetesConfigurationService",
       "source": "./kube",
       "default": {
         "webda": {

package/test/config-reload.json

@@ -41,7 +41,7 @@
       }
     },
     "DefinedMailer": {
-      "type": "Test/Mailer"
+      "type": "WebdaTest/Mailer"
     },
     "Users": {
       "type": "MemoryStore"

package/test/config.json

@@ -11,14 +11,10 @@
     "locales": ["es-ES", "en", "fr-FR"],
     "sessionSecret": "Lp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5EN"
   },
-  "module": {
-    "services": {
-      "Test/Mailer": "./moddas/debugmailer",
-      "Test/VoidStore": "./moddas/voidstore"
-    },
-    "models": {
-      "WebdaTest/Task": "./models/task",
-      "WebdaTest/Ident": "./models/ident"
+  "cachedModules": {
+    "schemas": {
+      "WebdaTest/Mailer": "./moddas/debugmailer",
+      "WebdaTest/VoidStore": "./moddas/voidstore"
     }
   },
   "services": {
@@ -72,7 +68,7 @@
       }
     },
     "DefinedMailer": {
-      "type": "Test/Mailer"
+      "type": "WebdaTest/Mailer"
     },
     "TrueMailer": {
       "type": "Webda/Mailer",
@@ -168,7 +164,7 @@
       }
     },
     "brokenService": {
-      "type": "Test/VoidStore",
+      "type": "WebdaTest/VoidStore",
       "accessKeyId": "LOCAL_ACCESS_KEY",
       "secretAccessKey": "LOCAL_SECRET_KEY"
     }

package/test/config.old.json

@@ -61,7 +61,7 @@
           }
         },
         "DefinedMailer": {
-          "type": "Test/Mailer"
+          "type": "WebdaTest/Mailer"
         },
         "MemoryIdents": {
           "asyncDelete": true,

package/test/moddas/annotatedservice.js

@@ -1,6 +1,4 @@
-"use strict";
-
-const Webda = require("../../lib/index.js");
+const Webda = require("../../src/index");
 
 @Webda.Bean
 class AnnotedService extends Webda.Store {

package/test/moddas/debugmailer.js

@@ -1,5 +1,4 @@
-"use strict";
-const Webda = require("../../lib/index");
+const Webda = require("../../src/index");
 
 class DebugMailer extends Webda.Service {
   constructor(webda, name, params) {
@@ -7,13 +6,9 @@ class DebugMailer extends Webda.Service {
     this.sent = [];
   }
 
-  getModda() {
-
-  }
-
   send(options, callback) {
     this.sent.push(options);
   }
 }
 
-module.exports = DebugMailer
+module.exports = DebugMailer;

package/test/moddas/fakeservice.js

@@ -1,4 +1,4 @@
-const Webda = require("../../lib/index.js");
+const Webda = require("../../src/index");
 
 class FakeService extends Webda.Service {}
 

package/test/moddas/voidstore.js

@@ -1,11 +1,9 @@
-"use strict";
-
-const Webda = require("../../lib/index.js");
+const Webda = require("../../src/index");
 
 class VoidStore extends Webda.Store {
   constructor(webda, name, params) {
     super(webda, name, params);
-    webda.registerRequestFilter(this);
+    webda.registerCORSFilter(this);
     if (this.parameters.brokenConstructor) throw Error();
   }
 

package/test/models/ident.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const WebdaIdent = require("../../lib/index.js").Ident;
+const WebdaIdent = require("../../src/index").Ident;
 
 /**
  * @class

package/test/models/task.js

@@ -1,5 +1,5 @@
 "use strict";
-const Webda = require("../../lib/index.js");
+const Webda = require("../../src/index");
 const OwnerModel = Webda.OwnerModel;
 const Context = Webda.Context;
 
@@ -27,10 +27,6 @@ class Task extends OwnerModel {
     return super.canAct(ctx, action);
   }
 
-  getSchema() {
-    return require("../schemas/task.json");
-  }
-
   _onSave() {
     this._autoListener = 1;
   }