ssube
/
js-yaml-schema
1
0
Fork 0
Code

fix: replace deprecated utility fns

This commit is contained in:
Sean Sube 2022-10-08 15:44:06 -05:00
parent 01f639f078
commit 06726e91fc
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/schema.ts
View File

@ -1,4 +1,4 @@
import { mustCoalesce } from '@apextoaster/js-utils'; import { mustDefault } from '@apextoaster/js-utils';
import { DEFAULT_SCHEMA, Schema } from 'js-yaml'; import { DEFAULT_SCHEMA, Schema } from 'js-yaml';
import { envType } from './type/Env'; import { envType } from './type/Env';
@ -17,7 +17,7 @@ export interface SchemaOptions {
* @public * @public
*/ */
export function createSchema(options: SchemaOptions): Schema { export function createSchema(options: SchemaOptions): Schema {
const base = mustCoalesce(options.base, DEFAULT_SCHEMA); const base = mustDefault(options.base, DEFAULT_SCHEMA);
return base.extend([ return base.extend([
envType, envType,
@ -43,7 +43,7 @@ export interface IncludeSchemaOptions {
* @deprecated use `createSchema` unless the include type is needed, since it requires a number of callbacks * @deprecated use `createSchema` unless the include type is needed, since it requires a number of callbacks
*/ */
export function createIncludeSchema(options: Readonly<IncludeSchemaOptions>): Schema { export function createIncludeSchema(options: Readonly<IncludeSchemaOptions>): Schema {
const base = mustCoalesce(options.base, DEFAULT_SCHEMA); const base = mustDefault(options.base, DEFAULT_SCHEMA);
const { includeType, setSchema } = createInclude({ const { includeType, setSchema } = createInclude({
...options.include, ...options.include,
schema: base, schema: base,

6
src/type/Include.ts
View File

@ -1,4 +1,4 @@
import { InvalidArgumentError, mustCoalesce, NotFoundError, Optional } from '@apextoaster/js-utils'; import { InvalidArgumentError, Maybe, mustDefault, NotFoundError } from '@apextoaster/js-utils';
import { DEFAULT_SCHEMA, load, Schema, Type as YamlType } from 'js-yaml'; import { DEFAULT_SCHEMA, load, Schema, Type as YamlType } from 'js-yaml';
export type ReaderEncoding = 'ascii' | 'utf-8'; export type ReaderEncoding = 'ascii' | 'utf-8';
@ -18,7 +18,7 @@ export interface IncludeOptions {
join: (...path: Array<string>) => string; join: (...path: Array<string>) => string;
read: IncludeReader; read: IncludeReader;
resolve: (path: string) => string; resolve: (path: string) => string;
schema: Optional<Schema>; schema: Maybe<Schema>;
} }
export interface IncludeResult { export interface IncludeResult {
@ -40,7 +40,7 @@ const ERROR_INCLUDE_PARSE = 'error loading included file';
*/ */
export function createInclude(options: Readonly<IncludeOptions>): IncludeResult { export function createInclude(options: Readonly<IncludeOptions>): IncludeResult {
const mutableOptions = { const mutableOptions = {
schema: mustCoalesce(options.schema, DEFAULT_SCHEMA), schema: mustDefault(options.schema, DEFAULT_SCHEMA),
}; };
const includeType = new YamlType('!include', { const includeType = new YamlType('!include', {

4
src/type/Regexp.ts
View File

@ -1,4 +1,4 @@
import { InvalidArgumentError, isNil } from '@apextoaster/js-utils'; import { InvalidArgumentError, isNone } from '@apextoaster/js-utils';
import { Type as YamlType } from 'js-yaml'; import { Type as YamlType } from 'js-yaml';
export const REGEXP_REGEXP = /^\/(.+)\/([gimsuy]*)$/; export const REGEXP_REGEXP = /^\/(.+)\/([gimsuy]*)$/;
@ -13,7 +13,7 @@ export const regexpType = new YamlType('!regexp', {
}, },
construct(value: string): RegExp { construct(value: string): RegExp {
const match = REGEXP_REGEXP.exec(value); const match = REGEXP_REGEXP.exec(value);
if (isNil(match)) { if (isNone(match)) {
throw new InvalidArgumentError('invalid regexp'); throw new InvalidArgumentError('invalid regexp');
} }
const [/* input */, expr, flags] = Array.from(match); const [/* input */, expr, flags] = Array.from(match);