@solid-stack/builder 1.1.4 → 1.1.6

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.
@@ -1 +1 @@
1
- {"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../../src/commands/service/commands/up/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,eAAO,MAAM,iBAAiB,QAAS,OAAO,KAAG,IAgDhD,CAAC"}
1
+ {"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../../src/commands/service/commands/up/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,eAAO,MAAM,iBAAiB,QAAS,OAAO,KAAG,IA0DhD,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../../../src/commands/service/commands/up/handler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAkB,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGnF,wBAAsB,eAAe,CACnC,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,CAmCjB"}
1
+ {"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../../../src/commands/service/commands/up/handler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAkB,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGnF,wBAAsB,eAAe,CACnC,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,CAqCjB"}
@@ -5,5 +5,6 @@ export type RunOptions = {
5
5
  dryRun?: boolean | undefined;
6
6
  skipBanner?: boolean | undefined;
7
7
  silenceWarnings?: boolean | undefined;
8
+ full?: boolean | undefined;
8
9
  };
9
10
  //# sourceMappingURL=RunOptions.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"RunOptions.d.ts","sourceRoot":"","sources":["../../src/core/RunOptions.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACvC,CAAC"}
1
+ {"version":3,"file":"RunOptions.d.ts","sourceRoot":"","sources":["../../src/core/RunOptions.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC5B,CAAC"}
@@ -1,5 +1,7 @@
1
1
  import type { Environment } from "../types/index.js";
2
- export declare const compileEnvironment: (environment: Environment, projectDir?: string, options?: {
2
+ export interface CompileEnvironmentOptions {
3
3
  silenceWarnings?: boolean | undefined;
4
- }) => string;
4
+ full?: boolean | undefined;
5
+ }
6
+ export declare const compileEnvironment: (environment: Environment, projectDir?: string, options?: CompileEnvironmentOptions) => string;
5
7
  //# sourceMappingURL=compileEnvironment.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"compileEnvironment.d.ts","sourceRoot":"","sources":["../../src/core/compileEnvironment.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAarD,eAAO,MAAM,kBAAkB,gBAChB,WAAW,eACZ,MAAM,YACT;IAAE,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAE,KACjD,MA4TF,CAAC"}
1
+ {"version":3,"file":"compileEnvironment.d.ts","sourceRoot":"","sources":["../../src/core/compileEnvironment.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAarD,MAAM,WAAW,yBAAyB;IACxC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC5B;AAED,eAAO,MAAM,kBAAkB,gBAChB,WAAW,eACZ,MAAM,YACT,yBAAyB,KACjC,MAkXF,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"compileMeshEnvironment.d.ts","sourceRoot":"","sources":["../../../src/core/mesh/compileMeshEnvironment.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACzC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACvC;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACxC;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,KAAK,GAAG,MAAM,EACpB,UAAU,GAAE,MAAsB,EAClC,OAAO,GAAE,kBAAuB,GAC/B,iBAAiB,CAm0BnB"}
1
+ {"version":3,"file":"compileMeshEnvironment.d.ts","sourceRoot":"","sources":["../../../src/core/mesh/compileMeshEnvironment.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACzC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACvC;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACxC;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,KAAK,GAAG,MAAM,EACpB,UAAU,GAAE,MAAsB,EAClC,OAAO,GAAE,kBAAuB,GAC/B,iBAAiB,CA+1BnB"}
@@ -1 +1 @@
1
- {"version":3,"file":"runDev.d.ts","sourceRoot":"","sources":["../../../src/core/runners/runDev.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGnD,eAAO,MAAM,MAAM,YAAmB,UAAU,KAAG,OAAO,CAAC,MAAM,CAkDhE,CAAC"}
1
+ {"version":3,"file":"runDev.d.ts","sourceRoot":"","sources":["../../../src/core/runners/runDev.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGnD,eAAO,MAAM,MAAM,YAAmB,UAAU,KAAG,OAAO,CAAC,MAAM,CAyDhE,CAAC"}
package/dist/index.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  export * from "./types/index.js";
2
2
  export { createCli, runCli } from "./cli.js";
3
- export { compileEnvironment } from "./core/compileEnvironment.js";
3
+ export { compileEnvironment, type CompileEnvironmentOptions, } from "./core/compileEnvironment.js";
4
4
  export { compileMeshEnvironment } from "./core/mesh/compileMeshEnvironment.js";
5
5
  export { teardownCompose } from "./core/teardownCompose.js";
6
6
  export { runCompose } from "./core/runCompose.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EACL,kBAAkB,EAClB,KAAK,yBAAyB,GAC/B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC"}
package/dist/index.js CHANGED
@@ -1240,12 +1240,13 @@ function compileMeshEnvironment(mode, rawMeshDir = process.cwd(), options = {})
1240
1240
  let overrideVolumes = [];
1241
1241
  let overrideHealthcheck = void 0;
1242
1242
  let overrideCommand = void 0;
1243
+ let overrideApp = void 0;
1243
1244
  const stageOverride = serviceOverrides[mode];
1244
1245
  if (stageOverride && existsSync(stageOverride.path)) {
1245
1246
  try {
1246
1247
  const overrideYaml = parse(readFileSync(stageOverride.path, "utf-8"));
1247
1248
  mergeTopLevelResources(overrideYaml);
1248
- const overrideApp = overrideYaml?.services?.app || overrideYaml?.services?.[serviceName];
1249
+ overrideApp = overrideYaml?.services?.app || overrideYaml?.services?.[serviceName];
1249
1250
  if (!overrideApp && overrideYaml?.services && Object.keys(overrideYaml.services).length > 0) {
1250
1251
  throw new ScriptError(
1251
1252
  `Override file "${stageOverride.path}" must define service "app" or "${serviceName}".`
@@ -1285,16 +1286,41 @@ function compileMeshEnvironment(mode, rawMeshDir = process.cwd(), options = {})
1285
1286
  }
1286
1287
  }
1287
1288
  environment.PORT = String(INTERNAL_PORT);
1289
+ const buildArgs = {};
1290
+ if (overrideApp?.build?.args) {
1291
+ if (Array.isArray(overrideApp.build.args)) {
1292
+ for (const item of overrideApp.build.args) {
1293
+ if (typeof item === "string") {
1294
+ const eqIdx = item.indexOf("=");
1295
+ if (eqIdx !== -1) {
1296
+ buildArgs[item.slice(0, eqIdx)] = item.slice(eqIdx + 1);
1297
+ } else {
1298
+ buildArgs[item] = process.env[item] ?? null;
1299
+ }
1300
+ }
1301
+ }
1302
+ } else if (typeof overrideApp.build.args === "object") {
1303
+ Object.assign(buildArgs, overrideApp.build.args);
1304
+ }
1305
+ }
1306
+ if (serviceBuildJson.envOverrides) {
1307
+ for (const [k, v] of Object.entries(serviceBuildJson.envOverrides)) {
1308
+ buildArgs[k] = interpolateEnvTemplates(v, `Service build.json: ${serviceName}`);
1309
+ }
1310
+ }
1288
1311
  if (serviceConfig.envOverrides) {
1289
1312
  for (const [k, v] of Object.entries(serviceConfig.envOverrides)) {
1290
- environment[k] = interpolateEnvTemplates(v, `Service: ${serviceName}`);
1313
+ const interpolated = interpolateEnvTemplates(v, `Service: ${serviceName}`);
1314
+ environment[k] = interpolated;
1315
+ buildArgs[k] = interpolated;
1291
1316
  }
1292
1317
  }
1293
1318
  const serviceDef = {
1294
1319
  build: {
1295
1320
  context: relServiceDir,
1296
1321
  dockerfile,
1297
- target: mode
1322
+ target: mode,
1323
+ ...Object.keys(buildArgs).length > 0 ? { args: buildArgs } : {}
1298
1324
  },
1299
1325
  init: true,
1300
1326
  logging: {
@@ -2621,6 +2647,12 @@ var compileEnvironment = (environment, projectDir = process.cwd(), options = {})
2621
2647
  composeFlags.push("-f", overrides.dev.path);
2622
2648
  filesUsed.push(overrides.dev.path);
2623
2649
  }
2650
+ if (options.full && dependencies.length > 0) {
2651
+ for (const dep of dependencies) {
2652
+ composeFlags.push("-f", dep.path);
2653
+ filesUsed.push(dep.path);
2654
+ }
2655
+ }
2624
2656
  composeFlags.push("-f", standalonePath);
2625
2657
  filesUsed.push(standalonePath);
2626
2658
  break;
@@ -2712,7 +2744,7 @@ ${explanation}`);
2712
2744
  }
2713
2745
  const mergedYamlConfig = result.stdout;
2714
2746
  const yml = parse(mergedYamlConfig);
2715
- if (environment === "prod" || environment === "e2e") {
2747
+ if (environment === "prod" || environment === "e2e" || environment === "dev" && options.full) {
2716
2748
  renameServicesWithDependencies(yml, dependencies);
2717
2749
  addDependenciesToAppService(yml, dependencies);
2718
2750
  }
@@ -2796,16 +2828,51 @@ ${explanation}`);
2796
2828
  serviceConfig.environment = {};
2797
2829
  }
2798
2830
  };
2831
+ const normalizeBuildArgs = (serviceConfig) => {
2832
+ if (typeof serviceConfig.build === "string") {
2833
+ serviceConfig.build = {
2834
+ context: serviceConfig.build
2835
+ };
2836
+ }
2837
+ if (serviceConfig.build && typeof serviceConfig.build === "object") {
2838
+ if (Array.isArray(serviceConfig.build.args)) {
2839
+ const argsObj = {};
2840
+ for (const item of serviceConfig.build.args) {
2841
+ if (typeof item === "string") {
2842
+ const eqIdx = item.indexOf("=");
2843
+ if (eqIdx !== -1) {
2844
+ argsObj[item.slice(0, eqIdx)] = item.slice(eqIdx + 1);
2845
+ } else {
2846
+ argsObj[item] = process.env[item] ?? null;
2847
+ }
2848
+ }
2849
+ }
2850
+ serviceConfig.build.args = argsObj;
2851
+ } else if (!serviceConfig.build.args || typeof serviceConfig.build.args !== "object") {
2852
+ serviceConfig.build.args = {};
2853
+ }
2854
+ }
2855
+ };
2799
2856
  if (buildJson.envOverrides && yml.services && yml.services.app) {
2800
2857
  normalizeEnvironment(yml.services.app);
2858
+ normalizeBuildArgs(yml.services.app);
2801
2859
  for (const [k, v] of Object.entries(buildJson.envOverrides)) {
2802
- yml.services.app.environment[k] = interpolateEnv(v, "App EnvOverrides");
2860
+ const val = interpolateEnv(v, "App EnvOverrides");
2861
+ yml.services.app.environment[k] = val;
2862
+ if (yml.services.app.build?.args) {
2863
+ yml.services.app.build.args[k] = val;
2864
+ }
2803
2865
  }
2804
2866
  }
2805
2867
  if (buildJson.tester?.envOverrides && yml.services && yml.services.tester) {
2806
2868
  normalizeEnvironment(yml.services.tester);
2869
+ normalizeBuildArgs(yml.services.tester);
2807
2870
  for (const [k, v] of Object.entries(buildJson.tester.envOverrides)) {
2808
- yml.services.tester.environment[k] = interpolateEnv(v, "Tester EnvOverrides");
2871
+ const val = interpolateEnv(v, "Tester EnvOverrides");
2872
+ yml.services.tester.environment[k] = val;
2873
+ if (yml.services.tester.build?.args) {
2874
+ yml.services.tester.build.args[k] = val;
2875
+ }
2809
2876
  }
2810
2877
  }
2811
2878
  if (yml.services) {
@@ -2822,6 +2889,10 @@ ${explanation}`);
2822
2889
  }
2823
2890
  }
2824
2891
  }
2892
+ if (environment === "dev" && options.full && yml.services?.app) {
2893
+ normalizeEnvironment(yml.services.app);
2894
+ yml.services.app.environment.INFRA_MODE = "integrated";
2895
+ }
2825
2896
  attachName(yml, projectName);
2826
2897
  const finalYamlConfig = stringify(yml);
2827
2898
  return finalYamlConfig;
@@ -3383,9 +3454,14 @@ Examples:
3383
3454
  );
3384
3455
  };
3385
3456
  var runDev = async (options) => {
3386
- console.log(pc22.cyan(`\u{1F680} Starting DEV environment...`));
3457
+ console.log(
3458
+ pc22.cyan(
3459
+ options.full ? `\u{1F680} Starting DEV environment (full / integrated)...` : `\u{1F680} Starting DEV environment...`
3460
+ )
3461
+ );
3387
3462
  const finalYamlConfig = compileEnvironment("dev", options.projectDir, {
3388
- silenceWarnings: options.silenceWarnings
3463
+ silenceWarnings: options.silenceWarnings,
3464
+ full: options.full
3389
3465
  });
3390
3466
  const parsed = parse(finalYamlConfig);
3391
3467
  const projectName = parsed?.name || "dev";
@@ -3473,12 +3549,14 @@ var runProd = async (options) => {
3473
3549
  async function handleServiceUp(rawStage, options = {}) {
3474
3550
  const projectDir = resolveProjectDir(options.projectDir);
3475
3551
  const stage = (rawStage || "dev").toLowerCase();
3552
+ const isFull = Boolean(options.full || options.integrated);
3476
3553
  const runOptions = {
3477
3554
  projectDir,
3478
3555
  debug: Boolean(options.debug),
3479
3556
  detach: Boolean(options.detach),
3480
3557
  dryRun: Boolean(options.dryRun),
3481
- silenceWarnings: Boolean(options.silenceWarnings)
3558
+ silenceWarnings: Boolean(options.silenceWarnings),
3559
+ full: isFull
3482
3560
  };
3483
3561
  if (stage === "dev") {
3484
3562
  return await runDev(runOptions);
@@ -3513,6 +3591,12 @@ var registerUpCommand = (cmd) => {
3513
3591
  ).option(
3514
3592
  "--silence-warnings",
3515
3593
  "Silence non-critical warnings like URL templating hints"
3594
+ ).option(
3595
+ "--full",
3596
+ "Run dev environment with mock dependencies and integrated infra mode"
3597
+ ).option(
3598
+ "--integrated",
3599
+ "Alias for --full"
3516
3600
  ).option(
3517
3601
  "-C, --project-dir <dir>",
3518
3602
  "Service project directory (defaults to cwd)"
@@ -3521,6 +3605,7 @@ var registerUpCommand = (cmd) => {
3521
3605
  `
3522
3606
  Examples:
3523
3607
  $ builder service up dev
3608
+ $ builder service up dev --full
3524
3609
  $ builder service up prod
3525
3610
  $ builder service up test
3526
3611
  $ builder service up test-unit
@@ -3533,7 +3618,8 @@ Examples:
3533
3618
  detach: options.detach,
3534
3619
  dryRun: options.dryRun,
3535
3620
  skipChecks: options.skipChecks,
3536
- silenceWarnings: options.silenceWarnings
3621
+ silenceWarnings: options.silenceWarnings,
3622
+ full: Boolean(options.full || options.integrated)
3537
3623
  });
3538
3624
  if (exitCode !== 0) {
3539
3625
  process.exit(exitCode);