ugly-app 0.1.128 → 0.1.130
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/dist/cli/serverLogQuery.d.ts.map +1 -1
- package/dist/cli/serverLogQuery.js +27 -2
- package/dist/cli/serverLogQuery.js.map +1 -1
- package/dist/cli/version.d.ts +1 -1
- package/dist/cli/version.js +1 -1
- package/package.json +1 -1
- package/src/cli/serverLogQuery.ts +28 -4
- package/src/cli/version.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverLogQuery.d.ts","sourceRoot":"","sources":["../../src/cli/serverLogQuery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"serverLogQuery.d.ts","sourceRoot":"","sources":["../../src/cli/serverLogQuery.ts"],"names":[],"mappings":"AA8DA,wBAAsB,eAAe,CACnC,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,gBAAgB,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,GAC3E,OAAO,CAAC,IAAI,CAAC,CAuCf"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { MongoClient } from 'mongodb';
|
|
2
2
|
import fs from 'node:fs/promises';
|
|
3
3
|
import path from 'node:path';
|
|
4
|
-
|
|
4
|
+
import { computeEnvVars, readUglyAppConfig } from './uglyappConfig.js';
|
|
5
|
+
/** Try to read MONGODB_URI from an env file. Returns null if not found. */
|
|
6
|
+
async function readUriFromEnvFile(envFile) {
|
|
5
7
|
const envPath = path.join(process.cwd(), envFile);
|
|
6
8
|
try {
|
|
7
9
|
const content = await fs.readFile(envPath, 'utf-8');
|
|
@@ -12,8 +14,31 @@ async function getMongoUri(envFile) {
|
|
|
12
14
|
}
|
|
13
15
|
}
|
|
14
16
|
catch {
|
|
15
|
-
|
|
17
|
+
// File doesn't exist or isn't readable
|
|
18
|
+
}
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
/** Derive MONGODB_URI from .uglyapp config (port-offset-based local Docker). */
|
|
22
|
+
function readUriFromUglyAppConfig() {
|
|
23
|
+
const config = readUglyAppConfig(process.cwd());
|
|
24
|
+
if (!config)
|
|
25
|
+
return null;
|
|
26
|
+
const envVars = computeEnvVars(config);
|
|
27
|
+
return envVars.MONGODB_URI ?? null;
|
|
28
|
+
}
|
|
29
|
+
async function getMongoUri(envFile) {
|
|
30
|
+
// 1. Try the specified env file
|
|
31
|
+
const fromEnv = await readUriFromEnvFile(envFile);
|
|
32
|
+
if (fromEnv)
|
|
33
|
+
return fromEnv;
|
|
34
|
+
// 2. For local (.env), fall back to .uglyapp config or default
|
|
35
|
+
if (envFile === '.env') {
|
|
36
|
+
const fromConfig = readUriFromUglyAppConfig();
|
|
37
|
+
if (fromConfig)
|
|
38
|
+
return fromConfig;
|
|
39
|
+
return 'mongodb://localhost:27017/app';
|
|
16
40
|
}
|
|
41
|
+
// 3. For server (.env.prod), no fallback — fail
|
|
17
42
|
throw new Error(`MONGODB_URI not found in ${envFile}. Add MONGODB_URI=<your-uri> to ${envFile}.`);
|
|
18
43
|
}
|
|
19
44
|
function formatDoc(doc) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverLogQuery.js","sourceRoot":"","sources":["../../src/cli/serverLogQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"serverLogQuery.js","sourceRoot":"","sources":["../../src/cli/serverLogQuery.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const CLI_VERSION = "0.1.
|
|
1
|
+
export declare const CLI_VERSION = "0.1.130";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/cli/version.js
CHANGED
package/package.json
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { MongoClient } from 'mongodb';
|
|
2
2
|
import fs from 'node:fs/promises';
|
|
3
3
|
import path from 'node:path';
|
|
4
|
+
import { computeEnvVars, readUglyAppConfig } from './uglyappConfig.js';
|
|
4
5
|
|
|
5
|
-
|
|
6
|
+
/** Try to read MONGODB_URI from an env file. Returns null if not found. */
|
|
7
|
+
async function readUriFromEnvFile(envFile: string): Promise<string | null> {
|
|
6
8
|
const envPath = path.join(process.cwd(), envFile);
|
|
7
9
|
try {
|
|
8
10
|
const content = await fs.readFile(envPath, 'utf-8');
|
|
@@ -11,10 +13,32 @@ async function getMongoUri(envFile: string): Promise<string> {
|
|
|
11
13
|
if (match) return match[1].replace(/^['"]|['"]$/g, '');
|
|
12
14
|
}
|
|
13
15
|
} catch {
|
|
14
|
-
|
|
15
|
-
`Cannot read ${envFile}. Make sure the file exists in your project root.`,
|
|
16
|
-
);
|
|
16
|
+
// File doesn't exist or isn't readable
|
|
17
17
|
}
|
|
18
|
+
return null;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
/** Derive MONGODB_URI from .uglyapp config (port-offset-based local Docker). */
|
|
22
|
+
function readUriFromUglyAppConfig(): string | null {
|
|
23
|
+
const config = readUglyAppConfig(process.cwd());
|
|
24
|
+
if (!config) return null;
|
|
25
|
+
const envVars = computeEnvVars(config);
|
|
26
|
+
return envVars.MONGODB_URI ?? null;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
async function getMongoUri(envFile: string): Promise<string> {
|
|
30
|
+
// 1. Try the specified env file
|
|
31
|
+
const fromEnv = await readUriFromEnvFile(envFile);
|
|
32
|
+
if (fromEnv) return fromEnv;
|
|
33
|
+
|
|
34
|
+
// 2. For local (.env), fall back to .uglyapp config or default
|
|
35
|
+
if (envFile === '.env') {
|
|
36
|
+
const fromConfig = readUriFromUglyAppConfig();
|
|
37
|
+
if (fromConfig) return fromConfig;
|
|
38
|
+
return 'mongodb://localhost:27017/app';
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
// 3. For server (.env.prod), no fallback — fail
|
|
18
42
|
throw new Error(
|
|
19
43
|
`MONGODB_URI not found in ${envFile}. Add MONGODB_URI=<your-uri> to ${envFile}.`,
|
|
20
44
|
);
|
package/src/cli/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// Auto-generated by prebuild — do not edit manually
|
|
2
|
-
export const CLI_VERSION = "0.1.
|
|
2
|
+
export const CLI_VERSION = "0.1.130";
|