@skmtc/core 0.0.652 → 0.0.654

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.
@@ -1 +1 @@
1
- {"version":3,"file":"toInteger.d.ts","sourceRoot":"","sources":["../../../src/oas/integer/toInteger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AASzC,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,SAAS,CAAC,YAAY,CAAA;IAC7B,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,SAAS,uBAAwB,aAAa,KAAG,UA2B7D,CAAA;AAED,KAAK,mBAAmB,CAAC,QAAQ,SAAS,OAAO,GAAG,SAAS,IAAI;IAC/D,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC,CAAA;IACrE,OAAO,EAAE,YAAY,CAAA;IACrB,QAAQ,EAAE,QAAQ,CAAA;IAClB,OAAO,EAAE,QAAQ,SAAS,IAAI,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAA;IAC/E,KAAK,EAAE,QAAQ,SAAS,IAAI,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG,SAAS,GAAG,MAAM,EAAE,GAAG,SAAS,CAAA;CACpF,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,SAAS,OAAO,GAAG,SAAS,mEAMjE,mBAAmB,CAAC,QAAQ,CAAC,KAAG,UAAU,CAAC,QAAQ,CA2CrD,CAAA"}
1
+ {"version":3,"file":"toInteger.d.ts","sourceRoot":"","sources":["../../../src/oas/integer/toInteger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AASzC,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,SAAS,CAAC,YAAY,CAAA;IAC7B,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,SAAS,uBAAwB,aAAa,KAAG,UA2B7D,CAAA;AAED,KAAK,mBAAmB,CAAC,QAAQ,SAAS,OAAO,GAAG,SAAS,IAAI;IAC/D,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC,CAAA;IACrE,OAAO,EAAE,YAAY,CAAA;IACrB,QAAQ,EAAE,QAAQ,CAAA;IAClB,OAAO,EAAE,QAAQ,SAAS,IAAI,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAA;IAC/E,KAAK,EAAE,QAAQ,SAAS,IAAI,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG,SAAS,GAAG,MAAM,EAAE,GAAG,SAAS,CAAA;CACpF,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,SAAS,OAAO,GAAG,SAAS,mEAMjE,mBAAmB,CAAC,QAAQ,CAAC,KAAG,UAAU,CAAC,QAAQ,CA0CrD,CAAA"}
@@ -1,10 +1,11 @@
1
1
  import { OasInteger } from './Integer.js';
2
2
  import { toSpecificationExtensionsV3 } from '../specificationExtensions/toSpecificationExtensionsV3.js';
3
- import { oasIntegerData, integerSchema } from './integer-types.js';
3
+ import { oasIntegerData, integerSchema, integerFormat } from './integer-types.js';
4
4
  import * as v from 'valibot';
5
5
  import { parseNullable } from '../_helpers/parseNullable.js';
6
6
  import { parseExample } from '../_helpers/parseExample.js';
7
7
  import { parseEnum } from '../_helpers/parseEnum.js';
8
+ import { parseFormat } from '../_helpers/parseFormat.js';
8
9
  export const toInteger = ({ value, context }) => {
9
10
  const { nullable, value: valueWithoutNullable } = parseNullable({
10
11
  value,
@@ -31,12 +32,12 @@ export const toInteger = ({ value, context }) => {
31
32
  });
32
33
  };
33
34
  export const toParsedInteger = ({ context, nullable, example, enums, value: valueWithoutEnums }) => {
34
- // const { format, value: valueWithoutFormat } = parseFormat({
35
- // value: valueWithoutEnums,
36
- // valibotSchema: integerFormat,
37
- // context
38
- // })
39
- const { type: _type, title, description, default: defaultValue, multipleOf, maximum, exclusiveMaximum, minimum, format, exclusiveMinimum, ...skipped } = v.parse(oasIntegerData, valueWithoutEnums);
35
+ const { format, value: valueWithoutFormat } = parseFormat({
36
+ value: valueWithoutEnums,
37
+ valibotSchema: integerFormat,
38
+ context
39
+ });
40
+ const { type: _type, title, description, default: defaultValue, multipleOf, maximum, exclusiveMaximum, minimum, exclusiveMinimum, ...skipped } = v.parse(oasIntegerData, valueWithoutFormat);
40
41
  const extensionFields = toSpecificationExtensionsV3({
41
42
  skipped,
42
43
  parent: valueWithoutEnums,
@@ -24,7 +24,7 @@ export const toV3Document = async (schema) => {
24
24
  })
25
25
  .with({ swagger: P.string.startsWith('2.0') }, async (doc) => {
26
26
  const parsed = await converter.convertObj(doc, {});
27
- return parsed;
27
+ return parsed.openapi;
28
28
  })
29
29
  .otherwise(() => {
30
30
  console.log('Unrecognized OpenAPI version', JSON.stringify(schema, null, 2).substring(0, 1000));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@skmtc/core",
3
- "version": "0.0.652",
3
+ "version": "0.0.654",
4
4
  "main": "./script/mod.js",
5
5
  "module": "./esm/mod.js",
6
6
  "exports": {
@@ -1 +1 @@
1
- {"version":3,"file":"toInteger.d.ts","sourceRoot":"","sources":["../../../src/oas/integer/toInteger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AASzC,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,SAAS,CAAC,YAAY,CAAA;IAC7B,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,SAAS,uBAAwB,aAAa,KAAG,UA2B7D,CAAA;AAED,KAAK,mBAAmB,CAAC,QAAQ,SAAS,OAAO,GAAG,SAAS,IAAI;IAC/D,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC,CAAA;IACrE,OAAO,EAAE,YAAY,CAAA;IACrB,QAAQ,EAAE,QAAQ,CAAA;IAClB,OAAO,EAAE,QAAQ,SAAS,IAAI,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAA;IAC/E,KAAK,EAAE,QAAQ,SAAS,IAAI,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG,SAAS,GAAG,MAAM,EAAE,GAAG,SAAS,CAAA;CACpF,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,SAAS,OAAO,GAAG,SAAS,mEAMjE,mBAAmB,CAAC,QAAQ,CAAC,KAAG,UAAU,CAAC,QAAQ,CA2CrD,CAAA"}
1
+ {"version":3,"file":"toInteger.d.ts","sourceRoot":"","sources":["../../../src/oas/integer/toInteger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AASzC,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,SAAS,CAAC,YAAY,CAAA;IAC7B,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,SAAS,uBAAwB,aAAa,KAAG,UA2B7D,CAAA;AAED,KAAK,mBAAmB,CAAC,QAAQ,SAAS,OAAO,GAAG,SAAS,IAAI;IAC/D,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC,CAAA;IACrE,OAAO,EAAE,YAAY,CAAA;IACrB,QAAQ,EAAE,QAAQ,CAAA;IAClB,OAAO,EAAE,QAAQ,SAAS,IAAI,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAA;IAC/E,KAAK,EAAE,QAAQ,SAAS,IAAI,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG,SAAS,GAAG,MAAM,EAAE,GAAG,SAAS,CAAA;CACpF,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,SAAS,OAAO,GAAG,SAAS,mEAMjE,mBAAmB,CAAC,QAAQ,CAAC,KAAG,UAAU,CAAC,QAAQ,CA0CrD,CAAA"}
@@ -31,6 +31,7 @@ const v = __importStar(require("valibot"));
31
31
  const parseNullable_js_1 = require("../_helpers/parseNullable.js");
32
32
  const parseExample_js_1 = require("../_helpers/parseExample.js");
33
33
  const parseEnum_js_1 = require("../_helpers/parseEnum.js");
34
+ const parseFormat_js_1 = require("../_helpers/parseFormat.js");
34
35
  const toInteger = ({ value, context }) => {
35
36
  const { nullable, value: valueWithoutNullable } = (0, parseNullable_js_1.parseNullable)({
36
37
  value,
@@ -58,12 +59,12 @@ const toInteger = ({ value, context }) => {
58
59
  };
59
60
  exports.toInteger = toInteger;
60
61
  const toParsedInteger = ({ context, nullable, example, enums, value: valueWithoutEnums }) => {
61
- // const { format, value: valueWithoutFormat } = parseFormat({
62
- // value: valueWithoutEnums,
63
- // valibotSchema: integerFormat,
64
- // context
65
- // })
66
- const { type: _type, title, description, default: defaultValue, multipleOf, maximum, exclusiveMaximum, minimum, format, exclusiveMinimum, ...skipped } = v.parse(integer_types_js_1.oasIntegerData, valueWithoutEnums);
62
+ const { format, value: valueWithoutFormat } = (0, parseFormat_js_1.parseFormat)({
63
+ value: valueWithoutEnums,
64
+ valibotSchema: integer_types_js_1.integerFormat,
65
+ context
66
+ });
67
+ const { type: _type, title, description, default: defaultValue, multipleOf, maximum, exclusiveMaximum, minimum, exclusiveMinimum, ...skipped } = v.parse(integer_types_js_1.oasIntegerData, valueWithoutFormat);
67
68
  const extensionFields = (0, toSpecificationExtensionsV3_js_1.toSpecificationExtensionsV3)({
68
69
  skipped,
69
70
  parent: valueWithoutEnums,
@@ -31,7 +31,7 @@ const toV3Document = async (schema) => {
31
31
  })
32
32
  .with({ swagger: ts_pattern_1.P.string.startsWith('2.0') }, async (doc) => {
33
33
  const parsed = await swagger2openapi_1.default.convertObj(doc, {});
34
- return parsed;
34
+ return parsed.openapi;
35
35
  })
36
36
  .otherwise(() => {
37
37
  console.log('Unrecognized OpenAPI version', JSON.stringify(schema, null, 2).substring(0, 1000));