rebase main

Author: ivansglazunov

.github/workflows/dockerize.yaml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 18
+          node-version: '16.20'
       - name: ci
         run: npm ci
       - name: build

.nvmrc

@@ -1 +1 @@
-18
+18.16.1

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine3.17 AS node
+FROM node:18.16.1-alpine3.17 AS node
 FROM docker:20.10.8-dind-alpine3.14
 
 COPY --from=node /usr/lib /usr/lib

imports/client.tsx

@@ -349,8 +349,6 @@ export interface DeepClientInstance<L = Link<number>> {
 
   delete<TTable extends 'links'|'numbers'|'strings'|'objects'>(exp: Exp<TTable>, options?: WriteOptions<TTable>):Promise<DeepClientResult<{ id }[]>>;
 
-  serial(options: AsyncSerialParams): Promise<DeepClientResult<{ id }[]>>;
-
   reserve<LL = L>(count: number): Promise<number[]>;
 
   await(id: number): Promise<boolean>;
@@ -372,8 +370,6 @@ export interface DeepClientInstance<L = Link<number>> {
   logout(): Promise<DeepClientAuthResult>;
 
   can(objectIds: number[], subjectIds: number[], actionIds: number[]): Promise<boolean>;
-
-  useDeepSubscription: typeof useDeepSubscription
 }
 
 export interface DeepClientAuthResult {
@@ -799,7 +795,9 @@ export class DeepClient<L = Link<number>> implements DeepClientInstance<L> {
     return { ...q, data: (q)?.data?.m0?.returning };
   };
 
-  async serial({
+  async serial<
+    LL = L
+  >({
     name, operations, returning, silent
   }: AsyncSerialParams): Promise<DeepClientResult<{ id: number }[]>> {
     // @ts-ignore
@@ -1070,14 +1068,14 @@ export class DeepClient<L = Link<number>> implements DeepClientInstance<L> {
       try {
         return await DeepClient.resolveDependency(path);
       } catch (e) {
-        console.log(`IGNORED ERROR: Call to DeepClient.resolveDependency is failed with`, e);
+        console.log(`Call to DeepClient.resolveDependency is failed with`, e);
       }
     }
     if (typeof require !== 'undefined') {
       try {
         return await require(path);
       } catch (e) {
-        console.log(`IGNORED ERROR: Call to require is failed with`, e);
+        console.log(`Call to require is failed with`, e);
       }
     }
     return await import(path);

imports/packager.ts

@@ -278,7 +278,7 @@ export class Packager<L extends Link<any>> {
       let newId;
       if (item.package) {
         newId = await this.client.id(pckg?.dependencies?.[item?.package?.dependencyId]?.name, item.package.containValue, true);
-        if (!newId) pckg.errors.push(`dependency [${pckg?.dependencies?.[item?.package?.dependencyId]?.name} ${item.package.containValue}], not found`);
+        if (!newId) pckg.errors.push(`dependency [${pckg?.dependencies?.[item?.package?.dependencyId]?.name, item.package.containValue}], not founded`);
       } else if (item.type) {
         newId = ids[idsIndex++];
       }
@@ -371,7 +371,7 @@ export class Packager<L extends Link<any>> {
       const ids = await this.client.reserve(counter);
       const { global, difference } = await this.globalizeIds(pckg, ids, sorted);
       if (pckg.errors?.length) {
-        return { errors: pckg.errors };
+        return { errors };
       }
       await this.insertItems(pckg, global, counter, dependedLinks, errors, mutated);
       if (errors.length) return { errors };

migrations/1655979260869-sync-handlers.ts

@@ -334,7 +334,7 @@ const prepareFunction = /*javascript*/`
 const selectValueTable = `\`SELECT * FROM \${table} WHERE link_id = \${linkId}\``;
 const selectLinkByValue = `\`SELECT link_id as id FROM \${table} WHERE value = '\${value}'::\${table==='strings' ? 'text' : table==='objects' ? 'jsonb' : 'bigint'}\``;
 
-const generateSelectWhereCode = /*javascript*/`(_where, shift = 0) => {
+const generateSelectWhereCode = /*javascript*/`(_where) => {
   const where = [];
   let values = [];
   let valueTable;
@@ -557,7 +557,7 @@ const deepFabric =  /*javascript*/`(ownerId, hasura_session) => {
         const findLinkIdByValue = ${findLinkIdByValueCode};
         const fillValueByLinks = ${fillValueByLinksCode};
         const isDeepEqual = ${isDeepEqualCode};
-        let generated = generateSelectWhere(_where, 1);
+        let generated = generateSelectWhere(_where);
         const where = generated.where;
         let links = [];
         const valueTableString = generated.valueTable ? generated.valueTable === 'values' ? ' left join "strings" on "strings".link_id = "main".id left join "objects" on "objects".link_id = "main".id left join "numbers" on "numbers".link_id = "main".id' : ' left join "'.concat(generated.valueTable, '" on "',generated.valueTable,'".link_id = "main".id') : '';
@@ -569,7 +569,7 @@ const deepFabric =  /*javascript*/`(ownerId, hasura_session) => {
       if (options?.table === 'tree'){
         const { id, link_id, parent_id, depth, root_id, position_id, tree_id } = _where;
         const generateSelectWhere = ${generateSelectWhereCode};
-        let generated = generateSelectWhere(_where, 1);
+        let generated = generateSelectWhere(_where);
         const where = generated.where;
         let links = [];
         if (where) links = plv8.execute(${selectTreeWithPermissions}, [ this.linkId, ...generated.values ]);
@@ -795,14 +795,12 @@ const triggerFunctionFabric = (handleOperationTypeId, valueTrigger) => /*javascr
 `;
 
 const deepClientFunction = /*javascript*/`
-
 const checkInsertPermission = ${checkInsertPermissionCode};
 const checkUpdatePermission = ${checkUpdatePermissionCode};
 const checkDeleteLinkPermission = ${checkDeleteLinkPermissionCode}; 
 const hasura_session = JSON.parse(plv8.execute("select current_setting('hasura.user', 't')")[0].current_setting);
 const default_role = hasura_session['x-hasura-role'];
 const default_user_id = hasura_session['x-hasura-user-id'];
-
 const deep = (${deepFabric})(Number(clientlinkid), hasura_session);
 const result = operation === 'id' || operation === 'update' || operation === 'objectSet' || operation === 'objectGet' ? deep[operation](...args) : operation === 'unsafe' ? deep[operation].plv8.execute(...args) : deep[operation](args, options);
 if (hasura_session['x-hasura-role'] !== default_role || hasura_session['x-hasura-user-id'] !== default_user_id){

migrations/1693460330175-sync-handlers-update.ts

@@ -20,9 +20,8 @@
     "benchmark": "export DEEPLINKS_HASURA_PATH=localhost:8080; export DEEPLINKS_HASURA_SSL=0; export DEEPLINKS_HASURA_SECRET=myadminsecretkey; ts-node benchmarks/index.ts",
     "migrate": "npm run package:build && npx migrate@latest up --matches '*.js'",
     "unmigrate": "npm run package:build && npx migrate@latest down --matches '*.js'",
-    "migrate-s-h": "npm run package:build && npx migrate@latest up 1693460330175-sync-handlers-update --matches '*.js'",
-    "unmigrate-s-h": "npm run package:build && npx migrate@latest down 1693460330175-sync-handlers-update --matches '*.js'",
-    "remigrate-s-h": "npm run unmigrate-s-h && npm run migrate",
+    "migrate-s-h": "npm run package:build && npx migrate@latest up 1655979260869-sync-handlers --matches '*.js'",
+    "unmigrate-s-h": "npm run package:build && npx migrate@latest down 1655979260869-sync-handlers --matches '*.js'",
     "start-engine-docker": "npm run start-engine-docker-core",
     "start-engine-docker-core": "cd ./node_modules/@deep-foundation/hasura && npm run docker",
     "stop-engine-docker": "cd ./node_modules/@deep-foundation/hasura/local && docker-compose --project-name deep down",
@@ -91,7 +90,7 @@
     "react": "^18.0.0"
   },
   "engines": {
-    "node": "^18"
+    "node": "^18.16.1"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.16.5",