@voxgig/create-sdkgen 0.17.0 → 0.17.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.
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.CreateRoot = void 0;
|
|
7
|
+
exports.sanitizeDefName = sanitizeDefName;
|
|
7
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
8
9
|
// import * as Fs from 'node:fs'
|
|
9
10
|
const jostraca_1 = require("jostraca");
|
|
@@ -88,6 +89,36 @@ function mergeGuide(existing, template) {
|
|
|
88
89
|
}
|
|
89
90
|
return missing.join('\n') + '\n\n' + existing;
|
|
90
91
|
}
|
|
92
|
+
// The OpenAPI filename is inherited from the upstream API slug, and upstream
|
|
93
|
+
// slugs are not constrained: the freepublicapis corpus contains apostrophes
|
|
94
|
+
// (catherine-shulman's-quotes), accents (dólar-y-monedas, kölner-adressen),
|
|
95
|
+
// and '!' / '>' / '_'. That name is copied into .sdk/def/ AND written verbatim
|
|
96
|
+
// into a single-quoted aontu string in sdk.aontu:
|
|
97
|
+
//
|
|
98
|
+
// def: 'catherine-shulman's-quotes_0.1.0.json'
|
|
99
|
+
// ^ terminates the string -> AontuError, no SDK
|
|
100
|
+
//
|
|
101
|
+
// Slugs are [a-z0-9-]; a filename additionally needs '.' and '_' for the
|
|
102
|
+
// version segment and extension, so those are kept — which also means every
|
|
103
|
+
// already-conforming name (including cedar's dotted gitlab-v4-swagger-2.0.yaml)
|
|
104
|
+
// is untouched and no repo churns. Everything else is folded to '-'.
|
|
105
|
+
function sanitizeDefName(filename) {
|
|
106
|
+
const clean = filename
|
|
107
|
+
.normalize('NFKD').replace(/[\u0300-\u036f]/g, '') // dólar -> dolar
|
|
108
|
+
.toLowerCase()
|
|
109
|
+
// Quotes are ELIDED, not folded to '-', so the filename agrees with the
|
|
110
|
+
// repo name apidef's sanitizeSlug derives from the same slug:
|
|
111
|
+
// catherine-shulman's-quotes -> catherine-shulmans-quotes(-sdk).
|
|
112
|
+
.replace(/['’"]/g, '')
|
|
113
|
+
.replace(/[^a-z0-9._-]+/g, '-')
|
|
114
|
+
.replace(/-+/g, '-')
|
|
115
|
+
// yu-gi-oh!_0.1.0.json would otherwise keep the '!' as a dangling '-'
|
|
116
|
+
// before the version separator: yu-gi-oh-_0.1.0.json.
|
|
117
|
+
.replace(/-+([._])/g, '$1')
|
|
118
|
+
.replace(/([._])-+/g, '$1')
|
|
119
|
+
.replace(/^-|-$/g, '');
|
|
120
|
+
return '' === clean ? 'openapi.yml' : clean;
|
|
121
|
+
}
|
|
91
122
|
// TODO: rename to RootSdk
|
|
92
123
|
const CreateRoot = (0, jostraca_1.cmp)(function CreateRoot(props) {
|
|
93
124
|
const { ctx$, ctx$: { folder }, spec, model } = props;
|
|
@@ -115,7 +146,7 @@ const CreateRoot = (0, jostraca_1.cmp)(function CreateRoot(props) {
|
|
|
115
146
|
(0, jostraca_1.Content)(GITIGNORE_TOP);
|
|
116
147
|
});
|
|
117
148
|
const origdef = spec.def;
|
|
118
|
-
const projdef = node_path_1.default.basename(origdef);
|
|
149
|
+
const projdef = sanitizeDefName(node_path_1.default.basename(origdef));
|
|
119
150
|
spec.def = projdef;
|
|
120
151
|
(0, jostraca_1.Folder)({ name: spec.sdk_folder }, () => {
|
|
121
152
|
(0, jostraca_1.File)({ name: '.gitignore' }, () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateRoot.js","sourceRoot":"","sources":["../../../src/project/standard/CreateRoot.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"CreateRoot.js","sourceRoot":"","sources":["../../../src/project/standard/CreateRoot.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@voxgig/create-sdkgen",
|
|
3
|
-
"version": "0.17.
|
|
3
|
+
"version": "0.17.2",
|
|
4
4
|
"main": "dist/create-sdkgen.js",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"types": "dist/create-sdkgen.d.ts",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
55
|
"@voxgig/util": "0.5.4",
|
|
56
|
-
"aontu": "0.50.
|
|
56
|
+
"aontu": "0.50.1",
|
|
57
57
|
"chokidar": "5.0.0",
|
|
58
58
|
"jostraca": "0.31.2",
|
|
59
59
|
"shape": "10.1.3"
|
|
@@ -111,6 +111,38 @@ function mergeGuide(existing: string | null, template: string): string {
|
|
|
111
111
|
}
|
|
112
112
|
|
|
113
113
|
|
|
114
|
+
// The OpenAPI filename is inherited from the upstream API slug, and upstream
|
|
115
|
+
// slugs are not constrained: the freepublicapis corpus contains apostrophes
|
|
116
|
+
// (catherine-shulman's-quotes), accents (dólar-y-monedas, kölner-adressen),
|
|
117
|
+
// and '!' / '>' / '_'. That name is copied into .sdk/def/ AND written verbatim
|
|
118
|
+
// into a single-quoted aontu string in sdk.aontu:
|
|
119
|
+
//
|
|
120
|
+
// def: 'catherine-shulman's-quotes_0.1.0.json'
|
|
121
|
+
// ^ terminates the string -> AontuError, no SDK
|
|
122
|
+
//
|
|
123
|
+
// Slugs are [a-z0-9-]; a filename additionally needs '.' and '_' for the
|
|
124
|
+
// version segment and extension, so those are kept — which also means every
|
|
125
|
+
// already-conforming name (including cedar's dotted gitlab-v4-swagger-2.0.yaml)
|
|
126
|
+
// is untouched and no repo churns. Everything else is folded to '-'.
|
|
127
|
+
function sanitizeDefName(filename: string): string {
|
|
128
|
+
const clean = filename
|
|
129
|
+
.normalize('NFKD').replace(/[\u0300-\u036f]/g, '') // dólar -> dolar
|
|
130
|
+
.toLowerCase()
|
|
131
|
+
// Quotes are ELIDED, not folded to '-', so the filename agrees with the
|
|
132
|
+
// repo name apidef's sanitizeSlug derives from the same slug:
|
|
133
|
+
// catherine-shulman's-quotes -> catherine-shulmans-quotes(-sdk).
|
|
134
|
+
.replace(/['’"]/g, '')
|
|
135
|
+
.replace(/[^a-z0-9._-]+/g, '-')
|
|
136
|
+
.replace(/-+/g, '-')
|
|
137
|
+
// yu-gi-oh!_0.1.0.json would otherwise keep the '!' as a dangling '-'
|
|
138
|
+
// before the version separator: yu-gi-oh-_0.1.0.json.
|
|
139
|
+
.replace(/-+([._])/g, '$1')
|
|
140
|
+
.replace(/([._])-+/g, '$1')
|
|
141
|
+
.replace(/^-|-$/g, '')
|
|
142
|
+
return '' === clean ? 'openapi.yml' : clean
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
|
|
114
146
|
// TODO: rename to RootSdk
|
|
115
147
|
const CreateRoot = cmp(function CreateRoot(props: any) {
|
|
116
148
|
const { ctx$, ctx$: { folder }, spec, model } = props
|
|
@@ -147,7 +179,7 @@ const CreateRoot = cmp(function CreateRoot(props: any) {
|
|
|
147
179
|
})
|
|
148
180
|
|
|
149
181
|
const origdef = spec.def
|
|
150
|
-
const projdef = Path.basename(origdef)
|
|
182
|
+
const projdef = sanitizeDefName(Path.basename(origdef))
|
|
151
183
|
spec.def = projdef
|
|
152
184
|
|
|
153
185
|
Folder({ name: spec.sdk_folder }, () => {
|
|
@@ -192,5 +224,6 @@ const CreateRoot = cmp(function CreateRoot(props: any) {
|
|
|
192
224
|
|
|
193
225
|
|
|
194
226
|
export {
|
|
195
|
-
CreateRoot
|
|
227
|
+
CreateRoot,
|
|
228
|
+
sanitizeDefName,
|
|
196
229
|
}
|