@aj-shadow/z-abs-funclayer-database-server 0.0.0-aj-beta.238 → 0.0.0-aj-beta.239
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aj-shadow/z-abs-funclayer-database-server",
|
|
3
|
-
"version": "0.0.0-aj-beta.
|
|
3
|
+
"version": "0.0.0-aj-beta.239",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@aj-shadow/z-abs-funclayer-database-server",
|
|
9
|
-
"version": "0.0.0-aj-beta.
|
|
9
|
+
"version": "0.0.0-aj-beta.239",
|
|
10
10
|
"license": "MIT"
|
|
11
11
|
}
|
|
12
12
|
}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
const Table = require('./table');
|
|
5
5
|
const DatabaseConst = require('../core/database-const');
|
|
6
6
|
const ActorPath = require('z-abs-corelayer-server/server/path/actor-path');
|
|
7
|
-
const
|
|
7
|
+
const { simpleGit } = require('simple-git');
|
|
8
8
|
const Fs = require('fs');
|
|
9
9
|
const Path = require('path');
|
|
10
10
|
|
|
@@ -30,7 +30,7 @@ class DatabaseFile {
|
|
|
30
30
|
let configList = [];
|
|
31
31
|
let configListError = null;
|
|
32
32
|
let statError = null;
|
|
33
|
-
|
|
33
|
+
simpleGit('.').listConfig((err, configList) => {
|
|
34
34
|
configListError = err;
|
|
35
35
|
if(0 === --pendings) {
|
|
36
36
|
this._loadDatabase(configListError, configList, statError, (err, definition, data) => {
|
|
@@ -182,7 +182,7 @@ class DatabaseFile {
|
|
|
182
182
|
|
|
183
183
|
_cloneDatabase(isHttp, cb) {
|
|
184
184
|
const databaseRepo = isHttp ? `https://gitlab.com/actorjs-database/${this.dbName}.git` : `git@gitlab.com:actorjs-database/${this.dbName}.git`;
|
|
185
|
-
|
|
185
|
+
simpleGit(Path.resolve(`${this.databasePath}${Path.sep}..`), ['--no-tags', '--single-branch', '--depth=1']).clone(databaseRepo, (err, result) => {
|
|
186
186
|
cb(err);
|
|
187
187
|
});
|
|
188
188
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
|
|
3
3
|
|
|
4
4
|
const ActorPathGenerated = require('z-abs-corelayer-server/server/path/actor-path-generated');
|
|
5
|
-
const
|
|
5
|
+
const { simpleGit } = require('simple-git');
|
|
6
6
|
const Fs = require('fs');
|
|
7
7
|
const Path = require('path');
|
|
8
8
|
|
|
@@ -21,7 +21,7 @@ class DatabaseGit {
|
|
|
21
21
|
let configList = [];
|
|
22
22
|
let configListError = null;
|
|
23
23
|
let statError = null;
|
|
24
|
-
|
|
24
|
+
simpleGit('.').listConfig((err, _configList) => {
|
|
25
25
|
configList = _configList
|
|
26
26
|
configListError = err;
|
|
27
27
|
if(0 === --pendings) {
|
|
@@ -82,18 +82,18 @@ class DatabaseGit {
|
|
|
82
82
|
}
|
|
83
83
|
|
|
84
84
|
fetchDatabase(cb) {
|
|
85
|
-
|
|
85
|
+
simpleGit(this.databasePath).fetch(['--no-tags'], (err, result) => {
|
|
86
86
|
if(err) {
|
|
87
87
|
cb(err);
|
|
88
88
|
return;
|
|
89
89
|
}
|
|
90
90
|
if(0 !== result.updated.length || 0 !== result.deleted.length) {
|
|
91
|
-
|
|
91
|
+
simpleGit(this.databasePath).reset(this.databasePath, 'hard', 'HEAD', (err, result) => {
|
|
92
92
|
if(err) {
|
|
93
93
|
cb(err);
|
|
94
94
|
return;
|
|
95
95
|
}
|
|
96
|
-
|
|
96
|
+
simpleGit(this.databasePath).merge(this.databasePath, 'orig', '@{u}', ['--no-verify'], (err, result) => {
|
|
97
97
|
if(err) {
|
|
98
98
|
cb(err);
|
|
99
99
|
return;
|
|
@@ -159,7 +159,7 @@ class DatabaseGit {
|
|
|
159
159
|
|
|
160
160
|
_cloneDatabase(isHttp, cb) {
|
|
161
161
|
const databaseRepo = isHttp ? `https://gitlab.com/actorjs-database/${this.dbName}.git` : `git@gitlab.com:actorjs-database/${this.dbName}.git`;
|
|
162
|
-
|
|
162
|
+
simpleGit(Path.resolve(`${this.databasePath}${Path.sep}..`), ['--no-tags', '--single-branch', '--depth=1']).clone(databaseRepo, (err, result) => {
|
|
163
163
|
cb(err);
|
|
164
164
|
});
|
|
165
165
|
}
|