@voxgig/sdkgen 1.3.1 → 1.3.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.
- package/bin/voxgig-sdkgen +1 -1
- package/dist/action/action.d.ts +2 -1
- package/dist/action/action.js +13 -3
- package/dist/action/action.js.map +1 -1
- package/dist/action/feature.js +3 -5
- package/dist/action/feature.js.map +1 -1
- package/dist/action/target.js +9 -7
- package/dist/action/target.js.map +1 -1
- package/dist/cmp/Deploy.js +3 -3
- package/dist/cmp/Deploy.js.map +1 -1
- package/dist/helpers/opShape.js +38 -6
- package/dist/helpers/opShape.js.map +1 -1
- package/dist/sdkgen.d.ts +2 -2
- package/dist/sdkgen.js +5 -4
- package/dist/sdkgen.js.map +1 -1
- package/dist/utility.d.ts +2 -1
- package/dist/utility.js +20 -1
- package/dist/utility.js.map +1 -1
- package/model/sdkgen.aontu +1 -1
- package/package.json +1 -1
- package/project/.sdk/model/feature/feature-index.aontu +5 -0
- package/project/.sdk/src/cmp/go/Config_go.ts +3 -2
- package/project/.sdk/src/cmp/go/ReadmeEntity_go.ts +35 -9
- package/project/.sdk/src/cmp/go/ReadmeExamplesTest_go.ts +18 -14
- package/project/.sdk/src/cmp/go/ReadmeHowto_go.ts +6 -2
- package/project/.sdk/src/cmp/go/ReadmeModel_go.ts +6 -2
- package/project/.sdk/src/cmp/go/ReadmeQuick_go.ts +51 -30
- package/project/.sdk/src/cmp/go/ReadmeRef_go.ts +66 -13
- package/project/.sdk/src/cmp/go/ReadmeTopHowto_go.ts +4 -0
- package/project/.sdk/src/cmp/go/ReadmeTopQuick_go.ts +51 -16
- package/project/.sdk/src/cmp/go/utility_go.ts +70 -0
- package/project/.sdk/src/cmp/js/Config_js.ts +3 -6
- package/project/.sdk/src/cmp/js/ReadmeEntity_js.ts +23 -6
- package/project/.sdk/src/cmp/js/ReadmeQuick_js.ts +31 -7
- package/project/.sdk/src/cmp/js/ReadmeRef_js.ts +33 -10
- package/project/.sdk/src/cmp/js/ReadmeTopQuick_js.ts +24 -14
- package/project/.sdk/src/cmp/js/ReadmeTopTest_js.ts +15 -3
- package/project/.sdk/src/cmp/lua/Config_lua.ts +3 -2
- package/project/.sdk/src/cmp/lua/ReadmeEntity_lua.ts +41 -6
- package/project/.sdk/src/cmp/lua/ReadmeQuick_lua.ts +94 -20
- package/project/.sdk/src/cmp/lua/ReadmeRef_lua.ts +51 -8
- package/project/.sdk/src/cmp/lua/ReadmeTopQuick_lua.ts +31 -2
- package/project/.sdk/src/cmp/lua/ReadmeTopTest_lua.ts +13 -2
- package/project/.sdk/src/cmp/php/Config_php.ts +3 -2
- package/project/.sdk/src/cmp/php/ReadmeEntity_php.ts +34 -6
- package/project/.sdk/src/cmp/php/ReadmeQuick_php.ts +95 -19
- package/project/.sdk/src/cmp/php/ReadmeRef_php.ts +44 -8
- package/project/.sdk/src/cmp/php/ReadmeTopQuick_php.ts +26 -2
- package/project/.sdk/src/cmp/php/ReadmeTopTest_php.ts +13 -2
- package/project/.sdk/src/cmp/py/Config_py.ts +3 -2
- package/project/.sdk/src/cmp/py/ReadmeEntity_py.ts +26 -8
- package/project/.sdk/src/cmp/py/ReadmeQuick_py.ts +95 -21
- package/project/.sdk/src/cmp/py/ReadmeRef_py.ts +37 -11
- package/project/.sdk/src/cmp/py/ReadmeTopQuick_py.ts +28 -2
- package/project/.sdk/src/cmp/py/ReadmeTopTest_py.ts +16 -3
- package/project/.sdk/src/cmp/rb/Config_rb.ts +3 -2
- package/project/.sdk/src/cmp/rb/ReadmeEntity_rb.ts +26 -8
- package/project/.sdk/src/cmp/rb/ReadmeQuick_rb.ts +96 -21
- package/project/.sdk/src/cmp/rb/ReadmeRef_rb.ts +36 -10
- package/project/.sdk/src/cmp/rb/ReadmeTopQuick_rb.ts +28 -2
- package/project/.sdk/src/cmp/rb/ReadmeTopTest_rb.ts +13 -2
- package/project/.sdk/src/cmp/ts/Config_ts.ts +3 -6
- package/project/.sdk/src/cmp/ts/ReadmeEntity_ts.ts +22 -6
- package/project/.sdk/src/cmp/ts/ReadmeQuick_ts.ts +56 -18
- package/project/.sdk/src/cmp/ts/ReadmeRef_ts.ts +33 -10
- package/project/.sdk/src/cmp/ts/ReadmeTopQuick_ts.ts +21 -14
- package/project/.sdk/src/cmp/ts/ReadmeTopTest_ts.ts +15 -3
- package/project/.sdk/tm/py/test/test_struct_utility.py +1 -1
- package/project/.sdk/tm/rb/Makefile +3 -1
- package/src/action/action.ts +15 -3
- package/src/action/feature.ts +4 -8
- package/src/action/target.ts +11 -9
- package/src/cmp/Deploy.ts +3 -3
- package/src/helpers/opShape.ts +45 -7
- package/src/sdkgen.ts +4 -3
- package/src/utility.ts +24 -1
- package/project/.sdk/model/feature/feature-index.jsonic +0 -5
- /package/project/.sdk/model/feature/{log.jsonic → log.aontu} +0 -0
- /package/project/.sdk/model/feature/{test.jsonic → test.aontu} +0 -0
- /package/project/.sdk/model/target/{go-cli.jsonic → go-cli.aontu} +0 -0
- /package/project/.sdk/model/target/{go-mcp.jsonic → go-mcp.aontu} +0 -0
- /package/project/.sdk/model/target/{go.jsonic → go.aontu} +0 -0
- /package/project/.sdk/model/target/{js.jsonic → js.aontu} +0 -0
- /package/project/.sdk/model/target/{lua.jsonic → lua.aontu} +0 -0
- /package/project/.sdk/model/target/{php.jsonic → php.aontu} +0 -0
- /package/project/.sdk/model/target/{py.jsonic → py.aontu} +0 -0
- /package/project/.sdk/model/target/{rb.jsonic → rb.aontu} +0 -0
- /package/project/.sdk/model/target/{ts.jsonic → ts.aontu} +0 -0
package/bin/voxgig-sdkgen
CHANGED
package/dist/action/action.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { ActionContext } from '../types';
|
|
2
2
|
declare function appendIndexEntries(content: string, names: string[]): string;
|
|
3
3
|
declare const UpdateIndex: import("jostraca").Component;
|
|
4
|
+
declare function parseAddNames(args: any[]): string[];
|
|
4
5
|
declare function loadContent(actx: ActionContext, which: string | string[]): any;
|
|
5
|
-
export { UpdateIndex, appendIndexEntries, loadContent };
|
|
6
|
+
export { UpdateIndex, appendIndexEntries, parseAddNames, loadContent };
|
package/dist/action/action.js
CHANGED
|
@@ -5,16 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.UpdateIndex = void 0;
|
|
7
7
|
exports.appendIndexEntries = appendIndexEntries;
|
|
8
|
+
exports.parseAddNames = parseAddNames;
|
|
8
9
|
exports.loadContent = loadContent;
|
|
9
10
|
const node_path_1 = __importDefault(require("node:path"));
|
|
10
11
|
const jostraca_1 = require("jostraca");
|
|
11
|
-
// Append `@"<name>.
|
|
12
|
+
// Append `@"<name>.aontu"` import lines for each name not already present in
|
|
12
13
|
// the index content. Checking against the accumulating result (not the
|
|
13
14
|
// original) means duplicate names in the same call are added at most once.
|
|
14
15
|
function appendIndexEntries(content, names) {
|
|
15
16
|
let out = content;
|
|
16
17
|
for (const n of names) {
|
|
17
|
-
const entry = `@"${n}.
|
|
18
|
+
const entry = `@"${n}.aontu"`;
|
|
18
19
|
if (!out.includes(entry)) {
|
|
19
20
|
out += '\n' + entry;
|
|
20
21
|
}
|
|
@@ -25,13 +26,22 @@ const UpdateIndex = (0, jostraca_1.cmp)(function UpdateIndex(props) {
|
|
|
25
26
|
(0, jostraca_1.Content)(appendIndexEntries(props.content, props.names));
|
|
26
27
|
});
|
|
27
28
|
exports.UpdateIndex = UpdateIndex;
|
|
29
|
+
// Names given to an `add` action: every positional after the subcommand is
|
|
30
|
+
// a name, each possibly comma-separated — `target add ts,py,go` and
|
|
31
|
+
// `target add ts py go` are equivalent (space-separated extras used to be
|
|
32
|
+
// silently dropped).
|
|
33
|
+
function parseAddNames(args) {
|
|
34
|
+
return args.slice(2)
|
|
35
|
+
.flatMap((a) => 'string' === typeof a ? a.split(',') : a)
|
|
36
|
+
.filter((n) => null != n && '' !== n);
|
|
37
|
+
}
|
|
28
38
|
function loadContent(actx, which) {
|
|
29
39
|
which = Array.isArray(which) ? which : [which];
|
|
30
40
|
const content = {};
|
|
31
41
|
const fs = actx.fs();
|
|
32
42
|
const modelfolder = node_path_1.default.dirname(actx.url);
|
|
33
43
|
which.map((w) => {
|
|
34
|
-
const indexfile = node_path_1.default.join(modelfolder, w, w + '-index.
|
|
44
|
+
const indexfile = node_path_1.default.join(modelfolder, w, w + '-index.aontu');
|
|
35
45
|
const indexcontent = fs.readFileSync(indexfile, 'utf8');
|
|
36
46
|
content[`${w}_index`] = indexcontent;
|
|
37
47
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../src/action/action.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../src/action/action.ts"],"names":[],"mappings":";;;;;;AAoEE,gDAAkB;AAClB,sCAAa;AACb,kCAAW;AArEb,0DAA4B;AAE5B,uCAGiB;AAQjB,6EAA6E;AAC7E,uEAAuE;AACvE,2EAA2E;AAC3E,SAAS,kBAAkB,CAAC,OAAe,EAAE,KAAe;IAC1D,IAAI,GAAG,GAAG,OAAO,CAAA;IAEjB,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAA;QAC7B,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,GAAG,IAAI,IAAI,GAAG,KAAK,CAAA;QACrB,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC;AAGD,MAAM,WAAW,GAAG,IAAA,cAAG,EAAC,SAAS,WAAW,CAAC,KAAU;IACrD,IAAA,kBAAO,EAAC,kBAAkB,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;AACzD,CAAC,CAAC,CAAA;AAkCA,kCAAW;AA/Bb,2EAA2E;AAC3E,oEAAoE;AACpE,0EAA0E;AAC1E,qBAAqB;AACrB,SAAS,aAAa,CAAC,IAAW;IAChC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;SACjB,OAAO,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC7D,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;AAC9C,CAAC;AAGD,SAAS,WAAW,CAAC,IAAmB,EAAE,KAAwB;IAChE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAE9C,MAAM,OAAO,GAAQ,EAAE,CAAA;IAEvB,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;IACpB,MAAM,WAAW,GAAG,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE1C,KAAK,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE;QACtB,MAAM,SAAS,GAAG,mBAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,CAAA;QAC/D,MAAM,YAAY,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QACvD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAA;IACtC,CAAC,CAAC,CAAA;IAEF,OAAO,OAAO,CAAA;AAChB,CAAC"}
|
package/dist/action/feature.js
CHANGED
|
@@ -24,9 +24,7 @@ async function action_feature(args, actx) {
|
|
|
24
24
|
return await cmd(args, actx);
|
|
25
25
|
}
|
|
26
26
|
async function cmd_feature_add(args, actx) {
|
|
27
|
-
|
|
28
|
-
const features = 'string' === typeof features_arg ? features_arg.split(',') : features_arg;
|
|
29
|
-
return feature_add(features, actx);
|
|
27
|
+
return feature_add((0, action_1.parseAddNames)(args), actx);
|
|
30
28
|
}
|
|
31
29
|
async function feature_add(features, actx) {
|
|
32
30
|
// Reuse the caller's Jostraca instance so feature generation honours the
|
|
@@ -75,10 +73,10 @@ const FeatureRoot = (0, jostraca_1.cmp)(function FeatureRoot(props) {
|
|
|
75
73
|
(0, jostraca_1.Folder)({ name: 'model/feature' }, () => {
|
|
76
74
|
(0, jostraca_1.Copy)({
|
|
77
75
|
// TODO: these paths needs to be parameterised
|
|
78
|
-
from: BASE + '/project/.sdk/model/feature/' + fname + '.
|
|
76
|
+
from: BASE + '/project/.sdk/model/feature/' + fname + '.aontu',
|
|
79
77
|
exclude: true
|
|
80
78
|
});
|
|
81
|
-
(0, jostraca_1.File)({ name: 'feature-index.
|
|
79
|
+
(0, jostraca_1.File)({ name: 'feature-index.aontu' }, () => (0, action_1.UpdateIndex)({
|
|
82
80
|
content: ctx$.meta.content.feature_index,
|
|
83
81
|
names: features,
|
|
84
82
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feature.js","sourceRoot":"","sources":["../../src/action/feature.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"feature.js","sourceRoot":"","sources":["../../src/action/feature.ts"],"names":[],"mappings":"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"}
|
package/dist/action/target.js
CHANGED
|
@@ -26,9 +26,7 @@ async function action_target(args, actx) {
|
|
|
26
26
|
return await cmd(args, actx);
|
|
27
27
|
}
|
|
28
28
|
async function cmd_target_add(args, actx) {
|
|
29
|
-
|
|
30
|
-
const targets = 'string' === typeof targets_arg ? targets_arg.split(',') : targets_arg;
|
|
31
|
-
return target_add(targets, actx);
|
|
29
|
+
return target_add((0, action_1.parseAddNames)(args), actx);
|
|
32
30
|
}
|
|
33
31
|
// Code API
|
|
34
32
|
async function target_add(targets, actx) {
|
|
@@ -77,6 +75,10 @@ const TargetRoot = (0, jostraca_1.cmp)(function TargetRoot(props) {
|
|
|
77
75
|
// TODO: jostraca - make from value easier to specify
|
|
78
76
|
// const tfolder = 'node_modules/@voxgig/sdkgen/project/.sdk'
|
|
79
77
|
(0, jostraca_1.Project)({}, () => {
|
|
78
|
+
// Resolved names of every target in this run. The index File is
|
|
79
|
+
// re-rendered per target and the last render wins, so each render must
|
|
80
|
+
// carry all names seen so far, not just its own.
|
|
81
|
+
const tnames = [];
|
|
80
82
|
(0, jostraca_1.each)(targets, (n) => {
|
|
81
83
|
const tref = n.val$;
|
|
82
84
|
log.info({
|
|
@@ -85,6 +87,7 @@ const TargetRoot = (0, jostraca_1.cmp)(function TargetRoot(props) {
|
|
|
85
87
|
note: tref
|
|
86
88
|
});
|
|
87
89
|
const { tname, tfolder, torigname, base } = resolveTarget(tref, ctx$);
|
|
90
|
+
tnames.push(tname);
|
|
88
91
|
const targetNote = tname + (tname != tref ? ' ref:' + tref : '');
|
|
89
92
|
log.info({
|
|
90
93
|
point: 'target-name', name: tname, folder: tfolder,
|
|
@@ -94,16 +97,15 @@ const TargetRoot = (0, jostraca_1.cmp)(function TargetRoot(props) {
|
|
|
94
97
|
});
|
|
95
98
|
(0, jostraca_1.Folder)({ name: 'model/target' }, () => {
|
|
96
99
|
(0, jostraca_1.Copy)({
|
|
97
|
-
from: tfolder + '/model/target/' + torigname + '.
|
|
100
|
+
from: tfolder + '/model/target/' + torigname + '.aontu',
|
|
98
101
|
// exclude: true
|
|
99
102
|
replace: {
|
|
100
103
|
"'BASE'": "'" + base + "'"
|
|
101
104
|
}
|
|
102
105
|
});
|
|
103
|
-
(0, jostraca_1.File)({ name: 'target-index.
|
|
106
|
+
(0, jostraca_1.File)({ name: 'target-index.aontu' }, () => (0, action_1.UpdateIndex)({
|
|
104
107
|
content: ctx$.meta.content.target_index,
|
|
105
|
-
|
|
106
|
-
names: [tname]
|
|
108
|
+
names: tnames,
|
|
107
109
|
}));
|
|
108
110
|
});
|
|
109
111
|
(0, jostraca_1.Folder)({ name: 'src/cmp/' + tname }, () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target.js","sourceRoot":"","sources":["../../src/action/target.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"target.js","sourceRoot":"","sources":["../../src/action/target.ts"],"names":[],"mappings":"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"}
|
package/dist/cmp/Deploy.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.Deploy = void 0;
|
|
|
4
4
|
const jostraca_1 = require("jostraca");
|
|
5
5
|
const types_1 = require("../types");
|
|
6
6
|
// Generate the SDK root deployment Makefile from the model's per-target
|
|
7
|
-
// `publish` sections (see model/sdkgen.
|
|
7
|
+
// `publish` sections (see model/sdkgen.aontu):
|
|
8
8
|
//
|
|
9
9
|
// publish.tag — git release tag `<prefix>/vX.Y.Z`; every port has
|
|
10
10
|
// one, pushed with a token from the aql key vault
|
|
@@ -154,7 +154,7 @@ deploy-dry-${t.name}:
|
|
|
154
154
|
.map(([v, def]) => `${v} ?= ${def}`).join('\n');
|
|
155
155
|
return `# ${model.Name} SDK deployment. GENERATED by @voxgig/sdkgen — regenerated
|
|
156
156
|
# on every \`npm run generate\` in .sdk/; publication details live in the
|
|
157
|
-
# model (.sdk/model/target/<target>.
|
|
157
|
+
# model (.sdk/model/target/<target>.aontu, \`publish\` section).
|
|
158
158
|
#
|
|
159
159
|
# Every port gets a git release tag <target>/vX.Y.Z. Ports with an ACTIVE
|
|
160
160
|
# registry also publish a package there. Credentials are injected at exec
|
|
@@ -193,7 +193,7 @@ TARGETS := ${targets.map((t) => t.name).join(' ')}
|
|
|
193
193
|
deploy:
|
|
194
194
|
\t@echo "Deployment is per-target — pick one (each upload is irreversible):"
|
|
195
195
|
\t@echo " make deploy-<target> targets: $(TARGETS)"
|
|
196
|
-
\t@echo "Registry state is set in the model (.sdk/model/target/<t>.
|
|
196
|
+
\t@echo "Registry state is set in the model (.sdk/model/target/<t>.aontu):"
|
|
197
197
|
${targets.map((t) => {
|
|
198
198
|
const reg = registryOf(t);
|
|
199
199
|
const state = reg ? `${reg.name} ${regIsActive(reg) ? 'ACTIVE' : 'publish pending (deploy = git tag only)'}` : 'tag-only';
|
package/dist/cmp/Deploy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Deploy.js","sourceRoot":"","sources":["../../src/cmp/Deploy.ts"],"names":[],"mappings":";;;AAAA,uCAAmD;AAEnD,oCAGiB;AAGjB,wEAAwE;AACxE
|
|
1
|
+
{"version":3,"file":"Deploy.js","sourceRoot":"","sources":["../../src/cmp/Deploy.ts"],"names":[],"mappings":"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"}
|
package/dist/helpers/opShape.js
CHANGED
|
@@ -53,19 +53,51 @@ function cap(s) {
|
|
|
53
53
|
function opTypeName(Name, opname) {
|
|
54
54
|
return Name + cap(opname) + (OP_SUFFIX[opname] || 'Match');
|
|
55
55
|
}
|
|
56
|
-
// Collect an op's params, deduped by name across
|
|
56
|
+
// Collect an op's params, deduped by name across its points.
|
|
57
|
+
//
|
|
58
|
+
// Points tagged with `select.$action` are sub-resource/action routes folded
|
|
59
|
+
// into the op (e.g. POST .../components/{component_id}/page_access_groups on
|
|
60
|
+
// the create op); they do not describe the op's canonical request payload,
|
|
61
|
+
// so they are excluded — unless the op consists only of action points.
|
|
62
|
+
//
|
|
63
|
+
// Requiredness merges by INTERSECTION: with several alternative canonical
|
|
64
|
+
// points, a param the caller must always supply is one required by every
|
|
65
|
+
// point; a param only some routes use is optional in the merged shape.
|
|
66
|
+
// (Union-required makes the common route untypeable — e.g. a plain
|
|
67
|
+
// list-by-parent-id call failing because sibling routes' ids are demanded —
|
|
68
|
+
// and steers callers into passing keys that flip runtime point dispatch to
|
|
69
|
+
// the wrong route.)
|
|
57
70
|
function opParams(op) {
|
|
58
|
-
|
|
71
|
+
let points = op && op.points ? (0, jostraca_1.each)(op.points) : [];
|
|
72
|
+
const canonical = points.filter((pt) => null == (pt && pt.select && pt.select['$action']));
|
|
73
|
+
if (0 < canonical.length) {
|
|
74
|
+
points = canonical;
|
|
75
|
+
}
|
|
59
76
|
const seen = {};
|
|
77
|
+
const requiredOnAll = {};
|
|
60
78
|
const out = [];
|
|
61
|
-
points.forEach((pt) => {
|
|
79
|
+
points.forEach((pt, pointIndex) => {
|
|
62
80
|
const params = pt && pt.args && pt.args.params ? (0, jostraca_1.each)(pt.args.params) : [];
|
|
81
|
+
const requiredHere = {};
|
|
63
82
|
params.forEach((p) => {
|
|
64
|
-
if (p && null != p.name
|
|
65
|
-
|
|
66
|
-
|
|
83
|
+
if (p && null != p.name) {
|
|
84
|
+
requiredHere[p.name] = false !== p.reqd;
|
|
85
|
+
if (!seen[p.name]) {
|
|
86
|
+
seen[p.name] = { ...p };
|
|
87
|
+
// A param first seen on a later point was absent earlier: optional.
|
|
88
|
+
requiredOnAll[p.name] = 0 === pointIndex;
|
|
89
|
+
out.push(seen[p.name]);
|
|
90
|
+
}
|
|
67
91
|
}
|
|
68
92
|
});
|
|
93
|
+
Object.keys(requiredOnAll).forEach((name) => {
|
|
94
|
+
if (true !== requiredHere[name]) {
|
|
95
|
+
requiredOnAll[name] = false;
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
out.forEach((p) => {
|
|
100
|
+
p.reqd = true === requiredOnAll[p.name];
|
|
69
101
|
});
|
|
70
102
|
return out;
|
|
71
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opShape.js","sourceRoot":"","sources":["../../src/helpers/opShape.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,sCAAsC;AACtC,EAAE;AACF,wEAAwE;AACxE,6DAA6D;AAC7D,2DAA2D;AAC3D,yEAAyE;AACzE,2EAA2E;AAC3E,EAAE;AACF,oBAAoB;AACpB,sDAAsD;AACtD,6EAA6E;AAC7E,+EAA+E;AAC/E,iEAAiE;AACjE,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF,mCAAmC;AACnC,0EAA0E;AAC1E,sCAAsC;AACtC,yEAAyE;AACzE,2EAA2E;AAC3E,qCAAqC;AACrC,EAAE;AACF,6EAA6E;AAC7E,4EAA4E;AAC5E,yEAAyE;;;
|
|
1
|
+
{"version":3,"file":"opShape.js","sourceRoot":"","sources":["../../src/helpers/opShape.ts"],"names":[],"mappings":"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"}
|
package/dist/sdkgen.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as JostracaModule from 'jostraca';
|
|
2
2
|
import type { ActionResult } from './types';
|
|
3
|
-
import { requirePath, isAuthActive } from './utility';
|
|
3
|
+
import { requirePath, isAuthActive, resolveAuthPrefix } from './utility';
|
|
4
4
|
import { Main } from './cmp/Main';
|
|
5
5
|
import { Deploy } from './cmp/Deploy';
|
|
6
6
|
import { Entity } from './cmp/Entity';
|
|
@@ -96,4 +96,4 @@ export declare const Inject: Component;
|
|
|
96
96
|
export declare const Line: Component;
|
|
97
97
|
export declare const Slot: Component;
|
|
98
98
|
export declare const List: Component;
|
|
99
|
-
export { Main, Deploy, License, Security, Changelog, Entity, Feature, Test, Readme, ReadmeTop, ReadmeInstall, ReadmeQuick, ReadmeErrors, ReadmeIntro, ReadmeModel, ReadmeOptions, ReadmeEntity, ReadmeHowto, ReadmeExplanation, ReadmeRef, FeatureHook, Jostraca, SdkGen, requirePath, isAuthActive, buildIdNames, getMatchEntries, collectDeps, canonToType, canonKey, OP_SUFFIX, opTypeName, opParams, opRequestShape, entityIdField, entityDataIdField, entityOps, entityPrimaryOp, isReservedName, safeVarName, packageName, installCommand, registryState, isPublished, registryName, vendorCommand, pkgDescription, nonAffiliation, keywords, envName, repoInfo, apiName, langLabel, PUBLISHER, PUBLISHER_URL, SECURITY_EMAIL, GENERATOR_URL, };
|
|
99
|
+
export { Main, Deploy, License, Security, Changelog, Entity, Feature, Test, Readme, ReadmeTop, ReadmeInstall, ReadmeQuick, ReadmeErrors, ReadmeIntro, ReadmeModel, ReadmeOptions, ReadmeEntity, ReadmeHowto, ReadmeExplanation, ReadmeRef, FeatureHook, Jostraca, SdkGen, requirePath, isAuthActive, resolveAuthPrefix, buildIdNames, getMatchEntries, collectDeps, canonToType, canonKey, OP_SUFFIX, opTypeName, opParams, opRequestShape, entityIdField, entityDataIdField, entityOps, entityPrimaryOp, isReservedName, safeVarName, packageName, installCommand, registryState, isPublished, registryName, vendorCommand, pkgDescription, nonAffiliation, keywords, envName, repoInfo, apiName, langLabel, PUBLISHER, PUBLISHER_URL, SECURITY_EMAIL, GENERATOR_URL, };
|
package/dist/sdkgen.js
CHANGED
|
@@ -37,8 +37,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
37
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
38
38
|
};
|
|
39
39
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
40
|
-
exports.
|
|
41
|
-
exports.GENERATOR_URL = exports.SECURITY_EMAIL = exports.PUBLISHER_URL = exports.PUBLISHER = exports.langLabel = exports.apiName = exports.repoInfo = exports.envName = exports.keywords = exports.nonAffiliation = exports.pkgDescription = exports.vendorCommand = exports.registryName = exports.isPublished = exports.registryState = exports.installCommand = exports.packageName = exports.safeVarName = exports.isReservedName = exports.entityPrimaryOp = exports.entityOps = exports.entityDataIdField = exports.entityIdField = exports.opRequestShape = exports.opParams = exports.opTypeName = exports.OP_SUFFIX = exports.canonKey = exports.canonToType = exports.collectDeps = void 0;
|
|
40
|
+
exports.buildIdNames = exports.resolveAuthPrefix = exports.isAuthActive = exports.requirePath = exports.Jostraca = exports.FeatureHook = exports.ReadmeRef = exports.ReadmeExplanation = exports.ReadmeHowto = exports.ReadmeEntity = exports.ReadmeOptions = exports.ReadmeModel = exports.ReadmeIntro = exports.ReadmeErrors = exports.ReadmeQuick = exports.ReadmeInstall = exports.ReadmeTop = exports.Readme = exports.Test = exports.Feature = exports.Entity = exports.Changelog = exports.Security = exports.License = exports.Deploy = exports.Main = exports.List = exports.Slot = exports.Line = exports.Inject = exports.Fragment = exports.Copy = exports.Content = exports.File = exports.Folder = exports.Project = exports.omap = exports.deep = exports.indent = exports.template = exports.getx = exports.get = exports.vmap = exports.cmap = exports.kebabify = exports.camelify = exports.snakify = exports.each = exports.names = exports.cmp = void 0;
|
|
41
|
+
exports.GENERATOR_URL = exports.SECURITY_EMAIL = exports.PUBLISHER_URL = exports.PUBLISHER = exports.langLabel = exports.apiName = exports.repoInfo = exports.envName = exports.keywords = exports.nonAffiliation = exports.pkgDescription = exports.vendorCommand = exports.registryName = exports.isPublished = exports.registryState = exports.installCommand = exports.packageName = exports.safeVarName = exports.isReservedName = exports.entityPrimaryOp = exports.entityOps = exports.entityDataIdField = exports.entityIdField = exports.opRequestShape = exports.opParams = exports.opTypeName = exports.OP_SUFFIX = exports.canonKey = exports.canonToType = exports.collectDeps = exports.getMatchEntries = void 0;
|
|
42
42
|
exports.SdkGen = SdkGen;
|
|
43
43
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
44
44
|
const node_path_1 = __importDefault(require("node:path"));
|
|
@@ -50,6 +50,7 @@ const util_2 = require("@voxgig/util");
|
|
|
50
50
|
const utility_1 = require("./utility");
|
|
51
51
|
Object.defineProperty(exports, "requirePath", { enumerable: true, get: function () { return utility_1.requirePath; } });
|
|
52
52
|
Object.defineProperty(exports, "isAuthActive", { enumerable: true, get: function () { return utility_1.isAuthActive; } });
|
|
53
|
+
Object.defineProperty(exports, "resolveAuthPrefix", { enumerable: true, get: function () { return utility_1.resolveAuthPrefix; } });
|
|
53
54
|
const Main_1 = require("./cmp/Main");
|
|
54
55
|
Object.defineProperty(exports, "Main", { enumerable: true, get: function () { return Main_1.Main; } });
|
|
55
56
|
const Deploy_1 = require("./cmp/Deploy");
|
|
@@ -216,7 +217,7 @@ function SdkGen(opts) {
|
|
|
216
217
|
return ctx;
|
|
217
218
|
}
|
|
218
219
|
function resolveModel() {
|
|
219
|
-
const path = './model/sdk.
|
|
220
|
+
const path = './model/sdk.aontu';
|
|
220
221
|
const errs = [];
|
|
221
222
|
if (null == aontu) {
|
|
222
223
|
aontu = new aontu_1.Aontu();
|
|
@@ -269,7 +270,7 @@ SdkGen.makeBuild = async function (opts) {
|
|
|
269
270
|
root: opts.root,
|
|
270
271
|
def: opts.def || 'no-def',
|
|
271
272
|
kind: 'openapi-3',
|
|
272
|
-
model: opts.model ? (opts.model.folder + '/api.
|
|
273
|
+
model: opts.model ? (opts.model.folder + '/api.aontu') : 'no-model',
|
|
273
274
|
meta: opts.meta || {},
|
|
274
275
|
};
|
|
275
276
|
return async function build(model, build, ctx) {
|
package/dist/sdkgen.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdkgen.js","sourceRoot":"","sources":["../src/sdkgen.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8avD,wBAAM;AA5aR,sDAAwB;AACxB,0DAA4B;AAE5B,uCAA+C;AAE/C,mCAA+B;AAC/B,yDAA0C;AAC1C,iCAA6B;AAE7B,uCAGqB;AAOrB,
|
|
1
|
+
{"version":3,"file":"sdkgen.js","sourceRoot":"","sources":["../src/sdkgen.ts"],"names":[],"mappings":"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"}
|
package/dist/utility.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
declare function resolvePath(ctx$: any, path: string): any;
|
|
2
2
|
declare function isAuthActive(model: any): boolean;
|
|
3
|
+
declare function resolveAuthPrefix(model: any): string;
|
|
3
4
|
declare function requirePath(ctx$: any, path: string, flags?: {
|
|
4
5
|
ignore?: boolean;
|
|
5
6
|
}): any;
|
|
6
7
|
declare class SdkGenError extends Error {
|
|
7
8
|
constructor(...args: any[]);
|
|
8
9
|
}
|
|
9
|
-
export { resolvePath, requirePath, isAuthActive, SdkGenError, };
|
|
10
|
+
export { resolvePath, requirePath, isAuthActive, resolveAuthPrefix, SdkGenError, };
|
package/dist/utility.js
CHANGED
|
@@ -7,6 +7,7 @@ exports.SdkGenError = void 0;
|
|
|
7
7
|
exports.resolvePath = resolvePath;
|
|
8
8
|
exports.requirePath = requirePath;
|
|
9
9
|
exports.isAuthActive = isAuthActive;
|
|
10
|
+
exports.resolveAuthPrefix = resolveAuthPrefix;
|
|
10
11
|
const node_path_1 = __importDefault(require("node:path"));
|
|
11
12
|
const apidef_1 = require("@voxgig/apidef");
|
|
12
13
|
function resolvePath(ctx$, path) {
|
|
@@ -16,7 +17,7 @@ function resolvePath(ctx$, path) {
|
|
|
16
17
|
// True unless the model declares auth off. Templates use this to gate
|
|
17
18
|
// apikey-related code, docs, and examples for public APIs that need no
|
|
18
19
|
// authentication. Two opt-outs, in priority order:
|
|
19
|
-
// 1. main.kit.info.auth: false (user-facing, set in api-info.
|
|
20
|
+
// 1. main.kit.info.auth: false (user-facing, set in api-info.aontu)
|
|
20
21
|
// 2. main.kit.config.auth.active: false
|
|
21
22
|
function isAuthActive(model) {
|
|
22
23
|
const info = (0, apidef_1.getModelPath)(model, `main.${apidef_1.KIT}.info`, { only_active: false, required: false });
|
|
@@ -25,6 +26,24 @@ function isAuthActive(model) {
|
|
|
25
26
|
const auth = (0, apidef_1.getModelPath)(model, `main.${apidef_1.KIT}.config.auth`, { only_active: false, required: false });
|
|
26
27
|
return null == auth || false !== auth.active;
|
|
27
28
|
}
|
|
29
|
+
// The credential prefix for the Authorization header value, resolved in
|
|
30
|
+
// priority order:
|
|
31
|
+
// 1. main.kit.config.auth.prefix (per-SDK user override)
|
|
32
|
+
// 2. main.kit.info.security.prefix (spec-derived, set by apidef from the
|
|
33
|
+
// API's securityScheme — e.g. 'OAuth' for Statuspage)
|
|
34
|
+
// 3. 'Bearer' (conventional fallback)
|
|
35
|
+
// '' is a valid resolved value: it means a raw credential with no prefix
|
|
36
|
+
// (e.g. an apiKey scheme in a custom header). Config generators for every
|
|
37
|
+
// language target must use this instead of hardcoding 'Bearer'.
|
|
38
|
+
function resolveAuthPrefix(model) {
|
|
39
|
+
const auth = (0, apidef_1.getModelPath)(model, `main.${apidef_1.KIT}.config.auth`, { only_active: false, required: false });
|
|
40
|
+
if (null != auth && null != auth.prefix)
|
|
41
|
+
return String(auth.prefix);
|
|
42
|
+
const security = (0, apidef_1.getModelPath)(model, `main.${apidef_1.KIT}.info.security`, { only_active: false, required: false });
|
|
43
|
+
if (null != security && null != security.prefix)
|
|
44
|
+
return String(security.prefix);
|
|
45
|
+
return 'Bearer';
|
|
46
|
+
}
|
|
28
47
|
function requirePath(ctx$, path, flags) {
|
|
29
48
|
const fullpath = resolvePath(ctx$, path);
|
|
30
49
|
const ignore = null == flags?.ignore ? false : flags.ignore;
|
package/dist/utility.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utility.js","sourceRoot":"","sources":["../src/utility.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"utility.js","sourceRoot":"","sources":["../src/utility.ts"],"names":[],"mappings":"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"}
|
package/model/sdkgen.aontu
CHANGED
|
@@ -10,7 +10,7 @@ main: def: {
|
|
|
10
10
|
# SDK but not listed here are appended afterwards in spec-defined
|
|
11
11
|
# order. Override per-SDK by setting
|
|
12
12
|
# `main.kit.config.docs_order: ['py','ts',...]` in
|
|
13
|
-
# `<sdk>/.sdk/model/config.
|
|
13
|
+
# `<sdk>/.sdk/model/config.aontu`.
|
|
14
14
|
main: kit: config: docs_order: *['ts','py','php','go','rb','lua'] | [&: string]
|
|
15
15
|
|
|
16
16
|
main: kit: target: &: {
|
package/package.json
CHANGED
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
cmp,
|
|
11
11
|
each,
|
|
12
12
|
isAuthActive,
|
|
13
|
+
resolveAuthPrefix,
|
|
13
14
|
} from '@voxgig/sdkgen'
|
|
14
15
|
|
|
15
16
|
|
|
@@ -39,8 +40,8 @@ const Config = cmp(async function Config(props: any) {
|
|
|
39
40
|
const headers = getModelPath(model, `main.${KIT}.config.headers`) || {}
|
|
40
41
|
|
|
41
42
|
const authActive = isAuthActive(model)
|
|
42
|
-
|
|
43
|
-
|
|
43
|
+
// config.auth.prefix override -> spec-derived info.security.prefix -> 'Bearer'
|
|
44
|
+
const authPrefix = resolveAuthPrefix(model)
|
|
44
45
|
|
|
45
46
|
let baseUrl = ''
|
|
46
47
|
try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
|