@naturalcycles/backend-lib 8.0.4 → 9.0.0

package/dist/deploy/deploy.util.js

@@ -1,12 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAndSaveDeployInfo = createAndSaveDeployInfo;
-exports.createDeployInfo = createDeployInfo;
-exports.createAndSaveAppYaml = createAndSaveAppYaml;
-exports.createAppYaml = createAppYaml;
-exports.validateGAEServiceName = validateGAEServiceName;
-const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
+import { _assert, _mapValues, _merge, _truncate, localTime } from '@naturalcycles/js-lib';
+import { dimGrey, fs2, sha256, white } from '@naturalcycles/nodejs-lib';
 const APP_YAML_DEFAULT = () => ({
     runtime: 'nodejs22',
     service: 'default',
@@ -25,17 +18,17 @@ const APP_YAML_DEFAULT = () => ({
         TS_NODE_PROJECT: './tsconfig.dist.json',
     },
 });
-async function createAndSaveDeployInfo(backendCfg, targetDir) {
+export async function createAndSaveDeployInfo(backendCfg, targetDir) {
     const deployInfo = await createDeployInfo(backendCfg);
     const deployInfoPath = `${targetDir}/deployInfo.json`;
-    nodejs_lib_1.fs2.writeJson(deployInfoPath, deployInfo, { spaces: 2 });
-    console.log(`saved ${(0, nodejs_lib_1.dimGrey)(deployInfoPath)}`);
+    fs2.writeJson(deployInfoPath, deployInfo, { spaces: 2 });
+    console.log(`saved ${dimGrey(deployInfoPath)}`);
     return deployInfo;
 }
-async function createDeployInfo(backendCfg, overrideBranch) {
-    const simpleGit = require('simple-git'); // lazy load
+export async function createDeployInfo(backendCfg, overrideBranch) {
+    const { simpleGit } = await import('simple-git'); // lazy load
     const git = simpleGit('.');
-    const now = js_lib_1.localTime.now();
+    const now = localTime.now();
     const gitBranch = overrideBranch || (await git.status()).current;
     const gitRev = (await git.revparse(['HEAD'])).slice(0, 7);
     let { gaeProject, gaeProjectByBranch = {}, gaeService, gaeServiceByBranch = {}, branchesWithTimestampVersions = [], } = backendCfg;
@@ -49,7 +42,7 @@ async function createDeployInfo(backendCfg, overrideBranch) {
             // Obfuscates the branch name by hashing it.
             // If there are Jira issue names in the branch name, the first one found will be used as a prefix.
             const jiraIssue = gitBranch.match(/([Dd][Ee][Vv]-\d+)/)?.[0];
-            const branchHash = (0, nodejs_lib_1.sha256)(gitBranch).slice(0, 10);
+            const branchHash = sha256(gitBranch).slice(0, 10);
             branchName = [jiraIssue, branchHash].filter(Boolean).join('-');
         }
         gaeService = validateGAEServiceName([branchName, gaeService].join('--'));
@@ -66,7 +59,7 @@ async function createDeployInfo(backendCfg, overrideBranch) {
     const versionUrl = `https://${[gaeVersion, gaeService, gaeProject].join('-dot-')}.appspot.com`;
     // Check the 63-char limit
     const versionUrlString = [gaeVersion, gaeService, gaeProject].join('-dot-');
-    (0, js_lib_1._assert)(versionUrlString.length <= 63, `versionUrl length should be <= 63 characters, but it's ${versionUrlString.length} instead: ${versionUrlString}`);
+    _assert(versionUrlString.length <= 63, `versionUrl length should be <= 63 characters, but it's ${versionUrlString.length} instead: ${versionUrlString}`);
     const serviceUrl = `https://${[gaeService, gaeProject].join('-dot-')}.appspot.com`;
     const deployInfo = {
         gaeProject,
@@ -81,35 +74,34 @@ async function createDeployInfo(backendCfg, overrideBranch) {
     console.log({ deployInfo });
     return deployInfo;
 }
-function createAndSaveAppYaml(backendCfg, deployInfo, projectDir, targetDir, appYamlPassEnv = '') {
+export function createAndSaveAppYaml(backendCfg, deployInfo, projectDir, targetDir, appYamlPassEnv = '') {
     const appYaml = createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv);
     const appYamlPath = `${targetDir}/app.yaml`;
-    nodejs_lib_1.fs2.writeYaml(appYamlPath, appYaml);
-    console.log(`saved ${(0, nodejs_lib_1.dimGrey)(appYamlPath)}`);
+    fs2.writeYaml(appYamlPath, appYaml);
+    console.log(`saved ${dimGrey(appYamlPath)}`);
     return appYaml;
 }
-function createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv = '') {
+export function createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv = '') {
     const { appEnvDefault, appEnvByBranch = {} } = backendCfg;
     const { gaeService: service, gitBranch } = deployInfo;
     const { APP_ENV: processAppEnv } = process.env;
     const APP_ENV = processAppEnv || appEnvByBranch[gitBranch] || appEnvDefault;
     if (processAppEnv) {
-        console.log(`using APP_ENV=${(0, nodejs_lib_1.dimGrey)(processAppEnv)} from process.env`);
+        console.log(`using APP_ENV=${dimGrey(processAppEnv)} from process.env`);
     }
     const appYaml = APP_YAML_DEFAULT();
     // Check existing app.yaml
     const appYamlPath = `${projectDir}/app.yaml`;
-    if (nodejs_lib_1.fs2.pathExists(appYamlPath)) {
-        console.log(`merging-in ${(0, nodejs_lib_1.dimGrey)(appYamlPath)}`);
-        (0, js_lib_1._merge)(appYaml, nodejs_lib_1.fs2.readYaml(appYamlPath));
+    if (fs2.pathExists(appYamlPath)) {
+        console.log(`merging-in ${dimGrey(appYamlPath)}`);
+        _merge(appYaml, fs2.readYaml(appYamlPath));
     }
     const appEnvYamlPath = `${projectDir}/app.${APP_ENV}.yaml`;
-    if (nodejs_lib_1.fs2.pathExists(appEnvYamlPath)) {
-        console.log(`merging-in ${(0, nodejs_lib_1.dimGrey)(appEnvYamlPath)}`);
-        (0, js_lib_1._merge)(appYaml, nodejs_lib_1.fs2.readYaml(appEnvYamlPath));
+    if (fs2.pathExists(appEnvYamlPath)) {
+        console.log(`merging-in ${dimGrey(appEnvYamlPath)}`);
+        _merge(appYaml, fs2.readYaml(appEnvYamlPath));
     }
     // appYamlPassEnv
-    require('dotenv').config(); // ensure .env is read
     const passEnv = appYamlPassEnv
         .split(',')
         .filter(Boolean)
@@ -123,9 +115,9 @@ function createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv = '')
         return map;
     }, {});
     if (Object.keys(passEnv).length) {
-        console.log(`will merge ${(0, nodejs_lib_1.white)(String(Object.keys(passEnv).length))} process.env keys to app.yaml: ${(0, nodejs_lib_1.dimGrey)(Object.keys(passEnv).join(', '))}`);
+        console.log(`will merge ${white(String(Object.keys(passEnv).length))} process.env keys to app.yaml: ${dimGrey(Object.keys(passEnv).join(', '))}`);
     }
-    (0, js_lib_1._merge)(appYaml, {
+    _merge(appYaml, {
         service,
         env_variables: {
             APP_ENV,
@@ -141,10 +133,10 @@ function createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv = '')
 function redactedAppYaml(appYaml) {
     return {
         ...appYaml,
-        env_variables: (0, js_lib_1._mapValues)(appYaml.env_variables || {}, (_k, v) => (0, js_lib_1._truncate)(String(v), 7)),
+        env_variables: _mapValues(appYaml.env_variables || {}, (_k, v) => _truncate(String(v), 7)),
     };
 }
-function validateGAEServiceName(serviceName) {
+export function validateGAEServiceName(serviceName) {
     // May only contain lowercase letters, digits, and hyphens. Must begin and end with a letter or digit. Must not exceed 63 characters.
     return serviceName
         .replaceAll('_', '-')

package/dist/deploy/deployGae.d.ts

@@ -1,5 +1,5 @@
-import type { DeployHealthCheckOptions } from './deployHealthCheck';
-import type { DeployPrepareOptions } from './deployPrepare';
+import type { DeployHealthCheckOptions } from './deployHealthCheck.js';
+import type { DeployPrepareOptions } from './deployPrepare.js';
 export interface DeployGaeOptions extends DeployPrepareOptions, DeployHealthCheckOptions {
 }
 export declare function deployGae(opt?: DeployGaeOptions): Promise<void>;

package/dist/deploy/deployGae.js

@@ -1,30 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployGae = deployGae;
-exports.undeployGae = undeployGae;
-const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const backend_cfg_util_1 = require("./backend.cfg.util");
-const deploy_util_1 = require("./deploy.util");
-const deployHealthCheck_1 = require("./deployHealthCheck");
-const deployPrepare_1 = require("./deployPrepare");
-async function deployGae(opt = {}) {
+import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib';
+import { appendToGithubSummary, exec2 } from '@naturalcycles/nodejs-lib';
+import { getBackendCfg } from './backend.cfg.util.js';
+import { createDeployInfo } from './deploy.util.js';
+import { deployHealthCheck } from './deployHealthCheck.js';
+import { deployPrepare } from './deployPrepare.js';
+export async function deployGae(opt = {}) {
     const { logOnFailure, logOnSuccess } = opt;
     // 1. build
-    nodejs_lib_1.exec2.spawn('yarn build');
+    exec2.spawn('yarn build');
     // 2. deploy-prepare
-    const deployInfo = await (0, deployPrepare_1.deployPrepare)();
+    const deployInfo = await deployPrepare();
     const targetDir = './tmp/deploy';
     const appYamlPath = `${targetDir}/app.yaml`;
     const { gaeProject, gaeService, gaeVersion, versionUrl, serviceUrl } = deployInfo;
-    (0, js_lib_1._objectAssign)(opt, {
+    _objectAssign(opt, {
         gaeProject,
         gaeService,
         gaeVersion,
     });
-    await (0, js_lib_1.pRetry)(async () => {
+    await pRetry(async () => {
         try {
-            nodejs_lib_1.exec2.spawn(`gcloud app deploy ${appYamlPath} --project ${gaeProject} --version ${gaeVersion} --quiet --no-promote`);
+            exec2.spawn(`gcloud app deploy ${appYamlPath} --project ${gaeProject} --version ${gaeVersion} --quiet --no-promote`);
         }
         catch (err) {
             if (logOnFailure) {
@@ -38,21 +34,21 @@ async function deployGae(opt = {}) {
         delay: 30_000,
         // todo: this doesn't work, as the error is different from what is logged.
         // We shoud somehow capture the logged text
-        predicate: err => (0, js_lib_1._anyToError)(err).message.includes('operation is already in progress'),
+        predicate: err => _anyToError(err).message.includes('operation is already in progress'),
     });
     // Health check (versionUrl)
     // yarn deploy-health-check --url $deployInfo_versionUrl --repeat 3 --timeoutSec 180 --intervalSec 2
-    await (0, deployHealthCheck_1.deployHealthCheck)(versionUrl, opt);
+    await deployHealthCheck(versionUrl, opt);
     // Only if "timestamped version" is used ('1' is default)
     if (gaeVersion !== '1') {
         // Rollout (promote versionUrl to serviceUrl)
         // gcloud app services set-traffic $deployInfo_gaeService --project $deployInfo_gaeProject --splits $deployInfo_gaeVersion=1 --quiet
-        nodejs_lib_1.exec2.spawn(`gcloud app services set-traffic ${gaeService} --project ${gaeProject} --splits ${gaeVersion}=1 --quiet`);
+        exec2.spawn(`gcloud app services set-traffic ${gaeService} --project ${gaeProject} --splits ${gaeVersion}=1 --quiet`);
         // Health check (serviceUrl)
         // yarn deploy-health-check --url $deployInfo_serviceUrl --repeat 3 --timeoutSec 60 --intervalSec 2
-        await (0, deployHealthCheck_1.deployHealthCheck)(serviceUrl, opt);
+        await deployHealthCheck(serviceUrl, opt);
     }
-    (0, nodejs_lib_1.appendToGithubSummary)(`Deployed ${serviceUrl}`);
+    appendToGithubSummary(`Deployed ${serviceUrl}`);
     // Logs
     if (logOnSuccess) {
         logs(gaeProject, gaeService, gaeVersion);
@@ -62,21 +58,21 @@ async function deployGae(opt = {}) {
  * Undeploys/removes the GAE service/version, using the same rules as deployGae.
  * Detects the service/version by the same criteria: branch name, backend.cfg.yaml, etc.
  */
-async function undeployGae(branch) {
+export async function undeployGae(branch) {
     const projectDir = '.';
-    const backendCfg = (0, backend_cfg_util_1.getBackendCfg)(projectDir);
-    const { gaeProject, gaeService, gaeVersion } = await (0, deploy_util_1.createDeployInfo)(backendCfg, branch);
+    const backendCfg = getBackendCfg(projectDir);
+    const { gaeProject, gaeService, gaeVersion } = await createDeployInfo(backendCfg, branch);
     // if (prod) {
     //   console.log(`undeployGae (branch: ${branch}): not removing prod version (safety check)`)
     //   return
     // }
     console.log(`undeployGae (branch: ${branch}): going to remove ${gaeProject}/${gaeService}/${gaeVersion}`);
-    nodejs_lib_1.exec2.spawn(`gcloud app versions delete --project ${gaeProject} --service ${gaeService} ${gaeVersion} --quiet`);
-    (0, nodejs_lib_1.appendToGithubSummary)(`removed ${gaeProject}/${gaeService}/${gaeVersion}`);
+    exec2.spawn(`gcloud app versions delete --project ${gaeProject} --service ${gaeService} ${gaeVersion} --quiet`);
+    appendToGithubSummary(`removed ${gaeProject}/${gaeService}/${gaeVersion}`);
 }
 function logs(gaeProject, gaeService, gaeVersion) {
     try {
-        nodejs_lib_1.exec2.spawn(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`);
+        exec2.spawn(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`);
     }
     catch { }
 }

package/dist/deploy/deployHealthCheck.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployHealthCheckYargsOptions = void 0;
-exports.deployHealthCheck = deployHealthCheck;
-const node_util_1 = require("node:util");
-const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const request_log_util_1 = require("../server/request.log.util");
-exports.deployHealthCheckYargsOptions = {
+import { inspect } from 'node:util';
+import { _filterFalsyValues, _ms, _since, getFetcher, pDelay } from '@naturalcycles/js-lib';
+import { dimGrey, exec2, red } from '@naturalcycles/nodejs-lib';
+import { coloredHttpCode } from '../server/request.log.util.js';
+export const deployHealthCheckYargsOptions = {
     thresholdHealthy: {
         type: 'number',
         default: 5,
@@ -56,7 +52,7 @@ const inspectOpt = {
  * Fails on up to `unhealthyThreshold` consecutive FAIL responses.
  * Fails after maxTries.
  */
-async function deployHealthCheck(url, opt = {}) {
+export async function deployHealthCheck(url, opt = {}) {
     const { thresholdHealthy = 5, thresholdUnhealthy = 8, maxTries = 30, timeoutSec = 30, intervalSec = 1, logOnFailure = true, logOnSuccess, gaeProject, gaeService, gaeVersion, } = opt;
     let attempt = 0;
     let countHealthy = 0;
@@ -65,15 +61,15 @@ async function deployHealthCheck(url, opt = {}) {
     let doneReason;
     let failed = false;
     let currentInterval = intervalSec * 1000;
-    const fetcher = (0, js_lib_1.getFetcher)();
+    const fetcher = getFetcher();
     while (!done) {
         await makeAttempt();
     }
     if (failed) {
-        console.log((0, nodejs_lib_1.red)(`Health check failed!`));
+        console.log(red(`Health check failed!`));
         if (logOnFailure) {
             try {
-                nodejs_lib_1.exec2.spawn(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`);
+                exec2.spawn(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`);
             }
             catch { }
         }
@@ -81,13 +77,13 @@ async function deployHealthCheck(url, opt = {}) {
     }
     if (logOnSuccess) {
         try {
-            nodejs_lib_1.exec2.spawn(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`);
+            exec2.spawn(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`);
         }
         catch { }
     }
     async function makeAttempt() {
         attempt++;
-        console.log([`>>`, (0, nodejs_lib_1.dimGrey)(url), (0, node_util_1.inspect)({ attempt }, inspectOpt)].join(' '));
+        console.log([`>>`, dimGrey(url), inspect({ attempt }, inspectOpt)].join(' '));
         const started = Date.now();
         const { err, statusCode = 0 } = await fetcher.doFetch({
             url,
@@ -122,9 +118,9 @@ async function deployHealthCheck(url, opt = {}) {
         }
         console.log([
             `<< HTTP`,
-            (0, request_log_util_1.coloredHttpCode)(statusCode),
-            (0, nodejs_lib_1.dimGrey)((0, js_lib_1._since)(started)),
-            (0, node_util_1.inspect)((0, js_lib_1._filterFalsyValues)({ countHealthy, countUnhealthy }), inspectOpt),
+            coloredHttpCode(statusCode),
+            dimGrey(_since(started)),
+            inspect(_filterFalsyValues({ countHealthy, countUnhealthy }), inspectOpt),
         ].join(' '));
         if (attempt >= maxTries) {
             doneReason = `reached maxTries of ${maxTries}`;
@@ -135,8 +131,8 @@ async function deployHealthCheck(url, opt = {}) {
             console.log(doneReason);
         }
         else {
-            console.log((0, nodejs_lib_1.dimGrey)(`... waiting ${(0, js_lib_1._ms)(currentInterval)} ...`));
-            await (0, js_lib_1.pDelay)(currentInterval);
+            console.log(dimGrey(`... waiting ${_ms(currentInterval)} ...`));
+            await pDelay(currentInterval);
         }
     }
 }

package/dist/deploy/deployPrepare.d.ts

@@ -1,4 +1,4 @@
-import type { DeployInfo } from './deploy.model';
+import type { DeployInfo } from './deploy.model.js';
 export interface DeployPrepareOptions {
     projectDir?: string;
     targetDir?: string;

package/dist/deploy/deployPrepare.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployPrepareYargsOptions = void 0;
-exports.deployPrepare = deployPrepare;
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const paths_cnst_1 = require("../paths.cnst");
-const backend_cfg_util_1 = require("./backend.cfg.util");
-const deploy_util_1 = require("./deploy.util");
-exports.deployPrepareYargsOptions = {
+import { dimGrey, fs2, kpySync } from '@naturalcycles/nodejs-lib';
+import { srcDir } from '../paths.cnst.js';
+import { getBackendCfg } from './backend.cfg.util.js';
+import { createAndSaveAppYaml, createAndSaveDeployInfo } from './deploy.util.js';
+export const deployPrepareYargsOptions = {
     projectDir: {
         type: 'string',
         default: '.',
@@ -50,22 +46,22 @@ const DEFAULT_FILES = [
     'patches', // to allow patch-package
     'resources',
 ];
-const defaultFilesDir = `${paths_cnst_1.srcDir}/deploy/files-default`;
-async function deployPrepare(opt = {}) {
-    // lazy load (somehow fixes `yarn test-leaks`)
+const defaultFilesDir = `${srcDir}/deploy/files-default`;
+export async function deployPrepare(opt = {}) {
+    await import('dotenv/config'); // ensure .env is loaded
     const { projectDir = '.', targetDir = './tmp/deploy', createNpmrc = true } = opt;
-    const backendCfg = (0, backend_cfg_util_1.getBackendCfg)(projectDir);
+    const backendCfg = getBackendCfg(projectDir);
     const inputPatterns = backendCfg.files || DEFAULT_FILES;
     const appYamlPassEnv = opt.appYamlPassEnv || backendCfg.appYamlPassEnv;
-    console.log(`1. Copy files to ${(0, nodejs_lib_1.dimGrey)(targetDir)}`);
+    console.log(`1. Copy files to ${dimGrey(targetDir)}`);
     // Clean targetDir
-    nodejs_lib_1.fs2.emptyDir(targetDir);
-    (0, nodejs_lib_1.kpySync)({
+    fs2.emptyDir(targetDir);
+    kpySync({
         baseDir: defaultFilesDir,
         outputDir: targetDir,
         dotfiles: true,
     });
-    (0, nodejs_lib_1.kpySync)({
+    kpySync({
         baseDir: projectDir,
         inputPatterns,
         outputDir: targetDir,
@@ -75,10 +71,10 @@ async function deployPrepare(opt = {}) {
     if (NPM_TOKEN && createNpmrc) {
         const npmrcPath = `${targetDir}/.npmrc`;
         const npmrc = `//registry.npmjs.org/:_authToken=${NPM_TOKEN}`;
-        nodejs_lib_1.fs2.writeFile(npmrcPath, npmrc);
+        fs2.writeFile(npmrcPath, npmrc);
     }
-    console.log(`2. Generate ${(0, nodejs_lib_1.dimGrey)('deployInfo.json')} and ${(0, nodejs_lib_1.dimGrey)('app.yaml')} in targetDir`);
-    const deployInfo = await (0, deploy_util_1.createAndSaveDeployInfo)(backendCfg, targetDir);
-    (0, deploy_util_1.createAndSaveAppYaml)(backendCfg, deployInfo, projectDir, targetDir, appYamlPassEnv);
+    console.log(`2. Generate ${dimGrey('deployInfo.json')} and ${dimGrey('app.yaml')} in targetDir`);
+    const deployInfo = await createAndSaveDeployInfo(backendCfg, targetDir);
+    createAndSaveAppYaml(backendCfg, deployInfo, projectDir, targetDir, appYamlPassEnv);
     return deployInfo;
 }

package/dist/deploy/index.d.ts

@@ -1,10 +1,10 @@
-import type { BackendCfg } from './backend.cfg.util';
-import { getBackendCfg } from './backend.cfg.util';
-import type { DeployInfo } from './deploy.model';
-import { createAppYaml, createDeployInfo } from './deploy.util';
-import { deployGae } from './deployGae';
-import type { DeployHealthCheckOptions } from './deployHealthCheck';
-import { deployHealthCheck } from './deployHealthCheck';
-import { deployPrepare } from './deployPrepare';
+import type { BackendCfg } from './backend.cfg.util.js';
+import { getBackendCfg } from './backend.cfg.util.js';
+import type { DeployInfo } from './deploy.model.js';
+import { createAppYaml, createDeployInfo } from './deploy.util.js';
+import { deployGae } from './deployGae.js';
+import type { DeployHealthCheckOptions } from './deployHealthCheck.js';
+import { deployHealthCheck } from './deployHealthCheck.js';
+import { deployPrepare } from './deployPrepare.js';
 export type { BackendCfg, DeployHealthCheckOptions, DeployInfo };
 export { createAppYaml, createDeployInfo, deployGae, deployHealthCheck, deployPrepare, getBackendCfg, };

package/dist/deploy/index.js

@@ -1,14 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBackendCfg = exports.deployPrepare = exports.deployHealthCheck = exports.deployGae = exports.createDeployInfo = exports.createAppYaml = void 0;
-const backend_cfg_util_1 = require("./backend.cfg.util");
-Object.defineProperty(exports, "getBackendCfg", { enumerable: true, get: function () { return backend_cfg_util_1.getBackendCfg; } });
-const deploy_util_1 = require("./deploy.util");
-Object.defineProperty(exports, "createAppYaml", { enumerable: true, get: function () { return deploy_util_1.createAppYaml; } });
-Object.defineProperty(exports, "createDeployInfo", { enumerable: true, get: function () { return deploy_util_1.createDeployInfo; } });
-const deployGae_1 = require("./deployGae");
-Object.defineProperty(exports, "deployGae", { enumerable: true, get: function () { return deployGae_1.deployGae; } });
-const deployHealthCheck_1 = require("./deployHealthCheck");
-Object.defineProperty(exports, "deployHealthCheck", { enumerable: true, get: function () { return deployHealthCheck_1.deployHealthCheck; } });
-const deployPrepare_1 = require("./deployPrepare");
-Object.defineProperty(exports, "deployPrepare", { enumerable: true, get: function () { return deployPrepare_1.deployPrepare; } });
+import { getBackendCfg } from './backend.cfg.util.js';
+import { createAppYaml, createDeployInfo } from './deploy.util.js';
+import { deployGae } from './deployGae.js';
+import { deployHealthCheck } from './deployHealthCheck.js';
+import { deployPrepare } from './deployPrepare.js';
+export { createAppYaml, createDeployInfo, deployGae, deployHealthCheck, deployPrepare, getBackendCfg, };

package/dist/env/env.shared.service.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnvSharedService = void 0;
-const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-class EnvSharedService {
+import { _assert, _by } from '@naturalcycles/js-lib';
+import { dimGrey } from '@naturalcycles/nodejs-lib';
+export class EnvSharedService {
     constructor(cfg) {
-        this.envMap = (0, js_lib_1._by)(cfg.environments, e => e.name);
+        this.envMap = _by(cfg.environments, e => e.name);
     }
     envMap;
     env;
@@ -15,17 +12,16 @@ class EnvSharedService {
     getEnv() {
         if (!this.env) {
             const { APP_ENV } = process.env;
-            (0, js_lib_1._assert)(APP_ENV, 'APP_ENV should be defined!');
+            _assert(APP_ENV, 'APP_ENV should be defined!');
             const env = this.envMap[APP_ENV];
-            (0, js_lib_1._assert)(env, `Environment ${APP_ENV} is not defined`);
+            _assert(env, `Environment ${APP_ENV} is not defined`);
             this.env = env;
-            console.log(`APP_ENV=${(0, nodejs_lib_1.dimGrey)(APP_ENV)} loaded`);
+            console.log(`APP_ENV=${dimGrey(APP_ENV)} loaded`);
         }
         return this.env;
     }
     setEnv(env) {
         this.env = env;
-        console.log(`setEnv APP_ENV=${(0, nodejs_lib_1.dimGrey)(env?.name || 'undefined')}`);
+        console.log(`setEnv APP_ENV=${dimGrey(env?.name || 'undefined')}`);
     }
 }
-exports.EnvSharedService = EnvSharedService;

package/dist/index.d.ts

@@ -1,34 +1,34 @@
-import onFinished = require('on-finished');
-export * from './admin/adminMiddleware';
-export * from './admin/base.admin.service';
-export * from './admin/firebase.shared.service';
-export * from './admin/secureHeaderMiddleware';
-export * from './env/env.shared.service';
-export * from './sentry/sentry.shared.service';
-export * from './server/asyncLocalStorageMiddleware';
-export * from './server/basicAuthMiddleware';
-export * from './server/bodyParserTimeoutMiddleware';
-export * from './server/createDefaultApp';
-export * from './server/createDefaultApp.model';
-export * from './server/deployInfo.util';
-export * from './server/genericErrorMiddleware';
-export * from './server/getDefaultRouter';
-export * from './server/logMiddleware';
-export * from './server/methodOverrideMiddleware';
-export * from './server/notFoundMiddleware';
-export * from './server/okMiddleware';
-export * from './server/request.log.util';
-export * from './server/request.util';
-export * from './server/requestTimeoutMiddleware';
-export * from './server/safeJsonMiddleware';
-export * from './server/server.model';
-export * from './server/serverStatsMiddleware';
-export * from './server/serverStatusMiddleware';
-export * from './server/simpleRequestLoggerMiddleware';
-export * from './server/startServer';
-export * from './server/startServer.model';
-export * from './server/validation/validateMiddleware';
-export * from './server/validation/validateRequest';
-export * from './server/validation/zodValidateMiddleware';
-export * from './util';
+import onFinished from 'on-finished';
+export * from './admin/adminMiddleware.js';
+export * from './admin/base.admin.service.js';
+export * from './admin/firebase.shared.service.js';
+export * from './admin/secureHeaderMiddleware.js';
+export * from './env/env.shared.service.js';
+export * from './sentry/sentry.shared.service.js';
+export * from './server/asyncLocalStorageMiddleware.js';
+export * from './server/basicAuthMiddleware.js';
+export * from './server/bodyParserTimeoutMiddleware.js';
+export * from './server/createDefaultApp.js';
+export * from './server/createDefaultApp.model.js';
+export * from './server/deployInfo.util.js';
+export * from './server/genericErrorMiddleware.js';
+export * from './server/getDefaultRouter.js';
+export * from './server/logMiddleware.js';
+export * from './server/methodOverrideMiddleware.js';
+export * from './server/notFoundMiddleware.js';
+export * from './server/okMiddleware.js';
+export * from './server/request.log.util.js';
+export * from './server/request.util.js';
+export * from './server/requestTimeoutMiddleware.js';
+export * from './server/safeJsonMiddleware.js';
+export * from './server/server.model.js';
+export * from './server/serverStatsMiddleware.js';
+export * from './server/serverStatusMiddleware.js';
+export * from './server/simpleRequestLoggerMiddleware.js';
+export * from './server/startServer.js';
+export * from './server/startServer.model.js';
+export * from './server/validation/validateMiddleware.js';
+export * from './server/validation/validateRequest.js';
+export * from './server/validation/zodValidateMiddleware.js';
+export * from './util.js';
 export { onFinished };

package/dist/index.js

@@ -1,38 +1,34 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.onFinished = void 0;
-const tslib_1 = require("tslib");
-const onFinished = require("on-finished");
-exports.onFinished = onFinished;
-tslib_1.__exportStar(require("./admin/adminMiddleware"), exports);
-tslib_1.__exportStar(require("./admin/base.admin.service"), exports);
-tslib_1.__exportStar(require("./admin/firebase.shared.service"), exports);
-tslib_1.__exportStar(require("./admin/secureHeaderMiddleware"), exports);
-tslib_1.__exportStar(require("./env/env.shared.service"), exports);
-tslib_1.__exportStar(require("./sentry/sentry.shared.service"), exports);
-tslib_1.__exportStar(require("./server/asyncLocalStorageMiddleware"), exports);
-tslib_1.__exportStar(require("./server/basicAuthMiddleware"), exports);
-tslib_1.__exportStar(require("./server/bodyParserTimeoutMiddleware"), exports);
-tslib_1.__exportStar(require("./server/createDefaultApp"), exports);
-tslib_1.__exportStar(require("./server/createDefaultApp.model"), exports);
-tslib_1.__exportStar(require("./server/deployInfo.util"), exports);
-tslib_1.__exportStar(require("./server/genericErrorMiddleware"), exports);
-tslib_1.__exportStar(require("./server/getDefaultRouter"), exports);
-tslib_1.__exportStar(require("./server/logMiddleware"), exports);
-tslib_1.__exportStar(require("./server/methodOverrideMiddleware"), exports);
-tslib_1.__exportStar(require("./server/notFoundMiddleware"), exports);
-tslib_1.__exportStar(require("./server/okMiddleware"), exports);
-tslib_1.__exportStar(require("./server/request.log.util"), exports);
-tslib_1.__exportStar(require("./server/request.util"), exports);
-tslib_1.__exportStar(require("./server/requestTimeoutMiddleware"), exports);
-tslib_1.__exportStar(require("./server/safeJsonMiddleware"), exports);
-tslib_1.__exportStar(require("./server/server.model"), exports);
-tslib_1.__exportStar(require("./server/serverStatsMiddleware"), exports);
-tslib_1.__exportStar(require("./server/serverStatusMiddleware"), exports);
-tslib_1.__exportStar(require("./server/simpleRequestLoggerMiddleware"), exports);
-tslib_1.__exportStar(require("./server/startServer"), exports);
-tslib_1.__exportStar(require("./server/startServer.model"), exports);
-tslib_1.__exportStar(require("./server/validation/validateMiddleware"), exports);
-tslib_1.__exportStar(require("./server/validation/validateRequest"), exports);
-tslib_1.__exportStar(require("./server/validation/zodValidateMiddleware"), exports);
-tslib_1.__exportStar(require("./util"), exports);
+import onFinished from 'on-finished';
+export * from './admin/adminMiddleware.js';
+export * from './admin/base.admin.service.js';
+export * from './admin/firebase.shared.service.js';
+export * from './admin/secureHeaderMiddleware.js';
+export * from './env/env.shared.service.js';
+export * from './sentry/sentry.shared.service.js';
+export * from './server/asyncLocalStorageMiddleware.js';
+export * from './server/basicAuthMiddleware.js';
+export * from './server/bodyParserTimeoutMiddleware.js';
+export * from './server/createDefaultApp.js';
+export * from './server/createDefaultApp.model.js';
+export * from './server/deployInfo.util.js';
+export * from './server/genericErrorMiddleware.js';
+export * from './server/getDefaultRouter.js';
+export * from './server/logMiddleware.js';
+export * from './server/methodOverrideMiddleware.js';
+export * from './server/notFoundMiddleware.js';
+export * from './server/okMiddleware.js';
+export * from './server/request.log.util.js';
+export * from './server/request.util.js';
+export * from './server/requestTimeoutMiddleware.js';
+export * from './server/safeJsonMiddleware.js';
+export * from './server/server.model.js';
+export * from './server/serverStatsMiddleware.js';
+export * from './server/serverStatusMiddleware.js';
+export * from './server/simpleRequestLoggerMiddleware.js';
+export * from './server/startServer.js';
+export * from './server/startServer.model.js';
+export * from './server/validation/validateMiddleware.js';
+export * from './server/validation/validateRequest.js';
+export * from './server/validation/zodValidateMiddleware.js';
+export * from './util.js';
+export { onFinished };