nmtjs 0.15.0-beta.43 → 0.15.0-beta.44
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/bin/cli.js +2 -0
- package/dist/cli.d.ts +0 -1
- package/dist/cli.js +23 -4
- package/dist/cli.js.map +1 -1
- package/package.json +39 -19
- package/src/cli.ts +30 -5
package/bin/cli.js
ADDED
package/dist/cli.d.ts
CHANGED
package/dist/cli.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
#!/usr/bin/env node --enable-source-maps
|
|
2
1
|
var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
|
|
3
2
|
if (typeof path === "string" && /^\.\.?\//.test(path)) {
|
|
4
3
|
return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
|
|
@@ -7,6 +6,7 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
|
|
|
7
6
|
}
|
|
8
7
|
return path;
|
|
9
8
|
};
|
|
9
|
+
import { existsSync } from 'node:fs';
|
|
10
10
|
import { relative, resolve } from 'node:path';
|
|
11
11
|
import process from 'node:process';
|
|
12
12
|
import { defineCommand, runMain } from 'citty';
|
|
@@ -20,19 +20,35 @@ const commonArgs = {
|
|
|
20
20
|
config: {
|
|
21
21
|
type: 'string',
|
|
22
22
|
alias: 'c',
|
|
23
|
-
default: './neemata.config.ts',
|
|
24
23
|
description: 'Path to Neemata config file',
|
|
25
24
|
required: false,
|
|
26
25
|
},
|
|
27
26
|
};
|
|
27
|
+
function resolveConfigPath(configPathArg) {
|
|
28
|
+
if (configPathArg) {
|
|
29
|
+
return resolve(configPathArg);
|
|
30
|
+
}
|
|
31
|
+
const tsConfigPath = resolve('./neemata.config.ts');
|
|
32
|
+
if (existsSync(tsConfigPath)) {
|
|
33
|
+
return tsConfigPath;
|
|
34
|
+
}
|
|
35
|
+
const jsConfigPath = resolve('./neemata.config.js');
|
|
36
|
+
if (existsSync(jsConfigPath)) {
|
|
37
|
+
return jsConfigPath;
|
|
38
|
+
}
|
|
39
|
+
throw new Error('Failed to resolve Neemata config file. Create neemata.config.ts or neemata.config.js, or pass --config.');
|
|
40
|
+
}
|
|
28
41
|
let config;
|
|
29
42
|
let viteConfigOptions;
|
|
30
43
|
let applicationImports;
|
|
44
|
+
async function runPrepare() {
|
|
45
|
+
await generateTypings(applicationImports);
|
|
46
|
+
}
|
|
31
47
|
const mainCommand = defineCommand({
|
|
32
48
|
meta: { description: 'Neemata CLI' },
|
|
33
49
|
args: { ...commonArgs },
|
|
34
50
|
async setup(ctx) {
|
|
35
|
-
const configPath =
|
|
51
|
+
const configPath = resolveConfigPath(ctx.args.config);
|
|
36
52
|
config = await import(__rewriteRelativeImportExtension(configPath)).then((m) => m.default);
|
|
37
53
|
for (const env of config.env) {
|
|
38
54
|
if (typeof env === 'string') {
|
|
@@ -69,23 +85,26 @@ const mainCommand = defineCommand({
|
|
|
69
85
|
subCommands: {
|
|
70
86
|
prepare: defineCommand({
|
|
71
87
|
async run(ctx) {
|
|
72
|
-
await
|
|
88
|
+
await runPrepare();
|
|
73
89
|
},
|
|
74
90
|
}),
|
|
75
91
|
dev: defineCommand({
|
|
76
92
|
async run(ctx) {
|
|
93
|
+
await runPrepare();
|
|
77
94
|
const { runner } = await createMainServer(viteConfigOptions, 'development', config);
|
|
78
95
|
await runner.import(viteConfigOptions.entrypointMainPath);
|
|
79
96
|
},
|
|
80
97
|
}),
|
|
81
98
|
preview: defineCommand({
|
|
82
99
|
async run(ctx) {
|
|
100
|
+
await runPrepare();
|
|
83
101
|
const { runner } = await createMainServer(viteConfigOptions, 'production', config);
|
|
84
102
|
await runner.import(viteConfigOptions.entrypointMainPath);
|
|
85
103
|
},
|
|
86
104
|
}),
|
|
87
105
|
build: defineCommand({
|
|
88
106
|
async run(ctx) {
|
|
107
|
+
await runPrepare();
|
|
89
108
|
const builder = await createBuilder(viteConfigOptions, config);
|
|
90
109
|
await builder.build();
|
|
91
110
|
},
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,14 +3,33 @@
|
|
|
3
3
|
"description": "Neemata framework CLI and umbrella package.",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"bin": {
|
|
6
|
-
"neemata": "./
|
|
6
|
+
"neemata": "./bin/cli.js"
|
|
7
7
|
},
|
|
8
8
|
"exports": {
|
|
9
|
-
".":
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
".": {
|
|
10
|
+
"types": "./dist/index.d.ts",
|
|
11
|
+
"import": "./dist/index.js",
|
|
12
|
+
"module-sync": "./dist/index.js"
|
|
13
|
+
},
|
|
14
|
+
"./cli": {
|
|
15
|
+
"types": "./dist/cli.d.ts",
|
|
16
|
+
"import": "./dist/cli.js",
|
|
17
|
+
"module-sync": "./dist/cli.js"
|
|
18
|
+
},
|
|
19
|
+
"./config": {
|
|
20
|
+
"types": "./dist/config.d.ts",
|
|
21
|
+
"import": "./dist/config.js",
|
|
22
|
+
"module-sync": "./dist/config.js"
|
|
23
|
+
},
|
|
24
|
+
"./runtime": {
|
|
25
|
+
"types": "./dist/runtime/index.d.ts",
|
|
26
|
+
"import": "./dist/runtime/index.js",
|
|
27
|
+
"module-sync": "./dist/runtime/index.js"
|
|
28
|
+
},
|
|
12
29
|
"./runtime/types": {
|
|
13
|
-
"types": "./dist/runtime/types.d.ts"
|
|
30
|
+
"types": "./dist/runtime/types.d.ts",
|
|
31
|
+
"import": "./dist/runtime/types.js",
|
|
32
|
+
"module-sync": "./dist/runtime/types.js"
|
|
14
33
|
}
|
|
15
34
|
},
|
|
16
35
|
"dependencies": {
|
|
@@ -27,25 +46,25 @@
|
|
|
27
46
|
"iovalkey": "^0.3.3",
|
|
28
47
|
"oxc-resolver": "11.17.0",
|
|
29
48
|
"prom-client": "git@github.com:siimon/prom-client.git#d4d2dcb366384833951e0116caca707b5f62aa5e",
|
|
30
|
-
"vite": "8.0.0-beta.
|
|
31
|
-
"@nmtjs/common": "0.15.0-beta.
|
|
32
|
-
"@nmtjs/core": "0.15.0-beta.
|
|
33
|
-
"@nmtjs/contract": "0.15.0-beta.
|
|
34
|
-
"@nmtjs/gateway": "0.15.0-beta.
|
|
35
|
-
"@nmtjs/json-format": "0.15.0-beta.
|
|
36
|
-
"@nmtjs/
|
|
37
|
-
"@nmtjs/
|
|
38
|
-
"@nmtjs/
|
|
39
|
-
"@nmtjs/
|
|
40
|
-
"@nmtjs/
|
|
49
|
+
"vite": "8.0.0-beta.14",
|
|
50
|
+
"@nmtjs/common": "0.15.0-beta.44",
|
|
51
|
+
"@nmtjs/core": "0.15.0-beta.44",
|
|
52
|
+
"@nmtjs/contract": "0.15.0-beta.44",
|
|
53
|
+
"@nmtjs/gateway": "0.15.0-beta.44",
|
|
54
|
+
"@nmtjs/json-format": "0.15.0-beta.44",
|
|
55
|
+
"@nmtjs/msgpack-format": "0.15.0-beta.44",
|
|
56
|
+
"@nmtjs/http-transport": "0.15.0-beta.44",
|
|
57
|
+
"@nmtjs/protocol": "0.15.0-beta.44",
|
|
58
|
+
"@nmtjs/ws-transport": "0.15.0-beta.44",
|
|
59
|
+
"@nmtjs/type": "0.15.0-beta.44"
|
|
41
60
|
},
|
|
42
61
|
"devDependencies": {
|
|
43
|
-
"@nmtjs/proxy": "1.0.0-beta.
|
|
62
|
+
"@nmtjs/proxy": "1.0.0-beta.3",
|
|
44
63
|
"pino": "10.3.0",
|
|
45
64
|
"zod": "^4.3.5"
|
|
46
65
|
},
|
|
47
66
|
"peerDependencies": {
|
|
48
|
-
"@nmtjs/proxy": "1.0.0-beta.
|
|
67
|
+
"@nmtjs/proxy": "1.0.0-beta.3",
|
|
49
68
|
"zod": "^4.3.5"
|
|
50
69
|
},
|
|
51
70
|
"peerDependenciesMeta": {
|
|
@@ -54,12 +73,13 @@
|
|
|
54
73
|
}
|
|
55
74
|
},
|
|
56
75
|
"files": [
|
|
76
|
+
"bin",
|
|
57
77
|
"dist",
|
|
58
78
|
"src",
|
|
59
79
|
"LICENSE.md",
|
|
60
80
|
"README.md"
|
|
61
81
|
],
|
|
62
|
-
"version": "0.15.0-beta.
|
|
82
|
+
"version": "0.15.0-beta.44",
|
|
63
83
|
"scripts": {
|
|
64
84
|
"clean-build": "rm -rf ./dist"
|
|
65
85
|
}
|
package/src/cli.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import { existsSync } from 'node:fs'
|
|
3
2
|
import { relative, resolve } from 'node:path'
|
|
4
3
|
import process from 'node:process'
|
|
5
4
|
|
|
@@ -19,12 +18,31 @@ const commonArgs = {
|
|
|
19
18
|
config: {
|
|
20
19
|
type: 'string',
|
|
21
20
|
alias: 'c',
|
|
22
|
-
default: './neemata.config.ts',
|
|
23
21
|
description: 'Path to Neemata config file',
|
|
24
22
|
required: false,
|
|
25
23
|
},
|
|
26
24
|
} satisfies Record<string, ArgDef>
|
|
27
25
|
|
|
26
|
+
function resolveConfigPath(configPathArg: string | undefined): string {
|
|
27
|
+
if (configPathArg) {
|
|
28
|
+
return resolve(configPathArg)
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
const tsConfigPath = resolve('./neemata.config.ts')
|
|
32
|
+
if (existsSync(tsConfigPath)) {
|
|
33
|
+
return tsConfigPath
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
const jsConfigPath = resolve('./neemata.config.js')
|
|
37
|
+
if (existsSync(jsConfigPath)) {
|
|
38
|
+
return jsConfigPath
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
throw new Error(
|
|
42
|
+
'Failed to resolve Neemata config file. Create neemata.config.ts or neemata.config.js, or pass --config.',
|
|
43
|
+
)
|
|
44
|
+
}
|
|
45
|
+
|
|
28
46
|
let config: NeemataConfig
|
|
29
47
|
let viteConfigOptions: ViteConfigOptions
|
|
30
48
|
let applicationImports: Record<
|
|
@@ -32,11 +50,15 @@ let applicationImports: Record<
|
|
|
32
50
|
{ path: string; specifier: string; type: 'neemata' | 'custom' }
|
|
33
51
|
>
|
|
34
52
|
|
|
53
|
+
async function runPrepare() {
|
|
54
|
+
await generateTypings(applicationImports)
|
|
55
|
+
}
|
|
56
|
+
|
|
35
57
|
const mainCommand = defineCommand({
|
|
36
58
|
meta: { description: 'Neemata CLI' },
|
|
37
59
|
args: { ...commonArgs },
|
|
38
60
|
async setup(ctx) {
|
|
39
|
-
const configPath =
|
|
61
|
+
const configPath = resolveConfigPath(ctx.args.config as string | undefined)
|
|
40
62
|
config = await import(configPath).then((m) => m.default)
|
|
41
63
|
|
|
42
64
|
for (const env of config.env) {
|
|
@@ -82,11 +104,12 @@ const mainCommand = defineCommand({
|
|
|
82
104
|
subCommands: {
|
|
83
105
|
prepare: defineCommand({
|
|
84
106
|
async run(ctx) {
|
|
85
|
-
await
|
|
107
|
+
await runPrepare()
|
|
86
108
|
},
|
|
87
109
|
}),
|
|
88
110
|
dev: defineCommand({
|
|
89
111
|
async run(ctx) {
|
|
112
|
+
await runPrepare()
|
|
90
113
|
const { runner } = await createMainServer(
|
|
91
114
|
viteConfigOptions,
|
|
92
115
|
'development',
|
|
@@ -97,6 +120,7 @@ const mainCommand = defineCommand({
|
|
|
97
120
|
}),
|
|
98
121
|
preview: defineCommand({
|
|
99
122
|
async run(ctx) {
|
|
123
|
+
await runPrepare()
|
|
100
124
|
const { runner } = await createMainServer(
|
|
101
125
|
viteConfigOptions,
|
|
102
126
|
'production',
|
|
@@ -107,6 +131,7 @@ const mainCommand = defineCommand({
|
|
|
107
131
|
}),
|
|
108
132
|
build: defineCommand({
|
|
109
133
|
async run(ctx) {
|
|
134
|
+
await runPrepare()
|
|
110
135
|
const builder = await createBuilder(viteConfigOptions, config)
|
|
111
136
|
await builder.build()
|
|
112
137
|
},
|