@voxgig/sdkgen 4.24.0 → 4.24.2

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.
Files changed (29) hide show
  1. package/bin/voxgig-sdkgen +1 -1
  2. package/dist/cmp/Deploy.js +9 -6
  3. package/dist/cmp/Deploy.js.map +1 -1
  4. package/dist/helpers/semver.js +3 -1
  5. package/dist/helpers/semver.js.map +1 -1
  6. package/dist/tsconfig.tsbuildinfo +1 -1
  7. package/package.json +4 -4
  8. package/project/.sdk/tm/go/test/pipeline_test.go +163 -57
  9. package/project/.sdk/tm/go/test/primary_utility_test.go +53 -0
  10. package/project/.sdk/tm/java/test/PipelineTest.java +141 -48
  11. package/project/.sdk/tm/java/test/PrimaryUtilityTest.java +67 -6
  12. package/project/.sdk/tm/js/test/pipeline.test.js +88 -22
  13. package/project/.sdk/tm/js/test/utility/PrimaryUtility.test.js +47 -1
  14. package/project/.sdk/tm/lua/test/omni.lua +8 -1
  15. package/project/.sdk/tm/lua/test/pipeline_test.lua +107 -28
  16. package/project/.sdk/tm/lua/test/primary_utility_test.lua +83 -3
  17. package/project/.sdk/tm/perl/t/omni.pm +7 -1
  18. package/project/.sdk/tm/perl/t/pipeline.t +124 -27
  19. package/project/.sdk/tm/perl/t/primary_utility.t +73 -0
  20. package/project/.sdk/tm/php/test/PipelineTest.php +143 -26
  21. package/project/.sdk/tm/php/test/PrimaryUtilityTest.php +80 -2
  22. package/project/.sdk/tm/py/test/test_pipeline.py +108 -31
  23. package/project/.sdk/tm/py/test/test_primary_utility.py +76 -1
  24. package/project/.sdk/tm/rb/test/pipeline_test.rb +100 -24
  25. package/project/.sdk/tm/rb/test/primary_utility_test.rb +59 -1
  26. package/project/.sdk/tm/ts/test/pipeline.test.ts +52 -11
  27. package/project/sdkgen-package.json +1 -1
  28. package/src/cmp/Deploy.ts +11 -6
  29. package/src/helpers/semver.ts +3 -1
package/bin/voxgig-sdkgen CHANGED
@@ -8,7 +8,7 @@ const { Shape, One, Skip } = require('shape')
8
8
 
9
9
  const { SdkGen } = require('../dist/sdkgen.js')
10
10
 
11
- const VERSION = '4.24.0'
11
+ const VERSION = '4.24.2'
12
12
  const KONSOLE = console
13
13
 
14
14
 
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Deploy = void 0;
4
4
  const jostraca_1 = require("jostraca");
5
+ const packageMeta_1 = require("../helpers/packageMeta");
5
6
  const types_1 = require("../types");
6
7
  const Deploy = (0, jostraca_1.cmp)(function Deploy(props) {
7
8
  const { ctx$ } = props;
@@ -98,7 +99,7 @@ deploy-${t.name}:
98
99
 
99
100
  deploy-dry-${t.name}:
100
101
  \tboru vault exec --dry-run ${ghArgs} -- $(MAKE) tag-push-${t.name}
101
- ${tagPushRecipe(t.name, 'tag-only port')}
102
+ ${tagPushRecipe(t.name, (0, packageMeta_1.packageVersion)(model, t.name), 'tag-only port')}
102
103
  `;
103
104
  }
104
105
  if (reg && !regIsActive(reg)) {
@@ -109,7 +110,7 @@ deploy-${t.name}:
109
110
 
110
111
  deploy-dry-${t.name}:
111
112
  \tboru vault exec --dry-run ${ghArgs} -- $(MAKE) tag-push-${t.name}
112
- ${tagPushRecipe(t.name, reg.name + ' publication pending — tag-only deploy')}
113
+ ${tagPushRecipe(t.name, (0, packageMeta_1.packageVersion)(model, t.name), reg.name + ' publication pending — tag-only deploy')}
113
114
  `;
114
115
  }
115
116
  return `
@@ -150,8 +151,6 @@ SHELL := /bin/bash
150
151
 
151
152
  ${varLines}
152
153
 
153
- # Lockstep SDK version, read from the canonical ts manifest.
154
- VERSION := $(shell node -p "require('./ts/package.json').version" 2>/dev/null || echo 0.0.0)
155
154
  BORU_DRY_RUN_FILLER := BORU-DRY-RUN-FILLER-NOT-A-REAL-SECRET
156
155
 
157
156
  TARGETS := ${targets.map((t) => t.name).join(' ')}
@@ -178,10 +177,14 @@ ${deployRules}`;
178
177
  // The root-level tag creation + push recipe for a target: boru --dry-run
179
178
  // filler cooperation, idempotent tag creation, token-authenticated https
180
179
  // push (works from an ssh-remote clone without ssh keys).
181
- function tagPushRecipe(name, note) {
180
+ function tagPushRecipe(name, version, note) {
181
+ // The version is embedded in both Make and shell syntax.
182
+ if (!/^[0-9A-Za-z][0-9A-Za-z.+-]*$/.test(version)) {
183
+ throw new Error('Deploy: invalid publish.version for target "' + name + '": ' + JSON.stringify(version));
184
+ }
182
185
  return `
183
186
  tag-push-${name}:
184
- \t@set -e; tag="${name}/v$(VERSION)"; \\
187
+ \t@set -e; tag="${name}/v${version}"; \\
185
188
  \ttoken="\$\${GITHUB_TOKEN:-$$GH_TOKEN}"; \\
186
189
  \tif [ "$$token" = "$(BORU_DRY_RUN_FILLER)" ]; then \\
187
190
  \t echo "[dry-run] boru filler token detected: would create (if missing) and push tag $$tag; nothing pushed."; exit 0; fi; \\
@@ -1 +1 @@
1
- {"version":3,"file":"Deploy.js","sourceRoot":"","sources":["../../src/cmp/Deploy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Deploy.js","sourceRoot":"","sources":["../../src/cmp/Deploy.ts"],"names":[],"mappings":"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"}
@@ -88,7 +88,9 @@ function satisfies(version, range) {
88
88
  // the strict-direction failure this module is shaped to avoid.
89
89
  let unknown = false;
90
90
  for (const alt of text.split('||')) {
91
- const comparators = alt.trim().split(/\s+/).filter((s) => '' !== s);
91
+ const comparators = alt.trim()
92
+ .replace(/(^|\s)(>=|<=|>|<|=|\^|~)\s+(?=v?\d)/g, '$1$2')
93
+ .split(/\s+/).filter((s) => '' !== s);
92
94
  if (0 === comparators.length) {
93
95
  unknown = true;
94
96
  continue;
@@ -1 +1 @@
1
- {"version":3,"file":"semver.js","sourceRoot":"","sources":["../../src/helpers/semver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"semver.js","sourceRoot":"","sources":["../../src/helpers/semver.ts"],"names":[],"mappings":"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"}