Skip to content

Commit f4dbaf5

Browse files
mythzmythz
committed
update dist
1 parent 6edf661 commit f4dbaf5

File tree

5 files changed

+98
-14
lines changed

5 files changed

+98
-14
lines changed

‎dist/index.js‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ function createFieldError(fieldName, message, errorCode = 'Exception') {
10911091
return new ResponseStatus({ errors: [new ResponseError({ fieldName, errorCode, message })] });
10921092
}
10931093
exports.createFieldError = createFieldError;
1094-
function isFormData(body) { return typeof window != "undefined" && body instanceof FormData; }
1094+
function isFormData(body) { return body instanceof FormData; }
10951095
exports.isFormData = isFormData;
10961096
function createErrorResponse(errorCode, message, type = null) {
10971097
const error = apply(new ErrorResponse(), e => {
@@ -1114,11 +1114,39 @@ function createError(errorCode, message, fieldName) {
11141114
});
11151115
}
11161116
exports.createError = createError;
1117-
function toCamelCase(s) { return !s ? s : s.charAt(0).toLowerCase() + s.substring(1); }
1117+
function toCamelCase(s) {
1118+
s = toPascalCase(s);
1119+
if (!s)
1120+
return '';
1121+
return s.charAt(0).toLowerCase() + s.substring(1);
1122+
}
11181123
exports.toCamelCase = toCamelCase;
1119-
function toPascalCase(s) { return !s ? s : s.charAt(0).toUpperCase() + s.substring(1); }
1124+
function toPascalCase(s) {
1125+
if (!s)
1126+
return '';
1127+
const isAllCaps = s.match(/^[A-Z0-9_]+$/);
1128+
if (isAllCaps) {
1129+
const words = s.split('_');
1130+
return words.map(x => x[0].toUpperCase() + x.substring(1).toLowerCase()).join('');
1131+
}
1132+
if (s.includes('_')) {
1133+
return s.split('_').filter(x => x[0]).map(x => x[0].toUpperCase() + x.substring(1)).join('');
1134+
}
1135+
return s.charAt(0).toUpperCase() + s.substring(1);
1136+
}
11201137
exports.toPascalCase = toPascalCase;
1121-
function toKebabCase(s) { return (s || '').replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase(); }
1138+
function toKebabCase(s) {
1139+
if (!s || s.length <= 1)
1140+
return s.toLowerCase();
1141+
// Insert hyphen before capitals and numbers, convert to lowercase
1142+
return s
1143+
.replace(/([A-Z0-9])/g, '-$1')
1144+
.toLowerCase()
1145+
// Remove leading hyphen if exists
1146+
.replace(/^-/, '')
1147+
// Replace multiple hyphens with single hyphen
1148+
.replace(/-+/g, '-');
1149+
}
11221150
exports.toKebabCase = toKebabCase;
11231151
function map(o, f) { return o == null ? null : f(o); }
11241152
exports.map = map;

‎dist/servicestack-client.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/servicestack-client.min.mjs‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎dist/servicestack-client.mjs‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,7 @@ export function createErrorStatus(message, errorCode = 'Exception') {
11981198
export function createFieldError(fieldName, message, errorCode = 'Exception') {
11991199
return new ResponseStatus({ errors: [new ResponseError({ fieldName, errorCode, message })] });
12001200
}
1201-
export function isFormData(body) { return typeof window != "undefined" && body instanceof FormData; }
1201+
export function isFormData(body) { return body instanceof FormData; }
12021202
function createErrorResponse(errorCode, message, type = null) {
12031203
const error = apply(new ErrorResponse(), e => {
12041204
if (type != null)
@@ -1219,9 +1219,37 @@ export function createError(errorCode, message, fieldName) {
12191219
})
12201220
});
12211221
}
1222-
export function toCamelCase(s) { return !s ? s : s.charAt(0).toLowerCase() + s.substring(1); }
1223-
export function toPascalCase(s) { return !s ? s : s.charAt(0).toUpperCase() + s.substring(1); }
1224-
export function toKebabCase(s) { return (s || '').replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase(); }
1222+
export function toCamelCase(s) {
1223+
s = toPascalCase(s);
1224+
if (!s)
1225+
return '';
1226+
return s.charAt(0).toLowerCase() + s.substring(1);
1227+
}
1228+
export function toPascalCase(s) {
1229+
if (!s)
1230+
return '';
1231+
const isAllCaps = s.match(/^[A-Z0-9_]+$/);
1232+
if (isAllCaps) {
1233+
const words = s.split('_');
1234+
return words.map(x => x[0].toUpperCase() + x.substring(1).toLowerCase()).join('');
1235+
}
1236+
if (s.includes('_')) {
1237+
return s.split('_').filter(x => x[0]).map(x => x[0].toUpperCase() + x.substring(1)).join('');
1238+
}
1239+
return s.charAt(0).toUpperCase() + s.substring(1);
1240+
}
1241+
export function toKebabCase(s) {
1242+
if (!s || s.length <= 1)
1243+
return s.toLowerCase();
1244+
// Insert hyphen before capitals and numbers, convert to lowercase
1245+
return s
1246+
.replace(/([A-Z0-9])/g, '-$1')
1247+
.toLowerCase()
1248+
// Remove leading hyphen if exists
1249+
.replace(/^-/, '')
1250+
// Replace multiple hyphens with single hyphen
1251+
.replace(/-+/g, '-');
1252+
}
12251253
export function map(o, f) { return o == null ? null : f(o); }
12261254
export function camelCaseAny(o) {
12271255
if (!o || !(o instanceof Object) || Array.isArray(o))

‎dist/servicestack-client.umd.js‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,7 +1342,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
13421342
return new ResponseStatus({ errors: [new ResponseError({ fieldName: fieldName, errorCode: errorCode, message: message })] });
13431343
}
13441344
exports.createFieldError = createFieldError;
1345-
function isFormData(body) { return typeof window != "undefined" && body instanceof FormData; }
1345+
function isFormData(body) { return body instanceof FormData; }
13461346
exports.isFormData = isFormData;
13471347
function createErrorResponse(errorCode, message, type) {
13481348
if (type === void 0) { type = null; }
@@ -1366,11 +1366,39 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
13661366
});
13671367
}
13681368
exports.createError = createError;
1369-
function toCamelCase(s) { return !s ? s : s.charAt(0).toLowerCase() + s.substring(1); }
1369+
function toCamelCase(s) {
1370+
s = toPascalCase(s);
1371+
if (!s)
1372+
return '';
1373+
return s.charAt(0).toLowerCase() + s.substring(1);
1374+
}
13701375
exports.toCamelCase = toCamelCase;
1371-
function toPascalCase(s) { return !s ? s : s.charAt(0).toUpperCase() + s.substring(1); }
1376+
function toPascalCase(s) {
1377+
if (!s)
1378+
return '';
1379+
var isAllCaps = s.match(/^[A-Z0-9_]+$/);
1380+
if (isAllCaps) {
1381+
var words = s.split('_');
1382+
return words.map(function (x) { return x[0].toUpperCase() + x.substring(1).toLowerCase(); }).join('');
1383+
}
1384+
if (s.includes('_')) {
1385+
return s.split('_').filter(function (x) { return x[0]; }).map(function (x) { return x[0].toUpperCase() + x.substring(1); }).join('');
1386+
}
1387+
return s.charAt(0).toUpperCase() + s.substring(1);
1388+
}
13721389
exports.toPascalCase = toPascalCase;
1373-
function toKebabCase(s) { return (s || '').replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase(); }
1390+
function toKebabCase(s) {
1391+
if (!s || s.length <= 1)
1392+
return s.toLowerCase();
1393+
// Insert hyphen before capitals and numbers, convert to lowercase
1394+
return s
1395+
.replace(/([A-Z0-9])/g, '-$1')
1396+
.toLowerCase()
1397+
// Remove leading hyphen if exists
1398+
.replace(/^-/, '')
1399+
// Replace multiple hyphens with single hyphen
1400+
.replace(/-+/g, '-');
1401+
}
13741402
exports.toKebabCase = toKebabCase;
13751403
function map(o, f) { return o == null ? null : f(o); }
13761404
exports.map = map;

0 commit comments

Comments
 (0)