arri 0.71.1 → 0.73.0
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.cjs +4 -4
- package/dist/cli.mjs +4 -4
- package/dist/index.cjs +16 -7
- package/dist/index.mjs +16 -7
- package/package.json +11 -11
package/dist/cli.cjs
CHANGED
|
@@ -577,7 +577,7 @@ const use = citty.defineCommand({
|
|
|
577
577
|
);
|
|
578
578
|
}
|
|
579
579
|
});
|
|
580
|
-
function updatePackageJson(fileContent, targetVersion) {
|
|
580
|
+
function updatePackageJson(fileContent, targetVersion, strict = true) {
|
|
581
581
|
const lines = fileContent.split("\n");
|
|
582
582
|
const output = [];
|
|
583
583
|
let updated = false;
|
|
@@ -600,7 +600,7 @@ function updatePackageJson(fileContent, targetVersion) {
|
|
|
600
600
|
return line;
|
|
601
601
|
}
|
|
602
602
|
const targetParts = parts[1].split('"');
|
|
603
|
-
targetParts[1] = `^${targetVersion}`;
|
|
603
|
+
targetParts[1] = strict ? `${targetVersion}` : `^${targetVersion}`;
|
|
604
604
|
parts[1] = targetParts.join('"');
|
|
605
605
|
return parts.join('":');
|
|
606
606
|
}
|
|
@@ -636,7 +636,7 @@ async function getDartPackageMeta() {
|
|
|
636
636
|
const data = schema.a.parse(PubPackageResponse, response);
|
|
637
637
|
return data;
|
|
638
638
|
}
|
|
639
|
-
function updatePubspecYaml(fileContent, version) {
|
|
639
|
+
function updatePubspecYaml(fileContent, version, strict = true) {
|
|
640
640
|
const lines = fileContent.split("\n");
|
|
641
641
|
const output = [];
|
|
642
642
|
let updated = false;
|
|
@@ -649,7 +649,7 @@ function updatePubspecYaml(fileContent, version) {
|
|
|
649
649
|
}
|
|
650
650
|
const targetPart = parts[1];
|
|
651
651
|
const subParts = targetPart.split(" ");
|
|
652
|
-
subParts[0] = `^${version}`;
|
|
652
|
+
subParts[0] = strict ? `${version}` : `^${version}`;
|
|
653
653
|
parts[1] = subParts.join(" ");
|
|
654
654
|
output.push(parts.join(": "));
|
|
655
655
|
updated = true;
|
package/dist/cli.mjs
CHANGED
|
@@ -565,7 +565,7 @@ const use = defineCommand({
|
|
|
565
565
|
);
|
|
566
566
|
}
|
|
567
567
|
});
|
|
568
|
-
function updatePackageJson(fileContent, targetVersion) {
|
|
568
|
+
function updatePackageJson(fileContent, targetVersion, strict = true) {
|
|
569
569
|
const lines = fileContent.split("\n");
|
|
570
570
|
const output = [];
|
|
571
571
|
let updated = false;
|
|
@@ -588,7 +588,7 @@ function updatePackageJson(fileContent, targetVersion) {
|
|
|
588
588
|
return line;
|
|
589
589
|
}
|
|
590
590
|
const targetParts = parts[1].split('"');
|
|
591
|
-
targetParts[1] = `^${targetVersion}`;
|
|
591
|
+
targetParts[1] = strict ? `${targetVersion}` : `^${targetVersion}`;
|
|
592
592
|
parts[1] = targetParts.join('"');
|
|
593
593
|
return parts.join('":');
|
|
594
594
|
}
|
|
@@ -624,7 +624,7 @@ async function getDartPackageMeta() {
|
|
|
624
624
|
const data = a.parse(PubPackageResponse, response);
|
|
625
625
|
return data;
|
|
626
626
|
}
|
|
627
|
-
function updatePubspecYaml(fileContent, version) {
|
|
627
|
+
function updatePubspecYaml(fileContent, version, strict = true) {
|
|
628
628
|
const lines = fileContent.split("\n");
|
|
629
629
|
const output = [];
|
|
630
630
|
let updated = false;
|
|
@@ -637,7 +637,7 @@ function updatePubspecYaml(fileContent, version) {
|
|
|
637
637
|
}
|
|
638
638
|
const targetPart = parts[1];
|
|
639
639
|
const subParts = targetPart.split(" ");
|
|
640
|
-
subParts[0] = `^${version}`;
|
|
640
|
+
subParts[0] = strict ? `${version}` : `^${version}`;
|
|
641
641
|
parts[1] = subParts.join(" ");
|
|
642
642
|
output.push(parts.join(": "));
|
|
643
643
|
updated = true;
|
package/dist/index.cjs
CHANGED
|
@@ -321,7 +321,7 @@ async function startBuild(generators, serverConfig, skipCodeGen = false) {
|
|
|
321
321
|
const startTime = (/* @__PURE__ */ new Date()).getTime();
|
|
322
322
|
common.logger.log(`Generating ${clientCount} client(s)...`);
|
|
323
323
|
await Promise.all(
|
|
324
|
-
generators.map((generator) => generator.run(def)) ?? []
|
|
324
|
+
generators.map((generator) => generator.run(def, false)) ?? []
|
|
325
325
|
);
|
|
326
326
|
common.logger.log(
|
|
327
327
|
`${clientCount} client(s) generated in ${(/* @__PURE__ */ new Date()).getTime() - startTime}ms`
|
|
@@ -430,7 +430,7 @@ async function createCodegenEntryFile(config) {
|
|
|
430
430
|
const virtualModule = await prettier__default.format(
|
|
431
431
|
`
|
|
432
432
|
import { writeFileSync } from 'node:fs';
|
|
433
|
-
import path from '
|
|
433
|
+
import path from 'node:path';
|
|
434
434
|
import app from './${OUT_APP_FILE}';
|
|
435
435
|
|
|
436
436
|
const __dirname = new URL(".", import.meta.url).pathname;
|
|
@@ -537,7 +537,7 @@ async function startDevServer(config, generators) {
|
|
|
537
537
|
let appDefStr = JSON.stringify(appDef);
|
|
538
538
|
if (generators.length) {
|
|
539
539
|
common.logger.info(`Running generators...`);
|
|
540
|
-
await generateClientsFromDefinition(appDef, generators);
|
|
540
|
+
await generateClientsFromDefinition(appDef, generators, true);
|
|
541
541
|
} else {
|
|
542
542
|
common.logger.warn(`No generators specified in config. Skipping codegen.`);
|
|
543
543
|
}
|
|
@@ -603,7 +603,11 @@ async function startDevServer(config, generators) {
|
|
|
603
603
|
common.logger.info(
|
|
604
604
|
`App Definition updated. Regenerating clients...`
|
|
605
605
|
);
|
|
606
|
-
await generateClientsFromDefinition(
|
|
606
|
+
await generateClientsFromDefinition(
|
|
607
|
+
newAppDef,
|
|
608
|
+
generators,
|
|
609
|
+
true
|
|
610
|
+
);
|
|
607
611
|
appDef = newAppDef;
|
|
608
612
|
appDefStr = newAppDefStr;
|
|
609
613
|
}
|
|
@@ -614,16 +618,21 @@ async function startDevServer(config, generators) {
|
|
|
614
618
|
}
|
|
615
619
|
await load();
|
|
616
620
|
}
|
|
617
|
-
async function generateClientsFromDefinition(appDef, generators) {
|
|
621
|
+
async function generateClientsFromDefinition(appDef, generators, isDev) {
|
|
618
622
|
const startTime = (/* @__PURE__ */ new Date()).getTime();
|
|
619
623
|
try {
|
|
620
624
|
const clientCount = generators.length;
|
|
621
|
-
await Promise.allSettled(
|
|
622
|
-
generators.map((generator) => generator.run(appDef,
|
|
625
|
+
const result = await Promise.allSettled(
|
|
626
|
+
generators.map((generator) => generator.run(appDef, isDev))
|
|
623
627
|
);
|
|
624
628
|
common.logger.success(
|
|
625
629
|
`Generated ${clientCount} client${clientCount === 1 ? "" : "s"} in ${(/* @__PURE__ */ new Date()).getTime() - startTime}ms`
|
|
626
630
|
);
|
|
631
|
+
for (const item of result) {
|
|
632
|
+
if (item.status === "rejected") {
|
|
633
|
+
console.error("ERROR", item.reason);
|
|
634
|
+
}
|
|
635
|
+
}
|
|
627
636
|
} catch (err) {
|
|
628
637
|
common.logger.error(err);
|
|
629
638
|
}
|
package/dist/index.mjs
CHANGED
|
@@ -295,7 +295,7 @@ async function startBuild(generators, serverConfig, skipCodeGen = false) {
|
|
|
295
295
|
const startTime = (/* @__PURE__ */ new Date()).getTime();
|
|
296
296
|
logger.log(`Generating ${clientCount} client(s)...`);
|
|
297
297
|
await Promise.all(
|
|
298
|
-
generators.map((generator) => generator.run(def)) ?? []
|
|
298
|
+
generators.map((generator) => generator.run(def, false)) ?? []
|
|
299
299
|
);
|
|
300
300
|
logger.log(
|
|
301
301
|
`${clientCount} client(s) generated in ${(/* @__PURE__ */ new Date()).getTime() - startTime}ms`
|
|
@@ -404,7 +404,7 @@ async function createCodegenEntryFile(config) {
|
|
|
404
404
|
const virtualModule = await prettier.format(
|
|
405
405
|
`
|
|
406
406
|
import { writeFileSync } from 'node:fs';
|
|
407
|
-
import path from '
|
|
407
|
+
import path from 'node:path';
|
|
408
408
|
import app from './${OUT_APP_FILE}';
|
|
409
409
|
|
|
410
410
|
const __dirname = new URL(".", import.meta.url).pathname;
|
|
@@ -511,7 +511,7 @@ async function startDevServer(config, generators) {
|
|
|
511
511
|
let appDefStr = JSON.stringify(appDef);
|
|
512
512
|
if (generators.length) {
|
|
513
513
|
logger.info(`Running generators...`);
|
|
514
|
-
await generateClientsFromDefinition(appDef, generators);
|
|
514
|
+
await generateClientsFromDefinition(appDef, generators, true);
|
|
515
515
|
} else {
|
|
516
516
|
logger.warn(`No generators specified in config. Skipping codegen.`);
|
|
517
517
|
}
|
|
@@ -577,7 +577,11 @@ async function startDevServer(config, generators) {
|
|
|
577
577
|
logger.info(
|
|
578
578
|
`App Definition updated. Regenerating clients...`
|
|
579
579
|
);
|
|
580
|
-
await generateClientsFromDefinition(
|
|
580
|
+
await generateClientsFromDefinition(
|
|
581
|
+
newAppDef,
|
|
582
|
+
generators,
|
|
583
|
+
true
|
|
584
|
+
);
|
|
581
585
|
appDef = newAppDef;
|
|
582
586
|
appDefStr = newAppDefStr;
|
|
583
587
|
}
|
|
@@ -588,16 +592,21 @@ async function startDevServer(config, generators) {
|
|
|
588
592
|
}
|
|
589
593
|
await load();
|
|
590
594
|
}
|
|
591
|
-
async function generateClientsFromDefinition(appDef, generators) {
|
|
595
|
+
async function generateClientsFromDefinition(appDef, generators, isDev) {
|
|
592
596
|
const startTime = (/* @__PURE__ */ new Date()).getTime();
|
|
593
597
|
try {
|
|
594
598
|
const clientCount = generators.length;
|
|
595
|
-
await Promise.allSettled(
|
|
596
|
-
generators.map((generator) => generator.run(appDef,
|
|
599
|
+
const result = await Promise.allSettled(
|
|
600
|
+
generators.map((generator) => generator.run(appDef, isDev))
|
|
597
601
|
);
|
|
598
602
|
logger.success(
|
|
599
603
|
`Generated ${clientCount} client${clientCount === 1 ? "" : "s"} in ${(/* @__PURE__ */ new Date()).getTime() - startTime}ms`
|
|
600
604
|
);
|
|
605
|
+
for (const item of result) {
|
|
606
|
+
if (item.status === "rejected") {
|
|
607
|
+
console.error("ERROR", item.reason);
|
|
608
|
+
}
|
|
609
|
+
}
|
|
601
610
|
} catch (err) {
|
|
602
611
|
logger.error(err);
|
|
603
612
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "arri",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.73.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": {
|
|
@@ -29,23 +29,23 @@
|
|
|
29
29
|
"c12": "^2.0.1",
|
|
30
30
|
"chokidar": "^4.0.3",
|
|
31
31
|
"citty": "^0.1.6",
|
|
32
|
-
"consola": "^3.
|
|
32
|
+
"consola": "^3.4.0",
|
|
33
33
|
"degit": "^2.8.4",
|
|
34
34
|
"enquirer": "^2.4.1",
|
|
35
35
|
"esbuild": "^0.24.2",
|
|
36
36
|
"esbuild-plugin-replace": "^1.4.0",
|
|
37
37
|
"globby": "^14.0.2",
|
|
38
|
-
"h3": "^1.
|
|
38
|
+
"h3": "^1.14.0",
|
|
39
39
|
"ofetch": "^1.4.1",
|
|
40
|
-
"pathe": "^2.0.
|
|
40
|
+
"pathe": "^2.0.2",
|
|
41
41
|
"prettier": "^3.4.2",
|
|
42
|
-
"@arrirpc/codegen-
|
|
43
|
-
"@arrirpc/codegen-
|
|
44
|
-
"@arrirpc/codegen-
|
|
45
|
-
"@arrirpc/
|
|
46
|
-
"@arrirpc/codegen-
|
|
47
|
-
"@arrirpc/codegen-utils": "0.
|
|
48
|
-
"@arrirpc/
|
|
42
|
+
"@arrirpc/codegen-dart": "0.73.0",
|
|
43
|
+
"@arrirpc/codegen-kotlin": "0.73.0",
|
|
44
|
+
"@arrirpc/codegen-ts": "0.73.0",
|
|
45
|
+
"@arrirpc/schema": "0.73.0",
|
|
46
|
+
"@arrirpc/codegen-swift": "0.73.0",
|
|
47
|
+
"@arrirpc/codegen-utils": "0.73.0",
|
|
48
|
+
"@arrirpc/codegen-rust": "0.73.0"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@types/degit": "^2.8.6"
|