@voxgig/apidef 2.0.0 → 2.0.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/dist/apidef.js +0 -19
- package/dist/apidef.js.map +1 -1
- package/dist/builder/flow/flowHeuristic01.js +37 -9
- package/dist/builder/flow/flowHeuristic01.js.map +1 -1
- package/dist/builder/flow.js +3 -3
- package/dist/builder/flow.js.map +1 -1
- package/dist/guide/heuristic01.js +51 -110
- package/dist/guide/heuristic01.js.map +1 -1
- package/dist/guide.js +2 -4
- package/dist/guide.js.map +1 -1
- package/dist/transform/entity.js +21 -2
- package/dist/transform/entity.js.map +1 -1
- package/dist/transform/operation.js +46 -27
- package/dist/transform/operation.js.map +1 -1
- package/dist/transform.js +1 -2
- package/dist/transform.js.map +1 -1
- package/dist/types.d.ts +9 -0
- package/dist/types.js +3 -2
- package/dist/types.js.map +1 -1
- package/dist/utility.d.ts +2 -1
- package/dist/utility.js +61 -36
- package/dist/utility.js.map +1 -1
- package/package.json +4 -4
- package/src/apidef.ts +0 -31
- package/src/builder/flow/flowHeuristic01.ts +44 -9
- package/src/builder/flow.ts +4 -3
- package/src/guide/heuristic01.ts +76 -123
- package/src/guide.ts +2 -6
- package/src/transform/entity.ts +26 -3
- package/src/transform/operation.ts +90 -38
- package/src/transform.ts +1 -2
- package/src/types.ts +3 -2
- package/src/utility.ts +79 -1
- package/src/builder/flow/flowHeuristic01.ts~ +0 -45
|
@@ -7,26 +7,32 @@ const operationTransform = async function (ctx) {
|
|
|
7
7
|
const { apimodel, model, def } = ctx;
|
|
8
8
|
const guide = model.main.api.guide;
|
|
9
9
|
let msg = 'operations: ';
|
|
10
|
-
const paramBuilder = (paramMap, paramDef, entityModel, pathdef, op, path, entity, model) => {
|
|
11
|
-
paramMap[paramDef.name] = {
|
|
10
|
+
const paramBuilder = (paramMap, paramDef, opModel, entityModel, pathdef, op, path, entity, model) => {
|
|
11
|
+
const paramSpec = paramMap[paramDef.name] = {
|
|
12
12
|
required: paramDef.required
|
|
13
13
|
};
|
|
14
|
-
(0, transform_1.fixName)(
|
|
14
|
+
(0, transform_1.fixName)(paramSpec, paramDef.name);
|
|
15
15
|
const type = paramDef.schema ? paramDef.schema.type : paramDef.type;
|
|
16
|
-
(0, transform_1.fixName)(
|
|
16
|
+
(0, transform_1.fixName)(paramSpec, type, 'type');
|
|
17
|
+
// Path params are always required.
|
|
18
|
+
opModel.validate.params[paramDef.name] = `\`$${paramSpec.TYPE}\``;
|
|
17
19
|
};
|
|
18
|
-
const queryBuilder = (queryMap, queryDef, entityModel, pathdef, op, path, entity, model) => {
|
|
19
|
-
queryMap[queryDef.name] = {
|
|
20
|
+
const queryBuilder = (queryMap, queryDef, opModel, entityModel, pathdef, op, path, entity, model) => {
|
|
21
|
+
const querySpec = queryMap[queryDef.name] = {
|
|
20
22
|
required: queryDef.required
|
|
21
23
|
};
|
|
22
24
|
(0, transform_1.fixName)(queryMap[queryDef.name], queryDef.name);
|
|
23
25
|
const type = queryDef.schema ? queryDef.schema.type : queryDef.type;
|
|
24
26
|
(0, transform_1.fixName)(queryMap[queryDef.name], type, 'type');
|
|
27
|
+
if (queryDef.required) {
|
|
28
|
+
opModel.validate.params[queryDef.name] = `\`$${querySpec.TYPE}\``;
|
|
29
|
+
}
|
|
25
30
|
};
|
|
26
31
|
// Resolve the JSON structure of the request or response.
|
|
27
32
|
// NOTE: uses heuristics.
|
|
28
33
|
const resolveTransform = (entityModel, op, kind, direction, pathdef) => {
|
|
29
34
|
let out;
|
|
35
|
+
let why = 'none';
|
|
30
36
|
if (null != op.transform?.[direction]) {
|
|
31
37
|
out = op.transform[direction];
|
|
32
38
|
}
|
|
@@ -34,29 +40,28 @@ const operationTransform = async function (ctx) {
|
|
|
34
40
|
const method = op.method;
|
|
35
41
|
const mdef = pathdef[method];
|
|
36
42
|
// TODO: fix getx
|
|
37
|
-
const content = 'res' === kind ?
|
|
43
|
+
// const content = 'res' === kind ?
|
|
44
|
+
const content = 'resform' === direction ?
|
|
38
45
|
((0, jostraca_1.getx)(mdef, 'responses.200.content') ||
|
|
39
46
|
(0, jostraca_1.getx)(mdef, 'responses.201.content')) :
|
|
40
47
|
(0, jostraca_1.getx)(mdef, 'requestBody.content');
|
|
41
|
-
// console.log(entityModel)
|
|
42
|
-
// console.log(mdef)
|
|
43
|
-
// console.log(getx(mdef, 'responses.200.content'))
|
|
44
|
-
// console.log(kind, method, pathdef, content)
|
|
45
48
|
if (content) {
|
|
46
49
|
const schema = content['application/json']?.schema;
|
|
47
50
|
const propkeys = null == schema?.properties ? [] : Object.keys(schema.properties);
|
|
48
51
|
const resolveDirectionTransform = 'resform' === direction ? resolveResponseTransform : resolveRequestTransform;
|
|
49
|
-
|
|
52
|
+
[out, why]
|
|
53
|
+
= resolveDirectionTransform(entityModel, op, kind, direction, method, mdef, content, schema, propkeys);
|
|
50
54
|
// out = JSON.stringify(transform)
|
|
51
|
-
out = transform
|
|
55
|
+
// out = transform
|
|
52
56
|
}
|
|
53
57
|
else {
|
|
54
58
|
out = 'res' === kind ? '`body`' : '`reqdata`';
|
|
55
59
|
}
|
|
56
60
|
}
|
|
57
|
-
return out;
|
|
61
|
+
return [out, why];
|
|
58
62
|
};
|
|
59
|
-
const resolveResponseTransform = (op, kind, method, mdef, content, schema, propkeys) => {
|
|
63
|
+
const resolveResponseTransform = (entityModel, op, kind, direction, method, mdef, content, schema, propkeys) => {
|
|
64
|
+
let why = 'default';
|
|
60
65
|
let transform = '`body`';
|
|
61
66
|
if (null == content || null == schema || null == propkeys) {
|
|
62
67
|
return transform;
|
|
@@ -65,12 +70,14 @@ const operationTransform = async function (ctx) {
|
|
|
65
70
|
if ('list' === opname) {
|
|
66
71
|
if ('array' !== schema.type) {
|
|
67
72
|
if (1 === propkeys.length) {
|
|
73
|
+
why = 'list-single-prop:' + propkeys[0];
|
|
68
74
|
transform = '`body.' + propkeys[0] + '`';
|
|
69
75
|
}
|
|
70
76
|
else {
|
|
71
77
|
// Use sub property that is an array
|
|
72
78
|
for (let pk of propkeys) {
|
|
73
79
|
if ('array' === schema.properties[pk]?.type) {
|
|
80
|
+
why = 'list-single-array:' + pk;
|
|
74
81
|
transform = '`body.' + pk + '`';
|
|
75
82
|
break;
|
|
76
83
|
}
|
|
@@ -82,11 +89,13 @@ const operationTransform = async function (ctx) {
|
|
|
82
89
|
if ('object' === schema.type) {
|
|
83
90
|
if (null == schema.properties.id) {
|
|
84
91
|
if (1 === propkeys.length) {
|
|
92
|
+
why = 'map-single-prop:' + propkeys[0];
|
|
85
93
|
transform = '`body.' + propkeys[0] + '`';
|
|
86
94
|
}
|
|
87
95
|
else {
|
|
88
96
|
for (let pk of propkeys) {
|
|
89
97
|
if (schema.properties[pk].properties?.id) {
|
|
98
|
+
why = 'map-sub-prop:' + pk;
|
|
90
99
|
transform = '`body.' + pk + '`';
|
|
91
100
|
break;
|
|
92
101
|
}
|
|
@@ -95,10 +104,11 @@ const operationTransform = async function (ctx) {
|
|
|
95
104
|
}
|
|
96
105
|
}
|
|
97
106
|
}
|
|
98
|
-
return transform;
|
|
107
|
+
return [transform, why];
|
|
99
108
|
};
|
|
100
|
-
const resolveRequestTransform = (op, kind, method, mdef, content, schema, propkeys) => {
|
|
109
|
+
const resolveRequestTransform = (entityModel, op, kind, direction, method, mdef, content, schema, propkeys) => {
|
|
101
110
|
let transform = '`data`';
|
|
111
|
+
let why = 'default';
|
|
102
112
|
if (null == content || null == schema || null == propkeys) {
|
|
103
113
|
return transform;
|
|
104
114
|
}
|
|
@@ -106,12 +116,14 @@ const operationTransform = async function (ctx) {
|
|
|
106
116
|
if ('list' === opname) {
|
|
107
117
|
if ('array' !== schema.type) {
|
|
108
118
|
if (1 === propkeys.length) {
|
|
119
|
+
why = 'list-single-prop:' + propkeys[0];
|
|
109
120
|
transform = { [propkeys[0]]: '`data`' };
|
|
110
121
|
}
|
|
111
122
|
else {
|
|
112
123
|
// Use sub property that is an array
|
|
113
124
|
for (let pk of propkeys) {
|
|
114
125
|
if ('array' === schema.properties[pk]?.type) {
|
|
126
|
+
why = 'list-single-array:' + pk;
|
|
115
127
|
transform = { [pk]: '`data`' };
|
|
116
128
|
break;
|
|
117
129
|
}
|
|
@@ -123,11 +135,13 @@ const operationTransform = async function (ctx) {
|
|
|
123
135
|
if ('object' === schema.type) {
|
|
124
136
|
if (null == schema.properties.id) {
|
|
125
137
|
if (1 === propkeys.length) {
|
|
138
|
+
why = 'map-single-prop:' + propkeys[0];
|
|
126
139
|
transform = { [propkeys[0]]: '`data`' };
|
|
127
140
|
}
|
|
128
141
|
else {
|
|
129
142
|
for (let pk of propkeys) {
|
|
130
143
|
if (schema.properties[pk].properties?.id) {
|
|
144
|
+
why = 'map-sub-prop:' + pk;
|
|
131
145
|
transform = { [pk]: '`data`' };
|
|
132
146
|
break;
|
|
133
147
|
}
|
|
@@ -136,38 +150,43 @@ const operationTransform = async function (ctx) {
|
|
|
136
150
|
}
|
|
137
151
|
}
|
|
138
152
|
}
|
|
139
|
-
return transform;
|
|
153
|
+
return [transform, why];
|
|
140
154
|
};
|
|
141
155
|
const opBuilder = {
|
|
142
156
|
any: (entityModel, pathdef, op, path, entity, model) => {
|
|
143
157
|
const opname = op.key$;
|
|
144
158
|
const method = op.method;
|
|
145
159
|
const kind = transform_1.OPKIND[opname];
|
|
146
|
-
const
|
|
160
|
+
const [resform, resform_COMMENT] = resolveTransform(entityModel, op, kind, 'resform', pathdef);
|
|
161
|
+
const [reqform, reqform_COMMENT] = resolveTransform(entityModel, op, kind, 'reqform', pathdef);
|
|
162
|
+
const opModel = entityModel.op[opname] = {
|
|
147
163
|
path: path.key$,
|
|
148
164
|
method,
|
|
149
165
|
kind,
|
|
150
166
|
param: {},
|
|
151
167
|
query: {},
|
|
152
|
-
|
|
153
|
-
resform
|
|
154
|
-
|
|
155
|
-
|
|
168
|
+
resform_COMMENT: 'derivation: ' + resform_COMMENT,
|
|
169
|
+
resform,
|
|
170
|
+
reqform_COMMENT: 'derivation: ' + reqform_COMMENT,
|
|
171
|
+
reqform,
|
|
172
|
+
validate: {
|
|
173
|
+
params: { '`$OPEN`': true }
|
|
174
|
+
}
|
|
156
175
|
};
|
|
157
|
-
(0, transform_1.fixName)(
|
|
176
|
+
(0, transform_1.fixName)(opModel, op.key$);
|
|
158
177
|
// Params are in the path
|
|
159
178
|
if (0 < path.params$.length) {
|
|
160
179
|
let params = (0, jostraca_1.getx)(pathdef[method], 'parameters?in=path') || [];
|
|
161
180
|
if (Array.isArray(params)) {
|
|
162
|
-
params.reduce((a, p) => (paramBuilder(a, p, entityModel, pathdef, op, path, entity, model), a),
|
|
181
|
+
params.reduce((a, p) => (paramBuilder(a, p, opModel, entityModel, pathdef, op, path, entity, model), a), opModel.param);
|
|
163
182
|
}
|
|
164
183
|
}
|
|
165
184
|
// Queries are after the ?
|
|
166
185
|
let queries = (0, jostraca_1.getx)(pathdef[op.val$], 'parameters?in!=path') || [];
|
|
167
186
|
if (Array.isArray(queries)) {
|
|
168
|
-
queries.reduce((a, p) => (queryBuilder(a, p, entityModel, pathdef, op, path, entity, model), a),
|
|
187
|
+
queries.reduce((a, p) => (queryBuilder(a, p, opModel, entityModel, pathdef, op, path, entity, model), a), opModel.query);
|
|
169
188
|
}
|
|
170
|
-
return
|
|
189
|
+
return opModel;
|
|
171
190
|
},
|
|
172
191
|
list: (entityModel, pathdef, op, path, entity, model) => {
|
|
173
192
|
return opBuilder.any(entityModel, pathdef, op, path, entity, model);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation.js","sourceRoot":"","sources":["../../src/transform/operation.ts"],"names":[],"mappings":";;;AAEA,uCAAqC;AAIrC,4CAA8C;AAI9C,MAAM,kBAAkB,GAAG,KAAK,WAC9B,GAAQ;IAMR,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA;IACpC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAA;IAElC,IAAI,GAAG,GAAG,cAAc,CAAA;IAExB,MAAM,YAAY,GAAG,
|
|
1
|
+
{"version":3,"file":"operation.js","sourceRoot":"","sources":["../../src/transform/operation.ts"],"names":[],"mappings":"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"}
|
package/dist/transform.js
CHANGED
|
@@ -60,7 +60,6 @@ async function resolveTransforms(ctx) {
|
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
catch (err) {
|
|
63
|
-
console.log(err);
|
|
64
63
|
throw err;
|
|
65
64
|
}
|
|
66
65
|
return tspec;
|
|
@@ -115,7 +114,7 @@ transforms, apimodel, def) {
|
|
|
115
114
|
}
|
|
116
115
|
catch (err) {
|
|
117
116
|
// TODO: fix: this error does not get printed
|
|
118
|
-
console.
|
|
117
|
+
console.error(err);
|
|
119
118
|
pres.ok = false;
|
|
120
119
|
pres.msg += transform.name + ': ' + err.message + '\n';
|
|
121
120
|
pres.results.push({
|
package/dist/transform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform.js","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":";AAAA,4CAA4C;;;;;;
|
|
1
|
+
{"version":3,"file":"transform.js","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -21,6 +21,7 @@ declare const ModelShape: {
|
|
|
21
21
|
def: {};
|
|
22
22
|
api: {
|
|
23
23
|
guide: {};
|
|
24
|
+
entity: {};
|
|
24
25
|
};
|
|
25
26
|
};
|
|
26
27
|
};
|
|
@@ -32,6 +33,7 @@ declare const ModelShape: {
|
|
|
32
33
|
def: {};
|
|
33
34
|
api: {
|
|
34
35
|
guide: {};
|
|
36
|
+
entity: {};
|
|
35
37
|
};
|
|
36
38
|
};
|
|
37
39
|
};
|
|
@@ -81,6 +83,7 @@ declare const ModelShape: {
|
|
|
81
83
|
def: {};
|
|
82
84
|
api: {
|
|
83
85
|
guide: {};
|
|
86
|
+
entity: {};
|
|
84
87
|
};
|
|
85
88
|
};
|
|
86
89
|
}>;
|
|
@@ -116,6 +119,7 @@ declare const OpenModelShape: {
|
|
|
116
119
|
def: {};
|
|
117
120
|
api: {
|
|
118
121
|
guide: {};
|
|
122
|
+
entity: {};
|
|
119
123
|
};
|
|
120
124
|
};
|
|
121
125
|
};
|
|
@@ -127,6 +131,7 @@ declare const OpenModelShape: {
|
|
|
127
131
|
def: {};
|
|
128
132
|
api: {
|
|
129
133
|
guide: {};
|
|
134
|
+
entity: {};
|
|
130
135
|
};
|
|
131
136
|
};
|
|
132
137
|
};
|
|
@@ -176,6 +181,7 @@ declare const OpenModelShape: {
|
|
|
176
181
|
def: {};
|
|
177
182
|
api: {
|
|
178
183
|
guide: {};
|
|
184
|
+
entity: {};
|
|
179
185
|
};
|
|
180
186
|
};
|
|
181
187
|
}>;
|
|
@@ -234,6 +240,7 @@ declare const OpenModelShape: {
|
|
|
234
240
|
def: {};
|
|
235
241
|
api: {
|
|
236
242
|
guide: {};
|
|
243
|
+
entity: {};
|
|
237
244
|
};
|
|
238
245
|
};
|
|
239
246
|
};
|
|
@@ -245,6 +252,7 @@ declare const OpenModelShape: {
|
|
|
245
252
|
def: {};
|
|
246
253
|
api: {
|
|
247
254
|
guide: {};
|
|
255
|
+
entity: {};
|
|
248
256
|
};
|
|
249
257
|
};
|
|
250
258
|
};
|
|
@@ -294,6 +302,7 @@ declare const OpenModelShape: {
|
|
|
294
302
|
def: {};
|
|
295
303
|
api: {
|
|
296
304
|
guide: {};
|
|
305
|
+
entity: {};
|
|
297
306
|
};
|
|
298
307
|
};
|
|
299
308
|
}>;
|
package/dist/types.js
CHANGED
|
@@ -10,11 +10,12 @@ const ModelShape = (0, gubu_1.Gubu)({
|
|
|
10
10
|
sdk: {},
|
|
11
11
|
def: {},
|
|
12
12
|
api: {
|
|
13
|
-
guide: {}
|
|
13
|
+
guide: {},
|
|
14
|
+
entity: {},
|
|
14
15
|
},
|
|
15
16
|
}
|
|
16
17
|
});
|
|
17
|
-
const OpenModelShape = (0, gubu_1.Gubu)((0, gubu_1.Open)(ModelShape));
|
|
18
|
+
const OpenModelShape = (0, gubu_1.Gubu)((0, gubu_1.Open)(ModelShape), { name: 'Model' });
|
|
18
19
|
exports.OpenModelShape = OpenModelShape;
|
|
19
20
|
const BuildShape = (0, gubu_1.Gubu)({
|
|
20
21
|
spec: {
|
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA,4CAA4C;;;AAK5C,+BAAsC;AAmBtC,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,MAAM;IACX,IAAI,EAAE;QACJ,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,EAAE;QACP,GAAG,EAAE;YACH,KAAK,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA,4CAA4C;;;AAK5C,+BAAsC;AAmBtC,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,MAAM;IACX,IAAI,EAAE;QACJ,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,EAAE;QACP,GAAG,EAAE;YACH,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACX;KACF;CACF,CAAC,CAAA;AACF,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;AAuC9D,wCAAc;AAlChB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC;IACtB,IAAI,EAAE;QACJ,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,EAAE;QACR,KAAK,EAAE,EAAE;QACT,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,EAAE;QACP,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,EAAE;QACP,EAAE,EAAE,IAAA,UAAG,GAAE;QACT,KAAK,EAAE;YACL,GAAG,EAAE,IAAI;YACT,GAAG,EAAE,IAAI;YACT,GAAG,EAAE,IAAI;SACV;KACF;CACF,CAAC,CAAA;AACF,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,UAAU,CAAC,CAAC,CAAA;AAkB3C,wCAAc"}
|
package/dist/utility.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { FsUtil, Log } from './types';
|
|
2
2
|
declare function loadFile(path: string, what: string, fs: FsUtil, log: Log): string;
|
|
3
3
|
declare function formatJsonSrc(jsonsrc: string): string;
|
|
4
|
-
|
|
4
|
+
declare function depluralize(word: string): string;
|
|
5
|
+
export { loadFile, formatJsonSrc, depluralize, };
|
package/dist/utility.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.loadFile = loadFile;
|
|
7
4
|
exports.formatJsonSrc = formatJsonSrc;
|
|
8
|
-
|
|
5
|
+
exports.depluralize = depluralize;
|
|
9
6
|
function loadFile(path, what, fs, log) {
|
|
10
7
|
try {
|
|
11
8
|
const source = fs.readFileSync(path, 'utf8');
|
|
@@ -19,41 +16,69 @@ function loadFile(path, what, fs, log) {
|
|
|
19
16
|
function formatJsonSrc(jsonsrc) {
|
|
20
17
|
return jsonsrc
|
|
21
18
|
.replace(/"([a-zA-Z_][a-zA-Z_0-9]*)": /g, '$1: ')
|
|
22
|
-
.replace(/},/g, '}\n')
|
|
19
|
+
.replace(/},/g, '}\n')
|
|
20
|
+
// .replace(/([a-zA-Z_][a-zA-Z_0-9]*)_COMMENT:/g, '# $1')
|
|
21
|
+
.replace(/\n(\s*)([a-zA-Z_][a-zA-Z_0-9]*)_COMMENT:\s*"(.*)",/g, '\n\n$1# $2 $3');
|
|
23
22
|
}
|
|
24
|
-
function
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
23
|
+
function depluralize(word) {
|
|
24
|
+
if (!word || word.length === 0) {
|
|
25
|
+
return word;
|
|
26
|
+
}
|
|
27
|
+
// Common irregular plurals
|
|
28
|
+
const irregulars = {
|
|
29
|
+
'children': 'child',
|
|
30
|
+
'men': 'man',
|
|
31
|
+
'women': 'woman',
|
|
32
|
+
'teeth': 'tooth',
|
|
33
|
+
'feet': 'foot',
|
|
34
|
+
'geese': 'goose',
|
|
35
|
+
'mice': 'mouse',
|
|
36
|
+
'people': 'person',
|
|
37
|
+
'data': 'datum',
|
|
38
|
+
'criteria': 'criterion',
|
|
39
|
+
'phenomena': 'phenomenon',
|
|
40
|
+
'indices': 'index',
|
|
41
|
+
'matrices': 'matrix',
|
|
42
|
+
'vertices': 'vertex',
|
|
43
|
+
'analyses': 'analysis',
|
|
44
|
+
'axes': 'axis',
|
|
45
|
+
'crises': 'crisis',
|
|
46
|
+
'diagnoses': 'diagnosis',
|
|
47
|
+
'oases': 'oasis',
|
|
48
|
+
'theses': 'thesis',
|
|
49
|
+
'appendices': 'appendix'
|
|
50
|
+
};
|
|
51
|
+
if (irregulars[word]) {
|
|
52
|
+
return irregulars[word];
|
|
53
|
+
}
|
|
54
|
+
// Rules for regular plurals (applied in order)
|
|
55
|
+
// -ies -> -y (cities -> city)
|
|
56
|
+
if (word.endsWith('ies') && word.length > 3) {
|
|
57
|
+
return word.slice(0, -3) + 'y';
|
|
58
|
+
}
|
|
59
|
+
// -ves -> -f or -fe (wolves -> wolf, knives -> knife)
|
|
60
|
+
if (word.endsWith('ves')) {
|
|
61
|
+
const stem = word.slice(0, -3);
|
|
62
|
+
// Check if it should be -fe (like knife, wife, life)
|
|
63
|
+
if (['kni', 'wi', 'li'].includes(stem)) {
|
|
64
|
+
return stem + 'fe';
|
|
48
65
|
}
|
|
66
|
+
return stem + 'f';
|
|
49
67
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
68
|
+
// -oes -> -o (potatoes -> potato)
|
|
69
|
+
if (word.endsWith('oes')) {
|
|
70
|
+
return word.slice(0, -2);
|
|
71
|
+
}
|
|
72
|
+
// -ses, -xes, -zes, -shes, -ches -> remove -es (boxes -> box)
|
|
73
|
+
if (word.endsWith('ses') || word.endsWith('xes') || word.endsWith('zes') ||
|
|
74
|
+
word.endsWith('shes') || word.endsWith('ches')) {
|
|
75
|
+
return word.slice(0, -2);
|
|
76
|
+
}
|
|
77
|
+
// -s -> remove -s (cats -> cat)
|
|
78
|
+
if (word.endsWith('s') && !word.endsWith('ss')) {
|
|
79
|
+
return word.slice(0, -1);
|
|
57
80
|
}
|
|
81
|
+
// If none of the rules apply, return as is
|
|
82
|
+
return word;
|
|
58
83
|
}
|
|
59
84
|
//# sourceMappingURL=utility.js.map
|
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@voxgig/apidef",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.2",
|
|
4
4
|
"main": "dist/apidef.js",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"types": "dist/apidef.d.ts",
|
|
@@ -41,9 +41,9 @@
|
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@hapi/code": "^9.0.3",
|
|
43
43
|
"@types/js-yaml": "^4.0.9",
|
|
44
|
-
"@types/node": "24.0.
|
|
44
|
+
"@types/node": "24.0.12",
|
|
45
45
|
"aontu": "^0.28.0",
|
|
46
|
-
"esbuild": "^0.25.
|
|
46
|
+
"esbuild": "^0.25.6",
|
|
47
47
|
"json-schema-to-ts": "^3.1.1",
|
|
48
48
|
"memfs": "^4.17.2",
|
|
49
49
|
"patch-package": "^8.0.0",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
53
|
"@redocly/openapi-core": "^1.34.3",
|
|
54
|
-
"@voxgig/struct": "^0.0.
|
|
54
|
+
"@voxgig/struct": "^0.0.4",
|
|
55
55
|
"@voxgig/util": "^0.0.10",
|
|
56
56
|
"chokidar": "^4.0.3",
|
|
57
57
|
"gubu": "^9.0.0",
|
package/src/apidef.ts
CHANGED
|
@@ -33,8 +33,6 @@ import {
|
|
|
33
33
|
|
|
34
34
|
|
|
35
35
|
import {
|
|
36
|
-
resolveTransforms,
|
|
37
|
-
processTransforms,
|
|
38
36
|
fixName,
|
|
39
37
|
} from './transform'
|
|
40
38
|
|
|
@@ -71,9 +69,6 @@ function ApiDef(opts: ApiDefOptions) {
|
|
|
71
69
|
async function generate(spec: any) {
|
|
72
70
|
const start = Date.now()
|
|
73
71
|
|
|
74
|
-
// console.log('APIDEF GENERATE')
|
|
75
|
-
// console.dir(spec, { depth: null })
|
|
76
|
-
|
|
77
72
|
const model: Model = OpenModelShape(spec.model)
|
|
78
73
|
const build: Build = OpenBuildShape(spec.build)
|
|
79
74
|
|
|
@@ -129,36 +124,12 @@ function ApiDef(opts: ApiDefOptions) {
|
|
|
129
124
|
field: fieldTransform,
|
|
130
125
|
})
|
|
131
126
|
|
|
132
|
-
// log.debug({
|
|
133
|
-
// point: 'transform', spec: transformSpec,
|
|
134
|
-
// note: log.levelVal <= 20 ? inspect(transformSpec) : ''
|
|
135
|
-
// })
|
|
136
|
-
|
|
137
|
-
// const processResult = await processTransforms(ctx, transforms, apimodel, def)
|
|
138
|
-
|
|
139
|
-
// if (!processResult.ok) {
|
|
140
|
-
// log.error({
|
|
141
|
-
// fail: 'process', point: 'transform-result',
|
|
142
|
-
// result: processResult, note: processResult.msg,
|
|
143
|
-
// err: processResult.results[0]?.err
|
|
144
|
-
// })
|
|
145
|
-
|
|
146
|
-
// return { ok: false, name: 'apidef', processResult }
|
|
147
|
-
// }
|
|
148
|
-
|
|
149
|
-
|
|
150
127
|
const builders = await resolveElements(ctx, 'builder', 'standard', {
|
|
151
128
|
entity: makeEntityBuilder,
|
|
152
129
|
flow: makeFlowBuilder,
|
|
153
130
|
})
|
|
154
131
|
|
|
155
132
|
|
|
156
|
-
|
|
157
|
-
// const entityBuilder = resolveEntity(apimodel, spec, opts)
|
|
158
|
-
|
|
159
|
-
// const entityBuilder = await resolveEntity(ctx)
|
|
160
|
-
// const flowBuilder = await resolveFlows(ctx)
|
|
161
|
-
|
|
162
133
|
const jostraca = Jostraca({
|
|
163
134
|
now: spec.now,
|
|
164
135
|
fs: () => fs,
|
|
@@ -184,8 +155,6 @@ function ApiDef(opts: ApiDefOptions) {
|
|
|
184
155
|
existing: { txt: { merge: true } }
|
|
185
156
|
}, root)
|
|
186
157
|
|
|
187
|
-
// console.log('JRES', jres)
|
|
188
|
-
|
|
189
158
|
log.info({ point: 'generate-end', note: 'success', break: true })
|
|
190
159
|
|
|
191
160
|
return {
|